evolution-cms / evolution

manager/includes/messageCount.inc.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/includes/protect.inc.php

Spacing +12 added lines, -12 removed lines

@@ -10,13 +10,13 @@ 
     die();
 
 global $sanitize_seed;
-$sanitize_seed = 'sanitize_seed_' . base_convert(md5(__FILE__),16,36);
+$sanitize_seed = 'sanitize_seed_'.base_convert(md5(__FILE__), 16, 36);
 
 // sanitize array
 if (!function_exists('modx_sanitize_gpc')) {
-    function modx_sanitize_gpc(& $values, $depth=0) {
-        if(200 < $depth) exit('GPC Array nested too deep!');
-        if(is_array($values)) {
+    function modx_sanitize_gpc(& $values, $depth = 0){
+        if (200 < $depth) exit('GPC Array nested too deep!');
+        if (is_array($values)) {
             $depth++;
             foreach ($values as $key => $value) {
                 if (is_array($value)) modx_sanitize_gpc($value, $depth);
@@ -29,16 +29,16 @@ 
     }
 }
 
-function getSanitizedValue($value='') {
+function getSanitizedValue($value = ''){
     global $sanitize_seed;
 
-    if(!$value) return $value;
+    if (!$value) return $value;
 
     $brackets = explode(' ', '[[ ]] [! !] [* *] [( )] {{ }} [+ +] [~ ~] [^ ^]');
-    foreach($brackets as $bracket) {
-        if(strpos($value,$bracket)===false) continue;
-        $sanitizedBracket = str_replace('#', $sanitize_seed, sprintf('#%s#%s#', substr($bracket,0,1), substr($bracket,1,1)));
-        $value = str_replace($bracket,$sanitizedBracket,$value);
+    foreach ($brackets as $bracket) {
+        if (strpos($value, $bracket) === false) continue;
+        $sanitizedBracket = str_replace('#', $sanitize_seed, sprintf('#%s#%s#', substr($bracket, 0, 1), substr($bracket, 1, 1)));
+        $value = str_replace($bracket, $sanitizedBracket, $value);
     }
     $value = str_ireplace('<script', 'sanitized_by_modx<s cript', $value);
     $value = preg_replace('/&#(\d+);/', 'sanitized_by_modx& #$1', $value);
@@ -46,13 +46,13 @@ 
 }
 
 modx_sanitize_gpc($_GET);
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     modx_sanitize_gpc($_POST);
 }
 modx_sanitize_gpc($_COOKIE);
 modx_sanitize_gpc($_REQUEST);
 
-foreach (array ('PHP_SELF', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'QUERY_STRING') as $key) {
+foreach (array('PHP_SELF', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'QUERY_STRING') as $key) {
     $_SERVER[$key] = isset ($_SERVER[$key]) ? htmlspecialchars($_SERVER[$key], ENT_QUOTES) : null;
 }
 

manager/includes/manager.lockout.inc.php

Spacing +32 added lines, -32 removed lines

@@ -1,75 +1,75 @@
 <?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->manager->action!='8' && isset($_SESSION['mgrValidated'])){
+if ($modx->manager->action != '8' && isset($_SESSION['mgrValidated'])) {
 
-    $homeurl = $modx->makeUrl($manager_login_startup>0 ? $manager_login_startup:$site_start);
+    $homeurl = $modx->makeUrl($manager_login_startup > 0 ? $manager_login_startup : $site_start);
     $logouturl = MODX_MANAGER_URL.'index.php?a=8';
 
-    $modx->setPlaceholder('modx_charset',$modx_manager_charset);
-    $modx->setPlaceholder('theme',$manager_theme);
+    $modx->setPlaceholder('modx_charset', $modx_manager_charset);
+    $modx->setPlaceholder('theme', $manager_theme);
 
-    $modx->setPlaceholder('site_name',$site_name);
-    $modx->setPlaceholder('logo_slogan',$_lang["logo_slogan"]);
-    $modx->setPlaceholder('manager_lockout_message',$_lang["manager_lockout_message"]);
+    $modx->setPlaceholder('site_name', $site_name);
+    $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
+    $modx->setPlaceholder('manager_lockout_message', $_lang["manager_lockout_message"]);
 
-    $modx->setPlaceholder('home',$_lang["home"]);
-    $modx->setPlaceholder('homeurl',$homeurl);
-    $modx->setPlaceholder('logout',$_lang["logout"]);
-    $modx->setPlaceholder('logouturl',$logouturl);
-    $modx->setPlaceholder('manager_theme_url',MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
-    $modx->setPlaceholder('year',date('Y'));
+    $modx->setPlaceholder('home', $_lang["home"]);
+    $modx->setPlaceholder('homeurl', $homeurl);
+    $modx->setPlaceholder('logout', $_lang["logout"]);
+    $modx->setPlaceholder('logouturl', $logouturl);
+    $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
+    $modx->setPlaceholder('year', date('Y'));
 
     // load template
-    if(!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
-    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+    if (!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) {
+    	$modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
     }
 
     $target = $modx->config['manager_lockout_tpl'];
     $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
     $target = $modx->mergeSettingsContent($target);
 
-    if(substr($target,0,1)==='@') {
-    	if(substr($target,0,6)==='@CHUNK') {
-    		$target = trim(substr($target,7));
+    if (substr($target, 0, 1) === '@') {
+    	if (substr($target, 0, 6) === '@CHUNK') {
+    		$target = trim(substr($target, 7));
     		$lockout_tpl = $modx->getChunk($target);
     	}
-    	elseif(substr($target,0,5)==='@FILE') {
-    		$target = trim(substr($target,6));
+    	elseif (substr($target, 0, 5) === '@FILE') {
+    		$target = trim(substr($target, 6));
     		$lockout_tpl = file_get_contents($target);
     	}
 	} else {
     	$chunk = $modx->getChunk($target);
-    	if($chunk!==false && !empty($chunk)) {
+    	if ($chunk !== false && !empty($chunk)) {
     		$lockout_tpl = $chunk;
     	}
-    	elseif(is_file(MODX_BASE_PATH . $target)) {
-    		$target = MODX_BASE_PATH . $target;
+    	elseif (is_file(MODX_BASE_PATH.$target)) {
+    		$target = MODX_BASE_PATH.$target;
     		$lockout_tpl = file_get_contents($target);
     	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) {
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl';
+    	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl')) {
+    		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}
-	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) {
-		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl';
+	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl')) {
+		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/templates/actions/manager.lockout.tpl';
 		$login_tpl = file_get_contents($target);
 	}
-    	elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible
-    		$target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html';
+    	elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html')) { // ClipperCMS compatible
+    		$target = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/manager.lockout.html';
     		$lockout_tpl = file_get_contents($target);
     	}
     	else {
-    		$target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl';
+    		$target = MODX_MANAGER_PATH.'media/style/common/manager.lockout.tpl';
     		$lockout_tpl = file_get_contents($target);
     	}
 	}
 
     // merge placeholders
     $lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl);
-    $regx = strpos($lockout_tpl,'[[+')!==false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
+    $regx = strpos($lockout_tpl, '[[+') !== false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
     $lockout_tpl = preg_replace($regx, '', $lockout_tpl); //cleanup
 
     echo $lockout_tpl;

manager/includes/settings.inc.php

Spacing +4 added lines, -4 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.");
 }
 
 // get the settings from the database.
 $settings = array();
-if ($modx && count($modx->config)>0) $settings = $modx->config;
-else{
+if ($modx && count($modx->config) > 0) $settings = $modx->config;
+else {
 	$rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('system_settings'));
 	while ($row = $modx->db->getRow($rs)) {
 		$settings[$row['setting_name']] = $row['setting_value'];
@@ -16,4 +16,4 @@ 
 extract($settings, EXTR_OVERWRITE);
 
 // setup default site id - new installation should generate a unique id for the site.
-if(!isset($site_id)) $site_id = "MzGeQ2faT4Dw06+U49x3";
+if (!isset($site_id)) $site_id = "MzGeQ2faT4Dw06+U49x3";

manager/includes/secure_mgr_documents.inc.php

Spacing +7 added lines, -7 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.");
 }
 
@@ -12,19 +12,19 @@ 
  *
  */
 
-function secureMgrDocument($docid='') {
+function secureMgrDocument($docid = ''){
 	global $modx;
 
-	$modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privatemgr = 1"));
+	$modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid > 0 ? "id='$docid'" : "privatemgr = 1"));
 	$rs = $modx->db->select(
 		'DISTINCT sc.id',
 		$modx->getFullTableName("site_content")." sc
 			LEFT JOIN ".$modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
 			LEFT JOIN ".$modx->getFullTableName("membergroup_access")." mga ON mga.documentgroup = dg.document_group",
-		($docid>0 ? " sc.id='{$docid}' AND ":"")."mga.id>0"
+		($docid > 0 ? " sc.id='{$docid}' AND " : "")."mga.id>0"
 		);
-	$ids = $modx->db->getColumn("id",$rs);
-	if(count($ids)>0) {
-		$modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");
+	$ids = $modx->db->getColumn("id", $rs);
+	if (count($ids) > 0) {
+		$modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ", $ids).")");
 	}
 }

manager/includes/header.inc.php

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

 }

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

@@ -17,31 +17,31 @@ 
 }

 

 if (!empty($_COOKIE['MODX_themeColor'])) {

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

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

 }

 

-$css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;

+$css = 'media/style/'.$modx->config['manager_theme'].'/style.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;

     }

 }

 

@@ -56,7 +56,7 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />

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

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

-    <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>

+    <?= sprintf('<script type="text/javascript" src="%s"></script>'."\n", $modx->config['mgr_jquery_path']) ?>

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

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

     <?php } ?>

@@ -68,7 +68,7 @@ 
     <?php } ?>

 

     <!-- OnManagerMainFrameHeaderHTMLBlock -->

-    <?= $onManagerMainFrameHeaderHTMLBlock . "\n" ?>

+    <?= $onManagerMainFrameHeaderHTMLBlock."\n" ?>

 

     <script type="text/javascript">

       /* <![CDATA[ */

@@ -364,7 +364,7 @@ 
 

           <?php

           if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {

-              echo 'doRefresh(' . $_REQUEST['r'] . ");\n";

+              echo 'doRefresh('.$_REQUEST['r'].");\n";

           }

           ?>

 

manager/includes/secure_web_documents.inc.php

Spacing +7 added lines, -7 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.");
 }
 
@@ -12,19 +12,19 @@ 
  *
  */
 
-function secureWebDocument($docid='') {
+function secureWebDocument($docid = ''){
 	global $modx;
 
-	$modx->db->update('privateweb = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privateweb = 1"));
+	$modx->db->update('privateweb = 0', $modx->getFullTableName("site_content"), ($docid > 0 ? "id='$docid'" : "privateweb = 1"));
 	$rs = $modx->db->select(
 		'DISTINCT sc.id',
 		$modx->getFullTableName("site_content")." sc
 			LEFT JOIN ".$modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
 			LEFT JOIN ".$modx->getFullTableName("webgroup_access")." wga ON wga.documentgroup = dg.document_group",
-		($docid>0 ? " sc.id='{$docid}' AND ":"")."wga.id>0"
+		($docid > 0 ? " sc.id='{$docid}' AND " : "")."wga.id>0"
 		);
-	$ids = $modx->db->getColumn("id",$rs);
-	if(count($ids)>0) {
-		$modx->db->update('privateweb = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");
+	$ids = $modx->db->getColumn("id", $rs);
+	if (count($ids) > 0) {
+		$modx->db->update('privateweb = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ", $ids).")");
 	}
 }

manager/includes/user_settings.inc.php

Spacing +2 added lines, -2 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.");
 }
 
@@ -17,7 +17,7 @@ 
 
 	$which_browser_default = $which_browser;
 	while ($row = $modx->db->getRow($rs)) {
-		if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
+		if ($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
 		$settings[$row['setting_name']] = $row['setting_value'];
 		if (isset($modx->config)) {
 			$modx->config[$row['setting_name']] = $row['setting_value'];

manager/includes/accesscontrol.inc.php

Spacing +51 added lines, -51 removed lines

@@ -1,14 +1,14 @@ 
 <?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(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 	header('HTTP/1.0 404 Not Found');
 	exit;
 }
 
-if(isset($_SESSION['mgrValidated']) && $_SESSION['usertype'] != 'manager') {
+if (isset($_SESSION['mgrValidated']) && $_SESSION['usertype'] != 'manager') {
 	//		if (isset($_COOKIE[session_name()])) {
 	//			setcookie(session_name(), '', 0, MODX_BASE_URL);
 	//		}
@@ -18,16 +18,16 @@ 
 }
 
 // andrazk 20070416 - if installer is running, destroy active sessions
-if(file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
-	include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
-	if(isset($installStartTime)) {
-		if((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
+if (file_exists(MODX_BASE_PATH.'assets/cache/installProc.inc.php')) {
+	include_once(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
+	if (isset($installStartTime)) {
+		if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
 			unset($installStartTime);
-			@ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
-			unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+			@ chmod(MODX_BASE_PATH.'assets/cache/installProc.inc.php', 0755);
+			unlink(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
 		} else {
-			if($_SERVER['REQUEST_METHOD'] != 'POST') {
-				if(isset($_COOKIE[session_name()])) {
+			if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+				if (isset($_COOKIE[session_name()])) {
 					session_unset();
 					@session_destroy();
 					//					setcookie(session_name(), '', 0, MODX_BASE_URL);
@@ -39,37 +39,37 @@ 
 }
 
 // andrazk 20070416 - if session started before install and was not destroyed yet
-if(isset($lastInstallTime)) {
-	if(isset($_SESSION['mgrValidated'])) {
-		if(isset($_SESSION['modx.session.created.time'])) {
-			if($_SESSION['modx.session.created.time'] < $lastInstallTime) {
-				if($_SERVER['REQUEST_METHOD'] != 'POST') {
-					if(isset($_COOKIE[session_name()])) {
+if (isset($lastInstallTime)) {
+	if (isset($_SESSION['mgrValidated'])) {
+		if (isset($_SESSION['modx.session.created.time'])) {
+			if ($_SESSION['modx.session.created.time'] < $lastInstallTime) {
+				if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+					if (isset($_COOKIE[session_name()])) {
 						session_unset();
 						@session_destroy();
 						//						setcookie(session_name(), '', 0, MODX_BASE_URL);
 					}
 					header('HTTP/1.0 307 Redirect');
-					header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2');
+					header('Location: '.MODX_MANAGER_URL.'index.php?installGoingOn=2');
 				}
 			}
 		}
 	}
 }
 
-if(!isset($_SESSION['mgrValidated'])) {
-	if(isset($manager_language)) {
+if (!isset($_SESSION['mgrValidated'])) {
+	if (isset($manager_language)) {
 		// establish fallback to English default
 		include_once "lang/english.inc.php";
 		// include localized overrides
-		include_once "lang/" . $manager_language . ".inc.php";
+		include_once "lang/".$manager_language.".inc.php";
 	} else {
 		include_once "lang/english.inc.php";
 	}
 
 	$modx->setPlaceholder('modx_charset', $modx_manager_charset);
 	$modx->setPlaceholder('theme', $manager_theme);
-    $modx->setPlaceholder('favicon', (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico'));
+    $modx->setPlaceholder('favicon', (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico'));
 
 	// invoke OnManagerLoginFormPrerender event
 	$evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
@@ -80,29 +80,29 @@ 
 	$modx->setPlaceholder('manager_path', MGR_DIR);
 	$modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
 	$modx->setPlaceholder('login_message', $_lang["login_message"]);
-	$modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
+	$modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
 	$modx->setPlaceholder('year', date('Y'));
 	$modx->setPlaceholder('manager_theme_style', (isset($_COOKIE['MODX_themeColor']) ? $_COOKIE['MODX_themeColor'] : ''));
 
 	// andrazk 20070416 - notify user of install/update
-	if(isset($_GET['installGoingOn'])) {
+	if (isset($_GET['installGoingOn'])) {
 		$installGoingOn = $_GET['installGoingOn'];
 	}
-	if(isset($installGoingOn)) {
-		switch($installGoingOn) {
+	if (isset($installGoingOn)) {
+		switch ($installGoingOn) {
 			case 1 :
-				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>");
+				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">".$_lang["login_cancelled_install_in_progress"]."</p><p>".$_lang["login_message"]."</p>");
 				break;
 			case 2 :
-				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>");
+				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">".$_lang["login_cancelled_site_was_updated"]."</p><p>".$_lang["login_message"]."</p>");
 				break;
 		}
 	}
 
-	if($modx->config['use_captcha'] == 1) {
+	if ($modx->config['use_captcha'] == 1) {
 		$modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]);
-		$modx->setPlaceholder('captcha_image', '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'includes/veriword.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>');
-		$modx->setPlaceholder('captcha_input', '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
+		$modx->setPlaceholder('captcha_image', '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha"><img id="captcha_image" src="'.MODX_MANAGER_URL.'includes/veriword.php?rand='.rand().'" alt="'.$_lang["login_captcha_message"].'" /></a>');
+		$modx->setPlaceholder('captcha_input', '<label>'.$_lang["captcha_code"].'</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
 	}
 
 	// login info
@@ -119,7 +119,7 @@ 
 
 	// invoke OnManagerLoginFormRender event
 	$evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
-	$html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
+	$html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">'.implode('', $evtOut).'</div>' : '';
 	$modx->setPlaceholder('OnManagerLoginFormRender', $html);
 
 	// load template
@@ -128,38 +128,38 @@ 
 	$target = $modx->mergeSettingsContent($target);
 
 	$login_tpl = null;
-	if(substr($target, 0, 1) === '@') {
-		if(substr($target, 0, 6) === '@CHUNK') {
+	if (substr($target, 0, 1) === '@') {
+		if (substr($target, 0, 6) === '@CHUNK') {
 			$target = trim(substr($target, 7));
 			$login_tpl = $modx->getChunk($target);
-		} elseif(substr($target, 0, 5) === '@FILE') {
+		} elseif (substr($target, 0, 5) === '@FILE') {
 			$target = trim(substr($target, 6));
 			$login_tpl = file_get_contents($target);
 		}
 	} else {
-		$theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/';
-		if(is_file($theme_path . 'style.php')) {
-			include($theme_path . 'style.php');
+		$theme_path = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/';
+		if (is_file($theme_path.'style.php')) {
+			include($theme_path.'style.php');
 		}
 		$chunk = $modx->getChunk($target);
-		if($chunk !== false && !empty($chunk)) {
+		if ($chunk !== false && !empty($chunk)) {
 			$login_tpl = $chunk;
-		} elseif(is_file(MODX_BASE_PATH . $target)) {
-			$target = MODX_BASE_PATH . $target;
+		} elseif (is_file(MODX_BASE_PATH.$target)) {
+			$target = MODX_BASE_PATH.$target;
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($target)) {
+		} elseif (is_file($target)) {
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'login.tpl')) {
-			$target = $theme_path . 'login.tpl';
+		} elseif (is_file($theme_path.'login.tpl')) {
+			$target = $theme_path.'login.tpl';
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'templates/actions/login.tpl')) {
-			$target = $theme_path . 'templates/actions/login.tpl';
+		} elseif (is_file($theme_path.'templates/actions/login.tpl')) {
+			$target = $theme_path.'templates/actions/login.tpl';
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
-			$target = $theme_path . 'html/login.html';
+		} elseif (is_file($theme_path.'html/login.html')) { // ClipperCMS compatible
+			$target = $theme_path.'html/login.html';
 			$login_tpl = file_get_contents($target);
 		} else {
-			$target = MODX_MANAGER_PATH . 'media/style/common/login.tpl';
+			$target = MODX_MANAGER_PATH.'media/style/common/login.tpl';
 			$login_tpl = file_get_contents($target);
 		}
 	}
@@ -182,8 +182,8 @@ 
 	$lasthittime = time();
 	$action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
 
-	if($action !== 1) {
-		if(!intval($itemid)) {
+	if ($action !== 1) {
+		if (!intval($itemid)) {
 			$itemid = null;
 		}
 		$sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)", $modx->getFullTableName('active_users') // Table