evolution-cms / evolution

manager/processors/save_password.processor.php

Spacing +7 added lines, -7 removed lines

@@ -1,8 +1,8 @@ 
 <?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.");
 }
-if(!$modx->hasPermission('save_password')) {
+if (!$modx->hasPermission('save_password')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -10,11 +10,11 @@ 
 $pass1 = $_POST['pass1'];
 $pass2 = $_POST['pass2'];
 
-if($pass1!=$pass2){
+if ($pass1 != $pass2) {
 	$modx->webAlertAndQuit("Passwords don't match!");
 }
 
-if(strlen($pass1)<6){
+if (strlen($pass1) < 6) {
 	$modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
 }
 
@@ -23,14 +23,14 @@ 
 	$uid = $modx->getLoginUserID();
 	$modx->loadExtension('phpass');
 	$f['password'] = $modx->phpass->HashPassword($pass1);
-	$modx->db->update($f,$tbl_manager_users,"id='{$uid}'");
+	$modx->db->update($f, $tbl_manager_users, "id='{$uid}'");
 
 	// invoke OnManagerChangePassword event
-	$modx->invokeEvent('OnManagerChangePassword', array (
+	$modx->invokeEvent('OnManagerChangePassword', array(
 		'userid' => $uid,
 		'username' => $_SESSION['mgrShortname'],
 		'userpassword' => $pass1
 	));
 
-$header="Location: index.php?a=2";
+$header = "Location: index.php?a=2";
 header($header);

manager/processors/empty_table.processor.php

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 <?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.");
 }
-if(!$modx->hasPermission('settings')) {
+if (!$modx->hasPermission('settings')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $modx->db->truncate($modx->getFullTableName('manager_log'));
 
-$header="Location: index.php?a=13";
+$header = "Location: index.php?a=13";
 header($header);

manager/processors/send_message.processor.php

Spacing +11 added lines, -11 removed lines

@@ -1,8 +1,8 @@ 
 <?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.");
 }
-if(!$modx->hasPermission('messages')) {
+if (!$modx->hasPermission('messages')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -10,13 +10,13 @@ 
 $userid = $_REQUEST['user'];
 $groupid = $_REQUEST['group'];
 $subject = $modx->db->escape($_REQUEST['messagesubject']);
-if($subject=="") $subject="(no subject)";
+if ($subject == "") $subject = "(no subject)";
 $message = $modx->db->escape($_REQUEST['messagebody']);
-if($message=="") $message="(no message)";
+if ($message == "") $message = "(no message)";
 $postdate = time();
 
-if($sendto=='u') {
-	if($userid==0) {
+if ($sendto == 'u') {
+	if ($userid == 0) {
 		$modx->webAlertAndQuit($_lang["error_no_user_selected"]);
 	}
 	$modx->db->insert(
@@ -31,12 +31,12 @@ 
 		), $modx->getFullTableName('user_messages'));
 }
 
-if($sendto=='g') {
-	if($groupid==0) {
+if ($sendto == 'g') {
+	if ($groupid == 0) {
 		$modx->webAlertAndQuit($_lang["error_no_group_selected"]);
 	}
 	$rs = $modx->db->select('internalKey', $modx->getFullTableName('user_attributes'), "role='{$groupid}' AND internalKey!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->db->getRow($rs)) {
+	while ($row = $modx->db->getRow($rs)) {
 		$modx->db->insert(
 			array(
 				'recipient' => $row['internalKey'],
@@ -51,9 +51,9 @@ 
 }
 
 
-if($sendto=='a') {
+if ($sendto == 'a') {
 	$rs = $modx->db->select('id', $modx->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'");
-	while ($row=$modx->db->getRow($rs)) {
+	while ($row = $modx->db->getRow($rs)) {
 		$modx->db->insert(
 			array(
 				'recipient' => $row['id'],

manager/frames/tree.php

Spacing +13 added lines, -13 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>

 		<?php } ?>

@@ -26,23 +26,23 @@ 
 

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

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

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

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

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

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

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

 

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

 		}

 		?>

@@ -66,7 +66,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/1.php

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

@@ -46,7 +46,7 @@ 
 }

 

 if (isset($_COOKIE['MODX_themeColor'])) {

-    $body_class .= ' ' . $_COOKIE['MODX_themeColor'];

+    $body_class .= ' '.$_COOKIE['MODX_themeColor'];

 }

 

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

@@ -74,36 +74,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 ?>" />

@@ -134,20 +134,20 @@ 
         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'] ?>',

           which_browser: '<?= $user['which_browser'] ?>',

-          layout: <?= (int)$manager_layout ?>,

+          layout: <?= (int) $manager_layout ?>,

           textdir: '<?= $modx_textdir ?>',

           global_tabs: <?= $modx->config['global_tabs'] ?>

 

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

@@ -365,7 +365,7 @@ 
                             <a href="javascript:;" class="dropdown-toggle" onclick="return false;">

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

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

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

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

                                 <?php } else { ?>

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

                                 <?php } ?>

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

@@ -531,7 +531,7 @@ 
     <script type="text/javascript">

 

       if (document.getElementById('treeMenu')) {

-          <?php if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>

+          <?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>

 

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

           e.preventDefault();

@@ -549,12 +549,12 @@ 
           }

         };

           <?php } ?>

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

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

 

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

           e.preventDefault();

           if (modx.config.global_tabs && !e.shiftKey) {

-            modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});

+            modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});

           } else {

             var randomNum = '<?= $_lang["files_files"] ?>';

             if (e.shiftKey) {

@@ -567,12 +567,12 @@ 
           }

         };

           <?php } ?>

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

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

 

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

           e.preventDefault();

           if (modx.config.global_tabs && !e.shiftKey) {

-            modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});

+            modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});

           } else {

             var randomNum = '<?= $_lang["files_files"] ?>';

             if (e.shiftKey) {

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

manager/frames/nodes.functions.inc.php

Spacing +107 added lines, -107 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.');
 }
 
@@ -10,7 +10,7 @@ 
  * @param $theme
  * @param string $hereid
  */
-function makeHTML($indent, $parent, $expandAll, $theme, $hereid = '') {
+function makeHTML($indent, $parent, $expandAll, $theme, $hereid = ''){
 	global $modx;
 	global $icons, $iconsPrivate, $_style;
 	global $_lang, $opened, $opened2, $closed2; //added global vars
@@ -21,35 +21,35 @@ 
 	// setup spacer
 	$level = 0;
 	$spacer = '<span class="indent">';
-	for($i = 2; $i <= $indent; $i++) {
+	for ($i = 2; $i <= $indent; $i++) {
 		$spacer .= '<i></i>';
 		$level++;
 	}
 	$spacer .= '</span>';
 
 	// manage order-by
-	if(!isset($_SESSION['tree_sortby']) && !isset($_SESSION['tree_sortdir'])) {
+	if (!isset($_SESSION['tree_sortby']) && !isset($_SESSION['tree_sortdir'])) {
 		// This is the first startup, set default sort order
 		$_SESSION['tree_sortby'] = 'menuindex';
 		$_SESSION['tree_sortdir'] = 'ASC';
 	}
 
-	switch($_SESSION['tree_sortby']) {
+	switch ($_SESSION['tree_sortby']) {
 		case 'createdon':
 		case 'editedon':
 		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') {
+	if ($_SESSION['tree_sortby'] == 'isfolder') {
 		$orderby .= ', menuindex ASC, pagetitle';
 	}
 
@@ -59,12 +59,12 @@ 
 	// get document groups for current user
 	$docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
 	$showProtected = false;
-	if(isset ($modx->config['tree_show_protected'])) {
+	if (isset ($modx->config['tree_show_protected'])) {
 		$showProtected = (boolean) $modx->config['tree_show_protected'];
 	}
 	$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}))");
+	if ($showProtected == false) {
+		$access = "AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
 	} else {
 		$access = '';
 	}
@@ -74,13 +74,13 @@ 
 	$from = "{$tblsc} AS sc LEFT JOIN {$tbldg} dg on dg.document = sc.id LEFT JOIN {$tblst} st on st.id = sc.template";
 	$where = "(parent={$parent}) {$access} GROUP BY sc.id";
 	$result = $modx->db->select($field, $from, $where, $orderby);
-	if($modx->db->getRecordCount($result) == 0) {
+	if ($modx->db->getRecordCount($result) == 0) {
 		$output .= sprintf('<div><a class="empty">%s%s&nbsp;<span class="empty">%s</span></a></div>', $spacer, $_style['tree_deletedpage'], $_lang['empty_folder']);
 	}
 
 	$nodeNameSource = $_SESSION['tree_nodename'] == 'default' ? $modx->config['resource_tree_node_name'] : $_SESSION['tree_nodename'];
 
-	while($row = $modx->db->getRow($result)) {
+	while ($row = $modx->db->getRow($result)) {
 		$node = '';
 
 		$nodetitle = getNodeTitle($nodeNameSource, $row);
@@ -89,46 +89,46 @@ 
 		$treeNodeClass = 'node';
 		$treeNodeClass .= $row['hasAccess'] == 0 ? ' protected' : '';
 
-		if($row['deleted'] == 1) {
+		if ($row['deleted'] == 1) {
 			$treeNodeClass .= ' deleted';
 			//$nodetitleDisplay = sprintf('<span class="deletedNode">%s</span>', $nodetitle);
-		} elseif($row['published'] == 0) {
+		} elseif ($row['published'] == 0) {
 			$treeNodeClass .= ' unpublished';
 			//$nodetitleDisplay = sprintf('<span class="unpublishedNode">%s</span>', $nodetitle);
-		} elseif($row['hidemenu'] == 1) {
+		} elseif ($row['hidemenu'] == 1) {
 			$treeNodeClass .= ' hidemenu';
 			//$nodetitleDisplay = sprintf('<span class="notInMenuNode%s">%s</span>', $protectedClass, $nodetitle);
 		} else {
 			//$nodetitleDisplay = sprintf('<span class="publishedNode%s">%s</span>', $protectedClass, $nodetitle);
 		}
 
-		if($row['id'] == $hereid) {
+		if ($row['id'] == $hereid) {
 			$treeNodeClass .= ' current';
 		}
 
 		$weblinkDisplay = $row['type'] == 'reference' ? sprintf('&nbsp;%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 = '';
 		$rowLock = $modx->elementIsLocked(7, $row['id'], true);
-		if($rowLock && $modx->hasPermission('display_locks')) {
-			if($rowLock['sid'] == $modx->sid) {
+		if ($rowLock && $modx->hasPermission('display_locks')) {
+			if ($rowLock['sid'] == $modx->sid) {
 				$title = $modx->parseText($_lang["lock_element_editing"], array(
 					'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"],
 					'username' => $rowLock['username'],
 					'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>';
+				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>';
 				} else {
-					$lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+					$lockedByUser = '<span title="'.$title.'" class="lockedResource">'.$_style['icons_secured'].'</span>';
 				}
 			}
 		}
@@ -136,23 +136,23 @@ 
 		$url = $modx->makeUrl($row['id']);
 
 		$title = '';
-		if(isDateNode($nodeNameSource)) {
-			$title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]';
+		if (isDateNode($nodeNameSource)) {
+			$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'],
@@ -201,9 +201,9 @@ 
 		$ph['expandAll'] = $expandAll;
 		$ph['isPrivate'] = ($row['privateweb'] || $row['privatemgr']) ? 1 : 0;
 
-		if(!$row['isfolder']) {
+		if (!$row['isfolder']) {
 			$tpl = getTplSingleNode();
-			switch($row['id']) {
+			switch ($row['id']) {
 				case $modx->config['site_start']            :
 					$icon = $_style['tree_page_home'];
 					break;
@@ -217,7 +217,7 @@ 
 					$icon = $_style['tree_page_info'];
 					break;
 				default:
-					if(isset($icons[$row['contentType']])) {
+					if (isset($icons[$row['contentType']])) {
 						$icon = $icons[$row['contentType']];
 					} else {
 						$icon = $_style['tree_page'];
@@ -227,20 +227,20 @@ 
 
 			// invoke OnManagerNodePrerender event
 			$prenode = $modx->invokeEvent("OnManagerNodePrerender", array('ph' => $ph));
-			if(is_array($prenode)) {
+			if (is_array($prenode)) {
 				$phnew = array();
-				foreach($prenode as $pnode) {
+				foreach ($prenode as $pnode) {
 					$phnew = array_merge($phnew, unserialize($pnode));
 				}
 				$ph = (count($phnew) > 0) ? $phnew : $ph;
 			}
 
-			if($ph['contextmenu']) {
-				$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+			if ($ph['contextmenu']) {
+				$ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
 			}
 
-			if($_SESSION['tree_show_only_folders']) {
-				if($row['parent'] == 0) {
+			if ($_SESSION['tree_show_only_folders']) {
+				if ($row['parent'] == 0) {
 					$node .= $modx->parseText($tpl, $ph);
 				} else {
 					$node .= '';
@@ -253,15 +253,15 @@ 
 			$ph['icon_folder_open'] = $_style['tree_folderopen_new'];
 			$ph['icon_folder_close'] = $_style['tree_folder_new'];
 
-			if($_SESSION['tree_show_only_folders']) {
+			if ($_SESSION['tree_show_only_folders']) {
 				$tpl = getTplFolderNodeNotChildren();
 				$checkFolders = checkIsFolder($row['id'], 1) ? 1 : 0; // folders
 				$checkDocs = checkIsFolder($row['id'], 0) ? 1 : 0; // no folders
 				$ph['tree_page_click'] = 3;
 
 				// expandAll: two type for partial expansion
-				if($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
-					if($expandAll == 1) {
+				if ($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
+					if ($expandAll == 1) {
 						$opened2[] = $row['id'];
 					}
 					$ph['icon'] = $ph['icon_folder_open'];
@@ -269,11 +269,11 @@ 
 					$ph['node_toggle'] = 1;
 					$ph['subMenuState'] = ' open';
 
-					if(($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
+					if (($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
 						$ph['showChildren'] = 1;
 						$ph['icon_node_toggle'] = '';
 						$ph['icon'] = $ph['icon_folder_close'];
-					} elseif(!$checkDocs && $checkFolders) {
+					} elseif (!$checkDocs && $checkFolders) {
 						$ph['showChildren'] = 0;
 						$ph['openFolder'] = 2;
 					} else {
@@ -285,20 +285,20 @@ 
 						'ph' => $ph,
 						'opened' => '1'
 					));
-					if(is_array($prenode)) {
+					if (is_array($prenode)) {
 						$phnew = array();
-						foreach($prenode as $pnode) {
+						foreach ($prenode as $pnode) {
 							$phnew = array_merge($phnew, unserialize($pnode));
 						}
 						$ph = (count($phnew) > 0) ? $phnew : $ph;
 					}
 
-					if($ph['contextmenu']) {
-						$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+					if ($ph['contextmenu']) {
+						$ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
 					}
 
 					$node .= $modx->parseText($tpl, $ph);
-					if($checkFolders) {
+					if ($checkFolders) {
 						$node .= makeHTML($indent + 1, $row['id'], $expandAll, $theme, $hereid);
 					}
 					$node .= '</div></div>';
@@ -308,10 +308,10 @@ 
 					$ph['icon_node_toggle'] = $ph['tree_plusnode'];
 					$ph['node_toggle'] = 0;
 
-					if(($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
+					if (($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
 						$ph['showChildren'] = 1;
 						$ph['icon_node_toggle'] = '';
-					} elseif(!$checkDocs && $checkFolders) {
+					} elseif (!$checkDocs && $checkFolders) {
 						$ph['showChildren'] = 0;
 						$ph['openFolder'] = 2;
 					} else {
@@ -323,16 +323,16 @@ 
 						'ph' => $ph,
 						'opened' => '0'
 					));
-					if(is_array($prenode)) {
+					if (is_array($prenode)) {
 						$phnew = array();
-						foreach($prenode as $pnode) {
+						foreach ($prenode as $pnode) {
 							$phnew = array_merge($phnew, unserialize($pnode));
 						}
 						$ph = (count($phnew) > 0) ? $phnew : $ph;
 					}
 
-					if($ph['contextmenu']) {
-						$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+					if ($ph['contextmenu']) {
+						$ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
 					}
 
 					$node .= $modx->parseText($tpl, $ph);
@@ -341,8 +341,8 @@ 
 			} else {
 				$tpl = getTplFolderNode();
 				// expandAll: two type for partial expansion
-				if($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
-					if($expandAll == 1) {
+				if ($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
+					if ($expandAll == 1) {
 						$opened2[] = $row['id'];
 					}
 					$ph['icon'] = $ph['icon_folder_open'];
@@ -350,7 +350,7 @@ 
 					$ph['node_toggle'] = 1;
 					$ph['subMenuState'] = ' open';
 
-					if($ph['donthit'] == 1) {
+					if ($ph['donthit'] == 1) {
 						$ph['tree_page_click'] = 3;
 						$ph['icon_node_toggle'] = '';
 						$ph['icon'] = $ph['icon_folder_close'];
@@ -362,32 +362,32 @@ 
 						'ph' => $ph,
 						'opened' => '1'
 					));
-					if(is_array($prenode)) {
+					if (is_array($prenode)) {
 						$phnew = array();
-						foreach($prenode as $pnode) {
+						foreach ($prenode as $pnode) {
 							$phnew = array_merge($phnew, unserialize($pnode));
 						}
 						$ph = (count($phnew) > 0) ? $phnew : $ph;
-						if($ph['showChildren'] == 0) {
+						if ($ph['showChildren'] == 0) {
 							unset($opened2[$row['id']]);
 							$ph['node_toggle'] = 0;
 							$ph['subMenuState'] = '';
 						}
 					}
 
-					if($ph['showChildren'] == 0) {
+					if ($ph['showChildren'] == 0) {
 						$ph['icon_node_toggle'] = '';
 						$ph['donthit'] = 1;
 						$ph['icon'] = $ph['icon_folder_close'];
 						$tpl = getTplFolderNodeNotChildren();
 					}
 
-					if($ph['contextmenu']) {
-						$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+					if ($ph['contextmenu']) {
+						$ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
 					}
 
 					$node .= $modx->parseText($tpl, $ph);
-					if($ph['donthit'] == 0) {
+					if ($ph['donthit'] == 0) {
 						$node .= makeHTML($indent + 1, $row['id'], $expandAll, $theme, $hereid);
 					}
 					$node .= '</div></div>';
@@ -397,7 +397,7 @@ 
 					$ph['icon_node_toggle'] = $ph['tree_plusnode'];
 					$ph['node_toggle'] = 0;
 
-					if($ph['donthit'] == 1) {
+					if ($ph['donthit'] == 1) {
 						$ph['tree_page_click'] = 3;
 						$ph['icon_node_toggle'] = '';
 						$ph['icon'] = $ph['icon_folder_close'];
@@ -409,23 +409,23 @@ 
 						'ph' => $ph,
 						'opened' => '0'
 					));
-					if(is_array($prenode)) {
+					if (is_array($prenode)) {
 						$phnew = array();
-						foreach($prenode as $pnode) {
+						foreach ($prenode as $pnode) {
 							$phnew = array_merge($phnew, unserialize($pnode));
 						}
 						$ph = (count($phnew) > 0) ? $phnew : $ph;
 					}
 
-					if($ph['showChildren'] == 0) {
+					if ($ph['showChildren'] == 0) {
 						$ph['icon_node_toggle'] = '';
 						$ph['donthit'] = 1;
 						$ph['icon'] = $ph['icon_folder_close'];
 						$tpl = getTplFolderNodeNotChildren();
 					}
 
-					if($ph['contextmenu']) {
-						$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+					if ($ph['contextmenu']) {
+						$ph['contextmenu'] = ' data-contextmenu="'._htmlentities($ph['contextmenu']).'"';
 					}
 
 					$node .= $modx->parseText($tpl, $ph);
@@ -437,10 +437,10 @@ 
 		// invoke OnManagerNodeRender event
 		$data['node'] = $node;
 		$evtOut = $modx->invokeEvent('OnManagerNodeRender', $data);
-		if(is_array($evtOut)) {
+		if (is_array($evtOut)) {
 			$evtOut = implode("\n", $evtOut);
 		}
-		if($evtOut != '') {
+		if ($evtOut != '') {
 			$node = trim($evtOut);
 		}
 
@@ -450,14 +450,14 @@ 
 	return $output;
 }
 
-function getIconInfo($_style) {
-	if(!isset($_style['tree_page_gif'])) {
+function getIconInfo($_style){
+	if (!isset($_style['tree_page_gif'])) {
 		$_style['tree_page_gif'] = $_style['tree_page'];
 	}
-	if(!isset($_style['tree_page_jpg'])) {
+	if (!isset($_style['tree_page_jpg'])) {
 		$_style['tree_page_jpg'] = $_style['tree_page'];
 	}
-	if(!isset($_style['tree_page_png'])) {
+	if (!isset($_style['tree_page_png'])) {
 		$_style['tree_page_png'] = $_style['tree_page'];
 	}
 	$icons = array(
@@ -477,14 +477,14 @@ 
 	return $icons;
 }
 
-function getPrivateIconInfo($_style) {
-	if(!isset($_style['tree_page_gif_secure'])) {
+function getPrivateIconInfo($_style){
+	if (!isset($_style['tree_page_gif_secure'])) {
 		$_style['tree_page_gif_secure'] = $_style['tree_page_secure'];
 	}
-	if(!isset($_style['tree_page_jpg_secure'])) {
+	if (!isset($_style['tree_page_jpg_secure'])) {
 		$_style['tree_page_jpg_secure'] = $_style['tree_page_secure'];
 	}
-	if(!isset($_style['tree_page_png_secure'])) {
+	if (!isset($_style['tree_page_png_secure'])) {
 		$_style['tree_page_png_secure'] = $_style['tree_page_secure'];
 	}
 	$iconsPrivate = array(
@@ -504,21 +504,21 @@ 
 	return $iconsPrivate;
 }
 
-function getNodeTitle($nodeNameSource, $row) {
+function getNodeTitle($nodeNameSource, $row){
 	global $modx;
 
-	switch($nodeNameSource) {
+	switch ($nodeNameSource) {
 		case 'menutitle':
 			$nodetitle = $row['menutitle'] ? $row['menutitle'] : $row['pagetitle'];
 			break;
 		case 'alias':
 			$nodetitle = $row['alias'] ? $row['alias'] : $row['id'];
-			if(strpos($row['alias'], '.') === false) {
-				if($row['isfolder'] != 1 || $modx->config['make_folders'] != 1) {
+			if (strpos($row['alias'], '.') === false) {
+				if ($row['isfolder'] != 1 || $modx->config['make_folders'] != 1) {
 					$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'];
@@ -533,7 +533,7 @@ 
 		case 'unpub_date':
 			$doc = $modx->getDocumentObject('id', $row['id']);
 			$date = $doc[$nodeNameSource];
-			if(!empty($date)) {
+			if (!empty($date)) {
 				$nodetitle = $modx->toDateFormat($date);
 			} else {
 				$nodetitle = '- - -';
@@ -550,8 +550,8 @@ 
 	return $nodetitle;
 }
 
-function isDateNode($nodeNameSource) {
-	switch($nodeNameSource) {
+function isDateNode($nodeNameSource){
+	switch ($nodeNameSource) {
 		case 'createdon':
 		case 'editedon':
 		case 'publishedon':
@@ -563,13 +563,13 @@ 
 	}
 }
 
-function checkIsFolder($parent = 0, $isfolder = 1) {
+function checkIsFolder($parent = 0, $isfolder = 1){
 	global $modx;
 
-	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.' '));
 }
 
-function _htmlentities($array) {
+function _htmlentities($array){
 	global $modx;
 
 	$array = json_encode($array, JSON_UNESCAPED_UNICODE);
@@ -578,7 +578,7 @@ 
 	return $array;
 }
 
-function getTplSingleNode() {
+function getTplSingleNode(){
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -602,7 +602,7 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a></div>';
 }
 
-function getTplFolderNode() {
+function getTplFolderNode(){
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -638,7 +638,7 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>';
 }
 
-function getTplFolderNodeNotChildren() {
+function getTplFolderNodeNotChildren(){
 	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
@@ -670,11 +670,11 @@ 
         title="[+title+]">[+nodetitleDisplay+][+weblinkDisplay+]</span>[+pageIdDisplay+]</a><div>';
 }
 
-function dbug($str, $flag = false) {
+function dbug($str, $flag = false){
 	print('<pre>');
 	print_r($str);
 	print('</pre>');
-	if($flag) {
+	if ($flag) {
 		exit;
 	}
 }

manager/actions/help/version_notices/1.2.php

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

manager/actions/help/version_notices/1.3.4.php

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

manager/actions/help/version_notices/1.2.1.php

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