diff --git a/src/Controllers/MediaManagerController.php b/src/Controllers/MediaManagerController.php index de15f2b..4be62d5 100644 --- a/src/Controllers/MediaManagerController.php +++ b/src/Controllers/MediaManagerController.php @@ -36,14 +36,14 @@ public function __construct() public function delete(Request $request) { $validation = Validator::make($request->all(), [ - 'path' => 'required', + 'path' => 'required', 'files' => 'required', ]); if ($validation->fails()) { return response()->json([ 'status' => 'error', - 'error' => implode(' / ', (array) $validation->errors()), + 'error' => implode(' / ', (array) $validation->errors()), ]); } $path = new Path($request->input('path')); @@ -141,11 +141,11 @@ public function mce(Request $request) } $data = [ - 'type' => $request->input('type', 'all'), - 'path' => $path ?? '/', - 'field' => $request->input('field'), + 'type' => $request->input('type', 'all'), + 'path' => $path ?? '/', + 'field' => $request->input('field'), 'return_type' => $request->input('return_type'), - 'selected' => $selected, + 'selected' => $selected, ]; return view('boilerplate-media-manager::index-mce', $data); @@ -174,15 +174,15 @@ public function newFolder(Request $request) public function paste(Request $request) { $validation = Validator::make($request->all(), [ - 'from' => 'required', - 'files' => 'required', + 'from' => 'required', + 'files' => 'required', 'destination' => 'required', ]); if ($validation->fails()) { return response()->json([ 'status' => 'error', - 'error' => implode(' / ', (array) $validation->errors()), + 'error' => implode(' / ', (array) $validation->errors()), ]); } @@ -212,10 +212,10 @@ public function rename(Request $request) } $validator = Validator::make($request->post(), [ - 'path' => 'required', - 'type' => ['required', Rule::in(['folder', 'file'])], + 'path' => 'required', + 'type' => ['required', Rule::in(['folder', 'file'])], 'fileName' => 'required', - 'newName' => 'required', + 'newName' => 'required', ]); if ($validator->fails()) { @@ -255,7 +255,7 @@ public function upload(Request $request) if ($validation->fails()) { return response()->json([ 'status' => 'error', - 'error' => $validation->errors()->first('file'), + 'error' => $validation->errors()->first('file'), ]); } diff --git a/src/Menu/BoilerplateMediaManager.php b/src/Menu/BoilerplateMediaManager.php index 54074fc..0cdcc2e 100644 --- a/src/Menu/BoilerplateMediaManager.php +++ b/src/Menu/BoilerplateMediaManager.php @@ -10,8 +10,8 @@ public function make(Builder $menu) { $menu->add(__('boilerplate-media-manager::menu.medialibrary'), [ 'permission' => 'media_manager', - 'icon' => 'images', - 'route' => 'mediamanager.index', ]) + 'icon' => 'images', + 'route' => 'mediamanager.index', ]) ->activeIfRoute('mediamanager.*') ->order(500); } diff --git a/src/Models/Directory.php b/src/Models/Directory.php index 27960e9..d6fdf63 100644 --- a/src/Models/Directory.php +++ b/src/Models/Directory.php @@ -86,13 +86,13 @@ public function toArray() { return [ 'download' => '', - 'isDir' => true, - 'type' => 'folder', - 'name' => basename($this->directory), - 'size' => '-', - 'link' => route('mediamanager.index', ['path' => $this->directory], false), - 'url' => $this->storage->url($this->directory), - 'time' => $this->getFileChangeTime(), + 'isDir' => true, + 'type' => 'folder', + 'name' => basename($this->directory), + 'size' => '-', + 'link' => route('mediamanager.index', ['path' => $this->directory], false), + 'url' => $this->storage->url($this->directory), + 'time' => $this->getFileChangeTime(), ]; } diff --git a/src/Models/File.php b/src/Models/File.php index 9c07a13..ffb5d26 100644 --- a/src/Models/File.php +++ b/src/Models/File.php @@ -188,19 +188,19 @@ public function toArray() $ts = filemtime($this->getFullPath()); return [ - 'download' => '', - 'icon' => $this->getIcon(), - 'thumb' => $this->getThumbUrl().'?'.$ts, - 'type' => $this->detectFileType(), - 'name' => basename($this->file), - 'filename' => $this->pathinfo['filename'], + 'download' => '', + 'icon' => $this->getIcon(), + 'thumb' => $this->getThumbUrl().'?'.$ts, + 'type' => $this->detectFileType(), + 'name' => basename($this->file), + 'filename' => $this->pathinfo['filename'], 'extension' => $this->pathinfo['extension'], - 'isDir' => false, - 'size' => $this->getFilesize(), - 'link' => route('mediamanager.index', ['path' => $this->file], false), - 'url' => $this->storage->url($this->file).'?'.$ts, - 'time' => $this->getFileChangeTime(), - 'ts' => $ts, + 'isDir' => false, + 'size' => $this->getFilesize(), + 'link' => route('mediamanager.index', ['path' => $this->file], false), + 'url' => $this->storage->url($this->file).'?'.$ts, + 'time' => $this->getFileChangeTime(), + 'ts' => $ts, ]; } diff --git a/src/Models/Path.php b/src/Models/Path.php index ff3bdee..6b840f1 100644 --- a/src/Models/Path.php +++ b/src/Models/Path.php @@ -137,7 +137,7 @@ private function formatDirectories($dirs = []) /** * Create a new folder in the current path. * - * @param $name + * @param $name */ public function newFolder($name) { @@ -207,7 +207,7 @@ public function upload($file, $fileName = null) /** * Delete a folder or a file in the current path. * - * @param $name + * @param $name * @return bool */ public function delete($name) @@ -236,7 +236,7 @@ public function delete($name) /** * Get relative path from root. * - * @param $path + * @param $path * @return mixed|string */ private function getRelativePath($path) diff --git a/src/config/mediamanager.php b/src/config/mediamanager.php index bc78cf3..826a00f 100644 --- a/src/config/mediamanager.php +++ b/src/config/mediamanager.php @@ -1,12 +1,12 @@ '/storage', + 'base_url' => '/storage', 'tinymce_upload_dir' => 'edition', - 'thumbs_dir' => 'thumbs', - 'hide_thumbs_dir' => true, - 'authorized' => [ - 'size' => '2048', + 'thumbs_dir' => 'thumbs', + 'hide_thumbs_dir' => true, + 'authorized' => [ + 'size' => '2048', 'mimes' => [// @see https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types) 'jpg', 'jpeg', @@ -34,32 +34,32 @@ 'wmv', ], ], - 'filetypes' => [// Recognized filetypes - 'image' => 'png|jpg|jpeg|gif|svg', - 'word' => 'doc|docx|odt', - 'excel' => 'xls|xlsx|ods', - 'ppt' => 'ppt|pptx', - 'pdf' => 'pdf', - 'code' => 'php|js|java|python|ruby|go|c|cpp|sql|m|h|json|html|aspx', + 'filetypes' => [// Recognized filetypes + 'image' => 'png|jpg|jpeg|gif|svg', + 'word' => 'doc|docx|odt', + 'excel' => 'xls|xlsx|ods', + 'ppt' => 'ppt|pptx', + 'pdf' => 'pdf', + 'code' => 'php|js|java|python|ruby|go|c|cpp|sql|m|h|json|html|aspx', 'archive' => 'zip|tar\.gz|rar|rpm', - 'txt' => 'txt|pac|log|md', - 'audio' => 'mp3|wav|flac|3pg|aa|aac|ape|au|m4a|mpc|ogg', - 'video' => 'mkv|rmvb|flv|mp4|avi|wmv|rm|asf|mpeg', + 'txt' => 'txt|pac|log|md', + 'audio' => 'mp3|wav|flac|3pg|aa|aac|ape|au|m4a|mpc|ogg', + 'video' => 'mkv|rmvb|flv|mp4|avi|wmv|rm|asf|mpeg', ], - 'icons' => [// Icons linked to filetypes - 'file' => 'file', // default - 'image' => 'file-image', - 'word' => 'file-word', - 'excel' => 'file-excel', - 'ppt' => 'file-powerpoint', - 'pdf' => 'file-pdf', - 'code' => 'file-code', + 'icons' => [// Icons linked to filetypes + 'file' => 'file', // default + 'image' => 'file-image', + 'word' => 'file-word', + 'excel' => 'file-excel', + 'ppt' => 'file-powerpoint', + 'pdf' => 'file-pdf', + 'code' => 'file-code', 'archive' => 'file-zip', - 'txt' => 'file-text', - 'audio' => 'file-audio', - 'video' => 'file-video', + 'txt' => 'file-text', + 'audio' => 'file-audio', + 'video' => 'file-video', ], - 'filter' => [ + 'filter' => [ '.gitignore', '.git', '.htaccess', diff --git a/src/migrations/2019_02_18_171649_permission.php b/src/migrations/2019_02_18_171649_permission.php index 2c96634..6e0d4e1 100755 --- a/src/migrations/2019_02_18_171649_permission.php +++ b/src/migrations/2019_02_18_171649_permission.php @@ -14,11 +14,11 @@ class Permission extends Migration public function up() { DB::table('permissions')->insert([ - 'name' => 'media_manager', + 'name' => 'media_manager', 'display_name' => 'boilerplate-media-manager::permissions.media_manager.display_name', - 'description' => 'boilerplate-media-manager::permissions.media_manager.description', - 'created_at' => date('Y-m-d H:i:s'), - 'updated_at' => date('Y-m-d H:i:s'), + 'description' => 'boilerplate-media-manager::permissions.media_manager.description', + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ]); } diff --git a/src/resources/lang/en/error.php b/src/resources/lang/en/error.php index 9eb6e97..fe27107 100644 --- a/src/resources/lang/en/error.php +++ b/src/resources/lang/en/error.php @@ -2,5 +2,5 @@ return [ 'notfound' => 'The folder does not exist', - 'back' => 'Back to the root folder', + 'back' => 'Back to the root folder', ]; diff --git a/src/resources/lang/en/list.php b/src/resources/lang/en/list.php index bb1e554..648a795 100644 --- a/src/resources/lang/en/list.php +++ b/src/resources/lang/en/list.php @@ -1,9 +1,9 @@ 'Name', - 'weight' => 'Weight', - 'type' => 'Type', - 'date' => 'Date', + 'name' => 'Name', + 'weight' => 'Weight', + 'type' => 'Type', + 'date' => 'Date', 'nocontent' => 'No content for the moment, click on upload to add medias', ]; diff --git a/src/resources/lang/en/menu.php b/src/resources/lang/en/menu.php index 08a0440..7cdeca3 100644 --- a/src/resources/lang/en/menu.php +++ b/src/resources/lang/en/menu.php @@ -2,12 +2,12 @@ return [ 'medialibrary' => 'Media library', - 'medialist' => 'Media listing', - 'view' => 'View', - 'rename' => 'Rename', - 'delete' => 'Delete', - 'upload' => 'Upload', - 'newFolder' => 'New folder', - 'paste' => 'Move here', - 'cancel' => 'Cancel', + 'medialist' => 'Media listing', + 'view' => 'View', + 'rename' => 'Rename', + 'delete' => 'Delete', + 'upload' => 'Upload', + 'newFolder' => 'New folder', + 'paste' => 'Move here', + 'cancel' => 'Cancel', ]; diff --git a/src/resources/lang/en/message.php b/src/resources/lang/en/message.php index d909822..ec1773e 100644 --- a/src/resources/lang/en/message.php +++ b/src/resources/lang/en/message.php @@ -6,11 +6,11 @@ 'success' => 'The deletion has been completed', ], 'folder' => [ - 'name' => 'Name of the folder', + 'name' => 'Name of the folder', 'success' => 'The folder has been created', ], 'rename' => [ - 'title' => 'Rename', + 'title' => 'Rename', 'success' => 'The renaming has been done', ], 'upload' => [ @@ -18,7 +18,7 @@ ], 'paste' => [ 'success' => 'Item(s) successfully moved', - 'files' => 'item(s) selected', + 'files' => 'item(s) selected', ], 'deletemedia' => 'Remove image ?', ]; diff --git a/src/resources/lang/en/permissions.php b/src/resources/lang/en/permissions.php index 971da00..385cb41 100644 --- a/src/resources/lang/en/permissions.php +++ b/src/resources/lang/en/permissions.php @@ -3,6 +3,6 @@ return [ 'media_manager' => [ 'display_name' => 'Media manager', - 'description' => 'User can access to the media manager and manage medias', + 'description' => 'User can access to the media manager and manage medias', ], ]; diff --git a/src/resources/lang/en/types.php b/src/resources/lang/en/types.php index e52ccdb..1a5ac6c 100644 --- a/src/resources/lang/en/types.php +++ b/src/resources/lang/en/types.php @@ -1,16 +1,16 @@ 'folder', - 'file' => 'file', - 'image' => 'image', - 'word' => 'word', - 'excel' => 'excel', - 'ppt' => 'powerpoint', - 'pdf' => 'pdf', - 'code' => 'text', + 'folder' => 'folder', + 'file' => 'file', + 'image' => 'image', + 'word' => 'word', + 'excel' => 'excel', + 'ppt' => 'powerpoint', + 'pdf' => 'pdf', + 'code' => 'text', 'archive' => 'archive', - 'txt' => 'text', - 'audio' => 'audio', - 'video' => 'video', + 'txt' => 'text', + 'audio' => 'audio', + 'video' => 'video', ]; diff --git a/src/resources/lang/fr/error.php b/src/resources/lang/fr/error.php index 6970cce..41a714e 100644 --- a/src/resources/lang/fr/error.php +++ b/src/resources/lang/fr/error.php @@ -2,5 +2,5 @@ return [ 'notfound' => "Le dossier n'existe pas", - 'back' => 'Revenir au dossier racine', + 'back' => 'Revenir au dossier racine', ]; diff --git a/src/resources/lang/fr/list.php b/src/resources/lang/fr/list.php index d14242d..92bddcd 100644 --- a/src/resources/lang/fr/list.php +++ b/src/resources/lang/fr/list.php @@ -1,9 +1,9 @@ 'Nom', - 'weight' => 'Poids', - 'type' => 'Type', - 'date' => 'Date', + 'name' => 'Nom', + 'weight' => 'Poids', + 'type' => 'Type', + 'date' => 'Date', 'nocontent' => 'Aucun contenu pour le moment, cliquez sur télécharger pour ajouter des médias', ]; diff --git a/src/resources/lang/fr/menu.php b/src/resources/lang/fr/menu.php index f336481..c797fa2 100644 --- a/src/resources/lang/fr/menu.php +++ b/src/resources/lang/fr/menu.php @@ -2,12 +2,12 @@ return [ 'medialibrary' => 'Médiathèque', - 'medialist' => 'Liste des médias', - 'view' => 'Voir', - 'rename' => 'Renommer', - 'delete' => 'Supprimer', - 'upload' => 'Télécharger', - 'newFolder' => 'Nouveau dossier', - 'paste' => 'Déplacer ici', - 'cancel' => 'Annuler', + 'medialist' => 'Liste des médias', + 'view' => 'Voir', + 'rename' => 'Renommer', + 'delete' => 'Supprimer', + 'upload' => 'Télécharger', + 'newFolder' => 'Nouveau dossier', + 'paste' => 'Déplacer ici', + 'cancel' => 'Annuler', ]; diff --git a/src/resources/lang/fr/message.php b/src/resources/lang/fr/message.php index c1c9764..878ef5f 100644 --- a/src/resources/lang/fr/message.php +++ b/src/resources/lang/fr/message.php @@ -6,11 +6,11 @@ 'success' => 'La suppression a été effectuée', ], 'folder' => [ - 'name' => 'Nom du dossier', + 'name' => 'Nom du dossier', 'success' => 'Le dossier a été créé', ], 'rename' => [ - 'title' => 'Renommer', + 'title' => 'Renommer', 'success' => 'Le renommage a été effectué', ], 'upload' => [ @@ -18,7 +18,7 @@ ], 'paste' => [ 'success' => 'Élément(s) correctement déplacé(s)', - 'files' => 'élément(s) sélectionné(s)', + 'files' => 'élément(s) sélectionné(s)', ], 'deletemedia' => "Déselectionner l'image ?", ]; diff --git a/src/resources/lang/fr/permissions.php b/src/resources/lang/fr/permissions.php index a360359..a5db757 100644 --- a/src/resources/lang/fr/permissions.php +++ b/src/resources/lang/fr/permissions.php @@ -3,6 +3,6 @@ return [ 'media_manager' => [ 'display_name' => 'Médiathèque', - 'description' => "L'utilisateur peut accéder à la médiathèque et y gérér les médias", + 'description' => "L'utilisateur peut accéder à la médiathèque et y gérér les médias", ], ]; diff --git a/src/resources/lang/fr/types.php b/src/resources/lang/fr/types.php index f59131c..4728bf4 100644 --- a/src/resources/lang/fr/types.php +++ b/src/resources/lang/fr/types.php @@ -1,16 +1,16 @@ 'dossier', - 'file' => 'fichier', - 'image' => 'image', - 'word' => 'word', - 'excel' => 'excel', - 'ppt' => 'powerpoint', - 'pdf' => 'pdf', - 'code' => 'texte', + 'folder' => 'dossier', + 'file' => 'fichier', + 'image' => 'image', + 'word' => 'word', + 'excel' => 'excel', + 'ppt' => 'powerpoint', + 'pdf' => 'pdf', + 'code' => 'texte', 'archive' => 'archive', - 'txt' => 'texte', - 'audio' => 'audio', - 'video' => 'vidéo', + 'txt' => 'texte', + 'audio' => 'audio', + 'video' => 'vidéo', ]; diff --git a/src/routes/boilerplate-media-manager.php b/src/routes/boilerplate-media-manager.php index adb85bf..57ea2a2 100755 --- a/src/routes/boilerplate-media-manager.php +++ b/src/routes/boilerplate-media-manager.php @@ -1,11 +1,11 @@ config('boilerplate.app.prefix', '').'/medias', - 'domain' => config('boilerplate.app.domain', ''), + 'prefix' => config('boilerplate.app.prefix', '').'/medias', + 'domain' => config('boilerplate.app.domain', ''), 'middleware' => ['web', 'boilerplatelocale', 'boilerplateauth', 'ability:admin,backend_access,media-manager'], - 'as' => 'mediamanager.', - 'namespace' => '\Sebastienheyd\BoilerplateMediaManager\Controllers', + 'as' => 'mediamanager.', + 'namespace' => '\Sebastienheyd\BoilerplateMediaManager\Controllers', ]; Route::group($default, function () {