FIX: lots of bugfixes, sorry for ugly commit

app/Http/Controllers/Admin/FileManager/CreateNewDirectory.php

@@ -34,7 +34,7 @@ class CreateNewDirectory extends Controller
      *
      * @return $this|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
      */
-    public function postNew(Request $request)
+    public function store(Request $request)
     {
         // create new directory
         try {

app/Http/Controllers/Admin/FileManager/UploadFile.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Http\Controllers\Admin\FileManager;
 
+use App\CMS\Helpers\Path;
 use App\CMS\Helpers\Template;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\Request;
@@ -82,7 +83,7 @@ class UploadFile extends Controller
         return view('admin.snippets.ckEditorUploaded', [
             'ckEditor'   => Input::get('CKEditor'),
             'funcNumber' => Input::get('CKEditorFuncNum'),
-            'fileUrl'    => Template::upload($uploadedFile['filename'])
+            'fileUrl'    => Path::upload($uploadedFile['filename'])
         ]);
     }
 

app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php

@@ -14,17 +14,28 @@ class UploadedFilesOverview extends Controller
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function index(Directory $directory =null)
+    public function index(Directory $directory = null)
     {
         // include hidden directories?
         $includeHidden = Input::get('hidden');
 
-        $subdirectories = $includeHidden ? $directory->allSubdirectories : $directory->subdirectories;
+        if (!$directory->exists) {
+            $subdirectories = Directory::whereNull('parent_id');
+        } else {
+            $subdirectories = $directory->allSubdirectories();
+        }
+
+        if ($includeHidden === false) {
+            $subdirectories = $subdirectories->where('hidden', false);
+        }
+
+        $subdirectories = $subdirectories->get();
 
         return view('admin.fileManager.overview', [
-            'directory'      => $directory,
-            'subdirectories' => $subdirectories,
-            'newDirectory'   => new Directory()
+            'directory'       => $directory,
+            'subdirectories'  => $subdirectories,
+            'newDirectory'    => new Directory(),
+            'parentDirectory' => $directory
         ]);
     }
 }

app/Http/Controllers/Admin/Templates/EditTemplate.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Templates;
 
+use App\CMS\Contracts\Repositories\Template as TemplateRepositoryContract;
 use App\Http\Controllers\Controller;
 use App\Http\Requests;
 use App\Http\Requests\EditTemplateRequest;
@@ -24,17 +25,19 @@ class EditTemplate extends Controller
          * @var $template Template
          */
         $template = Template::findOrFail($template);
-        $path = $template->getPath();
+
+        $repo = app(TemplateRepositoryContract::class);
+        $repo->setModel($template);
 
         // load template content
-        $absolutePath = $template->getPathToTemplate();
+        $absolutePath = $repo->getPathToTemplate();
         $content = @file_get_contents($absolutePath);
 
         return view('admin.templates.edit', [
             'template'        => $template,
             'templateContent' => $content,
             'isWritable'      => is_writable(dirname($absolutePath)),
-            'path'            => $path,
+            'path'            => $template->templatePath,
         ]);
     }
 

app/Http/Controllers/Admin/Users/UserDetail.php

@@ -4,8 +4,8 @@ namespace App\Http\Controllers\Admin\Users;
 
 use App\CMS\Enumerations\UserRoles;
 use App\CMS\Enumerations\UserStates;
+use App\Cms\Repositories\ActionLog\Actions;
 use App\Http\Controllers\Admin\Controller;
-use App\Http\Requests;
 use App\Models\ActionLog\ActionLog;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
@@ -17,7 +17,7 @@ class UserDetail extends Controller
      */
     private $log;
 
-    function __construct(ActionLog $log)
+    function __construct(Actions $log)
     {
         $this->log = $log;
     }
@@ -38,10 +38,10 @@ class UserDetail extends Controller
         $states = UserStates::getWithTranslations();
 
         return view('admin.userManagement.detail', [
-            'user'   => $user,
+            'user'     => $user,
             'statuses' => $states,
-            'roles'  => $roles,
-            'actions' => $actions
+            'roles'    => $roles,
+            'actions'  => $actions
         ]);
     }
 }

app/Http/Controllers/Admin/Widgets/AssociateWidget.php

@@ -6,8 +6,8 @@ use App\Events\AssignWidget;
 use App\Events\RemoveWidgetFromArea;
 use App\Http\Controllers\Admin\Controller;
 use App\Models\Widgets\Widget;
-use App\Models\WidgetArea;
-use App\Models\WidgetInWidgetArea;
+use App\Models\Widgets\WidgetArea;
+use App\Models\Widgets\WidgetInWidgetArea;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Event;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;

app/Http/Controllers/Admin/Widgets/EditWidget.php

@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Controllers\Admin\Widgets;
 
+use App\CMS\Widgets\Exceptions\MissingParameterException;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditWidgetRequest;
 use App\Models\Widgets\Widget;
-use App\CMS\Widgets\Exceptions\MissingParameterException;
 use Illuminate\Support\Facades\Event;
 
 class EditWidget extends Controller
@@ -47,7 +47,7 @@ class EditWidget extends Controller
 
         // try to save this widget
         try {
-            $widget = call_user_func([$widget->widget_type_handler, 'save'], $widget, (object)$request->all());
+            $widget->settings = json_encode(call_user_func([$widget->widget_type_handler, 'save'], $request));
         } catch (MissingParameterException $e) {
             // user omitted some value
             return $this->invalidWidget($e->getMessage());
@@ -64,7 +64,7 @@ class EditWidget extends Controller
 
         // redirect with success notification
         return redirect()
-            ->route('widgets.overview')
+            ->back()
             ->with('success', trans('admin/widgets.successfullyEdited'));
     }