evolution-cms / evolution

manager/frames/1.php

Indentation +3 added lines, -3 removed lines

@@ -236,9 +236,9 @@
         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";

-      ?>

+        $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));

+        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>

     <?php if ($modx->config['show_picker'] != "0") { ?>

Spacing +41 added lines, -41 removed lines

@@ -1,5 +1,5 @@ 
 <?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 @@ 
 

 $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 @@ 
     $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 @@ 
         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 @@ 
           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 @@ 
                             <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 @@ 
                                 $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 @@ 
      */

     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 @@ 
     <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 @@ 
           }

         };

           <?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 @@ 
           }

         };

           <?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 @@ 
 

 </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>

Braces +31 added lines, -28 removed lines

@@ -1,5 +1,5 @@ 
 <?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");

@@ -11,22 +11,22 @@ 
 

 $mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en';

 

-if (!isset($modx->config['manager_menu_height'])) {

+if (!isset($modx->config['manager_menu_height'])) {
     $modx->config['manager_menu_height'] = 2.2; // rem

 }

 

-if (!isset($modx->config['manager_tree_width'])) {

+if (!isset($modx->config['manager_tree_width'])) {
     $modx->config['manager_tree_width'] = 20; // rem

 }

 

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

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

     unset($_SESSION['onLoginForwardToAction']);

-} else {

+} else {
     $initMainframeAction = 2; // welcome.static

 }

 

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

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

 }

 

@@ -35,29 +35,29 @@ 
 $tree_width = $modx->config['manager_tree_width'];

 $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;

 }

 

-if (!$MODX_widthSideBar) {

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

 }

 

 $theme_modes = array('', '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[$modx->config['manager_theme_mode']])) {

+} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
     $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];

 }

 

 $navbar_position = $modx->config['manager_menu_position'];

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

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

 }

 

-if (isset($modx->pluginCache['ElementsInTree'])) {

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

 }

 

@@ -73,19 +73,19 @@ 
     'type8' => $_lang["lock_element_type_8"]

 );

 

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

+foreach ($unlockTranslations as $key => $value) {
     $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);

 }

 

 $user = $modx->getUserInfo($modx->getLoginUserID());

-if ($user['which_browser'] == 'default') {

+if ($user['which_browser'] == 'default') {
     $user['which_browser'] = $modx->config['which_browser'];

 }

 

 $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')) {

+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';

         $minifier = new Formatter\CSSMinify();

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

@@ -102,7 +102,7 @@ 
         $css = $minifier->minify();

         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')) {

+    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;

     }

 }

@@ -257,7 +257,7 @@ 
     <?php

     // invoke OnManagerTopPrerender event

     $evtOut = $modx->invokeEvent('OnManagerTopPrerender', $_REQUEST);

