FIX: fix content dependency on categories

.gitignore

@@ -1,3 +1,6 @@
+/modules
+/templates
+
 # published files from modules
 /public/modules
 /public/assets
@@ -9,9 +12,6 @@
 **/views/**/custom/*
 !**/views/**/custom/.gitkeep
 
-# module config - generated in ModuleManager service provider
-**/module.json
-
 # uploaded files
 /public/uploads/*
 !/public/uploads/.gitkeep
@@ -33,3 +33,4 @@
 /public/fonts
 /bower_components
 .sass-cache
+!/resources/views/vendor/

app/CMS/Enumerations/UserRoles.php

@@ -9,7 +9,7 @@ class UserRoles extends BaseEnumeration
     {
         $roles = [
             User::ROLE_ADMIN   => 'admin/userManagement.role_' . User::ROLE_ADMIN,
-            User::ROLE_EDITOR  => 'admin/userManagement.role_' . User::ROLE_EDITOR,
+//            User::ROLE_EDITOR  => 'admin/userManagement.role_' . User::ROLE_EDITOR,
             User::ROLE_VISITOR => 'admin/userManagement.role_' . User::ROLE_VISITOR
         ];
 

app/CMS/Handlers/AdminHandler.php

@@ -1,19 +1,17 @@
 <?php
+
 namespace App\CMS\Handlers;
 
 use App\CMS\Contracts\Modules\AppHandler;
-use App\Http\Controllers\Controller;
+use App\Models\FileManager\File;
-use App\Models\Content\Content;
 
 /**
  * Class Handler
- *
  * Handler is a class which handles module-specific behaviour which cannot be done by module itself, resp. cannot be
  * done by some abstract magic.
- *
  * @package App\CMS\Handlers\
  */
