Merge pull request UniSharp#50 from tsawler/master

Merge from master
ana-lisboa · Jan 28, 2016 · fd99a04 · fd99a04
2 parents 1a568a8 + 44aeeb1
commit fd99a04
Show file tree

Hide file tree

Showing 24 changed files with 310 additions and 117 deletions.
diff --git a/src/config/lfm.php b/src/config/lfm.php
@@ -2,6 +2,7 @@
 
 return [
     'use_package_routes' => true,
+    'middleware' => 'auth',
 
     'images_dir'         => 'public/vendor/laravel-filemanager/images/',
     'images_url'         => '/vendor/laravel-filemanager/images/',

diff --git a/src/controllers/Controller.php b/src/controllers/Controller.php
@@ -0,0 +1,10 @@
+<?php namespace Tsawler\Laravelfilemanager\controllers;
+
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+
+abstract class Controller extends BaseController
+{
+    use DispatchesJobs, ValidatesRequests;
+}
diff --git a/src/controllers/CropController.php b/src/controllers/CropController.php
@@ -1,6 +1,6 @@
 <?php namespace Tsawler\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Tsawler\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;

diff --git a/src/controllers/DeleteController.php b/src/controllers/DeleteController.php
@@ -1,6 +1,6 @@
 <?php namespace Tsawler\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Tsawler\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;
@@ -42,18 +42,25 @@ public function getDelete()
 
         if ($base != "/")
         {
-            if (File::isDirectory(base_path() . "/" . $this->file_location . $to_delete))
+            if (File::isDirectory(base_path() . "/" . $this->file_location . $base . "/" . $to_delete))
             {
-                File::delete(base_path() . "/" . $this->file_location . $base . "/" . $to_delete);
+                // make sure the directory is empty
+                if (sizeof(File::files(base_path() . "/" . $this->file_location . $base . "/" . $to_delete)) == 0)
+                {
+                    File::deleteDirectory(base_path() . "/" . $this->file_location . $base . "/" . $to_delete);
 
-                return "OK";
+                    return "OK";
+                } else
+                {
+                    return "You cannot delete this folder because it is not empty!";
+                }
             } else
             {
                 if (File::exists(base_path() . "/" . $this->file_location . $base . "/" . $to_delete))
                 {
                     File::delete(base_path() . "/" . $this->file_location . $base . "/" . $to_delete);
 
-                    if (Session::get('lfm_type') == "Images'")
+                    if (Session::get('lfm_type') == "Images")
                         File::delete(base_path() . "/" . $this->file_location . $base . "/" . "thumbs/" . $to_delete);
 
                     return "OK";
@@ -85,9 +92,11 @@ public function getDelete()
                     if (Session::get('lfm_type') == "Images")
                         File::delete(base_path() . "/" . $this->file_location . "thumbs/" . $to_delete);
                     return "OK";
+                } else {
+                    return $file_name . " not found!";
                 }
             }
         }
     }
-    
+
 }
diff --git a/src/controllers/DownloadController.php b/src/controllers/DownloadController.php
@@ -1,6 +1,6 @@
 <?php namespace Tsawler\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Tsawler\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;

diff --git a/src/controllers/FolderController.php b/src/controllers/FolderController.php
@@ -1,6 +1,6 @@
 <?php namespace Tsawler\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Tsawler\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;

diff --git a/src/controllers/ItemsController.php b/src/controllers/ItemsController.php
@@ -1,6 +1,6 @@
 <?php namespace Tsawler\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Tsawler\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;

diff --git a/src/controllers/LfmController.php b/src/controllers/LfmController.php
@@ -1,6 +1,6 @@
 <?php namespace Tsawler\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Tsawler\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;

diff --git a/src/controllers/RenameController.php b/src/controllers/RenameController.php
@@ -1,6 +1,6 @@
 <?php namespace Tsawler\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Tsawler\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;

diff --git a/src/controllers/ResizeController.php b/src/controllers/ResizeController.php
@@ -1,6 +1,6 @@
 <?php namespace Tsawler\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Tsawler\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;

diff --git a/src/controllers/UploadController.php b/src/controllers/UploadController.php
@@ -1,6 +1,6 @@
 <?php namespace Tsawler\Laravelfilemanager\controllers;
 
-use App\Http\Controllers\Controller;
+use Tsawler\Laravelfilemanager\controllers\Controller;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Input;