-    if (is_array($evtOut)) {

+    if (is_array($evtOut)) {
         echo implode("\n", $evtOut);

     }

     ?>

@@ -428,11 +428,14 @@ 
             <div id="evo-tab-page-home" class="evo-tab-page show iframe-scroller">

                 <iframe id="mainframe" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe>

             </div>

-        <?php else: ?>

+        <?php else {
+    : ?>

             <div class="iframe-scroller">

                 <iframe id="mainframe" name="main" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe>

             </div>

-        <?php endif; ?>

+        <?php endif;
+}
+?>

         <script>

             if (/iPhone|iPad|iPod/i.test(navigator.userAgent)) {

                 document.getElementById('mainframe').setAttribute('scrolling', 'no');

@@ -451,11 +454,11 @@ 
             'tree_sortdir',

             'tree_nodename'

         );

-        foreach ($sortParams as $param) {

-            if (isset($_REQUEST[$param])) {

+        foreach ($sortParams as $param) {
+            if (isset($_REQUEST[$param])) {
                 $modx->manager->saveLastUserSetting($param, $_REQUEST[$param]);

                 $_SESSION[$param] = $_REQUEST[$param];

-            } else if (!isset($_SESSION[$param])) {

+            } else if (!isset($_SESSION[$param])) {
                 $_SESSION[$param] = $modx->manager->getLastUserSetting($param);

             }

         }

@@ -541,9 +544,9 @@ 
      * @param string $text

      * @param bool $allowed

      */

-    function constructLink($action, $img, $text, $allowed)

-    {

-        if ((bool)$allowed) {

+    function constructLink($action, $img, $text, $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);

         }

@@ -648,7 +651,7 @@ 
     ?>

 

 </div>

-<?php if ($modx->config['show_picker'] != "0") {

+<?php if ($modx->config['show_picker'] != "0") {
     include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');

 } ?>

 </body>

manager/frames/mainmenu.php

Braces +35 added lines, -33 removed lines

@@ -32,7 +32,7 @@ 
 	'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',

@@ -48,7 +48,7 @@ 
 	);

 }

 

-if($modx->hasPermission('exec_module')) {

+if($modx->hasPermission('exec_module')) {
 	$sitemenu['modules'] = array(

 		'modules',

 		'main',

@@ -64,7 +64,7 @@ 
 	);

 }

 

-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',

@@ -80,7 +80,7 @@ 
 	);

 }

 

-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',

@@ -97,7 +97,7 @@ 
 }

 

 $tab = 0;

-if($modx->hasPermission('edit_template')) {

+if($modx->hasPermission('edit_template')) {
 	$sitemenu['element_templates'] = array(

 		'element_templates',

 		'elements',

@@ -112,7 +112,7 @@ 
 		'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',

@@ -127,7 +127,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_chunk')) {

+if($modx->hasPermission('edit_chunk')) {
 	$sitemenu['element_htmlsnippets'] = array(

 		'element_htmlsnippets',

 		'elements',

@@ -142,7 +142,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_snippet')) {

+if($modx->hasPermission('edit_snippet')) {
 	$sitemenu['element_snippets'] = array(

 		'element_snippets',

 		'elements',

@@ -157,7 +157,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_plugin')) {

+if($modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_plugins'] = array(

 		'element_plugins',

 		'elements',

@@ -174,7 +174,7 @@ 
 }

 //$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',

@@ -189,7 +189,7 @@ 
 		''

 	);

 }

-if($modx->hasPermission('category_manager')) {

+if($modx->hasPermission('category_manager')) {
 	$sitemenu['manage_categories'] = array(

 		'manage_categories',

 		'elements',

@@ -206,7 +206,7 @@ 
 }

 

 // 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',

@@ -222,19 +222,19 @@ 
 	);

 }

 

-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

                 ORDER BY sm.name');

-	} else {

+	} else {
 		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

 	}

-	if($modx->db->getRecordCount($rs)) {

-	    while ($row = $modx->db->getRow($rs)) {

+	if($modx->db->getRecordCount($rs)) {
+	    while ($row = $modx->db->getRow($rs)) {
             $sitemenu['module' . $row['id']] = array(

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

                 'modules',

@@ -254,7 +254,7 @@ 
 

 // security menu items (users)

 

-if($modx->hasPermission('edit_user')) {

+if($modx->hasPermission('edit_user')) {
 	$sitemenu['user_management_title'] = array(

 		'user_management_title',

 		'users',

@@ -270,7 +270,7 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_web_user')) {

+if($modx->hasPermission('edit_web_user')) {
 	$sitemenu['web_user_management_title'] = array(

 		'web_user_management_title',

 		'users',

@@ -286,7 +286,7 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_role')) {

+if($modx->hasPermission('edit_role')) {
 	$sitemenu['role_management_title'] = array(

 		'role_management_title',

 		'users',

@@ -302,7 +302,7 @@ 
 	);

 }

 

-if($modx->hasPermission('access_permissions')) {

+if($modx->hasPermission('access_permissions')) {
 	$sitemenu['manager_permissions'] = array(

 		'manager_permissions',

 		'users',

@@ -318,7 +318,7 @@ 
 	);

 }

 

-if($modx->hasPermission('web_access_permissions')) {

+if($modx->hasPermission('web_access_permissions')) {
 	$sitemenu['web_permissions'] = array(

 		'web_permissions',

 		'users',

@@ -374,7 +374,7 @@ 
 	''

 );

 

-if($modx->hasPermission('bk_manager')) {

+if($modx->hasPermission('bk_manager')) {
 	$sitemenu['bk_manager'] = array(

 		'bk_manager',

 		'tools',

@@ -390,7 +390,7 @@ 
 	);

 }

 

-if($modx->hasPermission('remove_locks')) {

+if($modx->hasPermission('remove_locks')) {
 	$sitemenu['remove_locks'] = array(

 		'remove_locks',

 		'tools',

@@ -406,7 +406,7 @@ 
 	);

 }

 

-if($modx->hasPermission('import_static')) {

+if($modx->hasPermission('import_static')) {
 	$sitemenu['import_site'] = array(

 		'import_site',

 		'tools',

@@ -422,7 +422,7 @@ 
 	);

 }

 

-if($modx->hasPermission('export_static')) {

+if($modx->hasPermission('export_static')) {
 	$sitemenu['export_site'] = array(

 		'export_site',

 		'tools',

@@ -439,19 +439,21 @@ 
 }

 

 $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')) {

+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 {

+} else {
 	include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');

 }

 $menu = new EVOmenu();

Indentation +325 added lines, -325 removed lines

@@ -4,237 +4,237 @@ 
 */

 

 $sitemenu['bars'] = array(

-	'bars',

-	'main',

-	'<i class="fa fa-bars"></i>',

-	'javascript:;',

-	$_lang['home'],

-	'modx.resizer.toggle(); return false;',

-	' return false;',

-	'',

-	0,

-	10,

-	''

+    'bars',

+    'main',

+    '<i class="fa fa-bars"></i>',

+    'javascript:;',

+    $_lang['home'],

+    'modx.resizer.toggle(); return false;',

+    ' return false;',

+    '',

+    0,

+    10,

+    ''

 );

 

 //mainMenu

 $sitemenu['site'] = array(

-	'site',

-	'main',

-	'<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>',

-	'index.php?a=2',

-	$_lang['home'],

-	'',

-	'',

-	'main',

-	0,

-	10,

-	'active'

+    'site',

+    'main',

+    '<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>',

+    'index.php?a=2',

+    $_lang['home'],

+    '',

+    '',

+    'main',

+    0,

+    10,

+    'active'

 );

 

 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>',

-		'javascript:;',

-		$_lang['elements'],

-		' return false;',

-		'',

-		'',

-		0,

-		20,

-		''

-	);

+    $sitemenu['elements'] = array(

+        'elements',

+        'main',

+        '<i class="fa fa-th"></i><span class="menu-item-text">' . $_lang['elements'] . '</span>',

+        'javascript:;',

+        $_lang['elements'],

+        ' return false;',

+        '',

+        '',

+        0,

+        20,

+        ''

+    );

 }

 

 if($modx->hasPermission('exec_module')) {

-	$sitemenu['modules'] = array(

-		'modules',

-		'main',

-		'<i class="'.$_style['icons_modules'] .'"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>',

-		'javascript:;',

-		$_lang['modules'],

-		' return false;',

-		'',

-		'',

-		0,

-		30,

-		''

-	);

+    $sitemenu['modules'] = array(

+        'modules',

+        'main',

+        '<i class="'.$_style['icons_modules'] .'"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>',

+        'javascript:;',

+        $_lang['modules'],

+        ' return false;',

+        '',

+        '',

+        0,

+        30,

+        ''

+    );

 }

 

 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>',

-		'javascript:;',

-		$_lang['users'],

-		' return false;',

-		'edit_user',

-		'',

-		0,

-		40,

-		''

-	);

+    $sitemenu['users'] = array(

+        'users',

+        'main',

+        '<i class="fa fa-users"></i><span class="menu-item-text">' . $_lang['users'] . '</span>',

+        'javascript:;',

+        $_lang['users'],

+        ' return false;',

+        'edit_user',

+        '',

+        0,

+        40,

+        ''

+    );

 }

 

 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>',

-		'javascript:;',

-		$_lang['tools'],

-		' return false;',

-		'',

-		'',

-		0,

-		50,

-		''

-	);

+    $sitemenu['tools'] = array(

+        'tools',

+        'main',

+        '<i class="fa fa-wrench"></i><span class="menu-item-text">' . $_lang['tools'] . '</span>',

+        'javascript:;',

+        $_lang['tools'],

+        ' return false;',

+        '',

+        '',

+        0,

+        50,

+        ''

+    );

 }

 

 $tab = 0;

 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++,

-		$_lang['manage_templates'],

-		'',

-		'new_template,edit_template',

-		'main',

-		0,

-		10,

-		'dropdown-toggle'

-	);

+    $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++,

+        $_lang['manage_templates'],

+        '',

+        'new_template,edit_template',

+        'main',

+        0,

+        10,

+        'dropdown-toggle'

+    );

 }

 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++,

-		$_lang['tmplvars'],

-		'',

-		'new_template,edit_template',

-		'main',

-		0,

-		20,

-		'dropdown-toggle'

-	);

+    $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++,

+        $_lang['tmplvars'],

+        '',

+        'new_template,edit_template',

+        'main',

+        0,

+        20,

+        'dropdown-toggle'

+    );

 }

 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++,

-		$_lang['manage_htmlsnippets'],

-		'',

-		'new_chunk,edit_chunk',

-		'main',

-		0,

-		30,

-		'dropdown-toggle'

-	);

+    $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++,

+        $_lang['manage_htmlsnippets'],

+        '',

+        'new_chunk,edit_chunk',

+        'main',

+        0,

+        30,

+        'dropdown-toggle'

+    );

 }

 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++,

-		$_lang['manage_snippets'],

-		'',

-		'new_snippet,edit_snippet',

-		'main',

-		0,

-		40,

-		'dropdown-toggle'

-	);

+    $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++,

+        $_lang['manage_snippets'],

+        '',

+        'new_snippet,edit_snippet',

+        'main',

+        0,

+        40,

+        'dropdown-toggle'

+    );

 }

 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++,

-		$_lang['manage_plugins'],

-		'',

-		'new_plugin,edit_plugin',

-		'main',

-		0,

-		50,

-		'dropdown-toggle'

-	);

+    $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++,

+        $_lang['manage_plugins'],

+        '',

+        'new_plugin,edit_plugin',

+        'main',

+        0,

+        50,

+        'dropdown-toggle'

+    );

 }

 //$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')) {

-	$sitemenu['manage_files'] = array(

-		'manage_files',

-		'elements',

-		'<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],

-		'index.php?a=31',

-		$_lang['manage_files'],

-		'',

-		'file_manager',

-		'main',

-		0,

-		80,

-		''

-	);

+    $sitemenu['manage_files'] = array(

+        'manage_files',

+        'elements',

+        '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'],

+        'index.php?a=31',

+        $_lang['manage_files'],

+        '',

+        'file_manager',

+        'main',

+        0,

+        80,

+        ''

+    );

 }

 if($modx->hasPermission('category_manager')) {

-	$sitemenu['manage_categories'] = array(

-		'manage_categories',

-		'elements',

-		'<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],

-		'index.php?a=120',

-		$_lang['manage_categories'],

-		'',

-		'category_manager',

-		'main',

-		0,

-		70,

-		''

-	);

+    $sitemenu['manage_categories'] = array(

+        'manage_categories',

+        'elements',

+        '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'],

+        'index.php?a=120',

+        $_lang['manage_categories'],

+        '',

+        'category_manager',

+        'main',

+        0,

+        70,

+        ''

+    );

 }

 

 // Modules Menu Items

 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'],

