Inspection of "Merge pull request #667 from pmfx/develop" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( f266be...c88d0f )

by Dmytro

created 2018-05-02 10:18 UTC

Status

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 header("X-XSS-Protection: 0");
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
 
 $theme_modes = array('', '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[$modx->config['manager_theme_mode']])) {
-    $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];
+    $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']];
 }
 
 $navbar_position = $modx->config['manager_menu_position'];
@@ -82,36 +82,36 @@  discard block
 block discarded – undo
     $user['which_browser'] = $modx->config['which_browser'];
 }
 
-$css = 'media/style/' . $modx->config['manager_theme'] . '/css/page.css?v=' . $lastInstallTime;
+$css = 'media/style/'.$modx->config['manager_theme'].'/css/page.css?v='.$lastInstallTime;
 
 if ($modx->config['manager_theme'] == 'default') {
-    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
-        require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';
+    if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css') && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/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(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css');
-        $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css');
+        $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(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css');
+        $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css');
         $css = $minifier->minify();
-        file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $css);
+        file_put_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css', $css);
     }
-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
-        $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;
+    if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
+        $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;
     }
 }
 
-$modx->config['global_tabs'] = (int)($modx->config['global_tabs'] && ($user['role'] == 1 || $modx->hasPermission('edit_template') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_plugin')));
+$modx->config['global_tabs'] = (int) ($modx->config['global_tabs'] && ($user['role'] == 1 || $modx->hasPermission('edit_template') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_plugin')));
 
 ?>
 <!DOCTYPE html>
-<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="') . $mxla . '" xml:lang="' . $mxla . '"' ?>>
+<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="').$mxla.'" xml:lang="'.$mxla.'"' ?>>
 <head>
     <title><?= $site_name ?>- (EVO CMS Manager)</title>
     <meta http-equiv="Content-Type" content="text/html; charset=<?= $modx_manager_charset ?>" />
@@ -142,21 +142,21 @@  discard block
 block discarded – undo
         MODX_SITE_URL: '<?= MODX_SITE_URL ?>',
         MODX_MANAGER_URL: '<?= MODX_MANAGER_URL ?>',
         user: {
-          role: <?= (int)$user['role'] ?>,
+          role: <?= (int) $user['role'] ?>,
           username: '<?= $user['username'] ?>'
         },
         config: {
           mail_check_timeperiod: <?= $modx->config['mail_check_timeperiod'] ?>,
-          menu_height: <?= (int)$menu_height ?>,
-          tree_width: <?= (int)$tree_width ?>,
-          tree_min_width: <?= (int)$tree_min_width ?>,
-          session_timeout: <?= (int)$modx->config['session_timeout'] ?>,
-          site_start: <?= (int)$modx->config['site_start'] ?>,
-          tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int)$modx->config['tree_page_click'] : 27) ?>,
+          menu_height: <?= (int) $menu_height ?>,
+          tree_width: <?= (int) $tree_width ?>,
+          tree_min_width: <?= (int) $tree_min_width ?>,
+          session_timeout: <?= (int) $modx->config['session_timeout'] ?>,
+          site_start: <?= (int) $modx->config['site_start'] ?>,
+          tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int) $modx->config['tree_page_click'] : 27) ?>,
           theme: '<?= $modx->config['manager_theme'] ?>',
           theme_mode: '<?= $modx->config['manager_theme_mode'] ?>',
           which_browser: '<?= $user['which_browser'] ?>',
-          layout: <?= (int)$manager_layout ?>,
+          layout: <?= (int) $manager_layout ?>,
           textdir: '<?= $modx_textdir ?>',
           global_tabs: <?= $modx->config['global_tabs'] ?>
 
@@ -241,11 +241,11 @@  discard block
 block discarded – undo
           delete a[b];
         },
         openedArray: [],
-        lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . "\n" ?>
+        lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE)."\n" ?>
       };
       <?php
       $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));
-      echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";
+      echo (empty($opened) ? '' : 'modx.openedArray['.implode("] = 1;\n		modx.openedArray[", $opened).'] = 1;')."\n";
       ?>
     </script>
     <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/modx.min.js?v=<?= $lastInstallTime ?>"></script>
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
                             <a href="javascript:;" class="dropdown-toggle" onclick="return false;">
                                 <span class="username"><?= $user['username'] ?></span>
                                 <?php if ($user['photo']) { ?>
-                                    <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL . $user['photo'] ?>);"></span>
+                                    <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL.$user['photo'] ?>);"></span>
                                 <?php } else { ?>
                                     <span class="icon"><?= $_style['menu_user'] ?></span>
                                 <?php } ?>
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
                                 $version = 'Evolution';
                                 ?>
                                 <?php
-                                echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>' . $version . ' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);
+                                echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>'.$version.' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);
                                 ?>
                             </ul>
                         </li>
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
      */
     function constructLink($action, $img, $text, $allowed)
     {
-        if ((bool)$allowed) {
+        if ((bool) $allowed) {
             echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action, $action);
             echo sprintf('<i class="%s"></i> %s</div>', $img, $text);
         }
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
     <script type="text/javascript">
 
       if (document.getElementById('treeMenu')) {
-          <?php if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>
+          <?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>
 
         document.getElementById('treeMenu_openelements').onclick = function(e) {
           e.preventDefault();
@@ -566,12 +566,12 @@  discard block
 block discarded – undo
           }
         };
           <?php } ?>
-          <?php if($use_browser && $modx->hasPermission('assets_images')) { ?>
+          <?php if ($use_browser && $modx->hasPermission('assets_images')) { ?>
 
         document.getElementById('treeMenu_openimages').onclick = function(e) {
           e.preventDefault();
           if (modx.config.global_tabs && !e.shiftKey) {
-            modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});
+            modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});
           } else {
             var randomNum = '<?= $_lang["files_files"] ?>';
             if (e.shiftKey) {
@@ -584,12 +584,12 @@  discard block
 block discarded – undo
           }
         };
           <?php } ?>
