evolution-cms / evolution

manager/media/browser/mcpuk/core/autoload.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
 $modx = evolutionCMS();
 $modx->db->connect();
 startCMSSession();
-if(!isset($_SESSION['mgrValidated'])) {
+if (!isset($_SESSION['mgrValidated'])) {
         die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 define('IN_MANAGER_MODE', true);
@@ -34,7 +34,7 @@ 
 
 $manager_language = $modx->config['manager_language'];
 // Pass language code from MODX to KCFinder
-if(!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
+if (!file_exists("../../../includes/lang/".$manager_language.".inc.php")) {
     $manager_language = "english"; // if not set, get the english language file.
 }
 include_once "../../../includes/lang/".$manager_language.".inc.php";
@@ -42,7 +42,7 @@ 
 
 // PHP VERSION CHECK
 if (substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.')) < 5)
-    die("You are using PHP " . PHP_VERSION . " when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
+    die("You are using PHP ".PHP_VERSION." when KCFinder require at least version 5! Some systems has an option to change the active PHP version. Please refer to your hosting provider or upgrade your PHP distribution.");
 
 
 // SAFE MODE CHECK
@@ -51,7 +51,7 @@ 
 
 
 // MAGIC AUTOLOAD CLASSES FUNCTION
-function autoloadda9d06472ccb71b84928677ce2a6ca89($class) {
+function autoloadda9d06472ccb71b84928677ce2a6ca89($class){
     static $classes = null;
     if ($classes === null) {
         $classes = array(
@@ -75,7 +75,7 @@ 
         );
     }
     if (isset($classes[$class])) {
-        require dirname(__FILE__) . $classes[$class];
+        require dirname(__FILE__).$classes[$class];
     }
 }
 spl_autoload_register('autoloadda9d06472ccb71b84928677ce2a6ca89', true);
@@ -84,18 +84,18 @@ 
 // json_encode() IMPLEMENTATION IF JSON EXTENSION IS MISSING
 if (!function_exists("json_encode")) {
 
-    function kcfinder_json_string_encode($string) {
-        return '"' .
+    function kcfinder_json_string_encode($string){
+        return '"'.
             str_replace('/', "\\/",
             str_replace("\t", "\\t",
             str_replace("\r", "\\r",
             str_replace("\n", "\\n",
             str_replace('"', "\\\"",
             str_replace("\\", "\\\\",
-        $string)))))) . '"';
+        $string)))))).'"';
     }
 
-    function json_encode($data) {
+    function json_encode($data){
 
         if (is_array($data)) {
             $ret = array();
@@ -103,14 +103,14 @@ 
             // OBJECT
             if (array_keys($data) !== range(0, count($data) - 1)) {
                 foreach ($data as $key => $val)
-                    $ret[] = kcfinder_json_string_encode($key) . ':' . json_encode($val);
-                return "{" . implode(",", $ret) . "}";
+                    $ret[] = kcfinder_json_string_encode($key).':'.json_encode($val);
+                return "{".implode(",", $ret)."}";
 
             // ARRAY
             } else {
                 foreach ($data as $val)
                     $ret[] = json_encode($val);
-                return "[" . implode(",", $ret) . "]";
+                return "[".implode(",", $ret)."]";
             }
 
         // BOOLEAN OR NULL

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 = evolutionCMS();
+    include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
+    $modx = evolutionCMS();
 }
 
 $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']) && (int)$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

manager/processors/undelete_content.processor.php

Indentation +26 added lines, -26 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('delete_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************ webber ********/
@@ -32,14 +32,14 @@ 
 $udperms->role = $_SESSION['mgrRole'];
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // get the timestamp on which the document was deleted.
 $rs = $modx->db->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
 $deltime = $modx->db->getValue($rs);
 if(!$deltime) {
-	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
+    $modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
 }
 
 $children = array();
@@ -49,36 +49,36 @@ 
  */
 function getChildren($parent) {
 
-	$modx = evolutionCMS();
-	global $children;
-	global $deltime;
-
-	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int)$parent."' AND deleted=1 AND deletedon='".(int)$deltime."'");
-		// the document has children documents, we'll need to delete those too
-		while ($row=$modx->db->getRow($rs)) {
-			$children[] = $row['id'];
-			getChildren($row['id']);
-			//echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
-		}
+    $modx = evolutionCMS();
+    global $children;
+    global $deltime;
+
+    $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int)$parent."' AND deleted=1 AND deletedon='".(int)$deltime."'");
+        // the document has children documents, we'll need to delete those too
+        while ($row=$modx->db->getRow($rs)) {
+            $children[] = $row['id'];
+            getChildren($row['id']);
+            //echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
+        }
 }
 
 getChildren($id);
 
 if(count($children)>0) {
-	$modx->db->update(
-		array(
-			'deleted'   => 0,
-			'deletedby' => 0,
-			'deletedon' => 0,
-		), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")");
+    $modx->db->update(
+        array(
+            'deleted'   => 0,
+            'deletedby' => 0,
+            'deletedon' => 0,
+        ), $modx->getFullTableName('site_content'), "id IN(".implode(", ", $children).")");
 }
 //'undelete' the document.
 $modx->db->update(
-	array(
-		'deleted'   => 0,
-		'deletedby' => 0,
-		'deletedon' => 0,
-	), $modx->getFullTableName('site_content'), "id='{$id}'");
+    array(
+        'deleted'   => 0,
+        'deletedby' => 0,
+        'deletedon' => 0,
+    ), $modx->getFullTableName('site_content'), "id='{$id}'");
 
 $modx->invokeEvent("OnDocFormUnDelete",
     array(

Spacing +18 added lines, -18 removed lines

@@ -1,44 +1,44 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('delete_document')) {
+if (!$modx->hasPermission('delete_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id'])? (int)$_REQUEST['id'] : 0;
-if($id==0) {
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /************ webber ********/
-$content=$modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
-$pid=($content['parent']==0?$id:$content['parent']);
+$content = $modx->db->getRow($modx->db->select('parent, pagetitle', $modx->getFullTableName('site_content'), "id='{$id}'"));
+$pid = ($content['parent'] == 0 ? $id : $content['parent']);
 
 /************** webber *************/
-$sd=isset($_REQUEST['dir'])?'&dir='.$_REQUEST['dir']:'&dir=DESC';
-$sb=isset($_REQUEST['sort'])?'&sort='.$_REQUEST['sort']:'&sort=createdon';
-$pg=isset($_REQUEST['page'])?'&page='.(int)$_REQUEST['page']:'';
-$add_path=$sd.$sb.$pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 /***********************************/
 
 
 // check permissions on the document
-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 $udperms = new udperms();
 $udperms->user = $modx->getLoginUserID();
 $udperms->document = $id;
 $udperms->role = $_SESSION['mgrRole'];
 
-if(!$udperms->checkPermissions()) {
+if (!$udperms->checkPermissions()) {
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // get the timestamp on which the document was deleted.
 $rs = $modx->db->select('deletedon', $modx->getFullTableName('site_content'), "id='{$id}' AND deleted=1");
 $deltime = $modx->db->getValue($rs);
-if(!$deltime) {
+if (!$deltime) {
 	$modx->webAlertAndQuit("Couldn't find document to determine it's date of deletion!");
 }
 
@@ -47,15 +47,15 @@ 
 /**
  * @param int $parent
  */
-function getChildren($parent) {
+function getChildren($parent){
 
 	$modx = evolutionCMS();
 	global $children;
 	global $deltime;
 
-	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int)$parent."' AND deleted=1 AND deletedon='".(int)$deltime."'");
+	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent='".(int) $parent."' AND deleted=1 AND deletedon='".(int) $deltime."'");
 		// the document has children documents, we'll need to delete those too
-		while ($row=$modx->db->getRow($rs)) {
+		while ($row = $modx->db->getRow($rs)) {
 			$children[] = $row['id'];
 			getChildren($row['id']);
 			//echo "Found childNode of parentNode $parent: ".$row['id']."<br />";
@@ -64,7 +64,7 @@ 
 
 getChildren($id);
 
-if(count($children)>0) {
+if (count($children) > 0) {
 	$modx->db->update(
 		array(
 			'deleted'   => 0,
@@ -93,5 +93,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=3&id=$pid&r=1".$add_path;
+$header = "Location: index.php?a=3&id=$pid&r=1".$add_path;
 header($header);

Braces +2 added lines, -1 removed lines

@@ -47,7 +47,8 @@
 /**
  * @param int $parent
  */
-function getChildren($parent) {
+function getChildren($parent)
+{
 
 	$modx = evolutionCMS();
 	global $children;

manager/processors/login.processor.php

Indentation +182 added lines, -182 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-	header('HTTP/1.0 404 Not Found');
-	exit('error');
+    header('HTTP/1.0 404 Not Found');
+    exit('error');
 }
 define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through
 define('MODX_API_MODE', true);
@@ -18,7 +18,7 @@ 
 include_once("{$core_path}lang/english.inc.php");
 
 if($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
-	include_once("{$core_path}lang/{$manager_language}.inc.php");
+    include_once("{$core_path}lang/{$manager_language}.inc.php");
 }
 
 // include the logger
@@ -26,7 +26,7 @@ 
 
 // Initialize System Alert Message Queque
 if(!isset($_SESSION['SystemAlertMsgQueque'])) {
-	$_SESSION['SystemAlertMsgQueque'] = array();
+    $_SESSION['SystemAlertMsgQueque'] = array();
 }
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
@@ -41,10 +41,10 @@ 
 
 // invoke OnBeforeManagerLogin event
 $modx->invokeEvent('OnBeforeManagerLogin', array(
-		'username' => $username,
-		'userpassword' => $givenPassword,
-		'rememberme' => $rememberme
-	));
+        'username' => $username,
+        'userpassword' => $givenPassword,
+        'rememberme' => $rememberme
+    ));
 $fields = 'mu.*, ua.*';
 $from = '[+prefix+]manager_users AS mu, [+prefix+]user_attributes AS ua';
 $where = "BINARY mu.username='{$username}' and ua.internalKey=mu.id";
@@ -52,8 +52,8 @@ 
 $limit = $modx->db->getRecordCount($rs);
 
 if($limit == 0 || $limit > 1) {
-	jsAlert($_lang['login_processor_unknown_user']);
-	return;
+    jsAlert($_lang['login_processor_unknown_user']);
+    return;
 }
 
 $row = $modx->db->getRow($rs);
@@ -74,127 +74,127 @@ 
 // get the user settings from the database
 $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_value!=''");
 while($row = $modx->db->getRow($rs)) {
-	extract($row);
-	${$setting_name} = $setting_value;
+    extract($row);
+    ${$setting_name} = $setting_value;
 }
 
 // blocked due to number of login errors.
 if($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
-	@session_destroy();
-	session_unset();
-	if($cip = getenv("HTTP_CLIENT_IP")) {
-		$ip = $cip;
-	} elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
-		$ip = $cip;
-	} elseif($cip = getenv("REMOTE_ADDR")) {
-		$ip = $cip;
-	} else {
-		$ip = "UNKNOWN";
-	}
-	$log = new logHandler;
-	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);
-	jsAlert($_lang['login_processor_many_failed_logins']);
-	return;
+    @session_destroy();
+    session_unset();
+    if($cip = getenv("HTTP_CLIENT_IP")) {
+        $ip = $cip;
+    } elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
+        $ip = $cip;
+    } elseif($cip = getenv("REMOTE_ADDR")) {
+        $ip = $cip;
+    } else {
+        $ip = "UNKNOWN";
+    }
+    $log = new logHandler;
+    $log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);
+    jsAlert($_lang['login_processor_many_failed_logins']);
+    return;
 }
 
 // blocked due to number of login errors, but get to try again
 if($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
-	$fields = array();
-	$fields['failedlogincount'] = '0';
-	$fields['blockeduntil'] = time() - 1;
-	$modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
+    $fields = array();
+    $fields['failedlogincount'] = '0';
+    $fields['blockeduntil'] = time() - 1;
+    $modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 }
 
 // this user has been blocked by an admin, so no way he's loggin in!
 if($blocked == '1') {
-	@session_destroy();
-	session_unset();
-	jsAlert($_lang['login_processor_blocked1']);
-	return;
+    @session_destroy();
+    session_unset();
+    jsAlert($_lang['login_processor_blocked1']);
+    return;
 }
 
 // blockuntil: this user has a block until date
 if($blockeduntildate > time()) {
-	@session_destroy();
-	session_unset();
-	jsAlert($_lang['login_processor_blocked2']);
-	return;
+    @session_destroy();
+    session_unset();
+    jsAlert($_lang['login_processor_blocked2']);
+    return;
 }
 
 // blockafter: this user has a block after date
 if($blockedafterdate > 0 && $blockedafterdate < time()) {
-	@session_destroy();
-	session_unset();
-	jsAlert($_lang['login_processor_blocked3']);
-	return;
+    @session_destroy();
+    session_unset();
+    jsAlert($_lang['login_processor_blocked3']);
+    return;
 }
 
 // allowed ip
 if($allowed_ip) {
-	if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
-		if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
-			jsAlert($_lang['login_processor_remotehost_ip']);
-			return;
-		}
-	}
-	if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
-		jsAlert($_lang['login_processor_remote_ip']);
-		return;
-	}
+    if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
+        if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
+            jsAlert($_lang['login_processor_remotehost_ip']);
+            return;
+        }
+    }
+    if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
+        jsAlert($_lang['login_processor_remote_ip']);
+        return;
+    }
 }
 
 // allowed days
 if($allowed_days) {
-	$date = getdate();
-	$day = $date['wday'] + 1;
-	if(strpos($allowed_days, $day) === false) {
-		jsAlert($_lang['login_processor_date']);
-		return;
-	}
+    $date = getdate();
+    $day = $date['wday'] + 1;
+    if(strpos($allowed_days, $day) === false) {
+        jsAlert($_lang['login_processor_date']);
+        return;
+    }
 }
 
 // invoke OnManagerAuthentication event
 $rt = $modx->invokeEvent('OnManagerAuthentication', array(
-		'userid' => $internalKey,
-		'username' => $username,
-		'userpassword' => $givenPassword,
-		'savedpassword' => $dbasePassword,
-		'rememberme' => $rememberme
-	));
+        'userid' => $internalKey,
+        'username' => $username,
+        'userpassword' => $givenPassword,
+        'savedpassword' => $dbasePassword,
+        'rememberme' => $rememberme
+    ));
 
 // check if plugin authenticated the user
 $matchPassword = false;
 if(!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
-	// check user password - local authentication
-	$hashType = $modx->manager->getHashType($dbasePassword);
-	if($hashType == 'phpass') {
-		$matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
-	} elseif($hashType == 'md5') {
-		$matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} elseif($hashType == 'v1') {
-		$matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} else {
-		$matchPassword = false;
-	}
+    // check user password - local authentication
+    $hashType = $modx->manager->getHashType($dbasePassword);
+    if($hashType == 'phpass') {
+        $matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
+    } elseif($hashType == 'md5') {
+        $matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
+    } elseif($hashType == 'v1') {
+        $matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
+    } else {
+        $matchPassword = false;
+    }
 } else if($rt === true || (is_array($rt) && in_array(true, $rt))) {
-	$matchPassword = true;
+    $matchPassword = true;
 }
 
 if(!$matchPassword) {
-	jsAlert($_lang['login_processor_wrong_password']);
-	incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
-	return;
+    jsAlert($_lang['login_processor_wrong_password']);
+    incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
+    return;
 }
 
 if($modx->config['use_captcha'] == 1) {
-	if(!isset ($_SESSION['veriword'])) {
-		jsAlert($_lang['login_processor_captcha_config']);
-		return;
-	} elseif($_SESSION['veriword'] != $captcha_code) {
-		jsAlert($_lang['login_processor_bad_code']);
-		incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
-		return;
-	}
+    if(!isset ($_SESSION['veriword'])) {
+        jsAlert($_lang['login_processor_captcha_config']);
+        return;
+    } elseif($_SESSION['veriword'] != $captcha_code) {
+        jsAlert($_lang['login_processor_bad_code']);
+        incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
+        return;
+    }
 }
 
 $modx->cleanupExpiredLocks();
