evolution-cms / evolution

manager/frames/nodes.functions.inc.php

Spacing +31 added lines, -31 removed lines

@@ -39,13 +39,13 @@ 
         case 'publishedon':
         case 'pub_date':
         case 'unpub_date':
-            $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'], 'sc.' . $_SESSION['tree_sortby']);
+            $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.'.$_SESSION['tree_sortby'], 'sc.'.$_SESSION['tree_sortby']);
             break;
         default:
-            $sortby = 'sc.' . $_SESSION['tree_sortby'];
+            $sortby = 'sc.'.$_SESSION['tree_sortby'];
     };
 
-    $orderby = $modx->db->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
+    $orderby = $modx->db->escape($sortby.' '.$_SESSION['tree_sortdir']);
 
     // Folder sorting gets special setup ;) Add menuindex and pagetitle
     if ($_SESSION['tree_sortby'] == 'isfolder') {
@@ -59,11 +59,11 @@ 
     $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
     $showProtected = false;
     if (isset($modx->config['tree_show_protected'])) {
-        $showProtected = (boolean)$modx->config['tree_show_protected'];
+        $showProtected = (boolean) $modx->config['tree_show_protected'];
     }
-    $mgrRole = (isset($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0';
+    $mgrRole = (isset($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
     if ($showProtected == false) {
-        $access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+        $access = "AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
     } else {
         $access = '';
     }
@@ -99,7 +99,7 @@ 
         }
 
         $weblinkDisplay = $row['type'] == 'reference' ? sprintf(' %s', $_style['tree_linkgo']) : '';
-        $pageIdDisplay = '<small>(' . ($modx_textdir ? '&rlm;' : '') . $row['id'] . ')</small>';
+        $pageIdDisplay = '<small>('.($modx_textdir ? '&rlm;' : '').$row['id'].')</small>';
 
         // Prepare displaying user-locks
         $lockedByUser = '';
@@ -110,7 +110,7 @@ 
                     'element_type' => $_lang["lock_element_type_7"],
                     'lasthit_df' => $rowLock['lasthit_df']
                 ));
-                $lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>';
+                $lockedByUser = '<span title="'.$title.'" class="editResource">'.$_style['tree_preview_resource'].'</span>';
             } else {
                 $title = $modx->parseText($_lang["lock_element_locked_by"], array(
                     'element_type' => $_lang["lock_element_type_7"],
@@ -118,9 +118,9 @@ 
                     'lasthit_df' => $rowLock['lasthit_df']
                 ));
                 if ($modx->hasPermission('remove_locks')) {
-                    $lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                    $lockedByUser = '<span onclick="modx.tree.unlockElement(7, '.$row['id'].', this);return false;" title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                 } else {
-                    $lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                    $lockedByUser = '<span title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
                 }
             }
         }
@@ -129,22 +129,22 @@ 
 
         $title = '';
         if (isDateNode($nodeNameSource)) {
-            $title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]';
+            $title = $_lang['pagetitle'].': '.$row['pagetitle'].'[+lf+]';
         }