-abstract class Handler extends BaseHandler implements AppHandler
+abstract class AdminHandler extends BaseHandler implements AppHandler
 {
     public static function getHistoryHandler()
     {
@@ -22,24 +20,36 @@ abstract class Handler extends BaseHandler implements AppHandler
 
     public static function getExtendedFormSections()
     {
-        return [
+        $formParts = [
             'basicInfo'   => trans('admin/contents.basicInfo'),
             'meta'        => trans('admin/contents.metaOptions'),
             'publication' => trans('admin/contents.publicationOptions'),
             'appearance'  => trans('admin/contents.appearance'),
             'files'       => trans('admin/contents.files')
         ];
+
+        if (\Auth::user()->cannot('upload', File::class)) {
+            unset($formParts['files']);
+        }
+
+        return $formParts;
     }
 
     public static function getExtendedFormInputsCreate()
     {
-        return [
+        $formParts = [
             'basicInfo'   => 'admin.content.formParts.basicInformation',
             'meta'        => 'admin.content.formParts.metaInformation',
             'publication' => 'admin.content.formParts.publicationSetup',
             'appearance'  => 'admin.content.formParts.appearance',
             'files'       => 'admin.content.formParts.files'
         ];
+
+        if (\Auth::user()->cannot('upload', File::class)) {
+            unset($formParts['files']);
+        }
+
+        return $formParts;
     }
 
     public static function getExtendedFormInputsEdit()

app/CMS/Handlers/BaseHandler.php

@@ -1,16 +1,24 @@
 <?php
+
 namespace App\CMS\Handlers;
 
 use App\CMS\Contracts\Modules\BaseModuleHandler;
 use App\CMS\Enumerations\TemplatePathsHumanReadableRootOnly;
 use App\CMS\Enumerations\WidgetTypes;
+use App\CMS\Repositories\Module;
+use App\Models\ActionLog\ActionLog;
+use App\Models\Content\Content;
+use App\Models\FileManager\File;
+use App\Models\Settings;
+use App\Models\Templates\Template;
 use App\Models\User;
+use App\Models\Widgets\Widget;
+use App\Models\Widgets\WidgetArea;
 
 abstract class BaseHandler implements BaseModuleHandler
 {
     /**
      * Register admin menu (or multiple ones)
-     *
      * This cannot be in ServiceProvider because Session is started at middleware. And ServiceProvider is called before
      * starting any middleware..
      *
@@ -25,84 +33,108 @@ abstract class BaseHandler implements BaseModuleHandler
         }
 
         // create instance of main menu
-        \Menu::create('mainMenu', function ($menu) {
+        \Menu::create('mainMenu', function ($menu) use ($user) {
             //            $menu->route('admin.dashboard', trans('admin/mainMenu.dashboard'), [], 10, ['icon' => 'fa fa-fw fa-dashboard']);
 
             /**
              * Content pages
-             *
              * Submenus can be registered later
              */
-            $menu->dropdown(trans('admin/mainMenu.contentPages'), function ($sub) {
+            $contentModules = app(Module::class)->getContentModules();
-                $sub->route('content.overview', trans('admin/mainMenu.contentPageOverview'), [], 10000, ['icon' => 'fa fa-fw fa-list']);
+
-            }, 20, ['icon' => 'fa fa-fw fa-database']);
+            if ($user->can('manage', Content::class) && !$contentModules->isEmpty()) {
+                $menu->dropdown(trans('admin/mainMenu.contentPages'), function ($sub) {
+                    $sub->route('content.overview', trans('admin/mainMenu.contentPageOverview'), [], 10000, ['icon' => 'fa fa-fw fa-list']);
+                }, 20, ['icon' => 'fa fa-fw fa-database']);
+            }
 
             /**
              * File manager
              */
-            $menu->route('upload.overview', trans('admin/mainMenu.fileManager'), [], 40, ['icon' => 'fa fa-fw fa-folder']);
+            if ($user->can('manage', File::class)) {
+                $menu->route('upload.overview', trans('admin/mainMenu.fileManager'), [], 40, ['icon' => 'fa fa-fw fa-folder']);
+            }
 
             /**
              * Widgets and widget areas
              */
-            $menu->dropdown(trans('admin/mainMenu.widgets'), function ($sub) {
+            if ($user->can('manage', Widget::class) || $user->can('manage', WidgetArea::class)) {
-                // create list of all widget types
+                $menu->dropdown(trans('admin/mainMenu.widgets'), function ($sub) use ($user) {
-                $widgets = WidgetTypes::getWithTranslations();
+                    // create list of all widget types
+                    $widgets = WidgetTypes::getWithTranslations();
 
-                if (!empty($widgets)) {
+                    if (!empty($widgets) && $user->can('create', Widget::class)) {
-                    $sub->dropdown(trans('admin/mainMenu.newWidget'), function ($sub) use ($widgets) {
+                        $sub->dropdown(trans('admin/mainMenu.newWidget'), function ($sub) use ($widgets) {
-                        $i = 1;
+                            $i = 1;
-                        foreach ($widgets as $type => $name) {
+                            foreach ($widgets as $type => $name) {
-                            $sub->route('widgets.new', $name, ['type' => $type], $i++);
+                                $sub->route('widgets.new', $name, ['type' => $type], $i++);
-                        }
+                            }
-                    }, 10, ['icon' => 'fa fa-fw fa-plus']);
+                        }, 10, ['icon' => 'fa fa-fw fa-plus']);
-                }
+                    }
+                    if ($user->can('manage', Widget::class)) {
+                        $sub->route('widgets.overview', trans('admin/mainMenu.widgetsOverview'), [], 20, ['icon' => 'fa fa-fw fa-list']);
+                    }
 
-                $sub->route('widgets.overview', trans('admin/mainMenu.widgetsOverview'), [], 20, ['icon' => 'fa fa-fw fa-list']);
+                    // menu for widget areas
-
+                    if ($user->can('manage', WidgetArea::class)) {
-                // menu for widget areas
+                        $sub->dropdown(trans('admin/mainMenu.widgetAreas'), function ($sub) use ($user) {
-                $sub->dropdown(trans('admin/mainMenu.widgetAreas'), function ($sub) {
+                            if ($user->can('create', WidgetArea::class)) {
-                    $sub->route('widgetareas.new', trans('admin/mainMenu.newWidgetArea'), [], 1, ['icon' => 'fa fa-fw fa-plus']);
+                                $sub->route('widgetareas.new', trans('admin/mainMenu.newWidgetArea'), [], 1, ['icon' => 'fa fa-fw fa-plus']);
-                    $sub->route('widgetareas.overview', trans('admin/mainMenu.widgetAreaOverview'), [], 2, ['icon' => 'fa fa-fw fa-list']);
+                            }
-                }, 50, ['icon' => 'fa fa-fw fa-object-group']);
+                            $sub->route('widgetareas.overview', trans('admin/mainMenu.widgetAreaOverview'), [], 2, ['icon' => 'fa fa-fw fa-list']);
-            }, 50, ['icon' => 'fa fa-fw fa-puzzle-piece']);
+                        }, 50, ['icon' => 'fa fa-fw fa-object-group']);
+                    }
+                }, 50, ['icon' => 'fa fa-fw fa-puzzle-piece']);
+            }
 
             /**
              * Divide system entries and other links in menu
              */
             $menu->addDivider(9999);
 
-            $menu->dropdown(trans('admin/mainMenu.system'), function ($sub) {
+            $menu->dropdown(trans('admin/mainMenu.system'), function ($sub) use ($user) {
 
                 /**
                  * User management
                  */
-                $sub->dropdown(trans('admin/mainMenu.userManagement'), function ($sub) {
+                if ($user->can('manage', User::class)) {
-                    $sub->route('users.new', trans('admin/mainMenu.newUser'), [], 10, ['icon' => 'fa fa-fw fa-user-plus']);
+                    $sub->dropdown(trans('admin/mainMenu.userManagement'), function ($sub) use ($user) {
-                    $sub->route('users.overview', trans('admin/mainMenu.usersOverview'), [], 30, ['icon' => 'fa fa-fw fa-users']);
+                        if ($user->can('create', User::class)) {
-                }, 20, ['icon' => 'fa fa-fw fa-users']);
+                            $sub->route('users.new', trans('admin/mainMenu.newUser'), [], 10, ['icon' => 'fa fa-fw fa-user-plus']);
+                        }
+                        $sub->route('users.overview', trans('admin/mainMenu.usersOverview'), [], 30, ['icon' => 'fa fa-fw fa-users']);
+                    }, 20, ['icon' => 'fa fa-fw fa-users']);
+                }
 
                 /**
                  * Templates
                  */
-                $templatePaths = TemplatePathsHumanReadableRootOnly::getWithTranslations();
+                if ($user->can('manage', Template::class)) {
-                if (!empty($templatePaths)) {
+                    $templatePaths = TemplatePathsHumanReadableRootOnly::getWithTranslations();
-                    $sub->dropdown(trans('admin/mainMenu.templates'), function ($sub) use ($templatePaths) {
+                    if (!empty($templatePaths)) {
-                        $i = 1;
+                        $sub->dropdown(trans('admin/mainMenu.templates'), function ($sub) use ($templatePaths) {
-                        foreach ($templatePaths as $id => $name) {
+                            $i = 1;
-                            $sub->route('templates.overview', $name, ['id' => $id], $i++);
+                            foreach ($templatePaths as $id => $name) {
-                        }
+                                $sub->route('templates.overview', $name, ['id' => $id], $i++);
-                    }, 60, ['icon' => 'fa fa-fw fa-file-code-o']);
+                            }
+                        }, 60, ['icon' => 'fa fa-fw fa-file-code-o']);
+                    }
                 }
 
-                $sub->route('log.overview', trans('admin/mainMenu.actionLog'), [], 70, ['icon' => 'fa fa-fw fa-history']);
+                if ($user->can('manage', ActionLog::class)) {
-                $sub->route('settings.overview', trans('admin/mainMenu.settings'), [], 80, ['icon' => 'fa fa-fw fa-gear']);
+                    $sub->route('log.overview', trans('admin/mainMenu.actionLog'), [], 70, ['icon' => 'fa fa-fw fa-history']);
+                }
+
+                if ($user->can('manage', Settings::class)) {
+                    $sub->route('settings.overview', trans('admin/mainMenu.settings'), [], 80, ['icon' => 'fa fa-fw fa-gear']);
+                    $sub->route('permissions.index', trans('admin/mainMenu.permissions'), [], 90, ['icon' => 'fa fa-fw fa-key']);
+                }
             }, 10000, ['icon' => 'fa fa-fw fa-gears']);
         });
 
         // create menu with user profile
-        \Menu::create('profileMenu', function ($menu) {
+        \Menu::create('profileMenu', function ($menu) use ($user) {
-            $menu->route('users.detail', trans('admin/userManagement.profile'), [], 10, ['icon' => 'fa fa-fw fa-user icon']);
+            $menu->route('users.detail', trans('admin/userManagement.profile'), ['user' => $user], 10, ['icon' => 'fa fa-fw fa-user icon']);
             $menu->addDivider(999);
             $menu->route('logout', trans('admin/common.logout'), [], 1000, ['icon' => 'fa fa-fw fa-power-off icon']);
         });

app/CMS/Handlers/History.php

@@ -17,8 +17,7 @@ class History implements HistoryHandler
         switch ($changeset->column) {
             case 'pageContent':
                 $route = route('history.diff', [
-                    'revision' => $changeset->edit_batch,
+                    'revision'       => $changeset->id
-                    'id'       => $changeset->id
                 ]);
 
                 return "(<a href='" . $route . "'>" . trans('admin/history.diff') . "</a>)";
@@ -48,8 +47,8 @@ class History implements HistoryHandler
                 break;
             default:
                 return trans('admin/history.changedFromTo', [
-                    'from' => is_null($changeset->old_value) ? trans('admin/history.emptyValue') : $changeset->old_value,
+                    'from' => empty($changeset->old_value) ? trans('admin/history.emptyValue') : $changeset->old_value,
-                    'to'   => is_null($changeset->new_value) ? trans('admin/history.emptyValue') : $changeset->new_value,
+                    'to'   => empty($changeset->new_value) ? trans('admin/history.emptyValue') : $changeset->new_value,
                 ]);
                 break;
         }

app/CMS/Handlers/Search/Content.php

@@ -1,7 +1,10 @@
 <?php
+
 namespace App\CMS\Handlers\Search;
 
 use App\Models\Content\Content as ContentModel;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
 
 class Content extends Search
 {
@@ -10,10 +13,15 @@ class Content extends Search
      *
      * @param string $term searched word
      *
-     * @return array list of found objects
+     * @return array|\Illuminate\Database\Eloquent\Collection|Collection|static[]
      */
     public function search($term)
     {
+        if (Auth::user()
+                ->cannot('manage', ContentModel::class)) {
+            return new Collection();
+        }
+
         $token = $this->tokenize($term);
 
         return ContentModel::where('pageContent', 'LIKE', $token)

app/CMS/Handlers/Search/Files.php

@@ -1,7 +1,9 @@
 <?php
+
 namespace App\CMS\Handlers\Search;
 
 use App\Models\FileManager\File;
+use Illuminate\Support\Collection;
 
 class Files extends Search
 {
@@ -24,6 +26,11 @@ class Files extends Search
      */
     public function search($term)
     {
+        if (\Auth::user()
+                 ->cannot('manage', File::class)) {
+            return new Collection();
+        }
+
         $token = $this->tokenize($term);
 
         return File::where('original_filename', 'LIKE', $token)

app/CMS/Handlers/Search/Presenters/AdminContent.php

@@ -3,11 +3,17 @@ namespace App\CMS\Handlers\Search\Presenters;
 
 use App\CMS\Enumerations\ContentStatuses;
 use App\CMS\Handlers\Contracts\SearchPresenterHandler;
+use App\Models\Content\Content;
 
 class AdminContent implements SearchPresenterHandler
 {
     public function render($foundItems)
     {
+        if (\Auth::user()
+                ->cannot('manage', Content::class)) {
+            return null;
+        }
+
         return view('admin.search.results.content', [
             'pages'    => $foundItems,
             'statuses' => ContentStatuses::getWithTranslations(),

app/CMS/Handlers/Search/Presenters/AdminFiles.php

@@ -2,6 +2,7 @@
 namespace App\CMS\Handlers\Search\Presenters;
 
 use App\CMS\Handlers\Contracts\SearchPresenterHandler;
+use App\Models\FileManager\File;
 
 class AdminFiles implements SearchPresenterHandler
 {
@@ -14,6 +15,11 @@ class AdminFiles implements SearchPresenterHandler
      */
     public function render($foundItems)
     {
+        if (\Auth::user()
+                 ->cannot('manage', File::class)) {
+            return null;
+        }
+
         return view('admin.fileManager.filesTiles', ['files' => $foundItems, 'hideDelete' => true]);
     }
 }

app/CMS/Helpers/Settings.php

@@ -2,6 +2,7 @@
 
 namespace App\CMS\Helpers;
 
+use App\CMS\Repositories\Settings\Settings as SettingsRepository;
 use App\Models\Settings as SettingsModel;
 use Illuminate\Support\Facades\Cache;
 
@@ -78,8 +79,7 @@ class Settings
     {
         if (!self::$initialized) {
             self::$settings = Cache::remember('settings', config('cache.settingCacheLifetime'), function () {
-                $model = new SettingsModel();
+                return app(SettingsRepository::class)->getAll();
-                return $model->getAll();
             });
         }
     }

app/CMS/Helpers/WidgetAreas.php

@@ -3,7 +3,6 @@
 namespace App\CMS\Helpers;
 
 use App\CMS\Repositories\Widgets\WidgetArea as WidgetAreaRepository;
-use App\Models\Widgets\WidgetArea;
 use Illuminate\Support\Facades\Cache;
 
 class WidgetAreas
@@ -27,9 +26,6 @@ class WidgetAreas
 
     protected static function loadWidgetArea($uniqueCode)
     {
-        WidgetArea::where('code', $uniqueCode)
-                  ->increment('viewed');
-
         $widgets = Cache::remember('widget-area-' . $uniqueCode, setting('widgetCacheLifetime', 5), function () use ($uniqueCode) {
             $widgetArea = app(\App\CMS\Repositories\Widgets\WidgetArea::class);
 
@@ -69,12 +65,20 @@ class WidgetAreas
             self::initWidgetAreas();
         }
 
-//        dd($uniqueCode);
-
         if (!isset(self::$widgetAreas[$uniqueCode])) {
             self::loadWidgetArea($uniqueCode);
         }
 
         echo isset(self::$widgetAreas[$uniqueCode]) ? self::$widgetAreas[$uniqueCode] : null;
     }
+
+    /**
+     * Get list of loaded widgets and areas
+     *
+     * @return array
+     */
+    public static function getLoadedWidgets()
+    {
+        return ['areas' => array_keys(self::$widgetAreas)];
+    }
 }

app/CMS/MenuPresenters/MetismenuPresenter.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\CMS\MenuPresenters;
 
 use Nwidart\Menus\MenuItem;
@@ -27,6 +28,10 @@ class MetismenuPresenter extends Presenter
      */
     public function getMenuWithoutDropdownWrapper($item)
     {
+        if (!is_string($item->getUrl())) {
+            return null;
+        }
+
         return '<li' . $this->getActiveState($item) . '><a href="' . $item->getUrl() . '">' . $item->getIcon() . ' ' . $item->title . '</a></li>' . PHP_EOL;
     }
 

app/CMS/ModuleManager/Installer.php

@@ -1,12 +1,14 @@
 <?php
-namespace App\ModuleManager;
+
+namespace App\CMS\ModuleManager;
 
 use App\CMS\Contracts\Modules\AppHandler;
 use App\CMS\Contracts\Modules\TemplateHandler;
 use App\Models\Module;
 use Illuminate\Support\Facades\App;
 
-class Installer {
+class Installer
+{
     /**
      * Create new module in database
      *
@@ -20,7 +22,7 @@ class Installer {
      * @return Module
      * @throws \ErrorException
      */
-    public static function install($name, $alias, $description, $handler, $parentModuleId, $settings)
+    public static function install($name, $alias, $staticName, $description, $handler, $parentModuleId, $settings)
     {
         // check if user does not want to install module in runtime
         if (!App::runningInConsole()) {
@@ -39,17 +41,18 @@ class Installer {
 
         // insert module into database
         $module = Module::create([
-                                          'name'               => $name,
+                                     'name'               => $name,
-                                          'description'        => $description,
+                                     'description'        => $description,
-                                          'handler'            => $handler,
+                                     'handler'            => $handler,
-                                          'manages_content'    => $managesContent,
+                                     'static_name'        => $staticName,
-                                          'support_categories' => $supportCategories,
+                                     'manages_content'    => $managesContent,
-                                          'alias'              => $alias,
+                                     'support_categories' => $supportCategories,
-                                          'module_settings'    => $settings,
+                                     'alias'              => $alias,
-                                          'parent_id'          => $parentModuleId ? $parentModuleId : null,
+                                     'module_settings'    => $settings,
-                                          'enabled'            => 1,
+                                     'parent_id'          => $parentModuleId ? $parentModuleId : null,
-                                          'is_template'        => $isTemplate
+                                     'enabled'            => 1,
-                                      ]);
+                                     'is_template'        => $isTemplate
+                                 ]);
 
         // install something module-specific
         if ($handler && is_callable([$handler, 'install'])) {

app/CMS/ModuleManager/Providers/ModuleManager.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace App\ModuleManager\Providers;
+namespace App\CMS\ModuleManager\Providers;
 
-use App\Models\Module;
+use App\CMS\Repositories\Module as ModuleRepository;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\ServiceProvider;
 
 class ModuleManager extends ServiceProvider
@@ -15,11 +14,8 @@ class ModuleManager extends ServiceProvider
     public function boot()
     {
         // this service provider needs published config - config is merged right after this service provider
-        $modules = Cache::rememberForever('enabled-modules', function () {
+        $modules = app(ModuleRepository::class)->getOnlyModules();
-            return Module::where('enabled', true)
+
-                         ->where('is_template', false)
-                         ->get();
-        });
 
         // iterate over all modules and enable or disable them
         foreach ($modules as $module) {
@@ -32,7 +28,7 @@ class ModuleManager extends ServiceProvider
             // include files (if any)
             if (isset($module->module_settings['files']) && !empty($module->module_settings['files'])) {
                 foreach ($module->module_settings['files'] as $file) {
-                    include config('modules.paths.modules') . '/' . $module->module_settings['staticName'] . '/' . $file;
+                    include config('modules.paths.modules') . '/' . $module->static_name . '/' . $file;
                 }
             }
         }

app/CMS/ModuleManager/Uninstaller.php

@@ -1,5 +1,5 @@
 <?php
-namespace  App\ModuleManager;
+namespace  App\CMS\ModuleManager;
 
 use App\Models\Module;
 use App\Models\Templates\TemplatePath;

app/CMS/Modules/Stubs/Handlers/$Module$Handler.stub

@@ -2,10 +2,10 @@
 
 namespace Modules\$ModuleNamespace$\Handlers;
 
-use App\CMS\Handlers\Handler;
+use App\CMS\Handlers\BaseHandler;
 use App\Models\User;
 
-class $Module$Handler extends Handler
+class $Module$Handler extends BaseHandler
 {
     /**
      * Register admin menu

app/CMS/Repositories/Content/Content.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\CMS\Repositories\Content;
 
 use App\CMS\Contracts\Repositories\Content as IContent;
@@ -113,6 +114,7 @@ class Content extends Repository implements IContent
                              ->whereNull('contents.deleted_at')
                              ->where('contents.language', LaravelLocalization::getCurrentLocale())
                              ->where('modules.enabled', 1)
+                             ->with('module')
                              ->orderBy('contents.created_at', 'DESC');
 
         // filter results using handler

app/CMS/Repositories/Module.php

@@ -1,9 +1,11 @@
 <?php
+
 namespace App\CMS\Repositories;
 
 use App\CMS\Contracts\Repositories\Module as IModule;
 use App\Models\Content\Content;
 use App\Models\Module as ModuleModel;
+use Illuminate\Support\Facades\Cache;
 
 class Module extends Repository implements IModule
 {
@@ -26,6 +28,15 @@ class Module extends Repository implements IModule
         }
     }
 
+    public function getContentModules()
+    {
+        return Cache::remember('enabled-content-modules', 3600, function () {
+            return ModuleModel::where('enabled', true)
+                       ->where('manages_content', true)
+                       ->get();
+        });
+    }
+
     public function getCreateContentTitle(ModuleModel $module)
     {
         $pageHeading = trans('admin/contents.new', ['name' => trans($module->name)]);
@@ -52,8 +63,19 @@ class Module extends Repository implements IModule
 
     public function all()
     {
-        return ModuleModel::where('enabled', true)
+        return Cache::rememberForever('enabled-modules-and-template', function () {
-                          ->get();
+            return ModuleModel::where('enabled', true)
+                              ->get();
+        });
+    }
+
+    public function getOnlyModules()
+    {
+        return Cache::rememberForever('enabled-modules', function () {
+            return ModuleModel::where('enabled', true)
+                              ->where('is_template', false)
+                              ->get();
+        });
     }
 
     public function getByHandler($handler)

app/CMS/Repositories/Permissions/Permission.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\CMS\Repositories\Permissions;
+
+use App\Models\Permissions\Permission as PermissionModel;
+
+class Permission
+{
+    public function getRootPermissions()
+    {
+        return PermissionModel::whereNull('parent_id')
+                              ->with('subpermissions')
+                              ->get();
+    }
+}

app/CMS/Repositories/Settings/Settings.php

@@ -1,27 +1,27 @@
 <?php
-namespace App\Models\ModelTraits;
+
+namespace App\CMS\Repositories\Settings;
 
 use App\Models\Settings as SettingsModel;
+use Illuminate\Support\Facades\Cache;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
-trait Settings
+class Settings
 {
     /**
      * Prepares common query for selecting settings
-     *
      * @return mixed
      */
     protected function getSettingsQuery()
     {
         return SettingsModel::select(['key', 'value', 'language'])
-                       ->where('language', LaravelLocalization::getCurrentLocale())
+                            ->where('language', LaravelLocalization::getCurrentLocale())
-                       ->orWhere('language', null)
+                            ->orWhere('language', null)
-                       ->orderBy('language', 'ASC');
+                            ->orderBy('language', 'ASC');
     }
 
     /**
      * Load all settings
-     *
      * @return \stdClass
      */
     public function getAll()
@@ -34,7 +34,6 @@ trait Settings
 
     /**
      * Get all settings with language info
-     *
      * @return \stdClass
      */
     public function getAllWithLanguage()
@@ -55,7 +54,6 @@ trait Settings
 
     /**
      * Load only config for views
-     *
      * @return \stdClass
      */
     public function getForView()
@@ -83,4 +81,31 @@ trait Settings
 
         return $data;
     }
+
+    /**
+     * Save settings
+     *
+     * @param array $data
+     */
+    public function save(array $data)
+    {
+        $commonSettings = isset($data['commonSettings']) ? $data['commonSettings'] : [];
+        unset($data['commonSettings']);
+
+        foreach ($data as $key => $value) {
+            // select language for this setting key
+            $language = isset($commonSettings[$key]) ? null : LaravelLocalization::getCurrentLocale();
+            $setting = SettingsModel::firstOrNew(['language' => $language, 'key' => $key]);
+
+            if ($setting->value == $value) {
+                continue;
+            }
+
+            // set value and save or delete
+            $setting->value = $value;
+            empty($value) ? $setting->delete() : $setting->save();
+        }
+
+        Cache::forget('settings');
+    }
 }

app/CMS/Repositories/Templates/Template.php

@@ -1,10 +1,12 @@
 <?php
+
 namespace App\Cms\Repositories\Templates;
 
 use App\CMS\Contracts\Repositories\Template as ITemplate;
 use App\CMS\Repositories\Repository;
 use App\Models\Module;
 use App\Models\Templates\Template as TemplateModel;
+use Illuminate\Support\Facades\Cache;
 
 class Template extends Repository implements ITemplate
 {
@@ -68,8 +70,10 @@ class Template extends Repository implements ITemplate
 
     public function getForModule(Module $module)
     {
-        return TemplateModel::where('module_id', $module->id)
+        return Cache::rememberForever('templates-for-module', function () use ($module) {
-                            ->select(['template_name', 'name', 'description'])
+            return TemplateModel::where('module_id', $module->id)
-                            ->get();
+                                ->select(['template_name', 'name', 'description'])
+                                ->get();
+        });
     }
 }

app/CMS/Widgets/Menu/Menu.php

@@ -8,6 +8,7 @@ use App\CMS\Contracts\Widgets\WidgetRenderer;
 use App\CMS\Widgets\Exceptions\MissingParameterException;
 use App\Http\Requests\Request;
 use App\Models\Content\Content;
+use Illuminate\Support\Facades\Cache;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 use Modules\Blog\Article\Handlers\Article;
 
@@ -15,7 +16,6 @@ class Menu implements PublicWidget
 {
     /**
      * Name getter
-     *
      * @return string
      */
     public static function getName()
@@ -25,7 +25,6 @@ class Menu implements PublicWidget
 
     /**
      * Getter for description
-     *
      * @return string
      */
     public static function getDescription()
@@ -35,7 +34,6 @@ class Menu implements PublicWidget
 
     /**
      * Getter for presenter/renderer of this widget
-     *
      * @return WidgetRenderer
      */
     public static function getPresenter()
@@ -75,16 +73,19 @@ class Menu implements PublicWidget
             $allowedStatuses[] = IContent::STATUS_PROTECTED;
         }
 
-        $pages = Content::where('language', LaravelLocalization::getCurrentLocale())
+        return Cache::remember('widget-menu-content-pages', 5, function () use ($ids, $allowedStatuses) {
-                        ->whereIn('id', $ids)
+            $pages = Content::where('language', LaravelLocalization::getCurrentLocale())
-                        ->whereIn('status', $allowedStatuses)
+                            ->whereIn('id', $ids)
-                        ->where('moduleHandler', '!=', Article::class)
+                            ->whereIn('status', $allowedStatuses)
-                        ->get();
+                            ->where('moduleHandler', '!=', Article::class)
-        $used = [];
+                            ->get();
-        foreach ($pages as $page) {
-            $used[$page->id] = $page;
-        }
 
-        return $used;
+            $used = [];
+            foreach ($pages as $page) {
+                $used[$page->id] = $page;
+            }
+
+            return $used;
+        });
     }
 }

app/Console/Commands/Modules/CreateNew.php

@@ -38,6 +38,9 @@ class CreateNew extends Command
             return;
         }
 
+        if (!is_dir($path))
+            mkdir($path);
+
         // copy stub files
         \File::copyDirectory(config('modules.paths.stubs'), $path);
 

app/Console/Commands/Modules/DisableModule.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Console\Commands\Modules;
+
+use App\Models\Module;
+use Illuminate\Console\Command;
+
+class DisableModule extends Command
+{
+    /**
+     * The name and signature of the console command.
+     * @var string
+     */
+    protected $signature = 'module:disable {module}';
+    /**
+     * The console command description.
+     * @var string
+     */
+    protected $description = 'Disable module';
+
+    /**
+     * Execute the console command.
+     * @return mixed
+     */
+    public function handle()
+    {
+        $moduleName = $this->argument('module');
+        $module = Module::where('static_name', $moduleName)
+                        ->firstOrFail();
+
+        if ($module->has_submodules) {
+            $submodules = $module->submodules;
+
+            foreach ($submodules as $submodule) {
+                $this->call('module:disable', ['module' => $submodule->static_name]);
+            }
+        }
+
+        $module->enabled = false;
+        $module->save();
+
+        \Cache::forget('enabled-modules');
+        \Cache::forget('enabled-modules-and-template');
+
+        $this->line('Module ' . $module->static_name . ' disabled.');
+    }
+}

app/Console/Commands/Modules/EnableModule.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Console\Commands\Modules;
+
+use App\Models\Module;
+use Illuminate\Console\Command;
+
+class EnableModule extends Command
+{
+    /**
+     * The name and signature of the console command.
+     * @var string
+     */
+    protected $signature = 'module:enable {module}';
+    /**
+     * The console command description.
+     * @var string
+     */
+    protected $description = 'Enable module';
+
+    /**
+     * Execute the console command.
+     * @return mixed
+     */
+    public function handle()
+    {
+        $moduleName = $this->argument('module');
+        $module = Module::where('static_name', $moduleName)
+                        ->firstOrFail();
+
+        if ($module->has_submodules) {
+            $submodules = $module->submodules;
+
+            foreach ($submodules as $submodule) {
+                $this->call('module:enable', ['module' => $submodule->static_name]);
+            }
+        }
+
+        if ($module->parent_id) {
+            $module->parent->update(['enabled' => true]);
+        }
+
+        $module->enabled = true;
+        $module->save();
+
+        \Cache::forget('enabled-modules');
+        \Cache::forget('enabled-modules-and-template');
+
+        $this->line('Module ' . $module->static_name . ' enabled.');
+    }
+}

app/Console/Commands/Modules/InstallModule.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands\Modules;
 
+use App\CMS\ModuleManager\Installer;
 use App\Models\Module;
-use App\ModuleManager\Installer;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Support\Facades\Cache;
@@ -15,13 +15,11 @@ class InstallModule extends Command
 {
     /**
      * The name and signature of the console command.
-     *
      * @var string
      */
     protected $signature = 'module:install {name} {parentModuleId?}';
     /**
      * The console command description.
-     *
      * @var string
      */
     protected $description = 'Custom installation of CMS module. Name given as directory name in /modules.';
@@ -31,7 +29,6 @@ class InstallModule extends Command
 
     /**
      * Create a new command instance.
-     *
      * @return void
      */
     public function __construct()
@@ -56,8 +53,9 @@ class InstallModule extends Command
         // get config
         $config = $this->loadConfig();
 
-        if (empty($config))
+        if (empty($config)) {
             return;
+        }
 
         // check if it is valid
         $this->checkMandatoryFields($config);
@@ -69,14 +67,15 @@ class InstallModule extends Command
         Cache::forget('enabled-modules');
         Cache::forget('module-handler-to-id-enumeration');
 
+        exec('composer dump-autoload');
+
         // inform user
-        $this->line('Module ' . $name . ' successfuly installed');
+        $this->line('Module ' . $name . ' successfuly installed.');
     }
 
     /**
      * Load config from Config/config.php in module files. We cannot use config() because the file have not published
      * yet.
-     *
      * @return array
      * @throws FileNotFoundException
      */
@@ -85,8 +84,9 @@ class InstallModule extends Command
         $basePath = $this->modulesPath . DIRECTORY_SEPARATOR . $this->moduleName . DIRECTORY_SEPARATOR;
         $path = $basePath . 'Config' . DIRECTORY_SEPARATOR . 'config.php';
 
-        if (basename($basePath) == 'Database')
+        if (basename($basePath) == 'Database') {
             return [];
+        }
 
         // check if module has Config/config.php file
         if (!file_exists($path)) {
@@ -121,7 +121,6 @@ class InstallModule extends Command
 
     /**
      * Installs module into database.
-     *
      * This method calls Module::install, which handles specific installation of module. In this way we should be able
      * to install any module even with some other database structures.
      *
@@ -155,13 +154,12 @@ class InstallModule extends Command
         if (is_null($module)) {
             // insert module into database
             $settings = [
-                'staticName' => $this->moduleName,
+                'providers' => $providers,
-                'providers'  => $providers,
+                'order'     => isset($config['order']) ? $config['order'] : 0,
-                'order'      => isset($config['order']) ? $config['order'] : 0,
+                'files'     => isset($config['files']) ? $config['files'] : []
-                'files'      => isset($config['files']) ? $config['files'] : []
             ];
 
-            $module = Installer::install($name, $alias, $description, $handler, $this->parentModuleId, $settings);
+            $module = Installer::install($name, $alias, $this->moduleName, $description, $handler, $this->parentModuleId, $settings);
         }
 
         // try to install submodules

app/Console/Commands/Modules/ModuleMigrate.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Console\Commands\Modules;
+
+use App\Models\Module;
+use Illuminate\Console\Command;
+
+class ModuleMigrate extends Command
+{
+    /**
+     * The name and signature of the console command.
+     * @var string
+     */
+    protected $signature = 'module:migrate {module}';
+    /**
+     * The console command description.
+     * @var string
+     */
+    protected $description = 'Run migrations in specified module';
+
+    /**
+     * Execute the console command.
+     * @return mixed
+     */
+    public function handle()
+    {
+        $moduleName = $this->argument('module');
+        $module = Module::where('static_name', $moduleName)
+                        ->firstOrFail();
+
+        if ($module->has_submodules) {
+            $submodules = $module->submodules;
+
+            foreach ($submodules as $submodule) {
+                $this->call('module:migrate', ['module' => $submodule->static_name]);
+            }
+        }
+
+        $this->line('Migrating ' . $module->static_name);
+        $this->call('migrate', ['--path' => config('modules.paths.modules').'/'.$moduleName.'/Database']);
+    }
+}

app/Console/Commands/Modules/UninstallModule.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class UninstallModule extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'command:name';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //
+    }
+}

app/Console/Commands/SetTemplate.php

@@ -2,9 +2,9 @@
 
 namespace App\Console\Commands;
 
+use App\CMS\ModuleManager\Installer;
+use App\CMS\ModuleManager\Uninstaller;
 use App\Models\Module;
-use App\ModuleManager\Installer;
-use App\ModuleManager\Uninstaller;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Cache;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -45,7 +45,7 @@ class SetTemplate extends Command
         $config['staticName'] = $template;
 
         if ($current) {
-            $this->line('Template is already installed. Currently using template ' . trans($current->name) . ' located in /templates/' . $current->module_settings['staticName'] . '.');
+            $this->line('Template is already installed. Currently using template ' . trans($current->name) . ' located in /templates/' . $current->static_name . '.');
             $confirm = $this->confirm('Uninstall it and install *' . trans($config['name']) . '*? All data associated with installed template will be lost!');
 
             if ($confirm) {
@@ -59,7 +59,7 @@ class SetTemplate extends Command
         }
 
         try {
-            Installer::install($config['name'], $config['alias'], $config['description'], $config['handler'], false, $config);
+            Installer::install($config['name'], $config['alias'], $config['staticName'], $config['description'], $config['handler'], false, $config);
         } catch (\Exception $e) {
             $this->error('Cannot install template ' . $template . '. Message: ' . $e->getMessage());
             return;

app/Console/Kernel.php

@@ -3,6 +3,9 @@
 namespace App\Console;
 
 use App\Console\Commands\Modules\CreateNew;
+use App\Console\Commands\Modules\DisableModule;
+use App\Console\Commands\Modules\EnableModule;
+use App\Console\Commands\Modules\ModuleMigrate;
 use App\Console\Commands\PublishTemplateResources;
 use App\Console\Commands\TemplateInfo;
 use Illuminate\Console\Scheduling\Schedule;
@@ -12,13 +15,15 @@ class Kernel extends ConsoleKernel
 {
     /**
      * The Artisan commands provided by your application.
-     *
      * @var array
      */
     protected $commands = [
         Commands\NewUser::class,
         Commands\ChangePassword::class,
         CreateNew::class,
+        ModuleMigrate::class,
+        EnableModule::class,
+        DisableModule::class,
         Commands\Modules\InstallModule::class,
         Commands\Modules\InstallAllModules::class,
         Commands\TranslateDirectory::class,

app/Events/UploadFile.php

@@ -2,37 +2,33 @@
 
 namespace App\Events;
 
+use App\Models\FileManager\File as FileModel;
 use Illuminate\Queue\SerializesModels;
-use Symfony\Component\HttpFoundation\File\File;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class UploadFile extends Event
 {
     use SerializesModels;
-    /**
-     * @var UploadedFile
-     */
     public $uploadedFile;
     /**
-     * @var
+     * @var FileModel
      */
-    public $id;
+    public $file;
 
     /**
      * Create a new event instance.
      *
-     * @param File $uploadedFile
+     * @param FileModel                    $file
-     * @param      $id
+     * @param                              $id
+     *
+     * @internal param File $uploadedFile
      */
-    public function __construct(File $uploadedFile, $id)
+    public function __construct(FileModel $file)
     {
-        $this->uploadedFile = $uploadedFile;
+        $this->file = $file;
-        $this->id = $id;
     }
 
     /**
      * Get the channels the event should be broadcast on.
-     *
      * @return array
      */
     public function broadcastOn()

app/Http/Controllers/Admin/Contents/ContentOverview.php

@@ -46,10 +46,13 @@ class ContentOverview extends Controller
         // get homepage - for checking if homepage is set and available
         $homepage = $this->content->getHomepage();
 
+        $contentModules = app(\App\CMS\Repositories\Module::class)->getContentModules();
+
         return view('admin.content.overview', [
             'pages'       => $pages,
             'homepage'    => $homepage,
             'pageHeading' => $pageHeading,
+            'contentModules' => $contentModules,
             'statuses'    => ContentStatuses::getWithTranslations(),
             'module'      => isset($module) ? $module : null
         ]);

app/Http/Controllers/Admin/Contents/CreateNewContent.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Http\Controllers\Admin\Contents;
 
 use App\CMS\Contracts\Repositories\Content as IContent;
@@ -11,13 +12,12 @@ use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\CreateNewContentRequest;
 use App\Http\Requests\Request;
 use App\Models\Module;
+use Illuminate\Support\Collection;
 use Modules\Categories\Contracts\Repositories\Category as ICategory;
 
 /**
  * Class CreateNewContent
- *
  * Controller for creating new content page.
- *
  * @package App\Http\Controllers\Admin\Contents
  */
 class CreateNewContent extends Controller
@@ -30,10 +30,6 @@ class CreateNewContent extends Controller
      * @var IModuleRepository
      */
     private $module;
-    /**
-     * @var ICategory
-     */
-    private $category;
     /**
      * @var ITemplate
      */
@@ -41,23 +37,20 @@ class CreateNewContent extends Controller
 
     /**
      * CreateNewContent constructor.
-     *
      * Sets File and Content models into class variables
      *
      * @param IContent|Content  $content
      * @param IModuleRepository $module
      * @param ICategory         $category
-     *
      * @param ITemplate         $template
      *
      * @internal param File $file
      */
-    public function __construct(IContent $content, IModuleRepository $module, ICategory $category, ITemplate $template)
+    public function __construct(IContent $content, IModuleRepository $module, ITemplate $template)
     {
         parent::__construct();
         $this->content = $content;
         $this->module = $module;
-        $this->category = $category;
         $this->template = $template;
     }
 
@@ -73,7 +66,11 @@ class CreateNewContent extends Controller
         $statuses = ContentStatuses::getWithTranslations();
         $pageHeading = $this->module->getCreateContentTitle($module);
         $templates = $this->template->getForModule($module);
-        $categories = $this->category->getForModule($module);
+
+        $categories = new Collection();
+        if (class_exists(ICategory::class)) {
+            $categories = app(ICategory::class)->getForModule($module);
+        }
 
         $page = $this->content->getOne();
 

app/Http/Controllers/Admin/Contents/EditContent.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Http\Controllers\Admin\Contents;
 
 use App\CMS\Contracts\Repositories\Content as IContent;
@@ -6,19 +7,15 @@ use App\CMS\Contracts\Repositories\Module as IModuleRepository;
 use App\CMS\Contracts\Repositories\Template as ITemplate;
 use App\CMS\Enumerations\ContentStatuses;
 use App\Cms\Handlers\Interactions\Interaction;
-use App\CMS\Helpers\CurrentTemplate;
 use App\Cms\Interactions\Admin\Content\EditContent as EditContentInteraction;
-use App\Events\AttemptToEditInvalidContent;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditContentRequest;
 use App\Http\Requests\Request;
 use App\Models\Content\Content;
 use App\Models\Content\ContentHistory;
 use App\Models\FileManager\File;
-use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Collection;
 use Modules\Categories\Contracts\Repositories\Category as ICategory;
-use Modules\Categories\Repositories\Category;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class EditContent extends Controller
 {
@@ -38,10 +35,6 @@ class EditContent extends Controller
      * @var IModuleRepository
      */
     private $module;
-    /**
-     * @var ICategory
-     */
-    private $category;
     /**
      * @var ITemplate
      */
@@ -49,7 +42,6 @@ class EditContent extends Controller
 
     /**
      * EditContent constructor.
-     *
      * Load ContentHistory and File into this controller
      *
      * @param ContentHistory    $history
@@ -59,13 +51,12 @@ class EditContent extends Controller
      * @param ICategory         $category
      * @param ITemplate         $template
      */
-    public function __construct(ContentHistory $history, File $file, IContent $content, IModuleRepository $module, Category $category, ITemplate $template)
+    public function __construct(ContentHistory $history, File $file, IContent $content, IModuleRepository $module, ITemplate $template)
     {
         $this->history = $history;
         $this->file = $file;
         $this->content = $content;
         $this->module = $module;
-        $this->category = $category;
         $this->template = $template;
     }
 
@@ -84,9 +75,13 @@ class EditContent extends Controller
         $module = $this->module->getByHandler($page->moduleHandler);
         $pageHeading = $this->module->getUpdateContentTitle($module, $page);
         $templates = $this->template->getForModule($module);
-        $categories = $this->category->getForModule($module);
         $history = $this->history->getStructuredHistoryOf($page);
 
+        $categories = new Collection();
+        if (class_exists(ICategory::class)) {
+            $categories = app(ICategory::class)->getForModule($module);
+        }
+
         // render view
         return view('admin.content.edit', [
             'pageHeading'      => $pageHeading,
@@ -94,7 +89,8 @@ class EditContent extends Controller
             'page'             => $page,
             'module'           => $module,
             'categories'       => $categories,
-            'rootPages'        => $this->content->getOverview()->get(),
+            'rootPages'        => $this->content->getOverview()
+                                                ->get(),
             'templates'        => $templates,
             'formSectionNames' => $this->module->call($module, 'getExtendedFormSections'),
             'formSections'     => $this->module->call($module, 'getExtendedFormInputsEdit'),

app/Http/Controllers/Admin/Dashboard/Dashboard.php

@@ -2,13 +2,22 @@
 
 namespace App\Http\Controllers\Admin\Dashboard;
 
+use App\CMS\Contracts\Repositories\Module;
 use App\Http\Controllers\Admin\Controller;
-use Illuminate\Http\Request;
+use App\Models\Content\Content;
+use Illuminate\Support\Facades\Auth;
 
 class Dashboard extends Controller
 {
-    public function index(Request $request)
+    public function index()
     {
-        return redirect()->route('content.overview');
+        $contentModules = app(Module::class)->getContentModules();
+
+        if (\Auth::user()
+                 ->can('manage', Content::class) && !$contentModules->isEmpty()) {
+            return redirect()->route('content.overview');
+        } else {
+            return redirect()->route('users.detail', ['user' => Auth::user()]);
+        }
     }
 }

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

@@ -1,8 +1,8 @@
 <?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;
 use App\Models\FileManager\File;

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

@@ -32,8 +32,6 @@ class UploadedFilesOverview extends Controller
      */
     public function index(Directory $directory = null)
     {
-//        dd($directory);
-
         // include hidden directories?
         $subdirectories = $this->directoryRepository->getAllSubdirectories($directory);
 

app/Http/Controllers/Admin/Login.php

@@ -1,87 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\Http\Requests\LoginRequest;
-use App\Models\User;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
-
-/**
- * Class Login
- *
- * @package App\Http\Controllers\Admin
- *
- * @todo    use trait ThrottlesLogins for disabling brutal-force password cracking
- */
-class Login extends Controller
-{
-    /**
-     * Display login form
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function getLogin()
-    {
-        return view('admin.loginForm');
-    }
-
-    /**
-     * Login handler
-     *
-     * @param LoginRequest $request
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function postLogin(LoginRequest $request)
-    {
-        $email = $request->email;
-
-        // try to find user
-        $user = User::where('email', $email)
-                    ->where('role', '!=', User::ROLE_VISITOR)
-                    ->where('status', User::STATE_ACTIVE)
-                    ->first();
-
-        if (!$user) {
-            return $this->loginFailed();
-        }
-
-        // try to log in user
-        if (Hash::check($request->password, $user->password)) {
-            Auth::login($user);
-
-            $redirect = $request->redirectTo ? $request->redirectTo : route('admin.dashboard');
-
-            return redirect()->intended($redirect);
-        }
-
-        // login invalid, redirect and inform the user
-        return $this->loginFailed();
-    }
-
-    /**
-     * Logs out user
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function logout()
-    {
-
-        // remove user information
-        \Auth::logout();
-
-        // redirect to login form with info about successfull logout
-        return redirect()
-            ->route('login')
-            ->with('success', trans('admin/common.logoutSuccessfull'));
-    }
-
-    private function loginFailed()
-    {
-        return redirect()
-            ->route('login')
-            ->with('error', trans('auth.failed'))
-            ->withInput();
-    }
-}

app/Http/Controllers/Admin/Permissions.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Request;
+use App\Models\Permissions\Permission;
+
+class Permissions extends Controller
+{
+    /**
+     * Display all permissions
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index()
+    {
+        $permissions = Permission::whereNull('parent_id')->get();
+
+        return view('admin/permissions.index', compact('permissions'));
+    }
+
+    /**
+     * Setup default permissions
+     *
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function setDefault(Request $request)
+    {
+        Permission::where('default', true)
+                  ->update(['default' => false]);
+
+        $permissions = $request->permissions;
+
+        Permission::whereIn('string_id', array_keys($permissions))
+                  ->update(['default' => true]);
+
+        return redirect()
+            ->back()
+            ->with('success', trans('admin/permissions.defaultSuccessfullySet'));
+    }
+}

app/Http/Controllers/Admin/Search.php

@@ -13,7 +13,6 @@ class Search extends Controller
 {
     /**
      * Create form for searching
-     *
      * @return $this|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function getSearch()
@@ -37,7 +36,6 @@ class Search extends Controller
 
     /**
      * Method used for performing search.
-     *
      * This method iterates over all registered search engines and returns results for each engine apart.
      *
      * @param string $term search text
@@ -60,10 +58,16 @@ class Search extends Controller
             // try to find given term
             $results = $search->search($term);
 
+            $content = $presenter->render($results);
+
+            if (is_null($content)) {
+                continue;
+            }
+
             // create result object
             $resultsParts[$search->getId()] = [
                 'name'    => $search->getName(),
-                'content' => $presenter->render($results),
+                'content' => $content,
                 'count'   => count($results)
             ];
         }

app/Http/Controllers/Admin/Settings.php

@@ -2,15 +2,15 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\CMS\Repositories\Settings\Settings as SettingsRepository;
 use App\Http\Requests;
 use App\Models\Settings as SettingsModel;
 use Illuminate\Support\Facades\App;
-use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 class Settings extends Controller
 {
     /**
-     * @var SettingsModel
+     * @var SettingsRepository
      */
     protected $settings;
 
@@ -19,14 +19,13 @@ class Settings extends Controller
      *
      * @param SettingsModel $settings
      */
-    public function __construct(SettingsModel $settings)
+    public function __construct(SettingsRepository $settings)
     {
         $this->settings = $settings;
     }
 
     /**
      * Get overview (with form) for editing settings
-     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function getOverview()
@@ -45,7 +44,6 @@ class Settings extends Controller
 
     /**
      * Save all settings (ignore empty ones)
-     *
      * When settings used to be non-empty string and user deletes it, key is also deleted from database
      *
      * @param Requests\SaveSettingsRequest $request
@@ -54,25 +52,7 @@ class Settings extends Controller
      */
     public function saveSettings(Requests\SaveSettingsRequest $request)
     {
-        $data = $request->all();
+        $this->settings->save($request->except(['_token']));
-        $commonSettings = isset($data['commonSettings']) ? $data['commonSettings'] : [];
-
-        // remove CSRF token field
-        unset($data['_token'], $data['commonSettings']);
-
-        foreach ($data as $key => $value) {
-            // select language for this setting key
-            $language = isset($commonSettings[$key]) ? null : LaravelLocalization::getCurrentLocale();
-            $setting = SettingsModel::firstOrNew(['language' => $language, 'key' => $key]);
-
-            if ($setting->value == $value) {
-                continue;
-            }
-
-            // set value and save or delete
-            $setting->value = $value;
-            empty($value) ? $setting->delete() : $setting->save();
-        }
 
         return redirect()
             ->route('settings.overview')

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

@@ -8,8 +8,11 @@ use App\CMS\Repositories\Users\User as UserRepository;
 use App\Events\EditUser as EditUserEvent;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditUserRequest;
+use App\Http\Requests\Request;
+use App\Models\Permissions\Permission;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
 
 class EditUser extends Controller
@@ -39,7 +42,7 @@ class EditUser extends Controller
     public function getEditUser(User $user = null)
     {
         // when no user specified, lets assume we want to edit "me"
-        if (!$user->exists()) {
+        if (!$user->exists) {
             $user = Auth::user();
         }
 
@@ -82,4 +85,34 @@ class EditUser extends Controller
             ->back()
             ->with('success', trans('admin/userManagement.userSuccessfullyEdited'));
     }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  int                      $id
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function setPermissions(Request $request, User $user)
+    {
+        $permissionIds = $request->get('permissions', []);
+        $permissions = Permission::whereIn('string_id', array_keys($permissionIds))
+                                 ->get();
+
+        DB::transaction(function () use ($user, $permissions) {
+            // remove all permissions
+            $user->permissions()
+                 ->detach();
+
+            foreach ($permissions as $permission) {
+                $user->permissions()
+                     ->attach($permission->id);
+            }
+        });
+
+        return redirect()
+            ->back()
+            ->with('success', trans('admin/permissions.successfullySet'));
+    }
 }

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

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin\Users;
 use App\CMS\Enumerations\UserRoles;
 use App\CMS\Enumerations\UserStates;
 use App\Cms\Repositories\ActionLog\Actions;
+use App\CMS\Repositories\Permissions\Permission;
 use App\Http\Controllers\Admin\Controller;
 use App\Models\ActionLog\ActionLog;
 use App\Models\User;
@@ -25,19 +26,21 @@ class UserDetail extends Controller
     public function getDetail(User $user = null)
     {
         // when no user specified, lets assume we want to edit "me"
-        if (!$user->exists()) {
+        if (!$user->exists) {
-            $id = Auth::user();
+            $user = Auth::user();
         }
 
         $actions = $this->log->getUserActions($user->id, 10);
         $roles = UserRoles::getWithTranslations();
         $states = UserStates::getWithTranslations();
+        $permissions = app(Permission::class)->getRootPermissions();
 
         return view('admin.userManagement.detail', [
-            'user'     => $user,
+            'user'        => $user,
-            'statuses' => $states,
+            'statuses'    => $states,
-            'roles'    => $roles,
+            'roles'       => $roles,
-            'actions'  => $actions
+            'actions'     => $actions,
+            'permissions' => $permissions
         ]);
     }
 }

app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php

@@ -40,7 +40,6 @@ class EditWidgetArea extends Controller
      */
     public function edit(WidgetArea $widgetArea)
     {
-        return view("test");
         $associatedWidgetIds = WidgetInWidgetArea::getWidgetIdsFromArea($widgetArea->id);
         $widgets = Widget::where('language', LaravelLocalization::getCurrentLocale())
                          ->paginate(25);

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

@@ -1,17 +1,25 @@
 <?php
+
 namespace App\Http\Controllers\Admin\Widgets;
 
 use App\Http\Controllers\Admin\Controller;
 use App\Models\Widgets\Widget;
+use App\Models\Widgets\WidgetType;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 class WidgetsOverview extends Controller
 {
+    /**
+     * Display list of all widgets
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
     public function index()
     {
         $widgets = Widget::where('language', LaravelLocalization::getCurrentLocale())
                          ->paginate(25);
 
-        return view('admin.widgets.overview', ['widgets' => $widgets]);
+        $widgetTypes = WidgetType::all();
+
+        return view('admin.widgets.overview', compact('widgetTypes', 'widgets'));
     }
 }

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+
+class ForgotPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset emails and
+    | includes a trait which assists in sending these notifications from
+    | your application to your users. Feel free to explore this trait.
+    |
+    */
+
+    use SendsPasswordResetEmails;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+}

app/Http/Controllers/Auth/LoginController.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Session;
+
+class LoginController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Login Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles authenticating users for the application and
+    | redirecting them to your home screen. The controller uses a trait
+    | to conveniently provide its functionality to your applications.
+    |
+    */
+
+    use AuthenticatesUsers;
+
+    /**
+     * Where to redirect users after login.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/admin';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest')->except('logout');
+    }
+
+    public function logout() {
+        Auth::logout();
+        return redirect()->route('login');
+    }
+}

app/Http/Controllers/Auth/RegisterController.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use App\Models\User;
+use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Support\Facades\Validator;
+
+class RegisterController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Register Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles the registration of new users as well as their
+    | validation and creation. By default this controller uses a trait to
+    | provide this functionality without requiring any additional code.
+    |
+    */
+
+    use RegistersUsers;
+    /**
+     * Where to redirect users after registration.
+     * @var string
+     */
+    protected $redirectTo = '/';
+
+    /**
+     * Create a new controller instance.
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @param  array $data
+     *
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    protected function validator(array $data)
+    {
+        return Validator::make($data, [
+            'name'                 => 'required|string|max:255',
+            'email'                => 'required|string|email|max:255|unique:users',
+            'password'             => 'required|string|min:6|confirmed',
+            'g-recaptcha-response' => 'required|recaptcha',
+        ]);
+    }
+
+    /**
+     * Create a new user instance after a valid registration.
+     *
+     * @param  array $data
+     *
+     * @return \App\User
+     */
+    protected function create(array $data)
+    {
+        return User::create([
+                                'name'     => $data['name'],
+                                'role'     => User::ROLE_VISITOR,
+                                'state'    => User::STATE_ACTIVE,
+                                'email'    => $data['email'],
+                                'password' => bcrypt($data['password']),
+                            ]);
+    }
+}

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+
+class ResetPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset requests
+    | and uses a simple trait to include this behavior. You're free to
+    | explore this trait and override any methods you wish to tweak.
+    |
+    */
+
+    use ResetsPasswords;
+
+    /**
+     * Where to redirect users after resetting their password.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/admin';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+}

app/Http/Controllers/Visitor/Sitemap.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Visitor;
 
 use App\CMS\Contracts\Repositories\Content;
-use App\Http\Requests;
+use App\Http\Controllers\Controller;
 
 class Sitemap extends Controller
 {
@@ -24,7 +24,6 @@ class Sitemap extends Controller
 
     /**
      * Get sitemap for all content pages
-     *
      * @return mixed
      */
     public function getMap()

app/Http/Kernel.php

@@ -2,8 +2,9 @@
 
 namespace App\Http;
 
-use App\Http\Middleware\TemplatePathInstaller;
+use App\Http\Middleware\TemplateChecker;
-use App\Http\Middleware\WidgetInstaller;
+use App\Http\Middleware\Web\IncrementWidgetsViews;
+use Illuminate\Auth\Middleware\Authorize;
 use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
@@ -36,13 +37,15 @@ class Kernel extends HttpKernel
     protected $middlewareGroups = [
         'web'   => [
             CheckForMaintenanceMode::class,
+            TemplateChecker::class,
             AddQueuedCookiesToResponse::class,
+            IncrementWidgetsViews::class,
         ],
         'admin' => [
-            Middleware\Authenticate::class,
+            Middleware\Admin\Authenticate::class,
-            Middleware\AdminMenuRegistrator::class,
+            Middleware\Admin\AdminMenuRegistrator::class,
-            TemplatePathInstaller::class,
+            Middleware\Admin\TemplatePathInstaller::class,
-            WidgetInstaller::class,
+            Middleware\Admin\WidgetInstaller::class,
         ],
         'api'   => [
             'throttle:60,1',
@@ -54,9 +57,9 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth'                  => Middleware\Authenticate::class,
+        'can'                   => Authorize::class,
-        'onlyAdmin'             => Middleware\RequireAdminRole::class,
+        'auth'                  => Middleware\Admin\Authenticate::class,
-        'adminMenu'             => Middleware\AdminMenuRegistrator::class,
+        'adminMenu'             => Middleware\Admin\AdminMenuRegistrator::class,
         'guest'                 => Middleware\RedirectIfAuthenticated::class,
         'throttle'              => ThrottleRequests::class,
         'localize'              => LaravelLocalizationRoutes::class,

app/Http/Middleware/Admin/AdminMenuRegistrator.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Http\Middleware\Admin;
 
-use App\CMS\Handlers\Handler;
+use App\CMS\Handlers\AdminHandler;
-use App\Models\Module;
+use App\CMS\Repositories\Module as ModuleRepository;
 use Closure;
 use Illuminate\Support\Facades\Log;
 
@@ -26,15 +26,15 @@ class AdminMenuRegistrator
 
         // create menu
         $user = \Auth::user();
-        Handler::registerAdminMenu($user);
+        AdminHandler::registerAdminMenu($user);
 
-        $modules = Module::where('enabled', true)
+        $modules = app(ModuleRepository::class)->all();
-                         ->get();
 
         // iterate over all enabled modules
         foreach ($modules as $key => $module) {
-            if (!is_callable([$module->handler, 'registerAdminMenu']))
+            if (!is_callable([$module->handler, 'registerAdminMenu'])) {
                 continue;
+            }
 
             // try to register menus
             try {

app/Http/Middleware/Admin/Authenticate.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Http\Middleware\Admin;
+
+use App\Models\User;
+use Closure;
+use Illuminate\Support\Facades\Auth;
+
+class Authenticate
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     * @param  string|null              $guard
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $guard = null)
+    {
+        if (!Auth::guard($guard)
+                 ->check() || Auth::user()->status != User::STATE_ACTIVE || Auth::user()->role == User::ROLE_VISITOR || 0) {
+            Auth::logout();
+
+            if ($request->ajax()) {
+                return response('Unauthorized.', 401);
+            }
+
+            // select right message
+            if (Auth::user() && Auth::user()->status != User::STATE_ACTIVE) {
+                $message = 'auth.userNotActive';
+            } elseif (Auth::user() && Auth::user()->role == User::ROLE_VISITOR) {
+                $message = 'auth.visitorInAdmin';
+            } else {
+                $message = 'auth.loginExpired';
+            }
+
+            return redirect()
+                ->route('login')
+                ->with('warning', trans($message));
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/Admin/TemplatePathInstaller.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Http\Middleware\Admin;
 
 use App\CMS\Handlers\Registrators\TemplateRegistrator;
 use Closure;

app/Http/Middleware/Admin/WidgetInstaller.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Http\Middleware\Admin;
 
 use App\CMS\Handlers\Registrators\WidgetRegistrator;
 use Closure;

app/Http/Middleware/Authenticate.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Support\Facades\Auth;
-
-class Authenticate
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @param  \Closure                 $next
-     * @param  string|null              $guard
-     *
-     * @return mixed
-     */
-    public function handle($request, Closure $next, $guard = null)
-    {
-        if (!Auth::guard($guard)->check()) {
-            if ($request->ajax()) {
-                return response('Unauthorized.', 401);
-            }
-
-            return redirect()
-                ->route('login')
-                ->with('redirectTo', $request->fullUrl());
-        }
-
-        return $next($request);
-    }
-}

app/Http/Middleware/TemplateChecker.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Middleware;
 
-use App\Models\User;
+use App\CMS\Helpers\CurrentTemplate;
 use Closure;
 
-class RequireAdminRole
+class TemplateChecker
 {
     /**
      * Handle an incoming request.
@@ -17,10 +17,10 @@ class RequireAdminRole
      */
     public function handle($request, Closure $next)
     {
-        if (\Auth::user()->role != User::ROLE_ADMIN) {
+        $template = CurrentTemplate::get();
-            return redirect()
+
-                ->back()
+        if (!$template) {
-                ->with('error', trans('auth.accessDenied'));
+            throw new \ErrorException('Template is not set, cannot continue');
         }
 
         return $next($request);

app/Http/Middleware/Web/IncrementWidgetsViews.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Middleware\Web;
+
+use App\CMS\Helpers\WidgetAreas;
+use App\Models\Widgets\WidgetArea;
+use Closure;
+
+class IncrementWidgetsViews
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        return $next($request);
+    }
+
+    public function terminate($request, $response)
+    {
+//        if (!setting('useWidgetPreloading', false))
+//            return;
+
+        $widgets = WidgetAreas::getLoadedWidgets();
+
+        if (!empty($widgets['areas'])) {
+            WidgetArea::whereIn('code', $widgets['areas'])
+                      ->increment('viewed');
+        }
+    }
+}

app/Http/routes.php

@@ -1,75 +0,0 @@
-<?php
-
-/**
- * This routing groups is used for routing along public part of website
- */
-
-use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
-
-Route::pattern('id', '\d+');
-Route::pattern('url', '[0-9\-a-z]+');
-
-/*******************************************************************************/
-
-Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['bindings']],  function () {
-    /**
-     * This route group serves to handle request in admin
-     */
-    Route::group([
-                     'middleware' => ['admin'],
-                     'namespace'  => 'Admin',
-                     'prefix'     => 'admin'
-                 ], function () {
-
-        // include all routes in routes/admin subfolder
-        $files = ['contents', 'fileManager', 'settings', 'templates', 'users', 'widgets'];
-        foreach ($files as $file) {
-            require_once __DIR__ . DIRECTORY_SEPARATOR . 'routes' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . $file . '.php';
-        }
-
-        // display dashboard with some usefull information
-        Route::get('/', 'Dashboard\Dashboard@index')
-             ->name('admin.dashboard');
-
-        // list of all actions
-        Route::get('actions', 'ActionLog\Overview@index')
-             ->name('log.overview');
-
-        // search form with results
-        Route::get('search', 'Search@getSearch')
-             ->name('search');
-
-        // logout method
-        Route::get('logout', 'Login@logout')
-             ->name('logout');
-    });
-
-    /**************************************************************************************/
-
-    /**
-     * This section must be specified as last one
-     */
-
-    Route::group(['middleware' => ['web']], function () {
-
-        // Homepage
-        Route::get('/', 'Visitor\Homepage@getIndex')
-             ->name('page.index');
-
-        // display login form
-        Route::get('admin/login', 'Admin\Login@getLogin')
-             ->name('loginForm');
-
-        // handle login
-        Route::post('admin/login', 'Admin\Login@postLogin')
-             ->name('login');
-
-        // route for sitemap
-        Route::get('sitemap.xml', 'Visitor\Sitemap@getMap')
-             ->name('sitemap');
-
-        // route for all content pages. This rule must be specified last (because it matches every route)
-        Route::get('{url}', 'Visitor\ContentPage@getPage')
-             ->name('page.content');
-    });
-});

app/Http/routes/admin/contents.php

@@ -1,42 +0,0 @@
-<?php
-Route::group(['namespace' => 'Contents'], function () {
-    // list of all static pages
-    Route::get('content/overview/{module?}', 'ContentOverview@index')
-         ->name('content.overview');
-
-    // form for creating new static page
-    Route::get('content/new/{module}', 'CreateNewContent@create')
-         ->name('content.new');
-
-    // form for editing existing static page
-    Route::get('content/edit/{page}', 'EditContent@edit')
-         ->name('content.edit');
-
-    // post method for creating new static page
-    Route::post('content/new/{module}', 'CreateNewContent@store')
-         ->name('content.newPost');
-
-    // post method for creating new static page
-    Route::post('content/edit/{page}', 'EditContent@update')
-         ->name('content.editPost');
-
-    // change status of page (protected, public or draft)
-    Route::get('content/status/{page}/{status}', 'ContentActions@changeStatus')
-         ->name('content.changeStatus');
-
-    // set homepage
-    Route::get('content/homepage/{page}', 'ContentActions@setHomepage')
-         ->name('content.setHomepage');
-
-    // delete page
-    Route::get('content/delete/{page}', 'ContentActions@delete')
-         ->name('content.delete');
-
-    // history of changes for specified page
-    Route::get('history/{page}', 'History@getOverview')
-         ->name('content.history');
-
-    // history of changes for specified page
-    Route::get('history/{revision}', 'History@getDiff')
-         ->name('history.diff');
-});

app/Http/routes/admin/fileManager.php

@@ -1,29 +0,0 @@
-<?php
-Route::group(['namespace' => 'FileManager'], function () {
-
-    Route::get('files/overview/{directory?}', 'UploadedFilesOverview@index')
-         ->name('upload.overview');
-
-    // uploader methods
-    Route::get('directories/edit/{directory}', 'EditDirectory@edit')
-         ->name('upload.editDirectory');
-
-    Route::post('directories/edit/{directory}', 'EditDirectory@update')
-         ->name('upload.postEditDirectory');
-
-    route::post('directories/new', 'CreateNewDirectory@store')
-         ->name('upload.postNewDirectory');
-
-    Route::get('upload/detail/{file}', 'EditUploadedFile@show')
-         ->name('upload.detail');
-
-    Route::post('upload/detail/{file}', 'EditUploadedFile@update')
-         ->name('upload.postEdit');
-
-    Route::get('upload/delete/{file}', 'EditUploadedFile@delete')
-         ->name('upload.delete');
-
-    // uploader methods
-    Route::post('upload', 'UploadFile@store')
-         ->name('upload.postFile');
-});

app/Http/routes/admin/settings.php

@@ -1,7 +0,0 @@
-<?php
-// form with settings
-Route::get('settings', 'Settings@getOverview')
-     ->name('settings.overview');
-
-Route::post('settings', 'Settings@saveSettings')
-     ->name('settings.save');

app/Http/routes/admin/templates.php

@@ -1,15 +0,0 @@
-<?php
-// these routes are available only for user with role admin
-Route::group(['middleware' => 'onlyAdmin', 'namespace' => 'Templates'], function () {
-    Route::get('templates/overview/path/{templatePath}', 'TemplateOverview@getPath')
-         ->name('templates.overview');
-
-    Route::post('templates/copy', 'CopyTemplate@createCopy')
-         ->name('templates.postCopy');
-
-    Route::get('templates/edit/{template}', 'EditTemplate@getEdit')
-         ->name('templates.edit');
-
-    Route::post('templates/edit/{template}', 'EditTemplate@postEdit')
-         ->name('templates.postEdit');
-});

app/Http/routes/admin/users.php

@@ -1,27 +0,0 @@
-<?php
-Route::group(['namespace' => 'Users'], function () {
-    // display form for creating new user
-    Route::get('users/new', 'CreateNewUser@getNewUser')
-         ->name('users.new');
-
-    // POST methods
-    // display form for creating new user
-    Route::post('users/new', 'CreateNewUser@postRegistration')
-         ->name('users.newPost');
-
-    // display form for edit of existing user
-    Route::get('users/edit/{user}', 'EditUser@getEditUser')
-         ->name('users.edit');
-
-    // display user detail in admin
-    Route::get('users/detail/{user?}', 'UserDetail@getDetail')
-         ->name('users.detail');
-
-    // method for saving edited data of user
-    Route::post('users/edit/{user}', 'EditUser@postEdit')
-         ->name('users.editPost');
-
-    // display list of all users registered into our system
-    Route::get('users/overview/{state?}/{perPage?}', 'UsersOverview@getOverview')
-         ->name('users.overview');
-});

app/Listeners/CreateImageThumbnail.php

@@ -3,23 +3,16 @@
 namespace App\Listeners;
 
 use App\Events\UploadFile;
+use App\Models\FileManager\File;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Support\Facades\File as FileFacade;
 use Illuminate\Support\Str;
 use Intervention\Image\Constraint;
 use Intervention\Image\Facades\Image;
 use Symfony\Component\HttpFoundation\File\File as SymphonyFile;
 
-class CreateImageThumbnail
+class CreateImageThumbnail implements ShouldQueue
 {
-    /**
-     * Create the event listener.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-    }
-
     /**
      * Handle the event.
      *
@@ -29,10 +22,10 @@ class CreateImageThumbnail
      */
     public function handle(UploadFile $event)
     {
-        $uploadedFile = $event->uploadedFile;
+        $uploadedFile = $event->file;
 
         // is uploaded file an image?
-        if (!Str::startsWith($uploadedFile->getMimeType(), 'image')) {
+        if (!Str::startsWith($uploadedFile->mime_type, 'image')) {
             return;
         }
         // yes, create thumbnail
@@ -42,10 +35,12 @@ class CreateImageThumbnail
     /**
      * Create thumbnail of given image
      *
-     * @param SymphonyFile $file
+     * @param File $uploadedFile
      */
-    private function createThumbnail(SymphonyFile $file)
+    private function createThumbnail(File $uploadedFile)
     {
+        $file = new SymphonyFile(config('app.upload_path') . '/' . $uploadedFile->filename);
+
         // does thumbnail directory exist?
         if (!is_dir(config('app.thumbnail_path'))) {
             FileFacade::makeDirectory(config('app.thumbnail_path'));

app/Listeners/Loggers/LogLogout.php

@@ -3,19 +3,22 @@
 namespace App\Listeners\Loggers;
 
 use Illuminate\Auth\Events\Logout;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class LogLogout extends Logger
 {
     /**
      * Handle the event.
      *
-     * @param  Logout  $event
+     * @param  Logout $event
+     *
      * @return void
      */
     public function handle(Logout $event)
     {
+        if (is_null($event->user)) {
+            return;
+        }
+
         $parameters = [
             'id'    => $event->user->id,
             'name'  => $event->user->name,
@@ -27,7 +30,6 @@ class LogLogout extends Logger
 
     /**
      * Getter for action name. Used only internally
-     *
      * @return mixed
      */
     protected function getName()

app/Listeners/Loggers/LogUploadFile.php

@@ -2,30 +2,33 @@
 
 namespace App\Listeners\Loggers;
 
-use App\Events\Uploadfile;
+use App\Events\UploadFile;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
-class LogUploadFile
+class LogUploadFile extends Logger
 {
-    /**
-     * Create the event listener.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
     /**
      * Handle the event.
      *
-     * @param  Uploadfile  $event
+     * @param  CreateNewWidget $event
+     *
      * @return void
      */
-    public function handle(Uploadfile $event)
+    public function handle(UploadFile $event)
     {
-        //
+        $parameters = [
+            'name' => $event->file->filename,
+            'mime' => $event->file->mime_type,
+        ];
+
+        $this->saveLog($parameters);
+    }
+
+    /**
+     * Getter for action name. Used only internally
+     * @return mixed
+     */
+    protected function getName()
+    {
+        return 'newFile';
     }
 }

app/Listeners/SetDefaultPermissions.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\CreateNewUser;
+use App\Models\Permissions\Permission;
+
+class SetDefaultPermissions
+{
+    /**
+     * Handle the event.
+     *
+     * @param  CreateNewUser $event
+     *
+     * @return void
+     */
+    public function handle(CreateNewUser $event)
+    {
+        $permissions = Permission::where('default', true)
+                                 ->get();
+
+        foreach ($permissions as $permission) {
+            $event->user->permissions()
+                        ->attach($permission);
+        }
+    }
+}

app/Models/Content/Content.php

@@ -6,6 +6,7 @@ use App\CMS\Contracts\Repositories\Content as ContentContract;
 use App\CMS\Helpers\Traits\Nullable;
 use App\CMS\Observers\Content as ContentObserver;
 use App\Models\FileManager\File;
+use App\Models\Module;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -55,7 +56,6 @@ class Content extends Model
 
     /**
      * Mark relationship with its historical records
-     *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function history()
@@ -65,7 +65,6 @@ class Content extends Model
 
     /**
      * Mark relationship with users table
-     *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function author()
@@ -75,7 +74,6 @@ class Content extends Model
 
     /**
      * Related files to content page
-     *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function files()
@@ -85,7 +83,6 @@ class Content extends Model
 
     /**
      * Category of content page
-     *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function category()
@@ -95,7 +92,6 @@ class Content extends Model
 
     /**
      * Subpages assigned to page
-     *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function subpages()
@@ -103,9 +99,17 @@ class Content extends Model
         return $this->hasMany(Content::class, 'parentId');
     }
 
+    /**
+     * Module relationship
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function module()
+    {
+        return $this->belongsTo(Module::class, 'moduleHandler', 'handler');
+    }
+
     /**
      * Parent page
-     *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function parentPage()
@@ -115,7 +119,6 @@ class Content extends Model
 
     /**
      * Is current content draft?
-     *
      * @return bool
      */
     public function isDraft()
@@ -125,7 +128,6 @@ class Content extends Model
 
     /**
      * Is current content visible for all visitors?
-     *
      * @return bool
      */
     public function isPublic()
@@ -135,7 +137,6 @@ class Content extends Model
 
     /**
      * Is current content visible only for logged users?
-     *
      * @return bool
      */
     public function isProtected()
@@ -145,7 +146,6 @@ class Content extends Model
 
     /**
      * Is current content visible for logged user OR for everyone?
-     *
      * @return bool
      */
     public function isVisible()
@@ -164,6 +164,9 @@ class Content extends Model
         return parent::save($options);
     }
 
+    /**
+     * Increment number of viewed content
+     */
     public function view()
     {
         $this->timestamps = false;

app/Models/Content/ContentHistory.php

@@ -2,6 +2,7 @@
 
 namespace App\Models\Content;
 
+use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 
 /**
@@ -21,5 +22,14 @@ class ContentHistory extends Model
         'new_value',
         'old_value'
     ];
-    protected $guarded = [];
+
+    /**
+     * Author of the change
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function author()
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
 }

app/Models/FileManager/ModelTraits/File.php

@@ -6,6 +6,7 @@ use App\Events\UploadFile;
 use App\Models\FileManager\File as FileModel;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Gate;
 use Symfony\Component\HttpFoundation\File\File as SymphonyFile;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
@@ -36,6 +37,8 @@ trait File
      */
     public function upload(UploadedFile $file, $data = [])
     {
+        abort_unless(Auth::user()->can('upload', FileModel::class), 403);
+
         $data = (object)$data;
 
         $destination = config('app.upload_path');
@@ -45,15 +48,15 @@ trait File
         $uploadedFile = $file->move($destination, $filename);
 
         // insert record into database
-        $id = $this->saveIntoDatabase($uploadedFile, $data, $file->getClientOriginalName());
+        $fileInDB = $this->saveIntoDatabase($uploadedFile, $data, $file->getClientOriginalName());
 
         // fire event about new file
-        Event::fire(new UploadFile($uploadedFile, $id));
+        Event::fire(new UploadFile($fileInDB));
 
         return [
             'filename' => $filename,
             'file'     => $file,
-            'id'       => $id
+            'id'       => $fileInDB->id
         ];
     }
 
@@ -89,6 +92,6 @@ trait File
                                          'keywords'          => isset($request->keyword) ? $request->keyword : ''
                                      ]);
 
-        return $newFile->id;
+        return $newFile;
     }
 }

app/Models/Module.php

@@ -15,6 +15,7 @@ class Module extends Model
         'parent_id',
         'name',
         'description',
+        'static_name',
         'alias',
         'module_settings',
         'enabled',
@@ -30,6 +31,15 @@ class Module extends Model
 
     public function getRouteKeyName()
     {
-       return 'alias';
+        return 'alias';
+    }
+
+    public function submodules()
+    {
+        return $this->hasMany(Module::class, 'parent_id');
+    }
+
+    public function parent() {
+        return $this->belongsTo(Module::class, 'parent_id');
     }
 }

app/Models/Permissions/Permission.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Models\Permissions;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Permission extends Model
+{
+    public $timestamps = false;
+    protected $fillable = [
+        'string_id',
+        'parent_id',
+        'group',
+        'name',
+        'default'
+    ];
+    protected $casts = [
+        'default' => 'boolean'
+    ];
+
+    /**
+     * Assign observer for this model for logging
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        self::observe(PermissionObserver::class);
+    }
+
+    public function parent()
+    {
+        return $this->hasOne(Permission::class, 'parent_id');
+    }
+
+    public function subpermissions()
+    {
+        return $this->hasMany(Permission::class, 'parent_id');
+    }
+}

app/Models/Permissions/PermissionObserver.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Models\Permissions;
+
+use App\Models\User;
+
+class PermissionObserver
+{
+    /**
+     * Sets default permissions when creating new
+     *
+     * @param Permission $permission
+     */
+    public function created(Permission $permission)
+    {
+        if ($permission->default) {
+            $users = User::where('role', '!=', User::ROLE_VISITOR)
+                         ->get();
+
+            foreach ($users as $user) {
+                $user->permissions()
+                     ->attach($permission->id);
+            }
+        }
+    }
+}

app/Models/Settings.php

@@ -7,8 +7,6 @@ use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 class Settings extends Model
 {
-    use ModelTraits\Settings;
-
     protected $table = 'settings';
     public $timestamps = false;
     protected $fillable = ['key', 'value', 'language'];

app/Models/User.php

@@ -2,18 +2,29 @@
 
 namespace App\Models;
 
+use App\Models\Permissions\Permission;
+use App\Notifications\ResetPasswordNotification;
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticableInterface;
+use Illuminate\Contracts\Auth\CanResetPassword;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\Access\Authorizable;
+use Illuminate\Notifications\Notifiable;
 
 /**
  * Class User
  */
-class User extends Model implements AuthenticableInterface
+class User extends Model implements AuthenticableInterface, CanResetPassword
 {
-    use SoftDeletes, Authenticatable, Authorizable;
+    use SoftDeletes, Authenticatable, Authorizable, Notifiable;
+    const STATE_DELETED = 'deleted';
+    const STATE_BLOCKED = 'blocked';
+    const STATE_ACTIVE = 'active';
+    const ROLE_VISITOR = 'visitor';
+    const ROLE_EDITOR = 'editor';
+    const ROLE_ADMIN = 'admin';
+    protected static $abilities;
     public $timestamps = true;
     protected $fillable = [
         'email',
@@ -24,17 +35,52 @@ class User extends Model implements AuthenticableInterface
     ];
     /**
      * The attributes excluded from the model's JSON form.
-     *
      * @var array
      */
     protected $hidden = [
         'password',
         'remember_token',
     ];
-    const STATE_DELETED = 'deleted';
+
-    const STATE_BLOCKED = 'blocked';
+    /**
-    const STATE_ACTIVE = 'active';
+     * Get the e-mail address where password reset links are sent.
-    const ROLE_VISITOR = 'visitor';
+     * @return string
-    const ROLE_EDITOR = 'editor';
+     */
-    const ROLE_ADMIN = 'admin';
+    public function getEmailForPasswordReset()
+    {
+        return $this->email;
+    }
+
+    /**
+     * Send the password reset notification.
+     *
+     * @param  string $token
+     *
+     * @return void
+     */
+    public function sendPasswordResetNotification($token)
+    {
+        $this->notify(new ResetPasswordNotification($token));
+    }
+
+    public function permissions()
+    {
+        return $this->belongsToMany(Permission::class, 'user_has_permissions');
+    }
+
+    /**
+     * Check if current user has given ability
+     *
+     * @param $ability
+     *
+     * @return bool
+     */
+    public function hasAbility($ability)
+    {
+        if (!isset(self::$abilities[$this->id])) {
+            self::$abilities[$this->id] = $this->permissions->pluck('string_id')->toArray();
+        }
+
+        return in_array($ability, self::$abilities[$this->id]);
+    }
 }

app/ModuleManager/Config/modules.php

@@ -1,10 +0,0 @@
-<?php
-
-return [
-    'namespace' => 'Modules',
-    'paths'     => [
-        'modules'   => base_path('modules'),
-        'assets'    => public_path('modules'),
-        'stubs' => base_path('app/CMS/Modules/Stubs'),
-    ]
-];

app/Notifications/ResetPasswordNotification.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Notifications;
+
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class ResetPasswordNotification extends Notification
+{
+    /**
+     * @var string
+     */
+    private $token;
+
+    /**
+     * Create a new notification instance.
+     * @return void
+     */
+    public function __construct($token)
+    {
+        $this->token = $token;
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed $notifiable
+     *
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed $notifiable
+     *
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        $url = route('password.reset', ['token' => $this->token, 'email' => $notifiable->email]);
+
+        return (new MailMessage())->subject(trans('notification.forgottenPassword.subject'))
+                                  ->line(trans('notification.forgottenPassword.firstLine'))
+                                  ->action(trans('notification.forgottenPassword.button'), $url)
+                                  ->line(trans('notification.forgottenPassword.lastLine'));
+    }
+}

app/Policies/ActionLogPolicy.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Policies;
+
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class ActionLogPolicy extends BasicPolicy
+{
+    use HandlesAuthorization;
+    protected $entity = 'actions';
+}

app/Policies/BasicPolicy.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+use Illuminate\Database\Eloquent\Model;
+
+abstract class BasicPolicy
+{
+    use HandlesAuthorization;
+    protected $entity;
+
+    /**
+     * Check if user has ability to manage entity before evaluating any other policy method
+     * @param User $user
+     * @param      $ability
+     *
+     * @return bool|null
+     */
+    public function before(User $user, $ability)
+    {
+
+        // check if user can operate on given entity
+        if (!$this->manage($user)) {
+            return false;
+        }
+    }
+
+    /**
+     * Can user manage given entity?
+     *
+     * @param User $user
+     *
+     * @return bool
+     */
+    public function manage(User $user)
+    {
+        return $user->hasAbility($this->entity . '-management');
+    }
+
+    /**
+     * Determine whether the user can delete the content.
+     *
+     * @param  \App\Models\User $user
+     * @param Model             $model
+     *
+     * @return mixed
+     */
+    public function delete(User $user, Model $model)
+    {
+        return $user->hasAbility('delete-' . $this->entity);
+    }
+}

app/Policies/ContentPolicy.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\Content\Content;
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class ContentPolicy extends BasicPolicy
+{
+    use HandlesAuthorization;
+    protected $entity = 'contents';
+
+    /**
+     * Determine whether the user can update the content.
+     *
+     * @param  \App\Models\User            $user
+     * @param  \App\Models\Content\Content $content
+     *
+     * @return mixed
+     */
+    public function update(User $user, Content $content)
+    {
+        if ($user->id != $content->user_id) {
+            return $user->hasAbility('update-contents') && $user->hasAbility('update-all-contents');
+        };
+
+        return $user->hasAbility('update-contents');
+    }
+
+    /**
+     * Does given user has permissions to create new content page?
+     *
+     * @param User $user
+     *
+     * @return bool
+     */
+    public function create(User $user) {
+        return $user->hasAbility('create-contents');
+    }
+
+    public function publish(User $user)
+    {
+        return $user->hasAbility('publish-contents');
+    }
+
+    public function setHomepage(User $user)
+    {
+        return $user->hasAbility('set-homepage-contents');
+    }
+
+    public function viewHistory(User $user) {
+        return $user->hasAbility('view-history-contents');
+    }
+}

app/Policies/DirectoriesPolicy.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\FileManager\Directory;
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class DirectoriesPolicy extends BasicPolicy
+{
+    use HandlesAuthorization;
+    protected $entity = 'directories';
+
+    /**
+     * Determine whether the user can create directories.
+     *
+     * @param  \App\Models\User  $user
+     * @return mixed
+     */
+    public function create(User $user)
+    {
+        return $user->hasAbility('create-directories');
+    }
+
+    /**
+     * Determine whether the user can update the directory.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\Directory  $directory
+     * @return mixed
+     */
+    public function update(User $user, Directory $directory)
+    {
+        return $user->hasAbility('update-directories');
+    }
+}

app/Policies/FilesPolicy.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\FileManager\File;
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class FilesPolicy extends BasicPolicy
+{
+    use HandlesAuthorization;
+    protected $entity = 'files';
+
+    /**
+     * Determine whether the user can create appModelsFileManagerFiles.
+     *
+     * @param  User $user
+     * @param File  $file
+     *
+     * @return mixed
+     */
+    public function upload(User $user)
+    {
+        return $user->hasAbility('upload-files');
+    }
+
+    /**
+     * Determine whether the user can update the appModelsFileManagerFile.
+     *
+     * @param  User  $user
+     * @param  File $file
+     *
+     * @return mixed
+     */
+    public function update(User $user, File $file)
+    {
+        return $user->hasAbility('update-files');
+    }
+}

app/Policies/ModulePolicy.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\Module;
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+use Illuminate\Database\Eloquent\Model;
+
+class ModulePolicy extends BasicPolicy
+{
+    use HandlesAuthorization;
+    protected $entity = 'modules';
+
+    /**
+     * Determine whether the user can create modules.
+     *
+     * @param  \App\Models\User $user
+     * @param Module            $module
+     *
+     * @return mixed
+     */
+    public function create(User $user, Model $module)
+    {
+        return $user->hasAbility('create-contents-' . $module->alias);
+    }
+}

app/Policies/SettingsPolicy.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Policies;
+
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class SettingsPolicy extends BasicPolicy
+{
+    use HandlesAuthorization;
+    protected $entity = 'settings';
+}

app/Policies/TemplatePolicy.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\Templates\Template;
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class TemplatePolicy extends BasicPolicy
+{
+    use HandlesAuthorization;
+
+    protected $entity = 'templates';
+
+    /**
+     * Determine whether the user can view the template.
+     *
+     * @param  \App\Models\User $user
+     * @param  \App\Template    $template
+     *
+     * @return mixed
+     */
+    public function copy(User $user)
+    {
+        return $user->hasAbility('copy-templates');
+    }
+
+    /**
+     * Determine whether the user can update the template.
+     *
+     * @param  \App\Models\User $user
+     * @param  \App\Template    $template
+     *
+     * @return mixed
+     */
+    public function update(User $user, Template $template)
+    {
+        return $user->hasAbility('edit-templates');
+    }
+}

app/Policies/UserPolicy.php

@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class UserPolicy extends BasicPolicy
+{
+    use HandlesAuthorization;
+    protected $entity = 'users';
+
+    public function before(User $user, $ability)
+    {
+        if ($ability === 'view')
+            return null;
+
+        return parent::before($user, $ability);
+    }
+
+    /**
+     * Can user see other users?
+     *
+     * @param User $currentUser
+     * @param User $user
+     *
+     * @return bool
+     */
+    public function view(User $currentUser, User $user) {
+        // user can se himself
+        if ($currentUser->id == $user->id)
+            return true;
+
+        return $this->manage($currentUser);
+    }
+
+    /**
+     * Can current user updates other users (or himself?)
+     *
+     * @param User $currentUser
+     * @param User $user
+     *
+     * @return bool
+     */
+    public function update(User $currentUser, User $user)
+    {
+        return $currentUser->id == $user->id || $currentUser->hasAbility('update-users');
+    }
+
+    /**
+     * Can user create other users?
+     *
+     * @param User $user
+     *
+     * @return bool
+     */
+    public function create(User $user) {
+        return $user->hasAbility('create-users');
+    }
+
+    /**
+     * Does current user has permissions for setting permissions to other users?
+     *
+     * @param User $currentUser
+     * @param User $user
+     *
+     * @return bool
+     */
+    public function setPermissions(User $currentUser, User $user)
+    {
+        if ($currentUser->id == $user->id || $user->role == User::ROLE_VISITOR) {
+            return false;
+        }
+
+        return $currentUser->hasAbility('set-permissions-users');
+    }
+
+    /**
+     * Can logged user change status of other users?
+     *
+     * @param User $currentUser
+     * @param User $user
+     *
+     * @return bool
+     */
+    public function changeStatus(User $currentUser, User $user)
+    {
+        if ($currentUser->id == $user->id) {
+            return false;
+        }
+
+        return $currentUser->hasAbility('change-status-users');
+    }
+
+    /**
+     * Can current user change role of other users?
+     *
+     * @param User $currentUser
+     * @param User $user
+     *
+     * @return bool
+     */
+    public function changeRole(User $currentUser, User $user)
+    {
+        if ($currentUser->id == $user->id) {
+            return false;
+        }
+
+        return $currentUser->hasAbility('change-role-users');
+    }
+}

app/Policies/WidgetAreaPolicy.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\User;
+use App\Models\Widgets\WidgetArea;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class WidgetAreaPolicy extends BasicPolicy
+{
+    use HandlesAuthorization;
+    protected $entity = 'widgetareas';
+
+    /**
+     * Determine whether the user can create widgetAreas.
+     *
+     * @param  \App\Models\User  $user
+     * @return mixed
+     */
+    public function create(User $user)
+    {
+        return $user->hasAbility('create-widgetareas');
+    }
+
+    /**
+     * Determine whether the user can update the widgetArea.
+     *
+     * @param  \App\Models\User  $user
+     * @param  \App\WidgetArea  $widgetArea
+     * @return mixed
+     */
+    public function update(User $user, WidgetArea $widgetArea)
+    {
+        return $user->id == $widgetArea->user_id || $user->hasAbility('edit-widgetareas');
+    }
+}

app/Policies/WidgetsPolicy.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\User;
+use App\Models\Widgets\Widget;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class WidgetsPolicy extends BasicPolicy
+{
+    use HandlesAuthorization;
+    protected $entity = 'widgets';
+
+    /**
+     * Determine whether the user can create widgets.
+     *
+     * @param  \App\Models\User $user
+     *
+     * @return mixed
+     */
+    public function create(User $user)
+    {
+        return $user->hasAbility('create-widgets');
+    }
+
+    /**
+     * Determine whether the user can update the widget.
+     *
+     * @param  \App\Models\User $user
+     * @param  \App\Widget      $widget
+     *
+     * @return mixed
+     */
+    public function update(User $user, Widget $widget)
+    {
+        return $user->id == $widget->user_id || $user->hasAbility('edit-widgets');
+    }
+
+    public function assign(User $user)
+    {
+        return $user->hasAbility('assign-widgets');
+    }
+
+    public function unassign(User $user)
+    {
+        return $user->hasAbility('unassign-widgets');
+    }
+}

app/Providers/AppServiceProvider.php

@@ -25,6 +25,7 @@ use App\CMS\Repositories\Module as ModuleRepository;
 use App\CMS\Repositories\Templates\Template as TemplateRepository;
 use App\CMS\Widgets\HtmlCode\HtmlCode;
 use App\CMS\Widgets\Menu\Menu;
+use App\CMS\Widgets\SocialButtons\SocialButtons;
 use Barryvdh\Debugbar\ServiceProvider as DebugBarServiceProvider;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\ServiceProvider;
@@ -106,6 +107,7 @@ class AppServiceProvider extends ServiceProvider
         // register all available widgets
         $registrator->register(HtmlCode::class);
         $registrator->register(Menu::class);
+        $registrator->register(SocialButtons::class);
     }
 
     /**
@@ -118,6 +120,7 @@ class AppServiceProvider extends ServiceProvider
         $registrator->register('basic', 'admin/settings.basic', 'admin.settings.parts.basic');
         $registrator->register('meta', 'admin/settings.meta', 'admin.settings.parts.meta');
         $registrator->register('social', 'admin/settings.socialSites', 'admin.settings.parts.social');
+        $registrator->register('widgets', 'admin/settings.widgets.title', 'admin.settings.parts.widgets');
     }
 
     /**

app/Providers/AuthServiceProvider.php

@@ -2,30 +2,58 @@
 
 namespace App\Providers;
 
-use Illuminate\Contracts\Auth\Access\Gate as GateContract;
+use App\Models\ActionLog\ActionLog;
-use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use App\Models\Content\Content;
+use App\Models\FileManager\Directory;
+use App\Models\FileManager\File;
+use App\Models\Module;
+use App\Models\Settings;
+use App\Models\Templates\Template;
+use App\Models\User;
+use App\Models\Widgets\Widget;
+use App\Models\Widgets\WidgetArea;
+use App\Policies\ActionLogPolicy;
+use App\Policies\ContentPolicy;
+use App\Policies\DirectoriesPolicy;
+use App\Policies\FilesPolicy;
+use App\Policies\ModulePolicy;
+use App\Policies\SettingsPolicy;
+use App\Policies\TemplatePolicy;
+use App\Policies\UserPolicy;
+use App\Policies\WidgetAreaPolicy;
+use App\Policies\WidgetsPolicy;
+use Illuminate\Foundation\Support\Providers\AuthServiceProvider as IlluminateAuthServiceProvider;
 
-class AuthServiceProvider extends ServiceProvider
+class AuthServiceProvider extends IlluminateAuthServiceProvider
 {
     /**
      * The policy mappings for the application.
-     *
      * @var array
      */
     protected $policies = [
-        'App\Model' => 'App\Policies\ModelPolicy',
+        Content::class    => ContentPolicy::class,
+        User::class       => UserPolicy::class,
+        Module::class     => ModulePolicy::class,
+        File::class       => FilesPolicy::class,
+        ActionLog::class  => ActionLogPolicy::class,
+        Template::class   => TemplatePolicy::class,
+        Directory::class  => DirectoriesPolicy::class,
+        Settings::class   => SettingsPolicy::class,
+        Widget::class     => WidgetsPolicy::class,
+        WidgetArea::class => WidgetAreaPolicy::class,
+        ActionLog::class  => ActionLogPolicy::class,
     ];
 
     /**
      * Register any application authentication / authorization services.
      *
-     * @param  \Illuminate\Contracts\Auth\Access\Gate  $gate
+     * @param  \Illuminate\Contracts\Auth\Access\Gate $gate
+     *
      * @return void
      */
-    public function boot(GateContract $gate)
+    public function boot()
     {
-        $this->registerPolicies($gate);
+        $this->registerPolicies();
-
         //
     }
 }

app/Providers/EventServiceProvider.php

@@ -43,21 +43,21 @@ use App\Listeners\Loggers\LogPublishContent;
 use App\Listeners\Loggers\LogRemoveWidgetFromArea;
 use App\Listeners\Loggers\LogSetHomepage;
 use App\Listeners\Loggers\LogUploadFile;
+use App\Listeners\SetDefaultPermissions;
 use Illuminate\Auth\Events\Login;
 use Illuminate\Auth\Events\Logout;
-use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 
 class EventServiceProvider extends ServiceProvider
 {
     /**
      * The event listener mappings for the application.
-     *
      * @var array
      */
     protected $listen = [
         CreateNewUser::class               => [
             LogCreatedUser::class,
+            SetDefaultPermissions::class,
         ],
         EditUser::class                    => [
             LogEditUser::class,

app/Providers/RouteServiceProvider.php

@@ -14,24 +14,27 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected $namespace = 'App\Http\Controllers';
 
-    /**
-     * Define your route model bindings, pattern filters, etc.
-     * @return void
-     */
-    public function boot()
-    {
-        parent::boot();
-    }
-
     /**
      * Define the routes for the application.
      * @return void
      */
     public function map()
     {
+        $this->mapAdminRoutes();
         $this->mapWebRoutes();
     }
 
+    /**
+     * Define the "admin" routes for the application.
+     * These routes all receive session state, CSRF protection, etc.
+     * @return void
+     */
+    protected function mapAdminRoutes()
+    {
+        Route::namespace($this->namespace.'\\Admin')
+             ->group(base_path('routes/admin.php'));
+    }
+
     /**
      * Define the "web" routes for the application.
      * These routes all receive session state, CSRF protection, etc.
@@ -40,7 +43,6 @@ class RouteServiceProvider extends ServiceProvider
     protected function mapWebRoutes()
     {
         Route::namespace($this->namespace)
-             ->middleware('web')
+             ->group(base_path('routes/web.php'));
-             ->group(app_path('Http/routes.php'));
     }
 }

app/Providers/TemplateServiceProvider.php

@@ -5,7 +5,7 @@ namespace App\Providers;
 use App\CMS\Contracts\Repositories\Template as TemplateContract;
 use App\CMS\Handlers\Registrators\TemplateRegistrator;
 use App\CMS\Helpers\CurrentTemplate;
-use App\Models\Module;
+use App\CMS\Repositories\Module;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\ServiceProvider;
 
@@ -13,19 +13,15 @@ class TemplateServiceProvider extends ServiceProvider
 {
     public function boot()
     {
+        $template = CurrentTemplate::get();
+
         // ignore running from artisan
-        if (App::runningInConsole() || App::environment('testing')) {
+        if (App::runningInConsole() || App::environment('testing') || !$template) {
             $this->publishViewResources();
 
             return;
         }
 
-        $template = CurrentTemplate::get();
-
-        if (!$template) {
-            throw new \ErrorException('Template is not set, cannot continue');
-        }
-
         // include files
         $files = isset($template->moduleSettings->files) ? $template->moduleSettings->files : [];
 
@@ -43,12 +39,17 @@ class TemplateServiceProvider extends ServiceProvider
         $this->registerTemplatePaths($publicTemplates);
     }
 
+    /**
+     * Register template paths from public templates
+     *
+     * @param $publicTemplates
+     */
     public function registerTemplatePaths($publicTemplates)
     {
-        $modules = Module::where('enabled', true)
+        $modules = app(Module::class)
-                         ->get()
+            ->all()
-                         ->pluck('id', 'alias')
+            ->pluck('id', 'alias')
-                         ->toArray();
+            ->toArray();
 
         /**
          * @var $registrator TemplateRegistrator
@@ -77,7 +78,6 @@ class TemplateServiceProvider extends ServiceProvider
 
     /**
      * Register the service provider.
-     *
      * @return void
      */
     public function register()
@@ -94,7 +94,7 @@ class TemplateServiceProvider extends ServiceProvider
             return;
         }
 
-        $templateDir = base_path('templates/' . $template->module_settings['staticName']. '/Resources');
+        $templateDir = base_path('templates/' . $template->static_name . '/Resources');
         $assetsDir = $templateDir . '/' . TemplateContract::ASSETS_DIRECTORY;
         $viewsDir = $templateDir . '/views';