@@ -229,36 +229,36 @@ 
 $_SESSION['mgrToken'] = md5($currentsessionid);
 
 if($rememberme == '1') {
-	$_SESSION['modx.mgr.session.cookie.lifetime'] = (int)$modx->config['session.cookie.lifetime'];
-
-	// Set a cookie separate from the session cookie with the username in it.
-	// Are we using secure connection? If so, make sure the cookie is secure
-	global $https_port;
-
-	$secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
-	if(version_compare(PHP_VERSION, '5.2', '<')) {
-		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
-	} else {
-		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
-	}
+    $_SESSION['modx.mgr.session.cookie.lifetime'] = (int)$modx->config['session.cookie.lifetime'];
+
+    // Set a cookie separate from the session cookie with the username in it.
+    // Are we using secure connection? If so, make sure the cookie is secure
+    global $https_port;
+
+    $secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
+    if(version_compare(PHP_VERSION, '5.2', '<')) {
+        setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
+    } else {
+        setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
+    }
 } else {
-	$_SESSION['modx.mgr.session.cookie.lifetime'] = 0;
+    $_SESSION['modx.mgr.session.cookie.lifetime'] = 0;
 
-	// Remove the Remember Me cookie
-	setcookie('modx_remember_manager', '', time() - 3600, MODX_BASE_URL);
+    // Remove the Remember Me cookie
+    setcookie('modx_remember_manager', '', time() - 3600, MODX_BASE_URL);
 }
 
 // Check if user already has an active session, if not check if user pressed logout end of last session
 $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_user_sessions'), "internalKey='{$internalKey}'");
 $activeSession = $modx->db->getValue($rs);
 if(!$activeSession) {
-	$rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
-	if($lastHit = $modx->db->getValue($rs)) {
-		$_SESSION['show_logout_reminder'] = array(
-			'type' => 'logout_reminder',
-			'lastHit' => $lastHit
-		);
-	}
+    $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
+    if($lastHit = $modx->db->getValue($rs)) {
+        $_SESSION['show_logout_reminder'] = array(
+            'type' => 'logout_reminder',
+            'lastHit' => $lastHit
+        );
+    }
 }
 
 $log = new logHandler;
@@ -266,29 +266,29 @@ 
 
 // invoke OnManagerLogin event
 $modx->invokeEvent('OnManagerLogin', array(
-		'userid' => $internalKey,
-		'username' => $username,
-		'userpassword' => $givenPassword,
-		'rememberme' => $rememberme
-	));
+        'userid' => $internalKey,
+        'username' => $username,
+        'userpassword' => $givenPassword,
+        'rememberme' => $rememberme
+    ));
 
 // check if we should redirect user to a web page
 $rs = $modx->db->select('setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_name='manager_login_startup'");
 $id = (int)$modx->db->getValue($rs);
 if($id > 0) {
-	$header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');
-	if($_POST['ajax'] == 1) {
-		echo $header;
-	} else {
-		header($header);
-	}
+    $header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');
+    if($_POST['ajax'] == 1) {
+        echo $header;
+    } else {
+        header($header);
+    }
 } else {
-	$header = 'Location: ' . MODX_MANAGER_URL;
-	if($_POST['ajax'] == 1) {
-		echo $header;
-	} else {
-		header($header);
-	}
+    $header = 'Location: ' . MODX_MANAGER_URL;
+    if($_POST['ajax'] == 1) {
+        echo $header;
+    } else {
+        header($header);
+    }
 }
 
 /**
@@ -297,12 +297,12 @@ 
  * @param string $msg
  */
 function jsAlert($msg) {
-	$modx = evolutionCMS();
-	if($_POST['ajax'] != 1) {
-		echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
-	} else {
-		echo $msg . "\n";
-	}
+    $modx = evolutionCMS();
+    if($_POST['ajax'] != 1) {
+        echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
+    } else {
+        echo $msg . "\n";
+    }
 }
 
 /**
@@ -312,8 +312,8 @@ 
  * @return bool
  */
 function login($username, $givenPassword, $dbasePassword) {
-	$modx = evolutionCMS();
-	return $modx->phpass->CheckPassword($givenPassword, $dbasePassword);
+    $modx = evolutionCMS();
+    return $modx->phpass->CheckPassword($givenPassword, $dbasePassword);
 }
 
 /**
@@ -324,26 +324,26 @@ 
  * @return bool
  */
 function loginV1($internalKey, $givenPassword, $dbasePassword, $username) {
-	$modx = evolutionCMS();
+    $modx = evolutionCMS();
 
-	$user_algo = $modx->manager->getV1UserHashAlgorithm($internalKey);
+    $user_algo = $modx->manager->getV1UserHashAlgorithm($internalKey);
 
-	if(!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) {
-		$modx->config['pwd_hash_algo'] = 'UNCRYPT';
-	}
+    if(!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) {
+        $modx->config['pwd_hash_algo'] = 'UNCRYPT';
+    }
 
-	if($user_algo !== $modx->config['pwd_hash_algo']) {
-		$bk_pwd_hash_algo = $modx->config['pwd_hash_algo'];
-		$modx->config['pwd_hash_algo'] = $user_algo;
-	}
+    if($user_algo !== $modx->config['pwd_hash_algo']) {
+        $bk_pwd_hash_algo = $modx->config['pwd_hash_algo'];
+        $modx->config['pwd_hash_algo'] = $user_algo;
+    }
 
-	if($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) {
-		return false;
-	}
+    if($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) {
+        return false;
+    }
 
-	updateNewHash($username, $givenPassword);
+    updateNewHash($username, $givenPassword);
 
-	return true;
+    return true;
 }
 
 /**
@@ -354,13 +354,13 @@ 
  * @return bool
  */
 function loginMD5($internalKey, $givenPassword, $dbasePassword, $username) {
-	$modx = evolutionCMS();
+    $modx = evolutionCMS();
 
-	if($dbasePassword != md5($givenPassword)) {
-		return false;
-	}
-	updateNewHash($username, $givenPassword);
-	return true;
+    if($dbasePassword != md5($givenPassword)) {
+        return false;
+    }
+    updateNewHash($username, $givenPassword);
+    return true;
 }
 
 /**
@@ -368,11 +368,11 @@ 
  * @param string $password
  */
 function updateNewHash($username, $password) {
-	$modx = evolutionCMS();
+    $modx = evolutionCMS();
 
-	$field = array();
-	$field['password'] = $modx->phpass->HashPassword($password);
-	$modx->db->update($field, '[+prefix+]manager_users', "username='{$username}'");
+    $field = array();
+    $field['password'] = $modx->phpass->HashPassword($password);
+    $modx->db->update($field, '[+prefix+]manager_users', "username='{$username}'");
 }
 
 /**
@@ -382,27 +382,27 @@ 
  * @param int $blocked_minutes
  */
 function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes) {
-	$modx = evolutionCMS();
-
-	$failedlogins += 1;
-
-	$fields = array('failedlogincount' => $failedlogins);
-	if($failedlogins >= $failed_allowed) //block user for too many fail attempts
-	{
-		$fields['blockeduntil'] = time() + ($blocked_minutes * 60);
-	}
-
-	$modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
-
-	if($failedlogins < $failed_allowed) {
-		//sleep to help prevent brute force attacks
-		$sleep = (int) $failedlogins / 2;
-		if($sleep > 5) {
-			$sleep = 5;
-		}
-		sleep($sleep);
-	}
-	@session_destroy();
-	session_unset();
-	return;
+    $modx = evolutionCMS();
+
+    $failedlogins += 1;
+
+    $fields = array('failedlogincount' => $failedlogins);
+    if($failedlogins >= $failed_allowed) //block user for too many fail attempts
+    {
+        $fields['blockeduntil'] = time() + ($blocked_minutes * 60);
+    }
+
+    $modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
+
+    if($failedlogins < $failed_allowed) {
+        //sleep to help prevent brute force attacks
+        $sleep = (int) $failedlogins / 2;
+        if($sleep > 5) {
+            $sleep = 5;
+        }
+        sleep($sleep);
+    }
+    @session_destroy();
+    session_unset();
+    return;
 }

Spacing +62 added lines, -62 removed lines

@@ -1,23 +1,23 @@ 
 <?php
-if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 	header('HTTP/1.0 404 Not Found');
 	exit('error');
 }
-define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through
+define('IN_MANAGER_MODE', true); // we use this to make sure files are accessed through
 define('MODX_API_MODE', true);
-include_once(__DIR__ . '/../../index.php');
+include_once(__DIR__.'/../../index.php');
 $modx->db->connect();
 $modx->getSettings();
 $modx->invokeEvent('OnManagerPageInit');
 $modx->loadExtension('ManagerAPI');
 $modx->loadExtension('phpass');
 
-$core_path = MODX_MANAGER_PATH . 'includes/';
+$core_path = MODX_MANAGER_PATH.'includes/';
 // include_once the language file
 $_lang = array();
 include_once("{$core_path}lang/english.inc.php");
 