-        $title .= $_lang['id'] . ': ' . $row['id'];
-        $title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle'];
-        $title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex'];
-        $title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-');
-        $title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename'];
-        $title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']);
-        $title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']);
-        $title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']);
-        $title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
-        $title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
-        $title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
-        $title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= $_lang['id'].': '.$row['id'];
+        $title .= '[+lf+]'.$_lang['resource_opt_menu_title'].': '.$row['menutitle'];
+        $title .= '[+lf+]'.$_lang['resource_opt_menu_index'].': '.$row['menuindex'];
+        $title .= '[+lf+]'.$_lang['alias'].': '.(!empty($row['alias']) ? $row['alias'] : '-');
+        $title .= '[+lf+]'.$_lang['template'].': '.$row['templatename'];
+        $title .= '[+lf+]'.$_lang['publish_date'].': '.$modx->toDateFormat($row['pub_date']);
+        $title .= '[+lf+]'.$_lang['unpublish_date'].': '.$modx->toDateFormat($row['unpub_date']);
+        $title .= '[+lf+]'.$_lang['page_data_web_access'].': '.($row['privateweb'] ? $_lang['private'] : $_lang['public']);
+        $title .= '[+lf+]'.$_lang['page_data_mgr_access'].': '.($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
+        $title .= '[+lf+]'.$_lang['resource_opt_richtext'].': '.($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= '[+lf+]'.$_lang['page_data_searchable'].': '.($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= '[+lf+]'.$_lang['page_data_cacheable'].': '.($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
         $title = $modx->htmlspecialchars($title);
-        $title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
+        $title = str_replace('[+lf+]', ' &#13;', $title); // replace line-breaks with empty space as fall-back
 
         $data = array(
             'id' => $row['id'],
@@ -228,7 +228,7 @@ 
             }
 
             if ($ph['contextmenu']) {
-                $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
             }
 
             if ($_SESSION['tree_show_only_folders']) {
@@ -285,7 +285,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -323,7 +323,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -374,7 +374,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -416,7 +416,7 @@ 
                     }
 
                     if ($ph['contextmenu']) {
-                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                        $ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
                     }
 
                     $node .= $modx->parseText($tpl, $ph);
@@ -493,7 +493,7 @@ 
                     $nodetitle .= $modx->config['friendly_url_suffix'];
                 }
             }
-            $nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle;
+            $nodetitle = $modx->config['friendly_url_prefix'].$nodetitle;
             break;
         case 'pagetitle':
             $nodetitle = $row['pagetitle'];
@@ -553,7 +553,7 @@ 
 {
     $modx = evolutionCMS();
 
-    return (int)$modx->db->getValue($modx->db->query('SELECT count(*) FROM ' . $modx->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
+    return (int) $modx->db->getValue($modx->db->query('SELECT count(*) FROM '.$modx->getFullTableName('site_content').' WHERE parent='.$parent.' AND isfolder='.$isfolder.' '));
 }
 
 /**

manager/frames/tree.php

Spacing +4 added lines, -4 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.");

 }

 

@@ -36,19 +36,19 @@ 
 

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

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

         ?>

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

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

         ?>

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

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

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

Spacing +42 added lines, -42 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'],

     '',

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

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

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

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

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

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

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

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

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

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

         '',

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

         '',

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

         '',

@@ -225,21 +225,21 @@ 
 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)) {

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

                 '',

                 '',

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

         '',

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

         '',

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

         '',

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

         '',

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

     '',

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

         '',

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

         '',

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

         '',

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

         '',

@@ -446,15 +446,15 @@ 
             $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')) {

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

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

Indentation +5 added lines, -5 removed lines

@@ -246,18 +246,18 @@
         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") {

-          ?>

+            ?>

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

         <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js" type="text/javascript"></script>

     <?php

-      } ?>

+        } ?>

     <?php

     // invoke OnManagerTopPrerender event

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

Spacing +38 added lines, -38 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 ?>" />

@@ -144,21 +144,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'] ?>

 

@@ -243,11 +243,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>

@@ -342,7 +342,7 @@ 
                                 <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 {

         ?>

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

@@ -577,7 +577,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);

         }

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

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

@@ -691,7 +691,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 +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/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');

Spacing +10 added lines, -10 removed lines

@@ -19,7 +19,7 @@ 
   *        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");
+include_once(dirname(__FILE__)."/../../../../../assets/cache/siteManager.php");
 require_once('../../../includes/protect.inc.php');
 include_once('../../../includes/config.inc.php');
 include_once('../../../includes/document.parser.class.inc.php');
@@ -34,15 +34,15 @@ 
 
 $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";
+include_once "../../../includes/lang/".$manager_language.".inc.php";
 $_GET['langCode'] = $modx_lang_attribute;
 
 // 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.");
 }
 
 
@@ -78,7 +78,7 @@ 
         );
     }
     if (isset($classes[$class])) {
-        require dirname(__FILE__) . $classes[$class];
+        require dirname(__FILE__).$classes[$class];
     }
 }
 spl_autoload_register('autoloadda9d06472ccb71b84928677ce2a6ca89', true);
@@ -88,14 +88,14 @@ 
 if (!function_exists("json_encode")) {
     function kcfinder_json_string_encode($string)
     {
-        return '"' .
+        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)
@@ -106,16 +106,16 @@ 
             // OBJECT
             if (array_keys($data) !== range(0, count($data) - 1)) {
                 foreach ($data as $key => $val) {
-                    $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val);
+                    $ret[] = kcfinder_json_string_encode($key).':'.json_encode($val);
                 }
-                return "{" . implode(",", $ret) . "}";
+                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/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
 {

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
 {

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

Indentation +27 added lines, -27 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc HTTP cache helper 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 HTTP cache helper 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 httpCache
 {
@@ -18,13 +18,13 @@ 
     const DEFAULT_EXPIRE = 604800; // in seconds
 
     /** Cache a file. The $type parameter might define the MIME type of the file
-      * or path to magic file to autodetect the MIME type. If you skip $type
-      * parameter the method will try with the default magic file. Autodetection
-      * of MIME type requires Fileinfo PHP extension used in file::getMimeType()
-      * @param string $file
-      * @param string $type
-      * @param integer $expire
-      * @param array $headers */
+     * or path to magic file to autodetect the MIME type. If you skip $type
+     * parameter the method will try with the default magic file. Autodetection
+     * of MIME type requires Fileinfo PHP extension used in file::getMimeType()
+     * @param string $file
+     * @param string $type
+     * @param integer $expire
+     * @param array $headers */
 
     public static function file($file, $type=null, $expire=null, array $headers=null)
     {
@@ -46,12 +46,12 @@ 
     }
 
     /** Cache the given $content with $mtime modification time.
-      * @param binary $content
-      * @param integer $mtime
-      * @param string $type
-      * @param integer $expire
-      * @param array $headers
-      * @param bool $checkMTime */
+     * @param binary $content
+     * @param integer $mtime
+     * @param string $type
+     * @param integer $expire
+     * @param array $headers
+     * @param bool $checkMTime */
 
     public static function content($content, $mtime, $type=null, $expire=null, array $headers=null, $checkMTime=true)
     {
@@ -80,10 +80,10 @@ 
     }
 
     /** Check if given modification time is newer than client-side one. If not,
-      * the method will tell the client to get the content from its own cache.
-      * Afterwards the script process will be terminated. This feature requires
-      * the PHP to be configured as Apache module.
-      * @param integer $mtime */
+     * the method will tell the client to get the content from its own cache.
+     * Afterwards the script process will be terminated. This feature requires
+     * the PHP to be configured as Apache module.
+     * @param integer $mtime */
 
     public static function checkMTime($mtime, $sendHeaders=null)
     {

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
       * @param integer $expire
       * @param array $headers */
 
-    public static function file($file, $type=null, $expire=null, array $headers=null)
+    public static function file($file, $type = null, $expire = null, array $headers = null)
     {
         $mtime = @filemtime($file);
         if ($mtime !== false) {
@@ -53,7 +53,7 @@ 
       * @param array $headers
       * @param bool $checkMTime */
 
-    public static function content($content, $mtime, $type=null, $expire=null, array $headers=null, $checkMTime=true)
+    public static function content($content, $mtime, $type = null, $expire = null, array $headers = null, $checkMTime = true)
     {
         if ($checkMTime) {
             self::checkMTime($mtime);
@@ -65,7 +65,7 @@ 
             $expire = self::DEFAULT_EXPIRE;
         }
         $size = strlen($content);
-        $expires = gmdate("D, d M Y H:i:s", time() + $expire) . " GMT";
+        $expires = gmdate("D, d M Y H:i:s", time() + $expire)." GMT";
         header("Content-Type: $type");
         header("Expires: $expires");
         header("Cache-Control: max-age=$expire");
@@ -85,9 +85,9 @@ 
       * the PHP to be configured as Apache module.
       * @param integer $mtime */
 
-    public static function checkMTime($mtime, $sendHeaders=null)
+    public static function checkMTime($mtime, $sendHeaders = null)
     {
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s", $mtime) . " GMT");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s", $mtime)." GMT");
 
         $headers = function_exists("getallheaders")
             ? getallheaders()

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

Indentation +21 added lines, -21 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Text processing helper 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 Text processing helper 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 text
 {
 
-  /** Replace repeated white spaces to single space
-    * @param string $string
-    * @return string */
+    /** Replace repeated white spaces to single space
+     * @param string $string
+     * @return string */
 
     public static function clearWhitespaces($string)
     {
@@ -25,8 +25,8 @@ 
     }
 
     /** Normalize the string for HTML attribute value
-      * @param string $string
-      * @return string */
+     * @param string $string
+     * @return string */
 
     public static function htmlValue($string)
     {
@@ -39,8 +39,8 @@ 
     }
 
     /** Normalize the string for JavaScript string value
-      * @param string $string
-      * @return string */
+     * @param string $string
+     * @return string */
 
     public static function jsValue($string)
     {
@@ -53,8 +53,8 @@ 
     }
 
     /** Normalize the string for XML tag content data
-      * @param string $string
-      * @param bool $cdata */
+     * @param string $string
+     * @param bool $cdata */
 
     public static function xmlData($string, $cdata=false)
     {
@@ -66,8 +66,8 @@ 
     }
 
     /** Returns compressed content of given CSS code
-      * @param string $code
-      * @return string */
+     * @param string $code
+     * @return string */
 
     public static function compressCSS($code)
     {

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
       * @param string $string
       * @param bool $cdata */
 
-    public static function xmlData($string, $cdata=false)
+    public static function xmlData($string, $cdata = false)
     {
         $string = str_replace("]]>", "]]]]><![CDATA[>", $string);
         if (!$cdata) {