evolution-cms / evolution

manager/index.php

Indentation +618 added lines, -618 removed lines

@@ -50,7 +50,7 @@ 
 
 $autoloader = realpath(__DIR__.'/../vendor/autoload.php');
 if (file_exists($autoloader) && is_readable($autoloader)) {
-	include_once($autoloader);
+    include_once($autoloader);
 }
 
 // get start time
@@ -65,22 +65,22 @@ 
 $site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php';
 if(is_file($site_hostnames_path)) include_once($site_hostnames_path);
 if(!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) {
-	$src = "<?php\n";
-	$src .= "define('MGR_DIR', '{$mgr_dir}');\n";
-	$rs = file_put_contents($site_mgr_path,$src);
-	if(!$rs) {
-		echo 'siteManager.php write error';
-		exit;
-	}
-	sleep(1);
-	header('Location:' . $_SERVER['REQUEST_URI']);
-	exit;
+    $src = "<?php\n";
+    $src .= "define('MGR_DIR', '{$mgr_dir}');\n";
+    $rs = file_put_contents($site_mgr_path,$src);
+    if(!$rs) {
+        echo 'siteManager.php write error';
+        exit;
+    }
+    sleep(1);
+    header('Location:' . $_SERVER['REQUEST_URI']);
+    exit;
 }
 
 // we use this to make sure files are accessed through
 // the manager instead of seperately.
 if (!defined('IN_MANAGER_MODE')) {
-	define("IN_MANAGER_MODE", true);
+    define("IN_MANAGER_MODE", true);
 }
 
 // harden it
@@ -101,16 +101,16 @@ 
 
 // check PHP version. EVO is compatible with php 5 (5.0.0+)
 $php_ver_comp =  version_compare(phpversion(), "5.0.0");
-		// -1 if left is less, 0 if equal, +1 if left is higher
+        // -1 if left is less, 0 if equal, +1 if left is higher
 if($php_ver_comp < 0) {
-	echo sprintf($_lang['php_version_check'], phpversion());
-	exit;
+    echo sprintf($_lang['php_version_check'], phpversion());
+    exit;
 }
 
 // check if iconv is installed
 if(!function_exists('iconv')) {
-	echo $_lang['iconv_not_available'];
-	exit;
+    echo $_lang['iconv_not_available'];
+    exit;
 }
 
 // set some runtime options
@@ -123,15 +123,15 @@ 
 
 // set the document_root :|
 if(!isset($_SERVER["DOCUMENT_ROOT"]) || empty($_SERVER["DOCUMENT_ROOT"])) {
-	$_SERVER["DOCUMENT_ROOT"] = str_replace($_SERVER["PATH_INFO"], "", preg_replace("/\\\\/", "/", $_SERVER["PATH_TRANSLATED"]))."/";
+    $_SERVER["DOCUMENT_ROOT"] = str_replace($_SERVER["PATH_INFO"], "", preg_replace("/\\\\/", "/", $_SERVER["PATH_TRANSLATED"]))."/";
 }
 
 // include_once config file
 $config_filename = "./includes/config.inc.php";
 if (!file_exists($config_filename)) {
-	echo "<h3>Unable to load configuration settings</h3>";
-	echo "Please run the EVO <a href='../install'>install utility</a>";
-	exit;
+    echo "<h3>Unable to load configuration settings</h3>";
+    echo "Please run the EVO <a href='../install'>install utility</a>";
+    exit;
 }
 
 // include the database configuration file
@@ -139,11 +139,11 @@ 
 
 // initiate the content manager class
 if (isset($coreClass) && class_exists($coreClass)) {
-	$modx = new $coreClass;
+    $modx = new $coreClass;
 } 	
 if (!isset($modx) || !($modx instanceof \DocumentParser)) {
-	include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
-	$modx = new \DocumentParser;
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
+    $modx = new \DocumentParser;
 }
 
 $modx->loadExtension("ManagerAPI");
@@ -166,25 +166,25 @@ 
 
 // now include_once different language file as english
 if(!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
-	$manager_language = "english"; // if not set, get the english language file.
+    $manager_language = "english"; // if not set, get the english language file.
 }
 
 // $length_eng_lang = count($_lang); // Not used for now, required for difference-check with other languages than english (i.e. inside installer) 
 
 if($manager_language!="english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
-	include_once "lang/".$manager_language.".inc.php";
+    include_once "lang/".$manager_language.".inc.php";
 }
 
 // allow custom language overrides not altered by future EVO-updates
 if(file_exists(MODX_MANAGER_PATH."includes/lang/override/".$manager_language.".inc.php")) {
-	include_once "lang/override/".$manager_language.".inc.php";
+    include_once "lang/override/".$manager_language.".inc.php";
 }
 
 $s = array('[+MGR_DIR+]');
 $r = array(MGR_DIR);
 foreach($_lang as $k=>$v)
 {
-	if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
+    if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
 }
 
 // send the charset header
@@ -199,19 +199,19 @@ 
 
 // double check the session
 if(!isset($_SESSION['mgrValidated'])){
-	echo "Not Logged In!";
-	exit;
+    echo "Not Logged In!";
+    exit;
 }
 
 // include_once the style variables file
 if(isset($manager_theme) && !isset($_style)) {
-	$_style = array();
-	include_once "media/style/".$manager_theme."/style.php";
+    $_style = array();
+    include_once "media/style/".$manager_theme."/style.php";
 }
 
 // check if user is allowed to access manager interface
 if(isset($allow_manager_access) && $allow_manager_access==0) {
-	include_once "manager.lockout.inc.php";
+    include_once "manager.lockout.inc.php";
 }
 
 // Initialize System Alert Message Queque
@@ -220,13 +220,13 @@ 
 
 // first we check to see if this is a frameset request
 if(!isset($_POST['a']) && !isset($_GET['a']) && !isset($_POST['updateMsgCount'])) {
-	// this looks to be a top-level frameset request, so let's serve up a frameset
-	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
-		include_once "media/style/".$manager_theme."/frames/1.php";
-	}else{
-		include_once "frames/1.php";
-	}
-	exit;
+    // this looks to be a top-level frameset request, so let's serve up a frameset
+    if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
+        include_once "media/style/".$manager_theme."/frames/1.php";
+    }else{
+        include_once "frames/1.php";
+    }
+    exit;
 }
 
 // OK, let's retrieve the action directive from the request
@@ -237,7 +237,7 @@ 
 else                       $action = null;
 
 if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) {
-	include_once 'messageCount.inc.php';
+    include_once 'messageCount.inc.php';
 }
 
 // save page to manager object
@@ -245,19 +245,19 @@ 
 
 // attempt to foil some simple types of CSRF attacks
 if (isset($modx->config['validate_referer']) && intval($modx->config['validate_referer'])) {
-	if (isset($_SERVER['HTTP_REFERER'])) {
-		$referer = $_SERVER['HTTP_REFERER'];
-
-		if (!empty($referer)) {
-			if (!preg_match('/^'.preg_quote(MODX_SITE_URL, '/').'/i', $referer)) {
-				$modx->webAlertAndQuit("A possible CSRF attempt was detected from referer: {$referer}.", "index.php");
-			}
-		} else {
-				$modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the client.", "index.php");
-		}
-	} else {
-		$modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the server.", "index.php");
-	}
+    if (isset($_SERVER['HTTP_REFERER'])) {
+        $referer = $_SERVER['HTTP_REFERER'];
+
+        if (!empty($referer)) {
+            if (!preg_match('/^'.preg_quote(MODX_SITE_URL, '/').'/i', $referer)) {
+                $modx->webAlertAndQuit("A possible CSRF attempt was detected from referer: {$referer}.", "index.php");
+            }
+        } else {
+                $modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the client.", "index.php");
+        }
+    } else {
+        $modx->webAlertAndQuit("A possible CSRF attempt was detected. No referer was provided by the server.", "index.php");
+    }
 }
 
 // invoke OnManagerPageInit event
@@ -265,13 +265,13 @@ 
 
 // return element filepath
 function includeFileProcessor ($filepath,$manager_theme) {
-	$element = "";
-	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
-		$element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
-	}else{
-		$element = $filepath;
-	}
-	return $element;
+    $element = "";
+    if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
+        $element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
+    }else{
+        $element = $filepath;
+    }
+    return $element;
 }
 
 // Now we decide what to do according to the action request. This is a BIG list :)
@@ -279,714 +279,714 @@ 
 /********************************************************************/
 /* frame management - show the requested frame                      */
 /********************************************************************/
-	case 1 :
-		// get the requested frame
-		$frame = preg_replace('/[^a-z0-9]/i','',$_REQUEST['f']);
-		if($frame>9) {
-			$enable_debug=false;    // this is to stop the debug thingy being attached to the framesets
-		}
-		include_once(includeFileProcessor("frames/".$frame.".php",$manager_theme));
-	break;
+    case 1 :
+        // get the requested frame
+        $frame = preg_replace('/[^a-z0-9]/i','',$_REQUEST['f']);
+        if($frame>9) {
+            $enable_debug=false;    // this is to stop the debug thingy being attached to the framesets
+        }
+        include_once(includeFileProcessor("frames/".$frame.".php",$manager_theme));
+    break;
 /********************************************************************/
 /* show the homepage                                                */
 /********************************************************************/
-	case 2:
-		// get the home page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/welcome.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 2:
+        // get the home page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/welcome.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* document data                                                    */
 /********************************************************************/
-	case 3:
-		// get the page to show document's data
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/document_data.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 3:
+        // get the page to show document's data
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/document_data.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* content management                                               */
 /********************************************************************/
-	case 85:
-		// get the mutate page for adding a folder
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 27:
-		// get the mutate page for changing content
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 4:
-		// get the mutate page for adding content
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 5:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_content.processor.php",$manager_theme));
-	break;
-	case 6:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_content.processor.php",$manager_theme));
-	break;
-	case 63:
-		// get the undelete processor
-		include_once(includeFileProcessor("processors/undelete_content.processor.php",$manager_theme));
-	break;
-	case 51:
-		// get the move action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/move_document.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 52:
-		// get the move document processor
-		include_once(includeFileProcessor("processors/move_document.processor.php",$manager_theme));
-	break;
-	case 61:
-		// get the processor for publishing content
-		include_once(includeFileProcessor("processors/publish_content.processor.php",$manager_theme));
-	break;
-	case 62:
-		// get the processor for publishing content
-		include_once(includeFileProcessor("processors/unpublish_content.processor.php",$manager_theme));
-	break;
-	case 56:
-		// get the sort menuindex action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-		break;
+    case 85:
+        // get the mutate page for adding a folder
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 27:
+        // get the mutate page for changing content
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 4:
+        // get the mutate page for adding content
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 5:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_content.processor.php",$manager_theme));
+    break;
+    case 6:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_content.processor.php",$manager_theme));
+    break;
+    case 63:
+        // get the undelete processor
+        include_once(includeFileProcessor("processors/undelete_content.processor.php",$manager_theme));
+    break;
+    case 51:
+        // get the move action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/move_document.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 52:
+        // get the move document processor
+        include_once(includeFileProcessor("processors/move_document.processor.php",$manager_theme));
+    break;
+    case 61:
+        // get the processor for publishing content
+        include_once(includeFileProcessor("processors/publish_content.processor.php",$manager_theme));
+    break;
+    case 62:
+        // get the processor for publishing content
+        include_once(includeFileProcessor("processors/unpublish_content.processor.php",$manager_theme));
+    break;
+    case 56:
+        // get the sort menuindex action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+        break;
 /********************************************************************/
 /* show the wait page - gives the tree time to refresh (hopefully)  */
 /********************************************************************/
-	case 7:
-		// get the wait page (so the tree can reload)
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/wait.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 7:
+        // get the wait page (so the tree can reload)
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/wait.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* let the user log out                                             */
 /********************************************************************/