diff --git a/src/lang/en/lfm.php b/src/lang/en/lfm.php
@@ -1,22 +1,52 @@
 <?php
 
 return [
-    'upload'       => 'Upload',
-    'thumbnails'   => 'Thumbnails',
-    'list'         => 'List',
-    'new_folder'   => 'New Folder',
-    'rename'       => 'Rename',
-    'delete'       => 'Delete',
-    'view'         => 'View',
-    'download'     => 'Download',
-    'resize'       => 'Resize',
-    'crop'         => 'Crop',
-    'item'         => 'Item',
-    'size'         => 'Size',
-    'type'         => 'Type',
-    'modified'     => 'Modified',
-    'action'       => 'Action',
-    'folder'       => 'Folder',
-    'empty_folder' => 'Folder is empty',
-
-];
+    'nav-upload'        => 'Upload',
+    'nav-thumbnails'    => 'Thumbnails',
+    'nav-list'          => 'List',
+
+    'menu-new'          => 'New Folder',
+    'menu-rename'       => 'Rename',
+    'menu-delete'       => 'Delete',
+    'menu-view'         => 'View',
+    'menu-download'     => 'Download',
+    'menu-resize'       => 'Resize',
+    'menu-crop'         => 'Crop',
+
+    'title-page'        => 'File Manager',
+    'title-panel'       => 'Laravel FileManager',
+    'title-upload'      => 'Upload File',
+    'title-view'        => 'View File',
+    'title-root'        => 'Files',
+    'title-item'        => 'Item',
+    'title-size'        => 'Size',
+    'title-type'        => 'Type',
+    'title-modified'    => 'Modified',
+    'title-action'      => 'Action',
+
+    'type-folder'       => 'Folder',
+
+    'message-empty'     => 'Folder is empty.',
+    'message-choose'    => 'Choose File',
+    'message-delete'    => 'Are you sure you want to delete this item?',
+    'message-name'      => 'Folder name:',
+    'message-rename'    => 'Rename to:',
+
+    'btn-upload'        => 'Upload File',
+    'btn-close'         => 'Close',
+    'btn-uploading'     => 'Uploading...',
+    'btn-crop'          => 'Crop',
+    'btn-cancel'        => 'Cancel',
+    'btn-resize'        => 'Resize',
+
+    'resize-ratio'      => 'Ratio:',
+    'resize-scaled'     => 'Image scaled:',
+    'resize-true'       => 'Yes',
+    'resize-old-height' => 'Original Height:',
+    'resize-old-width'  => 'Original Width:',
+    'resize-new-height' => 'Height:',
+    'resize-new-width'  => 'Width:',
+
+    'locale-bootbox'    => 'en',
+
+];
diff --git a/src/lang/fr/lfm.php b/src/lang/fr/lfm.php
@@ -1,21 +1,52 @@
 <?php
 
 return [
-    'upload'       => 'Charger',
-    'thumbnails'   => 'Vignettes',
-    'list'         => 'Liste',
-    'new_folder'   => 'Nouveau dossier',
-    'rename'       => 'Renommez',
-    'delete'       => 'Effacer',
-    'view'         => 'Voir le',
-    'download'     => 'Télécharger',
-    'resize'       => 'Redimensionner',
-    'crop'         => 'Récolte',
-    'item'         => 'Article',
-    'size'         => 'Taille du fichier',
-    'type'         => 'Type de fichier',
-    'modified'     => 'Date modifiée',
-    'action'       => 'Exécuter l’action',
-    'folder'       => 'Dossier',
-    'empty_folder' => 'Dossier est vide',
-];
+    'nav-upload'        => 'Charger',
+    'nav-thumbnails'    => 'Vignettes',
+    'nav-list'          => 'Liste',
+
+    'menu-new'          => 'Nouveau dossier',
+    'menu-rename'       => 'Renommez',
+    'menu-delete'       => 'Effacer',
+    'menu-view'         => 'Voir le',
+    'menu-download'     => 'Télécharger',
+    'menu-resize'       => 'Redimensionner',
+    'menu-crop'         => 'Récolte',
+
+    'title-page'        => '',
+    'title-panel'       => '',
+    'title-upload'      => '',
+    'title-view'        => '',
+    'title-root'        => '',
+    'title-item'        => 'Article',
+    'title-size'        => 'Taille du fichier',
+    'title-type'        => 'Type de fichier',
+    'title-modified'    => 'Date modifiée',
+    'title-action'      => 'Exécuter l’action',
+
+    'type-folder'       => 'Dossier',
+
+    'message-empty'     => 'Dossier est vide',
+    'message-choose'    => '',
+    'message-delete'    => '',
+    'message-name'      => '',
+    'message-rename'    => '',
+
+    'btn-upload'        => '',
+    'btn-close'         => '',
+    'btn-uploading'     => '',
+    'btn-crop'          => '',
+    'btn-cancel'        => '',
+    'btn-resize'        => '',
+
+    'resize-ratio'      => '',
+    'resize-scaled'     => '',
+    'resize-true'       => '',
+    'resize-old-height' => '',
+    'resize-old-width'  => '',
+    'resize-new-height' => '',
+    'resize-new-width'  => '',
+
+    'locale-bootbox'    => 'fr',
+
+];
diff --git a/src/lang/ru/lfm.php b/src/lang/ru/lfm.php
@@ -0,0 +1,59 @@
+<?php
+
+return [
+    'nav-upload'        => 'Загрузить',
+    'nav-thumbnails'    => 'Просмотр',
+    'nav-list'          => 'Список',
+
+    'menu-new'          => 'Новая папка',
+    'menu-rename'       => 'Переименовать',
+    'menu-delete'       => 'Удалить',
+    'menu-view'         => 'Просмотр',
+    'menu-download'     => 'Скачать',
+    'menu-resize'       => 'Размер изображения',
+    'menu-crop'         => 'Кадрирование',
+
+    'title-page'        => 'Файловый менеджер',
+    'title-panel'       => 'Файловый менеджер',
+    'title-upload'      => 'Загрузить файл',
+    'title-view'        => 'Просмотр',
+    'title-root'        => 'Файлы',
+    'title-shares'      => 'Общие файлы',
+    'title-item'        => 'Элемент',
+    'title-size'        => 'Размер изображения',
+    'title-type'        => 'Тип',
+    'title-modified'    => 'Изменен',
+    'title-action'      => 'Действие',
+
+    'type-folder'       => 'Папка',
+
+    'message-empty'     => 'Папка пуста.',
+    'message-choose'    => 'Выбрать файл',
+    'message-delete'    => 'Вы уверены, что хотите удалить этот элемент?',
+    'message-name'      => 'Название папки:',
+    'message-rename'    => 'Переименовать как:',
+
+    'error-rename'      => 'Файл с таким именем уже загружен!',
+    'error-file-empty'  => 'Вы должнв выбрать файл!',
+    'error-file-exist'  => 'Файл с таким именем уже загружен!',
+    'error-delete'      => 'Вы не можете удалить эту папку, потому что она не пуста!',
+    'error-folder-name' => 'Имя файла не должно быть пустым!',
+    'error-folder-exist'=> 'Папка с таким именем уже есть на сервере!',
+
+    'btn-upload'        => 'Загрузить файл',
+    'btn-close'         => 'Закрыть',
+    'btn-uploading'     => 'Загрузка...',
+    'btn-crop'          => 'Кадрировать',
+    'btn-cancel'        => 'Отмена',
+    'btn-resize'        => 'Изменить размер',
+
+    'resize-ratio'      => 'Соотношение сторон:',
+    'resize-scaled'     => 'Сохранять пропорции:',
+    'resize-true'       => 'Да',
+    'resize-old-height' => 'Исходная высота:',
+    'resize-old-width'  => 'Исходная ширина:',
+    'resize-new-height' => 'Высота:',
+    'resize-new-width'  => 'Ширина:',
+
+    'locale-bootbox'    => 'ru',
+];
diff --git a/src/lang/zh-TW/lfm.php b/src/lang/zh-TW/lfm.php
@@ -0,0 +1,52 @@
+<?php
+
+return [
+    'nav-upload'        => '上傳檔案',
+    'nav-thumbnails'    => '縮圖顯示',
+    'nav-list'          => '列表顯示',
+
+    'menu-new'          => '新增資料夾',
+    'menu-rename'       => '重新命名',
+    'menu-delete'       => '刪除',
+    'menu-view'         => '預覽',
+    'menu-download'     => '下載',
+    'menu-resize'       => '縮放',
+    'menu-crop'         => '裁剪',
+
+    'title-page'        => '檔案管理',
+    'title-panel'       => '檔案管理',
+    'title-upload'      => '上傳檔案',
+    'title-view'        => '預覽檔案',
+    'title-root'        => '我的檔案',
+    'title-item'        => '項目名稱',
+    'title-size'        => '檔案大小',
+    'title-type'        => '檔案類型',
+    'title-modified'    => '上次修改',
+    'title-action'      => '操作',
+
+    'type-folder'       => '資料夾',
+
+    'message-empty'     => '空的資料夾',
+    'message-choose'    => '選擇檔案',
+    'message-delete'    => '確定要刪除此項目嗎？',
+    'message-name'      => '資料夾名稱:',
+    'message-rename'    => '重新命名為:',
+
+    'btn-upload'        => '上傳',
+    'btn-close'         => '關閉',
+    'btn-uploading'     => '上傳中...',
+    'btn-crop'          => '裁剪',
+    'btn-cancel'        => '取消',
+    'btn-resize'        => '縮放',
+
+    'resize-ratio'      => '比例:',
+    'resize-scaled'     => '是否已縮放:',
+    'resize-true'       => '是',
+    'resize-old-height' => '原始高度:',
+    'resize-old-width'  => '原始寬度:',
+    'resize-new-height' => '目前高度:',
+    'resize-new-width'  => '目前寬度:',
+
+    'locale-bootbox'    => 'zh_TW',
+
+];