removed ckeditor upload function. anavel/uploads module responsibility

config/anavel.php

@@ -51,14 +51,6 @@
 
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | CKeditor uploads path
-    |--------------------------------------------------------------------------
-    |
-    */
-    'ckeditor_uploads_path' => 'uploads/ckeditor',
-
     /*
     |--------------------------------------------------------------------------
     | Modules

public/dist/css/custom.css

@@ -3,6 +3,6 @@
 }
 
 .img-preview img {
-    width: 200px;
-    height: 200px;
-}
+    width: 133px;
+    height: 133px;
+}

public/plugins/ckeditor/config.js

@@ -22,8 +22,7 @@ CKEDITOR.editorConfig = function( config ) {
 		{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
 		{ name: 'paragraph',   groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ] },
 		{ name: 'styles' },
-		{ name: 'colors' },
-		{ name: 'about' }
+		{ name: 'colors' }
 	];
 
 	// Remove some buttons provided by the standard plugins, which are
@@ -36,6 +35,10 @@ CKEDITOR.editorConfig = function( config ) {
 	// Simplify the dialog windows.
 	config.removeDialogTabs = 'image:advanced;link:advanced';
 
-    config.filebrowserBrowseUrl = $('body').data('ckeditor-file-browser-url');
-    config.filebrowserUploadUrl = $('body').data('ckeditor-file-uploader-url');
+	var customConfig = $('body').data('ckeditor');
+
+	config.removePlugins = customConfig.removePlugins;
+
+    config.filebrowserBrowseUrl = customConfig.fileBrowserUrl;
+    config.filebrowserUploadUrl = customConfig.fileUploaderUrl;
 };

src/Contracts/Anavel.php

@@ -10,4 +10,6 @@ public function register($provider);
     public function modules();
 
     public function activeModule();
+
+    public function hasModule($moduleProvider);
 }

src/Core/Anavel.php

@@ -81,4 +81,17 @@ public function activeModule()
 
         return null;
     }
+
+    public function hasModule($moduleProvider)
+    {
+        $hasModule = false;
+
+        foreach ($this->moduleProviders as $module) {
+            if ($module instanceof $moduleProvider) {
+                $hasModule = true;
+            }
+        }
+
+        return $hasModule;
+    }
 }

src/Http/Controllers/DefaultController.php

@@ -9,89 +9,4 @@ public function index()
     {
         return view(config('anavel.dashboard_view'));
     }
-
-    /**
-     * Store the files uploaded by ckeditor
-     *
-     * @param Request $request
-     * @return Response
-     */
-    public function ckeditorFileUploader(Request $request)
-    {
-        $url = '';
-        $message = '';
-
-        if ($request->hasFile('upload')) {
-            $fileName = uniqid() . '-' . $request->file('upload')->getClientOriginalName();
-
-            $request->file('upload')->move(
-                base_path(DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR . config('anavel.ckeditor_uploads_path')),
-                $fileName
-            );
-
-            $url = url(config('anavel.ckeditor_uploads_path')) . DIRECTORY_SEPARATOR . $fileName;
-        } elseif (! empty($request->file('upload')) && ! $request->file('upload')->isValid()) {
-            $message = $request->file('upload')->getErrorMessage();
-        }
-
-        return view('anavel::pages.ckeditor.uploader', [
-            'funcNum' => $request->get('CKEditorFuncNum'),
-            'url' => $url,
-            'message' => $message
-        ]);
-    }
-
-    public function ckeditorFileBrowser()
-    {
-        $base = public_path(config('anavel.ckeditor_uploads_path'));
-
-        if (!is_dir($base) && ! @mkdir($base, 0700, true)) {
-            throw new Exception(__('Folder %s not exists and can not be created', config('anavel.ckeditor_uploads_path')));
-        }
-
-        if (!is_dir($base)) {
-            throw new Exception(__('Folder %s not exists', config('anavel.ckeditor_uploads_path')));
-        } elseif (!is_writable($base)) {
-            throw new Exception(__('Folder %s has not write permissions', config('anavel.ckeditor_uploads_path')));
-        }
-
-        $dir = null;
-
-        list($files, $directories) = $this->getFilesDirectories($base, $dir, config('anavel.ckeditor_uploads_path'));
-
-        return view('anavel::pages.ckeditor.browser', [
-            'directories' => $directories,
-            'files' => $files
-        ]);
-    }
-
-    private function getFilesDirectories($base, $dir, $public)
-    {
-        if (substr($base, -1) !== DIRECTORY_SEPARATOR) {
-            $base = $base.DIRECTORY_SEPARATOR;
-        }
-
-        if (substr($public, -1) !== DIRECTORY_SEPARATOR) {
-            $public = $public.DIRECTORY_SEPARATOR;
-        }
-
-        $directories = $files = [];
-        foreach (glob($base.'*', GLOB_MARK) as $each) {
-            $each = str_replace($base, '', $each);
-            if (substr($each, -1) === '/') {
-                $directories[] = [
-                    'dir' => base64_encode($dir.$each),
-                    'slug' => base64_encode($each),
-                    'name' => $each,
-                ];
-            } else {
-                $files[] = [
-                    'slug' => base64_encode($each),
-                    'url' => asset($public.$each),
-                    'name' => $each,
-                ];
-            }
-        }
-        return [$files, $directories];
-    }
 }