-          <?php if($use_browser && $modx->hasPermission('assets_files')) { ?>
+          <?php if ($use_browser && $modx->hasPermission('assets_files')) { ?>
 
         document.getElementById('treeMenu_openfiles').onclick = function(e) {
           e.preventDefault();
           if (modx.config.global_tabs && !e.shiftKey) {
-            modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});
+            modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});
           } else {
             var randomNum = '<?= $_lang["files_files"] ?>';
             if (e.shiftKey) {
@@ -643,7 +643,7 @@  discard block
 block discarded – undo
 
 </div>
 <?php if ($modx->config['show_picker'] != "0") {
-    include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');
+    include('media/style/'.$modx->config['manager_theme'].'/color.switcher.php');
 } ?>
 </body>
 </html>

Please login to merge, or discard this patch.

manager/frames/mainmenu.php 1 patch

Spacing +69 added lines, -69 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 $sitemenu['site'] = array(
 	'site',
 	'main',
-	'<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>',
+	'<i class="fa fa-tachometer"></i><span class="menu-item-text">'.$_lang['home'].'</span>',
 	'index.php?a=2',
 	$_lang['home'],
 	'',
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
 	'active'
 );
 
-if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
+if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
 	$sitemenu['elements'] = array(
 		'elements',
 		'main',
-		'<i class="fa fa-th"></i><span class="menu-item-text">' . $_lang['elements'] . '</span>',
+		'<i class="fa fa-th"></i><span class="menu-item-text">'.$_lang['elements'].'</span>',
 		'javascript:;',
 		$_lang['elements'],
 		' return false;',
@@ -48,11 +48,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('exec_module')) {
+if ($modx->hasPermission('exec_module')) {
 	$sitemenu['modules'] = array(
 		'modules',
 		'main',
-		'<i class="'.$_style['icons_modules'] .'"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>',
+		'<i class="'.$_style['icons_modules'].'"></i><span class="menu-item-text">'.$_lang['modules'].'</span>',
 		'javascript:;',
 		$_lang['modules'],
 		' return false;',
@@ -64,11 +64,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
+if ($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
 	$sitemenu['users'] = array(
 		'users',
 		'main',
-		'<i class="fa fa-users"></i><span class="menu-item-text">' . $_lang['users'] . '</span>',
+		'<i class="fa fa-users"></i><span class="menu-item-text">'.$_lang['users'].'</span>',
 		'javascript:;',
 		$_lang['users'],
 		' return false;',
@@ -80,11 +80,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
+if ($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
 	$sitemenu['tools'] = array(
 		'tools',
 		'main',
-		'<i class="fa fa-wrench"></i><span class="menu-item-text">' . $_lang['tools'] . '</span>',
+		'<i class="fa fa-wrench"></i><span class="menu-item-text">'.$_lang['tools'].'</span>',
 		'javascript:;',
 		$_lang['tools'],
 		' return false;',
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
 }
 
 $tab = 0;
-if($modx->hasPermission('edit_template')) {
+if ($modx->hasPermission('edit_template')) {
 	$sitemenu['element_templates'] = array(
 		'element_templates',
 		'elements',
-		'<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
+		'<i class="fa fa-newspaper-o"></i>'.$_lang['manage_templates'].'<i class="fa fa-angle-right toggle"></i>',
+		'index.php?a=76&tab='.$tab++,
 		$_lang['manage_templates'],
 		'',
 		'new_template,edit_template',
@@ -112,12 +112,12 @@  discard block
 block discarded – undo
 		'dropdown-toggle'
 	);
 }
-if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
+if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_tplvars'] = array(
 		'element_tplvars',
 		'elements',
-		'<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
+		'<i class="fa fa-list-alt"></i>'.$_lang['tmplvars'].'<i class="fa fa-angle-right toggle"></i>',
+		'index.php?a=76&tab='.$tab++,
 		$_lang['tmplvars'],
 		'',
 		'new_template,edit_template',
@@ -127,12 +127,12 @@  discard block
 block discarded – undo
 		'dropdown-toggle'
 	);
 }
-if($modx->hasPermission('edit_chunk')) {
+if ($modx->hasPermission('edit_chunk')) {
 	$sitemenu['element_htmlsnippets'] = array(
 		'element_htmlsnippets',
 		'elements',
-		'<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
+		'<i class="fa fa-th-large"></i>'.$_lang['manage_htmlsnippets'].'<i class="fa fa-angle-right toggle"></i>',
+		'index.php?a=76&tab='.$tab++,
 		$_lang['manage_htmlsnippets'],
 		'',
 		'new_chunk,edit_chunk',
@@ -142,12 +142,12 @@  discard block
 block discarded – undo
 		'dropdown-toggle'
 	);
 }
-if($modx->hasPermission('edit_snippet')) {
+if ($modx->hasPermission('edit_snippet')) {
 	$sitemenu['element_snippets'] = array(
 		'element_snippets',
 		'elements',
-		'<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
+		'<i class="fa fa-code"></i>'.$_lang['manage_snippets'].'<i class="fa fa-angle-right toggle"></i>',
+		'index.php?a=76&tab='.$tab++,
 		$_lang['manage_snippets'],
 		'',
 		'new_snippet,edit_snippet',
@@ -157,12 +157,12 @@  discard block
 block discarded – undo
 		'dropdown-toggle'
 	);
 }
-if($modx->hasPermission('edit_plugin')) {
+if ($modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_plugins'] = array(
 		'element_plugins',
 		'elements',
-		'<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',
-		'index.php?a=76&tab=' . $tab++,
+		'<i class="fa fa-plug"></i>'.$_lang['manage_plugins'].'<i class="fa fa-angle-right toggle"></i>',
+		'index.php?a=76&tab='.$tab++,
 		$_lang['manage_plugins'],
 		'',
 		'new_plugin,edit_plugin',
@@ -174,11 +174,11 @@  discard block
 block discarded – undo
 }
 //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');
 
-if($modx->hasPermission('file_manager')) {
+if ($modx->hasPermission('file_manager')) {
 	$sitemenu['manage_files'] = array(
 		'manage_files',
 		'elements',
-		'<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],
+		'<i class="fa fa-folder-open-o"></i>'.$_lang['manage_files'],
 		'index.php?a=31',
 		$_lang['manage_files'],
 		'',
@@ -189,11 +189,11 @@  discard block
 block discarded – undo
 		''
 	);
 }
-if($modx->hasPermission('category_manager')) {
+if ($modx->hasPermission('category_manager')) {
 	$sitemenu['manage_categories'] = array(
 		'manage_categories',
 		'elements',
-		'<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],
+		'<i class="fa fa-object-group"></i>'.$_lang['manage_categories'],
 		'index.php?a=120',
 		$_lang['manage_categories'],
 		'',
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
 }
 
 // Modules Menu Items
-if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
+if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
 	$sitemenu['new_module'] = array(
 		'new_module',
 		'modules',
-		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],
+		'<i class="'.$_style['icons_modules'].'"></i>'.$_lang['module_management'],
 		'index.php?a=106',
 		$_lang['module_management'],
 		'',
@@ -222,24 +222,24 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('exec_module')) {
-	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
+if ($modx->hasPermission('exec_module')) {
+	if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
 		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
-				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
-				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
-				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
-                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1
+				FROM ' . $modx->getFullTableName('site_modules').' AS sm
+				LEFT JOIN ' . $modx->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id
+				LEFT JOIN ' . $modx->getFullTableName('member_groups').' AS mg ON sma.usergroup = mg.user_group
+                WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID().') AND sm.disabled != 1 AND sm.locked != 1
                 ORDER BY sm.name');
 	} else {
 		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
 	}
-	if($modx->db->getRecordCount($rs)) {
+	if ($modx->db->getRecordCount($rs)) {
 	    while ($row = $modx->db->getRow($rs)) {
-            $sitemenu['module' . $row['id']] = array(
-                'module' . $row['id'],
+            $sitemenu['module'.$row['id']] = array(
+                'module'.$row['id'],
                 'modules',
-                ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>') . $row['name'],
-                'index.php?a=112&id=' . $row['id'],
+                ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>').$row['name'],
+                'index.php?a=112&id='.$row['id'],
                 $row['name'],
                 '',
                 '',
@@ -254,11 +254,11 @@  discard block
 block discarded – undo
 
 // security menu items (users)
 
-if($modx->hasPermission('edit_user')) {
+if ($modx->hasPermission('edit_user')) {
 	$sitemenu['user_management_title'] = array(
 		'user_management_title',
 		'users',
-		'<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
+		'<i class="fa fa fa-user"></i>'.$_lang['user_management_title'].'<i class="fa fa-angle-right toggle"></i>',
 		'index.php?a=75',
 		$_lang['user_management_title'],
 		'',
@@ -270,11 +270,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('edit_web_user')) {
+if ($modx->hasPermission('edit_web_user')) {
 	$sitemenu['web_user_management_title'] = array(
 		'web_user_management_title',
 		'users',
-		'<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
+		'<i class="fa fa-users"></i>'.$_lang['web_user_management_title'].'<i class="fa fa-angle-right toggle"></i>',
 		'index.php?a=99',
 		$_lang['web_user_management_title'],
 		'',
@@ -286,11 +286,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('edit_role')) {
+if ($modx->hasPermission('edit_role')) {
 	$sitemenu['role_management_title'] = array(
 		'role_management_title',
 		'users',
-		'<i class="fa fa-legal"></i>' . $_lang['role_management_title'],
+		'<i class="fa fa-legal"></i>'.$_lang['role_management_title'],
 		'index.php?a=86',
 		$_lang['role_management_title'],
 		'',
@@ -302,11 +302,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('access_permissions')) {
+if ($modx->hasPermission('access_permissions')) {
 	$sitemenu['manager_permissions'] = array(
 		'manager_permissions',
 		'users',
-		'<i class="fa fa-male"></i>' . $_lang['manager_permissions'],
+		'<i class="fa fa-male"></i>'.$_lang['manager_permissions'],
 		'index.php?a=40',
 		$_lang['manager_permissions'],
 		'',
@@ -318,11 +318,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('web_access_permissions')) {
+if ($modx->hasPermission('web_access_permissions')) {
 	$sitemenu['web_permissions'] = array(
 		'web_permissions',
 		'users',
-		'<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],
+		'<i class="fa fa-universal-access"></i>'.$_lang['web_permissions'],
 		'index.php?a=91',
 		$_lang['web_permissions'],
 		'',
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
 $sitemenu['refresh_site'] = array(
     'refresh_site',
     'tools',
-    '<i class="fa fa-recycle"></i>' . $_lang['refresh_site'],
+    '<i class="fa fa-recycle"></i>'.$_lang['refresh_site'],
     'index.php?a=26',
     $_lang['refresh_site'],
     '',
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
             'a', // tag
             'javascript:;', // href
             'btn btn-secondary', // class or btn-success
-            'modx.popup({url:\'index.php?a=26\', title:\'' . $_lang['refresh_site'] . '\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick
+            'modx.popup({url:\'index.php?a=26\', title:\''.$_lang['refresh_site'].'\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick
             $_lang['refresh_site'], // title
             '<i class="fa fa-recycle"></i>' // innerHTML
         )
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
 $sitemenu['search'] = array(
 	'search',
 	'tools',
-	'<i class="fa fa-search"></i>' . $_lang['search'],
+	'<i class="fa fa-search"></i>'.$_lang['search'],
 	'index.php?a=71',
 	$_lang['search'],
 	'',
@@ -374,11 +374,11 @@  discard block
 block discarded – undo
 	''
 );
 
-if($modx->hasPermission('bk_manager')) {
+if ($modx->hasPermission('bk_manager')) {
 	$sitemenu['bk_manager'] = array(
 		'bk_manager',
 		'tools',
-		'<i class="fa fa-database"></i>' . $_lang['bk_manager'],
+		'<i class="fa fa-database"></i>'.$_lang['bk_manager'],
 		'index.php?a=93',
 		$_lang['bk_manager'],
 		'',
@@ -390,11 +390,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('remove_locks')) {
+if ($modx->hasPermission('remove_locks')) {
 	$sitemenu['remove_locks'] = array(
 		'remove_locks',
 		'tools',
-		'<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],
+		'<i class="fa fa-hourglass"></i>'.$_lang['remove_locks'],
 		'javascript:modx.removeLocks();',
 		$_lang['remove_locks'],
 		'',
@@ -406,11 +406,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('import_static')) {
+if ($modx->hasPermission('import_static')) {
 	$sitemenu['import_site'] = array(
 		'import_site',
 		'tools',
-		'<i class="fa fa-upload"></i>' . $_lang['import_site'],
+		'<i class="fa fa-upload"></i>'.$_lang['import_site'],
 		'index.php?a=95',
 		$_lang['import_site'],
 		'',
@@ -422,11 +422,11 @@  discard block
 block discarded – undo
 	);
 }
 
-if($modx->hasPermission('export_static')) {
+if ($modx->hasPermission('export_static')) {
 	$sitemenu['export_site'] = array(
 		'export_site',
 		'tools',
-		'<i class="fa fa-download"></i>' . $_lang['export_site'],
+		'<i class="fa fa-download"></i>'.$_lang['export_site'],
 		'index.php?a=83',
 		$_lang['export_site'],
 		'',
@@ -439,20 +439,20 @@  discard block
 block discarded – undo
 }
 
 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));
-if(is_array($menu)) {
+if (is_array($menu)) {
 	$newmenu = array();
-	foreach($menu as $item){
-		if(is_array(unserialize($item))){
+	foreach ($menu as $item) {
+		if (is_array(unserialize($item))) {
 			$newmenu = array_merge($newmenu, unserialize($item));
 		}
 	}
-	if(count($newmenu)> 0) $sitemenu = $newmenu;
+	if (count($newmenu) > 0) $sitemenu = $newmenu;
 }
 
-if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
-	include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');
+if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php')) {
+	include_once(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');
+	include_once(MODX_MANAGER_PATH.'includes/menu.class.inc.php');
 }
 $menu = new EVOmenu();
 $menu->Build($sitemenu, array(

Please login to merge, or discard this patch.

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5	5	header("X-XSS-Protection: 0");
		@@ -47,9 +47,9 @@ discard block
		block discarded – undo
47	47
48	48	$theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');
49	49	if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
50		- $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];
	50	+ $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']];
51	51	} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
52		- $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];
	52	+ $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']];
53	53	}
54	54
55	55	$navbar_position = $modx->config['manager_menu_position'];
		@@ -82,36 +82,36 @@ discard block
		block discarded – undo
82	82	$user['which_browser'] = $modx->config['which_browser'];
83	83	}
84	84
85		-$css = 'media/style/' . $modx->config['manager_theme'] . '/css/page.css?v=' . $lastInstallTime;
	85	+$css = 'media/style/'.$modx->config['manager_theme'].'/css/page.css?v='.$lastInstallTime;
86	86
87	87	if ($modx->config['manager_theme'] == 'default') {
88		- if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
89		- require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';
	88	+ if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css') && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {
	89	+ require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';
90	90	$minifier = new Formatter\CSSMinify();
91		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');
92		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css');
93		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css');
94		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css');
95		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css');
96		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css');
97		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css');
98		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css');
99		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css');
100		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css');
101		- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css');
	91	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css');
	92	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css');
	93	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css');
	94	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css');
	95	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css');
	96	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css');
	97	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css');
	98	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css');
	99	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css');
	100	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css');
	101	+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css');
102	102	$css = $minifier->minify();
103		- file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $css);
	103	+ file_put_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css', $css);
104	104	}
105		- if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
106		- $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;
	105	+ if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
	106	+ $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;
107	107	}
108	108	}
109	109
110		-$modx->config['global_tabs'] = (int)($modx->config['global_tabs'] && ($user['role'] == 1 \|\| $modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_plugin')));
	110	+$modx->config['global_tabs'] = (int) ($modx->config['global_tabs'] && ($user['role'] == 1 \|\| $modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_plugin')));
111	111
112	112	?>
113	113	<!DOCTYPE html>
114		-<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="') . $mxla . '" xml:lang="' . $mxla . '"' ?>>
	114	+<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="').$mxla.'" xml:lang="'.$mxla.'"' ?>>
115	115	<head>
116	116	<title><?= $site_name ?>- (EVO CMS Manager)</title>
117	117	<meta http-equiv="Content-Type" content="text/html; charset=<?= $modx_manager_charset ?>" />
		@@ -142,21 +142,21 @@ discard block
		block discarded – undo
142	142	MODX_SITE_URL: '<?= MODX_SITE_URL ?>',
143	143	MODX_MANAGER_URL: '<?= MODX_MANAGER_URL ?>',
144	144	user: {
145		- role: <?= (int)$user['role'] ?>,
	145	+ role: <?= (int) $user['role'] ?>,
146	146	username: '<?= $user['username'] ?>'
147	147	},
148	148	config: {
149	149	mail_check_timeperiod: <?= $modx->config['mail_check_timeperiod'] ?>,
150		- menu_height: <?= (int)$menu_height ?>,
151		- tree_width: <?= (int)$tree_width ?>,
152		- tree_min_width: <?= (int)$tree_min_width ?>,
153		- session_timeout: <?= (int)$modx->config['session_timeout'] ?>,
154		- site_start: <?= (int)$modx->config['site_start'] ?>,
155		- tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int)$modx->config['tree_page_click'] : 27) ?>,
	150	+ menu_height: <?= (int) $menu_height ?>,
	151	+ tree_width: <?= (int) $tree_width ?>,
	152	+ tree_min_width: <?= (int) $tree_min_width ?>,
	153	+ session_timeout: <?= (int) $modx->config['session_timeout'] ?>,
	154	+ site_start: <?= (int) $modx->config['site_start'] ?>,
	155	+ tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int) $modx->config['tree_page_click'] : 27) ?>,
156	156	theme: '<?= $modx->config['manager_theme'] ?>',
157	157	theme_mode: '<?= $modx->config['manager_theme_mode'] ?>',
158	158	which_browser: '<?= $user['which_browser'] ?>',
159		- layout: <?= (int)$manager_layout ?>,
	159	+ layout: <?= (int) $manager_layout ?>,
160	160	textdir: '<?= $modx_textdir ?>',
161	161	global_tabs: <?= $modx->config['global_tabs'] ?>
162	162
		@@ -241,11 +241,11 @@ discard block
		block discarded – undo
241	241	delete a[b];
242	242	},
243	243	openedArray: [],
244		- lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT \| JSON_UNESCAPED_UNICODE) . "\n" ?>
	244	+ lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT \| JSON_UNESCAPED_UNICODE)."\n" ?>
245	245	};
246	246	<?php
247	247	$opened = array_filter(array_map('intval', explode('\|', $_SESSION['openedArray'])));
248		- echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n modx.openedArray[", $opened) . '] = 1;') . "\n";
	248	+ echo (empty($opened) ? '' : 'modx.openedArray['.implode("] = 1;\n modx.openedArray[", $opened).'] = 1;')."\n";
249	249	?>
250	250	</script>
251	251	<script src="media/style/<?= $modx->config['manager_theme'] ?>/js/modx.min.js?v=<?= $lastInstallTime ?>"></script>
		@@ -327,7 +327,7 @@ discard block
		block discarded – undo
327	327	<a href="javascript:;" class="dropdown-toggle" onclick="return false;">
328	328	<span class="username"><?= $user['username'] ?></span>
329	329	<?php if ($user['photo']) { ?>
330		- <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL . $user['photo'] ?>);"></span>
	330	+ <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL.$user['photo'] ?>);"></span>
331	331	<?php } else { ?>
332	332	<span class="icon"><?= $_style['menu_user'] ?></span>
333	333	<?php } ?>
		@@ -354,7 +354,7 @@ discard block
		block discarded – undo
354	354	$version = 'Evolution';
355	355	?>
356	356	<?php
357		- echo sprintf('<li><span class="dropdown-item" title="%s – %s" %s>' . $version . ' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);
	357	+ echo sprintf('<li><span class="dropdown-item" title="%s – %s" %s>'.$version.' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);
358	358	?>
359	359	</ul>
360	360	</li>
		@@ -537,7 +537,7 @@ discard block
		block discarded – undo
537	537	*/
538	538	function constructLink($action, $img, $text, $allowed)
539	539	{
540		- if ((bool)$allowed) {
	540	+ if ((bool) $allowed) {
541	541	echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action, $action);
542	542	echo sprintf('<i class="%s"></i> %s</div>', $img, $text);
543	543	}
		@@ -548,7 +548,7 @@ discard block
		block discarded – undo
548	548	<script type="text/javascript">
549	549
550	550	if (document.getElementById('treeMenu')) {
551		- <?php if($modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_plugin')) { ?>
	551	+ <?php if ($modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_plugin')) { ?>
552	552
553	553	document.getElementById('treeMenu_openelements').onclick = function(e) {
554	554	e.preventDefault();
		@@ -566,12 +566,12 @@ discard block
		block discarded – undo
566	566	}
567	567	};
568	568	<?php } ?>
569		- <?php if($use_browser && $modx->hasPermission('assets_images')) { ?>
	569	+ <?php if ($use_browser && $modx->hasPermission('assets_images')) { ?>
570	570
571	571	document.getElementById('treeMenu_openimages').onclick = function(e) {
572	572	e.preventDefault();
573	573	if (modx.config.global_tabs && !e.shiftKey) {
574		- modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});
	574	+ modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});
575	575	} else {
576	576	var randomNum = '<?= $_lang["files_files"] ?>';
577	577	if (e.shiftKey) {
		@@ -584,12 +584,12 @@ discard block
		block discarded – undo
584	584	}
585	585	};
586	586	<?php } ?>
587		- <?php if($use_browser && $modx->hasPermission('assets_files')) { ?>
	587	+ <?php if ($use_browser && $modx->hasPermission('assets_files')) { ?>
588	588
589	589	document.getElementById('treeMenu_openfiles').onclick = function(e) {
590	590	e.preventDefault();
591	591	if (modx.config.global_tabs && !e.shiftKey) {
592		- modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});
	592	+ modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});
593	593	} else {
594	594	var randomNum = '<?= $_lang["files_files"] ?>';
595	595	if (e.shiftKey) {
		@@ -643,7 +643,7 @@ discard block
		block discarded – undo
643	643
644	644	</div>
645	645	<?php if ($modx->config['show_picker'] != "0") {
646		- include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');
	646	+ include('media/style/'.$modx->config['manager_theme'].'/color.switcher.php');
647	647	} ?>
648	648	</body>
649	649	</html>

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	$sitemenu['site'] = array(
22	22	'site',
23	23	'main',
24		- '<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>',
	24	+ '<i class="fa fa-tachometer"></i><span class="menu-item-text">'.$_lang['home'].'</span>',
25	25	'index.php?a=2',
26	26	$_lang['home'],
27	27	'',
		@@ -32,11 +32,11 @@ discard block
		block discarded – undo
32	32	'active'
33	33	);
34	34
35		-if($modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_plugin') \|\| $modx->hasPermission('file_manager')) {
	35	+if ($modx->hasPermission('edit_template') \|\| $modx->hasPermission('edit_snippet') \|\| $modx->hasPermission('edit_chunk') \|\| $modx->hasPermission('edit_plugin') \|\| $modx->hasPermission('file_manager')) {
36	36	$sitemenu['elements'] = array(
37	37	'elements',
38	38	'main',
39		- '<i class="fa fa-th"></i><span class="menu-item-text">' . $_lang['elements'] . '</span>',
	39	+ '<i class="fa fa-th"></i><span class="menu-item-text">'.$_lang['elements'].'</span>',
40	40	'javascript:;',
41	41	$_lang['elements'],
42	42	' return false;',
		@@ -48,11 +48,11 @@ discard block
		block discarded – undo
48	48	);
49	49	}
50	50
51		-if($modx->hasPermission('exec_module')) {
	51	+if ($modx->hasPermission('exec_module')) {
52	52	$sitemenu['modules'] = array(
53	53	'modules',
54	54	'main',
55		- '<i class="'.$_style['icons_modules'] .'"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>',
	55	+ '<i class="'.$_style['icons_modules'].'"></i><span class="menu-item-text">'.$_lang['modules'].'</span>',
56	56	'javascript:;',
57	57	$_lang['modules'],
58	58	' return false;',
		@@ -64,11 +64,11 @@ discard block
		block discarded – undo
64	64	);
65	65	}
66	66
67		-if($modx->hasPermission('edit_user') \|\| $modx->hasPermission('edit_web_user') \|\| $modx->hasPermission('edit_role') \|\| $modx->hasPermission('access_permissions') \|\| $modx->hasPermission('web_access_permissions')) {
	67	+if ($modx->hasPermission('edit_user') \|\| $modx->hasPermission('edit_web_user') \|\| $modx->hasPermission('edit_role') \|\| $modx->hasPermission('access_permissions') \|\| $modx->hasPermission('web_access_permissions')) {
68	68	$sitemenu['users'] = array(
69	69	'users',
70	70	'main',
71		- '<i class="fa fa-users"></i><span class="menu-item-text">' . $_lang['users'] . '</span>',
	71	+ '<i class="fa fa-users"></i><span class="menu-item-text">'.$_lang['users'].'</span>',
72	72	'javascript:;',
73	73	$_lang['users'],
74	74	' return false;',
		@@ -80,11 +80,11 @@ discard block
		block discarded – undo
80	80	);
81	81	}
82	82
83		-if($modx->hasPermission('empty_cache') \|\| $modx->hasPermission('bk_manager') \|\| $modx->hasPermission('remove_locks') \|\| $modx->hasPermission('import_static') \|\| $modx->hasPermission('export_static')) {
	83	+if ($modx->hasPermission('empty_cache') \|\| $modx->hasPermission('bk_manager') \|\| $modx->hasPermission('remove_locks') \|\| $modx->hasPermission('import_static') \|\| $modx->hasPermission('export_static')) {
84	84	$sitemenu['tools'] = array(
85	85	'tools',
86	86	'main',
87		- '<i class="fa fa-wrench"></i><span class="menu-item-text">' . $_lang['tools'] . '</span>',
	87	+ '<i class="fa fa-wrench"></i><span class="menu-item-text">'.$_lang['tools'].'</span>',
88	88	'javascript:;',
89	89	$_lang['tools'],
90	90	' return false;',
		@@ -97,12 +97,12 @@ discard block
		block discarded – undo
97	97	}
98	98
99	99	$tab = 0;
100		-if($modx->hasPermission('edit_template')) {
	100	+if ($modx->hasPermission('edit_template')) {
101	101	$sitemenu['element_templates'] = array(
102	102	'element_templates',
103	103	'elements',
104		- '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>',
105		- 'index.php?a=76&tab=' . $tab++,
	104	+ '<i class="fa fa-newspaper-o"></i>'.$_lang['manage_templates'].'<i class="fa fa-angle-right toggle"></i>',
	105	+ 'index.php?a=76&tab='.$tab++,
106	106	$_lang['manage_templates'],
107	107	'',
108	108	'new_template,edit_template',
		@@ -112,12 +112,12 @@ discard block
		block discarded – undo
112	112	'dropdown-toggle'
113	113	);
114	114	}
115		-if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
	115	+if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
116	116	$sitemenu['element_tplvars'] = array(
117	117	'element_tplvars',
118	118	'elements',
119		- '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>',
120		- 'index.php?a=76&tab=' . $tab++,
	119	+ '<i class="fa fa-list-alt"></i>'.$_lang['tmplvars'].'<i class="fa fa-angle-right toggle"></i>',
	120	+ 'index.php?a=76&tab='.$tab++,
121	121	$_lang['tmplvars'],
122	122	'',
123	123	'new_template,edit_template',
		@@ -127,12 +127,12 @@ discard block
		block discarded – undo
127	127	'dropdown-toggle'
128	128	);
129	129	}
130		-if($modx->hasPermission('edit_chunk')) {
	130	+if ($modx->hasPermission('edit_chunk')) {
131	131	$sitemenu['element_htmlsnippets'] = array(
132	132	'element_htmlsnippets',
133	133	'elements',
134		- '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>',
135		- 'index.php?a=76&tab=' . $tab++,
	134	+ '<i class="fa fa-th-large"></i>'.$_lang['manage_htmlsnippets'].'<i class="fa fa-angle-right toggle"></i>',
	135	+ 'index.php?a=76&tab='.$tab++,
136	136	$_lang['manage_htmlsnippets'],
137	137	'',
138	138	'new_chunk,edit_chunk',
		@@ -142,12 +142,12 @@ discard block
		block discarded – undo
142	142	'dropdown-toggle'
143	143	);
144	144	}
145		-if($modx->hasPermission('edit_snippet')) {
	145	+if ($modx->hasPermission('edit_snippet')) {
146	146	$sitemenu['element_snippets'] = array(
147	147	'element_snippets',
148	148	'elements',
149		- '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>',
150		- 'index.php?a=76&tab=' . $tab++,
	149	+ '<i class="fa fa-code"></i>'.$_lang['manage_snippets'].'<i class="fa fa-angle-right toggle"></i>',
	150	+ 'index.php?a=76&tab='.$tab++,
151	151	$_lang['manage_snippets'],
152	152	'',
153	153	'new_snippet,edit_snippet',
		@@ -157,12 +157,12 @@ discard block
		block discarded – undo
157	157	'dropdown-toggle'
158	158	);
159	159	}
160		-if($modx->hasPermission('edit_plugin')) {
	160	+if ($modx->hasPermission('edit_plugin')) {
161	161	$sitemenu['element_plugins'] = array(
162	162	'element_plugins',
163	163	'elements',
164		- '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>',
165		- 'index.php?a=76&tab=' . $tab++,
	164	+ '<i class="fa fa-plug"></i>'.$_lang['manage_plugins'].'<i class="fa fa-angle-right toggle"></i>',
	165	+ 'index.php?a=76&tab='.$tab++,
166	166	$_lang['manage_plugins'],
167	167	'',
168	168	'new_plugin,edit_plugin',
		@@ -174,11 +174,11 @@ discard block
		block discarded – undo
174	174	}
175	175	//$sitemenu['element_categories'] = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');
176	176
177		-if($modx->hasPermission('file_manager')) {
	177	+if ($modx->hasPermission('file_manager')) {
178	178	$sitemenu['manage_files'] = array(
179	179	'manage_files',
180	180	'elements',
181		- '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],
	181	+ '<i class="fa fa-folder-open-o"></i>'.$_lang['manage_files'],
182	182	'index.php?a=31',
183	183	$_lang['manage_files'],
184	184	'',
		@@ -189,11 +189,11 @@ discard block
		block discarded – undo
189	189	''
190	190	);
191	191	}
192		-if($modx->hasPermission('category_manager')) {
	192	+if ($modx->hasPermission('category_manager')) {
193	193	$sitemenu['manage_categories'] = array(
194	194	'manage_categories',
195	195	'elements',
196		- '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],
	196	+ '<i class="fa fa-object-group"></i>'.$_lang['manage_categories'],
197	197	'index.php?a=120',
198	198	$_lang['manage_categories'],
199	199	'',
		@@ -206,11 +206,11 @@ discard block
		block discarded – undo
206	206	}
207	207
208	208	// Modules Menu Items
209		-if($modx->hasPermission('new_module') \|\| $modx->hasPermission('edit_module') \|\| $modx->hasPermission('save_module')) {
	209	+if ($modx->hasPermission('new_module') \|\| $modx->hasPermission('edit_module') \|\| $modx->hasPermission('save_module')) {
210	210	$sitemenu['new_module'] = array(
211	211	'new_module',
212	212	'modules',
213		- '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],
	213	+ '<i class="'.$_style['icons_modules'].'"></i>'.$_lang['module_management'],
214	214	'index.php?a=106',
215	215	$_lang['module_management'],
216	216	'',
		@@ -222,24 +222,24 @@ discard block
		block discarded – undo
222	222	);
223	223	}
224	224
225		-if($modx->hasPermission('exec_module')) {
226		- if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
	225	+if ($modx->hasPermission('exec_module')) {
	226	+ if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
227	227	$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
228		- FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
229		- LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
230		- LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
231		- WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1
	228	+ FROM ' . $modx->getFullTableName('site_modules').' AS sm
	229	+ LEFT JOIN ' . $modx->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id
	230	+ LEFT JOIN ' . $modx->getFullTableName('member_groups').' AS mg ON sma.usergroup = mg.user_group
	231	+ WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID().') AND sm.disabled != 1 AND sm.locked != 1
232	232	ORDER BY sm.name');
233	233	} else {
234	234	$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
235	235	}
236		- if($modx->db->getRecordCount($rs)) {
	236	+ if ($modx->db->getRecordCount($rs)) {
237	237	while ($row = $modx->db->getRow($rs)) {
238		- $sitemenu['module' . $row['id']] = array(
239		- 'module' . $row['id'],
	238	+ $sitemenu['module'.$row['id']] = array(
	239	+ 'module'.$row['id'],
240	240	'modules',
241		- ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>') . $row['name'],
242		- 'index.php?a=112&id=' . $row['id'],
	241	+ ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>').$row['name'],
	242	+ 'index.php?a=112&id='.$row['id'],
243	243	$row['name'],
244	244	'',
245	245	'',
		@@ -254,11 +254,11 @@ discard block
		block discarded – undo
254	254
255	255	// security menu items (users)
256	256
257		-if($modx->hasPermission('edit_user')) {
	257	+if ($modx->hasPermission('edit_user')) {
258	258	$sitemenu['user_management_title'] = array(
259	259	'user_management_title',
260	260	'users',
261		- '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
	261	+ '<i class="fa fa fa-user"></i>'.$_lang['user_management_title'].'<i class="fa fa-angle-right toggle"></i>',
262	262	'index.php?a=75',
263	263	$_lang['user_management_title'],
264	264	'',
		@@ -270,11 +270,11 @@ discard block
		block discarded – undo
270	270	);
271	271	}
272	272
273		-if($modx->hasPermission('edit_web_user')) {
	273	+if ($modx->hasPermission('edit_web_user')) {
274	274	$sitemenu['web_user_management_title'] = array(
275	275	'web_user_management_title',
276	276	'users',
277		- '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>',
	277	+ '<i class="fa fa-users"></i>'.$_lang['web_user_management_title'].'<i class="fa fa-angle-right toggle"></i>',
278	278	'index.php?a=99',
279	279	$_lang['web_user_management_title'],
280	280	'',
		@@ -286,11 +286,11 @@ discard block
		block discarded – undo
286	286	);
287	287	}
288	288
289		-if($modx->hasPermission('edit_role')) {
	289	+if ($modx->hasPermission('edit_role')) {
290	290	$sitemenu['role_management_title'] = array(
291	291	'role_management_title',
292	292	'users',
293		- '<i class="fa fa-legal"></i>' . $_lang['role_management_title'],
	293	+ '<i class="fa fa-legal"></i>'.$_lang['role_management_title'],
294	294	'index.php?a=86',
295	295	$_lang['role_management_title'],
296	296	'',
		@@ -302,11 +302,11 @@ discard block
		block discarded – undo
302	302	);
303	303	}
304	304
305		-if($modx->hasPermission('access_permissions')) {
	305	+if ($modx->hasPermission('access_permissions')) {
306	306	$sitemenu['manager_permissions'] = array(
307	307	'manager_permissions',
308	308	'users',
309		- '<i class="fa fa-male"></i>' . $_lang['manager_permissions'],
	309	+ '<i class="fa fa-male"></i>'.$_lang['manager_permissions'],
310	310	'index.php?a=40',
311	311	$_lang['manager_permissions'],
312	312	'',
		@@ -318,11 +318,11 @@ discard block
		block discarded – undo
318	318	);
319	319	}
320	320
321		-if($modx->hasPermission('web_access_permissions')) {
	321	+if ($modx->hasPermission('web_access_permissions')) {
322	322	$sitemenu['web_permissions'] = array(
323	323	'web_permissions',
324	324	'users',
325		- '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],
	325	+ '<i class="fa fa-universal-access"></i>'.$_lang['web_permissions'],
326	326	'index.php?a=91',
327	327	$_lang['web_permissions'],
328	328	'',
		@@ -339,7 +339,7 @@ discard block
		block discarded – undo
339	339	$sitemenu['refresh_site'] = array(
340	340	'refresh_site',
341	341	'tools',
342		- '<i class="fa fa-recycle"></i>' . $_lang['refresh_site'],
	342	+ '<i class="fa fa-recycle"></i>'.$_lang['refresh_site'],
343	343	'index.php?a=26',
344	344	$_lang['refresh_site'],
345	345	'',
		@@ -353,7 +353,7 @@ discard block
		block discarded – undo
353	353	'a', // tag
354	354	'javascript:;', // href
355	355	'btn btn-secondary', // class or btn-success
356		- 'modx.popup({url:\'index.php?a=26\', title:\'' . $_lang['refresh_site'] . '\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick
	356	+ 'modx.popup({url:\'index.php?a=26\', title:\''.$_lang['refresh_site'].'\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick
357	357	$_lang['refresh_site'], // title
358	358	'<i class="fa fa-recycle"></i>' // innerHTML
359	359	)
		@@ -363,7 +363,7 @@ discard block
		block discarded – undo
363	363	$sitemenu['search'] = array(
364	364	'search',
365	365	'tools',
366		- '<i class="fa fa-search"></i>' . $_lang['search'],
	366	+ '<i class="fa fa-search"></i>'.$_lang['search'],
367	367	'index.php?a=71',
368	368	$_lang['search'],
369	369	'',
		@@ -374,11 +374,11 @@ discard block
		block discarded – undo
374	374	''
375	375	);
376	376
377		-if($modx->hasPermission('bk_manager')) {
	377	+if ($modx->hasPermission('bk_manager')) {
378	378	$sitemenu['bk_manager'] = array(
379	379	'bk_manager',
380	380	'tools',
381		- '<i class="fa fa-database"></i>' . $_lang['bk_manager'],
	381	+ '<i class="fa fa-database"></i>'.$_lang['bk_manager'],
382	382	'index.php?a=93',
383	383	$_lang['bk_manager'],
384	384	'',
		@@ -390,11 +390,11 @@ discard block
		block discarded – undo
390	390	);
391	391	}
392	392
393		-if($modx->hasPermission('remove_locks')) {
	393	+if ($modx->hasPermission('remove_locks')) {
394	394	$sitemenu['remove_locks'] = array(
395	395	'remove_locks',
396	396	'tools',
397		- '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],
	397	+ '<i class="fa fa-hourglass"></i>'.$_lang['remove_locks'],
398	398	'javascript:modx.removeLocks();',
399	399	$_lang['remove_locks'],
400	400	'',
		@@ -406,11 +406,11 @@ discard block
		block discarded – undo
406	406	);
407	407	}
408	408
409		-if($modx->hasPermission('import_static')) {
	409	+if ($modx->hasPermission('import_static')) {
410	410	$sitemenu['import_site'] = array(
411	411	'import_site',
412	412	'tools',
413		- '<i class="fa fa-upload"></i>' . $_lang['import_site'],
	413	+ '<i class="fa fa-upload"></i>'.$_lang['import_site'],
414	414	'index.php?a=95',
415	415	$_lang['import_site'],
416	416	'',
		@@ -422,11 +422,11 @@ discard block
		block discarded – undo
422	422	);
423	423	}
424	424
425		-if($modx->hasPermission('export_static')) {
	425	+if ($modx->hasPermission('export_static')) {
426	426	$sitemenu['export_site'] = array(
427	427	'export_site',
428	428	'tools',
429		- '<i class="fa fa-download"></i>' . $_lang['export_site'],
	429	+ '<i class="fa fa-download"></i>'.$_lang['export_site'],
430	430	'index.php?a=83',
431	431	$_lang['export_site'],
432	432	'',
		@@ -439,20 +439,20 @@ discard block
		block discarded – undo
439	439	}
440	440
441	441	$menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));
442		-if(is_array($menu)) {
	442	+if (is_array($menu)) {
443	443	$newmenu = array();
444		- foreach($menu as $item){
445		- if(is_array(unserialize($item))){
	444	+ foreach ($menu as $item) {
	445	+ if (is_array(unserialize($item))) {
446	446	$newmenu = array_merge($newmenu, unserialize($item));
447	447	}
448	448	}
449		- if(count($newmenu)> 0) $sitemenu = $newmenu;
	449	+ if (count($newmenu) > 0) $sitemenu = $newmenu;
450	450	}
451	451
452		-if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
453		- include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');
	452	+if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php')) {
	453	+ include_once(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php');
454	454	} else {
455		- include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');
	455	+ include_once(MODX_MANAGER_PATH.'includes/menu.class.inc.php');
456	456	}
457	457	$menu = new EVOmenu();
458	458	$menu->Build($sitemenu, array(

evolution-cms / evolution

Push — develop ( f266be...c88d0f )

Status

Category

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

Spacing +69 added lines, -69 removed lines patch added patch discarded remove patch