Skip to content

Commit

Permalink
handle uploaded file size too big error message
Browse files Browse the repository at this point in the history
  • Loading branch information
streamtw committed Sep 10, 2016
1 parent 5d98c20 commit 681b1ca
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/controllers/UploadController.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,16 @@ private function uploadValidator()
$is_valid = false;

$file = Input::file('upload');

if (empty($file)) {
throw new \Exception(Lang::get('laravel-filemanager::lfm.error-file-empty'));
}
if (!$file instanceof UploadedFile) {
} elseif (!$file instanceof UploadedFile) {
throw new \Exception(Lang::get('laravel-filemanager::lfm.error-instance'));
} elseif ($file->getError() == UPLOAD_ERR_INI_SIZE) {
$max_size = ini_get('upload_max_filesize');
throw new \Exception(Lang::get('laravel-filemanager::lfm.error-file-size', ['max' => $max_size]));
} elseif ($file->getError() != UPLOAD_ERR_OK) {
dd('File failed to upload. Error code: ' . $file->getError());
}

$mimetype = $file->getMimeType();
Expand Down
1 change: 1 addition & 0 deletions src/lang/ar/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'error-rename' => 'اسم الملف مستخدما مسبقا!',
'error-file-empty' => 'يجب اختيارملف!',
'error-file-exist' => 'يوجد ملف سابق بنفس الاسم!',
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',
'error-delete' => 'لا يمكن حذف هذا المجلد لانه غير فارغ!',
'error-folder-name' => 'اسم المجلد لا يمكن ان يكون فاغ!',
'error-folder-exist'=> 'اسم المجلد مستخدما مسبقا!',
Expand Down
1 change: 1 addition & 0 deletions src/lang/bg/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'error-rename' => 'Името е заето!',
'error-file-empty' => 'Трябва да изберете файл !',
'error-file-exist' => 'Файл с това име вече съществува!',
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',
'error-delete' => 'Не можете да изтриете тази папка, защото не е празна!',
'error-folder-name' => 'Моля изберете име на папката',
'error-folder-exist'=> 'Папка с това име вече съществува!',
Expand Down
1 change: 1 addition & 0 deletions src/lang/en/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'error-rename' => 'File name already in use!',
'error-file-empty' => 'You must choose a file!',
'error-file-exist' => 'A file with this name already exists!',
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',
'error-delete' => 'You cannot delete this folder because it is not empty!',
'error-folder-name' => 'Folder name cannot be empty!',
'error-folder-exist'=> 'A folder with this name already exists!',
Expand Down
1 change: 1 addition & 0 deletions src/lang/es/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'error-rename' => '¡Nombre de Archivo ya existe!',
'error-file-empty' => '¡Debes escoger un archivo!',
'error-file-exist' => '¡Ya existe un archivo con este nombre!',
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',
'error-folder-alnum'=> 'Only alphanumeric folder names are allowed!',
'error-delete' => '¡No puedes eliminar esta carpeta porque no está vacía!',
'error-folder-name' => '¡Nombre de carpeta no puede ser vacío!',
Expand Down
1 change: 1 addition & 0 deletions src/lang/fa/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'error-rename' => 'این نام قبلا استفاده شده!',
'error-file-empty' => 'شما باید یک فایل را انتخاب کنید!',
'error-file-exist' => 'یک فایل دیگر با این نام قبلا ایجاد شده است!',
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',
'error-delete' => 'به دلیل خالی نبودن پوشه امکان حذف آن وجود ندارد!',
'error-folder-name' => 'نام پوشه نمی تواند خالی باشد!',
'error-folder-exist'=> 'یک پوشه با این نام قبلا ایجاد شده است!',
Expand Down
1 change: 1 addition & 0 deletions src/lang/fr/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'error-rename' => 'Ce nom est déjà pris !',
'error-file-empty' => 'Veuillez choisir un fichier',
'error-file-exist' => 'Un fichier avec ce nom existe déjà !',
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',
'error-delete' => "Vous ne pouvez pas supprimer ce dossier car il n'est pas vide",
'error-folder-name' => 'Le nom du dossier ne peut pas être vide',
'error-folder-exist'=> 'Un dossier avec ce nom existe déjà !',
Expand Down
1 change: 1 addition & 0 deletions src/lang/he/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
'error-rename' => 'הקובץ נמצא בשימוש!',
'error-file-empty' => 'עליך לבחור קובץ!',
'error-file-exist' => 'קובץ עם שם זה כבר קיים!',
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',
'error-delete' => 'לא ניתן למחוק תייקיה זו מכיוון שהיא לא ריקה!',
'error-folder-name' => 'נא להזין שם תיקייה!',
'error-folder-exist'=> 'תיקייה עם שם זהה כבר קיימת!',
Expand Down
1 change: 1 addition & 0 deletions src/lang/hu/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'error-rename' => 'A fájl neve használatban!',
'error-file-empty' => 'Ki kell választanod egy fájlt!',
'error-file-exist' => 'Egy fájl már létezik ezzel a névvel.',
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',
'error-delete' => 'Nem tudod törölni ezt a mappát, mert nem üres!',
'error-folder-name' => 'A mappa neve nem lehet üres!',
'error-folder-exist'=> 'Egy mappa már létezik ezzel a névvel!',
Expand Down
1 change: 1 addition & 0 deletions src/lang/nl/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'error-rename' => 'Bestandsnaam is al in gebruik!',
'error-file-empty' => 'U dient een bestand te kiezen!',
'error-file-exist' => 'Een bestand met deze naam bestaat al!',
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',
'error-delete' => 'U kunt deze map niet verwijderen omdat deze nog bestanden bevat!',
'error-folder-name' => 'Mapnaam mag niet leeg zijn!',
'error-folder-exist'=> 'Een map met deze naam bestaat al!',
Expand Down
1 change: 1 addition & 0 deletions src/lang/pt-BR/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'error-rename' => 'Nome de arquivo já está em uso!',
'error-file-empty' => 'Você deve escolher um arquivo!',
'error-file-exist' => 'Um arquivo com este nome já existe!',
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',
'error-delete' => 'Você não pode deletar esta pasta, pois ela não está vazia!',
'error-folder-name' => 'Nome da pasta não pode ser vazio!',
'error-folder-exist'=> 'Uma pasta com este nome já existe!',
Expand Down
1 change: 1 addition & 0 deletions src/lang/ru/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
'error-rename' => 'Имя файла уже используется!',
'error-file-empty' => 'Вы должны выбрать файл!',
'error-file-exist' => 'Файл с этим именем уже существует!',
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',
'error-delete' => 'Вы не можете удалить эту папку, потому что она не пустая!',
'error-folder-name' => 'Имя папки не может быть пустым!',
'error-folder-exist'=> 'Папка с таким названием уже существует!',
Expand Down
1 change: 1 addition & 0 deletions src/lang/tr/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'error-rename' => 'Dosya adı kullanımda!',
'error-file-empty' => 'Bir dosya seçmelisiniz!',
'error-file-exist' => 'Bu adda bir dosya zaten var!',
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',
'error-delete' => 'Klasör boş olmadığından, klasörü silemezsiniz!',
'error-folder-name' => 'Klasör adı yazılmalıdır!',
'error-folder-exist'=> 'Bu adda bir klasör zaten var!',
Expand Down
1 change: 1 addition & 0 deletions src/lang/zh-CN/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'error-rename' => '名称重复,请重新输入!',
'error-file-empty' => '请选择档案!',
'error-file-exist' => '相同档名的档案已存在!',
'error-file-size' => '档案过大,无法上传! (档案大小上限: :max)',
'error-delete' => '文件夹未清空,无法删除!',
'error-folder-name' => '请输入文件夹名称!',
'error-folder-exist'=> '相同名称的文件夹已存在!',
Expand Down
1 change: 1 addition & 0 deletions src/lang/zh-TW/lfm.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'error-rename' => '名稱重複,請重新輸入!',
'error-file-empty' => '請選擇檔案!',
'error-file-exist' => '相同檔名的檔案已存在!',
'error-file-size' => '檔案過大,無法上傳! (檔案大小上限: :max)',
'error-delete' => '資料夾未清空,無法刪除!',
'error-folder-name' => '請輸入資料夾名稱!',
'error-folder-exist'=> '相同名稱的資料夾已存在!',
Expand Down

0 comments on commit 681b1ca

Please sign in to comment.