From e40a5a70a524818261a94406b17efdf540d423df Mon Sep 17 00:00:00 2001
From: Ivan Nieto <inietov@gmail.com>
Date: Wed, 15 May 2019 17:47:40 -0500
Subject: [PATCH] RTF support added (#7024)

* Added the Gatte Facade to AssetsController

* Added the filetype RTF in the modal to upload files

* Added validation of RTF files
---
 app/Http/Controllers/Api/AssetsController.php | 1 +
 app/Http/Requests/AssetFileRequest.php        | 2 +-
 resources/lang/en-GB/general.php              | 2 +-
 resources/lang/en-ID/general.php              | 2 +-
 resources/lang/en/general.php                 | 2 +-
 resources/lang/es-CO/general.php              | 2 +-
 resources/lang/es-ES/general.php              | 2 +-
 resources/lang/es-MX/general.php              | 2 +-
 resources/lang/es-VE/general.php              | 2 +-
 resources/views/modals/upload-file.blade.php  | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 381228a58f..ed51044751 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -1,6 +1,7 @@
 <?php
 namespace App\Http\Controllers\Api;
 
+use Illuminate\Support\Facades\Gate;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\AssetCheckoutRequest;
diff --git a/app/Http/Requests/AssetFileRequest.php b/app/Http/Requests/AssetFileRequest.php
index df5c4bdb2a..74dfde3ab4 100644
--- a/app/Http/Requests/AssetFileRequest.php
+++ b/app/Http/Requests/AssetFileRequest.php
@@ -24,7 +24,7 @@ class AssetFileRequest extends Request
     {
         $max_file_size = \App\Helpers\Helper::file_upload_max_size();
         return [
-          'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,lic,xml|max:'.$max_file_size,
+          'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,lic,xml,rtf|max:'.$max_file_size,
         ];
     }
 }
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 90ad774cc6..6efb25c645 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -206,7 +206,7 @@
     'unknown_admin'			=> 'Unknown Admin',
     'username_format'		=> 'Username Format',
     'update'                => 'Update',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
     'accepted'			    => 'accepted',
diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php
index f4017dcf02..413bf86a56 100644
--- a/resources/lang/en-ID/general.php
+++ b/resources/lang/en-ID/general.php
@@ -206,7 +206,7 @@
     'unknown_admin'			=> 'Admin tidak diketahui',
     'username_format'		=> 'Format nama pengguna',
     'update'                => 'Perbarui',
-    'upload_filetypes_help'      => 'Tipe file yang diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, dan rar. Maksimal ukuran file upload adalah :size.',
+    'upload_filetypes_help'      => 'Tipe file yang diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rtf dan rar. Maksimal ukuran file upload adalah :size.',
     'uploaded'              => 'Unggah',
     'user'					=> 'Pengguna',
     'accepted'			    => 'diterima',
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index b18366064b..0399a53dab 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -211,7 +211,7 @@
     'unknown_admin'			=> 'Unknown Admin',
     'username_format'		=> 'Username Format',
     'update'                => 'Update',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, xml, zip, and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
     'accepted'			    => 'accepted',
diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php
index 632408b951..6a51c98731 100644
--- a/resources/lang/es-CO/general.php
+++ b/resources/lang/es-CO/general.php
@@ -206,7 +206,7 @@
     'unknown_admin'			=> 'Admin Desconocido',
     'username_format'		=> 'Formato del nombre de usuario',
     'update'                => 'Actualizar',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Algunos tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf y rar. Tamaño máximo permitido: :size.',
     'uploaded'              => 'Subido',
     'user'					=> 'Usuario',
     'accepted'			    => 'aceptado',
diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php
index 632408b951..6a51c98731 100644
--- a/resources/lang/es-ES/general.php
+++ b/resources/lang/es-ES/general.php
@@ -206,7 +206,7 @@
     'unknown_admin'			=> 'Admin Desconocido',
     'username_format'		=> 'Formato del nombre de usuario',
     'update'                => 'Actualizar',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Algunos tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf y rar. Tamaño máximo permitido: :size.',
     'uploaded'              => 'Subido',
     'user'					=> 'Usuario',
     'accepted'			    => 'aceptado',
diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php
index 0afc20916b..bfcd3fd0a0 100644
--- a/resources/lang/es-MX/general.php
+++ b/resources/lang/es-MX/general.php
@@ -206,7 +206,7 @@
     'unknown_admin'			=> 'Admin Desconocido',
     'username_format'		=> 'Formato del nombre de usuario',
     'update'                => 'Actualizar',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Algunos tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf y rar. Tamaño máximo permitido: :size.',
     'uploaded'              => 'Subido',
     'user'					=> 'Usuario',
     'accepted'			    => 'aceptado',
diff --git a/resources/lang/es-VE/general.php b/resources/lang/es-VE/general.php
index 10e862902f..b4a839a18e 100644
--- a/resources/lang/es-VE/general.php
+++ b/resources/lang/es-VE/general.php
@@ -206,7 +206,7 @@
     'unknown_admin'			=> 'Administrador Desconocido',
     'username_format'		=> 'Formato de Nombre de Usuario',
     'update'                => 'Actualizar',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Algunos tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf y rar. Tamaño máximo permitido: :size.',
     'uploaded'              => 'Actualizado',
     'user'					=> 'Usuario',
     'accepted'			    => 'aceptado',
diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php
index 9c12032311..8b2a5db544 100644
--- a/resources/views/modals/upload-file.blade.php
+++ b/resources/views/modals/upload-file.blade.php
@@ -19,7 +19,7 @@
 
                         <label class="btn btn-default">
                             {{ trans('button.select_file')  }}
-                            <input type="file" name="file[]" multiple="true" class="js-uploadFile" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/*,.csv,.zip,.rar,.doc,.docx,.xls,.xml,.lic,.xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,text/plain,.pdf" style="display:none">
+                            <input type="file" name="file[]" multiple="true" class="js-uploadFile" id="uploadFile" data-maxsize="{{ \App\Helpers\Helper::file_upload_max_size() }}" accept="image/*,.csv,.zip,.rar,.doc,.docx,.xls,.xml,.lic,.xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,text/plain,.pdf,application/rtf" style="display:none">
                         </label>
 
                     </div>