-		'index.php?a=106',

-		$_lang['module_management'],

-		'',

-		'new_module,edit_module',

-		'main',

-		1,

-		0,

-		''

-	);

+    $sitemenu['new_module'] = array(

+        'new_module',

+        'modules',

+        '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],

+        'index.php?a=106',

+        $_lang['module_management'],

+        '',

+        'new_module,edit_module',

+        'main',

+        1,

+        0,

+        ''

+    );

 }

 

 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

+    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

                 ORDER BY sm.name');

-	} else {

-		$rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

-	}

-	if($modx->db->getRecordCount($rs)) {

-	    while ($row = $modx->db->getRow($rs)) {

+    } else {

+        $rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');

+    }

+    if($modx->db->getRecordCount($rs)) {

+        while ($row = $modx->db->getRow($rs)) {

             $sitemenu['module' . $row['id']] = array(

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

                 'modules',

@@ -255,83 +255,83 @@ 
 // security menu items (users)

 

 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>',

-		'index.php?a=75',

-		$_lang['user_management_title'],

-		'',

-		'edit_user',

-		'main',

-		0,

-		10,

-		'dropdown-toggle'

-	);

+    $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>',

+        'index.php?a=75',

+        $_lang['user_management_title'],

+        '',

+        'edit_user',

+        'main',

+        0,

+        10,

+        'dropdown-toggle'

+    );

 }

 

 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>',

-		'index.php?a=99',

-		$_lang['web_user_management_title'],

-		'',

-		'edit_web_user',

-		'main',

-		0,

-		20,

-		'dropdown-toggle'

-	);

