evolution-cms / evolution

manager/frames/tree.php

Braces +10 added lines, -10 removed lines

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

 }

 

 // invoke OnManagerTreeInit event

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

-if (is_array($evtOut)) {

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

 }

 ?>

@@ -17,7 +17,7 @@ 
 

 		<a class="treeButton" id="treeMenu_collapsetree" onclick="modx.tree.collapseTree();" title="<?php echo $_lang['collapse_tree']; ?>"><?php echo $_style['collapse_tree']; ?></a>

 

-		<?php if ($modx->hasPermission('new_document')) {

+		<?php if ($modx->hasPermission('new_document')) {
     ?>

 			<a class="treeButton" id="treeMenu_addresource" onclick="modx.tabs({url:'<?= MODX_MANAGER_URL ?>?a=4', title: '<?php echo $_lang['add_resource']; ?>'});" title="<?php echo $_lang['add_resource']; ?>"><?php echo $_style['add_doc_tree']; ?></a>

 			<a class="treeButton" id="treeMenu_addweblink" onclick="modx.tabs({url:'<?= MODX_MANAGER_URL ?>?a=72', title: '<?php echo $_lang['add_weblink']; ?>'});" title="<?php echo $_lang['add_weblink']; ?>"><?php echo $_style['add_weblink_tree']; ?></a>

@@ -28,31 +28,31 @@ 
 

 		<a class="treeButton" id="treeMenu_sortingtree" onclick="modx.tree.showSorter(event);" title="<?php echo $_lang['sort_tree']; ?>"><?php echo $_style['sort_tree']; ?></a>

 

-		<?php if ($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {

+		<?php if ($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
         ?>

 			<a class="treeButton" id="treeMenu_sortingindex" onclick="modx.tabs({url: '<?= MODX_MANAGER_URL ?>?a=56&id=0', title: '<?php echo $_lang['sort_menuindex']; ?>'});" title="<?php echo $_lang['sort_menuindex']; ?>"><?php echo $_style['sort_menuindex']; ?></a>

 		<?php

     } ?>

 

-		<?php if ($use_browser && $modx->hasPermission('assets_images')) {

+		<?php if ($use_browser && $modx->hasPermission('assets_images')) {
         ?>

 			<a class="treeButton" id="treeMenu_openimages" title="<?php echo $_lang["images_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['images_management']; ?></a>

 		<?php

     } ?>

 

-		<?php if ($use_browser && $modx->hasPermission('assets_files')) {

+		<?php if ($use_browser && $modx->hasPermission('assets_files')) {
         ?>

 			<a class="treeButton" id="treeMenu_openfiles" title="<?php echo $_lang["files_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['files_management']; ?></a>

 		<?php

     } ?>

 

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

 			<a class="treeButton" id="treeMenu_openelements" title="<?php echo $_lang["element_management"] . "\n" . $_lang['em_button_shift'] ?>"><?php echo $_style['element_management']; ?></a>

 		<?php

     } ?>

 

-		<?php if ($modx->hasPermission('empty_trash')) {

+		<?php if ($modx->hasPermission('empty_trash')) {
         ?>

 			<a class="treeButton treeButtonDisabled" id="treeMenu_emptytrash" title="<?php echo $_lang['empty_recycle_bin_empty']; ?>"><?php echo $_style['empty_recycle_bin_empty']; ?></a>

 		<?php

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

         // invoke OnManagerTreePrerender event

         $evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->db->escape($_REQUEST));

-        if (is_array($evtOut)) {

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

         }

         ?>

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

         // invoke OnManagerTreeRender event

         $evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->db->escape($_REQUEST));

-        if (is_array($evtOut)) {

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

         }

         ?>

manager/frames/mainmenu.php

Braces +32 added lines, -32 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,21 +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) {

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

manager/frames/1.php

Braces +52 added lines, -49 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;

     }

 }

@@ -119,7 +119,7 @@ 
     <meta name="theme-color" content="#1d2023" />

     <meta http-equiv="X-UA-Compatible" content="IE=edge" />

     <link rel="stylesheet" type="text/css" href="<?= $css ?>" />

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

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

         <link rel="stylesheet" href="media/style/common/spectrum/spectrum.css" />

         <link rel="stylesheet" type="text/css" href="media/style/<?= $modx->config['manager_theme'] ?>/css/color.switcher.css" />

@@ -251,7 +251,7 @@ 
       ?>

     </script>

     <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/modx.min.js?v=<?= $lastInstallTime ?>"></script>

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

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

         <script src="media/script/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>

         <script src="media/script/spectrum/spectrum.evo.min.js" type="text/javascript"></script>

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

     // invoke OnManagerTopPrerender event

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

-    if (is_array($evtOut)) {

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

     }

     ?>

@@ -287,14 +287,14 @@ 
                                 <div class="mask"></div>

                             </form>

                         </li>

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

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

-                            <?php if ($modx->hasPermission('new_document')) {

+                            <?php if ($modx->hasPermission('new_document')) {
             ?>

                                 <li id="newresource" class="dropdown newresource">

                                     <a href="javascript:;" class="dropdown-toggle" onclick="return false;" title="<?= $_lang['add_resource'] ?>"><?= $_style['menu_new_resource'] ?></a>

                                     <ul class="dropdown-menu">

-                                        <?php if ($modx->hasPermission('new_document')) {

+                                        <?php if ($modx->hasPermission('new_document')) {
                 ?>

                                             <li>

                                                 <a onclick="" href="index.php?a=4" target="main">

@@ -308,7 +308,7 @@ 
                                             </li>

                                         <?php

             } ?>

-                                        <?php if ($use_browser && $modx->hasPermission('assets_images')) {

+                                        <?php if ($use_browser && $modx->hasPermission('assets_images')) {
                 ?>

                                             <li>

                                                 <a onclick="" href="media/browser/<?= $which_browser ?>/browse.php?&type=images" target="main">

@@ -317,7 +317,7 @@ 
                                             </li>

                                         <?php

             } ?>

-                                        <?php if ($use_browser && $modx->hasPermission('assets_files')) {

+                                        <?php if ($use_browser && $modx->hasPermission('assets_files')) {
                 ?>

                                             <li>

                                                 <a onclick="" href="media/browser/<?= $which_browser ?>/browse.php?&type=files" target="main">

@@ -340,11 +340,11 @@ 
                         <li id="account" class="dropdown account">

                             <a href="javascript:;" class="dropdown-toggle" onclick="return false;">

                                 <span class="username"><?= $user['username'] ?></span>

-                                <?php if ($user['photo']) {

+                                <?php if ($user['photo']) {
         ?>

                                     <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL . $user['photo'] ?>);"></span>

                                 <?php

-    } else {

+    } else {
         ?>

                                     <span class="icon"><?= $_style['menu_user'] ?></span>

                                 <?php

@@ -355,7 +355,7 @@ 
                                 <?php if ($modx->hasPermission('messages')): ?>

                                     <li id="newMail"></li>

                                 <?php endif; ?>

-                                <?php if ($modx->hasPermission('change_password')) {

+                                <?php if ($modx->hasPermission('change_password')) {
         ?>

                                     <li>

                                         <a onclick="" href="index.php?a=28" target="main">

@@ -378,12 +378,12 @@ 
                                 ?>

                             </ul>

                         </li>

-                        <?php if ($modx->hasPermission('settings') || $modx->hasPermission('view_eventlog') || $modx->hasPermission('logs') || $modx->hasPermission('help')) {

+                        <?php if ($modx->hasPermission('settings') || $modx->hasPermission('view_eventlog') || $modx->hasPermission('logs') || $modx->hasPermission('help')) {
                                     ?>

                             <li id="system" class="dropdown">

                                 <a href="javascript:;" class="dropdown-toggle" title="<?= $_lang['system'] ?>" onclick="return false;"><?= $_style['menu_system'] ?></a>

                                 <ul class="dropdown-menu">

-                                    <?php if ($modx->hasPermission('settings')) {

+                                    <?php if ($modx->hasPermission('settings')) {
                                         ?>

                                         <li>

                                             <a href="index.php?a=17" target="main">

@@ -392,7 +392,7 @@ 
                                         </li>

                                     <?php

                                     } ?>

-                                    <?php if ($modx->hasPermission('view_eventlog')) {

+                                    <?php if ($modx->hasPermission('view_eventlog')) {
                                         ?>

                                         <li>

                                             <a href="index.php?a=70" target="main">

@@ -401,7 +401,7 @@ 
                                         </li>

                                     <?php

                                     } ?>

-                                    <?php if ($modx->hasPermission('view_eventlog')) {

+                                    <?php if ($modx->hasPermission('view_eventlog')) {
                                         ?>

                                         <li>

                                             <a href="index.php?a=114" target="main">

@@ -410,7 +410,7 @@ 
                                         </li>

                                     <?php

                                     } ?>

-                                    <?php if ($modx->hasPermission('logs')) {

+                                    <?php if ($modx->hasPermission('logs')) {
                                         ?>

                                         <li>

                                             <a href="index.php?a=13" target="main">

@@ -424,7 +424,7 @@ 
                                         </li>

                                     <?php

                                     } ?>

-                                    <?php if ($modx->hasPermission('help')) {

+                                    <?php if ($modx->hasPermission('help')) {
                                         ?>

                                         <li>

                                             <a href="index.php?a=9" target="main">

@@ -437,7 +437,7 @@ 
                             </li>

                         <?php

                                 } ?>

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

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

                             <li id="fullscreen">

                                 <a href="javascript:;" onclick="toggleFullScreen();" id="toggleFullScreen" title="<?= $_lang["toggle_fullscreen"] ?>">

@@ -462,11 +462,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');

@@ -485,11 +488,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];

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

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

             }

         }

@@ -575,9 +578,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);

         }

@@ -588,7 +591,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) {

@@ -608,7 +611,7 @@ 
         };

           <?php

     } ?>

-          <?php if ($use_browser && $modx->hasPermission('assets_images')) {

+          <?php if ($use_browser && $modx->hasPermission('assets_images')) {
         ?>

 

         document.getElementById('treeMenu_openimages').onclick = function(e) {

@@ -628,7 +631,7 @@ 
         };

           <?php

     } ?>

-          <?php if ($use_browser && $modx->hasPermission('assets_files')) {

+          <?php if ($use_browser && $modx->hasPermission('assets_files')) {
         ?>

 

         document.getElementById('treeMenu_openfiles').onclick = function(e) {

@@ -652,7 +655,7 @@ 
       }

 

     </script>

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

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

         <script>

           function toggleFullScreen()

@@ -690,7 +693,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/media/browser/mcpuk/lib/class_image_gmagick.php

Braces +4 added lines, -2 removed lines

@@ -22,7 +22,8 @@ 
     // ABSTRACT PUBLIC METHODS
 
     public function resize($width, $height)
-    {//
+    {
+//
         if (!$width) {
             $width = 1;
         }
@@ -40,7 +41,8 @@ 
     }
 
     public function resizeFit($width, $height, $background=false)
-    {//
+    {
+//
         if (!$width) {
             $width = 1;
         }

manager/media/browser/mcpuk/lib/class_gd.php

Braces +94 added lines, -94 removed lines

@@ -12,8 +12,8 @@ 
   *      @link http://kcfinder.sunhater.com

   */

 

-class gd

-{

+class gd
+{
 

   /** GD resource

     * @var resource */

@@ -41,20 +41,20 @@ 
       * @param mixed $image

       * @return array */

 

-    protected function build_image($image)

-    {

-        if ($image instanceof gd) {

+    protected function build_image($image)
+    {
+        if ($image instanceof gd) {
             $width = $image->get_width();

             $height = $image->get_height();

             $image = $image->get_image();

-        } elseif (is_resource($image) && (get_resource_type($image) == "gd")) {

+        } elseif (is_resource($image) && (get_resource_type($image) == "gd")) {
             $width = @imagesx($image);

             $height = @imagesy($image);

-        } elseif (is_array($image)) {

+        } elseif (is_array($image)) {
             list($key, $width) = each($image);

             list($key, $height) = each($image);

             $image = imagecreatetruecolor($width, $height);

-        } elseif (false !== (list($width, $height, $type) = @getimagesize($image))) {

+        } elseif (false !== (list($width, $height, $type) = @getimagesize($image))) {
             $image =

                 ($type == IMAGETYPE_GIF)      ? @imagecreatefromgif($image)  : (

                 ($type == IMAGETYPE_WBMP)     ? @imagecreatefromwbmp($image) : (

@@ -64,7 +64,7 @@ 
                 ($type == IMAGETYPE_XBM)      ? @imagecreatefromxbm($image)  : false

             )))));

 

-            if ($type == IMAGETYPE_PNG) {

+            if ($type == IMAGETYPE_PNG) {
                 imagealphablending($image, false);

             }

         }

@@ -80,7 +80,7 @@ 
             ? array($image, $width, $height)

             : false;

 

-        if (($return !== false) && isset($type)) {

+        if (($return !== false) && isset($type)) {
             $this->type = $type;

         }

 

@@ -98,22 +98,22 @@ 
       * @param integer $bigger_size

       * @return gd */

 

-    public function __construct($image, $bigger_size=null)

-    {

+    public function __construct($image, $bigger_size=null)
+    {
         $this->image = $this->width = $this->height = null;

 

         $image_details = $this->build_image($image);

 

-        if ($image_details !== false) {

+        if ($image_details !== false) {
             list($this->image, $this->width, $this->height) = $image_details;

-        } else {

+        } else {
             $this->init_error = true;

         }

 

         if (!is_null($this->image) &&

             !is_null($bigger_size) &&

             (preg_match('/^[1-9][0-9]*$/', $bigger_size) !== false)

-        ) {

+        ) {
             $image = $this->image;

             list($width, $height) = $this->get_prop_size($bigger_size);

             $this->image = imagecreatetruecolor($width, $height);

@@ -128,24 +128,24 @@ 
     /** Returns the GD resource

       * @return resource */

 

-    public function get_image()

-    {

+    public function get_image()
+    {
         return $this->image;

     }

 

     /** Returns the image width

       * @return integer */

 

-    public function get_width()

-    {

+    public function get_width()
+    {
         return $this->width;

     }

 

     /** Returns the image height

       * @return integer */

 

-    public function get_height()

-    {

+    public function get_height()
+    {
         return $this->height;

     }

 

@@ -153,10 +153,10 @@ 
       * @param integer $resized_height

       * @return integer */

 

-    public function get_prop_width($resized_height)

-    {

+    public function get_prop_width($resized_height)
+    {
         $width = intval(($this->width * $resized_height) / $this->height);

-        if (!$width) {

+        if (!$width) {
             $width = 1;

         }

         return $width;

@@ -166,10 +166,10 @@ 
       * @param integer $resized_width

       * @return integer */

 

-    public function get_prop_height($resized_width)

-    {

+    public function get_prop_height($resized_width)
+    {
         $height = intval(($this->height * $resized_width) / $this->width);

-        if (!$height) {

+        if (!$height) {
             $height = 1;

         }

         return $height;

@@ -181,15 +181,15 @@ 
       * @param integer $bigger_size

       * @return array */

 

-    public function get_prop_size($bigger_size)

-    {

-        if ($this->width > $this->height) {

+    public function get_prop_size($bigger_size)
+    {
+        if ($this->width > $this->height) {
             $width = $bigger_size;

             $height = $this->get_prop_height($width);

-        } elseif ($this->height > $this->width) {

+        } elseif ($this->height > $this->width) {
             $height = $bigger_size;

             $width = $this->get_prop_width($height);

-        } else {

+        } else {
             $width = $height = $bigger_size;

         }

 

@@ -201,12 +201,12 @@ 
       * @param integer $height

       * @return bool */

 

-    public function resize($width, $height)

-    {

-        if (!$width) {

+    public function resize($width, $height)
+    {
+        if (!$width) {
             $width = 1;

         }

-        if (!$height) {

+        if (!$height) {
             $height = 1;

         }

         return (

@@ -223,19 +223,19 @@ 
       * @param mixed $src

       * @return bool */

 

-    public function resize_crop($src)

-    {

+    public function resize_crop($src)
+    {
         $image_details = $this->build_image($src);

 

-        if ($image_details !== false) {

+        if ($image_details !== false) {
             list($src, $src_width, $src_height) = $image_details;

 

-            if (($src_width / $src_height) > ($this->width / $this->height)) {

+            if (($src_width / $src_height) > ($this->width / $this->height)) {
                 $src_w = $this->get_prop_width($src_height);

                 $src_h = $src_height;

                 $src_x = intval(($src_width - $src_w) / 2);

                 $src_y = 0;

-            } else {

+            } else {
                 $src_w = $src_width;

                 $src_h = $this->get_prop_height($src_width);

                 $src_x = 0;

@@ -243,7 +243,7 @@ 
             }

 

             return imagecopyresampled($this->image, $src, 0, 0, $src_x, $src_y, $this->width, $this->height, $src_w, $src_h);

-        } else {

+        } else {
             return false;

         }

     }

@@ -253,20 +253,20 @@ 
       * @param integer $height

       * @return bool */

 

-    public function resize_fit($width, $height)

-    {

-        if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height))) {

+    public function resize_fit($width, $height)
+    {
+        if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height))) {
             return true;

         }

-        if (!$width || (($height / $width) < ($this->height / $this->width))) {

+        if (!$width || (($height / $width) < ($this->height / $this->width))) {
             $width = intval(($this->width * $height) / $this->height);

-        } elseif (!$height || (($width / $height) < ($this->width / $this->height))) {

+        } elseif (!$height || (($width / $height) < ($this->width / $this->height))) {
             $height = intval(($this->height * $width) / $this->width);

         }

-        if (!$width) {

+        if (!$width) {
             $width = 1;

         }

-        if (!$height) {

+        if (!$height) {
             $height = 1;

         }

         return $this->resize($width, $height);

@@ -279,8 +279,8 @@ 
       * @param integer $height

       * @return bool */

 

-    public function resize_overflow($width, $height)

-    {

+    public function resize_overflow($width, $height)
+    {
         $big = (($this->width / $this->height) > ($width / $height))

             ? ($this->width * $height) / $this->height

             : ($this->height * $width) / $this->width;

@@ -288,7 +288,7 @@ 
 

         $return = ($img = new gd($this->image, $big));

 

-        if ($return) {

+        if ($return) {
             $this->image = $img->get_image();

             $this->width = $img->get_width();

             $this->height = $img->get_height();

@@ -297,8 +297,8 @@ 
         return $return;

     }

 

-    public function gd_color()

-    {

+    public function gd_color()
+    {
         $args = func_get_args();

 

         $expr_rgb = '/^rgb\(\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\)$/i';

@@ -306,20 +306,20 @@ 
         $expr_hex2 = '/^\#?([0-9a-f])([0-9a-f])([0-9a-f])$/i';

         $expr_byte = '/^([01]?\d?\d|2[0-4]\d|25[0-5])$/';

 

-        if (!isset($args[0])) {

+        if (!isset($args[0])) {
             return false;

         }

 

-        if (count($args[0]) == 3) {

+        if (count($args[0]) == 3) {
             list($r, $g, $b) = $args[0];

-        } elseif (preg_match($expr_rgb, $args[0])) {

+        } elseif (preg_match($expr_rgb, $args[0])) {
             list($r, $g, $b) = explode(" ", preg_replace($expr_rgb, "$1 $2 $3", $args[0]));

-        } elseif (preg_match($expr_hex1, $args[0])) {

+        } elseif (preg_match($expr_hex1, $args[0])) {
             list($r, $g, $b) = explode(" ", preg_replace($expr_hex1, "$1 $2 $3", $args[0]));

             $r = hexdec($r);

             $g = hexdec($g);

             $b = hexdec($b);

-        } elseif (preg_match($expr_hex2, $args[0])) {

+        } elseif (preg_match($expr_hex2, $args[0])) {
             list($r, $g, $b) = explode(" ", preg_replace($expr_hex2, "$1$1 $2$2 $3$3", $args[0]));

             $r = hexdec($r);

             $g = hexdec($g);

@@ -328,17 +328,17 @@ 
             preg_match($expr_byte, $args[0]) &&

             preg_match($expr_byte, $args[1]) &&

             preg_match($expr_byte, $args[2])

-        ) {

+        ) {
             list($r, $g, $b) = $args;

-        } else {

+        } else {
             return false;

         }

 

         return imagecolorallocate($this->image, $r, $g, $b);

     }

 

-    public function fill_color($color)

-    {

+    public function fill_color($color)
+    {
         return $this->imagefilledrectangle(0, 0, $this->width - 1, $this->height - 1, $color);

     }

 

@@ -351,26 +351,26 @@ 
         $src_x=0, $src_y=0,

         $dst_w=null, $dst_h=null,

         $src_w=null, $src_h=null

-    ) {

+    ) {
         $image_details = $this->build_image($src);

 

-        if ($image_details !== false) {

+        if ($image_details !== false) {
             list($src, $src_width, $src_height) = $image_details;

 

-            if (is_null($dst_w)) {

+            if (is_null($dst_w)) {
                 $dst_w = $this->width - $dst_x;

             }

-            if (is_null($dst_h)) {

+            if (is_null($dst_h)) {
                 $dst_h = $this->height - $dst_y;

             }

-            if (is_null($src_w)) {

+            if (is_null($src_w)) {
                 $src_w = $src_width - $src_x;

             }

-            if (is_null($src_h)) {

+            if (is_null($src_h)) {
                 $src_h = $src_height - $src_y;

             }

             return imagecopy($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h);

-        } else {

+        } else {
             return false;

         }

     }

@@ -381,22 +381,22 @@ 
         $src_x=0, $src_y=0,

         $dst_w=null, $dst_h=null,

         $src_w=null, $src_h=null

-    ) {

+    ) {
         $image_details = $this->build_image($src);

 

-        if ($image_details !== false) {

+        if ($image_details !== false) {
             list($src, $src_width, $src_height) = $image_details;

 

-            if (is_null($dst_w)) {

+            if (is_null($dst_w)) {
                 $dst_w = $this->width - $dst_x;

             }

-            if (is_null($dst_h)) {

+            if (is_null($dst_h)) {
                 $dst_h = $this->height - $dst_y;

             }

-            if (is_null($src_w)) {

+            if (is_null($src_w)) {
                 $src_w = $src_width - $src_x;

             }

-            if (is_null($src_h)) {

+            if (is_null($src_h)) {
                 $src_h = $src_height - $src_y;

             }

             imagealphablending($this->image, false);

@@ -409,7 +409,7 @@ 
 

             $transindex = imagecolortransparent($src);

             $palletsize = imagecolorstotal($src);

-            if ($transindex >= 0 && $transindex < $palletsize) {

+            if ($transindex >= 0 && $transindex < $palletsize) {
                 $transcol = imagecolorsforindex($src, $transindex);

 

                 /*** end gif transparent fix ***/

@@ -418,54 +418,54 @@ 
                 imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex);

                 imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);

                 imagecolortransparent($this->image, $transindex);

-                for ($y=0; $y<$dst_h; ++$y) {

-                    for ($x=0; $x<$dst_w; ++$x) {

-                        if (((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) {

+                for ($y=0; $y<$dst_h; ++$y) {
+                    for ($x=0; $x<$dst_w; ++$x) {
+                        if (((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) {
                             imagesetpixel($this->image, $x, $y, $transindex);

                         }

                     }

                 }

                 imagetruecolortopalette($this->image, true, 255);

-            } else {

+            } else {
                 $transparent = imagecolorallocatealpha($this->image, 255, 255, 255, 127);

                 imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transparent);

                 imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);

             }

             return $this->image;

-        } else {

+        } else {
             return false;

         }

     }

 

-    public function imagefilledrectangle($x1, $y1, $x2, $y2, $color)

-    {

+    public function imagefilledrectangle($x1, $y1, $x2, $y2, $color)
+    {
         $color = $this->gd_color($color);

-        if ($color === false) {

+        if ($color === false) {
             return false;

         }

         return imagefilledrectangle($this->image, $x1, $y1, $x2, $y2, $color);

     }

 

-    public function imagepng($filename=null, $quality=null, $filters=null)

-    {

-        if (is_null($filename) && !headers_sent()) {

+    public function imagepng($filename=null, $quality=null, $filters=null)
+    {
+        if (is_null($filename) && !headers_sent()) {
             header("Content-Type: image/png");

         }

         @imagesavealpha($this->image, true);

         return imagepng($this->image, $filename, $quality, $filters);

     }

 

-    public function imagejpeg($filename=null, $quality=75)

-    {

-        if (is_null($filename) && !headers_sent()) {

+    public function imagejpeg($filename=null, $quality=75)
+    {
+        if (is_null($filename) && !headers_sent()) {
             header("Content-Type: image/jpeg");

         }

         return imagejpeg($this->image, $filename, $quality);

     }

 

-    public function imagegif($filename=null)

-    {

-        if (is_null($filename) && !headers_sent()) {

+    public function imagegif($filename=null)
+    {
+        if (is_null($filename) && !headers_sent()) {
             header("Content-Type: image/gif");

         }

         @imagesavealpha($this->image, true);

manager/media/browser/mcpuk/lib/class_image_imagick.php

Braces +4 added lines, -2 removed lines

@@ -22,7 +22,8 @@ 
     // ABSTRACT PUBLIC METHODS
 
     public function resize($width, $height)
-    {//
+    {
+//
         if (!$width) {
             $width = 1;
         }
@@ -40,7 +41,8 @@ 
     }
 
     public function resizeFit($width, $height, $background=false)
-    {//
+    {
+//
         if (!$width) {
             $width = 1;
         }

manager/media/browser/mcpuk/browser.php

Braces +4 added lines, -4 removed lines

@@ -10,15 +10,15 @@
 			}

 		};

 <?php

-    if (isset($_GET['type'])) {

+    if (isset($_GET['type'])) {
         $type = htmlspecialchars(trim($_GET['type']), ENT_QUOTES);

-    } elseif (isset($_GET['Type'])) {

+    } elseif (isset($_GET['Type'])) {
         $type = htmlspecialchars(trim($_GET['Type']), ENT_QUOTES);

-    } else {

+    } else {
         $type = 'images';

     }

     

-    if ($type==='image') {

+    if ($type==='image') {
         $type = 'images';

     }

     

manager/media/style/default/style.php

Braces +15 added lines, -15 removed lines

@@ -10,12 +10,12 @@ 
  */

 $style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/';

 $modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php';

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

+if (!$modx->config['lang_code']) {
     global $modx_lang_attribute;

     $modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;

 }

 

-if ($_GET['a'] == 2) {

+if ($_GET['a'] == 2) {
     include_once('welcome.php');

 }

 

@@ -262,68 +262,68 @@ 
 

 // actions buttons templates

 $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : '';

-if (!empty($modx->config['global_tabs']) && !isset($_SESSION['stay'])) {

+if (!empty($modx->config['global_tabs']) && !isset($_SESSION['stay'])) {
     $_REQUEST['stay'] = 2;

 }

-if (isset($_REQUEST['stay'])) {

+if (isset($_REQUEST['stay'])) {
     $_SESSION['stay'] = $_REQUEST['stay'];

-} elseif (isset($_SESSION['stay'])) {

+} elseif (isset($_SESSION['stay'])) {
     $_REQUEST['stay'] = $_SESSION['stay'];

 }

 $stay = isset($_REQUEST['stay']) ? $_REQUEST['stay'] : '';

 $addnew = 0;

 $run = 0;

-switch ($action) {

+switch ($action) {
     case '3':

     case '4':

     case '27':

     case '72':

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

+        if ($modx->hasPermission('new_document')) {
             $addnew = 1;

         }

         break;

     case '16':

     case '19':

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

+        if ($modx->hasPermission('new_template')) {
             $addnew = 1;

         }

         break;

     case '300':

     case '301':

-        if ($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {

+        if ($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
             $addnew = 1;

         }

         break;

     case '77':

     case '78':

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

+        if ($modx->hasPermission('new_chunk')) {
             $addnew = 1;

         }

         break;

     case '22':

     case '23':

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

+        if ($modx->hasPermission('new_snippet')) {
             $addnew = 1;

         }

         break;

     case '101':

     case '102':

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

+        if ($modx->hasPermission('new_plugin')) {
             $addnew = 1;

         }

         break;

     case '106':

     case '107':

     case '108':

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

+        if ($modx->hasPermission('new_module')) {
             $addnew = 1;

         }

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

+        if ($modx->hasPermission('exec_module')) {
             $run = 1;

         }

         break;

     case '88':

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

+        if ($modx->hasPermission('new_web_user')) {
             $addnew = 1;

         }

         break;

manager/media/style/default/ajax.php

Braces +73 added lines, -73 removed lines

@@ -7,11 +7,11 @@ 
 

 $modx->db->connect();

 

-if (empty($modx->config)) {

+if (empty($modx->config)) {
     $modx->getSettings();

 }

 

-if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {

+if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {
     $modx->sendErrorPage();

 }

 

@@ -20,7 +20,7 @@ 
 

 $_lang = array();

 include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php';

-if ($modx->config['manager_language'] != 'english') {

+if ($modx->config['manager_language'] != 'english') {
     include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php';

 }

 include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php';

@@ -33,12 +33,12 @@ 
 // set limit sql query

 $limit = !empty($modx->config['number_of_results']) ? (int) $modx->config['number_of_results'] : 100;

 

-if (isset($action)) {

-    switch ($action) {

+if (isset($action)) {
+    switch ($action) {
 

         case '1': {

 

-            switch ($frame) {

+            switch ($frame) {
                 case 'nodes':

                     include_once MODX_MANAGER_PATH . '/frames/nodes.php';

 

@@ -52,7 +52,7 @@ 
 

             $elements = isset($_REQUEST['elements']) && is_scalar($_REQUEST['elements']) ? htmlentities($_REQUEST['elements']) : '';

 

-            if ($elements) {

+            if ($elements) {
                 $output = '';

                 $items = '';

                 $sql = '';

@@ -61,7 +61,7 @@ 
                 $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->db->escape($filter) . '%"' : '';

                 $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

 

-                switch ($elements) {

+                switch ($elements) {
                     case 'element_templates':

                         $a = 16;

                         $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->db->escape($filter) . '%"' : '';

@@ -71,7 +71,7 @@ 
                         ORDER BY t1.templatename ASC

                         ' . $sqlLimit);

 

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

+                        if ($modx->hasPermission('new_template')) {
                             $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>';

                         }

 

@@ -87,7 +87,7 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

-                        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')) {
                             $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>';

                         }

 

@@ -101,7 +101,7 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

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

+                        if ($modx->hasPermission('new_chunk')) {
                             $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>';

                         }

 

@@ -115,7 +115,7 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

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

+                        if ($modx->hasPermission('new_snippet')) {
                             $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>';

                         }

 

@@ -129,19 +129,19 @@ 
                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

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

+                        if ($modx->hasPermission('new_plugin')) {
                             $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>';

                         }

 

                         break;

                 }

 

-                if ($count = $modx->db->getRecordCount($sql)) {

-                    if ($count == $limit) {

+                if ($count = $modx->db->getRecordCount($sql)) {
+                    if ($count == $limit) {
                         $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                     }

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

-                        if (($row['disabled'] || $row['locked']) && $role != 1) {

+                    while ($row = $modx->db->getRow($sql)) {
+                        if (($row['disabled'] || $row['locked']) && $role != 1) {
                             continue;

                         }

 

@@ -149,9 +149,9 @@ 
                     }

                 }

 

-                if (isset($_REQUEST['filter'])) {

+                if (isset($_REQUEST['filter'])) {
                     $output = $items;

-                } else {

+                } else {
                     $output .= $items;

                 }

 

@@ -176,22 +176,22 @@ 
 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

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

+            if ($modx->hasPermission('new_user')) {
                 $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>';

             }

 

-            if ($count = $modx->db->getRecordCount($sql)) {

-                if ($count == $limit) {

+            if ($count = $modx->db->getRecordCount($sql)) {
+                if ($count == $limit) {
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

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

+                while ($row = $modx->db->getRow($sql)) {
                     $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';

                 }

             }

 

-            if (isset($_REQUEST['filter'])) {

+            if (isset($_REQUEST['filter'])) {
                 $output = $items;

-            } else {

+            } else {
                 $output .= $items;

             }

 

@@ -215,22 +215,22 @@ 
 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

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

+            if ($modx->hasPermission('new_web_user')) {
                 $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>';

             }

 

-            if ($count = $modx->db->getRecordCount($sql)) {

-                if ($count == $limit) {

+            if ($count = $modx->db->getRecordCount($sql)) {
+                if ($count == $limit) {
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

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

+                while ($row = $modx->db->getRow($sql)) {
                     $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';

                 }

             }

 

-            if (isset($_REQUEST['filter'])) {

+            if (isset($_REQUEST['filter'])) {
                 $output = $items;

-            } else {

+            } else {
                 $output .= $items;

             }

 

@@ -244,8 +244,8 @@ 
             $type = isset($_REQUEST['type']) && is_scalar($_REQUEST['type']) ? $modx->db->escape($_REQUEST['type']) : false;

             $contextmenu = '';

 

-            if ($role && $name && $type) {

-                switch ($type) {

+            if ($role && $name && $type) {
+                switch ($type) {
                     case 'Snippet':

                     case 'SnippetNoCache': {

 

@@ -254,7 +254,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

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

+                        if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -265,13 +265,13 @@ 
                                     'url' => "index.php?a=22&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

                                 );

                             }

-                        } else {

+                        } else {
                             $contextmenu = array(

                                 'header' => array(

                                     'innerHTML' => '<i class="fa fa-code"></i> ' . $name

@@ -292,7 +292,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

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

+                        if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -303,13 +303,13 @@ 
                                     'url' => "index.php?a=78&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

                                 );

                             }

-                        } else {

+                        } else {
                             $contextmenu = array(

                                 'header' => array(

                                     'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name

@@ -329,7 +329,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

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

+                        if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -340,19 +340,19 @@ 
                                     'url' => "index.php?a=78&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

                                 );

                             }

-                        } else {

+                        } else {
                             $sql = $modx->db->query('SELECT *

 							FROM ' . $modx->getFullTableName('site_snippets') . '

 							WHERE name="' . $name . '"

 							LIMIT 1');

 

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

+                            if ($modx->db->getRecordCount($sql)) {
                                 $row = $modx->db->getRow($sql);

                                 $contextmenu = array(

                                     'header' => array(

@@ -363,13 +363,13 @@ 
                                         'url' => "index.php?a=22&id=" . $row['id']

                                     )

                                 );

-                                if (!empty($row['description'])) {

+                                if (!empty($row['description'])) {
                                     $contextmenu['seperator'] = '';

                                     $contextmenu['description'] = array(

                                         'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

                                     );

                                 }

-                            } else {

+                            } else {
                                 $contextmenu = array(

                                     'header' => array(

                                         'innerHTML' => '<i class="fa fa-code"></i> ' . $name

@@ -431,7 +431,7 @@ 
                             'alias_visible'

                         );

 

-                        if (in_array($name, $default_field)) {

+                        if (in_array($name, $default_field)) {
                             return;

                         }

 

@@ -440,7 +440,7 @@ 
 						WHERE name="' . $name . '"

 						LIMIT 1');

 

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

+                        if ($modx->db->getRecordCount($sql)) {
                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

@@ -451,13 +451,13 @@ 
                                     'url' => "index.php?a=301&id=" . $row['id']

                                 )

                             );

-                            if (!empty($row['description'])) {

+                            if (!empty($row['description'])) {
                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

                                 );

                             }

-                        } else {

+                        } else {
                             $contextmenu = array(

                                 'header' => array(

                                     'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name

@@ -482,13 +482,13 @@ 
         case 'movedocument': {

             $json = array();

 

-            if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {

+            if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
                 $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';

                 $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0;

                 $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0;

 

                 // set parent

-                if ($id && $parent >= 0) {

+                if ($id && $parent >= 0) {
 

                     // find older parent

                     $parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));

@@ -499,31 +499,31 @@ 
                         'new_parent'  => $parent,

                     ));

 

-                    if (is_array($eventOut) && count($eventOut) > 0) {

+                    if (is_array($eventOut) && count($eventOut) > 0) {
                         $eventParent = array_pop($eventOut);

 

-                        if ($eventParent == $parentOld) {

+                        if ($eventParent == $parentOld) {
                             $json['errors'] = $_lang['error_movedocument2'];

-                        } else {

+                        } else {
                             $parent = $eventParent;

                         }

                     }

 

-                    if (empty($json['errors'])) {

+                    if (empty($json['errors'])) {
                         // check privileges user for move docs

-                        if (!empty($modx->config['tree_show_protected']) && $role != 1) {

+                        if (!empty($modx->config['tree_show_protected']) && $role != 1) {
                             $sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');

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

+                            if ($modx->db->getRecordCount($sql)) {
                                 $document_groups = array();

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

+                                while ($row = $modx->db->getRow($sql)) {
                                     $document_groups[$row['document']]['groups'][] = $row['document_group'];

                                 }

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

-                                    if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {

+                                foreach ($document_groups as $key => $value) {
+                                    if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {
                                         $json['errors'] = $_lang["error_no_privileges"];

                                     }

                                 }

-                                if ($json['errors']) {

+                                if ($json['errors']) {
                                     header('content-type: application/json');

                                     echo json_encode($json, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE);

                                     break;

@@ -531,9 +531,9 @@ 
                             }

                         }

 

-                        if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {

+                        if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {
                             $json['errors'] = $_lang["error_no_privileges"];

-                        } else {

+                        } else {
                             // set new parent

                             $modx->db->update(array(

                                 'parent' => $parent

@@ -543,13 +543,13 @@ 
                                 'isfolder' => 1

                             ), $modx->getFullTableName('site_content'), 'id=' . $parent);

 

-                            if ($parent != $parentOld) {

+                            if ($parent != $parentOld) {
                                 // check children docs and set parent isfolder

-                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {

+                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
                                     $modx->db->update(array(

                                         'isfolder' => 1

                                     ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

-                                } else {

+                                } else {
                                     $modx->db->update(array(

                                         'isfolder' => 0

                                     ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

@@ -557,16 +557,16 @@ 
                             }

 

                             // set menuindex

-                            if (!empty($menuindex)) {

+                            if (!empty($menuindex)) {
                                 $menuindex = explode(',', $menuindex);

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

+                                foreach ($menuindex as $key => $value) {
                                     $modx->db->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);

                                 }

-                            } else {

+                            } else {
                                 // TODO: max(*) menuindex

                             }

 

-                            if (!$json['errors']) {

+                            if (!$json['errors']) {
                                 $json['success'] = $_lang["actioncomplete"];

 

                                 $modx->invokeEvent('onAfterMoveDocument', array(

@@ -578,7 +578,7 @@ 
                         }

                     }

                 }

-            } else {

+            } else {
                 $json['errors'] = $_lang["error_no_privileges"];

             }

 

@@ -594,7 +594,7 @@ 
 

             $output = !!$modx->elementIsLocked($type, $id, true);

 

-            if (!$output) {

+            if (!$output) {
                 $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';

                 $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';

                 $sql = '

@@ -603,7 +603,7 @@ 
                     LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id

                     WHERE sc.id=' . $id . ' GROUP BY sc.id';

                 $sql = $modx->db->query($sql);

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

+                if ($modx->db->getRecordCount($sql)) {
                     $row = $modx->db->getRow($sql);

                     $output = !!$row['locked'];

                 }