-if($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
+if ($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
 	include_once("{$core_path}lang/{$manager_language}.inc.php");
 }
 
@@ -25,7 +25,7 @@ 
 include_once("{$core_path}log.class.inc.php");
 
 // Initialize System Alert Message Queque
-if(!isset($_SESSION['SystemAlertMsgQueque'])) {
+if (!isset($_SESSION['SystemAlertMsgQueque'])) {
 	$_SESSION['SystemAlertMsgQueque'] = array();
 }
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
@@ -51,7 +51,7 @@ 
 $rs = $modx->db->select($fields, $from, $where);
 $limit = $modx->db->getRecordCount($rs);
 
-if($limit == 0 || $limit > 1) {
+if ($limit == 0 || $limit > 1) {
 	jsAlert($_lang['login_processor_unknown_user']);
 	return;
 }
@@ -73,32 +73,32 @@ 
 
 // get the user settings from the database
 $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_value!=''");
-while($row = $modx->db->getRow($rs)) {
+while ($row = $modx->db->getRow($rs)) {
 	extract($row);
 	${$setting_name} = $setting_value;
 }
 
 // blocked due to number of login errors.
-if($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
+if ($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
 	@session_destroy();
 	session_unset();
-	if($cip = getenv("HTTP_CLIENT_IP")) {
+	if ($cip = getenv("HTTP_CLIENT_IP")) {
 		$ip = $cip;
-	} elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
+	} elseif ($cip = getenv("HTTP_X_FORWARDED_FOR")) {
 		$ip = $cip;
-	} elseif($cip = getenv("REMOTE_ADDR")) {
+	} elseif ($cip = getenv("REMOTE_ADDR")) {
 		$ip = $cip;
 	} else {
 		$ip = "UNKNOWN";
 	}
 	$log = new logHandler;
-	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);
+	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: ".$ip);
 	jsAlert($_lang['login_processor_many_failed_logins']);
 	return;
 }
 
 // blocked due to number of login errors, but get to try again
-if($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
+if ($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
 	$fields = array();
 	$fields['failedlogincount'] = '0';
 	$fields['blockeduntil'] = time() - 1;
@@ -106,7 +106,7 @@ 
 }
 
 // this user has been blocked by an admin, so no way he's loggin in!
-if($blocked == '1') {
+if ($blocked == '1') {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked1']);
@@ -114,7 +114,7 @@ 
 }
 
 // blockuntil: this user has a block until date
-if($blockeduntildate > time()) {
+if ($blockeduntildate > time()) {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked2']);
@@ -122,7 +122,7 @@ 
 }
 
 // blockafter: this user has a block after date
-if($blockedafterdate > 0 && $blockedafterdate < time()) {
+if ($blockedafterdate > 0 && $blockedafterdate < time()) {
 	@session_destroy();
 	session_unset();
 	jsAlert($_lang['login_processor_blocked3']);
@@ -130,24 +130,24 @@ 
 }
 
 // allowed ip
-if($allowed_ip) {
-	if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
-		if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
+if ($allowed_ip) {
+	if (($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
+		if (gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
 			jsAlert($_lang['login_processor_remotehost_ip']);
 			return;
 		}
 	}
-	if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
+	if (!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
 		jsAlert($_lang['login_processor_remote_ip']);
 		return;
 	}
 }
 
 // allowed days
-if($allowed_days) {
+if ($allowed_days) {
 	$date = getdate();
 	$day = $date['wday'] + 1;
-	if(strpos($allowed_days, $day) === false) {
+	if (strpos($allowed_days, $day) === false) {
 		jsAlert($_lang['login_processor_date']);
 		return;
 	}
@@ -164,33 +164,33 @@ 
 
 // check if plugin authenticated the user
 $matchPassword = false;
-if(!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
+if (!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
 	// check user password - local authentication
 	$hashType = $modx->manager->getHashType($dbasePassword);
-	if($hashType == 'phpass') {
+	if ($hashType == 'phpass') {
 		$matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
-	} elseif($hashType == 'md5') {
+	} elseif ($hashType == 'md5') {
 		$matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} elseif($hashType == 'v1') {
+	} elseif ($hashType == 'v1') {
 		$matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
 	} else {
 		$matchPassword = false;
 	}
-} else if($rt === true || (is_array($rt) && in_array(true, $rt))) {
+} else if ($rt === true || (is_array($rt) && in_array(true, $rt))) {
 	$matchPassword = true;
 }
 
-if(!$matchPassword) {
+if (!$matchPassword) {
 	jsAlert($_lang['login_processor_wrong_password']);
 	incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
 	return;
 }
 
-if($modx->config['use_captcha'] == 1) {
-	if(!isset ($_SESSION['veriword'])) {
+if ($modx->config['use_captcha'] == 1) {
+	if (!isset ($_SESSION['veriword'])) {
 		jsAlert($_lang['login_processor_captcha_config']);
 		return;
-	} elseif($_SESSION['veriword'] != $captcha_code) {
+	} elseif ($_SESSION['veriword'] != $captcha_code) {
 		jsAlert($_lang['login_processor_bad_code']);
 		incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
 		return;
@@ -218,25 +218,25 @@ 
 $_SESSION['mgrPermissions'] = $modx->db->getRow($rs);
 
 // successful login so reset fail count and update key values
-$modx->db->update('failedlogincount=0, ' . 'logincount=logincount+1, ' . 'lastlogin=thislogin, ' . 'thislogin=' . time() . ', ' . "sessionid='{$currentsessionid}'", '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
+$modx->db->update('failedlogincount=0, '.'logincount=logincount+1, '.'lastlogin=thislogin, '.'thislogin='.time().', '."sessionid='{$currentsessionid}'", '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 
 // get user's document groups
 $i = 0;
-$rs = $modx->db->select('uga.documentgroup', $modx->getFullTableName('member_groups') . ' ug
-		INNER JOIN ' . $modx->getFullTableName('membergroup_access') . ' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");
+$rs = $modx->db->select('uga.documentgroup', $modx->getFullTableName('member_groups').' ug
+		INNER JOIN ' . $modx->getFullTableName('membergroup_access').' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");
 $_SESSION['mgrDocgroups'] = $modx->db->getColumn('documentgroup', $rs);
 
 $_SESSION['mgrToken'] = md5($currentsessionid);
 
-if($rememberme == '1') {
-	$_SESSION['modx.mgr.session.cookie.lifetime'] = (int)$modx->config['session.cookie.lifetime'];
+if ($rememberme == '1') {
+	$_SESSION['modx.mgr.session.cookie.lifetime'] = (int) $modx->config['session.cookie.lifetime'];
 
 	// Set a cookie separate from the session cookie with the username in it.
 	// Are we using secure connection? If so, make sure the cookie is secure
 	global $https_port;
 
 	$secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
-	if(version_compare(PHP_VERSION, '5.2', '<')) {
+	if (version_compare(PHP_VERSION, '5.2', '<')) {
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
 	} else {
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
@@ -251,9 +251,9 @@ 
 // Check if user already has an active session, if not check if user pressed logout end of last session
 $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_user_sessions'), "internalKey='{$internalKey}'");
 $activeSession = $modx->db->getValue($rs);
-if(!$activeSession) {
+if (!$activeSession) {
 	$rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
-	if($lastHit = $modx->db->getValue($rs)) {
+	if ($lastHit = $modx->db->getValue($rs)) {
 		$_SESSION['show_logout_reminder'] = array(
 			'type' => 'logout_reminder',
 			'lastHit' => $lastHit
@@ -274,17 +274,17 @@ 
 
 // check if we should redirect user to a web page
 $rs = $modx->db->select('setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_name='manager_login_startup'");
-$id = (int)$modx->db->getValue($rs);
-if($id > 0) {
-	$header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');
-	if($_POST['ajax'] == 1) {
+$id = (int) $modx->db->getValue($rs);
+if ($id > 0) {
+	$header = 'Location: '.$modx->makeUrl($id, '', '', 'full');
+	if ($_POST['ajax'] == 1) {
 		echo $header;
 	} else {
 		header($header);
 	}
 } else {
-	$header = 'Location: ' . MODX_MANAGER_URL;
-	if($_POST['ajax'] == 1) {
+	$header = 'Location: '.MODX_MANAGER_URL;
+	if ($_POST['ajax'] == 1) {
 		echo $header;
 	} else {
 		header($header);
@@ -296,12 +296,12 @@ 
  *
  * @param string $msg
  */
-function jsAlert($msg) {
+function jsAlert($msg){
 	$modx = evolutionCMS();
-	if($_POST['ajax'] != 1) {
-		echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
+	if ($_POST['ajax'] != 1) {
+		echo "<script>window.setTimeout(\"alert('".addslashes($modx->db->escape($msg))."')\",10);history.go(-1)</script>";
 	} else {
-		echo $msg . "\n";
+		echo $msg."\n";
 	}
 }
 
@@ -311,7 +311,7 @@ 
  * @param string $dbasePassword
  * @return bool
  */
-function login($username, $givenPassword, $dbasePassword) {
+function login($username, $givenPassword, $dbasePassword){
 	$modx = evolutionCMS();
 	return $modx->phpass->CheckPassword($givenPassword, $dbasePassword);
 }
@@ -323,21 +323,21 @@ 
  * @param string $username
  * @return bool
  */
-function loginV1($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginV1($internalKey, $givenPassword, $dbasePassword, $username){
 	$modx = evolutionCMS();
 
 	$user_algo = $modx->manager->getV1UserHashAlgorithm($internalKey);
 
-	if(!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) {
+	if (!isset($modx->config['pwd_hash_algo']) || empty($modx->config['pwd_hash_algo'])) {
 		$modx->config['pwd_hash_algo'] = 'UNCRYPT';
 	}
 
-	if($user_algo !== $modx->config['pwd_hash_algo']) {
+	if ($user_algo !== $modx->config['pwd_hash_algo']) {
 		$bk_pwd_hash_algo = $modx->config['pwd_hash_algo'];
 		$modx->config['pwd_hash_algo'] = $user_algo;
 	}
 
-	if($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) {
+	if ($dbasePassword != $modx->manager->genV1Hash($givenPassword, $internalKey)) {
 		return false;
 	}
 
@@ -353,10 +353,10 @@ 
  * @param string $username
  * @return bool
  */
-function loginMD5($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginMD5($internalKey, $givenPassword, $dbasePassword, $username){
 	$modx = evolutionCMS();
 
-	if($dbasePassword != md5($givenPassword)) {
+	if ($dbasePassword != md5($givenPassword)) {
 		return false;
 	}
 	updateNewHash($username, $givenPassword);
@@ -367,7 +367,7 @@ 
  * @param string $username
  * @param string $password
  */
-function updateNewHash($username, $password) {
+function updateNewHash($username, $password){
 	$modx = evolutionCMS();
 
 	$field = array();
@@ -381,23 +381,23 @@ 
  * @param int $failed_allowed
  * @param int $blocked_minutes
  */
-function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes) {
+function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes){
 	$modx = evolutionCMS();
 
 	$failedlogins += 1;
 
 	$fields = array('failedlogincount' => $failedlogins);
-	if($failedlogins >= $failed_allowed) //block user for too many fail attempts
+	if ($failedlogins >= $failed_allowed) //block user for too many fail attempts
 	{
 		$fields['blockeduntil'] = time() + ($blocked_minutes * 60);
 	}
 
 	$modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 
-	if($failedlogins < $failed_allowed) {
+	if ($failedlogins < $failed_allowed) {
 		//sleep to help prevent brute force attacks
 		$sleep = (int) $failedlogins / 2;
-		if($sleep > 5) {
+		if ($sleep > 5) {
 			$sleep = 5;
 		}
 		sleep($sleep);

Braces +15 added lines, -7 removed lines

@@ -296,7 +296,8 @@ 
  *
  * @param string $msg
  */
-function jsAlert($msg) {
+function jsAlert($msg)
+{
 	$modx = evolutionCMS();
 	if($_POST['ajax'] != 1) {
 		echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
@@ -311,7 +312,8 @@ 
  * @param string $dbasePassword
  * @return bool
  */
-function login($username, $givenPassword, $dbasePassword) {
+function login($username, $givenPassword, $dbasePassword)
+{
 	$modx = evolutionCMS();
 	return $modx->phpass->CheckPassword($givenPassword, $dbasePassword);
 }
@@ -323,7 +325,8 @@ 
  * @param string $username
  * @return bool
  */
-function loginV1($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginV1($internalKey, $givenPassword, $dbasePassword, $username)
+{
 	$modx = evolutionCMS();
 
 	$user_algo = $modx->manager->getV1UserHashAlgorithm($internalKey);
@@ -353,7 +356,8 @@ 
  * @param string $username
  * @return bool
  */
-function loginMD5($internalKey, $givenPassword, $dbasePassword, $username) {
+function loginMD5($internalKey, $givenPassword, $dbasePassword, $username)
+{
 	$modx = evolutionCMS();
 
 	if($dbasePassword != md5($givenPassword)) {
@@ -367,7 +371,8 @@ 
  * @param string $username
  * @param string $password
  */
-function updateNewHash($username, $password) {
+function updateNewHash($username, $password)
+{
 	$modx = evolutionCMS();
 
 	$field = array();
@@ -381,16 +386,19 @@ 
  * @param int $failed_allowed
  * @param int $blocked_minutes
  */
-function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes) {
+function incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes)
+{
 	$modx = evolutionCMS();
 
 	$failedlogins += 1;
 
 	$fields = array('failedlogincount' => $failedlogins);
-	if($failedlogins >= $failed_allowed) //block user for too many fail attempts
+	if($failedlogins >= $failed_allowed) {
+	    //block user for too many fail attempts
 	{
 		$fields['blockeduntil'] = time() + ($blocked_minutes * 60);
 	}
+	}
 
 	$modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 

manager/processors/save_user.processor.php

Indentation +368 added lines, -368 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $modx->loadExtension('phpass');
@@ -45,134 +45,134 @@ 
 
 // verify password
 if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
-	webAlertAndQuit("Password typed is mismatched");
+    webAlertAndQuit("Password typed is mismatched");
 }
 
 // verify email
 if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
-	webAlertAndQuit("E-mail address doesn't seem to be valid!");
+    webAlertAndQuit("E-mail address doesn't seem to be valid!");
 }
 
 // verify admin security
 if($_SESSION['mgrRole'] != 1) {
-	// Check to see if user tried to spoof a "1" (admin) role
-	if(!$modx->hasPermission('save_role')) {
-		webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!");
-	}
-	// Verify that the user being edited wasn't an admin and the user ID got spoofed
-	$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, "internalKey='{$id}' AND role=1");
-	$limit = $modx->db->getValue($rs);
-	if($limit > 0) {
-		webAlertAndQuit("You cannot alter an administrative user.");
-	}
+    // Check to see if user tried to spoof a "1" (admin) role
+    if(!$modx->hasPermission('save_role')) {
+        webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!");
+    }
+    // Verify that the user being edited wasn't an admin and the user ID got spoofed
+    $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, "internalKey='{$id}' AND role=1");
+    $limit = $modx->db->getValue($rs);
+    if($limit > 0) {
+        webAlertAndQuit("You cannot alter an administrative user.");
+    }
 
 }
 
 switch($input['mode']) {
-	case '11' : // new user
-		// check if this user name already exist
-		$rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s'", $modx->db->escape($newusername)));
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exist
-		$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND id!='%s'", $modx->db->escape($email), $id));
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
-				webAlertAndQuit("Password is too short!");
-			} else {
-				$newpassword = $specifiedpassword;
-			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
-			$newpassword = generate_password(8);
-		} else {
-			webAlertAndQuit("No password generation method specified!");
-		}
-
-		// invoke OnBeforeUserFormSave event
-		$modx->invokeEvent("OnBeforeUserFormSave", array(
-			"mode" => "new",
-		));
-
-		// create the user account
-		$internalKey = $modx->db->insert(array('username' => $modx->db->escape($newusername)), $tbl_manager_users);
-
-		$field = array();
-		$field['password'] = $modx->phpass->HashPassword($newpassword);
-		$modx->db->update($field, $tbl_manager_users, "id='{$internalKey}'");
-
-		$field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->insert($field, $tbl_user_attributes);
-
-		// Save user settings
-		saveUserSettings($internalKey);
-
-		// invoke OnManagerSaveUser event
-		$modx->invokeEvent("OnManagerSaveUser", array(
-			"mode" => "new",
-			"userid" => $internalKey,
-			"username" => $newusername,
-			"userpassword" => $newpassword,
-			"useremail" => $email,
-			"userfullname" => $fullname,
-			"userroleid" => $role
-		));
-
-		// invoke OnUserFormSave event
-		$modx->invokeEvent("OnUserFormSave", array(
-			"mode" => "new",
-			"id" => $internalKey
-		));
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$f = array();
-					$f['user_group'] = (int)$user_groups[$i];
-					$f['member'] = $internalKey;
-					$modx->db->insert($f, $tbl_member_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=75&r=2";
-				header($header);
-			}
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=75&r=2";
-			}
-
-			include_once "header.inc.php";
-			?>
+    case '11' : // new user
+        // check if this user name already exist
+        $rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s'", $modx->db->escape($newusername)));
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("User name is already in use!");
+        }
+
+        // check if the email address already exist
+        $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND id!='%s'", $modx->db->escape($email), $id));
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("Email is already in use!");
+        }
+
+        // generate a new password for this user
+        if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+            if(strlen($specifiedpassword) < 6) {
+                webAlertAndQuit("Password is too short!");
+            } else {
+                $newpassword = $specifiedpassword;
+            }
+        } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+            webAlertAndQuit("You didn't specify a password for this user!");
+        } elseif($passwordgenmethod == 'g') {
+            $newpassword = generate_password(8);
+        } else {
+            webAlertAndQuit("No password generation method specified!");
+        }
+
+        // invoke OnBeforeUserFormSave event
+        $modx->invokeEvent("OnBeforeUserFormSave", array(
+            "mode" => "new",
+        ));
+
+        // create the user account
+        $internalKey = $modx->db->insert(array('username' => $modx->db->escape($newusername)), $tbl_manager_users);
+
+        $field = array();
+        $field['password'] = $modx->phpass->HashPassword($newpassword);
+        $modx->db->update($field, $tbl_manager_users, "id='{$internalKey}'");
+
+        $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
+        $field = $modx->db->escape($field);
+        $modx->db->insert($field, $tbl_user_attributes);
+
+        // Save user settings
+        saveUserSettings($internalKey);
+
+        // invoke OnManagerSaveUser event
+        $modx->invokeEvent("OnManagerSaveUser", array(
+            "mode" => "new",
+            "userid" => $internalKey,
+            "username" => $newusername,
+            "userpassword" => $newpassword,
+            "useremail" => $email,
+            "userfullname" => $fullname,
+            "userroleid" => $role
+        ));
+
+        // invoke OnUserFormSave event
+        $modx->invokeEvent("OnUserFormSave", array(
+            "mode" => "new",
+            "id" => $internalKey
+        ));
+
+        // Set the item name for logger
+        $_SESSION['itemname'] = $newusername;
+
+        /*******************************************************************************/
+        // put the user in the user_groups he/ she should be in
+        // first, check that up_perms are switched on!
+        if($use_udperms == 1) {
+            if(!empty($user_groups)) {
+                for($i = 0; $i < count($user_groups); $i++) {
+                    $f = array();
+                    $f['user_group'] = (int)$user_groups[$i];
+                    $f['member'] = $internalKey;
+                    $modx->db->insert($f, $tbl_member_groups);
+                }
+            }
+        }
+        // end of user_groups stuff!
+
+        if($passwordnotifymethod == 'e') {
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=75&r=2";
+                header($header);
+            }
+        } else {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+            } else {
+                $stayUrl = "index.php?a=75&r=2";
+            }
+
+            include_once "header.inc.php";
+            ?>
 
 			<h1><?php echo $_lang['user_title']; ?></h1>
 
@@ -194,125 +194,125 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		}
-		break;
-	case '12' : // edit user
-		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
-					webAlertAndQuit("Password is too short!");
-				} else {
-					$newpassword = $specifiedpassword;
-				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
-				$newpassword = generate_password(8);
-			} else {
-				webAlertAndQuit("No password generation method specified!");
-			}
-		}
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-		}
-
-		// check if the username already exist
-		$rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s' AND id!='%s'", $modx->db->escape($newusername), $id));
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exists
-		$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND internalKey!='%s'", $modx->db->escape($email), $id));
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// invoke OnBeforeUserFormSave event
-		$modx->invokeEvent("OnBeforeUserFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		// update user name and password
-		$field = array();
-		$field['username'] = $modx->db->escape($newusername);
-		if($genpassword == 1) {
-			$field['password'] = $modx->phpass->HashPassword($newpassword);
-		}
-		$modx->db->update($field, $tbl_manager_users, "id='{$id}'");
-		$field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->update($field, $tbl_user_attributes, "internalKey='{$id}'");
-
-		// Save user settings
-		saveUserSettings($id);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		// invoke OnManagerSaveUser event
-		$modx->invokeEvent("OnManagerSaveUser", array(
-			"mode" => "upd",
-			"userid" => $id,
-			"username" => $newusername,
-			"userpassword" => $newpassword,
-			"useremail" => $email,
-			"userfullname" => $fullname,
-			"userroleid" => $role,
-			"oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
-			"olduseremail" => (($oldemail != $email) ? $oldemail : "")
-		));
-
-		// invoke OnManagerChangePassword event
-		if($genpassword == 1) {
-			$modx->invokeEvent("OnManagerChangePassword", array(
-				"userid" => $id,
-				"username" => $newusername,
-				"userpassword" => $newpassword
-			));
-		}
-
-		// invoke OnUserFormSave event
-		$modx->invokeEvent("OnUserFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
-			$modx->db->delete($tbl_member_groups, "member='{$id}'");
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$field = array();
-					$field['user_group'] = (int)$user_groups[$i];
-					$field['member'] = $id;
-					$modx->db->insert($field, $tbl_member_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-		/*******************************************************************************/
-		if($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) {
-			$modx->webAlertAndQuit($_lang["user_changeddata"], 'javascript:top.location.href="index.php?a=8";');
-		}
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=75&r=2";
-			}
-
-			include_once "header.inc.php";
-			?>
+            include_once "footer.inc.php";
+        }
+        break;
+    case '12' : // edit user
+        // generate a new password for this user
+        if($genpassword == 1) {
+            if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+                if(strlen($specifiedpassword) < 6) {
+                    webAlertAndQuit("Password is too short!");
+                } else {
+                    $newpassword = $specifiedpassword;
+                }
+            } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+                webAlertAndQuit("You didn't specify a password for this user!");
+            } elseif($passwordgenmethod == 'g') {
+                $newpassword = generate_password(8);
+            } else {
+                webAlertAndQuit("No password generation method specified!");
+            }
+        }
+        if($passwordnotifymethod == 'e') {
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
+        }
+
+        // check if the username already exist
+        $rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s' AND id!='%s'", $modx->db->escape($newusername), $id));
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("User name is already in use!");
+        }
+
+        // check if the email address already exists
+        $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND internalKey!='%s'", $modx->db->escape($email), $id));
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("Email is already in use!");
+        }
+
+        // invoke OnBeforeUserFormSave event
+        $modx->invokeEvent("OnBeforeUserFormSave", array(
+            "mode" => "upd",
+            "id" => $id
+        ));
+
+        // update user name and password
+        $field = array();
+        $field['username'] = $modx->db->escape($newusername);
+        if($genpassword == 1) {
+            $field['password'] = $modx->phpass->HashPassword($newpassword);
+        }
+        $modx->db->update($field, $tbl_manager_users, "id='{$id}'");
+        $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
+        $field = $modx->db->escape($field);
+        $modx->db->update($field, $tbl_user_attributes, "internalKey='{$id}'");
+
+        // Save user settings
+        saveUserSettings($id);
+
+        // Set the item name for logger
+        $_SESSION['itemname'] = $newusername;
+
+        // invoke OnManagerSaveUser event
+        $modx->invokeEvent("OnManagerSaveUser", array(
+            "mode" => "upd",
+            "userid" => $id,
+            "username" => $newusername,
+            "userpassword" => $newpassword,
+            "useremail" => $email,
+            "userfullname" => $fullname,
+            "userroleid" => $role,
+            "oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
+            "olduseremail" => (($oldemail != $email) ? $oldemail : "")
+        ));
+
+        // invoke OnManagerChangePassword event
+        if($genpassword == 1) {
+            $modx->invokeEvent("OnManagerChangePassword", array(
+                "userid" => $id,
+                "username" => $newusername,
+                "userpassword" => $newpassword
+            ));
+        }
+
+        // invoke OnUserFormSave event
+        $modx->invokeEvent("OnUserFormSave", array(
+            "mode" => "upd",
+            "id" => $id
+        ));
+
+        /*******************************************************************************/
+        // put the user in the user_groups he/ she should be in
+        // first, check that up_perms are switched on!
+        if($use_udperms == 1) {
+            // as this is an existing user, delete his/ her entries in the groups before saving the new groups
+            $modx->db->delete($tbl_member_groups, "member='{$id}'");
+            if(!empty($user_groups)) {
+                for($i = 0; $i < count($user_groups); $i++) {
+                    $field = array();
+                    $field['user_group'] = (int)$user_groups[$i];
+                    $field['member'] = $id;
+                    $modx->db->insert($field, $tbl_member_groups);
+                }
+            }
+        }
+        // end of user_groups stuff!
+        /*******************************************************************************/
+        if($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) {
+            $modx->webAlertAndQuit($_lang["user_changeddata"], 'javascript:top.location.href="index.php?a=8";');
+        }
+        if($genpassword == 1 && $passwordnotifymethod == 's') {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+            } else {
+                $stayUrl = "index.php?a=75&r=2";
+            }
+
+            include_once "header.inc.php";
+            ?>
 
 			<h1><?php echo $_lang['user_title']; ?></h1>
 
@@ -332,20 +332,20 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=75&r=2";
-				header($header);
-			}
-		}
-		break;
-	default:
-		webAlertAndQuit("No operation set in request.");
+            include_once "footer.inc.php";
+        } else {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=75&r=2";
+                header($header);
+            }
+        }
+        break;
+    default:
+        webAlertAndQuit("No operation set in request.");
 }
 
 /**
@@ -357,31 +357,31 @@ 
  * @param string $ufn
  */
 function sendMailMessage($email, $uid, $pwd, $ufn) {
-	$modx = evolutionCMS(); global $_lang, $signupemail_message;
-	global $emailsubject, $emailsender;
-	global $site_name;
-	$manager_url = MODX_MANAGER_URL;
-	$message = sprintf($signupemail_message, $uid, $pwd); // use old method
-	// replace placeholders
-	$message = str_replace("[+uid+]", $uid, $message);
-	$message = str_replace("[+pwd+]", $pwd, $message);
-	$message = str_replace("[+ufn+]", $ufn, $message);
-	$message = str_replace("[+sname+]", $site_name, $message);
-	$message = str_replace("[+saddr+]", $emailsender, $message);
-	$message = str_replace("[+semail+]", $emailsender, $message);
-	$message = str_replace("[+surl+]", $manager_url, $message);
-
-	$param = array();
-	$param['from'] = "{$site_name}<{$emailsender}>";
-	$param['subject'] = $emailsubject;
-	$param['body'] = $message;
-	$param['to'] = $email;
-	$param['type'] = 'text';
-	$rs = $modx->sendmail($param);
-	if(!$rs) {
-		$modx->manager->saveFormValues();
-		$modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
-	}
+    $modx = evolutionCMS(); global $_lang, $signupemail_message;
+    global $emailsubject, $emailsender;
+    global $site_name;
+    $manager_url = MODX_MANAGER_URL;
+    $message = sprintf($signupemail_message, $uid, $pwd); // use old method
+    // replace placeholders
+    $message = str_replace("[+uid+]", $uid, $message);
+    $message = str_replace("[+pwd+]", $pwd, $message);
+    $message = str_replace("[+ufn+]", $ufn, $message);
+    $message = str_replace("[+sname+]", $site_name, $message);
+    $message = str_replace("[+saddr+]", $emailsender, $message);
+    $message = str_replace("[+semail+]", $emailsender, $message);
+    $message = str_replace("[+surl+]", $manager_url, $message);
+
+    $param = array();
+    $param['from'] = "{$site_name}<{$emailsender}>";
+    $param['subject'] = $emailsubject;
+    $param['body'] = $message;
+    $param['to'] = $email;
+    $param['type'] = 'text';
+    $rs = $modx->sendmail($param);
+    if(!$rs) {
+        $modx->manager->saveFormValues();
+        $modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
+    }
 }
 
 /**
@@ -390,86 +390,86 @@ 
  * @param int $id
  */
 function saveUserSettings($id) {
-	$modx = evolutionCMS();
-	$tbl_user_settings = $modx->getFullTableName('user_settings');
-
-	$ignore = array(
-		'id',
-		'oldusername',
-		'oldemail',
-		'newusername',
-		'fullname',
-		'newpassword',
-		'newpasswordcheck',
-		'passwordgenmethod',
-		'passwordnotifymethod',
-		'specifiedpassword',
-		'confirmpassword',
-		'email',
-		'phone',
-		'mobilephone',
-		'fax',
-		'dob',
-		'country',
-		'street',
-		'city',
-		'state',
-		'zip',
-		'gender',
-		'photo',
-		'comment',
-		'role',
-		'failedlogincount',
-		'blocked',
-		'blockeduntil',
-		'blockedafter',
-		'user_groups',
-		'mode',
-		'blockedmode',
-		'stay',
-		'save',
-		'theme_refresher'
-	);
-
-	// determine which settings can be saved blank (based on 'default_{settingname}' POST checkbox values)
-	$defaults = array(
-		'upload_images',
-		'upload_media',
-		'upload_flash',
-		'upload_files'
-	);
-
-	// get user setting field names
-	$settings = array();
-	foreach($_POST as $n => $v) {
-		if(in_array($n, $ignore) || (!in_array($n, $defaults) && is_scalar($v) && trim($v) == '') || (!in_array($n, $defaults) && is_array($v) && empty($v))) {
-			continue;
-		} // ignore blacklist and empties
-		$settings[$n] = $v; // this value should be saved
-	}
-
-	foreach($defaults as $k) {
-		if(isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') {
-			unset($settings[$k]);
-		}
-		unset($settings['default_' . $k]);
-	}
-
-	$modx->db->delete($tbl_user_settings, "user='{$id}'");
-
-	foreach($settings as $n => $vl) {
-		if(is_array($vl)) {
-			$vl = implode(",", $vl);
-		}
-		if($vl != '') {
-			$f = array();
-			$f['user'] = $id;
-			$f['setting_name'] = $n;
-			$f['setting_value'] = $vl;
-			$f = $modx->db->escape($f);
-			$modx->db->insert($f, $tbl_user_settings);
-		}
-	}
+    $modx = evolutionCMS();
+    $tbl_user_settings = $modx->getFullTableName('user_settings');
+
+    $ignore = array(
+        'id',
+        'oldusername',
+        'oldemail',
+        'newusername',
+        'fullname',
+        'newpassword',
+        'newpasswordcheck',
+        'passwordgenmethod',
+        'passwordnotifymethod',
+        'specifiedpassword',
+        'confirmpassword',
+        'email',
+        'phone',
+        'mobilephone',
+        'fax',
+        'dob',
+        'country',
+        'street',
+        'city',
+        'state',
+        'zip',
+        'gender',
+        'photo',
+        'comment',
+        'role',
+        'failedlogincount',
+        'blocked',
+        'blockeduntil',
+        'blockedafter',
+        'user_groups',
+        'mode',
+        'blockedmode',
+        'stay',
+        'save',
+        'theme_refresher'
+    );
+
+    // determine which settings can be saved blank (based on 'default_{settingname}' POST checkbox values)
+    $defaults = array(
+        'upload_images',
+        'upload_media',
+        'upload_flash',
+        'upload_files'
+    );
+
+    // get user setting field names
+    $settings = array();
+    foreach($_POST as $n => $v) {
+        if(in_array($n, $ignore) || (!in_array($n, $defaults) && is_scalar($v) && trim($v) == '') || (!in_array($n, $defaults) && is_array($v) && empty($v))) {
+            continue;
+        } // ignore blacklist and empties
+        $settings[$n] = $v; // this value should be saved
+    }
+
+    foreach($defaults as $k) {
+        if(isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') {
+            unset($settings[$k]);
+        }
+        unset($settings['default_' . $k]);
+    }
+
+    $modx->db->delete($tbl_user_settings, "user='{$id}'");
+
+    foreach($settings as $n => $vl) {
+        if(is_array($vl)) {
+            $vl = implode(",", $vl);
+        }
+        if($vl != '') {
+            $f = array();
+            $f['user'] = $id;
+            $f['setting_name'] = $n;
+            $f['setting_value'] = $vl;
+            $f = $modx->db->escape($f);
+            $modx->db->insert($f, $tbl_user_settings);
+        }
+    }
 }
 
 /**
@@ -478,10 +478,10 @@ 
  * @param $msg
  */
 function webAlertAndQuit($msg) {
-	global $id, $modx;
-	$mode = $_POST['mode'];
-	$modx->manager->saveFormValues($mode);
-	$modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '12' ? "&id={$id}" : ''));
+    global $id, $modx;
+    $mode = $_POST['mode'];
+    $modx->manager->saveFormValues($mode);
+    $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '12' ? "&id={$id}" : ''));
 }
 
 /**
@@ -491,12 +491,12 @@ 
  * @return string
  */
 function generate_password($length = 10) {
-	$allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
-	$ps_len = strlen($allowable_characters);
-	mt_srand((double) microtime() * 1000000);
-	$pass = "";
-	for($i = 0; $i < $length; $i++) {
-		$pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
-	}
-	return $pass;
+    $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+    $ps_len = strlen($allowable_characters);
+    mt_srand((double) microtime() * 1000000);
+    $pass = "";
+    for($i = 0; $i < $length; $i++) {
+        $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
+    }
+    return $pass;
 }

Spacing +60 added lines, -60 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('save_user')) {
+if (!$modx->hasPermission('save_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -14,7 +14,7 @@ 
 
 $input = $_POST;
 
-$id = (int)$input['id'];
+$id = (int) $input['id'];
 $oldusername = $input['oldusername'];
 $newusername = !empty ($input['newusername']) ? trim($input['newusername']) : "New User";
 $fullname = $input['fullname'];
@@ -44,56 +44,56 @@ 
 $user_groups = $input['user_groups'];
 
 // verify password
-if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
+if ($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
 	webAlertAndQuit("Password typed is mismatched");
 }
 
 // verify email
-if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
+if ($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
 	webAlertAndQuit("E-mail address doesn't seem to be valid!");
 }
 
 // verify admin security
-if($_SESSION['mgrRole'] != 1) {
+if ($_SESSION['mgrRole'] != 1) {
 	// Check to see if user tried to spoof a "1" (admin) role
-	if(!$modx->hasPermission('save_role')) {
+	if (!$modx->hasPermission('save_role')) {
 		webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!");
 	}
 	// Verify that the user being edited wasn't an admin and the user ID got spoofed
 	$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, "internalKey='{$id}' AND role=1");
 	$limit = $modx->db->getValue($rs);
-	if($limit > 0) {
+	if ($limit > 0) {
 		webAlertAndQuit("You cannot alter an administrative user.");
 	}
 
 }
 
-switch($input['mode']) {
+switch ($input['mode']) {
 	case '11' : // new user
 		// check if this user name already exist
 		$rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s'", $modx->db->escape($newusername)));
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("User name is already in use!");
 		}
 
 		// check if the email address already exist
 		$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND id!='%s'", $modx->db->escape($email), $id));
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("Email is already in use!");
 		}
 
 		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
+		if ($specifiedpassword != "" && $passwordgenmethod == "spec") {
+			if (strlen($specifiedpassword) < 6) {
 				webAlertAndQuit("Password is too short!");
 			} else {
 				$newpassword = $specifiedpassword;
 			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+		} elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {
 			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
+		} elseif ($passwordgenmethod == 'g') {
 			$newpassword = generate_password(8);
 		} else {
 			webAlertAndQuit("No password generation method specified!");
@@ -141,11 +141,11 @@ 
 		/*******************************************************************************/
 		// put the user in the user_groups he/ she should be in
 		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
+		if ($use_udperms == 1) {
+			if (!empty($user_groups)) {
+				for ($i = 0; $i < count($user_groups); $i++) {
 					$f = array();
-					$f['user_group'] = (int)$user_groups[$i];
+					$f['user_group'] = (int) $user_groups[$i];
 					$f['member'] = $internalKey;
 					$modx->db->insert($f, $tbl_member_groups);
 				}
@@ -153,20 +153,20 @@ 
 		}
 		// end of user_groups stuff!
 
-		if($passwordnotifymethod == 'e') {
+		if ($passwordnotifymethod == 'e') {
 			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$header = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];
 				header($header);
 			} else {
 				$header = "Location: index.php?a=75&r=2";
 				header($header);
 			}
 		} else {
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay'];
 			} else {
 				$stayUrl = "index.php?a=75&r=2";
 			}
@@ -199,36 +199,36 @@ 
 		break;
 	case '12' : // edit user
 		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
+		if ($genpassword == 1) {
+			if ($specifiedpassword != "" && $passwordgenmethod == "spec") {
+				if (strlen($specifiedpassword) < 6) {
 					webAlertAndQuit("Password is too short!");
 				} else {
 					$newpassword = $specifiedpassword;
 				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+			} elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {
 				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
+			} elseif ($passwordgenmethod == 'g') {
 				$newpassword = generate_password(8);
 			} else {
 				webAlertAndQuit("No password generation method specified!");
 			}
 		}
-		if($passwordnotifymethod == 'e') {
+		if ($passwordnotifymethod == 'e') {
 			sendMailMessage($email, $newusername, $newpassword, $fullname);
 		}
 
 		// check if the username already exist
 		$rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s' AND id!='%s'", $modx->db->escape($newusername), $id));
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("User name is already in use!");
 		}
 
 		// check if the email address already exists
 		$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND internalKey!='%s'", $modx->db->escape($email), $id));
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("Email is already in use!");
 		}
 
@@ -241,7 +241,7 @@ 
 		// update user name and password
 		$field = array();
 		$field['username'] = $modx->db->escape($newusername);
-		if($genpassword == 1) {
+		if ($genpassword == 1) {
 			$field['password'] = $modx->phpass->HashPassword($newpassword);
 		}
 		$modx->db->update($field, $tbl_manager_users, "id='{$id}'");
@@ -269,7 +269,7 @@ 
 		));
 
 		// invoke OnManagerChangePassword event
-		if($genpassword == 1) {
+		if ($genpassword == 1) {
 			$modx->invokeEvent("OnManagerChangePassword", array(
 				"userid" => $id,
 				"username" => $newusername,
@@ -286,13 +286,13 @@ 
 		/*******************************************************************************/
 		// put the user in the user_groups he/ she should be in
 		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
+		if ($use_udperms == 1) {
 			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
 			$modx->db->delete($tbl_member_groups, "member='{$id}'");
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
+			if (!empty($user_groups)) {
+				for ($i = 0; $i < count($user_groups); $i++) {
 					$field = array();
-					$field['user_group'] = (int)$user_groups[$i];
+					$field['user_group'] = (int) $user_groups[$i];
 					$field['member'] = $id;
 					$modx->db->insert($field, $tbl_member_groups);
 				}
@@ -300,13 +300,13 @@ 
 		}
 		// end of user_groups stuff!
 		/*******************************************************************************/
-		if($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) {
+		if ($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) {
 			$modx->webAlertAndQuit($_lang["user_changeddata"], 'javascript:top.location.href="index.php?a=8";');
 		}
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
+		if ($genpassword == 1 && $passwordnotifymethod == 's') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay'];
 			} else {
 				$stayUrl = "index.php?a=75&r=2";
 			}
@@ -326,7 +326,7 @@ 
 				<div class="sectionHeader"><?php echo $_lang['user_title']; ?></div>
 				<div class="sectionBody">
 					<div id="disp">
-						<p><?php echo sprintf($_lang["password_msg"], $modx->htmlspecialchars($newusername), $modx->htmlspecialchars($newpassword)) . (($id == $modx->getLoginUserID()) ? ' ' . $_lang['user_changeddata'] : ''); ?></p>
+						<p><?php echo sprintf($_lang["password_msg"], $modx->htmlspecialchars($newusername), $modx->htmlspecialchars($newpassword)).(($id == $modx->getLoginUserID()) ? ' '.$_lang['user_changeddata'] : ''); ?></p>
 					</div>
 				</div>
 			</div>
@@ -334,9 +334,9 @@ 
 
 			include_once "footer.inc.php";
 		} else {
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$header = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];
 				header($header);
 			} else {
 				$header = "Location: index.php?a=75&r=2";
@@ -356,7 +356,7 @@ 
  * @param string $pwd
  * @param string $ufn
  */
-function sendMailMessage($email, $uid, $pwd, $ufn) {
+function sendMailMessage($email, $uid, $pwd, $ufn){
 	$modx = evolutionCMS(); global $_lang, $signupemail_message;
 	global $emailsubject, $emailsender;
 	global $site_name;
@@ -378,7 +378,7 @@ 
 	$param['to'] = $email;
 	$param['type'] = 'text';
 	$rs = $modx->sendmail($param);
-	if(!$rs) {
+	if (!$rs) {
 		$modx->manager->saveFormValues();
 		$modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
 	}
@@ -389,7 +389,7 @@ 
  *
  * @param int $id
  */
-function saveUserSettings($id) {
+function saveUserSettings($id){
 	$modx = evolutionCMS();
 	$tbl_user_settings = $modx->getFullTableName('user_settings');
 
@@ -441,27 +441,27 @@ 
 
 	// get user setting field names
 	$settings = array();
-	foreach($_POST as $n => $v) {
-		if(in_array($n, $ignore) || (!in_array($n, $defaults) && is_scalar($v) && trim($v) == '') || (!in_array($n, $defaults) && is_array($v) && empty($v))) {
+	foreach ($_POST as $n => $v) {
+		if (in_array($n, $ignore) || (!in_array($n, $defaults) && is_scalar($v) && trim($v) == '') || (!in_array($n, $defaults) && is_array($v) && empty($v))) {
 			continue;
 		} // ignore blacklist and empties
 		$settings[$n] = $v; // this value should be saved
 	}
 
-	foreach($defaults as $k) {
-		if(isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') {
+	foreach ($defaults as $k) {
+		if (isset($settings['default_'.$k]) && $settings['default_'.$k] == '1') {
 			unset($settings[$k]);
 		}
-		unset($settings['default_' . $k]);
+		unset($settings['default_'.$k]);
 	}
 
 	$modx->db->delete($tbl_user_settings, "user='{$id}'");
 
-	foreach($settings as $n => $vl) {
-		if(is_array($vl)) {
+	foreach ($settings as $n => $vl) {
+		if (is_array($vl)) {
 			$vl = implode(",", $vl);
 		}
-		if($vl != '') {
+		if ($vl != '') {
 			$f = array();
 			$f['user'] = $id;
 			$f['setting_name'] = $n;
@@ -477,11 +477,11 @@ 
  *
  * @param $msg
  */
-function webAlertAndQuit($msg) {
+function webAlertAndQuit($msg){
 	global $id, $modx;
 	$mode = $_POST['mode'];
 	$modx->manager->saveFormValues($mode);
-	$modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '12' ? "&id={$id}" : ''));
+	$modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode == '12' ? "&id={$id}" : ''));
 }
 
 /**
@@ -490,12 +490,12 @@ 
  * @param int $length
  * @return string
  */
-function generate_password($length = 10) {
+function generate_password($length = 10){
 	$allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
 	$ps_len = strlen($allowable_characters);
 	mt_srand((double) microtime() * 1000000);
 	$pass = "";
-	for($i = 0; $i < $length; $i++) {
+	for ($i = 0; $i < $length; $i++) {
 		$pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
 	}
 	return $pass;

Braces +8 added lines, -4 removed lines

@@ -356,7 +356,8 @@ 
  * @param string $pwd
  * @param string $ufn
  */
-function sendMailMessage($email, $uid, $pwd, $ufn) {
+function sendMailMessage($email, $uid, $pwd, $ufn)
+{
 	$modx = evolutionCMS(); global $_lang, $signupemail_message;
 	global $emailsubject, $emailsender;
 	global $site_name;
@@ -389,7 +390,8 @@ 
  *
  * @param int $id
  */
-function saveUserSettings($id) {
+function saveUserSettings($id)
+{
 	$modx = evolutionCMS();
 	$tbl_user_settings = $modx->getFullTableName('user_settings');
 
@@ -477,7 +479,8 @@ 
  *
  * @param $msg
  */
-function webAlertAndQuit($msg) {
+function webAlertAndQuit($msg)
+{
 	global $id, $modx;
 	$mode = $_POST['mode'];
 	$modx->manager->saveFormValues($mode);
@@ -490,7 +493,8 @@ 
  * @param int $length
  * @return string
  */
-function generate_password($length = 10) {
+function generate_password($length = 10)
+{
 	$allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
 	$ps_len = strlen($allowable_characters);
 	mt_srand((double) microtime() * 1000000);

manager/processors/save_plugin.processor.php

Spacing +16 added lines, -16 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
 }
 if (!$modx->hasPermission('save_plugin')) {
     $modx->webAlertAndQuit($_lang['error_no_privileges']);
 }
 
-$id = (int)$_POST['id'];
+$id = (int) $_POST['id'];
 $name = $modx->db->escape(trim($_POST['name']));
 $description = $modx->db->escape($_POST['description']);
 $locked = $_POST['locked'] == 'on' ? '1' : '0';
@@ -20,11 +20,11 @@ 
 
 //Kyle Jaebker - added category support
 if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) {
-    $categoryid = (int)$_POST['categoryid'];
+    $categoryid = (int) $_POST['categoryid'];
 } elseif (empty($_POST['newcategory']) && $_POST['categoryid'] <= 0) {
     $categoryid = 0;
 } else {
-    include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
     $categoryid = getCategory($_POST['newcategory']);
 }
 
@@ -40,12 +40,12 @@ 
     $moduleguid = isset($parsed['guid']) ? $parsed['guid'] : $moduleguid;
 
     $description = isset($parsed['description']) ? $parsed['description'] : $description;
-    $version = isset($parsed['version']) ? '<b>' . $parsed['version'] . '</b> ' : '';
+    $version = isset($parsed['version']) ? '<b>'.$parsed['version'].'</b> ' : '';
     if ($version) {
-        $description = $version . trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description));
+        $description = $version.trim(preg_replace('/(<b>.+?)+(<\/b>)/i', '', $description));
     }
     if (isset($parsed['modx_category'])) {
-        include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+        include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
         $categoryid = getCategory($parsed['modx_category']);
     }
 }
@@ -103,7 +103,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "102&id=$newid" : '101';
-            $header = 'Location: index.php?a=' . $a . '&r=2&stay=' . $_POST['stay'];
+            $header = 'Location: index.php?a='.$a.'&r=2&stay='.$_POST['stay'];
             header($header);
         } else {
             $header = 'Location: index.php?a=76&r=2';
@@ -158,7 +158,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "102&id=$id" : '101';
-            $header = 'Location: index.php?a=' . $a . '&r=2&stay=' . $_POST['stay'];
+            $header = 'Location: index.php?a='.$a.'&r=2&stay='.$_POST['stay'];
             header($header);
         } else {
             $modx->unlockElement(5, $id);
@@ -177,7 +177,7 @@ 
     // save selected system events
     $formEventList = array();
     foreach ($sysevents as $evtId) {
-        if(!preg_match('@^[1-9][0-9]*$@',$evtId)) $evtId = getEventIdByName($evtId);
+        if (!preg_match('@^[1-9][0-9]*$@', $evtId)) $evtId = getEventIdByName($evtId);
         if ($mode == '101') {
             $rs = $modx->db->select('max(priority) as priority', '[+prefix+]site_plugin_events', "evtid='{$evtId}'");
         } else {
@@ -202,13 +202,13 @@ 
     $rs = $modx->db->select('*', '[+prefix+]site_plugin_events', sprintf("pluginid='%s'", $id));
     $dbEventList = array();
     $del = array();
-    while($row = $modx->db->getRow($rs)) {
-        if(!in_array($row['evtid'], $evtids)) $del[] = $row['evtid'];
+    while ($row = $modx->db->getRow($rs)) {
+        if (!in_array($row['evtid'], $evtids)) $del[] = $row['evtid'];
     }
 
-    if(empty($del)) return;
+    if (empty($del)) return;
 
-    foreach($del as $delid) {
+    foreach ($del as $delid) {
         $modx->db->delete('[+prefix+]site_plugin_events', sprintf("evtid='%s' AND pluginid='%s'", $delid, $id));
     }
 }
@@ -220,9 +220,9 @@ 
 function getEventIdByName($name)
 {
     $modx = evolutionCMS();
-    static $eventIds=array();
+    static $eventIds = array();
 
-    if(isset($eventIds[$name])) return $eventIds[$name];
+    if (isset($eventIds[$name])) return $eventIds[$name];
 
     $rs = $modx->db->select('id, name', '[+prefix+]system_eventnames');
     while ($row = $modx->db->getRow($rs)) {

Braces +12 added lines, -4 removed lines

@@ -177,7 +177,9 @@ 
     // save selected system events
     $formEventList = array();
     foreach ($sysevents as $evtId) {
-        if(!preg_match('@^[1-9][0-9]*$@',$evtId)) $evtId = getEventIdByName($evtId);
+        if(!preg_match('@^[1-9][0-9]*$@',$evtId)) {
+            $evtId = getEventIdByName($evtId);
+        }
         if ($mode == '101') {
             $rs = $modx->db->select('max(priority) as priority', '[+prefix+]site_plugin_events', "evtid='{$evtId}'");
         } else {
@@ -203,10 +205,14 @@ 
     $dbEventList = array();
     $del = array();
     while($row = $modx->db->getRow($rs)) {
-        if(!in_array($row['evtid'], $evtids)) $del[] = $row['evtid'];
+        if(!in_array($row['evtid'], $evtids)) {
+            $del[] = $row['evtid'];
+        }
     }
 
-    if(empty($del)) return;
+    if(empty($del)) {
+        return;
+    }
 
     foreach($del as $delid) {
         $modx->db->delete('[+prefix+]site_plugin_events', sprintf("evtid='%s' AND pluginid='%s'", $delid, $id));
@@ -222,7 +228,9 @@ 
     $modx = evolutionCMS();
     static $eventIds=array();
 
-    if(isset($eventIds[$name])) return $eventIds[$name];
+    if(isset($eventIds[$name])) {
+        return $eventIds[$name];
+    }
 
     $rs = $modx->db->select('id, name', '[+prefix+]system_eventnames');
     while ($row = $modx->db->getRow($rs)) {

manager/processors/cache_sync.class.processor.php

Braces +4 added lines, -2 removed lines

@@ -79,7 +79,8 @@ 
      * @return string
      */
     public function getParents($id, $path = '')
-    { // modx:returns child's parent
+    {
+// modx:returns child's parent
         $modx = evolutionCMS();
         if (empty($this->aliases)) {
             $f = "id, IF(alias='', id, alias) AS alias, parent, alias_visible";
@@ -456,7 +457,8 @@ 
                         $_ = trim($_);
                     }
                     $lastChar = substr($_, -1);
-                    if (!in_array($lastChar, $chars)) {// ,320,327,288,284,289
+                    if (!in_array($lastChar, $chars)) {
+// ,320,327,288,284,289
                         if (!in_array($prev_token,
                             array(T_FOREACH, T_WHILE, T_FOR, T_BOOLEAN_AND, T_BOOLEAN_OR, T_DOUBLE_ARROW))) {
                             $_ .= ' ';

manager/processors/move_document.processor.php

Indentation +65 added lines, -65 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0;
@@ -25,17 +25,17 @@ 
 // check user has permission to move document to chosen location
 
 if ($use_udperms == 1) {
-	if ($oldparent != $newParentID) {
-		include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
-		$udperms = new udperms();
-		$udperms->user = $modx->getLoginUserID();
-		$udperms->document = $newParentID;
-		$udperms->role = $_SESSION['mgrRole'];
-
-		 if (!$udperms->checkPermissions()) {
-			$modx->webAlertAndQuit($_lang["access_permission_parent_denied"]);
-		 }
-	}
+    if ($oldparent != $newParentID) {
+        include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+        $udperms = new udperms();
+        $udperms->user = $modx->getLoginUserID();
+        $udperms->document = $newParentID;
+        $udperms->role = $_SESSION['mgrRole'];
+
+            if (!$udperms->checkPermissions()) {
+            $modx->webAlertAndQuit($_lang["access_permission_parent_denied"]);
+            }
+    }
 }
 
 /**
@@ -43,67 +43,67 @@ 
  * @return array
  */
 function allChildren($currDocID) {
-	$modx = evolutionCMS();
-	$children= array();
-	$currDocID = $modx->db->escape($currDocID);
-	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'");
-	while ($child= $modx->db->getRow($rs)) {
-		$children[]= $child['id'];
-		$children= array_merge($children, allChildren($child['id']));
-	}
-	return $children;
+    $modx = evolutionCMS();
+    $children= array();
+    $currDocID = $modx->db->escape($currDocID);
+    $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'");
+    while ($child= $modx->db->getRow($rs)) {
+        $children[]= $child['id'];
+        $children= array_merge($children, allChildren($child['id']));
+    }
+    return $children;
 }
 
 $evtOut = $modx->invokeEvent("onBeforeMoveDocument", array (
-	"id_document" => $documentID,
-	"old_parent" => $oldparent,
-	"new_parent" => $newParentID
+    "id_document" => $documentID,
+    "old_parent" => $oldparent,
+    "new_parent" => $newParentID
 ));
 if (is_array($evtOut) && count($evtOut) > 0){
-	$newParent = array_pop($evtOut);
-	if($newParent == $oldparent) {
-		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
-		$newParentID = $newParent;
-	}
+    $newParent = array_pop($evtOut);
+    if($newParent == $oldparent) {
+        $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+    }else{
+        $newParentID = $newParent;
+    }
 }
 
 $children = allChildren($documentID);
 if (!array_search($newParentID, $children)) {
-	$modx->db->update(array(
-		'isfolder' => 1,
-	), $modx->getFullTableName('site_content'), "id='{$newParentID}'");
-
-	$modx->db->update(array(
-		'parent'   => $newParentID,
-		'editedby' => $modx->getLoginUserID(),
-		'editedon' => time(),
-	), $modx->getFullTableName('site_content'), "id='{$documentID}'");
-
-	// finished moving the document, now check to see if the old_parent should no longer be a folder.
-	$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
-	$limit = $modx->db->getValue($rs);
-
-	if(!$limit>0) {
-		$modx->db->update(array(
-			'isfolder' => 0,
-		), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
-	}
-	// Set the item name for logger
-	$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
-	$_SESSION['itemname'] = $pagetitle;
-
-	$modx->invokeEvent("onAfterMoveDocument", array (
-		"id_document" => $documentID,
-		"old_parent" => $oldparent,
-		"new_parent" => $newParentID
-	));
-
-	// empty cache & sync site
-	$modx->clearCache('full');
-
-	$header="Location: index.php?a=3&id={$documentID}&r=9";
-	header($header);
+    $modx->db->update(array(
+        'isfolder' => 1,
+    ), $modx->getFullTableName('site_content'), "id='{$newParentID}'");
+
+    $modx->db->update(array(
+        'parent'   => $newParentID,
+        'editedby' => $modx->getLoginUserID(),
+        'editedon' => time(),
+    ), $modx->getFullTableName('site_content'), "id='{$documentID}'");
+
+    // finished moving the document, now check to see if the old_parent should no longer be a folder.
+    $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
+    $limit = $modx->db->getValue($rs);
+
+    if(!$limit>0) {
+        $modx->db->update(array(
+            'isfolder' => 0,
+        ), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
+    }
+    // Set the item name for logger
+    $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
+    $_SESSION['itemname'] = $pagetitle;
+
+    $modx->invokeEvent("onAfterMoveDocument", array (
+        "id_document" => $documentID,
+        "old_parent" => $oldparent,
+        "new_parent" => $newParentID
+    ));
+
+    // empty cache & sync site
+    $modx->clearCache('full');
+
+    $header="Location: index.php?a=3&id={$documentID}&r=9";
+    header($header);
 } else {
-	$modx->webAlertAndQuit("You cannot move a document to a child document!");
+    $modx->webAlertAndQuit("You cannot move a document to a child document!");
 }

Spacing +20 added lines, -20 removed lines

@@ -1,20 +1,20 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('edit_document')) {
+if (!$modx->hasPermission('edit_document')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0;
-$documentID = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$newParentID = isset($_REQUEST['new_parent']) ? (int) $_REQUEST['new_parent'] : 0;
+$documentID = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // ok, two things to check.
 // first, document cannot be moved to itself
 // second, new parent must be a folder. If not, set it to folder.
-if($documentID==$newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]);
-if($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
-if($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if ($documentID == $newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]);
+if ($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if ($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
 
 $parents = $modx->getParentIds($newParentID);
 if (in_array($documentID, $parents))  $modx->webAlertAndQuit($_lang["error_movedocument2"]);
@@ -26,7 +26,7 @@ 
 
 if ($use_udperms == 1) {
 	if ($oldparent != $newParentID) {
-		include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+		include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 		$udperms = new udperms();
 		$udperms->user = $modx->getLoginUserID();
 		$udperms->document = $newParentID;
@@ -42,28 +42,28 @@ 
  * @param int $currDocID
  * @return array
  */
-function allChildren($currDocID) {
+function allChildren($currDocID){
 	$modx = evolutionCMS();
-	$children= array();
+	$children = array();
 	$currDocID = $modx->db->escape($currDocID);
 	$rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'");
-	while ($child= $modx->db->getRow($rs)) {
-		$children[]= $child['id'];
-		$children= array_merge($children, allChildren($child['id']));
+	while ($child = $modx->db->getRow($rs)) {
+		$children[] = $child['id'];
+		$children = array_merge($children, allChildren($child['id']));
 	}
 	return $children;
 }
 
-$evtOut = $modx->invokeEvent("onBeforeMoveDocument", array (
+$evtOut = $modx->invokeEvent("onBeforeMoveDocument", array(
 	"id_document" => $documentID,
 	"old_parent" => $oldparent,
 	"new_parent" => $newParentID
 ));
-if (is_array($evtOut) && count($evtOut) > 0){
+if (is_array($evtOut) && count($evtOut) > 0) {
 	$newParent = array_pop($evtOut);
-	if($newParent == $oldparent) {
+	if ($newParent == $oldparent) {
 		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
+	} else {
 		$newParentID = $newParent;
 	}
 }
@@ -84,7 +84,7 @@ 
 	$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
 	$limit = $modx->db->getValue($rs);
 
-	if(!$limit>0) {
+	if (!$limit > 0) {
 		$modx->db->update(array(
 			'isfolder' => 0,
 		), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
@@ -93,7 +93,7 @@ 
 	$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
 	$_SESSION['itemname'] = $pagetitle;
 
-	$modx->invokeEvent("onAfterMoveDocument", array (
+	$modx->invokeEvent("onAfterMoveDocument", array(
 		"id_document" => $documentID,
 		"old_parent" => $oldparent,
 		"new_parent" => $newParentID
@@ -102,7 +102,7 @@ 
 	// empty cache & sync site
 	$modx->clearCache('full');
 
-	$header="Location: index.php?a=3&id={$documentID}&r=9";
+	$header = "Location: index.php?a=3&id={$documentID}&r=9";
 	header($header);
 } else {
 	$modx->webAlertAndQuit("You cannot move a document to a child document!");

Braces +16 added lines, -7 removed lines

@@ -12,12 +12,20 @@ 
 // ok, two things to check.
 // first, document cannot be moved to itself
 // second, new parent must be a folder. If not, set it to folder.
-if($documentID==$newParentID) $modx->webAlertAndQuit($_lang["error_movedocument1"]);
-if($documentID <= 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
-if($newParentID < 0) $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if($documentID==$newParentID) {
+    $modx->webAlertAndQuit($_lang["error_movedocument1"]);
+}
+if($documentID <= 0) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
+if($newParentID < 0) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
 
 $parents = $modx->getParentIds($newParentID);
-if (in_array($documentID, $parents))  $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+if (in_array($documentID, $parents)) {
+    $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+}
 
 $rs = $modx->db->select('parent', $modx->getFullTableName('site_content'), "id='{$documentID}'");
 $oldparent = $modx->db->getValue($rs);
@@ -42,7 +50,8 @@ 
  * @param int $currDocID
  * @return array
  */
-function allChildren($currDocID) {
+function allChildren($currDocID)
+{
 	$modx = evolutionCMS();
 	$children= array();
 	$currDocID = $modx->db->escape($currDocID);
@@ -59,11 +68,11 @@ 
 	"old_parent" => $oldparent,
 	"new_parent" => $newParentID
 ));
-if (is_array($evtOut) && count($evtOut) > 0){
+if (is_array($evtOut) && count($evtOut) > 0) {
 	$newParent = array_pop($evtOut);
 	if($newParent == $oldparent) {
 		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
+	} else {
 		$newParentID = $newParent;
 	}
 }

manager/processors/save_web_user.processor.php

Indentation +277 added lines, -277 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_web_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $tbl_web_users = $modx->getFullTableName('web_users');
@@ -12,10 +12,10 @@ 
 
 $input = $_POST;
 foreach($input as $k => $v) {
-	if($k !== 'comment') {
-		$v = sanitize($v);
-	}
-	$input[$k] = $v;
+    if($k !== 'comment') {
+        $v = sanitize($v);
+    }
+    $input[$k] = $v;
 }
 
 $id = (int)$input['id'];
@@ -51,80 +51,80 @@ 
 
 // verify password
 if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
-	webAlertAndQuit("Password typed is mismatched");
+    webAlertAndQuit("Password typed is mismatched");
 }
 
 // verify email
 if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
-	webAlertAndQuit("E-mail address doesn't seem to be valid!");
+    webAlertAndQuit("E-mail address doesn't seem to be valid!");
 }
 
 switch($input['mode']) {
-	case '87' : // new user
-		// check if this user name already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
-				webAlertAndQuit("Password is too short!");
-			} else {
-				$newpassword = $specifiedpassword;
-			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
-			$newpassword = generate_password(8);
-		} else {
-			webAlertAndQuit("No password generation method specified!");
-		}
-
-		// invoke OnBeforeWUsrFormSave event
-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(
-			"mode" => "new",
-		));
-
-		// create the user account
-		$field = array();
-		$field['username'] = $esc_newusername;
-		$field['password'] = md5($newpassword);
-		$internalKey = $modx->db->insert($field, $tbl_web_users);
-
-		$field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->insert($field, $tbl_web_user_attributes);
-
-		// Save User Settings
-		saveUserSettings($internalKey);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$f = array();
-					$f['webgroup'] = (int)$user_groups[$i];
-					$f['webuser'] = $internalKey;
-					$modx->db->insert($f, $tbl_web_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
+    case '87' : // new user
+        // check if this user name already exist
+        $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("User name is already in use!");
+        }
+
+        // check if the email address already exist
+        $rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("Email is already in use!");
+        }
+
+        // generate a new password for this user
+        if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+            if(strlen($specifiedpassword) < 6) {
+                webAlertAndQuit("Password is too short!");
+            } else {
+                $newpassword = $specifiedpassword;
+            }
+        } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+            webAlertAndQuit("You didn't specify a password for this user!");
+        } elseif($passwordgenmethod == 'g') {
+            $newpassword = generate_password(8);
+        } else {
+            webAlertAndQuit("No password generation method specified!");
+        }
+
+        // invoke OnBeforeWUsrFormSave event
+        $modx->invokeEvent("OnBeforeWUsrFormSave", array(
+            "mode" => "new",
+        ));
+
+        // create the user account
+        $field = array();
+        $field['username'] = $esc_newusername;
+        $field['password'] = md5($newpassword);
+        $internalKey = $modx->db->insert($field, $tbl_web_users);
+
+        $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
+        $field = $modx->db->escape($field);
+        $modx->db->insert($field, $tbl_web_user_attributes);
+
+        // Save User Settings
+        saveUserSettings($internalKey);
+
+        // Set the item name for logger
+        $_SESSION['itemname'] = $newusername;
+
+        /*******************************************************************************/
+        // put the user in the user_groups he/ she should be in
+        // first, check that up_perms are switched on!
+        if($use_udperms == 1) {
+            if(!empty($user_groups)) {
+                for($i = 0; $i < count($user_groups); $i++) {
+                    $f = array();
+                    $f['webgroup'] = (int)$user_groups[$i];
+                    $f['webuser'] = $internalKey;
+                    $modx->db->insert($f, $tbl_web_groups);
+                }
+            }
+        }
+        // end of user_groups stuff!
 
         // invoke OnWebSaveUser event
         $modx->invokeEvent("OnWebSaveUser", array(
@@ -142,26 +142,26 @@ 
             "id" => $internalKey
         ));
 
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=99&r=2";
-				header($header);
-			}
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=99&r=2";
-			}
-
-			include_once "header.inc.php";
-			?>
+        if($passwordnotifymethod == 'e') {
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=99&r=2";
+                header($header);
+            }
+        } else {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+            } else {
+                $stayUrl = "index.php?a=99&r=2";
+            }
+
+            include_once "header.inc.php";
+            ?>
 
 			<h1><?php echo $_lang['web_user_title']; ?></h1>
 
@@ -183,84 +183,84 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		}
-		break;
-	case '88' : // edit user
-		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
-					webAlertAndQuit("Password is too short!");
-				} else {
-					$newpassword = $specifiedpassword;
-				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
-				$newpassword = generate_password(8);
-			} else {
-				webAlertAndQuit("No password generation method specified!");
-			}
-		}
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-		}
-
-		// check if the username already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exists
-		$rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// invoke OnBeforeWUsrFormSave event
-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		// update user name and password
-		$field = array();
-		$field['username'] = $esc_newusername;
-		if($genpassword == 1) {
-			$field['password'] = md5($newpassword);
-		}
-		$modx->db->update($field, $tbl_web_users, "id='{$id}'");
-		$field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'");
-
-		// Save User Settings
-		saveUserSettings($id);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
-			$modx->db->delete($tbl_web_groups, "webuser='{$id}'");
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$field = array();
-					$field['webgroup'] = (int)$user_groups[$i];
-					$field['webuser'] = $id;
-					$modx->db->insert($field, $tbl_web_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-		/*******************************************************************************/
+            include_once "footer.inc.php";
+        }
+        break;
+    case '88' : // edit user
+        // generate a new password for this user
+        if($genpassword == 1) {
+            if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+                if(strlen($specifiedpassword) < 6) {
+                    webAlertAndQuit("Password is too short!");
+                } else {
+                    $newpassword = $specifiedpassword;
+                }
+            } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+                webAlertAndQuit("You didn't specify a password for this user!");
+            } elseif($passwordgenmethod == 'g') {
+                $newpassword = generate_password(8);
+            } else {
+                webAlertAndQuit("No password generation method specified!");
+            }
+        }
+        if($passwordnotifymethod == 'e') {
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
+        }
+
+        // check if the username already exist
+        $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("User name is already in use!");
+        }
+
+        // check if the email address already exists
+        $rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("Email is already in use!");
+        }
+
+        // invoke OnBeforeWUsrFormSave event
+        $modx->invokeEvent("OnBeforeWUsrFormSave", array(
+            "mode" => "upd",
+            "id" => $id
+        ));
+
+        // update user name and password
+        $field = array();
+        $field['username'] = $esc_newusername;
+        if($genpassword == 1) {
+            $field['password'] = md5($newpassword);
+        }
+        $modx->db->update($field, $tbl_web_users, "id='{$id}'");
+        $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
+        $field = $modx->db->escape($field);
+        $modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'");
+
+        // Save User Settings
+        saveUserSettings($id);
+
+        // Set the item name for logger
+        $_SESSION['itemname'] = $newusername;
+
+        /*******************************************************************************/
+        // put the user in the user_groups he/ she should be in
+        // first, check that up_perms are switched on!
+        if($use_udperms == 1) {
+            // as this is an existing user, delete his/ her entries in the groups before saving the new groups
+            $modx->db->delete($tbl_web_groups, "webuser='{$id}'");
+            if(!empty($user_groups)) {
+                for($i = 0; $i < count($user_groups); $i++) {
+                    $field = array();
+                    $field['webgroup'] = (int)$user_groups[$i];
+                    $field['webuser'] = $id;
+                    $modx->db->insert($field, $tbl_web_groups);
+                }
+            }
+        }
+        // end of user_groups stuff!
+        /*******************************************************************************/
 
         // invoke OnWebSaveUser event
         $modx->invokeEvent("OnWebSaveUser", array(
@@ -289,16 +289,16 @@ 
             "id" => $id
         ));
 
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=99&r=2";
-			}
+        if($genpassword == 1 && $passwordnotifymethod == 's') {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+            } else {
+                $stayUrl = "index.php?a=99&r=2";
+            }
 
-			include_once "header.inc.php";
-			?>
+            include_once "header.inc.php";
+            ?>
 
 			<h1><?php echo $_lang['web_user_title']; ?></h1>
 
@@ -318,20 +318,20 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=99&r=2";
-				header($header);
-			}
-		}
-		break;
-	default :
-		webAlertAndQuit("No operation set in request.");
+            include_once "footer.inc.php";
+        } else {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=99&r=2";
+                header($header);
+            }
+        }
+        break;
+    default :
+        webAlertAndQuit("No operation set in request.");
 }
 
 /**
@@ -341,14 +341,14 @@ 
  * @return string
  */
 function save_user_quoted_printable($string) {
-	$crlf = "\n";
-	$string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf;
-	$f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e';
-	$r[] = "'=' . sprintf('%02X', ord('\\1'))";
-	$f[] = '/([\011\040])' . $crlf . '/e';
-	$r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'";
-	$string = preg_replace($f, $r, $string);
-	return trim(wordwrap($string, 70, ' =' . $crlf));
+    $crlf = "\n";
+    $string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf;
+    $f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e';
+    $r[] = "'=' . sprintf('%02X', ord('\\1'))";
+    $f[] = '/([\011\040])' . $crlf . '/e';
+    $r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'";
+    $string = preg_replace($f, $r, $string);
+    return trim(wordwrap($string, 70, ' =' . $crlf));
 }
 
 /**
@@ -360,94 +360,94 @@ 
  * @param string $ufn
  */
 function sendMailMessage($email, $uid, $pwd, $ufn) {
-	$modx = evolutionCMS(); global $_lang, $websignupemail_message;
-	global $emailsubject, $emailsender;
-	global $site_name, $site_url;
-	$message = sprintf($websignupemail_message, $uid, $pwd); // use old method
-	// replace placeholders
-	$message = str_replace("[+uid+]", $uid, $message);
-	$message = str_replace("[+pwd+]", $pwd, $message);
-	$message = str_replace("[+ufn+]", $ufn, $message);
-	$message = str_replace("[+sname+]", $site_name, $message);
-	$message = str_replace("[+saddr+]", $emailsender, $message);
-	$message = str_replace("[+semail+]", $emailsender, $message);
-	$message = str_replace("[+surl+]", $site_url, $message);
-
-	$param = array();
-	$param['from'] = "{$site_name}<{$emailsender}>";
-	$param['subject'] = $emailsubject;
-	$param['body'] = $message;
-	$param['to'] = $email;
-	$param['type'] = 'text';
-	$rs = $modx->sendmail($param);
-	if(!$rs) {
-		$modx->manager->saveFormValues();
-		$modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
-	}
+    $modx = evolutionCMS(); global $_lang, $websignupemail_message;
+    global $emailsubject, $emailsender;
+    global $site_name, $site_url;
+    $message = sprintf($websignupemail_message, $uid, $pwd); // use old method
+    // replace placeholders
+    $message = str_replace("[+uid+]", $uid, $message);
+    $message = str_replace("[+pwd+]", $pwd, $message);
+    $message = str_replace("[+ufn+]", $ufn, $message);
+    $message = str_replace("[+sname+]", $site_name, $message);
+    $message = str_replace("[+saddr+]", $emailsender, $message);
+    $message = str_replace("[+semail+]", $emailsender, $message);
+    $message = str_replace("[+surl+]", $site_url, $message);
+
+    $param = array();
+    $param['from'] = "{$site_name}<{$emailsender}>";
+    $param['subject'] = $emailsubject;
+    $param['body'] = $message;
+    $param['to'] = $email;
+    $param['type'] = 'text';
+    $rs = $modx->sendmail($param);
+    if(!$rs) {
+        $modx->manager->saveFormValues();
+        $modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
+    }
 }
 
 // Save User Settings
 function saveUserSettings($id) {
-	$modx = evolutionCMS();
-	$tbl_web_user_settings = $modx->getFullTableName('web_user_settings');
-
-	$settings = array(
-		"login_home",
-		"allowed_ip",
-		"allowed_days"
-	);
-
-	$modx->db->delete($tbl_web_user_settings, "webuser='{$id}'");
-
-	foreach($settings as $n) {
-		$vl = $_POST[$n];
-		if(is_array($vl)) {
-			$vl = implode(",", $vl);
-		}
-		if($vl != '') {
-			$f = array();
-			$f['webuser'] = $id;
-			$f['setting_name'] = $n;
-			$f['setting_value'] = $vl;
-			$f = $modx->db->escape($f);
-			$modx->db->insert($f, $tbl_web_user_settings);
-		}
-	}
+    $modx = evolutionCMS();
+    $tbl_web_user_settings = $modx->getFullTableName('web_user_settings');
+
+    $settings = array(
+        "login_home",
+        "allowed_ip",
+        "allowed_days"
+    );
+
+    $modx->db->delete($tbl_web_user_settings, "webuser='{$id}'");
+
+    foreach($settings as $n) {
+        $vl = $_POST[$n];
+        if(is_array($vl)) {
+            $vl = implode(",", $vl);
+        }
+        if($vl != '') {
+            $f = array();
+            $f['webuser'] = $id;
+            $f['setting_name'] = $n;
+            $f['setting_value'] = $vl;
+            $f = $modx->db->escape($f);
+            $modx->db->insert($f, $tbl_web_user_settings);
+        }
+    }
 }
 
 // Web alert -  sends an alert to web browser
 function webAlertAndQuit($msg) {
-	global $id, $modx;
-	$mode = $_POST['mode'];
-	$modx->manager->saveFormValues($mode);
-	$modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : ''));
+    global $id, $modx;
+    $mode = $_POST['mode'];
+    $modx->manager->saveFormValues($mode);
+    $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : ''));
 }
 
 // Generate password
 function generate_password($length = 10) {
-	$allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
-	$ps_len = strlen($allowable_characters);
-	mt_srand((double) microtime() * 1000000);
-	$pass = "";
-	for($i = 0; $i < $length; $i++) {
-		$pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
-	}
-	return $pass;
+    $allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+    $ps_len = strlen($allowable_characters);
+    mt_srand((double) microtime() * 1000000);
+    $pass = "";
+    for($i = 0; $i < $length; $i++) {
+        $pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
+    }
+    return $pass;
 }
 
 function sanitize($str = '', $safecount = 0) {
-	$modx = evolutionCMS();
-	$safecount++;
-	if(1000 < $safecount) {
-		exit("error too many loops '{$safecount}'");
-	}
-	if(is_array($str)) {
-		foreach($str as $i => $v) {
-			$str[$i] = sanitize($v, $safecount);
-		}
-	} else {
-		// $str = strip_tags($str); // LEAVE < and > intact
-		$str = htmlspecialchars($str, ENT_NOQUOTES, $modx->config['modx_charset']);
-	}
-	return $str;
+    $modx = evolutionCMS();
+    $safecount++;
+    if(1000 < $safecount) {
+        exit("error too many loops '{$safecount}'");
+    }
+    if(is_array($str)) {
+        foreach($str as $i => $v) {
+            $str[$i] = sanitize($v, $safecount);
+        }
+    } else {
+        // $str = strip_tags($str); // LEAVE < and > intact
+        $str = htmlspecialchars($str, ENT_NOQUOTES, $modx->config['modx_charset']);
+    }
+    return $str;
 }

Spacing +61 added lines, -61 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('save_web_user')) {
+if (!$modx->hasPermission('save_web_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -11,14 +11,14 @@ 
 $tbl_web_groups = $modx->getFullTableName('web_groups');
 
 $input = $_POST;
-foreach($input as $k => $v) {
-	if($k !== 'comment') {
+foreach ($input as $k => $v) {
+	if ($k !== 'comment') {
 		$v = sanitize($v);
 	}
 	$input[$k] = $v;
 }
 
-$id = (int)$input['id'];
+$id = (int) $input['id'];
 $oldusername = $input['oldusername'];
 $newusername = !empty ($input['newusername']) ? trim($input['newusername']) : "New User";
 $esc_newusername = $modx->db->escape($newusername);
@@ -50,41 +50,41 @@ 
 $user_groups = $input['user_groups'];
 
 // verify password
-if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
+if ($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
 	webAlertAndQuit("Password typed is mismatched");
 }
 
 // verify email
-if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
+if ($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
 	webAlertAndQuit("E-mail address doesn't seem to be valid!");
 }
 
-switch($input['mode']) {
+switch ($input['mode']) {
 	case '87' : // new user
 		// check if this user name already exist
 		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("User name is already in use!");
 		}
 
 		// check if the email address already exist
 		$rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("Email is already in use!");
 		}
 
 		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
+		if ($specifiedpassword != "" && $passwordgenmethod == "spec") {
+			if (strlen($specifiedpassword) < 6) {
 				webAlertAndQuit("Password is too short!");
 			} else {
 				$newpassword = $specifiedpassword;
 			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+		} elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {
 			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
+		} elseif ($passwordgenmethod == 'g') {
 			$newpassword = generate_password(8);
 		} else {
 			webAlertAndQuit("No password generation method specified!");
@@ -114,11 +114,11 @@ 
 		/*******************************************************************************/
 		// put the user in the user_groups he/ she should be in
 		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
+		if ($use_udperms == 1) {
+			if (!empty($user_groups)) {
+				for ($i = 0; $i < count($user_groups); $i++) {
 					$f = array();
-					$f['webgroup'] = (int)$user_groups[$i];
+					$f['webgroup'] = (int) $user_groups[$i];
 					$f['webuser'] = $internalKey;
 					$modx->db->insert($f, $tbl_web_groups);
 				}
@@ -142,20 +142,20 @@ 
             "id" => $internalKey
         ));
 
-		if($passwordnotifymethod == 'e') {
+		if ($passwordnotifymethod == 'e') {
 			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$header = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];
 				header($header);
 			} else {
 				$header = "Location: index.php?a=99&r=2";
 				header($header);
 			}
 		} else {
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay'];
 			} else {
 				$stayUrl = "index.php?a=99&r=2";
 			}
@@ -188,36 +188,36 @@ 
 		break;
 	case '88' : // edit user
 		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
+		if ($genpassword == 1) {
+			if ($specifiedpassword != "" && $passwordgenmethod == "spec") {
+				if (strlen($specifiedpassword) < 6) {
 					webAlertAndQuit("Password is too short!");
 				} else {
 					$newpassword = $specifiedpassword;
 				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+			} elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {
 				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
+			} elseif ($passwordgenmethod == 'g') {
 				$newpassword = generate_password(8);
 			} else {
 				webAlertAndQuit("No password generation method specified!");
 			}
 		}
-		if($passwordnotifymethod == 'e') {
+		if ($passwordnotifymethod == 'e') {
 			sendMailMessage($email, $newusername, $newpassword, $fullname);
 		}
 
 		// check if the username already exist
 		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("User name is already in use!");
 		}
 
 		// check if the email address already exists
 		$rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
 		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
+		if ($limit > 0) {
 			webAlertAndQuit("Email is already in use!");
 		}
 
@@ -230,7 +230,7 @@ 
 		// update user name and password
 		$field = array();
 		$field['username'] = $esc_newusername;
-		if($genpassword == 1) {
+		if ($genpassword == 1) {
 			$field['password'] = md5($newpassword);
 		}
 		$modx->db->update($field, $tbl_web_users, "id='{$id}'");
@@ -247,13 +247,13 @@ 
 		/*******************************************************************************/
 		// put the user in the user_groups he/ she should be in
 		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
+		if ($use_udperms == 1) {
 			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
 			$modx->db->delete($tbl_web_groups, "webuser='{$id}'");
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
+			if (!empty($user_groups)) {
+				for ($i = 0; $i < count($user_groups); $i++) {
 					$field = array();
-					$field['webgroup'] = (int)$user_groups[$i];
+					$field['webgroup'] = (int) $user_groups[$i];
 					$field['webuser'] = $id;
 					$modx->db->insert($field, $tbl_web_groups);
 				}
@@ -275,7 +275,7 @@ 
         ));
 
         // invoke OnWebChangePassword event
-        if($genpassword == 1) {
+        if ($genpassword == 1) {
             $modx->invokeEvent("OnWebChangePassword", array(
                 "userid" => $id,
                 "username" => $newusername,
@@ -289,10 +289,10 @@ 
             "id" => $id
         ));
 
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
+		if ($genpassword == 1 && $passwordnotifymethod == 's') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay'];
 			} else {
 				$stayUrl = "index.php?a=99&r=2";
 			}
@@ -320,9 +320,9 @@ 
 
 			include_once "footer.inc.php";
 		} else {
-			if($input['stay'] != '') {
+			if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				$header = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];
 				header($header);
 			} else {
 				$header = "Location: index.php?a=99&r=2";
@@ -340,15 +340,15 @@ 
  * @param string $string
  * @return string
  */
-function save_user_quoted_printable($string) {
+function save_user_quoted_printable($string){
 	$crlf = "\n";
-	$string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf;
+	$string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string).$crlf;
 	$f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e';
 	$r[] = "'=' . sprintf('%02X', ord('\\1'))";
-	$f[] = '/([\011\040])' . $crlf . '/e';
-	$r[] = "'=' . sprintf('%02X', ord('\\1')) . '" . $crlf . "'";
+	$f[] = '/([\011\040])'.$crlf.'/e';
+	$r[] = "'=' . sprintf('%02X', ord('\\1')) . '".$crlf."'";
 	$string = preg_replace($f, $r, $string);
-	return trim(wordwrap($string, 70, ' =' . $crlf));
+	return trim(wordwrap($string, 70, ' ='.$crlf));
 }
 
 /**
@@ -359,7 +359,7 @@ 
  * @param string $pwd
  * @param string $ufn
  */
-function sendMailMessage($email, $uid, $pwd, $ufn) {
+function sendMailMessage($email, $uid, $pwd, $ufn){
 	$modx = evolutionCMS(); global $_lang, $websignupemail_message;
 	global $emailsubject, $emailsender;
 	global $site_name, $site_url;
@@ -380,14 +380,14 @@ 
 	$param['to'] = $email;
 	$param['type'] = 'text';
 	$rs = $modx->sendmail($param);
-	if(!$rs) {
+	if (!$rs) {
 		$modx->manager->saveFormValues();
 		$modx->messageQuit("{$email} - {$_lang['error_sending_email']}");
 	}
 }
 
 // Save User Settings
-function saveUserSettings($id) {
+function saveUserSettings($id){
 	$modx = evolutionCMS();
 	$tbl_web_user_settings = $modx->getFullTableName('web_user_settings');
 
@@ -399,12 +399,12 @@ 
 
 	$modx->db->delete($tbl_web_user_settings, "webuser='{$id}'");
 
-	foreach($settings as $n) {
+	foreach ($settings as $n) {
 		$vl = $_POST[$n];
-		if(is_array($vl)) {
+		if (is_array($vl)) {
 			$vl = implode(",", $vl);
 		}
-		if($vl != '') {
+		if ($vl != '') {
 			$f = array();
 			$f['webuser'] = $id;
 			$f['setting_name'] = $n;
@@ -416,33 +416,33 @@ 
 }
 
 // Web alert -  sends an alert to web browser
-function webAlertAndQuit($msg) {
+function webAlertAndQuit($msg){
 	global $id, $modx;
 	$mode = $_POST['mode'];
 	$modx->manager->saveFormValues($mode);
-	$modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : ''));
+	$modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode == '88' ? "&id={$id}" : ''));
 }
 
 // Generate password
-function generate_password($length = 10) {
+function generate_password($length = 10){
 	$allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
 	$ps_len = strlen($allowable_characters);
 	mt_srand((double) microtime() * 1000000);
 	$pass = "";
-	for($i = 0; $i < $length; $i++) {
+	for ($i = 0; $i < $length; $i++) {
 		$pass .= $allowable_characters[mt_rand(0, $ps_len - 1)];
 	}
 	return $pass;
 }
 
-function sanitize($str = '', $safecount = 0) {
+function sanitize($str = '', $safecount = 0){
 	$modx = evolutionCMS();
 	$safecount++;
-	if(1000 < $safecount) {
+	if (1000 < $safecount) {
 		exit("error too many loops '{$safecount}'");
 	}
-	if(is_array($str)) {
-		foreach($str as $i => $v) {
+	if (is_array($str)) {
+		foreach ($str as $i => $v) {
 			$str[$i] = sanitize($v, $safecount);
 		}
 	} else {

Braces +12 added lines, -6 removed lines

@@ -340,7 +340,8 @@ 
  * @param string $string
  * @return string
  */
-function save_user_quoted_printable($string) {
+function save_user_quoted_printable($string)
+{
 	$crlf = "\n";
 	$string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf;
 	$f[] = '/([\000-\010\013\014\016-\037\075\177-\377])/e';
@@ -359,7 +360,8 @@ 
  * @param string $pwd
  * @param string $ufn
  */
-function sendMailMessage($email, $uid, $pwd, $ufn) {
+function sendMailMessage($email, $uid, $pwd, $ufn)
+{
 	$modx = evolutionCMS(); global $_lang, $websignupemail_message;
 	global $emailsubject, $emailsender;
 	global $site_name, $site_url;
@@ -387,7 +389,8 @@ 
 }
 
 // Save User Settings
-function saveUserSettings($id) {
+function saveUserSettings($id)
+{
 	$modx = evolutionCMS();
 	$tbl_web_user_settings = $modx->getFullTableName('web_user_settings');
 
@@ -416,7 +419,8 @@ 
 }
 
 // Web alert -  sends an alert to web browser
-function webAlertAndQuit($msg) {
+function webAlertAndQuit($msg)
+{
 	global $id, $modx;
 	$mode = $_POST['mode'];
 	$modx->manager->saveFormValues($mode);
@@ -424,7 +428,8 @@ 
 }
 
 // Generate password
-function generate_password($length = 10) {
+function generate_password($length = 10)
+{
 	$allowable_characters = "abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
 	$ps_len = strlen($allowable_characters);
 	mt_srand((double) microtime() * 1000000);
@@ -435,7 +440,8 @@ 
 	return $pass;
 }
 
-function sanitize($str = '', $safecount = 0) {
+function sanitize($str = '', $safecount = 0)
+{
 	$modx = evolutionCMS();
 	$safecount++;
 	if(1000 < $safecount) {