+    $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>',

+        'index.php?a=99',

+        $_lang['web_user_management_title'],

+        '',

+        'edit_web_user',

+        'main',

+        0,

+        20,

+        'dropdown-toggle'

+    );

 }

 

 if($modx->hasPermission('edit_role')) {

-	$sitemenu['role_management_title'] = array(

-		'role_management_title',

-		'users',

-		'<i class="fa fa-legal"></i>' . $_lang['role_management_title'],

-		'index.php?a=86',

-		$_lang['role_management_title'],

-		'',

-		'new_role,edit_role,delete_role',

-		'main',

-		0,

-		30,

-		''

-	);

+    $sitemenu['role_management_title'] = array(

+        'role_management_title',

+        'users',

+        '<i class="fa fa-legal"></i>' . $_lang['role_management_title'],

+        'index.php?a=86',

+        $_lang['role_management_title'],

+        '',

+        'new_role,edit_role,delete_role',

+        'main',

+        0,

+        30,

+        ''

+    );

 }

 

 if($modx->hasPermission('access_permissions')) {

-	$sitemenu['manager_permissions'] = array(

-		'manager_permissions',

-		'users',

-		'<i class="fa fa-male"></i>' . $_lang['manager_permissions'],

-		'index.php?a=40',

-		$_lang['manager_permissions'],

-		'',

-		'access_permissions',

-		'main',

-		0,

-		40,

-		''

-	);

+    $sitemenu['manager_permissions'] = array(

+        'manager_permissions',

+        'users',

+        '<i class="fa fa-male"></i>' . $_lang['manager_permissions'],

+        'index.php?a=40',

+        $_lang['manager_permissions'],

+        '',

+        'access_permissions',

+        'main',

+        0,

+        40,

+        ''

+    );

 }

 

 if($modx->hasPermission('web_access_permissions')) {

-	$sitemenu['web_permissions'] = array(

-		'web_permissions',

-		'users',

-		'<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],

-		'index.php?a=91',

-		$_lang['web_permissions'],

-		'',

-		'web_access_permissions',

-		'main',

-		0,

-		50,

-		''

-	);

+    $sitemenu['web_permissions'] = array(

+        'web_permissions',

+        'users',

+        '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'],

+        'index.php?a=91',

+        $_lang['web_permissions'],

+        '',

+        'web_access_permissions',

+        'main',

+        0,

+        50,

+        ''

+    );

 }

 

 // Tools Menu

