evolution-cms / evolution

manager/processors/save_user.processor.php

Switch Indentation +237 added lines, -237 removed lines

@@ -69,110 +69,110 @@ 
 }
 
 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.");
 }
 
 /**

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 = DocumentParser::getInstance(); 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 = DocumentParser::getInstance(); 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 = DocumentParser::getInstance();
-	$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 = DocumentParser::getInstance();
+    $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 = DocumentParser::getInstance(); 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 = DocumentParser::getInstance();
 	$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 = DocumentParser::getInstance(); global $_lang, $signupemail_message;
 	global $emailsubject, $emailsender;
 	global $site_name;
@@ -389,7 +390,8 @@ 
  *
  * @param int $id
  */
-function saveUserSettings($id) {
+function saveUserSettings($id)
+{
 	$modx = DocumentParser::getInstance();
 	$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/user_documents_permissions.class.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
         $role = $this->role;
 
         if ($role == 1) {
-            return true;  // administrator - grant all document permissions
+            return true; // administrator - grant all document permissions
         }
 
         if ($modx->config['use_udperms'] == 0 || $modx->config['use_udperms'] == "" || !isset($modx->config['use_udperms'])) {
@@ -63,14 +63,14 @@ 
             are private to the manager users will not be private to web users if the
             document group is not assigned to a web user group and visa versa.
          */
-        $permissionsok = false;  // set permissions to false
+        $permissionsok = false; // set permissions to false
 
         $rs = $modx->db->select(
             'count(DISTINCT sc.id)',
             "{$tblsc} AS sc 
 				LEFT JOIN {$tbldg} AS dg on dg.document = sc.id 
 				LEFT JOIN {$tbldgn} dgn ON dgn.id = dg.document_group",
-            "sc.id='{$this->document}' AND (" . (empty($docgrp) ? '' : "dg.document_group = " . $docgrp . " ||") . " sc.privatemgr = 0)"
+            "sc.id='{$this->document}' AND (".(empty($docgrp) ? '' : "dg.document_group = ".$docgrp." ||")." sc.privatemgr = 0)"
         );
         $limit = $modx->db->getValue($rs);
         if ($limit == 1) {

manager/processors/duplicate_module.processor.php

Indentation +35 added lines, -35 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('new_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /**
@@ -17,11 +17,11 @@ 
  * @return string
  */
 function createGUID(){
-	srand((double)microtime()*1000000);
-	$r = rand() ;
-	$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
-	$m = md5 ($u);
-	return $m;
+    srand((double)microtime()*1000000);
+    $r = rand() ;
+    $u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
+    $m = md5 ($u);
+    return $m;
 }
 
 // count duplicates
@@ -32,40 +32,40 @@ 
 
 // duplicate module
 $newid = $modx->db->insert(
-	array(
-		'name'=>'',
-		'description'=>'',
-		'disabled'=>'',
-		'category'=>'',
-		'wrap'=>'',
-		'icon'=>'',
-		'enable_resource'=>'',
-		'resourcefile'=>'',
-		'createdon'=>'',
-		'editedon'=>'',
-		'guid'=>'',
-		'enable_sharedparams'=>'',
-		'properties'=>'',
-		'modulecode'=>'',
-		), $modx->getFullTableName('site_modules'), // Insert into
-	"CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, category, wrap, icon, enable_resource, resourcefile, createdon, editedon, '".createGUID()."' AS guid, enable_sharedparams, properties, modulecode", $modx->getFullTableName('site_modules'), "id='{$id}'"); // Copy from
+    array(
+        'name'=>'',
+        'description'=>'',
+        'disabled'=>'',
+        'category'=>'',
+        'wrap'=>'',
+        'icon'=>'',
+        'enable_resource'=>'',
+        'resourcefile'=>'',
+        'createdon'=>'',
+        'editedon'=>'',
+        'guid'=>'',
+        'enable_sharedparams'=>'',
+        'properties'=>'',
+        'modulecode'=>'',
+        ), $modx->getFullTableName('site_modules'), // Insert into
+    "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, category, wrap, icon, enable_resource, resourcefile, createdon, editedon, '".createGUID()."' AS guid, enable_sharedparams, properties, modulecode", $modx->getFullTableName('site_modules'), "id='{$id}'"); // Copy from
 
 // duplicate module dependencies
 $modx->db->insert(
-	array(
-		'module'=>'',
-		'resource'=>'',
-		'type'=>'',
-		), $modx->getFullTableName('site_module_depobj'), // Insert into
-	"'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from
+    array(
+        'module'=>'',
+        'resource'=>'',
+        'type'=>'',
+        ), $modx->getFullTableName('site_module_depobj'), // Insert into
+    "'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from
 
 // duplicate module user group access
 $modx->db->insert(
-	array(
-		'module'=>'',
-		'usergroup'=>'',
-		), $modx->getFullTableName('site_module_access'), // Insert into
-	"'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from
+    array(
+        'module'=>'',
+        'usergroup'=>'',
+        ), $modx->getFullTableName('site_module_access'), // Insert into
+    "'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$newid}'"));

Spacing +10 added lines, -10 removed lines

@@ -1,13 +1,13 @@ 
 <?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('new_module')) {
+if (!$modx->hasPermission('new_module')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
@@ -17,17 +17,17 @@ 
  * @return string
  */
 function createGUID(){
-	srand((double)microtime()*1000000);
-	$r = rand() ;
-	$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
-	$m = md5 ($u);
+	srand((double) microtime() * 1000000);
+	$r = rand();
+	$u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1);
+	$m = md5($u);
 	return $m;
 }
 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate module
@@ -72,5 +72,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new module
-$header="Location: index.php?r=2&a=108&id=$newid";
+$header = "Location: index.php?r=2&a=108&id=$newid";
 header($header);

Braces +7 added lines, -3 removed lines

@@ -16,7 +16,8 @@ 
  *
  * @return string
  */
-function createGUID(){
+function createGUID()
+{
 	srand((double)microtime()*1000000);
 	$r = rand() ;
 	$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
@@ -27,8 +28,11 @@ 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate module
 $newid = $modx->db->insert(

manager/processors/delete_content.processor.php

Spacing +21 added lines, -21 removed lines

@@ -1,25 +1,25 @@ 
 <?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')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if ($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
     $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 /*******ищем родителя чтобы к нему вернуться********/
-$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']);
 
 /************ а заодно и путь возврата (сам путь внизу файла) **********/
-$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;
 
 /*****************************/
 
@@ -27,7 +27,7 @@ 
 $children = array();
 
 // 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;
@@ -52,17 +52,17 @@ 
     $parent = $modx->db->escape($parent);
     $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent={$parent} AND deleted=0");
         // the document has children documents, we'll need to delete those too
-        while ($childid=$modx->db->getValue($rs)) {
-            if ($childid==$site_start) {
+        while ($childid = $modx->db->getValue($rs)) {
+            if ($childid == $site_start) {
                 $modx->webAlertAndQuit("The document you are trying to delete is a folder containing document {$childid}. This document is registered as the 'Site start' document, and cannot be deleted. Please assign another document as your 'Site start' document and try again.");
             }
-            if ($childid==$site_unavailable_page) {
+            if ($childid == $site_unavailable_page) {
                 $modx->webAlertAndQuit("The document you are trying to delete is a folder containing document {$childid}. This document is registered as the 'Site unavailable page' document, and cannot be deleted. Please assign another document as your 'Site unavailable page' document and try again.");
             }
-            if ($childid==$error_page) {
+            if ($childid == $error_page) {
                 $modx->webAlertAndQuit("The document you are trying to delete is a folder containing document {$childid}. This document is registered as the 'Site error page' document, and cannot be deleted. Please assign another document as your 'Site error page' document and try again.");
             }
-            if ($childid==$unauthorized_page) {
+            if ($childid == $unauthorized_page) {
                 $modx->webAlertAndQuit("The document you are trying to delete is a folder containing document {$childid}. This document is registered as the 'Site unauthorized page' document, and cannot be deleted. Please assign another document as your 'Site unauthorized page' document and try again.");
             }
             $children[] = $childid;
@@ -80,7 +80,7 @@ 
                             "children"=>$children
                         ));
 
-if (count($children)>0) {
+if (count($children) > 0) {
     $modx->db->update(
         array(
             'deleted'   => 1,
@@ -89,19 +89,19 @@ 
         ), $modx->getFullTableName('site_content'), "id IN (".implode(", ", $children).")");
 }
 
-if ($site_start==$id) {
+if ($site_start == $id) {
     $modx->webAlertAndQuit("Document is 'Site start' and cannot be deleted!");
 }
 
-if ($site_unavailable_page==$id) {
+if ($site_unavailable_page == $id) {
     $modx->webAlertAndQuit("Document is used as the 'Site unavailable page' and cannot be deleted!");
 }
 
-if ($error_page==$id) {
+if ($error_page == $id) {
     $modx->webAlertAndQuit("Document is used as the 'Site error page' and cannot be deleted!");
 }
 
-if ($unauthorized_page==$id) {
+if ($unauthorized_page == $id) {
     $modx->webAlertAndQuit("Document is used as the 'Site unauthorized page' and cannot be deleted!");
 }
 
@@ -127,5 +127,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);

manager/processors/remove_installer.processor.php

Indentation +14 added lines, -14 removed lines

@@ -16,9 +16,9 @@ 
 $pth = dirname(dirname(dirname(__FILE__)))."/install/";
 $pth = str_replace("\\","/",$pth);
 if(isset($_GET["rminstall"])) {
-	if(is_dir($pth)) {
-		if(!rmdirRecursive($pth)) $msg="An error occured while attempting to remove the install folder";
-	}
+    if(is_dir($pth)) {
+        if(!rmdirRecursive($pth)) $msg="An error occured while attempting to remove the install folder";
+    }
 }
 if($msg) echo "<script>alert('".addslashes($msg)."');</script>";
 echo "<script>window.location='../index.php?a=2';</script>";
@@ -31,15 +31,15 @@ 
  * @return bool
  */
 function rmdirRecursive($path, $followLinks=false) {
-   $dir = opendir($path) ;
-   while ($entry = readdir($dir)) {
-	   if (is_file("$path/$entry") || ((!$followLinks) && is_link("$path/$entry"))) {
-		   @unlink( "$path/$entry" );
-	   }
-	   elseif (is_dir("$path/$entry") && $entry!='.' && $entry!='..') {
-		   rmdirRecursive("$path/$entry"); // recursive
-	   }
-   }
-   closedir($dir);
-   return @rmdir($path);
+    $dir = opendir($path) ;
+    while ($entry = readdir($dir)) {
+        if (is_file("$path/$entry") || ((!$followLinks) && is_link("$path/$entry"))) {
+            @unlink( "$path/$entry" );
+        }
+        elseif (is_dir("$path/$entry") && $entry!='.' && $entry!='..') {
+            rmdirRecursive("$path/$entry"); // recursive
+        }
+    }
+    closedir($dir);
+    return @rmdir($path);
 }

Spacing +10 added lines, -10 removed lines

@@ -12,15 +12,15 @@ 
  *
  */
 
-$msg ='';
+$msg = '';
 $pth = dirname(dirname(dirname(__FILE__)))."/install/";
-$pth = str_replace("\\","/",$pth);
-if(isset($_GET["rminstall"])) {
-	if(is_dir($pth)) {
-		if(!rmdirRecursive($pth)) $msg="An error occured while attempting to remove the install folder";
+$pth = str_replace("\\", "/", $pth);
+if (isset($_GET["rminstall"])) {
+	if (is_dir($pth)) {
+		if (!rmdirRecursive($pth)) $msg = "An error occured while attempting to remove the install folder";
 	}
 }
-if($msg) echo "<script>alert('".addslashes($msg)."');</script>";
+if ($msg) echo "<script>alert('".addslashes($msg)."');</script>";
 echo "<script>window.location='../index.php?a=2';</script>";
 
 /**
@@ -30,13 +30,13 @@ 
  * @param bool $followLinks
  * @return bool
  */
-function rmdirRecursive($path, $followLinks=false) {
-   $dir = opendir($path) ;
+function rmdirRecursive($path, $followLinks = false){
+   $dir = opendir($path);
    while ($entry = readdir($dir)) {
 	   if (is_file("$path/$entry") || ((!$followLinks) && is_link("$path/$entry"))) {
-		   @unlink( "$path/$entry" );
+		   @unlink("$path/$entry");
 	   }
-	   elseif (is_dir("$path/$entry") && $entry!='.' && $entry!='..') {
+	   elseif (is_dir("$path/$entry") && $entry != '.' && $entry != '..') {
 		   rmdirRecursive("$path/$entry"); // recursive
 	   }
    }

Braces +9 added lines, -5 removed lines

@@ -17,10 +17,14 @@ 
 $pth = str_replace("\\","/",$pth);
 if(isset($_GET["rminstall"])) {
 	if(is_dir($pth)) {
-		if(!rmdirRecursive($pth)) $msg="An error occured while attempting to remove the install folder";
+		if(!rmdirRecursive($pth)) {
+		    $msg="An error occured while attempting to remove the install folder";
+		}
 	}
 }
-if($msg) echo "<script>alert('".addslashes($msg)."');</script>";
+if($msg) {
+    echo "<script>alert('".addslashes($msg)."');</script>";
+}
 echo "<script>window.location='../index.php?a=2';</script>";
 
 /**
@@ -30,13 +34,13 @@ 
  * @param bool $followLinks
  * @return bool
  */
-function rmdirRecursive($path, $followLinks=false) {
+function rmdirRecursive($path, $followLinks=false)
+{
    $dir = opendir($path) ;
    while ($entry = readdir($dir)) {
 	   if (is_file("$path/$entry") || ((!$followLinks) && is_link("$path/$entry"))) {
 		   @unlink( "$path/$entry" );
-	   }
-	   elseif (is_dir("$path/$entry") && $entry!='.' && $entry!='..') {
+	   } elseif (is_dir("$path/$entry") && $entry!='.' && $entry!='..') {
 		   rmdirRecursive("$path/$entry"); // recursive
 	   }
    }

manager/processors/save_web_user.processor.php

Switch Indentation +224 added lines, -224 removed lines

@@ -60,108 +60,108 @@ 
 }
 
 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!");
-		}
+	    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(
+                "mode" => "new",
+                "userid" => $internalKey,
+                "username" => $newusername,
+                "userpassword" => $newpassword,
+                "useremail" => $email,
+                "userfullname" => $fullname
+            ));
 
-		// 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 OnWUsrFormSave event
+            $modx->invokeEvent("OnWUsrFormSave", array(
+                "mode" => "new",
+                "id" => $internalKey
+            ));
 
-		// 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(
-            "mode" => "new",
-            "userid" => $internalKey,
-            "username" => $newusername,
-            "userpassword" => $newpassword,
-            "useremail" => $email,
-            "userfullname" => $fullname
-        ));
-
-        // invoke OnWUsrFormSave event
-        $modx->invokeEvent("OnWUsrFormSave", array(
-            "mode" => "new",
-            "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,122 +183,122 @@ 
 			</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!
-		/*******************************************************************************/
-
-        // invoke OnWebSaveUser event
-        $modx->invokeEvent("OnWebSaveUser", array(
-            "mode" => "upd",
-            "userid" => $id,
-            "username" => $newusername,
-            "userpassword" => $newpassword,
-            "useremail" => $email,
-            "userfullname" => $fullname,
-            "oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
-            "olduseremail" => (($oldemail != $email) ? $oldemail : "")
-        ));
-
-        // invoke OnWebChangePassword event
-        if($genpassword == 1) {
-            $modx->invokeEvent("OnWebChangePassword", array(
+			    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(
+                "mode" => "upd",
                 "userid" => $id,
                 "username" => $newusername,
-                "userpassword" => $newpassword
+                "userpassword" => $newpassword,
+                "useremail" => $email,
+                "userfullname" => $fullname,
+                "oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
+                "olduseremail" => (($oldemail != $email) ? $oldemail : "")
             ));
-        }
 
-        // invoke OnWUsrFormSave event
-        $modx->invokeEvent("OnWUsrFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
+            // invoke OnWebChangePassword event
+            if($genpassword == 1) {
+                $modx->invokeEvent("OnWebChangePassword", array(
+                    "userid" => $id,
+                    "username" => $newusername,
+                    "userpassword" => $newpassword
+                ));
+            }
+
+            // invoke OnWUsrFormSave event
+            $modx->invokeEvent("OnWUsrFormSave", array(
+                "mode" => "upd",
+                "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.");
 }
 
 /**

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 = DocumentParser::getInstance(); 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 = DocumentParser::getInstance(); 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 = DocumentParser::getInstance();
-	$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 = DocumentParser::getInstance();
+    $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 = DocumentParser::getInstance();
-	$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 = DocumentParser::getInstance();
+    $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 = DocumentParser::getInstance(); 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 = DocumentParser::getInstance();
 	$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 = DocumentParser::getInstance();
 	$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 = DocumentParser::getInstance(); 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 = DocumentParser::getInstance();
 	$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 = DocumentParser::getInstance();
 	$safecount++;
 	if(1000 < $safecount) {

manager/media/script/air-datepicker/datepicker.inc.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
         if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
-		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
+        $modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
 

Spacing +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-class DATEPICKER {
+class DATEPICKER{
     /**
      * @return string
      */
-    public function getDP() {
+    public function getDP(){
         $modx = DocumentParser::getInstance();
 
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
+        if (!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
 		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
@@ -15,14 +15,14 @@ 
     /**
      * @return string
      */
-    public function getLangCode() {
+    public function getLangCode(){
         $modx = DocumentParser::getInstance(); global $modx_lang_attribute;
 
-        if(!$modx_lang_attribute) return 'en';
+        if (!$modx_lang_attribute) return 'en';
 
         $lc = $modx_lang_attribute;
-        if($lc === 'uk') return 'ru';
-        $dp_path = str_replace('\\','/',dirname(__FILE__));
+        if ($lc === 'uk') return 'ru';
+        $dp_path = str_replace('\\', '/', dirname(__FILE__));
 
         return (is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) ? $modx_lang_attribute : 'en';
     }

Braces +15 added lines, -6 removed lines

@@ -1,13 +1,17 @@ 
 <?php
-class DATEPICKER {
+class DATEPICKER
+{
     /**
      * @return string
      */
-    public function getDP() {
+    public function getDP()
+    {
         $modx = DocumentParser::getInstance();
 
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
+        if(!isset($modx->config['lang_code'])) {
+            $modx->config['lang_code'] = $this->getLangCode();
+        }
 		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
         return $modx->mergeSettingsContent($load_script);
     }
@@ -15,13 +19,18 @@ 
     /**
      * @return string
      */
-    public function getLangCode() {
+    public function getLangCode()
+    {
         $modx = DocumentParser::getInstance(); global $modx_lang_attribute;
 
-        if(!$modx_lang_attribute) return 'en';
+        if(!$modx_lang_attribute) {
+            return 'en';
+        }
 
         $lc = $modx_lang_attribute;
-        if($lc === 'uk') return 'ru';
+        if($lc === 'uk') {
+            return 'ru';
+        }
         $dp_path = str_replace('\\','/',dirname(__FILE__));
 
         return (is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) ? $modx_lang_attribute : 'en';

manager/frames/nodes.php

Spacing +3 added lines, -3 removed lines

@@ -18,9 +18,9 @@
     exit('send some data');
 } //??
 
-$indent = (int)$_REQUEST['indent'];
-$parent = (int)$_REQUEST['parent'];
-$expandAll = (int)$_REQUEST['expandAll'];
+$indent = (int) $_REQUEST['indent'];
+$parent = (int) $_REQUEST['parent'];
+$expandAll = (int) $_REQUEST['expandAll'];
 $output = '';
 $hereid = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? $_REQUEST['id'] : '';
 

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 = DocumentParser::getInstance();
-	$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 = DocumentParser::getInstance();
+    $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 = DocumentParser::getInstance();
-	$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 = DocumentParser::getInstance();
 	$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;
 	}
 }