-	case 8:
-		// get the logout processor
-		include_once(includeFileProcessor("processors/logout.processor.php",$manager_theme));
-	break;
+    case 8:
+        // get the logout processor
+        include_once(includeFileProcessor("processors/logout.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* user management                                                  */
 /********************************************************************/
-	case 87:
-		// get the new web user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 88:
-		// get the edit web user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 89:
-		// get the save web user processor
-		include_once(includeFileProcessor("processors/save_web_user.processor.php",$manager_theme));
-	break;
-	case 90:
-		// get the delete web user page
-		include_once(includeFileProcessor("processors/delete_web_user.processor.php",$manager_theme));
-	break;
-	case 11:
-		// get the new user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 12:
-		// get the edit user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 32:
-		// get the save user processor
-		include_once(includeFileProcessor("processors/save_user.processor.php",$manager_theme));
-	break;
-	case 28:
-		// get the change password page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_password.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 34:
-		// get the save new password page
-		include_once(includeFileProcessor("processors/save_password.processor.php",$manager_theme));
-	break;
-	case 33:
-		// get the delete user page
-		include_once(includeFileProcessor("processors/delete_user.processor.php",$manager_theme));
-	break;
+    case 87:
+        // get the new web user page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 88:
+        // get the edit web user page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 89:
+        // get the save web user processor
+        include_once(includeFileProcessor("processors/save_web_user.processor.php",$manager_theme));
+    break;
+    case 90:
+        // get the delete web user page
+        include_once(includeFileProcessor("processors/delete_web_user.processor.php",$manager_theme));
+    break;
+    case 11:
+        // get the new user page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 12:
+        // get the edit user page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 32:
+        // get the save user processor
+        include_once(includeFileProcessor("processors/save_user.processor.php",$manager_theme));
+    break;
+    case 28:
+        // get the change password page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_password.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 34:
+        // get the save new password page
+        include_once(includeFileProcessor("processors/save_password.processor.php",$manager_theme));
+    break;
+    case 33:
+        // get the delete user page
+        include_once(includeFileProcessor("processors/delete_user.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* role management                                                  */
 /********************************************************************/
-	case 38:
-		// get the new role page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 35:
-		// get the edit role page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 36:
-		// get the save role page
-		include_once(includeFileProcessor("processors/save_role.processor.php",$manager_theme));
-	break;
-	case 37:
-		// get the delete role page
-		include_once(includeFileProcessor("processors/delete_role.processor.php",$manager_theme));
-	break;
+    case 38:
+        // get the new role page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 35:
+        // get the edit role page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 36:
+        // get the save role page
+        include_once(includeFileProcessor("processors/save_role.processor.php",$manager_theme));
+    break;
+    case 37:
+        // get the delete role page
+        include_once(includeFileProcessor("processors/delete_role.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* category management                                               */
 /********************************************************************/
-	case 120:
-		// get the edit category page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 121:
-		// for ajax-requests
-		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
-	break;
+    case 120:
+        // get the edit category page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 121:
+        // for ajax-requests
+        include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
+    break;
 /********************************************************************/
 /* template management                                              */
 /********************************************************************/
-	case 16:
-		// get the edit template action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 19:
-		// get the new template action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 20:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_template.processor.php",$manager_theme));
-	break;
-	case 21:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_template.processor.php",$manager_theme));
-	break;
-	case 96:
-		// get the duplicate template processor
-		include_once(includeFileProcessor("processors/duplicate_template.processor.php",$manager_theme));
-	break;
-	case 117:
-		// change the tv rank for selected template
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-		break;
+    case 16:
+        // get the edit template action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 19:
+        // get the new template action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 20:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_template.processor.php",$manager_theme));
+    break;
+    case 21:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_template.processor.php",$manager_theme));
+    break;
+    case 96:
+        // get the duplicate template processor
+        include_once(includeFileProcessor("processors/duplicate_template.processor.php",$manager_theme));
+    break;
+    case 117:
+        // change the tv rank for selected template
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+        break;
 /********************************************************************/
 /* snippet management                                               */
 /********************************************************************/
-	case 22:
-		// get the edit snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 23:
-		// get the new snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 24:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_snippet.processor.php",$manager_theme));
-	break;
-	case 25:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_snippet.processor.php",$manager_theme));
-	break;
-	case 98:
-		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_snippet.processor.php",$manager_theme));
-	break;
+    case 22:
+        // get the edit snippet action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 23:
+        // get the new snippet action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 24:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_snippet.processor.php",$manager_theme));
+    break;
+    case 25:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_snippet.processor.php",$manager_theme));
+    break;
+    case 98:
+        // get the duplicate processor
+        include_once(includeFileProcessor("processors/duplicate_snippet.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* htmlsnippet management                                               */
 /********************************************************************/
-	case 78:
-		// get the edit snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 77:
-		// get the new snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 79:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php",$manager_theme));
-	break;
-	case 80:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php",$manager_theme));
-	break;
-	case 97:
-		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php",$manager_theme));
-	break;
+    case 78:
+        // get the edit snippet action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 77:
+        // get the new snippet action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 79:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php",$manager_theme));
+    break;
+    case 80:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php",$manager_theme));
+    break;
+    case 97:
+        // get the duplicate processor
+        include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* show the credits page                                            */
 /********************************************************************/
-	case 18:
-		// get the credits page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/credits.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 18:
+        // get the credits page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/credits.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* empty cache & synchronisation                                    */
 /********************************************************************/
-	case 26:
-		// get the cache emptying processor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/refresh_site.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 26:
+        // get the cache emptying processor
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/refresh_site.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Module management                                                */
 /********************************************************************/
-	case 106:
-		// get module management
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/modules.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 107:
-		// get the new module action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 108:
-		// get the edit module action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 109:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_module.processor.php",$manager_theme));
-	break;
-	case 110:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_module.processor.php",$manager_theme));
-	break;
-	case 111:
-		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_module.processor.php",$manager_theme));
-	break;
-	case 112:
-		// execute/run the module
-		//include_once "header.inc.php";
-		include_once(includeFileProcessor("processors/execute_module.processor.php",$manager_theme));
-		//include_once "footer.inc.php";
-		break;
-	case 113:
-		// get the module resources (dependencies) action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 106:
+        // get module management
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/modules.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 107:
+        // get the new module action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 108:
+        // get the edit module action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 109:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_module.processor.php",$manager_theme));
+    break;
+    case 110:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_module.processor.php",$manager_theme));
+    break;
+    case 111:
+        // get the duplicate processor
+        include_once(includeFileProcessor("processors/duplicate_module.processor.php",$manager_theme));
+    break;
+    case 112:
+        // execute/run the module
+        //include_once "header.inc.php";
+        include_once(includeFileProcessor("processors/execute_module.processor.php",$manager_theme));
+        //include_once "footer.inc.php";
+        break;
+    case 113:
+        // get the module resources (dependencies) action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* plugin management                                                */
 /********************************************************************/
-	case 100:
-		// change the plugin priority
-		//include_once "header.inc.php"; - in action file
-		include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 101:
-		// get the new plugin action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 102:
-		// get the edit plugin action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 103:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_plugin.processor.php",$manager_theme));
-	break;
-	case 104:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_plugin.processor.php",$manager_theme));
-	break;
-	case 105:
-		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_plugin.processor.php",$manager_theme));
-	break;
-	case 119:
-		// get the purge processor
-		include_once(includeFileProcessor("processors/purge_plugin.processor.php",$manager_theme));
-	break;
+    case 100:
+        // change the plugin priority
+        //include_once "header.inc.php"; - in action file
+        include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 101:
+        // get the new plugin action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 102:
+        // get the edit plugin action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 103:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_plugin.processor.php",$manager_theme));
+    break;
+    case 104:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_plugin.processor.php",$manager_theme));
+    break;
+    case 105:
+        // get the duplicate processor
+        include_once(includeFileProcessor("processors/duplicate_plugin.processor.php",$manager_theme));
+    break;
+    case 119:
+        // get the purge processor
+        include_once(includeFileProcessor("processors/purge_plugin.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* view phpinfo                                                     */
 /********************************************************************/
-	case 200:
-		// show phpInfo
-		if($modx->hasPermission('logs')) {
-			include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-			include_once(includeFileProcessor("actions/phpinfo.static.php",$manager_theme));
-			include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-		}
-	break;
+    case 200:
+        // show phpInfo
+        if($modx->hasPermission('logs')) {
+            include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+            include_once(includeFileProcessor("actions/phpinfo.static.php",$manager_theme));
+            include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+        }
+    break;
 /********************************************************************/
 /* errorpage                                            */
 /********************************************************************/
-	case 29:
-		// get the error page
-		include_once(includeFileProcessor("actions/error_dialog.static.php",$manager_theme));
-	break;
+    case 29:
+        // get the error page
+        include_once(includeFileProcessor("actions/error_dialog.static.php",$manager_theme));
+    break;
 /********************************************************************/
 /* file manager                                                     */
 /********************************************************************/
-	case 31:
-		// get the page to manage files
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/files.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 31:
+        // get the page to manage files
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/files.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* access permissions                                               */
 /********************************************************************/
-	case 40:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/access_permissions.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 91:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 40:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/access_permissions.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 91:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* access groups processor                                          */
 /********************************************************************/
-	case 41:
-		include_once(includeFileProcessor("processors/access_groups.processor.php",$manager_theme));
-	break;
-	case 92:
-		include_once(includeFileProcessor("processors/web_access_groups.processor.php",$manager_theme));
-	break;
+    case 41:
+        include_once(includeFileProcessor("processors/access_groups.processor.php",$manager_theme));
+    break;
+    case 92:
+        include_once(includeFileProcessor("processors/web_access_groups.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* settings editor                                                  */
 /********************************************************************/
-	case 17:
-		// get the settings editor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_settings.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 118:
-		// call settings ajax include
-		ob_clean();
-		include_once(includeFileProcessor("includes/mutate_settings.ajax.php",$manager_theme));
-	break;
+    case 17:
+        // get the settings editor
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_settings.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 118:
+        // call settings ajax include
+        ob_clean();
+        include_once(includeFileProcessor("includes/mutate_settings.ajax.php",$manager_theme));
+    break;
 /********************************************************************/
 /* save settings                                                    */
 /********************************************************************/
-	case 30:
-		// get the save settings processor
-		include_once(includeFileProcessor("processors/save_settings.processor.php",$manager_theme));
-	break;
+    case 30:
+        // get the save settings processor
+        include_once(includeFileProcessor("processors/save_settings.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* system information                                               */
 /********************************************************************/
-	case 53:
-		// get the settings editor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/sysinfo.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 53:
+        // get the settings editor
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/sysinfo.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* optimise table                                               */
 /********************************************************************/
-	case 54:
-		// get the table optimizer/truncate processor
-		include_once(includeFileProcessor("processors/optimize_table.processor.php",$manager_theme));
-	break;
+    case 54:
+        // get the table optimizer/truncate processor
+        include_once(includeFileProcessor("processors/optimize_table.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* view logging                                                     */
 /********************************************************************/
-	case 13:
-		// view logging
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/logging.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 13:
+        // view logging
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/logging.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* empty logs                                                       */
 /********************************************************************/
-	case 55:
-		// get the settings editor
-		include_once(includeFileProcessor("processors/empty_table.processor.php",$manager_theme));
-	break;
+    case 55:
+        // get the settings editor
+        include_once(includeFileProcessor("processors/empty_table.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* calls test page                                                      */
 /********************************************************************/
-	case 999:
-		// get the test page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("test_page.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 999:
+        // get the test page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("test_page.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Empty recycle bin                                                */
 /********************************************************************/
-	case 64:
-		// get the Recycle bin emptier
-		include_once(includeFileProcessor("processors/remove_content.processor.php",$manager_theme));
-	break;
+    case 64:
+        // get the Recycle bin emptier
+        include_once(includeFileProcessor("processors/remove_content.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Messages                                                     */
 /********************************************************************/
-	case 10:
-		// get the messages page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/messages.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 10:
+        // get the messages page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/messages.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Delete a message                                                 */
 /********************************************************************/
-	case 65:
-		// get the message deleter
-		include_once(includeFileProcessor("processors/delete_message.processor.php",$manager_theme));
-	break;
+    case 65:
+        // get the message deleter
+        include_once(includeFileProcessor("processors/delete_message.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Send a message                                                   */
 /********************************************************************/
-	case 66:
-		// get the message deleter
-		include_once(includeFileProcessor("processors/send_message.processor.php",$manager_theme));
-	break;
+    case 66:
+        // get the message deleter
+        include_once(includeFileProcessor("processors/send_message.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Remove locks                                                 */
 /********************************************************************/
-	case 67:
-		// get the lock remover
-		include_once(includeFileProcessor("processors/remove_locks.processor.php",$manager_theme));
-	break;
+    case 67:
+        // get the lock remover
+        include_once(includeFileProcessor("processors/remove_locks.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Site schedule                                                    */
 /********************************************************************/
-	case 70:
-		// get the schedule page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/site_schedule.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 70:
+        // get the schedule page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/site_schedule.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Search                                                           */
 /********************************************************************/
-	case 71:
-		// get the search page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/search.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 71:
+        // get the search page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/search.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* About                                                            */
 /********************************************************************/
-	case 59:
-		// get the about page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/about.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 59:
+        // get the about page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/about.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Add weblink                                                          */
 /********************************************************************/
-	case 72:
-		// get the weblink page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 72:
+        // get the weblink page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* User management                                                  */
 /********************************************************************/
-	case 75:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/user_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 99:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/web_user_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 86:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/role_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 75:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/user_management.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 99:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/web_user_management.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 86:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/role_management.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* template/ snippet management                                                 */
 /********************************************************************/
-	case 76:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/resources.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 76:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/resources.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Export to file                                                   */
 /********************************************************************/
-	case 83:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/export_site.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 83:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/export_site.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Resource Selector                                                    */
 /********************************************************************/
-	case 84:
-		include_once(includeFileProcessor("actions/resource_selector.static.php",$manager_theme));
-	break;
+    case 84:
+        include_once(includeFileProcessor("actions/resource_selector.static.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Backup Manager                                                   */
 /********************************************************************/
-	case 93:
-		# header and footer will be handled interally
-		include_once(includeFileProcessor("actions/bkmanager.static.php",$manager_theme));
-	break;
+    case 93:
+        # header and footer will be handled interally
+        include_once(includeFileProcessor("actions/bkmanager.static.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Duplicate Document                                                   */
 /********************************************************************/
-	case 94:
-		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_content.processor.php",$manager_theme));
-	break;
+    case 94:
+        // get the duplicate processor
+        include_once(includeFileProcessor("processors/duplicate_content.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Import Document from file                                        */
 /********************************************************************/
-	case 95:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/import_site.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 95:
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/import_site.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Help                                                             */
 /********************************************************************/
-	case 9:
-		// get the help page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/help.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 9:
+        // get the help page
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/help.static.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Template Variables - Based on Apodigm's Docvars                  */
 /********************************************************************/
-	case 300:
-		// get the new document variable action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 301:
-		// get the edit document variable action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 302:
-		// get the save processor
-		include_once(includeFileProcessor("processors/save_tmplvars.processor.php",$manager_theme));
-	break;
-	case 303:
-		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_tmplvars.processor.php",$manager_theme));
-	break;
-	case 304:
-		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php",$manager_theme));
-	break;
-	case 305:
-		// get the tv-rank action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
+    case 300:
+        // get the new document variable action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 301:
+        // get the edit document variable action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 302:
+        // get the save processor
+        include_once(includeFileProcessor("processors/save_tmplvars.processor.php",$manager_theme));
+    break;
+    case 303:
+        // get the delete processor
+        include_once(includeFileProcessor("processors/delete_tmplvars.processor.php",$manager_theme));
+    break;
+    case 304:
+        // get the duplicate processor
+        include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php",$manager_theme));
+    break;
+    case 305:
+        // get the tv-rank action
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
 /********************************************************************/
 /* Event viewer: show event message log                             */
 /********************************************************************/
-	case 114:
-		// get event logs
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/eventlog.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 115:
-		// get event log details viewer
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/eventlog_details.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
-	break;
-	case 116:
-		// get the event log delete processor
-		include_once(includeFileProcessor("processors/delete_eventlog.processor.php",$manager_theme));
-	break;
-
-	case 501:
-		//delete category
-		include_once(includeFileProcessor("processors/delete_category.processor.php",$manager_theme));
-	break;
+    case 114:
+        // get event logs
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/eventlog.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 115:
+        // get event log details viewer
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        include_once(includeFileProcessor("actions/eventlog_details.dynamic.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+    break;
+    case 116:
+        // get the event log delete processor
+        include_once(includeFileProcessor("processors/delete_eventlog.processor.php",$manager_theme));
+    break;
+
+    case 501:
+        //delete category
+        include_once(includeFileProcessor("processors/delete_category.processor.php",$manager_theme));
+    break;
 /********************************************************************/
 /* default action: show not implemented message                     */
 /********************************************************************/
-	default :
-		// say that what was requested doesn't do anything yet
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		echo "
+    default :
+        // say that what was requested doesn't do anything yet
+        include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+        echo "
 			<div class='sectionHeader'>".$_lang['functionnotimpl']."</div>
 			<div class='sectionBody'>
 				<p>".$_lang['functionnotimpl_message']."</p>
 			</div>
 		";
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+        include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
 }
 
 /********************************************************************/
 // log action, unless it's a frame request
 if($action!=1 && $action!=7 && $action!=2) {
-	include_once "log.class.inc.php";
-	$log = new logHandler;
-	$log->initAndWriteLog();
+    include_once "log.class.inc.php";
+    $log = new logHandler;
+    $log->initAndWriteLog();
 }
 /********************************************************************/
 // show debug

Spacing +268 added lines, -268 removed lines

@@ -54,26 +54,26 @@ 
 }
 
 // get start time
-$mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tstart = $mtime;
+$mtime = microtime(); $mtime = explode(" ", $mtime); $mtime = $mtime[1] + $mtime[0]; $tstart = $mtime;
 $mstart = memory_get_usage();
-$self      = str_replace('\\','/',__FILE__);
-$self_dir  = str_replace('/index.php','',$self);
-$mgr_dir   = substr($self_dir,strrpos($self_dir,'/')+1);
-$base_path = str_replace($mgr_dir . '/index.php','',$self);
-$site_mgr_path = $base_path . 'assets/cache/siteManager.php';
-if(is_file($site_mgr_path)) include_once($site_mgr_path);
-$site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php';
-if(is_file($site_hostnames_path)) include_once($site_hostnames_path);
-if(!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) {
+$self      = str_replace('\\', '/', __FILE__);
+$self_dir  = str_replace('/index.php', '', $self);
+$mgr_dir   = substr($self_dir, strrpos($self_dir, '/') + 1);
+$base_path = str_replace($mgr_dir.'/index.php', '', $self);
+$site_mgr_path = $base_path.'assets/cache/siteManager.php';
+if (is_file($site_mgr_path)) include_once($site_mgr_path);
+$site_hostnames_path = $base_path.'assets/cache/siteHostnames.php';
+if (is_file($site_hostnames_path)) include_once($site_hostnames_path);
+if (!defined('MGR_DIR') || MGR_DIR !== $mgr_dir) {
 	$src = "<?php\n";
 	$src .= "define('MGR_DIR', '{$mgr_dir}');\n";
-	$rs = file_put_contents($site_mgr_path,$src);
-	if(!$rs) {
+	$rs = file_put_contents($site_mgr_path, $src);
+	if (!$rs) {
 		echo 'siteManager.php write error';
 		exit;
 	}
 	sleep(1);
-	header('Location:' . $_SERVER['REQUEST_URI']);
+	header('Location:'.$_SERVER['REQUEST_URI']);
 	exit;
 }
 
@@ -88,7 +88,7 @@ 
 
 // send anti caching headers
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 header("Cache-Control: no-store, no-cache, must-revalidate");
 header("Cache-Control: post-check=0, pre-check=0", false);
 header("Pragma: no-cache");
@@ -100,29 +100,29 @@ 
 include_once "includes/lang/english.inc.php";
 
 // check PHP version. EVO is compatible with php 5 (5.0.0+)
-$php_ver_comp =  version_compare(phpversion(), "5.0.0");
+$php_ver_comp = version_compare(phpversion(), "5.0.0");
 		// -1 if left is less, 0 if equal, +1 if left is higher
-if($php_ver_comp < 0) {
+if ($php_ver_comp < 0) {
 	echo sprintf($_lang['php_version_check'], phpversion());
 	exit;
 }
 
 // check if iconv is installed
-if(!function_exists('iconv')) {
+if (!function_exists('iconv')) {
 	echo $_lang['iconv_not_available'];
 	exit;
 }
 
 // set some runtime options
-$incPath = str_replace("\\","/",dirname(__FILE__)."/includes/"); // Mod by Raymond
-set_include_path(get_include_path() . PATH_SEPARATOR . $incPath);
+$incPath = str_replace("\\", "/", dirname(__FILE__)."/includes/"); // Mod by Raymond
+set_include_path(get_include_path().PATH_SEPARATOR.$incPath);
 
 if (!defined("ENT_COMPAT")) define("ENT_COMPAT", 2);
 if (!defined("ENT_NOQUOTES")) define("ENT_NOQUOTES", 0);
 if (!defined("ENT_QUOTES")) define("ENT_QUOTES", 3);
 
 // set the document_root :|
-if(!isset($_SERVER["DOCUMENT_ROOT"]) || empty($_SERVER["DOCUMENT_ROOT"])) {
+if (!isset($_SERVER["DOCUMENT_ROOT"]) || empty($_SERVER["DOCUMENT_ROOT"])) {
 	$_SERVER["DOCUMENT_ROOT"] = str_replace($_SERVER["PATH_INFO"], "", preg_replace("/\\\\/", "/", $_SERVER["PATH_TRANSLATED"]))."/";
 }
 
@@ -161,30 +161,30 @@ 
 // Now that session is given get user settings and merge into $modx->config
 $usersettings = $modx->getUserSettings();
 
-$settings =& $modx->config;
+$settings = & $modx->config;
 extract($modx->config, EXTR_OVERWRITE);
 
 // now include_once different language file as english
-if(!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
+if (!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
 	$manager_language = "english"; // if not set, get the english language file.
 }
 
 // $length_eng_lang = count($_lang); // Not used for now, required for difference-check with other languages than english (i.e. inside installer) 
 
-if($manager_language!="english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
+if ($manager_language != "english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
 	include_once "lang/".$manager_language.".inc.php";
 }
 
 // allow custom language overrides not altered by future EVO-updates
-if(file_exists(MODX_MANAGER_PATH."includes/lang/override/".$manager_language.".inc.php")) {
+if (file_exists(MODX_MANAGER_PATH."includes/lang/override/".$manager_language.".inc.php")) {
 	include_once "lang/override/".$manager_language.".inc.php";
 }
 
 $s = array('[+MGR_DIR+]');
 $r = array(MGR_DIR);
-foreach($_lang as $k=>$v)
+foreach ($_lang as $k=>$v)
 {
-	if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
+	if (strpos($v, '[+') !== false) $_lang[$k] = str_replace($s, $r, $v);
 }
 
 // send the charset header
@@ -198,19 +198,19 @@ 
 include_once "accesscontrol.inc.php";
 
 // double check the session
-if(!isset($_SESSION['mgrValidated'])){
+if (!isset($_SESSION['mgrValidated'])) {
 	echo "Not Logged In!";
 	exit;
 }
 
 // include_once the style variables file
-if(isset($manager_theme) && !isset($_style)) {
+if (isset($manager_theme) && !isset($_style)) {
 	$_style = array();
 	include_once "media/style/".$manager_theme."/style.php";
 }
 
 // check if user is allowed to access manager interface
-if(isset($allow_manager_access) && $allow_manager_access==0) {
+if (isset($allow_manager_access) && $allow_manager_access == 0) {
 	include_once "manager.lockout.inc.php";
 }
 
@@ -219,21 +219,21 @@ 
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
 // first we check to see if this is a frameset request
-if(!isset($_POST['a']) && !isset($_GET['a']) && !isset($_POST['updateMsgCount'])) {
+if (!isset($_POST['a']) && !isset($_GET['a']) && !isset($_POST['updateMsgCount'])) {
 	// this looks to be a top-level frameset request, so let's serve up a frameset
-	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
+	if (is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
 		include_once "media/style/".$manager_theme."/frames/1.php";
-	}else{
+	} else {
 		include_once "frames/1.php";
 	}
 	exit;
 }
 
 // OK, let's retrieve the action directive from the request
-$option = array('min_range'=>1,'max_range'=>2000);
-if(isset($_GET['a']) && isset($_POST['a'])) $modx->webAlertAndQuit($_lang['error_double_action']);
-elseif(isset($_GET['a']))  $action = filter_input(INPUT_GET, 'a',FILTER_VALIDATE_INT,$option);
-elseif(isset($_POST['a'])) $action = filter_input(INPUT_POST,'a',FILTER_VALIDATE_INT,$option);
+$option = array('min_range'=>1, 'max_range'=>2000);
+if (isset($_GET['a']) && isset($_POST['a'])) $modx->webAlertAndQuit($_lang['error_double_action']);
+elseif (isset($_GET['a']))  $action = filter_input(INPUT_GET, 'a', FILTER_VALIDATE_INT, $option);
+elseif (isset($_POST['a'])) $action = filter_input(INPUT_POST, 'a', FILTER_VALIDATE_INT, $option);
 else                       $action = null;
 
 if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) {
@@ -264,11 +264,11 @@ 
 $modx->invokeEvent("OnManagerPageInit", array("action" => $action));
 
 // return element filepath
-function includeFileProcessor ($filepath,$manager_theme) {
+function includeFileProcessor($filepath, $manager_theme){
 	$element = "";
-	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
+	if (is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
 		$element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
-	}else{
+	} else {
 		$element = $filepath;
 	}
 	return $element;
@@ -281,341 +281,341 @@ 
 /********************************************************************/
 	case 1 :
 		// get the requested frame
-		$frame = preg_replace('/[^a-z0-9]/i','',$_REQUEST['f']);
-		if($frame>9) {
-			$enable_debug=false;    // this is to stop the debug thingy being attached to the framesets
+		$frame = preg_replace('/[^a-z0-9]/i', '', $_REQUEST['f']);
+		if ($frame > 9) {
+			$enable_debug = false; // this is to stop the debug thingy being attached to the framesets
 		}
-		include_once(includeFileProcessor("frames/".$frame.".php",$manager_theme));
+		include_once(includeFileProcessor("frames/".$frame.".php", $manager_theme));
 	break;
 /********************************************************************/
 /* show the homepage                                                */
 /********************************************************************/
 	case 2:
 		// get the home page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/welcome.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/welcome.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* document data                                                    */
 /********************************************************************/
 	case 3:
 		// get the page to show document's data
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/document_data.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/document_data.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* content management                                               */
 /********************************************************************/
 	case 85:
 		// get the mutate page for adding a folder
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_content.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 27:
 		// get the mutate page for changing content
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_content.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 4:
 		// get the mutate page for adding content
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_content.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 5:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_content.processor.php", $manager_theme));
 	break;
 	case 6:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_content.processor.php", $manager_theme));
 	break;
 	case 63:
 		// get the undelete processor
-		include_once(includeFileProcessor("processors/undelete_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/undelete_content.processor.php", $manager_theme));
 	break;
 	case 51:
 		// get the move action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/move_document.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/move_document.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 52:
 		// get the move document processor
-		include_once(includeFileProcessor("processors/move_document.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/move_document.processor.php", $manager_theme));
 	break;
 	case 61:
 		// get the processor for publishing content
-		include_once(includeFileProcessor("processors/publish_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/publish_content.processor.php", $manager_theme));
 	break;
 	case 62:
 		// get the processor for publishing content
-		include_once(includeFileProcessor("processors/unpublish_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/unpublish_content.processor.php", $manager_theme));
 	break;
 	case 56:
 		// get the sort menuindex action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 		break;
 /********************************************************************/
 /* show the wait page - gives the tree time to refresh (hopefully)  */
 /********************************************************************/
 	case 7:
 		// get the wait page (so the tree can reload)
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/wait.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/wait.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* let the user log out                                             */
 /********************************************************************/
 	case 8:
 		// get the logout processor
-		include_once(includeFileProcessor("processors/logout.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/logout.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* user management                                                  */
 /********************************************************************/
 	case 87:
 		// get the new web user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 88:
 		// get the edit web user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 89:
 		// get the save web user processor
-		include_once(includeFileProcessor("processors/save_web_user.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_web_user.processor.php", $manager_theme));
 	break;
 	case 90:
 		// get the delete web user page
-		include_once(includeFileProcessor("processors/delete_web_user.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_web_user.processor.php", $manager_theme));
 	break;
 	case 11:
 		// get the new user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_user.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 12:
 		// get the edit user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_user.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 32:
 		// get the save user processor
-		include_once(includeFileProcessor("processors/save_user.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_user.processor.php", $manager_theme));
 	break;
 	case 28:
 		// get the change password page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_password.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_password.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 34:
 		// get the save new password page
-		include_once(includeFileProcessor("processors/save_password.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_password.processor.php", $manager_theme));
 	break;
 	case 33:
 		// get the delete user page
-		include_once(includeFileProcessor("processors/delete_user.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_user.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* role management                                                  */
 /********************************************************************/
 	case 38:
 		// get the new role page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_role.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 35:
 		// get the edit role page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_role.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 36:
 		// get the save role page
-		include_once(includeFileProcessor("processors/save_role.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_role.processor.php", $manager_theme));
 	break;
 	case 37:
 		// get the delete role page
-		include_once(includeFileProcessor("processors/delete_role.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_role.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* category management                                               */
 /********************************************************************/
 	case 120:
 		// get the edit category page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 121:
 		// for ajax-requests
-		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
+		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php", $manager_theme));
 	break;
 /********************************************************************/
 /* template management                                              */
 /********************************************************************/
 	case 16:
 		// get the edit template action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 19:
 		// get the new template action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 20:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_template.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_template.processor.php", $manager_theme));
 	break;
 	case 21:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_template.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_template.processor.php", $manager_theme));
 	break;
 	case 96:
 		// get the duplicate template processor
-		include_once(includeFileProcessor("processors/duplicate_template.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_template.processor.php", $manager_theme));
 	break;
 	case 117:
 		// change the tv rank for selected template
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 		break;
 /********************************************************************/
 /* snippet management                                               */
 /********************************************************************/
 	case 22:
 		// get the edit snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 23:
 		// get the new snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 24:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_snippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_snippet.processor.php", $manager_theme));
 	break;
 	case 25:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_snippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_snippet.processor.php", $manager_theme));
 	break;
 	case 98:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_snippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_snippet.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* htmlsnippet management                                               */
 /********************************************************************/
 	case 78:
 		// get the edit snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 77:
 		// get the new snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 79:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php", $manager_theme));
 	break;
 	case 80:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php", $manager_theme));
 	break;
 	case 97:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* show the credits page                                            */
 /********************************************************************/
 	case 18:
 		// get the credits page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/credits.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/credits.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* empty cache & synchronisation                                    */
 /********************************************************************/
 	case 26:
 		// get the cache emptying processor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/refresh_site.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/refresh_site.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Module management                                                */
 /********************************************************************/
 	case 106:
 		// get module management
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/modules.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/modules.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 107:
 		// get the new module action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_module.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 108:
 		// get the edit module action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_module.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 109:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_module.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_module.processor.php", $manager_theme));
 	break;
 	case 110:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_module.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_module.processor.php", $manager_theme));
 	break;
 	case 111:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_module.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_module.processor.php", $manager_theme));
 	break;
 	case 112:
 		// execute/run the module
 		//include_once "header.inc.php";
-		include_once(includeFileProcessor("processors/execute_module.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/execute_module.processor.php", $manager_theme));
 		//include_once "footer.inc.php";
 		break;
 	case 113:
 		// get the module resources (dependencies) action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* plugin management                                                */
@@ -623,46 +623,46 @@ 
 	case 100:
 		// change the plugin priority
 		//include_once "header.inc.php"; - in action file
-		include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 101:
 		// get the new plugin action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 102:
 		// get the edit plugin action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 103:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_plugin.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_plugin.processor.php", $manager_theme));
 	break;
 	case 104:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_plugin.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_plugin.processor.php", $manager_theme));
 	break;
 	case 105:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_plugin.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_plugin.processor.php", $manager_theme));
 	break;
 	case 119:
 		// get the purge processor
-		include_once(includeFileProcessor("processors/purge_plugin.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/purge_plugin.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* view phpinfo                                                     */
 /********************************************************************/
 	case 200:
 		// show phpInfo
-		if($modx->hasPermission('logs')) {
-			include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-			include_once(includeFileProcessor("actions/phpinfo.static.php",$manager_theme));
-			include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		if ($modx->hasPermission('logs')) {
+			include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+			include_once(includeFileProcessor("actions/phpinfo.static.php", $manager_theme));
+			include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 		}
 	break;
 /********************************************************************/
@@ -670,320 +670,320 @@ 
 /********************************************************************/
 	case 29:
 		// get the error page
-		include_once(includeFileProcessor("actions/error_dialog.static.php",$manager_theme));
+		include_once(includeFileProcessor("actions/error_dialog.static.php", $manager_theme));
 	break;
 /********************************************************************/
 /* file manager                                                     */
 /********************************************************************/
 	case 31:
 		// get the page to manage files
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/files.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/files.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* access permissions                                               */
 /********************************************************************/
 	case 40:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/access_permissions.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/access_permissions.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 91:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* access groups processor                                          */
 /********************************************************************/
 	case 41:
-		include_once(includeFileProcessor("processors/access_groups.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/access_groups.processor.php", $manager_theme));
 	break;
 	case 92:
-		include_once(includeFileProcessor("processors/web_access_groups.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/web_access_groups.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* settings editor                                                  */
 /********************************************************************/
 	case 17:
 		// get the settings editor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_settings.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_settings.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 118:
 		// call settings ajax include
 		ob_clean();
-		include_once(includeFileProcessor("includes/mutate_settings.ajax.php",$manager_theme));
+		include_once(includeFileProcessor("includes/mutate_settings.ajax.php", $manager_theme));
 	break;
 /********************************************************************/
 /* save settings                                                    */
 /********************************************************************/
 	case 30:
 		// get the save settings processor
-		include_once(includeFileProcessor("processors/save_settings.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_settings.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* system information                                               */
 /********************************************************************/
 	case 53:
 		// get the settings editor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/sysinfo.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/sysinfo.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* optimise table                                               */
 /********************************************************************/
 	case 54:
 		// get the table optimizer/truncate processor
-		include_once(includeFileProcessor("processors/optimize_table.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/optimize_table.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* view logging                                                     */
 /********************************************************************/
 	case 13:
 		// view logging
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/logging.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/logging.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* empty logs                                                       */
 /********************************************************************/
 	case 55:
 		// get the settings editor
-		include_once(includeFileProcessor("processors/empty_table.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/empty_table.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* calls test page                                                      */
 /********************************************************************/
 	case 999:
 		// get the test page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("test_page.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("test_page.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Empty recycle bin                                                */
 /********************************************************************/
 	case 64:
 		// get the Recycle bin emptier
-		include_once(includeFileProcessor("processors/remove_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/remove_content.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Messages                                                     */
 /********************************************************************/
 	case 10:
 		// get the messages page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/messages.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/messages.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Delete a message                                                 */
 /********************************************************************/
 	case 65:
 		// get the message deleter
-		include_once(includeFileProcessor("processors/delete_message.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_message.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Send a message                                                   */
 /********************************************************************/
 	case 66:
 		// get the message deleter
-		include_once(includeFileProcessor("processors/send_message.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/send_message.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Remove locks                                                 */
 /********************************************************************/
 	case 67:
 		// get the lock remover
-		include_once(includeFileProcessor("processors/remove_locks.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/remove_locks.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Site schedule                                                    */
 /********************************************************************/
 	case 70:
 		// get the schedule page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/site_schedule.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/site_schedule.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Search                                                           */
 /********************************************************************/
 	case 71:
 		// get the search page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/search.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/search.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* About                                                            */
 /********************************************************************/
 	case 59:
 		// get the about page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/about.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/about.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Add weblink                                                          */
 /********************************************************************/
 	case 72:
 		// get the weblink page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_content.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* User management                                                  */
 /********************************************************************/
 	case 75:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/user_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/user_management.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 99:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/web_user_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/web_user_management.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 86:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/role_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/role_management.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* template/ snippet management                                                 */
 /********************************************************************/
 	case 76:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/resources.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/resources.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Export to file                                                   */
 /********************************************************************/
 	case 83:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/export_site.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/export_site.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Resource Selector                                                    */
 /********************************************************************/
 	case 84:
-		include_once(includeFileProcessor("actions/resource_selector.static.php",$manager_theme));
+		include_once(includeFileProcessor("actions/resource_selector.static.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Backup Manager                                                   */
 /********************************************************************/
 	case 93:
 		# header and footer will be handled interally
-		include_once(includeFileProcessor("actions/bkmanager.static.php",$manager_theme));
+		include_once(includeFileProcessor("actions/bkmanager.static.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Duplicate Document                                                   */
 /********************************************************************/
 	case 94:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_content.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Import Document from file                                        */
 /********************************************************************/
 	case 95:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/import_site.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/import_site.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Help                                                             */
 /********************************************************************/
 	case 9:
 		// get the help page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/help.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/help.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Template Variables - Based on Apodigm's Docvars                  */
 /********************************************************************/
 	case 300:
 		// get the new document variable action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 301:
 		// get the edit document variable action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 302:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_tmplvars.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_tmplvars.processor.php", $manager_theme));
 	break;
 	case 303:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_tmplvars.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_tmplvars.processor.php", $manager_theme));
 	break;
 	case 304:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php", $manager_theme));
 	break;
 	case 305:
 		// get the tv-rank action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Event viewer: show event message log                             */
 /********************************************************************/
 	case 114:
 		// get event logs
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/eventlog.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/eventlog.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 115:
 		// get event log details viewer
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/eventlog_details.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/eventlog_details.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 116:
 		// get the event log delete processor
-		include_once(includeFileProcessor("processors/delete_eventlog.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_eventlog.processor.php", $manager_theme));
 	break;
 
 	case 501:
 		//delete category
-		include_once(includeFileProcessor("processors/delete_category.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_category.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* default action: show not implemented message                     */
 /********************************************************************/
 	default :
 		// say that what was requested doesn't do anything yet
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
 		echo "
 			<div class='sectionHeader'>".$_lang['functionnotimpl']."</div>
 			<div class='sectionBody'>
 				<p>".$_lang['functionnotimpl_message']."</p>
 			</div>
 		";
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 }
 
 /********************************************************************/
 // log action, unless it's a frame request
-if($action!=1 && $action!=7 && $action!=2) {
+if ($action != 1 && $action != 7 && $action != 2) {
 	include_once "log.class.inc.php";
 	$log = new logHandler;
 	$log->initAndWriteLog();

Braces +37 added lines, -18 removed lines

@@ -61,9 +61,13 @@ 
 $mgr_dir   = substr($self_dir,strrpos($self_dir,'/')+1);
 $base_path = str_replace($mgr_dir . '/index.php','',$self);
 $site_mgr_path = $base_path . 'assets/cache/siteManager.php';
-if(is_file($site_mgr_path)) include_once($site_mgr_path);
+if(is_file($site_mgr_path)) {
+    include_once($site_mgr_path);
+}
 $site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php';
-if(is_file($site_hostnames_path)) include_once($site_hostnames_path);
+if(is_file($site_hostnames_path)) {
+    include_once($site_hostnames_path);
+}
 if(!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) {
 	$src = "<?php\n";
 	$src .= "define('MGR_DIR', '{$mgr_dir}');\n";
@@ -117,9 +121,15 @@ 
 $incPath = str_replace("\\","/",dirname(__FILE__)."/includes/"); // Mod by Raymond
 set_include_path(get_include_path() . PATH_SEPARATOR . $incPath);
 
-if (!defined("ENT_COMPAT")) define("ENT_COMPAT", 2);
-if (!defined("ENT_NOQUOTES")) define("ENT_NOQUOTES", 0);
-if (!defined("ENT_QUOTES")) define("ENT_QUOTES", 3);
+if (!defined("ENT_COMPAT")) {
+    define("ENT_COMPAT", 2);
+}
+if (!defined("ENT_NOQUOTES")) {
+    define("ENT_NOQUOTES", 0);
+}
+if (!defined("ENT_QUOTES")) {
+    define("ENT_QUOTES", 3);
+}
 
 // set the document_root :|
 if(!isset($_SERVER["DOCUMENT_ROOT"]) || empty($_SERVER["DOCUMENT_ROOT"])) {
@@ -182,10 +192,11 @@ 
 
 $s = array('[+MGR_DIR+]');
 $r = array(MGR_DIR);
-foreach($_lang as $k=>$v)
-{
-	if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
-}
+foreach($_lang as $k=>$v) {
+	if(strpos($v,'[+')!==false) {
+	    $_lang[$k] = str_replace($s, $r, $v);
+	}
+	}
 
 // send the charset header
 header('Content-Type: text/html; charset='.$modx_manager_charset);
@@ -198,7 +209,7 @@ 
 include_once "accesscontrol.inc.php";
 
 // double check the session
-if(!isset($_SESSION['mgrValidated'])){
+if(!isset($_SESSION['mgrValidated'])) {
 	echo "Not Logged In!";
 	exit;
 }
@@ -215,7 +226,9 @@ 
 }
 
 // Initialize System Alert Message Queque
-if (!isset($_SESSION['SystemAlertMsgQueque'])) $_SESSION['SystemAlertMsgQueque'] = array();
+if (!isset($_SESSION['SystemAlertMsgQueque'])) {
+    $_SESSION['SystemAlertMsgQueque'] = array();
+}
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
 // first we check to see if this is a frameset request
@@ -223,7 +236,7 @@ 
 	// this looks to be a top-level frameset request, so let's serve up a frameset
 	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
 		include_once "media/style/".$manager_theme."/frames/1.php";
-	}else{
+	} else {
 		include_once "frames/1.php";
 	}
 	exit;
@@ -231,10 +244,15 @@ 
 
 // OK, let's retrieve the action directive from the request
 $option = array('min_range'=>1,'max_range'=>2000);
-if(isset($_GET['a']) && isset($_POST['a'])) $modx->webAlertAndQuit($_lang['error_double_action']);
-elseif(isset($_GET['a']))  $action = filter_input(INPUT_GET, 'a',FILTER_VALIDATE_INT,$option);
-elseif(isset($_POST['a'])) $action = filter_input(INPUT_POST,'a',FILTER_VALIDATE_INT,$option);
-else                       $action = null;
+if(isset($_GET['a']) && isset($_POST['a'])) {
+    $modx->webAlertAndQuit($_lang['error_double_action']);
+} elseif(isset($_GET['a'])) {
+    $action = filter_input(INPUT_GET, 'a',FILTER_VALIDATE_INT,$option);
+} elseif(isset($_POST['a'])) {
+    $action = filter_input(INPUT_POST,'a',FILTER_VALIDATE_INT,$option);
+} else {
+    $action = null;
+}
 
 if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) {
 	include_once 'messageCount.inc.php';
@@ -264,11 +282,12 @@ 
 $modx->invokeEvent("OnManagerPageInit", array("action" => $action));
 
 // return element filepath
-function includeFileProcessor ($filepath,$manager_theme) {
+function includeFileProcessor ($filepath,$manager_theme)
+{
 	$element = "";
 	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
 		$element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
-	}else{
+	} else {
 		$element = $filepath;
 	}
 	return $element;

manager/includes/accesscontrol.inc.php

Indentation +169 added lines, -169 removed lines

@@ -1,193 +1,193 @@
 <?php
 if(IN_MANAGER_MODE != "true") {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    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'])) {
-	header('HTTP/1.0 404 Not Found');
-	exit;
+    header('HTTP/1.0 404 Not Found');
+    exit;
 }
 
 if(isset($_SESSION['mgrValidated']) && $_SESSION['usertype'] != 'manager') {
-	//		if (isset($_COOKIE[session_name()])) {
-	//			setcookie(session_name(), '', 0, MODX_BASE_URL);
-	//		}
-	@session_destroy();
-	// start session
-	//	    startCMSSession();
+    //		if (isset($_COOKIE[session_name()])) {
+    //			setcookie(session_name(), '', 0, MODX_BASE_URL);
+    //		}
+    @session_destroy();
+    // start session
+    //	    startCMSSession();
 }
 
 // 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
-			unset($installStartTime);
-			@ 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()])) {
-					session_unset();
-					@session_destroy();
-					//					setcookie(session_name(), '', 0, MODX_BASE_URL);
-				}
-				$installGoingOn = 1;
-			}
-		}
-	}
+    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');
+        } else {
+            if($_SERVER['REQUEST_METHOD'] != 'POST') {
+                if(isset($_COOKIE[session_name()])) {
+                    session_unset();
+                    @session_destroy();
+                    //					setcookie(session_name(), '', 0, MODX_BASE_URL);
+                }
+                $installGoingOn = 1;
+            }
+        }
+    }
 }
 
 // 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()])) {
-						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');
-				}
-			}
-		}
-	}
+    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');
+                }
+            }
+        }
+    }
 }
 
 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";
-	} else {
-		include_once "lang/english.inc.php";
-	}
-
-	$modx->setPlaceholder('modx_charset', $modx_manager_charset);
-	$modx->setPlaceholder('theme', $manager_theme);
+    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";
+    } 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'));
 
-	// invoke OnManagerLoginFormPrerender event
-	$evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
-	$html = is_array($evtOut) ? implode('', $evtOut) : '';
-	$modx->setPlaceholder('OnManagerLoginFormPrerender', $html);
-
-	$modx->setPlaceholder('site_name', $site_name);
-	$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('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'])) {
-		$installGoingOn = $_GET['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>");
-				break;
-			case 2 :
-				$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) {
-		$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="" />');
-	}
-
-	// login info
-	$uid = isset($_COOKIE['modx_remember_manager']) ? preg_replace('/[^a-zA-Z0-9\-_@\.]*/', '', $_COOKIE['modx_remember_manager']) : '';
-	$modx->setPlaceholder('uid', $uid);
-	$modx->setPlaceholder('username', $_lang["username"]);
-	$modx->setPlaceholder('password', $_lang["password"]);
-
-	// remember me
-	$html = isset($_COOKIE['modx_remember_manager']) ? 'checked="checked"' : '';
-	$modx->setPlaceholder('remember_me', $html);
-	$modx->setPlaceholder('remember_username', $_lang["remember_username"]);
-	$modx->setPlaceholder('login_button', $_lang["login_button"]);
-
-	// invoke OnManagerLoginFormRender event
-	$evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
-	$html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
-	$modx->setPlaceholder('OnManagerLoginFormRender', $html);
-
-	// load template
-	$target = $modx->getConfig('manager_login_tpl');
-	$target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
-	$target = $modx->mergeSettingsContent($target);
-
-	$login_tpl = null;
-	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') {
-			$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');
-		}
-		$chunk = $modx->getChunk($target);
-		if($chunk !== false && !empty($chunk)) {
-			$login_tpl = $chunk;
-		} elseif(is_file(MODX_BASE_PATH . $target)) {
-			$target = MODX_BASE_PATH . $target;
-			$login_tpl = file_get_contents($target);
-		} elseif(is_file($target)) {
-			$login_tpl = file_get_contents($target);
-		} 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';
-			$login_tpl = file_get_contents($target);
-		} 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';
-			$login_tpl = file_get_contents($target);
-		}
-	}
-
-	// merge placeholders
-	$login_tpl = $modx->mergePlaceholderContent($login_tpl);
-	$regx = strpos($login_tpl, '[[+') !== false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
-	$login_tpl = preg_replace($regx, '', $login_tpl); //cleanup
-
-	echo $login_tpl;
-
-	exit;
+    // invoke OnManagerLoginFormPrerender event
+    $evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
+    $html = is_array($evtOut) ? implode('', $evtOut) : '';
+    $modx->setPlaceholder('OnManagerLoginFormPrerender', $html);
+
+    $modx->setPlaceholder('site_name', $site_name);
+    $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('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'])) {
+        $installGoingOn = $_GET['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>");
+                break;
+            case 2 :
+                $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) {
+        $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="" />');
+    }
+
+    // login info
+    $uid = isset($_COOKIE['modx_remember_manager']) ? preg_replace('/[^a-zA-Z0-9\-_@\.]*/', '', $_COOKIE['modx_remember_manager']) : '';
+    $modx->setPlaceholder('uid', $uid);
+    $modx->setPlaceholder('username', $_lang["username"]);
+    $modx->setPlaceholder('password', $_lang["password"]);
+
+    // remember me
+    $html = isset($_COOKIE['modx_remember_manager']) ? 'checked="checked"' : '';
+    $modx->setPlaceholder('remember_me', $html);
+    $modx->setPlaceholder('remember_username', $_lang["remember_username"]);
+    $modx->setPlaceholder('login_button', $_lang["login_button"]);
+
+    // invoke OnManagerLoginFormRender event
+    $evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
+    $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
+    $modx->setPlaceholder('OnManagerLoginFormRender', $html);
+
+    // load template
+    $target = $modx->getConfig('manager_login_tpl');
+    $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
+    $target = $modx->mergeSettingsContent($target);
+
+    $login_tpl = null;
+    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') {
+            $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');
+        }
+        $chunk = $modx->getChunk($target);
+        if($chunk !== false && !empty($chunk)) {
+            $login_tpl = $chunk;
+        } elseif(is_file(MODX_BASE_PATH . $target)) {
+            $target = MODX_BASE_PATH . $target;
+            $login_tpl = file_get_contents($target);
+        } elseif(is_file($target)) {
+            $login_tpl = file_get_contents($target);
+        } 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';
+            $login_tpl = file_get_contents($target);
+        } 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';
+            $login_tpl = file_get_contents($target);
+        }
+    }
+
+    // merge placeholders
+    $login_tpl = $modx->mergePlaceholderContent($login_tpl);
+    $regx = strpos($login_tpl, '[[+') !== false ? '~\[\[\+(.*?)\]\]~' : '~\[\+(.*?)\+\]~'; // little tweak for newer parsers
+    $login_tpl = preg_replace($regx, '', $login_tpl); //cleanup
+
+    echo $login_tpl;
+
+    exit;
 
 } else {
-	// Update table active_user_sessions
-	$modx->updateValidatedUserSession();
-
-	// Update last action in table active_users
-	$itemid = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';
-	$lasthittime = time();
-	$action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
-
-	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
-			, session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string) $action, $itemid == null ? var_export(null, true) : $itemid);
-		$modx->db->query($sql);
-	}
+    // Update table active_user_sessions
+    $modx->updateValidatedUserSession();
+
+    // Update last action in table active_users
+    $itemid = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';
+    $lasthittime = time();
+    $action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
+
+    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
+            , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string) $action, $itemid == null ? var_export(null, true) : $itemid);
+        $modx->db->query($sql);
+    }
 }

Spacing +51 added lines, -51 removed lines

@@ -1,14 +1,14 @@ 
 <?php
-if(IN_MANAGER_MODE != "true") {
+if (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

Braces +4 added lines, -2 removed lines

@@ -21,7 +21,8 @@ 
 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((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');
@@ -155,7 +156,8 @@ 
 		} 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
+		} elseif(is_file($theme_path . 'html/login.html')) {
+// ClipperCMS compatible
 			$target = $theme_path . 'html/login.html';
 			$login_tpl = file_get_contents($target);
 		} else {

manager/includes/tmplvars.format.inc.php

Indentation +324 added lines, -324 removed lines

@@ -7,364 +7,364 @@
 // Added by Raymond 20-Jan-2005
 function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '') {
 
-	global $modx;
+    global $modx;
 
-	// process any TV commands in value
-	$docid = intval($docid) ? intval($docid) : $modx->documentIdentifier;
-	$value = ProcessTVCommand($value, $name, $docid);
+    // process any TV commands in value
+    $docid = intval($docid) ? intval($docid) : $modx->documentIdentifier;
+    $value = ProcessTVCommand($value, $name, $docid);
 
-	$params = array();
-	if($paramstring) {
-		$cp = explode("&", $paramstring);
-		foreach($cp as $p => $v) {
-			$v = trim($v); // trim
-			$ar = explode("=", $v);
-			if(is_array($ar) && count($ar) == 2) {
-				$params[$ar[0]] = decodeParamValue($ar[1]);
-			}
-		}
-	}
+    $params = array();
+    if($paramstring) {
+        $cp = explode("&", $paramstring);
+        foreach($cp as $p => $v) {
+            $v = trim($v); // trim
+            $ar = explode("=", $v);
+            if(is_array($ar) && count($ar) == 2) {
+                $params[$ar[0]] = decodeParamValue($ar[1]);
+            }
+        }
+    }
 
-	$id = "tv$name";
-	switch($format) {
-		case 'image':
-			$images = parseInput($value, '||', 'array');
-			$o = '';
-			foreach($images as $image) {
-				if(!is_array($image)) {
-					$image = explode('==', $image);
-				}
-				$src = $image[0];
+    $id = "tv$name";
+    switch($format) {
+        case 'image':
+            $images = parseInput($value, '||', 'array');
+            $o = '';
+            foreach($images as $image) {
+                if(!is_array($image)) {
+                    $image = explode('==', $image);
+                }
+                $src = $image[0];
 
-				if($src) {
-					// We have a valid source
-					$attributes = '';
-					$attr = array(
-						'class' => $params['class'],
-						'src' => $src,
-						'id' => ($params['id'] ? $params['id'] : ''),
-						'alt' => $modx->htmlspecialchars($params['alttext']),
-						'style' => $params['style']
-					);
-					if(isset($params['align']) && $params['align'] != 'none') {
-						$attr['align'] = $params['align'];
-					}
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib'];
+                if($src) {
+                    // We have a valid source
+                    $attributes = '';
+                    $attr = array(
+                        'class' => $params['class'],
+                        'src' => $src,
+                        'id' => ($params['id'] ? $params['id'] : ''),
+                        'alt' => $modx->htmlspecialchars($params['alttext']),
+                        'style' => $params['style']
+                    );
+                    if(isset($params['align']) && $params['align'] != 'none') {
+                        $attr['align'] = $params['align'];
+                    }
+                    foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                    $attributes .= ' ' . $params['attrib'];
 
-					// Output the image with attributes
-					$o .= '<img' . rtrim($attributes) . ' />';
-				}
-			}
-			break;
+                    // Output the image with attributes
+                    $o .= '<img' . rtrim($attributes) . ' />';
+                }
+            }
+            break;
 
-		case "delim":    // display as delimitted list
-			$value = parseInput($value, "||");
-			$p = $params['format'] ? $params['format'] : " ";
-			if($p == "\\n") {
-				$p = "\n";
-			}
-			$o = str_replace("||", $p, $value);
-			break;
+        case "delim":    // display as delimitted list
+            $value = parseInput($value, "||");
+            $p = $params['format'] ? $params['format'] : " ";
+            if($p == "\\n") {
+                $p = "\n";
+            }
+            $o = str_replace("||", $p, $value);
+            break;
 
-		case "string":
-			$value = parseInput($value);
-			$format = strtolower($params['format']);
-			if($format == 'upper case') {
-				$o = strtoupper($value);
-			} else if($format == 'lower case') {
-				$o = strtolower($value);
-			} else if($format == 'sentence case') {
-				$o = ucfirst($value);
-			} else if($format == 'capitalize') {
-				$o = ucwords($value);
-			} else {
-				$o = $value;
-			}
-			break;
+        case "string":
+            $value = parseInput($value);
+            $format = strtolower($params['format']);
+            if($format == 'upper case') {
+                $o = strtoupper($value);
+            } else if($format == 'lower case') {
+                $o = strtolower($value);
+            } else if($format == 'sentence case') {
+                $o = ucfirst($value);
+            } else if($format == 'capitalize') {
+                $o = ucwords($value);
+            } else {
+                $o = $value;
+            }
+            break;
 
-		case "date":
-			if($value != '' || $params['default'] == 'Yes') {
-				if(empty($value)) {
-					$value = 'now';
-				}
-				$timestamp = getUnixtimeFromDateString($value);
-				$p = $params['format'] ? $params['format'] : "%A %d, %B %Y";
-				$o = strftime($p, $timestamp);
-			} else {
-				$value = '';
-			}
-			break;
+        case "date":
+            if($value != '' || $params['default'] == 'Yes') {
+                if(empty($value)) {
+                    $value = 'now';
+                }
+                $timestamp = getUnixtimeFromDateString($value);
+                $p = $params['format'] ? $params['format'] : "%A %d, %B %Y";
+                $o = strftime($p, $timestamp);
+            } else {
+                $value = '';
+            }
+            break;
 
-		case "hyperlink":
-			$value = parseInput($value, "||", "array");
-			$o = '';
-			for($i = 0; $i < count($value); $i++) {
-				list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]);
-				if(!$url) {
-					$url = $name;
-				}
-				if($url) {
-					if($o) {
-						$o .= '<br />';
-					}
-					$attributes = '';
-					// setup the link attributes
-					$attr = array(
-						'href' => $url,
-						'title' => $params['title'] ? $modx->htmlspecialchars($params['title']) : $name,
-						'class' => $params['class'],
-						'style' => $params['style'],
-						'target' => $params['target'],
-					);
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib']; // add extra
+        case "hyperlink":
+            $value = parseInput($value, "||", "array");
+            $o = '';
+            for($i = 0; $i < count($value); $i++) {
+                list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]);
+                if(!$url) {
+                    $url = $name;
+                }
+                if($url) {
+                    if($o) {
+                        $o .= '<br />';
+                    }
+                    $attributes = '';
+                    // setup the link attributes
+                    $attr = array(
+                        'href' => $url,
+                        'title' => $params['title'] ? $modx->htmlspecialchars($params['title']) : $name,
+                        'class' => $params['class'],
+                        'style' => $params['style'],
+                        'target' => $params['target'],
+                    );
+                    foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                    $attributes .= ' ' . $params['attrib']; // add extra
 
-					// Output the link
-					$o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
-				}
-			}
-			break;
+                    // Output the link
+                    $o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
+                }
+            }
+            break;
 
-		case "htmltag":
-			$value = parseInput($value, "||", "array");
-			$tagid = $params['tagid'];
-			$tagname = ($params['tagname']) ? $params['tagname'] : 'div';
-			$o = '';
-			// Loop through a list of tags
-			for($i = 0; $i < count($value); $i++) {
-				$tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i];
-				if(!$tagvalue) {
-					continue;
-				}
+        case "htmltag":
+            $value = parseInput($value, "||", "array");
+            $tagid = $params['tagid'];
+            $tagname = ($params['tagname']) ? $params['tagname'] : 'div';
+            $o = '';
+            // Loop through a list of tags
+            for($i = 0; $i < count($value); $i++) {
+                $tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i];
+                if(!$tagvalue) {
+                    continue;
+                }
 
-				$attributes = '';
-				$attr = array(
-					'id' => ($tagid ? $tagid : $id),
-					// 'tv' already added to id
-					'class' => $params['class'],
-					'style' => $params['style'],
-				);
-				foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-				$attributes .= ' ' . $params['attrib']; // add extra
+                $attributes = '';
+                $attr = array(
+                    'id' => ($tagid ? $tagid : $id),
+                    // 'tv' already added to id
+                    'class' => $params['class'],
+                    'style' => $params['style'],
+                );
+                foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+                $attributes .= ' ' . $params['attrib']; // add extra
 
-				// Output the HTML Tag
-				$o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
-			}
-			break;
+                // Output the HTML Tag
+                $o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
+            }
+            break;
 
-		case "richtext":
-			$value = parseInput($value);
-			$w = $params['w'] ? $params['w'] : '100%';
-			$h = $params['h'] ? $params['h'] : '400px';
-			$richtexteditor = $params['edt'] ? $params['edt'] : "";
-			$o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">';
-			$o .= $modx->htmlspecialchars($value);
-			$o .= '</textarea></div>';
-			$replace_richtext = array($id);
-			// setup editors
-			if(!empty($replace_richtext) && !empty($richtexteditor)) {
-				// invoke OnRichTextEditorInit event
-				$evtOut = $modx->invokeEvent("OnRichTextEditorInit", array(
-					'editor' => $richtexteditor,
-					'elements' => $replace_richtext,
-					'forfrontend' => 1,
-					'width' => $w,
-					'height' => $h
-				));
-				if(is_array($evtOut)) {
-					$o .= implode("", $evtOut);
-				}
-			}
-			break;
+        case "richtext":
+            $value = parseInput($value);
+            $w = $params['w'] ? $params['w'] : '100%';
+            $h = $params['h'] ? $params['h'] : '400px';
+            $richtexteditor = $params['edt'] ? $params['edt'] : "";
+            $o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">';
+            $o .= $modx->htmlspecialchars($value);
+            $o .= '</textarea></div>';
+            $replace_richtext = array($id);
+            // setup editors
+            if(!empty($replace_richtext) && !empty($richtexteditor)) {
+                // invoke OnRichTextEditorInit event
+                $evtOut = $modx->invokeEvent("OnRichTextEditorInit", array(
+                    'editor' => $richtexteditor,
+                    'elements' => $replace_richtext,
+                    'forfrontend' => 1,
+                    'width' => $w,
+                    'height' => $h
+                ));
+                if(is_array($evtOut)) {
+                    $o .= implode("", $evtOut);
+                }
+            }
+            break;
 
-		case "unixtime":
-			$value = parseInput($value);
-			$o = getUnixtimeFromDateString($value);
-			break;
+        case "unixtime":
+            $value = parseInput($value);
+            $o = getUnixtimeFromDateString($value);
+            break;
 
-		case "viewport":
-			$value = parseInput($value);
-			$id = '_' . time();
-			if(!$params['vpid']) {
-				$params['vpid'] = $id;
-			}
-			$sTag = "<iframe";
-			$eTag = "</iframe>";
-			$autoMode = "0";
-			$w = $params['width'];
-			$h = $params['height'];
-			if($params['stretch'] == 'Yes') {
-				$w = "100%";
-				$h = "100%";
-			}
-			if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
-				$autoMode = "3";  //both
-			} else if($params['awidth'] == 'Yes') {
-				$autoMode = "1"; //width only
-			} else if($params['aheight'] == 'Yes') {
-				$autoMode = "2";    //height only
-			}
+        case "viewport":
+            $value = parseInput($value);
+            $id = '_' . time();
+            if(!$params['vpid']) {
+                $params['vpid'] = $id;
+            }
+            $sTag = "<iframe";
+            $eTag = "</iframe>";
+            $autoMode = "0";
+            $w = $params['width'];
+            $h = $params['height'];
+            if($params['stretch'] == 'Yes') {
+                $w = "100%";
+                $h = "100%";
+            }
+            if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
+                $autoMode = "3";  //both
+            } else if($params['awidth'] == 'Yes') {
+                $autoMode = "1"; //width only
+            } else if($params['aheight'] == 'Yes') {
+                $autoMode = "2";    //height only
+            }
 
-			$modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array(
-				'name' => 'viewport',
-				'version' => '0',
-				'plaintext' => false
-			));
-			$o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' ";
-			if($params['class']) {
-				$o .= " class='" . $params['class'] . "' ";
-			}
-			if($params['style']) {
-				$o .= " style='" . $params['style'] . "' ";
-			}
-			if($params['attrib']) {
-				$o .= $params['attrib'] . " ";
-			}
-			$o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' ";
-			$o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' ";
-			$o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' ";
-			$o .= ">";
-			$o .= $eTag;
-			break;
+            $modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array(
+                'name' => 'viewport',
+                'version' => '0',
+                'plaintext' => false
+            ));
+            $o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' ";
+            if($params['class']) {
+                $o .= " class='" . $params['class'] . "' ";
+            }
+            if($params['style']) {
+                $o .= " style='" . $params['style'] . "' ";
+            }
+            if($params['attrib']) {
+                $o .= $params['attrib'] . " ";
+            }
+            $o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' ";
+            $o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' ";
+            $o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' ";
+            $o .= ">";
+            $o .= $eTag;
+            break;
 
-		case "datagrid":
-			include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
-			$grd = new DataGrid('', $value);
+        case "datagrid":
+            include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+            $grd = new DataGrid('', $value);
 
-			$grd->noRecordMsg = $params['egmsg'];
+            $grd->noRecordMsg = $params['egmsg'];
 
-			$grd->columnHeaderClass = $params['chdrc'];
-			$grd->cssClass = $params['tblc'];
-			$grd->itemClass = $params['itmc'];
-			$grd->altItemClass = $params['aitmc'];
+            $grd->columnHeaderClass = $params['chdrc'];
+            $grd->cssClass = $params['tblc'];
+            $grd->itemClass = $params['itmc'];
+            $grd->altItemClass = $params['aitmc'];
 
-			$grd->columnHeaderStyle = $params['chdrs'];
-			$grd->cssStyle = $params['tbls'];
-			$grd->itemStyle = $params['itms'];
-			$grd->altItemStyle = $params['aitms'];
+            $grd->columnHeaderStyle = $params['chdrs'];
+            $grd->cssStyle = $params['tbls'];
+            $grd->itemStyle = $params['itms'];
+            $grd->altItemStyle = $params['aitms'];
 
-			$grd->columns = $params['cols'];
-			$grd->fields = $params['flds'];
-			$grd->colWidths = $params['cwidth'];
-			$grd->colAligns = $params['calign'];
-			$grd->colColors = $params['ccolor'];
-			$grd->colTypes = $params['ctype'];
+            $grd->columns = $params['cols'];
+            $grd->fields = $params['flds'];
+            $grd->colWidths = $params['cwidth'];
+            $grd->colAligns = $params['calign'];
+            $grd->colColors = $params['ccolor'];
+            $grd->colTypes = $params['ctype'];
 
-			$grd->cellPadding = $params['cpad'];
-			$grd->cellSpacing = $params['cspace'];
-			$grd->header = $params['head'];
-			$grd->footer = $params['foot'];
-			$grd->pageSize = $params['psize'];
-			$grd->pagerLocation = $params['ploc'];
-			$grd->pagerClass = $params['pclass'];
-			$grd->pagerStyle = $params['pstyle'];
-			$o = $grd->render();
-			break;
+            $grd->cellPadding = $params['cpad'];
+            $grd->cellSpacing = $params['cspace'];
+            $grd->header = $params['head'];
+            $grd->footer = $params['foot'];
+            $grd->pageSize = $params['psize'];
+            $grd->pagerLocation = $params['ploc'];
+            $grd->pagerClass = $params['pclass'];
+            $grd->pagerStyle = $params['pstyle'];
+            $o = $grd->render();
+            break;
 
-		case 'htmlentities':
-			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
-				// remove delimiter from checkbox and listbox-multiple TVs
-				$value = str_replace('||', '', $value);
-			}
-			$o = htmlentities($value, ENT_NOQUOTES, $modx->config['modx_charset']);
-			break;
+        case 'htmlentities':
+            $value = parseInput($value);
+            if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+                // remove delimiter from checkbox and listbox-multiple TVs
+                $value = str_replace('||', '', $value);
+            }
+            $o = htmlentities($value, ENT_NOQUOTES, $modx->config['modx_charset']);
+            break;
 
-		case 'custom_widget':
-			$widget_output = '';
-			$o = '';
-			/* If we are loading a file */
-			if(substr($params['output'], 0, 5) == "@FILE") {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
-				} else {
-					$widget_output = file_get_contents($file_name);
-				}
-			} elseif(substr($params['output'], 0, 8) == '@INCLUDE') {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 9));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
-				} else {
-					/* The included file needs to set $widget_output. Can be string, array, object */
-					include $file_name;
-				}
-			} elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
-				$chunk_name = trim(substr($params['output'], 7));
-				$widget_output = $modx->getChunk($chunk_name);
-			} elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
-				$eval_str = trim(substr($params['output'], 6));
-				$widget_output = eval($eval_str);
-			} elseif($value !== '') {
-				$widget_output = $params['output'];
-			} else {
-				$widget_output = '';
-			}
-			if(is_string($widget_output)) {
-				$_ = $modx->config['enable_filter'];
-				$modx->config['enable_filter'] = 1;
-				$widget_output = $modx->parseText($widget_output, array('value' => $value));
-				$modx->config['enable_filter'] = $_;
-				$o = $modx->parseDocumentSource($widget_output);
-			} else {
-				$o = $widget_output;
-			}
-			break;
+        case 'custom_widget':
+            $widget_output = '';
+            $o = '';
+            /* If we are loading a file */
+            if(substr($params['output'], 0, 5) == "@FILE") {
+                $file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
+                if(!file_exists($file_name)) {
+                    $widget_output = $file_name . ' does not exist';
+                } else {
+                    $widget_output = file_get_contents($file_name);
+                }
+            } elseif(substr($params['output'], 0, 8) == '@INCLUDE') {
+                $file_name = MODX_BASE_PATH . trim(substr($params['output'], 9));
+                if(!file_exists($file_name)) {
+                    $widget_output = $file_name . ' does not exist';
+                } else {
+                    /* The included file needs to set $widget_output. Can be string, array, object */
+                    include $file_name;
+                }
+            } elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
+                $chunk_name = trim(substr($params['output'], 7));
+                $widget_output = $modx->getChunk($chunk_name);
+            } elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
+                $eval_str = trim(substr($params['output'], 6));
+                $widget_output = eval($eval_str);
+            } elseif($value !== '') {
+                $widget_output = $params['output'];
+            } else {
+                $widget_output = '';
+            }
+            if(is_string($widget_output)) {
+                $_ = $modx->config['enable_filter'];
+                $modx->config['enable_filter'] = 1;
+                $widget_output = $modx->parseText($widget_output, array('value' => $value));
+                $modx->config['enable_filter'] = $_;
+                $o = $modx->parseDocumentSource($widget_output);
+            } else {
+                $o = $widget_output;
+            }
+            break;
 
-		default:
-			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
-				// add separator
-				$value = explode('||', $value);
-				$value = implode($sep, $value);
-			}
-			$o = $value;
-			break;
-	}
-	return $o;
+        default:
+            $value = parseInput($value);
+            if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+                // add separator
+                $value = explode('||', $value);
+                $value = implode($sep, $value);
+            }
+            $o = $value;
+            break;
+    }
+    return $o;
 }
 
 function decodeParamValue($s) {
-	$s = str_replace("%3D", '=', $s); // =
-	$s = str_replace("%26", '&', $s); // &
-	return $s;
+    $s = str_replace("%3D", '=', $s); // =
+    $s = str_replace("%26", '&', $s); // &
+    return $s;
 }
 
 // returns an array if a delimiter is present. returns array is a recordset is present
 function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array
-	global $modx;
-	if($modx->db->isResult($src)) {
-		// must be a recordset
-		$rows = array();
-		while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
-		return ($type == "array") ? $rows : implode($delim, $rows);
-	} else {
-		// must be a text
-		if($type == "array") {
-			return explode($delim, $src);
-		} else {
-			return $src;
-		}
-	}
+    global $modx;
+    if($modx->db->isResult($src)) {
+        // must be a recordset
+        $rows = array();
+        while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
+        return ($type == "array") ? $rows : implode($delim, $rows);
+    } else {
+        // must be a text
+        if($type == "array") {
+            return explode($delim, $src);
+        } else {
+            return $src;
+        }
+    }
 }
 
 function getUnixtimeFromDateString($value) {
-	$timestamp = false;
-	// Check for MySQL or legacy style date
-	$date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
-	$date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
-	$matches = array();
-	if(strpos($value, '-') !== false) {
-		if(preg_match($date_match_1, $value, $matches)) {
-			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]);
-		} elseif(preg_match($date_match_2, $value, $matches)) {
-			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
-		}
-	}
-	// If those didn't work, use strtotime to figure out the date
-	if($timestamp === false || $timestamp === -1) {
-		$timestamp = strtotime($value);
-	}
-	return $timestamp;
+    $timestamp = false;
+    // Check for MySQL or legacy style date
+    $date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
+    $date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
+    $matches = array();
+    if(strpos($value, '-') !== false) {
+        if(preg_match($date_match_1, $value, $matches)) {
+            $timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]);
+        } elseif(preg_match($date_match_2, $value, $matches)) {
+            $timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
+        }
+    }
+    // If those didn't work, use strtotime to figure out the date
+    if($timestamp === false || $timestamp === -1) {
+        $timestamp = strtotime($value);
+    }
+    return $timestamp;
 }

Spacing +78 added lines, -78 removed lines

@@ -5,7 +5,7 @@ 
  */
 
 // Added by Raymond 20-Jan-2005
-function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '') {
+function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = ''){
 
 	global $modx;
 
@@ -14,29 +14,29 @@ 
 	$value = ProcessTVCommand($value, $name, $docid);
 
 	$params = array();
-	if($paramstring) {
+	if ($paramstring) {
 		$cp = explode("&", $paramstring);
-		foreach($cp as $p => $v) {
+		foreach ($cp as $p => $v) {
 			$v = trim($v); // trim
 			$ar = explode("=", $v);
-			if(is_array($ar) && count($ar) == 2) {
+			if (is_array($ar) && count($ar) == 2) {
 				$params[$ar[0]] = decodeParamValue($ar[1]);
 			}
 		}
 	}
 
 	$id = "tv$name";
-	switch($format) {
+	switch ($format) {
 		case 'image':
 			$images = parseInput($value, '||', 'array');
 			$o = '';
-			foreach($images as $image) {
-				if(!is_array($image)) {
+			foreach ($images as $image) {
+				if (!is_array($image)) {
 					$image = explode('==', $image);
 				}
 				$src = $image[0];
 
-				if($src) {
+				if ($src) {
 					// We have a valid source
 					$attributes = '';
 					$attr = array(
@@ -46,14 +46,14 @@ 
 						'alt' => $modx->htmlspecialchars($params['alttext']),
 						'style' => $params['style']
 					);
-					if(isset($params['align']) && $params['align'] != 'none') {
+					if (isset($params['align']) && $params['align'] != 'none') {
 						$attr['align'] = $params['align'];
 					}
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib'];
+					foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+					$attributes .= ' '.$params['attrib'];
 
 					// Output the image with attributes
-					$o .= '<img' . rtrim($attributes) . ' />';
+					$o .= '<img'.rtrim($attributes).' />';
 				}
 			}
 			break;
@@ -61,7 +61,7 @@ 
 		case "delim":    // display as delimitted list
 			$value = parseInput($value, "||");
 			$p = $params['format'] ? $params['format'] : " ";
-			if($p == "\\n") {
+			if ($p == "\\n") {
 				$p = "\n";
 			}
 			$o = str_replace("||", $p, $value);
@@ -70,13 +70,13 @@ 
 		case "string":
 			$value = parseInput($value);
 			$format = strtolower($params['format']);
-			if($format == 'upper case') {
+			if ($format == 'upper case') {
 				$o = strtoupper($value);
-			} else if($format == 'lower case') {
+			} else if ($format == 'lower case') {
 				$o = strtolower($value);
-			} else if($format == 'sentence case') {
+			} else if ($format == 'sentence case') {
 				$o = ucfirst($value);
-			} else if($format == 'capitalize') {
+			} else if ($format == 'capitalize') {
 				$o = ucwords($value);
 			} else {
 				$o = $value;
@@ -84,8 +84,8 @@ 
 			break;
 
 		case "date":
-			if($value != '' || $params['default'] == 'Yes') {
-				if(empty($value)) {
+			if ($value != '' || $params['default'] == 'Yes') {
+				if (empty($value)) {
 					$value = 'now';
 				}
 				$timestamp = getUnixtimeFromDateString($value);
@@ -99,13 +99,13 @@ 
 		case "hyperlink":
 			$value = parseInput($value, "||", "array");
 			$o = '';
-			for($i = 0; $i < count($value); $i++) {
+			for ($i = 0; $i < count($value); $i++) {
 				list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]);
-				if(!$url) {
+				if (!$url) {
 					$url = $name;
 				}
-				if($url) {
-					if($o) {
+				if ($url) {
+					if ($o) {
 						$o .= '<br />';
 					}
 					$attributes = '';
@@ -117,11 +117,11 @@ 
 						'style' => $params['style'],
 						'target' => $params['target'],
 					);
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib']; // add extra
+					foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+					$attributes .= ' '.$params['attrib']; // add extra
 
 					// Output the link
-					$o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
+					$o .= '<a'.rtrim($attributes).'>'.($params['text'] ? $modx->htmlspecialchars($params['text']) : $name).'</a>';
 				}
 			}
 			break;
@@ -132,9 +132,9 @@ 
 			$tagname = ($params['tagname']) ? $params['tagname'] : 'div';
 			$o = '';
 			// Loop through a list of tags
-			for($i = 0; $i < count($value); $i++) {
+			for ($i = 0; $i < count($value); $i++) {
 				$tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i];
-				if(!$tagvalue) {
+				if (!$tagvalue) {
 					continue;
 				}
 
@@ -145,11 +145,11 @@ 
 					'class' => $params['class'],
 					'style' => $params['style'],
 				);
-				foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-				$attributes .= ' ' . $params['attrib']; // add extra
+				foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+				$attributes .= ' '.$params['attrib']; // add extra
 
 				// Output the HTML Tag
-				$o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
+				$o .= '<'.$tagname.rtrim($attributes).'>'.$tagvalue.'</'.$tagname.'>';
 			}
 			break;
 
@@ -158,12 +158,12 @@ 
 			$w = $params['w'] ? $params['w'] : '100%';
 			$h = $params['h'] ? $params['h'] : '400px';
 			$richtexteditor = $params['edt'] ? $params['edt'] : "";
-			$o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">';
+			$o = '<div class="MODX_RichTextWidget"><textarea id="'.$id.'" name="'.$id.'" style="width:'.$w.'; height:'.$h.';">';
 			$o .= $modx->htmlspecialchars($value);
 			$o .= '</textarea></div>';
 			$replace_richtext = array($id);
 			// setup editors
-			if(!empty($replace_richtext) && !empty($richtexteditor)) {
+			if (!empty($replace_richtext) && !empty($richtexteditor)) {
 				// invoke OnRichTextEditorInit event
 				$evtOut = $modx->invokeEvent("OnRichTextEditorInit", array(
 					'editor' => $richtexteditor,
@@ -172,7 +172,7 @@ 
 					'width' => $w,
 					'height' => $h
 				));
-				if(is_array($evtOut)) {
+				if (is_array($evtOut)) {
 					$o .= implode("", $evtOut);
 				}
 			}
@@ -185,8 +185,8 @@ 
 
 		case "viewport":
 			$value = parseInput($value);
-			$id = '_' . time();
-			if(!$params['vpid']) {
+			$id = '_'.time();
+			if (!$params['vpid']) {
 				$params['vpid'] = $id;
 			}
 			$sTag = "<iframe";
@@ -194,42 +194,42 @@ 
 			$autoMode = "0";
 			$w = $params['width'];
 			$h = $params['height'];
-			if($params['stretch'] == 'Yes') {
+			if ($params['stretch'] == 'Yes') {
 				$w = "100%";
 				$h = "100%";
 			}
-			if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
-				$autoMode = "3";  //both
-			} else if($params['awidth'] == 'Yes') {
+			if ($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
+				$autoMode = "3"; //both
+			} else if ($params['awidth'] == 'Yes') {
 				$autoMode = "1"; //width only
-			} else if($params['aheight'] == 'Yes') {
-				$autoMode = "2";    //height only
+			} else if ($params['aheight'] == 'Yes') {
+				$autoMode = "2"; //height only
 			}
 
-			$modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array(
+			$modx->regClientStartupScript(MODX_MANAGER_URL."media/script/bin/viewport.js", array(
 				'name' => 'viewport',
 				'version' => '0',
 				'plaintext' => false
 			));
-			$o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' ";
-			if($params['class']) {
-				$o .= " class='" . $params['class'] . "' ";
+			$o = $sTag." id='".$params['vpid']."' name='".$params['vpid']."' ";
+			if ($params['class']) {
+				$o .= " class='".$params['class']."' ";
 			}
-			if($params['style']) {
-				$o .= " style='" . $params['style'] . "' ";
+			if ($params['style']) {
+				$o .= " style='".$params['style']."' ";
 			}
-			if($params['attrib']) {
-				$o .= $params['attrib'] . " ";
+			if ($params['attrib']) {
+				$o .= $params['attrib']." ";
 			}
-			$o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' ";
-			$o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' ";
-			$o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' ";
+			$o .= "scrolling='".($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto"))."' ";
+			$o .= "src='".$value."' frameborder='".$params['borsize']."' ";
+			$o .= "onload=\"window.setTimeout('ResizeViewPort(\\'".$params['vpid']."\\',".$autoMode.")',100);\" width='".$w."' height='".$h."' ";
 			$o .= ">";
 			$o .= $eTag;
 			break;
 
 		case "datagrid":
-			include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+			include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
 			$grd = new DataGrid('', $value);
 
 			$grd->noRecordMsg = $params['egmsg'];
@@ -264,7 +264,7 @@ 
 
 		case 'htmlentities':
 			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+			if ($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
 				// remove delimiter from checkbox and listbox-multiple TVs
 				$value = str_replace('||', '', $value);
 			}
@@ -275,33 +275,33 @@ 
 			$widget_output = '';
 			$o = '';
 			/* If we are loading a file */
-			if(substr($params['output'], 0, 5) == "@FILE") {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
+			if (substr($params['output'], 0, 5) == "@FILE") {
+				$file_name = MODX_BASE_PATH.trim(substr($params['output'], 6));
+				if (!file_exists($file_name)) {
+					$widget_output = $file_name.' does not exist';
 				} else {
 					$widget_output = file_get_contents($file_name);
 				}
-			} elseif(substr($params['output'], 0, 8) == '@INCLUDE') {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 9));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
+			} elseif (substr($params['output'], 0, 8) == '@INCLUDE') {
+				$file_name = MODX_BASE_PATH.trim(substr($params['output'], 9));
+				if (!file_exists($file_name)) {
+					$widget_output = $file_name.' does not exist';
 				} else {
 					/* The included file needs to set $widget_output. Can be string, array, object */
 					include $file_name;
 				}
-			} elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
+			} elseif (substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
 				$chunk_name = trim(substr($params['output'], 7));
 				$widget_output = $modx->getChunk($chunk_name);
-			} elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
+			} elseif (substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
 				$eval_str = trim(substr($params['output'], 6));
 				$widget_output = eval($eval_str);
-			} elseif($value !== '') {
+			} elseif ($value !== '') {
 				$widget_output = $params['output'];
 			} else {
 				$widget_output = '';
 			}
-			if(is_string($widget_output)) {
+			if (is_string($widget_output)) {
 				$_ = $modx->config['enable_filter'];
 				$modx->config['enable_filter'] = 1;
 				$widget_output = $modx->parseText($widget_output, array('value' => $value));
@@ -314,7 +314,7 @@ 
 
 		default:
 			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+			if ($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
 				// add separator
 				$value = explode('||', $value);
 				$value = implode($sep, $value);
@@ -325,23 +325,23 @@ 
 	return $o;
 }
 
-function decodeParamValue($s) {
+function decodeParamValue($s){
 	$s = str_replace("%3D", '=', $s); // =
 	$s = str_replace("%26", '&', $s); // &
 	return $s;
 }
 
 // returns an array if a delimiter is present. returns array is a recordset is present
-function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array
+function parseInput($src, $delim = "||", $type = "string", $columns = true){ // type can be: string, array
 	global $modx;
-	if($modx->db->isResult($src)) {
+	if ($modx->db->isResult($src)) {
 		// must be a recordset
 		$rows = array();
-		while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		while ($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
 		return ($type == "array") ? $rows : implode($delim, $rows);
 	} else {
 		// must be a text
-		if($type == "array") {
+		if ($type == "array") {
 			return explode($delim, $src);
 		} else {
 			return $src;
@@ -349,21 +349,21 @@ 
 	}
 }
 
-function getUnixtimeFromDateString($value) {
+function getUnixtimeFromDateString($value){
 	$timestamp = false;
 	// Check for MySQL or legacy style date
 	$date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
 	$date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
 	$matches = array();
-	if(strpos($value, '-') !== false) {
-		if(preg_match($date_match_1, $value, $matches)) {
+	if (strpos($value, '-') !== false) {
+		if (preg_match($date_match_1, $value, $matches)) {
 			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]);
-		} elseif(preg_match($date_match_2, $value, $matches)) {
+		} elseif (preg_match($date_match_2, $value, $matches)) {
 			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
 		}
 	}
 	// If those didn't work, use strtotime to figure out the date
-	if($timestamp === false || $timestamp === -1) {
+	if ($timestamp === false || $timestamp === -1) {
 		$timestamp = strtotime($value);
 	}
 	return $timestamp;

Braces +21 added lines, -8 removed lines

@@ -5,7 +5,8 @@ 
  */
 
 // Added by Raymond 20-Jan-2005
-function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '') {
+function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '')
+{
 
 	global $modx;
 
@@ -49,7 +50,9 @@ 
 					if(isset($params['align']) && $params['align'] != 'none') {
 						$attr['align'] = $params['align'];
 					}
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					foreach($attr as $k => $v) {
+					    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					}
 					$attributes .= ' ' . $params['attrib'];
 
 					// Output the image with attributes
@@ -117,7 +120,9 @@ 
 						'style' => $params['style'],
 						'target' => $params['target'],
 					);
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					foreach($attr as $k => $v) {
+					    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+					}
 					$attributes .= ' ' . $params['attrib']; // add extra
 
 					// Output the link
@@ -145,7 +150,9 @@ 
 					'class' => $params['class'],
 					'style' => $params['style'],
 				);
-				foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+				foreach($attr as $k => $v) {
+				    $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
+				}
 				$attributes .= ' ' . $params['attrib']; // add extra
 
 				// Output the HTML Tag
@@ -325,19 +332,24 @@ 
 	return $o;
 }
 
-function decodeParamValue($s) {
+function decodeParamValue($s)
+{
 	$s = str_replace("%3D", '=', $s); // =
 	$s = str_replace("%26", '&', $s); // &
 	return $s;
 }
 
 // returns an array if a delimiter is present. returns array is a recordset is present
-function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array
+function parseInput($src, $delim = "||", $type = "string", $columns = true)
+{
+// type can be: string, array
 	global $modx;
 	if($modx->db->isResult($src)) {
 		// must be a recordset
 		$rows = array();
-		while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		while($cols = $modx->db->getRow($src, 'num')) {
+		    $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		}
 		return ($type == "array") ? $rows : implode($delim, $rows);
 	} else {
 		// must be a text
@@ -349,7 +361,8 @@ 
 	}
 }
 
-function getUnixtimeFromDateString($value) {
+function getUnixtimeFromDateString($value)
+{
 	$timestamp = false;
 	// Check for MySQL or legacy style date
 	$date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';

manager/includes/rss.inc.php

Indentation +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
  *  MODX Manager Home Page Implmentation by pixelchutes (www.pixelchutes.com)
  *  Based on kudo's kRSS Module v1.0.72
  *
@@ -30,43 +30,43 @@ 
 require_once(MODX_MANAGER_PATH.'media/rss/rss_fetch.inc');
 // Convert relative path into absolute url
 function rel2abs( $rel, $base ) {
-	// parse base URL  and convert to local variables: $scheme, $host,  $path
-	extract( parse_url( $base ) );
-	if ( strpos( $rel,"//" ) === 0 ) {
-		return $scheme . ':' . $rel;
-	}
-	// return if already absolute URL
-	if ( parse_url( $rel, PHP_URL_SCHEME ) != '' ) {
-		return $rel;
-	}
-	// queries and anchors
-	if ( $rel[0] == '#' || $rel[0] == '?' ) {
-		return $base . $rel;
-	}
-	// remove non-directory element from path
-	$path = preg_replace( '#/[^/]*$#', '', $path );
-	// destroy path if relative url points to root
-	if ( $rel[0] ==  '/' ) {
-		$path = '';
-	}
-	// dirty absolute URL
-	$abs = $host . $path . "/" . $rel;
-	// replace '//' or  '/./' or '/foo/../' with '/'
-	$abs = preg_replace( "/(\/\.?\/)/", "/", $abs );
-	$abs = preg_replace( "/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs );
-	// absolute URL is ready!
-	return $scheme . '://' . $abs;
+    // parse base URL  and convert to local variables: $scheme, $host,  $path
+    extract( parse_url( $base ) );
+    if ( strpos( $rel,"//" ) === 0 ) {
+        return $scheme . ':' . $rel;
+    }
+    // return if already absolute URL
+    if ( parse_url( $rel, PHP_URL_SCHEME ) != '' ) {
+        return $rel;
+    }
+    // queries and anchors
+    if ( $rel[0] == '#' || $rel[0] == '?' ) {
+        return $base . $rel;
+    }
+    // remove non-directory element from path
+    $path = preg_replace( '#/[^/]*$#', '', $path );
+    // destroy path if relative url points to root
+    if ( $rel[0] ==  '/' ) {
+        $path = '';
+    }
+    // dirty absolute URL
+    $abs = $host . $path . "/" . $rel;
+    // replace '//' or  '/./' or '/foo/../' with '/'
+    $abs = preg_replace( "/(\/\.?\/)/", "/", $abs );
+    $abs = preg_replace( "/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs );
+    // absolute URL is ready!
+    return $scheme . '://' . $abs;
 }
 $feedData = array();
 
 // create Feed
 foreach ($urls as $section=>$url) {
-	$output = '';
+    $output = '';
     $rss = @fetch_rss($url);
     if( !$rss ){
-    	$feedData[$section] = 'Failed to retrieve ' . $url;
-    	continue;
-	}
+        $feedData[$section] = 'Failed to retrieve ' . $url;
+        continue;
+    }
     $output .= '<ul>';
 
     $items = array_slice($rss->items, 0, $itemsNumber);
@@ -84,6 +84,6 @@ 
     }
 
     $output .= '</ul>';
-	$feedData[$section] = $output;
+    $feedData[$section] = $output;
 }
 ?>

Spacing +16 added lines, -16 removed lines

@@ -29,33 +29,33 @@ 
 // include MagPieRSS
 require_once(MODX_MANAGER_PATH.'media/rss/rss_fetch.inc');
 // Convert relative path into absolute url
-function rel2abs( $rel, $base ) {
+function rel2abs($rel, $base){
 	// parse base URL  and convert to local variables: $scheme, $host,  $path
-	extract( parse_url( $base ) );
-	if ( strpos( $rel,"//" ) === 0 ) {
-		return $scheme . ':' . $rel;
+	extract(parse_url($base));
+	if (strpos($rel, "//") === 0) {
+		return $scheme.':'.$rel;
 	}
 	// return if already absolute URL
-	if ( parse_url( $rel, PHP_URL_SCHEME ) != '' ) {
+	if (parse_url($rel, PHP_URL_SCHEME) != '') {
 		return $rel;
 	}
 	// queries and anchors
-	if ( $rel[0] == '#' || $rel[0] == '?' ) {
-		return $base . $rel;
+	if ($rel[0] == '#' || $rel[0] == '?') {
+		return $base.$rel;
 	}
 	// remove non-directory element from path
-	$path = preg_replace( '#/[^/]*$#', '', $path );
+	$path = preg_replace('#/[^/]*$#', '', $path);
 	// destroy path if relative url points to root
-	if ( $rel[0] ==  '/' ) {
+	if ($rel[0] == '/') {
 		$path = '';
 	}
 	// dirty absolute URL
-	$abs = $host . $path . "/" . $rel;
+	$abs = $host.$path."/".$rel;
 	// replace '//' or  '/./' or '/foo/../' with '/'
-	$abs = preg_replace( "/(\/\.?\/)/", "/", $abs );
-	$abs = preg_replace( "/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs );
+	$abs = preg_replace("/(\/\.?\/)/", "/", $abs);
+	$abs = preg_replace("/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs);
 	// absolute URL is ready!
-	return $scheme . '://' . $abs;
+	return $scheme.'://'.$abs;
 }
 $feedData = array();
 
@@ -63,15 +63,15 @@ 
 foreach ($urls as $section=>$url) {
 	$output = '';
     $rss = @fetch_rss($url);
-    if( !$rss ){
-    	$feedData[$section] = 'Failed to retrieve ' . $url;
+    if (!$rss) {
+    	$feedData[$section] = 'Failed to retrieve '.$url;
     	continue;
 	}
     $output .= '<ul>';
 
     $items = array_slice($rss->items, 0, $itemsNumber);
     foreach ($items as $item) {
-        $href = rel2abs($item['link'],'https://github.com');
+        $href = rel2abs($item['link'], 'https://github.com');
         $title = $item['title'];
         $pubdate = $item['pubdate'];
         $pubdate = $modx->toDateFormat(strtotime($pubdate));

Braces +3 added lines, -2 removed lines

@@ -29,7 +29,8 @@ 
 // include MagPieRSS
 require_once(MODX_MANAGER_PATH.'media/rss/rss_fetch.inc');
 // Convert relative path into absolute url
-function rel2abs( $rel, $base ) {
+function rel2abs( $rel, $base )
+{
 	// parse base URL  and convert to local variables: $scheme, $host,  $path
 	extract( parse_url( $base ) );
 	if ( strpos( $rel,"//" ) === 0 ) {
@@ -63,7 +64,7 @@ 
 foreach ($urls as $section=>$url) {
 	$output = '';
     $rss = @fetch_rss($url);
-    if( !$rss ){
+    if( !$rss ) {
     	$feedData[$section] = 'Failed to retrieve ' . $url;
     	continue;
 	}

manager/includes/default_config.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php

 

-$c  = &$settings;

+$c = &$settings;

 

 $c['site_name']                = 'My MODX Site';

 $c['site_start']               = 1;

manager/includes/secure_web_documents.inc.php

Indentation +11 added lines, -11 removed lines

@@ -11,19 +11,19 @@
  */
 
 function secureWebDocument($docid='') {
-	global $modx;
+    global $modx;
 		
-	$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
+    $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"
-		);
-	$ids = $modx->db->getColumn("id",$rs);
-	if(count($ids)>0) {
-		$modx->db->update('privateweb = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");	
-	}
+        ($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).")");	
+    }
 }
 ?>
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(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 (IN_MANAGER_MODE != "true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 
 /**
  *	Secure Web Documents
@@ -10,20 +10,20 @@ 
  *
  */
 
-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).")");	
 	}
 }
 ?>
\ No newline at end of file

Braces +5 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(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(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 
 /**
  *	Secure Web Documents
@@ -10,7 +12,8 @@ 
  *
  */
 
-function secureWebDocument($docid='') {
+function secureWebDocument($docid='')
+{
 	global $modx;
 		
 	$modx->db->update('privateweb = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privateweb = 1"));

manager/includes/charsets.php

Spacing +17 added lines, -17 removed lines

@@ -65,26 +65,26 @@
 $_['macintosh']         = 'Western European (Mac) - macintosh';
 $_['Windows-1252']      = 'Western European (Windows) - Windows-1252';
 
-if($modx_charset     == 'euc-jp')      $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
-elseif($modx_charset == 'shift_jis')   $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
-elseif($modx_charset == 'iso-2022-jp') $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp';
-elseif($modx_charset == 'csISO2022JP') $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP';
-elseif($modx_charset == 'EUC-CN')            $_['EUC-CN']            = 'Chinese Simplified (EUC) - EUC-CN';
-elseif($modx_charset == 'hz-gb-2312')        $_['hz-gb-2312']        = 'Chinese Simplified (HZ) - hz-gb-2312';
-elseif($modx_charset == 'x-mac-chinesesimp') $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp';
-elseif($modx_charset == 'x-Chinese-CNS')     $_['x-Chinese-CNS']     = 'Chinese Traditional (CNS) - x-Chinese-CNS';
-elseif($modx_charset == 'x-Chinese-Eten')    $_['x-Chinese-Eten']    = 'Chinese Traditional (Eten) - x-Chinese-Eten';
-elseif($modx_charset == 'x-mac-chinesetrad') $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad';
-elseif($modx_charset == 'ks_c_5601-1987') $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987';
-elseif($modx_charset == 'euc-kr')         $_['euc-kr']         = 'Korean (EUC) - euc-kr';
-elseif($modx_charset == 'iso-2022-kr')    $_['iso-2022-kr']    = 'Korean (ISO) - iso-2022-kr';
-elseif($modx_charset == 'Johab')          $_['Johab']          = 'Korean (Johab) - Johab';
-elseif($modx_charset == 'x-mac-korean')   $_['x-mac-korean']   = 'Korean (Mac) - x-mac-korean';
+if ($modx_charset == 'euc-jp')      $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
+elseif ($modx_charset == 'shift_jis')   $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
+elseif ($modx_charset == 'iso-2022-jp') $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp';
+elseif ($modx_charset == 'csISO2022JP') $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP';
+elseif ($modx_charset == 'EUC-CN')            $_['EUC-CN']            = 'Chinese Simplified (EUC) - EUC-CN';
+elseif ($modx_charset == 'hz-gb-2312')        $_['hz-gb-2312']        = 'Chinese Simplified (HZ) - hz-gb-2312';
+elseif ($modx_charset == 'x-mac-chinesesimp') $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp';
+elseif ($modx_charset == 'x-Chinese-CNS')     $_['x-Chinese-CNS']     = 'Chinese Traditional (CNS) - x-Chinese-CNS';
+elseif ($modx_charset == 'x-Chinese-Eten')    $_['x-Chinese-Eten']    = 'Chinese Traditional (Eten) - x-Chinese-Eten';
+elseif ($modx_charset == 'x-mac-chinesetrad') $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad';
+elseif ($modx_charset == 'ks_c_5601-1987') $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987';
+elseif ($modx_charset == 'euc-kr')         $_['euc-kr']         = 'Korean (EUC) - euc-kr';
+elseif ($modx_charset == 'iso-2022-kr')    $_['iso-2022-kr']    = 'Korean (ISO) - iso-2022-kr';
+elseif ($modx_charset == 'Johab')          $_['Johab']          = 'Korean (Johab) - Johab';
+elseif ($modx_charset == 'x-mac-korean')   $_['x-mac-korean']   = 'Korean (Mac) - x-mac-korean';
 
 $tpl = '<option value="%s" %s>%s</option>';
 $options = array();
-foreach($_ as $value=>$label) {
-    $selected = $value===$modx_charset ? 'selected' : '';
+foreach ($_ as $value=>$label) {
+    $selected = $value === $modx_charset ? 'selected' : '';
     $options[] = sprintf($tpl, $value, $selected, $label);
 }
 echo join("\n", $options);

Braces +31 added lines, -15 removed lines

@@ -65,21 +65,37 @@
 $_['macintosh']         = 'Western European (Mac) - macintosh';
 $_['Windows-1252']      = 'Western European (Windows) - Windows-1252';
 
-if($modx_charset     == 'euc-jp')      $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
-elseif($modx_charset == 'shift_jis')   $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
-elseif($modx_charset == 'iso-2022-jp') $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp';
-elseif($modx_charset == 'csISO2022JP') $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP';
-elseif($modx_charset == 'EUC-CN')            $_['EUC-CN']            = 'Chinese Simplified (EUC) - EUC-CN';
-elseif($modx_charset == 'hz-gb-2312')        $_['hz-gb-2312']        = 'Chinese Simplified (HZ) - hz-gb-2312';
-elseif($modx_charset == 'x-mac-chinesesimp') $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp';
-elseif($modx_charset == 'x-Chinese-CNS')     $_['x-Chinese-CNS']     = 'Chinese Traditional (CNS) - x-Chinese-CNS';
-elseif($modx_charset == 'x-Chinese-Eten')    $_['x-Chinese-Eten']    = 'Chinese Traditional (Eten) - x-Chinese-Eten';
-elseif($modx_charset == 'x-mac-chinesetrad') $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad';
-elseif($modx_charset == 'ks_c_5601-1987') $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987';
-elseif($modx_charset == 'euc-kr')         $_['euc-kr']         = 'Korean (EUC) - euc-kr';
-elseif($modx_charset == 'iso-2022-kr')    $_['iso-2022-kr']    = 'Korean (ISO) - iso-2022-kr';
-elseif($modx_charset == 'Johab')          $_['Johab']          = 'Korean (Johab) - Johab';
-elseif($modx_charset == 'x-mac-korean')   $_['x-mac-korean']   = 'Korean (Mac) - x-mac-korean';
+if($modx_charset     == 'euc-jp') {
+    $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
+} elseif($modx_charset == 'shift_jis') {
+    $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
+} elseif($modx_charset == 'iso-2022-jp') {
+    $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp';
+} elseif($modx_charset == 'csISO2022JP') {
+    $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP';
+} elseif($modx_charset == 'EUC-CN') {
+    $_['EUC-CN']            = 'Chinese Simplified (EUC) - EUC-CN';
+} elseif($modx_charset == 'hz-gb-2312') {
+    $_['hz-gb-2312']        = 'Chinese Simplified (HZ) - hz-gb-2312';
+} elseif($modx_charset == 'x-mac-chinesesimp') {
+    $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp';
+} elseif($modx_charset == 'x-Chinese-CNS') {
+    $_['x-Chinese-CNS']     = 'Chinese Traditional (CNS) - x-Chinese-CNS';
+} elseif($modx_charset == 'x-Chinese-Eten') {
+    $_['x-Chinese-Eten']    = 'Chinese Traditional (Eten) - x-Chinese-Eten';
+} elseif($modx_charset == 'x-mac-chinesetrad') {
+    $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad';
+} elseif($modx_charset == 'ks_c_5601-1987') {
+    $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987';
+} elseif($modx_charset == 'euc-kr') {
+    $_['euc-kr']         = 'Korean (EUC) - euc-kr';
+} elseif($modx_charset == 'iso-2022-kr') {
+    $_['iso-2022-kr']    = 'Korean (ISO) - iso-2022-kr';
+} elseif($modx_charset == 'Johab') {
+    $_['Johab']          = 'Korean (Johab) - Johab';
+} elseif($modx_charset == 'x-mac-korean') {
+    $_['x-mac-korean']   = 'Korean (Mac) - x-mac-korean';
+}
 
 $tpl = '<option value="%s" %s>%s</option>';
 $options = array();

manager/includes/mutate_settings.ajax.php

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 }
 
 if($emptyCache) {
-	$modx->clearCache('full');
+    $modx->clearCache('full');
 }
 
 echo $str;
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -3,9 +3,9 @@ 
  * mutate_settings.ajax.php
  * 
  */
-if(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 (IN_MANAGER_MODE != "true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
  
-require_once(dirname(__FILE__) . '/protect.inc.php');
+require_once(dirname(__FILE__).'/protect.inc.php');
 
 $action = preg_replace('/[^A-Za-z0-9_\-\.\/]/', '', $_POST['action']);
 $lang = preg_replace('/[^A-Za-z0-9_\s\+\-\.\/]/', '', $_POST['lang']);
@@ -20,10 +20,10 @@ 
 $str = '';
 $emptyCache = false;
 
-switch(true){
-    case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/',$lang) && file_exists(dirname(__FILE__) . '/lang/'.$lang.'.inc.php')):{
-        include(dirname(__FILE__) . '/lang/'.$lang.'.inc.php');
-        $str = isset($key,$_lang,$_lang[$key]) ? $_lang[$key] : "" ;
+switch (true) {
+    case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/', $lang) && file_exists(dirname(__FILE__).'/lang/'.$lang.'.inc.php')):{
+        include(dirname(__FILE__).'/lang/'.$lang.'.inc.php');
+        $str = isset($key, $_lang, $_lang[$key]) ? $_lang[$key] : "";
         break;
     }
     case ($action == 'setsetting' && !empty($key) && !empty($value)):{
@@ -50,7 +50,7 @@ 
     }
 }
 
-if($emptyCache) {
+if ($emptyCache) {
 	$modx->clearCache('full');
 }
 

Braces +4 added lines, -2 removed lines

@@ -3,7 +3,9 @@ 
  * mutate_settings.ajax.php
  * 
  */
-if(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(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
  
 require_once(dirname(__FILE__) . '/protect.inc.php');
 
@@ -20,7 +22,7 @@ 
 $str = '';
 $emptyCache = false;
 
-switch(true){
+switch(true) {
     case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/',$lang) && file_exists(dirname(__FILE__) . '/lang/'.$lang.'.inc.php')):{
         include(dirname(__FILE__) . '/lang/'.$lang.'.inc.php');
         $str = isset($key,$_lang,$_lang[$key]) ? $_lang[$key] : "" ;

manager/includes/preload.functions.inc.php

Spacing +7 added lines, -7 removed lines

@@ -3,10 +3,10 @@ 
 global $site_sessionname;

 $site_sessionname = genEvoSessionName(); // For legacy extras not using startCMSSession

 

-function genEvoSessionName() {

+function genEvoSessionName(){

     $_ = crc32(__FILE__);

     $_ = sprintf('%u', $_);

-    return 'evo' . base_convert($_,10,36);

+    return 'evo'.base_convert($_, 10, 36);

 }

 

 function startCMSSession(){

@@ -15,7 +15,7 @@ 
     

     session_name($site_sessionname);

     removeInvalidCmsSessionIds($site_sessionname);

-    $cookieExpiration= 0;

+    $cookieExpiration = 0;

     $secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);

     $cookiePath = !empty($session_cookie_path) ? $session_cookie_path : MODX_BASE_URL;

     $cookieDomain = !empty($session_cookie_domain) ? $session_cookie_domain : '';

@@ -24,8 +24,8 @@ 
 

     $key = "modx.{$context}.session.cookie.lifetime";

     if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {

-        $cookieLifetime= intval($_SESSION[$key]);

-        if($cookieLifetime) $cookieExpiration = $_SERVER['REQUEST_TIME']+$cookieLifetime;

+        $cookieLifetime = intval($_SESSION[$key]);

+        if ($cookieLifetime) $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime;

         setcookie(session_name(), session_id(), $cookieExpiration, $cookiePath, $cookieDomain, $secure, true);

     }

     if (!isset($_SESSION['modx.session.created.time'])) {

@@ -33,14 +33,14 @@ 
     }

 }

 

-function removeInvalidCmsSessionFromStorage(&$storage, $session_name) {

+function removeInvalidCmsSessionFromStorage(&$storage, $session_name){

     if (isset($storage[$session_name]) && ($storage[$session_name] === '' || $storage[$session_name] === 'deleted'))

     {

     unset($storage[$session_name]);

     }

 }

 

-function removeInvalidCmsSessionIds($session_name) {

+function removeInvalidCmsSessionIds($session_name){

     // session ids is invalid iff it is empty string

     // storage priorioty can see in PHP source ext/session/session.c

     removeInvalidCmsSessionFromStorage($_COOKIE, $session_name);

Braces +14 added lines, -9 removed lines

@@ -3,13 +3,15 @@ 
 global $site_sessionname;

 $site_sessionname = genEvoSessionName(); // For legacy extras not using startCMSSession

 

-function genEvoSessionName() {

+function genEvoSessionName()
+{
     $_ = crc32(__FILE__);

     $_ = sprintf('%u', $_);

     return 'evo' . base_convert($_,10,36);

 }

 

-function startCMSSession(){

+function startCMSSession()
+{
     

     global $site_sessionname, $https_port, $session_cookie_path, $session_cookie_domain;

     

@@ -23,24 +25,27 @@ 
     session_start();

 

     $key = "modx.{$context}.session.cookie.lifetime";

-    if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {

+    if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {
         $cookieLifetime= intval($_SESSION[$key]);

-        if($cookieLifetime) $cookieExpiration = $_SERVER['REQUEST_TIME']+$cookieLifetime;

+        if($cookieLifetime) {
+            $cookieExpiration = $_SERVER['REQUEST_TIME']+$cookieLifetime;
+        }
         setcookie(session_name(), session_id(), $cookieExpiration, $cookiePath, $cookieDomain, $secure, true);

     }

-    if (!isset($_SESSION['modx.session.created.time'])) {

+    if (!isset($_SESSION['modx.session.created.time'])) {
         $_SESSION['modx.session.created.time'] = $_SERVER['REQUEST_TIME'];

     }

 }

 

-function removeInvalidCmsSessionFromStorage(&$storage, $session_name) {

-    if (isset($storage[$session_name]) && ($storage[$session_name] === '' || $storage[$session_name] === 'deleted'))

-    {

+function removeInvalidCmsSessionFromStorage(&$storage, $session_name)
+{
+    if (isset($storage[$session_name]) && ($storage[$session_name] === '' || $storage[$session_name] === 'deleted')) {
     unset($storage[$session_name]);

     }

 }

 

-function removeInvalidCmsSessionIds($session_name) {

+function removeInvalidCmsSessionIds($session_name)
+{
     // session ids is invalid iff it is empty string

     // storage priorioty can see in PHP source ext/session/session.c

     removeInvalidCmsSessionFromStorage($_COOKIE, $session_name);