@@ -361,104 +361,104 @@ 
 );

 

 $sitemenu['search'] = array(

-	'search',

-	'tools',

-	'<i class="fa fa-search"></i>' . $_lang['search'],

-	'index.php?a=71',

-	$_lang['search'],

-	'',

-	'',

-	'main',

-	1,

-	9,

-	''

+    'search',

+    'tools',

+    '<i class="fa fa-search"></i>' . $_lang['search'],

+    'index.php?a=71',

+    $_lang['search'],

+    '',

+    '',

+    'main',

+    1,

+    9,

+    ''

 );

 

 if($modx->hasPermission('bk_manager')) {

-	$sitemenu['bk_manager'] = array(

-		'bk_manager',

-		'tools',

-		'<i class="fa fa-database"></i>' . $_lang['bk_manager'],

-		'index.php?a=93',

-		$_lang['bk_manager'],

-		'',

-		'bk_manager',

-		'main',

-		0,

-		10,

-		''

-	);

+    $sitemenu['bk_manager'] = array(

+        'bk_manager',

+        'tools',

+        '<i class="fa fa-database"></i>' . $_lang['bk_manager'],

+        'index.php?a=93',

+        $_lang['bk_manager'],

+        '',

+        'bk_manager',

+        'main',

+        0,

+        10,

+        ''

+    );

 }

 

 if($modx->hasPermission('remove_locks')) {

-	$sitemenu['remove_locks'] = array(

-		'remove_locks',

-		'tools',

-		'<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],

-		'javascript:modx.removeLocks();',

-		$_lang['remove_locks'],

-		'',

-		'remove_locks',

-		'',

-		0,

-		20,

-		''

-	);

+    $sitemenu['remove_locks'] = array(

+        'remove_locks',

+        'tools',

+        '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'],

+        'javascript:modx.removeLocks();',

+        $_lang['remove_locks'],

+        '',

+        'remove_locks',

+        '',

+        0,

+        20,

+        ''

+    );

 }

 

 if($modx->hasPermission('import_static')) {

-	$sitemenu['import_site'] = array(

-		'import_site',

-		'tools',

-		'<i class="fa fa-upload"></i>' . $_lang['import_site'],

-		'index.php?a=95',

-		$_lang['import_site'],

-		'',

-		'import_static',

-		'main',

-		0,

-		30,

-		''

-	);

+    $sitemenu['import_site'] = array(

+        'import_site',

+        'tools',

+        '<i class="fa fa-upload"></i>' . $_lang['import_site'],

+        'index.php?a=95',

+        $_lang['import_site'],

+        '',

+        'import_static',

+        'main',

+        0,

+        30,

+        ''

+    );

 }

 

 if($modx->hasPermission('export_static')) {

-	$sitemenu['export_site'] = array(

-		'export_site',

-		'tools',

-		'<i class="fa fa-download"></i>' . $_lang['export_site'],

-		'index.php?a=83',

-		$_lang['export_site'],

-		'',

-		'export_static',

-		'main',

-		1,

-		40,

-		''

-	);

+    $sitemenu['export_site'] = array(

+        'export_site',

+        'tools',

+        '<i class="fa fa-download"></i>' . $_lang['export_site'],

+        'index.php?a=83',

+        $_lang['export_site'],

+        '',

+        'export_static',

+        'main',

+        1,

+        40,

+        ''

+    );

 }

 

 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));

 if(is_array($menu)) {

-	$newmenu = array();

-	foreach($menu as $item){

-		if(is_array(unserialize($item))){

-			$newmenu = array_merge($newmenu, unserialize($item));

-		}

-	}

-	if(count($newmenu)> 0) $sitemenu = $newmenu;

+    $newmenu = array();

+    foreach($menu as $item){

+        if(is_array(unserialize($item))){

+            $newmenu = array_merge($newmenu, unserialize($item));

+        }

+    }

+    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');

+    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(

-	'outerClass' => 'nav',

-	'innerClass' => 'dropdown-menu',

-	'parentClass' => 'dropdown',

+    'outerClass' => 'nav',

+    'innerClass' => 'dropdown-menu',

+    'parentClass' => 'dropdown',

     'parentLinkClass' => 'dropdown-toggle',

     'parentLinkAttr' => '',

     'parentLinkIn' => ''

Spacing +69 added lines, -69 removed lines

@@ -21,7 +21,7 @@ 
 $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 @@ 
 	'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 @@ 
 	);

 }

 

-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 @@ 
 	);

 }

 

-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 @@ 
 	);

 }

 

-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 @@ 
 }

 

 $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 @@ 
 		'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 @@ 
 		'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 @@ 
 		'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 @@ 
 		'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 @@ 
 }

 //$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 @@ 
 		''

 	);

 }

-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 @@ 
 }

 

 // 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 @@ 
 	);

 }

 

-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 @@ 
 

 // 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 @@ 
 	);

 }

 

-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 @@ 
 	);

 }

 

-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 @@ 
 	);

 }

 

-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 @@ 
 	);

 }

 

-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 @@ 
 $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 @@ 
             '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 @@ 
 $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 @@ 
 	''

 );

 

-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 @@ 
 	);

 }

 

-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 @@ 
 	);

 }

 

-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 @@ 
 	);

 }

 

