evolution-cms / evolution

core/src/Controllers/EventLog.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Controllers;
 
-use EvolutionCMS\Models;
 use EvolutionCMS\Interfaces\ManagerTheme;
+use EvolutionCMS\Models;
 
 class EventLog extends AbstractController implements ManagerTheme\PageControllerInterface
 {

core/src/Controllers/ExportSite.php

Unused Use Statements +1 added lines, -2 removed lines

@@ -1,8 +1,7 @@
 <?php namespace EvolutionCMS\Controllers;

 

-use EvolutionCMS\Interfaces\ManagerTheme;

+use EvolutionCMS\Interfaces\ManagerTheme;
 use EvolutionCMS\Interfaces\ManagerThemeInterface;

-use EvolutionCMS\Models;

 

 class ExportSite extends AbstractController implements ManagerTheme\PageControllerInterface

 {

Spacing +8 added lines, -8 removed lines

@@ -48,7 +48,7 @@ 
                 $output = sprintf($this->managerTheme->getLang('export_site_numberdocs'), $exportSite->total);

                 $output .= $exportSite->run();

                 $output .= sprintf(

-                    '<p>' . $this->managerTheme->getLang("export_site_time") . '</p>',

+                    '<p>'.$this->managerTheme->getLang("export_site_time").'</p>',

                     round($exportSite->get_mtime() - $exportSite->exportstart, 3)

                 );

             }

@@ -60,8 +60,8 @@ 
 

     protected function setMaxTime() : int

     {

-        $maxTime = (int)get_by_key($_POST, 'maxtime', 30, function ($val) {

-            return (int)$val > 0;

+        $maxTime = (int) get_by_key($_POST, 'maxtime', 30, function($val){

+            return (int) $val > 0;

         });

         @set_time_limit($maxTime);

 

@@ -70,10 +70,10 @@ 
 

     protected function getExportDir() : string

     {

-        if (is_dir(MODX_BASE_PATH . 'temp')) {

-            $exportDir = MODX_BASE_PATH . 'temp/export';

+        if (is_dir(MODX_BASE_PATH.'temp')) {

+            $exportDir = MODX_BASE_PATH.'temp/export';

         } else {

-            $exportDir = MODX_BASE_PATH . 'assets/export';

+            $exportDir = MODX_BASE_PATH.'assets/export';

         }

 

         return $exportDir;

@@ -90,10 +90,10 @@ 
             0 <= \strlen(str_replace("{$exportDir}/", '', MODX_BASE_PATH))

         ) {

             $out = $this->managerTheme->getLang('export_site.static.php6');

-        } elseif ($this->managerTheme->getCore()->getConfig('rb_base_dir') === $exportDir . '/') {

+        } elseif ($this->managerTheme->getCore()->getConfig('rb_base_dir') === $exportDir.'/') {

             $out = $this->managerTheme->getCore()->parsePlaceholder(

                 $this->managerTheme->getLang('export_site.static.php7'),

-                'rb_base_url=' . MODX_BASE_URL . $this->managerTheme->getCore()->getConfig('rb_base_url')

+                'rb_base_url='.MODX_BASE_URL.$this->managerTheme->getCore()->getConfig('rb_base_url')

             );

         } elseif (!is_writable($exportDir)) {

             $out = $this->managerTheme->getLang('export_site_target_unwritable');

Braces +12 added lines, -12 removed lines

@@ -4,8 +4,8 @@ 
 use EvolutionCMS\Interfaces\ManagerThemeInterface;

 use EvolutionCMS\Models;

 

-class ExportSite extends AbstractController implements ManagerTheme\PageControllerInterface

-{

+class ExportSite extends AbstractController implements ManagerTheme\PageControllerInterface
+{
     protected $view = 'page.export_site';

 

     /**

@@ -13,8 +13,8 @@ 
      */

     protected $database;

 

-    public function __construct(ManagerThemeInterface $managerTheme, array $data = [])

-    {

+    public function __construct(ManagerThemeInterface $managerTheme, array $data = [])
+    {
         parent::__construct($managerTheme, $data);

         $this->database = $this->managerTheme->getCore()->getDatabase();

     }

@@ -39,10 +39,10 @@ 
     {

         $this->parameters['output'] = '';

 

-        if (isset($_POST['export'])) {

+        if (isset($_POST['export'])) {
             $this->setMaxTime();

             $exportDir = $this->getExportDir();

-            if (($output = $this->validateExportDir($exportDir)) === null) {

+            if (($output = $this->validateExportDir($exportDir)) === null) {
                 $exportSite = $this->objectExportSite($exportDir);

 

                 $output = sprintf($this->managerTheme->getLang('export_site_numberdocs'), $exportSite->total);

@@ -60,7 +60,7 @@ 
 

     protected function setMaxTime() : int

     {

-        $maxTime = (int)get_by_key($_POST, 'maxtime', 30, function ($val) {

+        $maxTime = (int)get_by_key($_POST, 'maxtime', 30, function ($val){
             return (int)$val > 0;

         });

         @set_time_limit($maxTime);

@@ -70,9 +70,9 @@ 
 

     protected function getExportDir() : string

     {

-        if (is_dir(MODX_BASE_PATH . 'temp')) {

+        if (is_dir(MODX_BASE_PATH . 'temp')) {
             $exportDir = MODX_BASE_PATH . 'temp/export';

-        } else {

+        } else {
             $exportDir = MODX_BASE_PATH . 'assets/export';

         }

 

@@ -88,14 +88,14 @@ 
         $out = null;

         if (strpos(MODX_BASE_PATH, "{$exportDir}/") === 0 &&

             0 <= \strlen(str_replace("{$exportDir}/", '', MODX_BASE_PATH))

-        ) {

+        ) {
             $out = $this->managerTheme->getLang('export_site.static.php6');

-        } elseif ($this->managerTheme->getCore()->getConfig('rb_base_dir') === $exportDir . '/') {

+        } elseif ($this->managerTheme->getCore()->getConfig('rb_base_dir') === $exportDir . '/') {
             $out = $this->managerTheme->getCore()->parsePlaceholder(

                 $this->managerTheme->getLang('export_site.static.php7'),

                 'rb_base_url=' . MODX_BASE_URL . $this->managerTheme->getCore()->getConfig('rb_base_url')

             );

-        } elseif (!is_writable($exportDir)) {

+        } elseif (!is_writable($exportDir)) {
             $out = $this->managerTheme->getLang('export_site_target_unwritable');

         }

 

core/src/Controllers/Frame.php

Doc Comments +3 added lines

@@ -399,6 +399,9 @@
         return $this;

     }

 

+    /**
+     * @param integer $tab
+     */
     protected function menuElementTemplates($tab)

     {

         if ($this->managerTheme->getCore()->hasPermission('edit_template')) {

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php namespace EvolutionCMS\Controllers;

 

-use EvolutionCMS\Interfaces\ManagerTheme;

+use EvolutionCMS\Interfaces\ManagerTheme;
 use EvolutionCMS\Interfaces\ManagerThemeInterface;

 

 class Frame extends AbstractController implements ManagerTheme\PageControllerInterface

Spacing +59 added lines, -59 removed lines

@@ -22,7 +22,7 @@ 
             $this->managerTheme->getCore()->setConfig('enable_debug', false);

         }

         if (!empty($this->frame)) {

-            $this->setView('frame.' . $this->frame);

+            $this->setView('frame.'.$this->frame);

         }

     }

 

@@ -84,9 +84,9 @@ 
 

         $theme_modes = ['', 'lightness', 'light', 'dark', 'darkness'];

         if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

-            $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

+            $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']];

         } elseif (!empty($theme_modes[$this->managerTheme->getCore()->getConfig('manager_theme_mode')])) {

-            $body_class .= ' ' . $theme_modes[$this->managerTheme->getCore()->getConfig('manager_theme_mode')];

+            $body_class .= ' '.$theme_modes[$this->managerTheme->getCore()->getConfig('manager_theme_mode')];

         }

 

         $navbar_position = $this->managerTheme->getCore()->getConfig('manager_menu_position');

@@ -138,7 +138,7 @@ 
 

         $this->managerTheme->getCore()->setConfig(

             'global_tabs',

-            (int)($this->managerTheme->getCore()->getConfig('global_tabs') && $flag)

+            (int) ($this->managerTheme->getCore()->getConfig('global_tabs') && $flag)

         );

 

         $this->makeMenu();

@@ -173,29 +173,29 @@ 
 

     protected function registerCss(): string

     {

-        $this->parameters['css'] = $this->managerTheme->getThemeDir(false) . 'css/page.css?v=' . EVO_INSTALL_TIME;

+        $this->parameters['css'] = $this->managerTheme->getThemeDir(false).'css/page.css?v='.EVO_INSTALL_TIME;

 

         if ($this->managerTheme->getTheme() === 'default') {

             $themeDir = $this->managerTheme->getThemeDir();

 

-            if (!file_exists($themeDir . 'css/styles.min.css') && is_writable($themeDir . 'css')) {

-                require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';

+            if (!file_exists($themeDir.'css/styles.min.css') && is_writable($themeDir.'css')) {

+                require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';

                 $minifier = new \Formatter\CSSMinify();

-                $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');

-                $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css');

-                $minifier->addFile($themeDir . 'css/fonts.css');

-                $minifier->addFile($themeDir . 'css/forms.css');

-                $minifier->addFile($themeDir . 'css/mainmenu.css');

-                $minifier->addFile($themeDir . 'css/tree.css');

-                $minifier->addFile($themeDir . 'css/custom.css');

-                $minifier->addFile($themeDir . 'css/tabpane.css');

-                $minifier->addFile($themeDir . 'css/contextmenu.css');

-                $minifier->addFile($themeDir . 'css/index.css');

-                $minifier->addFile($themeDir . 'css/main.css');

-                file_put_contents($themeDir . 'css/styles.min.css', $minifier->minify());

+                $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css');

+                $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css');

+                $minifier->addFile($themeDir.'css/fonts.css');

+                $minifier->addFile($themeDir.'css/forms.css');

+                $minifier->addFile($themeDir.'css/mainmenu.css');

+                $minifier->addFile($themeDir.'css/tree.css');

+                $minifier->addFile($themeDir.'css/custom.css');

+                $minifier->addFile($themeDir.'css/tabpane.css');

+                $minifier->addFile($themeDir.'css/contextmenu.css');

+                $minifier->addFile($themeDir.'css/index.css');

+                $minifier->addFile($themeDir.'css/main.css');

+                file_put_contents($themeDir.'css/styles.min.css', $minifier->minify());

             }

-            if (file_exists($themeDir . 'css/styles.min.css')) {

-                $this->parameters['css'] = $this->managerTheme->getThemeDir(false) . 'css/styles.min.css?v=' . EVO_INSTALL_TIME;

+            if (file_exists($themeDir.'css/styles.min.css')) {

+                $this->parameters['css'] = $this->managerTheme->getThemeDir(false).'css/styles.min.css?v='.EVO_INSTALL_TIME;

             }

         }

 

@@ -280,7 +280,7 @@ 
         $this->sitemenu['site'] = [

             'site',

             'main',

-            '<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $this->managerTheme->getLexicon('home') . '</span>',

+            '<i class="fa fa-tachometer"></i><span class="menu-item-text">'.$this->managerTheme->getLexicon('home').'</span>',

             'index.php?a=2',

             $this->managerTheme->getLexicon('home'),

             '',

@@ -304,7 +304,7 @@ 
             $this->sitemenu['elements'] = [

                 'elements',

                 'main',

-                '<i class="fa fa-th"></i><span class="menu-item-text">' . $this->managerTheme->getLexicon('elements') . '</span>',

+                '<i class="fa fa-th"></i><span class="menu-item-text">'.$this->managerTheme->getLexicon('elements').'</span>',

                 'javascript:;',

                 $this->managerTheme->getLexicon('elements'),

                 ' return false;',

@@ -325,7 +325,7 @@ 
             $this->sitemenu['modules'] = [

                 'modules',

                 'main',

-                '<i class="' . $this->managerTheme->getStyle('icons_modules') . '"></i><span class="menu-item-text">' . $this->managerTheme->getLexicon('modules') . '</span>',

+                '<i class="'.$this->managerTheme->getStyle('icons_modules').'"></i><span class="menu-item-text">'.$this->managerTheme->getLexicon('modules').'</span>',

                 'javascript:;',

                 $this->managerTheme->getLexicon('modules'),

                 ' return false;',

@@ -349,7 +349,7 @@ 
             $this->sitemenu['users'] = [

                 'users',

                 'main',

-                '<i class="fa fa-users"></i><span class="menu-item-text">' . $this->managerTheme->getLexicon('users') . '</span>',

+                '<i class="fa fa-users"></i><span class="menu-item-text">'.$this->managerTheme->getLexicon('users').'</span>',

                 'javascript:;',

                 $this->managerTheme->getLexicon('users'),

                 ' return false;',

@@ -373,7 +373,7 @@ 
             $this->sitemenu['tools'] = [

                 'tools',

                 'main',

-                '<i class="fa fa-wrench"></i><span class="menu-item-text">' . $this->managerTheme->getLexicon('tools') . '</span>',

+                '<i class="fa fa-wrench"></i><span class="menu-item-text">'.$this->managerTheme->getLexicon('tools').'</span>',

                 'javascript:;',

                 $this->managerTheme->getLexicon('tools'),

                 ' return false;',

@@ -405,8 +405,8 @@ 
             $this->sitemenu['element_templates'] = [

                 'element_templates',

                 'elements',

-                '<i class="fa fa-newspaper-o"></i>' . $this->managerTheme->getLexicon('manage_templates') . '<i class="fa fa-angle-right toggle"></i>',

-                'index.php?a=76&tab=' . $tab++,

+                '<i class="fa fa-newspaper-o"></i>'.$this->managerTheme->getLexicon('manage_templates').'<i class="fa fa-angle-right toggle"></i>',

+                'index.php?a=76&tab='.$tab++,

                 $this->managerTheme->getLexicon('manage_templates'),

                 '',

                 'new_template,edit_template',

@@ -426,8 +426,8 @@ 
             $this->sitemenu['element_tplvars'] = [

                 'element_tplvars',

                 'elements',

-                '<i class="fa fa-list-alt"></i>' . $this->managerTheme->getLexicon('tmplvars') . '<i class="fa fa-angle-right toggle"></i>',

-                'index.php?a=76&tab=' . $tab,

+                '<i class="fa fa-list-alt"></i>'.$this->managerTheme->getLexicon('tmplvars').'<i class="fa fa-angle-right toggle"></i>',

+                'index.php?a=76&tab='.$tab,

                 $this->managerTheme->getLexicon('tmplvars'),

                 '',

                 'new_template,edit_template',

@@ -447,8 +447,8 @@ 
             $this->sitemenu['element_htmlsnippets'] = [

                 'element_htmlsnippets',

                 'elements',

-                '<i class="fa fa-th-large"></i>' . $this->managerTheme->getLexicon('manage_htmlsnippets') . '<i class="fa fa-angle-right toggle"></i>',

-                'index.php?a=76&tab=' . $tab++,

+                '<i class="fa fa-th-large"></i>'.$this->managerTheme->getLexicon('manage_htmlsnippets').'<i class="fa fa-angle-right toggle"></i>',

+                'index.php?a=76&tab='.$tab++,

                 $this->managerTheme->getLexicon('manage_htmlsnippets'),

                 '',

                 'new_chunk,edit_chunk',

@@ -468,8 +468,8 @@ 
             $this->sitemenu['element_snippets'] = [

                 'element_snippets',

                 'elements',

-                '<i class="fa fa-code"></i>' . $this->managerTheme->getLexicon('manage_snippets') . '<i class="fa fa-angle-right toggle"></i>',

-                'index.php?a=76&tab=' . $tab++,

+                '<i class="fa fa-code"></i>'.$this->managerTheme->getLexicon('manage_snippets').'<i class="fa fa-angle-right toggle"></i>',

+                'index.php?a=76&tab='.$tab++,

                 $this->managerTheme->getLexicon('manage_snippets'),

                 '',

                 'new_snippet,edit_snippet',

@@ -489,8 +489,8 @@ 
             $this->sitemenu['element_plugins'] = [

                 'element_plugins',

                 'elements',

-                '<i class="fa fa-plug"></i>' . $this->managerTheme->getLexicon('manage_plugins') . '<i class="fa fa-angle-right toggle"></i>',

-                'index.php?a=76&tab=' . $tab++,

+                '<i class="fa fa-plug"></i>'.$this->managerTheme->getLexicon('manage_plugins').'<i class="fa fa-angle-right toggle"></i>',

+                'index.php?a=76&tab='.$tab++,

                 $this->managerTheme->getLexicon('manage_plugins'),

                 '',

                 'new_plugin,edit_plugin',

@@ -510,7 +510,7 @@ 
             $this->sitemenu['manage_files'] = [

                 'manage_files',

                 'elements',

-                '<i class="fa fa-folder-open-o"></i>' . $this->managerTheme->getLexicon('manage_files'),

+                '<i class="fa fa-folder-open-o"></i>'.$this->managerTheme->getLexicon('manage_files'),

                 'index.php?a=31',

                 $this->managerTheme->getLexicon('manage_files'),

                 '',

@@ -531,7 +531,7 @@ 
             $this->sitemenu['manage_categories'] = [

                 'manage_categories',

                 'elements',

-                '<i class="fa fa-object-group"></i>' . $this->managerTheme->getLexicon('manage_categories'),

+                '<i class="fa fa-object-group"></i>'.$this->managerTheme->getLexicon('manage_categories'),

                 'index.php?a=120',

                 $this->managerTheme->getLexicon('manage_categories'),

                 '',

@@ -556,7 +556,7 @@ 
             $this->sitemenu['new_module'] = [

                 'new_module',

                 'modules',

-                '<i class="' . $this->managerTheme->getStyle('icons_modules') . '"></i>' . $this->managerTheme->getLexicon('module_management'),

+                '<i class="'.$this->managerTheme->getStyle('icons_modules').'"></i>'.$this->managerTheme->getLexicon('module_management'),

                 'index.php?a=106',

                 $this->managerTheme->getLexicon('module_management'),

                 '',

@@ -576,10 +576,10 @@ 
         if ($this->managerTheme->getCore()->hasPermission('exec_module')) {

             if ($_SESSION['mgrRole'] != 1 && $this->managerTheme->getCore()->getConfig('use_udperms') === true) {

                 $rs = $this->managerTheme->getCore()->getDatabase()->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

-				FROM ' . $this->managerTheme->getCore()->getDatabase()->getFullTableName('site_modules') . ' AS sm

-				LEFT JOIN ' . $this->managerTheme->getCore()->getDatabase()->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

-				LEFT JOIN ' . $this->managerTheme->getCore()->getDatabase()->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

-                WHERE (mg.member IS NULL OR mg.member = ' . $this->managerTheme->getCore()->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

+				FROM ' . $this->managerTheme->getCore()->getDatabase()->getFullTableName('site_modules').' AS sm

+				LEFT JOIN ' . $this->managerTheme->getCore()->getDatabase()->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id

+				LEFT JOIN ' . $this->managerTheme->getCore()->getDatabase()->getFullTableName('member_groups').' AS mg ON sma.usergroup = mg.user_group

+                WHERE (mg.member IS NULL OR mg.member = ' . $this->managerTheme->getCore()->getLoginUserID().') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

             } else {

                 $rs = $this->managerTheme->getCore()->getDatabase()->select(

@@ -591,11 +591,11 @@ 
             }

             if ($this->managerTheme->getCore()->getDatabase()->getRecordCount($rs)) {

                 while ($row = $this->managerTheme->getCore()->getDatabase()->getRow($rs)) {

-                    $this->sitemenu['module' . $row['id']] = [

-                        'module' . $row['id'],

+                    $this->sitemenu['module'.$row['id']] = [

+                        'module'.$row['id'],

                         'modules',

-                        ($row['icon'] != '' ? '<i class="' . $row['icon'] . '"></i>' : '<i class="' . $this->managerTheme->getStyle('icons_module') . '"></i>') . $row['name'],

-                        'index.php?a=112&id=' . $row['id'],

+                        ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$this->managerTheme->getStyle('icons_module').'"></i>').$row['name'],

+                        'index.php?a=112&id='.$row['id'],

                         $row['name'],

                         '',

                         '',

@@ -617,7 +617,7 @@ 
             $this->sitemenu['user_management_title'] = [

                 'user_management_title',

                 'users',

-                '<i class="fa fa fa-user"></i>' . $this->managerTheme->getLexicon('user_management_title') . '<i class="fa fa-angle-right toggle"></i>',

+                '<i class="fa fa fa-user"></i>'.$this->managerTheme->getLexicon('user_management_title').'<i class="fa fa-angle-right toggle"></i>',

                 'index.php?a=75',

                 $this->managerTheme->getLexicon('user_management_title'),

                 '',

@@ -638,7 +638,7 @@ 
             $this->sitemenu['web_user_management_title'] = [

                 'web_user_management_title',

                 'users',

-                '<i class="fa fa-users"></i>' . $this->managerTheme->getLexicon('web_user_management_title') . '<i class="fa fa-angle-right toggle"></i>',

+                '<i class="fa fa-users"></i>'.$this->managerTheme->getLexicon('web_user_management_title').'<i class="fa fa-angle-right toggle"></i>',

                 'index.php?a=99',

                 $this->managerTheme->getLexicon('web_user_management_title'),

                 '',

@@ -659,7 +659,7 @@ 
             $this->sitemenu['role_management_title'] = [

                 'role_management_title',

                 'users',

-                '<i class="fa fa-legal"></i>' . $this->managerTheme->getLexicon('role_management_title'),

+                '<i class="fa fa-legal"></i>'.$this->managerTheme->getLexicon('role_management_title'),

                 'index.php?a=86',

                 $this->managerTheme->getLexicon('role_management_title'),

                 '',

@@ -680,7 +680,7 @@ 
             $this->sitemenu['manager_permissions'] = [

                 'manager_permissions',

                 'users',

-                '<i class="fa fa-male"></i>' . $this->managerTheme->getLexicon('manager_permissions'),

+                '<i class="fa fa-male"></i>'.$this->managerTheme->getLexicon('manager_permissions'),

                 'index.php?a=40',

                 $this->managerTheme->getLexicon('manager_permissions'),

                 '',

@@ -701,7 +701,7 @@ 
             $this->sitemenu['web_permissions'] = [

                 'web_permissions',

                 'users',

-                '<i class="fa fa-universal-access"></i>' . $this->managerTheme->getLexicon('web_permissions'),

+                '<i class="fa fa-universal-access"></i>'.$this->managerTheme->getLexicon('web_permissions'),

                 'index.php?a=91',

                 $this->managerTheme->getLexicon('web_permissions'),

                 '',

@@ -721,7 +721,7 @@ 
         $this->sitemenu['refresh_site'] = [

             'refresh_site',

             'tools',

-            '<i class="fa fa-recycle"></i>' . $this->managerTheme->getLexicon('refresh_site'),

+            '<i class="fa fa-recycle"></i>'.$this->managerTheme->getLexicon('refresh_site'),

             'index.php?a=26',

             $this->managerTheme->getLexicon('refresh_site'),

             '',

@@ -738,7 +738,7 @@ 
                     // href

                     'btn btn-secondary',

                     // class or btn-success

-                    'modx.popup({url:\'index.php?a=26\', title:\'' . $this->managerTheme->getLexicon('refresh_site') . '\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })',

+                    'modx.popup({url:\'index.php?a=26\', title:\''.$this->managerTheme->getLexicon('refresh_site').'\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })',

                     // onclick

                     $this->managerTheme->getLexicon('refresh_site'),

                     // title

@@ -756,7 +756,7 @@ 
         $this->sitemenu['search'] = [

             'search',

             'tools',

-            '<i class="fa fa-search"></i>' . $this->managerTheme->getLexicon('search'),

+            '<i class="fa fa-search"></i>'.$this->managerTheme->getLexicon('search'),

             'index.php?a=71',

             $this->managerTheme->getLexicon('search'),

             '',

@@ -776,7 +776,7 @@ 
             $this->sitemenu['bk_manager'] = [

                 'bk_manager',

                 'tools',

-                '<i class="fa fa-database"></i>' . $this->managerTheme->getLexicon('bk_manager'),

+                '<i class="fa fa-database"></i>'.$this->managerTheme->getLexicon('bk_manager'),

                 'index.php?a=93',

                 $this->managerTheme->getLexicon('bk_manager'),

                 '',

@@ -797,7 +797,7 @@ 
             $this->sitemenu['remove_locks'] = [

                 'remove_locks',

                 'tools',

-                '<i class="fa fa-hourglass"></i>' . $this->managerTheme->getLexicon('remove_locks'),

+                '<i class="fa fa-hourglass"></i>'.$this->managerTheme->getLexicon('remove_locks'),

                 'javascript:modx.removeLocks();',

                 $this->managerTheme->getLexicon('remove_locks'),

                 '',

@@ -818,7 +818,7 @@ 
             $this->sitemenu['import_site'] = [

                 'import_site',

                 'tools',

-                '<i class="fa fa-upload"></i>' . $this->managerTheme->getLexicon('import_site'),

+                '<i class="fa fa-upload"></i>'.$this->managerTheme->getLexicon('import_site'),

                 'index.php?a=95',

                 $this->managerTheme->getLexicon('import_site'),

                 '',

@@ -839,7 +839,7 @@ 
             $this->sitemenu['export_site'] = [

                 'export_site',

                 'tools',

-                '<i class="fa fa-download"></i>' . $this->managerTheme->getLexicon('export_site'),

+                '<i class="fa fa-download"></i>'.$this->managerTheme->getLexicon('export_site'),

                 'index.php?a=83',

                 $this->managerTheme->getLexicon('export_site'),

                 '',

Braces +109 added lines, -109 removed lines

@@ -3,25 +3,25 @@ 
 use EvolutionCMS\Interfaces\ManagerTheme;

 use EvolutionCMS\Interfaces\ManagerThemeInterface;

 

-class Frame extends AbstractController implements ManagerTheme\PageControllerInterface

-{

+class Frame extends AbstractController implements ManagerTheme\PageControllerInterface
+{
     protected $view;

 

     protected $frame;

 

     protected $sitemenu = [];

 

-    public function __construct(ManagerThemeInterface $managerTheme, array $data = [])

-    {

+    public function __construct(ManagerThemeInterface $managerTheme, array $data = [])
+    {
         parent::__construct($managerTheme, $data);

 

         $this->frame = $this->detectFrame();

 

-        if ($this->frame > 9) {

+        if ($this->frame > 9) {
             // this is to stop the debug thingy being attached to the framesets

             $this->managerTheme->getCore()->setConfig('enable_debug', false);

         }

-        if (!empty($this->frame)) {

+        if (!empty($this->frame)) {
             $this->setView('frame.' . $this->frame);

         }

     }

@@ -59,11 +59,11 @@ 
             ]

         );

 

-        if ($this->managerTheme->getCore()->getConfig('manager_menu_height') === '') {

+        if ($this->managerTheme->getCore()->getConfig('manager_menu_height') === '') {
             $this->managerTheme->getCore()->setConfig('manager_menu_height', 2.2); // rem

         }

 

-        if ($this->managerTheme->getCore()->getConfig('manager_tree_width') === '') {

+        if ($this->managerTheme->getCore()->getConfig('manager_tree_width') === '') {
             $this->managerTheme->getCore()->setConfig('manager_tree_width', 20); // rem

         }

 

@@ -71,30 +71,30 @@ 
         $tree_width = $this->managerTheme->getCore()->getConfig('manager_tree_width');

         $this->parameters['tree_min_width'] = 0;

 

-        if (isset($_COOKIE['MODX_widthSideBar'])) {

+        if (isset($_COOKIE['MODX_widthSideBar'])) {
             $MODX_widthSideBar = $_COOKIE['MODX_widthSideBar'];

-        } else {

+        } else {
             $MODX_widthSideBar = $tree_width;

         }

         $this->parameters['MODX_widthSideBar'] = $MODX_widthSideBar;

 

-        if (!$MODX_widthSideBar) {

+        if (!$MODX_widthSideBar) {
             $body_class .= 'sidebar-closed';

         }

 

         $theme_modes = ['', 'lightness', 'light', 'dark', 'darkness'];

-        if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

+        if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
             $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

-        } elseif (!empty($theme_modes[$this->managerTheme->getCore()->getConfig('manager_theme_mode')])) {

+        } elseif (!empty($theme_modes[$this->managerTheme->getCore()->getConfig('manager_theme_mode')])) {
             $body_class .= ' ' . $theme_modes[$this->managerTheme->getCore()->getConfig('manager_theme_mode')];

         }

 

         $navbar_position = $this->managerTheme->getCore()->getConfig('manager_menu_position');

-        if ($navbar_position === 'left') {

+        if ($navbar_position === 'left') {
             $body_class .= ' navbar-left navbar-left-icon-and-text';

         }

 

-        if (isset($this->managerTheme->getCore()->pluginCache['ElementsInTree'])) {

+        if (isset($this->managerTheme->getCore()->pluginCache['ElementsInTree'])) {
             $body_class .= ' ElementsInTree';

         }

 

@@ -112,7 +112,7 @@ 
             'type8' => $this->managerTheme->getLexicon('lock_element_type_8')

         ];

 

-        foreach ($unlockTranslations as $key => $value) {

+        foreach ($unlockTranslations as $key => $value) {
             $unlockTranslations[$key] = iconv(

                 $this->managerTheme->getCore()->getConfig('modx_charset'),

                 'utf-8',

@@ -122,7 +122,7 @@ 
         $this->parameters['unlockTranslations'] = $unlockTranslations;

 

         $user = $this->managerTheme->getCore()->getUserInfo($this->managerTheme->getCore()->getLoginUserID());

-        if ((isset($user['which_browser']) && $user['which_browser'] == 'default') || (!isset($user['which_browser']))) {

+        if ((isset($user['which_browser']) && $user['which_browser'] == 'default') || (!isset($user['which_browser']))) {
             $user['which_browser'] = $this->managerTheme->getCore()->getConfig('which_browser');

         }

         $this->parameters['user'] = $user;

@@ -159,14 +159,14 @@ 
     {

         $_SESSION['browser'] = (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 1') !== false) ? 'legacy_IE' : 'modern';

 

-        if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) {

+        if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) {
             $this->parameters['initMainframeAction'] = $_SESSION['onLoginForwardToAction'];

             unset($_SESSION['onLoginForwardToAction']);

-        } else {

+        } else {
             $this->parameters['initMainframeAction'] = 2; // welcome.static

         }

 

-        if (!isset($_SESSION['tree_show_only_folders'])) {

+        if (!isset($_SESSION['tree_show_only_folders'])) {
             $_SESSION['tree_show_only_folders'] = 0;

         }

     }

@@ -175,10 +175,10 @@ 
     {

         $this->parameters['css'] = $this->managerTheme->getThemeDir(false) . 'css/page.css?v=' . EVO_INSTALL_TIME;

 

-        if ($this->managerTheme->getTheme() === 'default') {

+        if ($this->managerTheme->getTheme() === 'default') {
             $themeDir = $this->managerTheme->getThemeDir();

 

-            if (!file_exists($themeDir . 'css/styles.min.css') && is_writable($themeDir . 'css')) {

+            if (!file_exists($themeDir . 'css/styles.min.css') && is_writable($themeDir . 'css')) {
                 require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';

                 $minifier = new \Formatter\CSSMinify();

                 $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');

@@ -194,7 +194,7 @@ 
                 $minifier->addFile($themeDir . 'css/main.css');

                 file_put_contents($themeDir . 'css/styles.min.css', $minifier->minify());

             }

-            if (file_exists($themeDir . 'css/styles.min.css')) {

+            if (file_exists($themeDir . 'css/styles.min.css')) {
                 $this->parameters['css'] = $this->managerTheme->getThemeDir(false) . 'css/styles.min.css?v=' . EVO_INSTALL_TIME;

             }

         }

@@ -202,8 +202,8 @@ 
         return $this->parameters['css'];

     }

 

-    protected function makeMenu()

-    {

+    protected function makeMenu()
+    {
         $this->menuBars()

             ->menuSite()

             ->menuElementTypes()

@@ -228,15 +228,15 @@ 
             ->menuExportSite();

 

         $menu = $this->managerTheme->getCore()->invokeEvent('OnManagerMenuPrerender', ['menu' => $this->sitemenu]);

-        if (\is_array($menu)) {

+        if (\is_array($menu)) {
             $newmenu = [];

-            foreach ($menu as $item) {

+            foreach ($menu as $item) {
                 $data = unserialize($item, ['allowed_classes' => false]);

-                if (\is_array($data)) {

+                if (\is_array($data)) {
                     $newmenu = array_merge($newmenu, $data);

                 }

             }

-            if (\count($newmenu) > 0) {

+            if (\count($newmenu) > 0) {
                 $this->sitemenu = $newmenu;

             }

         }

@@ -256,8 +256,8 @@ 
             );

     }

 

-    protected function menuBars()

-    {

+    protected function menuBars()
+    {
         $this->sitemenu['bars'] = [

             'bars',

             'main',

@@ -275,8 +275,8 @@ 
         return $this;

     }

 

-    protected function menuSite()

-    {

+    protected function menuSite()
+    {
         $this->sitemenu['site'] = [

             'site',

             'main',

@@ -294,13 +294,13 @@ 
         return $this;

     }

 

-    protected function menuElementTypes()

-    {

+    protected function menuElementTypes()
+    {
         $flag = $this->managerTheme->getCore()->hasAnyPermissions(

             ['edit_template', 'edit_snippet', 'edit_chunk', 'edit_plugin', 'category_manager', 'file_manager']

         );

 

-        if ($flag) {

+        if ($flag) {
             $this->sitemenu['elements'] = [

                 'elements',

                 'main',

@@ -319,9 +319,9 @@ 
         return $this;

     }

 

-    protected function menuModules()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('exec_module')) {

+    protected function menuModules()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('exec_module')) {
             $this->sitemenu['modules'] = [

                 'modules',

                 'main',

@@ -340,12 +340,12 @@ 
         return $this;

     }

 

-    protected function menuUsers()

-    {

+    protected function menuUsers()
+    {
         $flag = $this->managerTheme->getCore()->hasAnyPermissions(

             ['edit_user', 'edit_web_user', 'edit_role', 'access_permissions', 'web_access_permissions']

         );

-        if ($flag) {

+        if ($flag) {
             $this->sitemenu['users'] = [

                 'users',

                 'main',

@@ -364,12 +364,12 @@ 
         return $this;

     }

 

-    protected function menuTools()

-    {

+    protected function menuTools()
+    {
         $flag = $this->managerTheme->getCore()->hasAnyPermissions(

             ['empty_cache', 'bk_manager', 'remove_locks', 'import_static', 'export_static']

         );

-        if ($flag) {

+        if ($flag) {
             $this->sitemenu['tools'] = [

                 'tools',

                 'main',

@@ -388,8 +388,8 @@ 
         return $this;

     }

 

-    protected function menuElements()

-    {

+    protected function menuElements()
+    {
         $tab = $this->menuElementTemplates(0);

         $tab = $this->menuElementTv($tab);

         $tab = $this->menuElementChunks($tab);

@@ -399,9 +399,9 @@ 
         return $this;

     }

 

-    protected function menuElementTemplates($tab)

-    {

-        if ($this->managerTheme->getCore()->hasPermission('edit_template')) {

+    protected function menuElementTemplates($tab)
+    {
+        if ($this->managerTheme->getCore()->hasPermission('edit_template')) {
             $this->sitemenu['element_templates'] = [

                 'element_templates',

                 'elements',

@@ -420,9 +420,9 @@ 
         return $tab;

     }

 

-    protected function menuElementTv($tab)

-    {

-        if ($this->managerTheme->getCore()->hasPermission('edit_template') && $this->managerTheme->getCore()->hasPermission('edit_snippet') && $this->managerTheme->getCore()->hasPermission('edit_chunk') && $this->managerTheme->getCore()->hasPermission('edit_plugin')) {

+    protected function menuElementTv($tab)
+    {
+        if ($this->managerTheme->getCore()->hasPermission('edit_template') && $this->managerTheme->getCore()->hasPermission('edit_snippet') && $this->managerTheme->getCore()->hasPermission('edit_chunk') && $this->managerTheme->getCore()->hasPermission('edit_plugin')) {
             $this->sitemenu['element_tplvars'] = [

                 'element_tplvars',

                 'elements',

@@ -441,9 +441,9 @@ 
         return $tab;

     }

 

-    protected function menuElementChunks($tab)

-    {

-        if ($this->managerTheme->getCore()->hasPermission('edit_chunk')) {

+    protected function menuElementChunks($tab)
+    {
+        if ($this->managerTheme->getCore()->hasPermission('edit_chunk')) {
             $this->sitemenu['element_htmlsnippets'] = [

                 'element_htmlsnippets',

                 'elements',

@@ -462,9 +462,9 @@ 
         return $tab;

     }

 

-    protected function menuElementSnippets($tab)

-    {

-        if ($this->managerTheme->getCore()->hasPermission('edit_snippet')) {

+    protected function menuElementSnippets($tab)
+    {
+        if ($this->managerTheme->getCore()->hasPermission('edit_snippet')) {
             $this->sitemenu['element_snippets'] = [

                 'element_snippets',

                 'elements',

@@ -483,9 +483,9 @@ 
         return $tab;

     }

 

-    protected function menuElementPlugins($tab)

-    {

-        if ($this->managerTheme->getCore()->hasPermission('edit_plugin')) {

+    protected function menuElementPlugins($tab)
+    {
+        if ($this->managerTheme->getCore()->hasPermission('edit_plugin')) {
             $this->sitemenu['element_plugins'] = [

                 'element_plugins',

                 'elements',

@@ -504,9 +504,9 @@ 
         return $tab;

     }

 

-    function menuFiles()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('file_manager')) {

+    function menuFiles()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('file_manager')) {
             $this->sitemenu['manage_files'] = [

                 'manage_files',

                 'elements',

@@ -525,9 +525,9 @@ 
         return $this;

     }

 

-    protected function menuCategories()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('category_manager')) {

+    protected function menuCategories()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('category_manager')) {
             $this->sitemenu['manage_categories'] = [

                 'manage_categories',

                 'elements',

@@ -546,13 +546,13 @@ 
         return $this;

     }

 

-    protected function menuNewModule()

-    {

+    protected function menuNewModule()
+    {
         $flag = $this->managerTheme->getCore()->hasAnyPermissions(

             ['new_module', 'edit_module', 'save_module']

         );

 

-        if ($flag) {

+        if ($flag) {
             $this->sitemenu['new_module'] = [

                 'new_module',

                 'modules',

@@ -571,17 +571,17 @@ 
         return $this;

     }

 

-    protected function menuRunModules()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('exec_module')) {

-            if ($_SESSION['mgrRole'] != 1 && $this->managerTheme->getCore()->getConfig('use_udperms') === true) {

+    protected function menuRunModules()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('exec_module')) {
+            if ($_SESSION['mgrRole'] != 1 && $this->managerTheme->getCore()->getConfig('use_udperms') === true) {
                 $rs = $this->managerTheme->getCore()->getDatabase()->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

 				FROM ' . $this->managerTheme->getCore()->getDatabase()->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $this->managerTheme->getCore()->getDatabase()->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $this->managerTheme->getCore()->getDatabase()->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $this->managerTheme->getCore()->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

-            } else {

+            } else {
                 $rs = $this->managerTheme->getCore()->getDatabase()->select(

                     '*',

                     $this->managerTheme->getCore()->getDatabase()->getFullTableName('site_modules'),

@@ -589,8 +589,8 @@ 
                     'name'

                 );

             }

-            if ($this->managerTheme->getCore()->getDatabase()->getRecordCount($rs)) {

-                while ($row = $this->managerTheme->getCore()->getDatabase()->getRow($rs)) {

+            if ($this->managerTheme->getCore()->getDatabase()->getRecordCount($rs)) {
+                while ($row = $this->managerTheme->getCore()->getDatabase()->getRow($rs)) {
                     $this->sitemenu['module' . $row['id']] = [

                         'module' . $row['id'],

                         'modules',

@@ -611,9 +611,9 @@ 
         return $this;

     }

 

-    protected function menuUserManagment()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('edit_user')) {

+    protected function menuUserManagment()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('edit_user')) {
             $this->sitemenu['user_management_title'] = [

                 'user_management_title',

                 'users',

@@ -632,9 +632,9 @@ 
         return $this;

     }

 

-    protected function menuWebUserManagment()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('edit_web_user')) {

+    protected function menuWebUserManagment()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('edit_web_user')) {
             $this->sitemenu['web_user_management_title'] = [

                 'web_user_management_title',

                 'users',

@@ -653,9 +653,9 @@ 
         return $this;

     }

 

-    protected function menuRoleManagment()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('edit_role')) {

+    protected function menuRoleManagment()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('edit_role')) {
             $this->sitemenu['role_management_title'] = [

                 'role_management_title',

                 'users',

@@ -674,9 +674,9 @@ 
         return $this;

     }

 

-    protected function menuPermissions()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('access_permissions')) {

+    protected function menuPermissions()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('access_permissions')) {
             $this->sitemenu['manager_permissions'] = [

                 'manager_permissions',

                 'users',

@@ -695,9 +695,9 @@ 
         return $this;

     }

 

-    protected function menuWebPermissions()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('web_access_permissions')) {

+    protected function menuWebPermissions()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('web_access_permissions')) {
             $this->sitemenu['web_permissions'] = [

                 'web_permissions',

                 'users',

@@ -716,8 +716,8 @@ 
         return $this;

     }

 

-    protected function menuRefreshSite()

-    {

+    protected function menuRefreshSite()
+    {
         $this->sitemenu['refresh_site'] = [

             'refresh_site',

             'tools',

@@ -751,8 +751,8 @@ 
         return $this;

     }

 

-    protected function menuSearch()

-    {

+    protected function menuSearch()
+    {
         $this->sitemenu['search'] = [

             'search',

             'tools',

@@ -770,9 +770,9 @@ 
         return $this;

     }

 

-    protected function menuBkManager()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('bk_manager')) {

+    protected function menuBkManager()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('bk_manager')) {
             $this->sitemenu['bk_manager'] = [

                 'bk_manager',

                 'tools',

@@ -791,9 +791,9 @@ 
         return $this;

     }

 

-    protected function menuRemoveLocks()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('remove_locks')) {

+    protected function menuRemoveLocks()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('remove_locks')) {
             $this->sitemenu['remove_locks'] = [

                 'remove_locks',

                 'tools',

@@ -812,9 +812,9 @@ 
         return $this;

     }

 

-    protected function menuImportSite()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('import_static')) {

+    protected function menuImportSite()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('import_static')) {
             $this->sitemenu['import_site'] = [

                 'import_site',

                 'tools',

@@ -833,9 +833,9 @@ 
         return $this;

     }

 

-    protected function menuExportSite()

-    {

-        if ($this->managerTheme->getCore()->hasPermission('export_static')) {

+    protected function menuExportSite()
+    {
+        if ($this->managerTheme->getCore()->hasPermission('export_static')) {
             $this->sitemenu['export_site'] = [

                 'export_site',

                 'tools',

core/src/Controllers/MoveDocument.php

Doc Comments +4 added lines, -1 removed lines

@@ -135,7 +135,7 @@ 
     }

 

     /**

-     * @param string|int $id

+     * @param integer $id

      * @return Models\SiteContent

      */

     protected function getDocument($id) : Models\SiteContent

@@ -153,6 +153,9 @@ 
         return $document;

     }

 

+    /**
+     * @param integer $id
+     */
     protected function checkNewParentPermission($id)

     {

         $udperms = new Permissions;

Unused Use Statements +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php namespace EvolutionCMS\Controllers;

 

-use EvolutionCMS\Interfaces\ManagerTheme;

-use EvolutionCMS\Models;

-use EvolutionCMS\Legacy\Permissions;

+use EvolutionCMS\Interfaces\ManagerTheme;
+use EvolutionCMS\Legacy\Permissions;
+use EvolutionCMS\Models;
 use Exception;

 

 class MoveDocument extends AbstractController implements ManagerTheme\PageControllerInterface

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 

     public function process() : bool

     {

-        if ((int)$this->getIndex() === 52) {

+        if ((int) $this->getIndex() === 52) {

             $this->handle();

             $flag = false;

         } else {

@@ -40,7 +40,7 @@ 
 

     protected function handle()

     {

-        $newParentID = (int)get_by_key($_REQUEST, 'new_parent', 0, 'is_scalar');

+        $newParentID = (int) get_by_key($_REQUEST, 'new_parent', 0, 'is_scalar');

         $documentID = $this->getElementId();

 

         // ok, two things to check.

@@ -73,7 +73,7 @@ 
         ]);

 

         if (\is_array($evtOut) && count($evtOut) > 0) {

-            $newParent = (int)array_pop($evtOut);

+            $newParent = (int) array_pop($evtOut);

             if ($newParent === $document->parent) {

                 $this->managerTheme->alertAndQuit('error_movedocument2');

             } else {

@@ -109,7 +109,7 @@ 
         // empty cache & sync site

         $this->managerTheme->getCore()->clearCache('full');

 

-        header('Location: index.php?a=3&id=' . $document->getKey() . '&r=9');

+        header('Location: index.php?a=3&id='.$document->getKey().'&r=9');

     }

 

     protected function processDisplay() : bool

@@ -160,7 +160,7 @@ 
         $udperms->document = $id;

         $udperms->role = $_SESSION['mgrRole'];

 

-        if (! $udperms->checkPermissions()) {

+        if (!$udperms->checkPermissions()) {

             $this->managerTheme->alertAndQuit('access_permission_parent_denied');

         }

     }

Braces +22 added lines, -22 removed lines

@@ -5,8 +5,8 @@ 
 use EvolutionCMS\Legacy\Permissions;

 use Exception;

 

-class MoveDocument extends AbstractController implements ManagerTheme\PageControllerInterface

-{

+class MoveDocument extends AbstractController implements ManagerTheme\PageControllerInterface
+{
     protected $view = 'page.move_document';

 

     /**

@@ -27,10 +27,10 @@ 
 

     public function process() : bool

     {

-        if ((int)$this->getIndex() === 52) {

+        if ((int)$this->getIndex() === 52) {
             $this->handle();

             $flag = false;

-        } else {

+        } else {
             $this->processDisplay();

             $flag = true;

         }

@@ -38,31 +38,31 @@ 
         return $flag;

     }

 

-    protected function handle()

-    {

+    protected function handle()
+    {
         $newParentID = (int)get_by_key($_REQUEST, 'new_parent', 0, 'is_scalar');

         $documentID = $this->getElementId();

 

         // ok, two things to check.

         // first, document cannot be moved to itself

         // second, new parent must be a folder. If not, set it to folder.

-        if ($documentID === $newParentID) {

+        if ($documentID === $newParentID) {
             $this->managerTheme->alertAndQuit('error_movedocument1');

         }

 

-        if ($documentID <= 0 || $newParentID < 0) {

+        if ($documentID <= 0 || $newParentID < 0) {
             $this->managerTheme->alertAndQuit('error_movedocument2');

         }

 

         $document = $this->getDocument($documentID);

 

         $parents = $this->managerTheme->getCore()->getParentIds($newParentID);

-        if (\in_array($document->getKey(), $parents, true)) {

+        if (\in_array($document->getKey(), $parents, true)) {
             $this->managerTheme->alertAndQuit('error_movedocument2');

         }

 

         // check user has permission to move document to chosen location

-        if ($this->managerTheme->getCore()->getConfig('use_udperms') && $document->parent !== $newParentID) {

+        if ($this->managerTheme->getCore()->getConfig('use_udperms') && $document->parent !== $newParentID) {
             $this->checkNewParentPermission($newParentID);

         }

 

@@ -72,11 +72,11 @@ 
             'new_parent' => $newParentID

         ]);

 

-        if (\is_array($evtOut) && count($evtOut) > 0) {

+        if (\is_array($evtOut) && count($evtOut) > 0) {
             $newParent = (int)array_pop($evtOut);

-            if ($newParent === $document->parent) {

+            if ($newParent === $document->parent) {
                 $this->managerTheme->alertAndQuit('error_movedocument2');

-            } else {

+            } else {
                 $newParentID = $newParent;

             }

         }

@@ -84,13 +84,13 @@ 
         $parentDocument = $this->getDocument($newParentID);

 

         $children = allChildren($document->getKey());

-        if (\in_array($parentDocument->getKey(), $children, true)) {

+        if (\in_array($parentDocument->getKey(), $children, true)) {
             $this->managerTheme->alertAndQuit('You cannot move a document to a child document!', false);

         }

 

         $parentDocument->isfolder = true;

         $parentDocument->save();

-        if ($document->ancestor->childrens()->count() <= 1) {

+        if ($document->ancestor->childrens()->count() <= 1) {
             $document->ancestor->isfolder = false;

             $document->ancestor->save();

         }

@@ -123,7 +123,7 @@ 
         $udperms->document = $document->getKey();

         $udperms->role = $_SESSION['mgrRole'];

 

-        if (!$udperms->checkPermissions()) {

+        if (!$udperms->checkPermissions()) {
             $this->managerTheme->alertAndQuit('access_permission_denied');

         }

 

@@ -140,27 +140,27 @@ 
      */

     protected function getDocument($id) : Models\SiteContent

     {

-        try {

-            if ($id <= 0) {

+        try {
+            if ($id <= 0) {
                 throw new Exception();

             }

             /** @var Models\SiteContent $document */

             $document = Models\SiteContent::withTrashed()->findOrFail($id);

-        } catch (Exception $exception) {

+        } catch (Exception $exception) {
             $this->managerTheme->alertAndQuit('error_no_id');

         }

 

         return $document;

     }

 

-    protected function checkNewParentPermission($id)

-    {

+    protected function checkNewParentPermission($id)
+    {
         $udperms = new Permissions;

         $udperms->user = $this->managerTheme->getCore()->getLoginUserID();

         $udperms->document = $id;

         $udperms->role = $_SESSION['mgrRole'];

 

-        if (! $udperms->checkPermissions()) {

+        if (! $udperms->checkPermissions()) {
             $this->managerTheme->alertAndQuit('access_permission_parent_denied');

         }

     }

core/src/Controllers/Password.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Controllers;
 
-use EvolutionCMS\Models;
 use EvolutionCMS\Interfaces\ManagerTheme;
+use EvolutionCMS\Models;
 
 class Password extends AbstractController implements ManagerTheme\PageControllerInterface
 {

core/src/Controllers/Plugin.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Controllers;
 
-use EvolutionCMS\Models;
 use EvolutionCMS\Interfaces\ManagerTheme;
+use EvolutionCMS\Models;
 use Illuminate\Support\Collection;
 
 class Plugin extends AbstractController implements ManagerTheme\PageControllerInterface

Spacing +5 added lines, -5 removed lines

@@ -86,7 +86,7 @@ 
 
         if ($data->exists) {
             if (empty($data->count())) {
-                $this->managerTheme->alertAndQuit('Plugin not found for id ' . $id . '.', false);
+                $this->managerTheme->alertAndQuit('Plugin not found for id '.$id.'.', false);
             }
 
             $_SESSION['itemname'] = $data->name;
@@ -123,13 +123,13 @@ 
             ->getDatabase()
             ->select('sm.id,sm.name,sm.guid', $this->managerTheme->getCore()
                     ->getDatabase()
-                    ->getFullTableName("site_modules") . " sm
+                    ->getFullTableName("site_modules")." sm
 					INNER JOIN " . $this->managerTheme->getCore()
                     ->getDatabase()
-                    ->getFullTableName("site_module_depobj") . " smd ON smd.module=sm.id AND smd.type=30
+                    ->getFullTableName("site_module_depobj")." smd ON smd.module=sm.id AND smd.type=30
 					INNER JOIN " . $this->managerTheme->getCore()
                     ->getDatabase()
-                    ->getFullTableName("site_plugins") . " 
+                    ->getFullTableName("site_plugins")." 
                     sp ON sp.id=smd.resource", "smd.resource='{$this->object->getKey()}' AND sm.enable_sharedparams='1'",
                 'sm.name');
         while ($row = $this->managerTheme->getCore()
@@ -180,7 +180,7 @@ 
             $out = implode('', $out);
         }
 
-        return (string)$out;
+        return (string) $out;
     }
 
     protected function parameterActionButtons()

core/src/Controllers/PluginPriority.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Controllers;

 

-use EvolutionCMS\Models;

-use EvolutionCMS\Interfaces\ManagerTheme;

+use EvolutionCMS\Interfaces\ManagerTheme;
+use EvolutionCMS\Models;
 use Illuminate\Database\Eloquent;

 

 

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     {

         return Models\SystemEventname::with(

             [

-                'plugins' => function (Eloquent\Relations\BelongsToMany $query) {

+                'plugins' => function(Eloquent\Relations\BelongsToMany $query){

                     $query->orderBy('priority');

                 }

             ]

Braces +9 added lines, -9 removed lines

@@ -5,8 +5,8 @@ 
 use Illuminate\Database\Eloquent;

 

 

-class PluginPriority extends AbstractController implements ManagerTheme\PageControllerInterface

-{

+class PluginPriority extends AbstractController implements ManagerTheme\PageControllerInterface
+{
     protected $view = 'page.plugin_priority';

 

     /**

@@ -39,7 +39,7 @@ 
     {

         return Models\SystemEventname::with(

             [

-                'plugins' => function (Eloquent\Relations\BelongsToMany $query) {

+                'plugins' => function (Eloquent\Relations\BelongsToMany $query){
                     $query->orderBy('priority');

                 }

             ]

@@ -50,19 +50,19 @@ 
     {

         $updateMsg = false;

 

-        if (isset($_POST['listSubmitted'])) {

+        if (isset($_POST['listSubmitted'])) {
             $updateMsg = true;

             $tbl = $this->managerTheme->getCore()->getDatabase()->getFullTableName('site_plugin_events');

 

-            foreach ($_POST as $listName => $listValue) {

-                if ($listName === 'listSubmitted') {

+            foreach ($_POST as $listName => $listValue) {
+                if ($listName === 'listSubmitted') {
                     continue;

                 }

                 $orderArray = explode(',', $listValue);

                 $listName = ltrim($listName, 'list_');

-                if (\count($orderArray) > 0) {

-                    foreach ($orderArray as $key => $item) {

-                        if ($item == '') {

+                if (\count($orderArray) > 0) {
+                    foreach ($orderArray as $key => $item) {
+                        if ($item == '') {
                             continue;

                         }

                         $pluginId = ltrim($item, 'item_');

core/src/Controllers/Resources.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php namespace EvolutionCMS\Controllers;
 
 use EvolutionCMS\Interfaces\ManagerTheme;
-use Illuminate\Support\Arr;
 
 class Resources extends AbstractResources implements ManagerTheme\PageControllerInterface
 {

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
         }
         foreach ($this->tabs as $tabN => $tabClass) {
             if (($tabController = $this->makeTab($tabClass, $tabN)) !== null) {
-                if ((string)$tab !== (string)$tabN) {
+                if ((string) $tab !== (string) $tabN) {
                     $tabController->setNoData();
                 } else {
                     $activeTab = $tabController->getTabName();
@@ -48,7 +48,7 @@ 
         return array_merge(compact('tabs'), parent::getParameters($params), compact('activeTab'));
     }
 
-    protected function makeTab($tabClass, int $index = 0) :? ManagerTheme\TabControllerInterface
+    protected function makeTab($tabClass, int $index = 0) : ? ManagerTheme\TabControllerInterface
     {
         $tabController = null;
         if (class_exists($tabClass) &&
@@ -57,7 +57,7 @@ 
             /** @var ManagerTheme\TabControllerInterface $tabController */
             $tabController = new $tabClass($this->managerTheme);
             $tabController->setIndex($index);
-            if (! $tabController->canView()) {
+            if (!$tabController->canView()) {
                 $tabController = null;
             }
         }
@@ -82,7 +82,7 @@ 
 
     protected function needTab()
     {
-        return get_by_key($_GET, 'tab', 0, function ($val) {
+        return get_by_key($_GET, 'tab', 0, function($val){
             return is_numeric($val) && array_key_exists($val, $this->tabs);
         });
     }

Braces +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 
     protected function needTab()
     {
-        return get_by_key($_GET, 'tab', 0, function ($val) {
+        return get_by_key($_GET, 'tab', 0, function ($val){
             return is_numeric($val) && array_key_exists($val, $this->tabs);
         });
     }

core/src/Controllers/Resources/Chunks.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <?php namespace EvolutionCMS\Controllers\Resources;
 
-use EvolutionCMS\Models;
 use EvolutionCMS\Controllers\AbstractResources;
 use EvolutionCMS\Interfaces\ManagerTheme\TabControllerInterface;
-use Illuminate\Support\Collection;
+use EvolutionCMS\Models;
 use Illuminate\Database\Eloquent;
+use Illuminate\Support\Collection;
 
 //'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
 class Chunks extends AbstractResources implements TabControllerInterface

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
      */
     public function getTabName($withIndex = true): string
     {
-        return 'tabChunks' . ($withIndex ? '-' . $this->getIndex() : '');
+        return 'tabChunks'.($withIndex ? '-'.$this->getIndex() : '');
     }
 
     /**
@@ -65,7 +65,7 @@ 
     protected function parameterCategories() : Collection
     {
         return Models\Category::with('chunks')
-            ->whereHas('chunks', function (Eloquent\Builder $builder) {
+            ->whereHas('chunks', function(Eloquent\Builder $builder){
                 return $builder->lockedView();
             })->orderBy('rank', 'ASC')
             ->get();

Braces +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
     protected function parameterCategories() : Collection
     {
         return Models\Category::with('chunks')
-            ->whereHas('chunks', function (Eloquent\Builder $builder) {
+            ->whereHas('chunks', function (Eloquent\Builder $builder){
                 return $builder->lockedView();
             })->orderBy('rank', 'ASC')
             ->get();