src/Http/routes.php

@@ -27,8 +27,5 @@ function () {
                 return redirect()->route(config('anavel.profile_edit_route'), [config('anavel.profile_model_slug'), $id]);
             }
         ]);
-
-        Route::post('/ckeditor/file/uploader', ['as' => 'anavel.ckeditor.file-uploader', 'uses' => 'DefaultController@ckeditorFileUploader']);
-        Route::get('/ckeditor/file/browser', ['as' => 'anavel.ckeditor.file-browser', 'uses' => 'DefaultController@ckeditorFileBrowser']);
     }
 );

src/Providers/ViewComposersServiceProvider.php

@@ -21,6 +21,7 @@ public function boot()
      */
     public function register()
     {
+        $this->app->view->composer('anavel::layouts.master', 'Anavel\Foundation\View\Composers\MasterLayoutComposer');
         $this->app->view->composer('anavel::molecules.header.default', 'Anavel\Foundation\View\Composers\HeaderComposer');
         $this->app->view->composer('anavel::molecules.sidebar.default', 'Anavel\Foundation\View\Composers\SidebarComposer');
     }

src/View/Composers/MasterLayoutComposer.php

@@ -0,0 +1,35 @@
+<?php
+namespace Anavel\Foundation\View\Composers;
+
+use Anavel\Foundation\Contracts\Anavel;
+
+class MasterLayoutComposer
+{
+    protected $anavel;
+
+    public function __construct(Anavel $anavel)
+    {
+        $this->anavel = $anavel;
+    }
+
+    public function compose($view)
+    {
+        $uploadsModuleIsInstalled = $this->anavel->hasModule('Anavel\Uploads\UploadsModuleProvider');
+
+        $ckEditorData = [
+            'removePlugins'   => 'image',
+            'fileBrowserUrl'  => '',
+            'fileUploaderUrl' => '',
+        ];
+
+        if ($uploadsModuleIsInstalled) {
+            $ckEditorData['removePlugins'] = '';
+            $ckEditorData['fileBrowserUrl'] = route('anavel-uploads.ckeditor.file-browser');
+            $ckEditorData['fileUploaderUrl'] = route('anavel-uploads.ckeditor.file-uploader', ['_token' => csrf_token()]);
+        }
+
+        $view->with([
+            'ckEditorData' => json_encode($ckEditorData)
+        ]);
+    }
+}

views/layouts/master.blade.php

@@ -28,7 +28,7 @@
     </head>
 
     @section('body')
-    <body class="{{ config('anavel.layout_options') }} {{ config('anavel.skin') }} @section('body-classes')@show" data-ckeditor-file-browser-url="{{ route('anavel.ckeditor.file-browser') }}" data-ckeditor-file-uploader-url="{{ route('anavel.ckeditor.file-uploader', ['_token' => csrf_token()]) }}">
+    <body class="{{ config('anavel.layout_options') }} {{ config('anavel.skin') }} @section('body-classes')@show" data-ckeditor="{{ $ckEditorData }}">
         <div class="wrapper">
             @section('header')
                 @include('anavel::molecules.header.default')