-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 @@ 
 }

 

 $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(

manager/media/browser/mcpuk/core/types/type_img.php

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Image detection class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Image detection class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class type_img {
 

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_img {
+class type_img{
 
-    public function checkFile($file, array $config) {
+    public function checkFile($file, array $config){
 
         $driver = isset($config['imageDriversPriority'])
             ? image::getDriver(explode(" ", $config['imageDriversPriority'])) : "gd";

Braces +7 added lines, -4 removed lines

@@ -12,17 +12,20 @@
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_img {
+class type_img
+{
 
-    public function checkFile($file, array $config) {
+    public function checkFile($file, array $config)
+    {
 
         $driver = isset($config['imageDriversPriority'])
             ? image::getDriver(explode(" ", $config['imageDriversPriority'])) : "gd";
 
         $img = image::factory($driver, $file);
 
-        if ($img->initError)
-            return "Unknown image format/encoding.";
+        if ($img->initError) {
+                    return "Unknown image format/encoding.";
+        }
 
         return true;
     }

manager/media/browser/mcpuk/core/types/type_mime.php

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc MIME type detection class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc MIME type detection class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class type_mime {
 

Spacing +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_mime {
+class type_mime{
 
-    public function checkFile($file, array $config) {
+    public function checkFile($file, array $config){
         if (!class_exists("finfo"))
             return "Fileinfo PECL extension is missing.";
 
@@ -33,12 +33,12 @@ 
         $mimes = $config['params'];
         if (substr($mimes, 0, 1) == "!") {
             $mimes = trim(substr($mimes, 1));
-            return in_array($type , explode(" ", $mimes))
+            return in_array($type, explode(" ", $mimes))
                 ? "You can't upload such files."
                 : true;
         }
 
-        return !in_array($type , explode(" ", $mimes))
+        return !in_array($type, explode(" ", $mimes))
             ? "You can't upload such files."
             : true;
     }

Braces +13 added lines, -8 removed lines

@@ -12,20 +12,25 @@
   *      @link http://kcfinder.sunhater.com
   */
 
-class type_mime {
+class type_mime
+{
 
-    public function checkFile($file, array $config) {
-        if (!class_exists("finfo"))
-            return "Fileinfo PECL extension is missing.";
+    public function checkFile($file, array $config)
+    {
+        if (!class_exists("finfo")) {
+                    return "Fileinfo PECL extension is missing.";
+        }
 
-        if (!isset($config['params']))
-            return "Undefined MIME types.";
+        if (!isset($config['params'])) {
+                    return "Undefined MIME types.";
+        }
 
         $finfo = strlen($config['mime_magic'])
             ? new finfo(FILEINFO_MIME, $config['mime_magic'])
             : new finfo(FILEINFO_MIME);
-        if (!$finfo)
-            return "Opening fileinfo database failed.";
+        if (!$finfo) {
+                    return "Opening fileinfo database failed.";
+        }
 
         $type = $finfo->file($file);
         $type = substr($type, 0, strrpos($type, ";"));

manager/media/browser/mcpuk/core/autoload.php

Indentation +18 added lines, -18 removed lines

@@ -1,24 +1,24 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc This file is included first, before each other
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  *
-  * This file is the place you can put any code (at the end of the file),
-  * which will be executed before any other. Suitable for:
-  *     1. Set PHP ini settings using ini_set()
-  *     2. Custom session save handler with session_set_save_handler()
-  *     3. Any custom integration code. If you use any global variables
-  *        here, they can be accessed in config.php via $GLOBALS array.
-  *        It's recommended to use constants instead.
-  */
+ *
+ *      @desc This file is included first, before each other
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ *
+ * This file is the place you can put any code (at the end of the file),
+ * which will be executed before any other. Suitable for:
+ *     1. Set PHP ini settings using ini_set()
+ *     2. Custom session save handler with session_set_save_handler()
+ *     3. Any custom integration code. If you use any global variables
+ *        here, they can be accessed in config.php via $GLOBALS array.
+ *        It's recommended to use constants instead.
+ */
 include_once(dirname(__FILE__)."/../../../../../assets/cache/siteManager.php");
 require_once('../../../includes/protect.inc.php');
 include_once('../../../includes/config.inc.php');

Braces +25 added lines, -15 removed lines

@@ -41,17 +41,20 @@ 
 $_GET['langCode'] = $modx_lang_attribute;
 
 // PHP VERSION CHECK
-if (substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.')) < 5)
+if (substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.')) < 5) {
     die("You are using PHP " . PHP_VERSION . " when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
+}
 
 
 // SAFE MODE CHECK
-if (ini_get("safe_mode"))
+if (ini_get("safe_mode")) {
     die("The \"safe_mode\" PHP ini setting is turned on! You cannot run KCFinder in safe mode.");
+}
 
 
 // MAGIC AUTOLOAD CLASSES FUNCTION
-function autoloadda9d06472ccb71b84928677ce2a6ca89($class) {
+function autoloadda9d06472ccb71b84928677ce2a6ca89($class)
+{
     static $classes = null;
     if ($classes === null) {
         $classes = array(
@@ -84,7 +87,8 @@ 
 // json_encode() IMPLEMENTATION IF JSON EXTENSION IS MISSING
 if (!function_exists("json_encode")) {
 
-    function kcfinder_json_string_encode($string) {
+    function kcfinder_json_string_encode($string)
+    {
         return '"' .
             str_replace('/', "\\/",
             str_replace("\t", "\\t",
@@ -95,37 +99,43 @@ 
         $string)))))) . '"';
     }
 
-    function json_encode($data) {
+    function json_encode($data)
+    {
 
         if (is_array($data)) {
             $ret = array();
 
             // OBJECT
             if (array_keys($data) !== range(0, count($data) - 1)) {
-                foreach ($data as $key => $val)
-                    $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val);
+                foreach ($data as $key => $val) {
+                                    $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val);
+                }
                 return "{" . implode(",", $ret) . "}";
 
             // ARRAY
             } else {
-                foreach ($data as $val)
-                    $ret[] = json_encode($val);
+                foreach ($data as $val) {
+                                    $ret[] = json_encode($val);
+                }
                 return "[" . implode(",", $ret) . "]";
             }
 
         // BOOLEAN OR NULL
-        } elseif (is_bool($data) || ($data === null))
-            return ($data === null)
+        } elseif (is_bool($data) || ($data === null)) {
+                    return ($data === null)
                 ? "null"
                 : ($data ? "true" : "false");
+        }
 
         // FLOAT
-        elseif (is_float($data))
-            return rtrim(rtrim(number_format($data, 14, ".", ""), "0"), ".");
+        elseif (is_float($data)) {
+                    return rtrim(rtrim(number_format($data, 14, ".", ""), "0"), ".");
+        }
 
         // INTEGER
-        elseif (is_int($data))
-            return $data;
+        elseif (is_int($data)) {
+                    return $data;
+        }
 
         // STRING
         return kcfinder_json_string_encode($data);

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
 $modx = evolutionCMS();
 $modx->db->connect();
 startCMSSession();
-if(!isset($_SESSION['mgrValidated'])) {
+if (!isset($_SESSION['mgrValidated'])) {
         die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 define('IN_MANAGER_MODE', true);
@@ -34,7 +34,7 @@ 
 
 $manager_language = $modx->config['manager_language'];
 // Pass language code from MODX to KCFinder
-if(!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
+if (!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
     $manager_language = "english"; // if not set, get the english language file.
 }
 include_once "../../../includes/lang/".$manager_language.".inc.php";
@@ -42,7 +42,7 @@ 
 
 // PHP VERSION CHECK
 if (substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.')) < 5)
-    die("You are using PHP " . PHP_VERSION . " when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
+    die("You are using PHP ".PHP_VERSION." when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
 
 
 // SAFE MODE CHECK
@@ -51,7 +51,7 @@ 
 
 
 // MAGIC AUTOLOAD CLASSES FUNCTION
-function autoloadda9d06472ccb71b84928677ce2a6ca89($class) {
+function autoloadda9d06472ccb71b84928677ce2a6ca89($class){
     static $classes = null;
     if ($classes === null) {
         $classes = array(
@@ -75,7 +75,7 @@ 
         );
     }
     if (isset($classes[$class])) {
-        require dirname(__FILE__) . $classes[$class];
+        require dirname(__FILE__).$classes[$class];
     }
 }
 spl_autoload_register('autoloadda9d06472ccb71b84928677ce2a6ca89', true);
@@ -84,18 +84,18 @@ 
 // json_encode() IMPLEMENTATION IF JSON EXTENSION IS MISSING
 if (!function_exists("json_encode")) {
 
-    function kcfinder_json_string_encode($string) {
-        return '"' .
+    function kcfinder_json_string_encode($string){
+        return '"'.
             str_replace('/', "\\/",
             str_replace("\t", "\\t",
             str_replace("\r", "\\r",
             str_replace("\n", "\\n",
             str_replace('"', "\\\"",
             str_replace("\\", "\\\\",
-        $string)))))) . '"';
+        $string)))))).'"';
     }
 
-    function json_encode($data) {
+    function json_encode($data){
 
         if (is_array($data)) {
             $ret = array();
@@ -103,14 +103,14 @@ 
             // OBJECT
             if (array_keys($data) !== range(0, count($data) - 1)) {
                 foreach ($data as $key => $val)
-                    $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val);
-                return "{" . implode(",", $ret) . "}";
+                    $ret[] = kcfinder_json_string_encode($key).':'.json_encode($val);
+                return "{".implode(",", $ret)."}";
 
             // ARRAY
             } else {
                 foreach ($data as $val)
                     $ret[] = json_encode($val);
-                return "[" . implode(",", $ret) . "]";
+                return "[".implode(",", $ret)."]";
             }
 
         // BOOLEAN OR NULL

manager/media/browser/mcpuk/tpl/tpl_css.php

Spacing +1 added lines, -1 removed lines

@@ -1,2 +1,2 @@
-<link href="css.php?type=<?php echo $this->type ?><?php echo ($this->cms ? "&amp;cms={$this->cms}" : "" ) ?>" rel="stylesheet" type="text/css" />
+<link href="css.php?type=<?php echo $this->type ?><?php echo ($this->cms ? "&amp;cms={$this->cms}" : "") ?>" rel="stylesheet" type="text/css" />
 <link href="themes/<?php echo $this->config['theme'] ?>/style.css" rel="stylesheet" type="text/css" />

manager/media/browser/mcpuk/tpl/tpl_javascript.php

Upper-Lower-Casing +12 added lines, -12 removed lines

@@ -4,12 +4,12 @@ 
 <script src="js/helper.js" type="text/javascript"></script>
 <script src="js/browser/joiner.php" type="text/javascript"></script>
 <script src="js_localize.php?lng=<?php echo $this->lang ?>" type="text/javascript"></script>
-<?php IF (isset($this->opener['TinyMCE']) && $this->opener['TinyMCE']): ?>
+<?php if (isset($this->opener['TinyMCE']) && $this->opener['TinyMCE']): ?>
 <script src="<?php echo $this->config['_tinyMCEPath'] ?>/tiny_mce_popup.js" type="text/javascript"></script>
-<?php ENDIF ?>
-<?php IF (file_exists("themes/{$this->config['theme']}/init.js")): ?>
+<?php endif ?>
+<?php if (file_exists("themes/{$this->config['theme']}/init.js")): ?>
 <script src="themes/<?php echo $this->config['theme'] ?>/init.js" type="text/javascript"></script>
-<?php ENDIF ?>
+<?php endif ?>
 <script type="text/javascript">
 browser.version = "<?php echo self::VERSION ?>";
 browser.support.chromeFrame = <?php echo (strpos(strtolower($_SERVER['HTTP_USER_AGENT']), " chromeframe") !== false) ? "true" : "false" ?>;
@@ -23,19 +23,19 @@ 
 browser.siteURL = "<?php echo text::jsValue($this->config['siteURL']) ?>";
 browser.assetsURL = "<?php echo text::jsValue($this->config['assetsURL']) ?>";
 browser.thumbsURL = browser.assetsURL + "/<?php echo text::jsValue($this->config['thumbsDir']) ?>";
-<?php IF (isset($this->get['opener']) && strlen($this->get['opener'])): ?>
+<?php if (isset($this->get['opener']) && strlen($this->get['opener'])): ?>
 browser.opener.name = "<?php echo text::jsValue($this->get['opener']) ?>";
-<?php ENDIF ?>
-<?php IF (isset($this->opener['CKEditor']['funcNum']) && preg_match('/^\d+$/', $this->opener['CKEditor']['funcNum'])): ?>
+<?php endif ?>
+<?php if (isset($this->opener['CKEditor']['funcNum']) && preg_match('/^\d+$/', $this->opener['CKEditor']['funcNum'])): ?>
 browser.opener.CKEditor = {};
 browser.opener.CKEditor.funcNum = <?php echo $this->opener['CKEditor']['funcNum'] ?>;
-<?php ENDIF ?>
-<?php IF (isset($this->opener['TinyMCE']) && $this->opener['TinyMCE']): ?>
+<?php endif ?>
+<?php if (isset($this->opener['TinyMCE']) && $this->opener['TinyMCE']): ?>
 browser.opener.TinyMCE = true;
-<?php ENDIF ?>
-<?php IF (isset($this->get['opener']) && ($this->get['opener'] == "tinymce4") && isset($this->get['field'])): ?>
+<?php endif ?>
+<?php if (isset($this->get['opener']) && ($this->get['opener'] == "tinymce4") && isset($this->get['field'])): ?>
 browser.opener.TinyMCE4 = "<?= text::jsValue($this->get['field']) ?>";
-<?php ENDIF ?>
+<?php endif ?>
 browser.cms = "<?php echo text::jsValue($this->cms) ?>";
 _.kuki.domain = "<?php echo text::jsValue($this->config['cookieDomain']) ?>";
 _.kuki.path = "<?php echo text::jsValue($this->config['cookiePath']) ?>";

manager/media/browser/mcpuk/tpl/tpl_browser.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 <head>

     <title>KCFinder: /

         <?php echo $this->session['dir'] ?></title>

-    <?php INCLUDE "tpl/tpl_css.php" ?>

-    <?php INCLUDE "tpl/tpl_javascript.php" ?>

+    <?php include "tpl/tpl_css.php" ?>

+    <?php include "tpl/tpl_javascript.php" ?>

 </head>

 

 <body>

manager/media/browser/mcpuk/lang/uk.php

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php
 
 /** Ukrainian localization file for KCFinder
-	* author: Myroslav Dobra
-	* E-mail: dmaraptor@mail.ru
-  */
+ * author: Myroslav Dobra
+ * E-mail: dmaraptor@mail.ru
+ */
 
 $lang = array(