evolution-cms / evolution

manager/processors/duplicate_tmplvars.processor.php

Indentation +2 added lines, -2 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('edit_template')) {
-	$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"]);
 }
 
 // count duplicates

Spacing +7 added lines, -7 removed lines

@@ -1,21 +1,21 @@ 
 <?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_template')) {
+if (!$modx->hasPermission('edit_template')) {
 	$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"]);
 }
 
 // count duplicates
-$tmplvar = EvolutionCMS\Models\SiteTmplvar::with(['tmplvarAccess','tmplvarTemplate'])->findOrFail($id);
+$tmplvar = EvolutionCMS\Models\SiteTmplvar::with(['tmplvarAccess', 'tmplvarTemplate'])->findOrFail($id);
 $name = $tmplvar->name;
 $count = EvolutionCMS\Models\SiteTmplvar::where('name', 'like', $name.' '.$_lang['duplicated_el_suffix'].'%')->count();
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 
@@ -38,5 +38,5 @@ 
 $_SESSION['itemname'] = $newTmplvar->name;
 
 // finish duplicating - redirect to new variable
-$header="Location: index.php?r=2&a=301&id=".$newTmplvar->getKey();
+$header = "Location: index.php?r=2&a=301&id=".$newTmplvar->getKey();
 header($header);

Braces +5 added lines, -2 removed lines

@@ -15,8 +15,11 @@
 $tmplvar = EvolutionCMS\Models\SiteTmplvar::with(['tmplvarAccess','tmplvarTemplate'])->findOrFail($id);
 $name = $tmplvar->name;
 $count = EvolutionCMS\Models\SiteTmplvar::where('name', 'like', $name.' '.$_lang['duplicated_el_suffix'].'%')->count();
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 
 $newTmplvar = $tmplvar->replicate();

manager/processors/delete_web_user.processor.php

Spacing +5 added lines, -5 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('delete_web_user')) {
+if (!$modx->hasPermission('delete_web_user')) {
     $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"]);
 }
 
@@ -39,5 +39,5 @@ 
         "id"	=> $id
     ));
 
-$header="Location: index.php?a=99";
+$header = "Location: index.php?a=99";
 header($header);

manager/processors/duplicate_htmlsnippet.processor.php

Indentation +2 added lines, -2 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_chunk')) {
-	$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"]);
 }
 
 // count duplicates

Spacing +6 added lines, -6 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_chunk')) {
+if (!$modx->hasPermission('new_chunk')) {
 	$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"]);
 }
 
@@ -15,7 +15,7 @@ 
 $htmlsnippet = EvolutionCMS\Models\SiteHtmlsnippet::findOrFail($id);
 $name = $htmlsnippet->name;
 $count = EvolutionCMS\Models\SiteHtmlsnippet::where('name', 'like', $name.' '.$_lang['duplicated_el_suffix'].'%')->count();
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate htmlsnippet
@@ -26,5 +26,5 @@ 
 $_SESSION['itemname'] = $newHtmlsnippet->name;
 
 // finish duplicating - redirect to new chunk
-$header="Location: index.php?r=2&a=78&id=".$newHtmlsnippet->getKey();
+$header = "Location: index.php?r=2&a=78&id=".$newHtmlsnippet->getKey();
 header($header);

Braces +5 added lines, -2 removed lines

@@ -15,8 +15,11 @@
 $htmlsnippet = EvolutionCMS\Models\SiteHtmlsnippet::findOrFail($id);
 $name = $htmlsnippet->name;
 $count = EvolutionCMS\Models\SiteHtmlsnippet::where('name', 'like', $name.' '.$_lang['duplicated_el_suffix'].'%')->count();
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate htmlsnippet
 $newHtmlsnippet = $htmlsnippet->replicate();

manager/processors/save_htmlsnippet.processor.php

Spacing +10 added lines, -10 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('save_chunk')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = (int)$_POST['id'];
+$id = (int) $_POST['id'];
 $snippet = $_POST['post'];
 $name = trim($_POST['name']);
 $description = $_POST['description'];
@@ -16,11 +16,11 @@ 
 
 //Kyle Jaebker - added category support
 if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) {
-    $category = (int)$_POST['categoryid'];
+    $category = (int) $_POST['categoryid'];
 } elseif (empty($_POST['newcategory']) && $_POST['categoryid'] <= 0) {
     $category = 0;
 } else {
-    include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
     $category = checkCategory($_POST['newcategory']);
     if (!$category) {
         $category = newCategory($_POST['newcategory']);
@@ -44,13 +44,13 @@ 
         ));
 
         // disallow duplicate names for new chunks
-        if (EvolutionCMS\Models\SiteHtmlsnippet::where('name','=',$name)->first()) {
+        if (EvolutionCMS\Models\SiteHtmlsnippet::where('name', '=', $name)->first()) {
             $modx->getManagerApi()->saveFormValues(77);
             $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['chunk'], $name), "index.php?a=77");
         }
 
         //do stuff to save the new doc
-        $id = EvolutionCMS\Models\SiteHtmlsnippet::create(compact('name', 'description','snippet','locked','category','editor_type','editor_name','disabled','createdon','editedon'))->getKey();
+        $id = EvolutionCMS\Models\SiteHtmlsnippet::create(compact('name', 'description', 'snippet', 'locked', 'category', 'editor_type', 'editor_name', 'disabled', 'createdon', 'editedon'))->getKey();
 
         // invoke OnChunkFormSave event
         $modx->invokeEvent("OnChunkFormSave", array(
@@ -67,7 +67,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "78&id=$id" : "77";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $header = "Location: index.php?a=76&r=2";
@@ -82,7 +82,7 @@ 
         ));
 
         // disallow duplicate names for chunks
-        if (EvolutionCMS\Models\SiteHtmlsnippet::where('id','!=',$id)->where('name','=',$name)->first()) {
+        if (EvolutionCMS\Models\SiteHtmlsnippet::where('id', '!=', $id)->where('name', '=', $name)->first()) {
             $modx->getManagerApi()->saveFormValues(78);
             $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['chunk'], $name), "index.php?a=78&id={$id}");
         }
@@ -90,7 +90,7 @@ 
         //do stuff to save the edited doc
         $chunk = EvolutionCMS\Models\SiteHtmlsnippet::find($id);
 
-        $chunk->update(compact('name', 'description','snippet','locked','category','editor_type','editor_name','disabled','editedon'));
+        $chunk->update(compact('name', 'description', 'snippet', 'locked', 'category', 'editor_type', 'editor_name', 'disabled', 'editedon'));
 
         // invoke OnChunkFormSave event
         $modx->invokeEvent("OnChunkFormSave", array(
@@ -107,7 +107,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "78&id=$id" : "77";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $modx->unlockElement(3, $id);

manager/processors/save_user.processor.php

Indentation +205 added lines, -205 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"]);

 }

 

 $input = $_POST;

@@ -39,131 +39,131 @@ 
 

 // verify password

 if ($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {

-	webAlertAndQuit("Password typed is mismatched", 12);

+    webAlertAndQuit("Password typed is mismatched", 12);

 }

 

 // 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!", 12);

+    webAlertAndQuit("E-mail address doesn't seem to be valid!", 12);

 }

 

 // verify admin security

 if ($_SESSION['mgrRole'] != 1) {

-	// Check to see if user tried to spoof a "1" (admin) role

+    // Check to see if user tried to spoof a "1" (admin) role

     if (!$modx->hasPermission('save_user')) {

-		webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!", 12);

-	}

-	// Verify that the user being edited wasn't an admin and the user ID got spoofed

-	if (EvolutionCMS\Models\ManagerUser::where('role', '=', 1)->where('internalKey', '=', $id)->first()) {

-		webAlertAndQuit("You cannot alter an administrative user.", 12);

-	}

+        webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!", 12);

+    }

+    // Verify that the user being edited wasn't an admin and the user ID got spoofed

+    if (EvolutionCMS\Models\ManagerUser::where('role', '=', 1)->where('internalKey', '=', $id)->first()) {

+        webAlertAndQuit("You cannot alter an administrative user.", 12);

+    }

 

 }

 

 switch ($input['mode']) {

-	case '11' : // new user

-		// check if this user name already exist

-		if (EvolutionCMS\Models\ManagerUser::where('username', '=', $newusername)->first()) {

-			webAlertAndQuit("User name is already in use!", 12);

-		}

-

-		// check if the email address already exist

-		if (EvolutionCMS\Models\UserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

-			webAlertAndQuit("Email is already in use!", 12);

-		}

-

-		// generate a new password for this user

+    case '11' : // new user

+        // check if this user name already exist

+        if (EvolutionCMS\Models\ManagerUser::where('username', '=', $newusername)->first()) {

+            webAlertAndQuit("User name is already in use!", 12);

+        }

+

+        // check if the email address already exist

+        if (EvolutionCMS\Models\UserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

+            webAlertAndQuit("Email is already in use!", 12);

+        }

+

+        // generate a new password for this user

         if ($specifiedpassword != "" && $passwordgenmethod == "spec") {

             if (strlen($specifiedpassword) < 6) {

-				webAlertAndQuit("Password is too short!", 12);

-			} else {

-				$newpassword = $specifiedpassword;

-			}

+                webAlertAndQuit("Password is too short!", 12);

+            } else {

+                $newpassword = $specifiedpassword;

+            }

         } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

-			webAlertAndQuit("You didn't specify a password for this user!", 12);

+            webAlertAndQuit("You didn't specify a password for this user!", 12);

         } elseif ($passwordgenmethod == 'g') {

-			$newpassword = generate_password(8);

-		} else {

-			webAlertAndQuit("No password generation method specified!", 12);

-		}

-

-		// invoke OnBeforeUserFormSave event

-		$modx->invokeEvent("OnBeforeUserFormSave", array(

-			"mode" => "new",

-		));

-

-		// create the user account

-		$field = array();

-		$field['password'] = $modx->getPasswordHash()->HashPassword($newpassword);

-		$field['username'] = $newusername;

-		$managerUser= EvolutionCMS\Models\ManagerUser::create($field);

-		$internalKey = $managerUser->getKey();

-		$field = compact( 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');

-		$managerUser->attributes()->create($field);

+            $newpassword = generate_password(8);

+        } else {

+            webAlertAndQuit("No password generation method specified!", 12);

+        }

+

+        // invoke OnBeforeUserFormSave event

+        $modx->invokeEvent("OnBeforeUserFormSave", array(

+            "mode" => "new",

+        ));

+

+        // create the user account

+        $field = array();

+        $field['password'] = $modx->getPasswordHash()->HashPassword($newpassword);

+        $field['username'] = $newusername;

+        $managerUser= EvolutionCMS\Models\ManagerUser::create($field);

+        $internalKey = $managerUser->getKey();

+        $field = compact( 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');

+        $managerUser->attributes()->create($field);

 

         $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

+        // Save user settings

         saveManagerUserSettings($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($modx->getConfig('use_udperms') == 1) {

-			if(!empty($user_groups)) {

-				for($i = 0; $i < count($user_groups); $i++) {

-					$field = array();

-					$field['user_group'] = (int)$user_groups[$i];

-					$field['member'] = $id;

-					$managerUser->memberGroups()->create($field);

-				}

-			}

-		}

-		// end of user_groups stuff!

+        // 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($modx->getConfig('use_udperms') == 1) {

+            if(!empty($user_groups)) {

+                for($i = 0; $i < count($user_groups); $i++) {

+                    $field = array();

+                    $field['user_group'] = (int)$user_groups[$i];

+                    $field['member'] = $id;

+                    $managerUser->memberGroups()->create($field);

+                }

+            }

+        }

+        // end of user_groups stuff!

 

         if ($passwordnotifymethod == 'e') {

             sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);

             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 {

+                $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";

-			}

+                $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 MODX_MANAGER_PATH . "includes/header.inc.php";

-			?>

+            include_once MODX_MANAGER_PATH . "includes/header.inc.php";

+            ?>

 

 			<h1><?php echo $_lang['user_title']; ?></h1>

 

@@ -185,123 +185,123 @@ 
 			</div>

 			<?php

 

-			include_once MODX_MANAGER_PATH . "includes/footer.inc.php";

-		}

-		break;

-	case '12' : // edit user

-		// generate a new password for this user

+            include_once MODX_MANAGER_PATH . "includes/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!", 12);

-				} else {

-					$newpassword = $specifiedpassword;

-				}

+                    webAlertAndQuit("Password is too short!", 12);

+                } else {

+                    $newpassword = $specifiedpassword;

+                }

             } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

-				webAlertAndQuit("You didn't specify a password for this user!", 12);

+                webAlertAndQuit("You didn't specify a password for this user!", 12);

             } elseif ($passwordgenmethod == 'g') {

-				$newpassword = generate_password(8);

-			} else {

-				webAlertAndQuit("No password generation method specified!", 12);

-			}

-		}

+                $newpassword = generate_password(8);

+            } else {

+                webAlertAndQuit("No password generation method specified!", 12);

+            }

+        }

         if ($passwordnotifymethod == 'e') {

             sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);

-		}

-

-		// check if the username already exist

-		if (EvolutionCMS\Models\ManagerUser::where('username', '=', $newusername)->where('id', '!=', $id)->first()) {

-			webAlertAndQuit("User name is already in use!", 12);

-		}

-

-		// check if the email address already exists

-		if (EvolutionCMS\Models\UserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

-			webAlertAndQuit("Email is already in use!", 12);

-		}

-

-		// invoke OnBeforeUserFormSave event

-		$modx->invokeEvent("OnBeforeUserFormSave", array(

-			"mode" => "upd",

-			"id" => $id

-		));

-

-		// update user name and password

-		$field = array();

-		$field['username'] = $newusername;

+        }

+

+        // check if the username already exist

+        if (EvolutionCMS\Models\ManagerUser::where('username', '=', $newusername)->where('id', '!=', $id)->first()) {

+            webAlertAndQuit("User name is already in use!", 12);

+        }

+

+        // check if the email address already exists

+        if (EvolutionCMS\Models\UserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

+            webAlertAndQuit("Email is already in use!", 12);

+        }

+

+        // invoke OnBeforeUserFormSave event

+        $modx->invokeEvent("OnBeforeUserFormSave", array(

+            "mode" => "upd",

+            "id" => $id

+        ));

+

+        // update user name and password

+        $field = array();

+        $field['username'] = $newusername;

         if ($genpassword == 1) {

-			$field['password'] = $modx->getPasswordHash()->HashPassword($newpassword);

-		}

-		$managerUser = EvolutionCMS\Models\ManagerUser::find($id);

-		$managerUser->update($field);

+            $field['password'] = $modx->getPasswordHash()->HashPassword($newpassword);

+        }

+        $managerUser = EvolutionCMS\Models\ManagerUser::find($id);

+        $managerUser->update($field);

         $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state',

             'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil',

             'blockedafter');

-		$managerUser->attributes->update($field);

+        $managerUser->attributes->update($field);

 

-		// Save user settings

+        // Save user settings

         saveManagerUserSettings($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

+        // 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($modx->getConfig('use_udperms') == 1) {

-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups

-			$managerUser->memberGroups()->delete();

+            $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($modx->getConfig('use_udperms') == 1) {

+            // as this is an existing user, delete his/ her entries in the groups before saving the new groups

+            $managerUser->memberGroups()->delete();

             if (!empty($user_groups)) {

                 for ($i = 0; $i < count($user_groups); $i++) {

-					$field = array();

-					$field['user_group'] = (int)$user_groups[$i];

-					$field['member'] = $id;

-					$managerUser->memberGroups()->create($field);

-				}

-			}

-		}

-		// end of user_groups stuff!

-		/*******************************************************************************/

+                    $field = array();

+                    $field['user_group'] = (int)$user_groups[$i];

+                    $field['member'] = $id;

+                    $managerUser->memberGroups()->create($field);

+                }

+            }

+        }

+        // 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";');

-		}

+            $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";

-			}

+                $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 MODX_MANAGER_PATH . "includes/header.inc.php";

-			?>

+            include_once MODX_MANAGER_PATH . "includes/header.inc.php";

+            ?>

 

 			<h1><?php echo $_lang['user_title']; ?></h1>

 

@@ -324,18 +324,18 @@ 
 			</div>

 			<?php

 

-			include_once MODX_MANAGER_PATH . "includes/footer.inc.php";

-		} else {

+            include_once MODX_MANAGER_PATH . "includes/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.", 12);

+                $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.", 12);

 }

Switch Indentation +236 added lines, -236 removed lines

@@ -61,109 +61,109 @@ 
 }

 

 switch ($input['mode']) {

-	case '11' : // new user

-		// check if this user name already exist

-		if (EvolutionCMS\Models\ManagerUser::where('username', '=', $newusername)->first()) {

-			webAlertAndQuit("User name is already in use!", 12);

-		}

-

-		// check if the email address already exist

-		if (EvolutionCMS\Models\UserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

-			webAlertAndQuit("Email is already in use!", 12);

-		}

-

-		// generate a new password for this user

-        if ($specifiedpassword != "" && $passwordgenmethod == "spec") {

-            if (strlen($specifiedpassword) < 6) {

-				webAlertAndQuit("Password is too short!", 12);

-			} else {

-				$newpassword = $specifiedpassword;

-			}

-        } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

-			webAlertAndQuit("You didn't specify a password for this user!", 12);

-        } elseif ($passwordgenmethod == 'g') {

-			$newpassword = generate_password(8);

-		} else {

-			webAlertAndQuit("No password generation method specified!", 12);

-		}

-

-		// invoke OnBeforeUserFormSave event

-		$modx->invokeEvent("OnBeforeUserFormSave", array(

-			"mode" => "new",

-		));

-

-		// create the user account

-		$field = array();

-		$field['password'] = $modx->getPasswordHash()->HashPassword($newpassword);

-		$field['username'] = $newusername;

-		$managerUser= EvolutionCMS\Models\ManagerUser::create($field);

-		$internalKey = $managerUser->getKey();

-		$field = compact( 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');

-		$managerUser->attributes()->create($field);

-

-        $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

-        saveManagerUserSettings($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($modx->getConfig('use_udperms') == 1) {

-			if(!empty($user_groups)) {

-				for($i = 0; $i < count($user_groups); $i++) {

-					$field = array();

-					$field['user_group'] = (int)$user_groups[$i];

-					$field['member'] = $id;

-					$managerUser->memberGroups()->create($field);

-				}

-			}

-		}

-		// end of user_groups stuff!

-

-        if ($passwordnotifymethod == 'e') {

-            sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);

-            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 MODX_MANAGER_PATH . "includes/header.inc.php";

-			?>

+	    case '11' : // new user

+		    // check if this user name already exist

+		    if (EvolutionCMS\Models\ManagerUser::where('username', '=', $newusername)->first()) {

+			    webAlertAndQuit("User name is already in use!", 12);

+		    }

+

+		    // check if the email address already exist

+		    if (EvolutionCMS\Models\UserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

+			    webAlertAndQuit("Email is already in use!", 12);

+		    }

+

+		    // generate a new password for this user

+            if ($specifiedpassword != "" && $passwordgenmethod == "spec") {

+                if (strlen($specifiedpassword) < 6) {

+				    webAlertAndQuit("Password is too short!", 12);

+			    } else {

+				    $newpassword = $specifiedpassword;

+			    }

+            } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

+			    webAlertAndQuit("You didn't specify a password for this user!", 12);

+            } elseif ($passwordgenmethod == 'g') {

+			    $newpassword = generate_password(8);

+		    } else {

+			    webAlertAndQuit("No password generation method specified!", 12);

+		    }

+

+		    // invoke OnBeforeUserFormSave event

+		    $modx->invokeEvent("OnBeforeUserFormSave", array(

+			    "mode" => "new",

+		    ));

+

+		    // create the user account

+		    $field = array();

+		    $field['password'] = $modx->getPasswordHash()->HashPassword($newpassword);

+		    $field['username'] = $newusername;

+		    $managerUser= EvolutionCMS\Models\ManagerUser::create($field);

+		    $internalKey = $managerUser->getKey();

+		    $field = compact( 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');

+		    $managerUser->attributes()->create($field);

+

+            $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

+            saveManagerUserSettings($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($modx->getConfig('use_udperms') == 1) {

+			    if(!empty($user_groups)) {

+				    for($i = 0; $i < count($user_groups); $i++) {

+					    $field = array();

+					    $field['user_group'] = (int)$user_groups[$i];

+					    $field['member'] = $id;

+					    $managerUser->memberGroups()->create($field);

+				    }

+			    }

+		    }

+		    // end of user_groups stuff!

+

+            if ($passwordnotifymethod == 'e') {

+                sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);

+                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 MODX_MANAGER_PATH . "includes/header.inc.php";

+			    ?>

 

 			<h1><?php echo $_lang['user_title']; ?></h1>

 

@@ -185,130 +185,130 @@ 
 			</div>

 			<?php

 

-			include_once MODX_MANAGER_PATH . "includes/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!", 12);

-				} else {

-					$newpassword = $specifiedpassword;

-				}

-            } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

-				webAlertAndQuit("You didn't specify a password for this user!", 12);

-            } elseif ($passwordgenmethod == 'g') {

-				$newpassword = generate_password(8);

-			} else {

-				webAlertAndQuit("No password generation method specified!", 12);

-			}

-		}

-        if ($passwordnotifymethod == 'e') {

-            sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);

-		}

-

-		// check if the username already exist

-		if (EvolutionCMS\Models\ManagerUser::where('username', '=', $newusername)->where('id', '!=', $id)->first()) {

-			webAlertAndQuit("User name is already in use!", 12);

-		}

-

-		// check if the email address already exists

-		if (EvolutionCMS\Models\UserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

-			webAlertAndQuit("Email is already in use!", 12);

-		}

-

-		// invoke OnBeforeUserFormSave event

-		$modx->invokeEvent("OnBeforeUserFormSave", array(

-			"mode" => "upd",

-			"id" => $id

-		));

-

-		// update user name and password

-		$field = array();

-		$field['username'] = $newusername;

-        if ($genpassword == 1) {

-			$field['password'] = $modx->getPasswordHash()->HashPassword($newpassword);

-		}

-		$managerUser = EvolutionCMS\Models\ManagerUser::find($id);

-		$managerUser->update($field);

-        $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state',

-            'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil',

-            'blockedafter');

-		$managerUser->attributes->update($field);

-

-		// Save user settings

-        saveManagerUserSettings($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($modx->getConfig('use_udperms') == 1) {

-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups

-			$managerUser->memberGroups()->delete();

-            if (!empty($user_groups)) {

-                for ($i = 0; $i < count($user_groups); $i++) {

-					$field = array();

-					$field['user_group'] = (int)$user_groups[$i];

-					$field['member'] = $id;

-					$managerUser->memberGroups()->create($field);

-				}

-			}

-		}

-		// 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 MODX_MANAGER_PATH . "includes/header.inc.php";

-			?>

+			    include_once MODX_MANAGER_PATH . "includes/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!", 12);

+				    } else {

+					    $newpassword = $specifiedpassword;

+				    }

+                } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

+				    webAlertAndQuit("You didn't specify a password for this user!", 12);

+                } elseif ($passwordgenmethod == 'g') {

+				    $newpassword = generate_password(8);

+			    } else {

+				    webAlertAndQuit("No password generation method specified!", 12);

+			    }

+		    }

+            if ($passwordnotifymethod == 'e') {

+                sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);

+		    }

+

+		    // check if the username already exist

+		    if (EvolutionCMS\Models\ManagerUser::where('username', '=', $newusername)->where('id', '!=', $id)->first()) {

+			    webAlertAndQuit("User name is already in use!", 12);

+		    }

+

+		    // check if the email address already exists

+		    if (EvolutionCMS\Models\UserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

+			    webAlertAndQuit("Email is already in use!", 12);

+		    }

+

+		    // invoke OnBeforeUserFormSave event

+		    $modx->invokeEvent("OnBeforeUserFormSave", array(

+			    "mode" => "upd",

+			    "id" => $id

+		    ));

+

+		    // update user name and password

+		    $field = array();

+		    $field['username'] = $newusername;

+            if ($genpassword == 1) {

+			    $field['password'] = $modx->getPasswordHash()->HashPassword($newpassword);

+		    }

+		    $managerUser = EvolutionCMS\Models\ManagerUser::find($id);

+		    $managerUser->update($field);

+            $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state',

+                'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil',

+                'blockedafter');

+		    $managerUser->attributes->update($field);

+

+		    // Save user settings

+            saveManagerUserSettings($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($modx->getConfig('use_udperms') == 1) {

+			    // as this is an existing user, delete his/ her entries in the groups before saving the new groups

+			    $managerUser->memberGroups()->delete();

+                if (!empty($user_groups)) {

+                    for ($i = 0; $i < count($user_groups); $i++) {

+					    $field = array();

+					    $field['user_group'] = (int)$user_groups[$i];

+					    $field['member'] = $id;

+					    $managerUser->memberGroups()->create($field);

+				    }

+			    }

+		    }

+		    // 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 MODX_MANAGER_PATH . "includes/header.inc.php";

+			    ?>

 

 			<h1><?php echo $_lang['user_title']; ?></h1>

 

 			<div id="actions">

                 <div class="btn-group">

                     <a class="btn" href="<?php echo ($id == $modx->getLoginUserID()) ? 'index.php?a=8' : $stayUrl;

-                    ?>"><i

+                        ?>"><i

                             class="<?php echo $_style["actions_save"] ?>"></i> <?php echo ($id == $modx->getLoginUserID()) ? $_lang['logout'] : $_lang['edit']; ?>

                     </a>

 			</div>

@@ -318,24 +318,24 @@ 
                 <div class="tab-page">

                     <div class="container container-body" id="disp">

                         <p><?php echo sprintf($_lang["password_msg"], $modx->getPhpCompat()->htmlspecialchars($newusername),

-                                    $modx->getPhpCompat()->htmlspecialchars($newpassword)) . (($id == $modx->getLoginUserID()) ? ' ' . $_lang['user_changeddata'] : ''); ?></p>

+                                        $modx->getPhpCompat()->htmlspecialchars($newpassword)) . (($id == $modx->getLoginUserID()) ? ' ' . $_lang['user_changeddata'] : ''); ?></p>

 					</div>

 				</div>

 			</div>

 			<?php

 

-			include_once MODX_MANAGER_PATH . "includes/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.", 12);

+			    include_once MODX_MANAGER_PATH . "includes/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.", 12);

 }

Spacing +18 added lines, -18 removed lines

@@ -8,7 +8,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'];

@@ -96,9 +96,9 @@ 
 		$field = array();

 		$field['password'] = $modx->getPasswordHash()->HashPassword($newpassword);

 		$field['username'] = $newusername;

-		$managerUser= EvolutionCMS\Models\ManagerUser::create($field);

+		$managerUser = EvolutionCMS\Models\ManagerUser::create($field);

 		$internalKey = $managerUser->getKey();

-		$field = compact( 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');

+		$field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');

 		$managerUser->attributes()->create($field);

 

         $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street',

@@ -132,11 +132,11 @@ 
 		/*******************************************************************************/

 		// put the user in the user_groups he/ she should be in

 		// first, check that up_perms are switched on!

-		if($modx->getConfig('use_udperms') == 1) {

-			if(!empty($user_groups)) {

-				for($i = 0; $i < count($user_groups); $i++) {

+		if ($modx->getConfig('use_udperms') == 1) {

+			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;

 					$managerUser->memberGroups()->create($field);

 				}

@@ -148,7 +148,7 @@ 
             sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);

             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";

@@ -157,12 +157,12 @@ 
 		} else {

             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";

 			}

 

-			include_once MODX_MANAGER_PATH . "includes/header.inc.php";

+			include_once MODX_MANAGER_PATH."includes/header.inc.php";

 			?>

 

 			<h1><?php echo $_lang['user_title']; ?></h1>

@@ -185,7 +185,7 @@ 
 			</div>

 			<?php

 

-			include_once MODX_MANAGER_PATH . "includes/footer.inc.php";

+			include_once MODX_MANAGER_PATH."includes/footer.inc.php";

 		}

 		break;

 	case '12' : // edit user

@@ -275,13 +275,13 @@ 
 		/*******************************************************************************/

 		// put the user in the user_groups he/ she should be in

 		// first, check that up_perms are switched on!

-		if($modx->getConfig('use_udperms') == 1) {

+		if ($modx->getConfig('use_udperms') == 1) {

 			// as this is an existing user, delete his/ her entries in the groups before saving the new groups

 			$managerUser->memberGroups()->delete();

             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;

 					$managerUser->memberGroups()->create($field);

 				}

@@ -295,12 +295,12 @@ 
         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";

 			}

 

-			include_once MODX_MANAGER_PATH . "includes/header.inc.php";

+			include_once MODX_MANAGER_PATH."includes/header.inc.php";

 			?>

 

 			<h1><?php echo $_lang['user_title']; ?></h1>

@@ -318,17 +318,17 @@ 
                 <div class="tab-page">

                     <div class="container container-body" id="disp">

                         <p><?php echo sprintf($_lang["password_msg"], $modx->getPhpCompat()->htmlspecialchars($newusername),

-                                    $modx->getPhpCompat()->htmlspecialchars($newpassword)) . (($id == $modx->getLoginUserID()) ? ' ' . $_lang['user_changeddata'] : ''); ?></p>

+                                    $modx->getPhpCompat()->htmlspecialchars($newpassword)).(($id == $modx->getLoginUserID()) ? ' '.$_lang['user_changeddata'] : ''); ?></p>

 					</div>

 				</div>

 			</div>

 			<?php

 

-			include_once MODX_MANAGER_PATH . "includes/footer.inc.php";

+			include_once MODX_MANAGER_PATH."includes/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 = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];

 				header($header);

 			} else {

 				$header = "Location: index.php?a=75&r=2";

Braces +47 added lines, -47 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"]);

 }

 

@@ -38,52 +38,52 @@ 
 $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", 12);

 }

 

 // 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!", 12);

 }

 

 // 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_user')) {

+    if (!$modx->hasPermission('save_user')) {
 		webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!", 12);

 	}

 	// Verify that the user being edited wasn't an admin and the user ID got spoofed

-	if (EvolutionCMS\Models\ManagerUser::where('role', '=', 1)->where('internalKey', '=', $id)->first()) {

+	if (EvolutionCMS\Models\ManagerUser::where('role', '=', 1)->where('internalKey', '=', $id)->first()) {
 		webAlertAndQuit("You cannot alter an administrative user.", 12);

 	}

 

 }

 

-switch ($input['mode']) {

+switch ($input['mode']) {
 	case '11' : // new user

 		// check if this user name already exist

-		if (EvolutionCMS\Models\ManagerUser::where('username', '=', $newusername)->first()) {

+		if (EvolutionCMS\Models\ManagerUser::where('username', '=', $newusername)->first()) {
 			webAlertAndQuit("User name is already in use!", 12);

 		}

 

 		// check if the email address already exist

-		if (EvolutionCMS\Models\UserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

+		if (EvolutionCMS\Models\UserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {
 			webAlertAndQuit("Email is already in use!", 12);

 		}

 

 		// 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!", 12);

-			} else {

+			} else {
 				$newpassword = $specifiedpassword;

 			}

-        } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

+        } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {
 			webAlertAndQuit("You didn't specify a password for this user!", 12);

-        } elseif ($passwordgenmethod == 'g') {

+        } elseif ($passwordgenmethod == 'g') {
 			$newpassword = generate_password(8);

-		} else {

+		} else {
 			webAlertAndQuit("No password generation method specified!", 12);

 		}

 

@@ -132,9 +132,9 @@ 
 		/*******************************************************************************/

 		// put the user in the user_groups he/ she should be in

 		// first, check that up_perms are switched on!

-		if($modx->getConfig('use_udperms') == 1) {

-			if(!empty($user_groups)) {

-				for($i = 0; $i < count($user_groups); $i++) {

+		if($modx->getConfig('use_udperms') == 1) {
+			if(!empty($user_groups)) {
+				for($i = 0; $i < count($user_groups); $i++) {
 					$field = array();

 					$field['user_group'] = (int)$user_groups[$i];

 					$field['member'] = $id;

@@ -144,21 +144,21 @@ 
 		}

 		// end of user_groups stuff!

 

-        if ($passwordnotifymethod == 'e') {

+        if ($passwordnotifymethod == 'e') {
             sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);

-            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($header);

-			} else {

+			} else {
 				$header = "Location: index.php?a=75&r=2";

 				header($header);

 			}

-		} else {

-            if ($input['stay'] != '') {

+		} else {
+            if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";

 				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];

-			} else {

+			} else {
 				$stayUrl = "index.php?a=75&r=2";

 			}

 

@@ -190,32 +190,32 @@ 
 		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!", 12);

-				} else {

+				} else {
 					$newpassword = $specifiedpassword;

 				}

-            } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

+            } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {
 				webAlertAndQuit("You didn't specify a password for this user!", 12);

-            } elseif ($passwordgenmethod == 'g') {

+            } elseif ($passwordgenmethod == 'g') {
 				$newpassword = generate_password(8);

-			} else {

+			} else {
 				webAlertAndQuit("No password generation method specified!", 12);

 			}

 		}

-        if ($passwordnotifymethod == 'e') {

+        if ($passwordnotifymethod == 'e') {
             sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);

 		}

 

 		// check if the username already exist

-		if (EvolutionCMS\Models\ManagerUser::where('username', '=', $newusername)->where('id', '!=', $id)->first()) {

+		if (EvolutionCMS\Models\ManagerUser::where('username', '=', $newusername)->where('id', '!=', $id)->first()) {
 			webAlertAndQuit("User name is already in use!", 12);

 		}

 

 		// check if the email address already exists

-		if (EvolutionCMS\Models\UserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

+		if (EvolutionCMS\Models\UserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {
 			webAlertAndQuit("Email is already in use!", 12);

 		}

 

@@ -228,7 +228,7 @@ 
 		// update user name and password

 		$field = array();

 		$field['username'] = $newusername;

-        if ($genpassword == 1) {

+        if ($genpassword == 1) {
 			$field['password'] = $modx->getPasswordHash()->HashPassword($newpassword);

 		}

 		$managerUser = EvolutionCMS\Models\ManagerUser::find($id);

@@ -258,7 +258,7 @@ 
 		));

 

 		// invoke OnManagerChangePassword event

-        if ($genpassword == 1) {

+        if ($genpassword == 1) {
 			$modx->invokeEvent("OnManagerChangePassword", array(

 				"userid" => $id,

 				"username" => $newusername,

@@ -275,11 +275,11 @@ 
 		/*******************************************************************************/

 		// put the user in the user_groups he/ she should be in

 		// first, check that up_perms are switched on!

-		if($modx->getConfig('use_udperms') == 1) {

+		if($modx->getConfig('use_udperms') == 1) {
 			// as this is an existing user, delete his/ her entries in the groups before saving the new groups

 			$managerUser->memberGroups()->delete();

-            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['member'] = $id;

@@ -289,14 +289,14 @@ 
 		}

 		// 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'];

-			} else {

+			} else {
 				$stayUrl = "index.php?a=75&r=2";

 			}

 

@@ -325,12 +325,12 @@ 
 			<?php

 

 			include_once MODX_MANAGER_PATH . "includes/footer.inc.php";

-		} else {

-            if ($input['stay'] != '') {

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

+			} else {
 				$header = "Location: index.php?a=75&r=2";

 				header($header);

 			}

manager/processors/save_settings.processor.php

Indentation +98 added lines, -98 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('settings')) {

-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 $data = $_POST;

 // lose the POST now, gets rid of quirky issue with Safari 3 - see FS#972

@@ -11,41 +11,41 @@ 
 

 if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false)

 {

-	$htaccess        = MODX_BASE_PATH . '.htaccess';

-	$sample_htaccess = MODX_BASE_PATH . 'ht.access';

-	$dir = '/' . trim(MODX_BASE_URL,'/');

-	if(is_file($htaccess))

-	{

-		$_ = file_get_contents($htaccess);

-		if(strpos($_,'RewriteBase')===false)

-		{

-			$warnings[] = $_lang["settings_friendlyurls_alert2"];

-		}

-		elseif(is_writable($htaccess))

-		{

-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);

-			if(!@file_put_contents($htaccess,$_))

-			{

-				$warnings[] = $_lang["settings_friendlyurls_alert2"];

-			}

-		}

-	}

-	elseif(is_file($sample_htaccess))

-	{

-		if(!@rename($sample_htaccess,$htaccess))

+    $htaccess        = MODX_BASE_PATH . '.htaccess';

+    $sample_htaccess = MODX_BASE_PATH . 'ht.access';

+    $dir = '/' . trim(MODX_BASE_URL,'/');

+    if(is_file($htaccess))

+    {

+        $_ = file_get_contents($htaccess);

+        if(strpos($_,'RewriteBase')===false)

         {

-        	$warnings[] = $_lang["settings_friendlyurls_alert"];

-		}

-		elseif(MODX_BASE_URL!=='/')

-		{

-			$_ = file_get_contents($htaccess);

-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);

-			if(!@file_put_contents($htaccess,$_))

-			{

-				$warnings[] = $_lang["settings_friendlyurls_alert2"];

-			}

-		}

-	}

+            $warnings[] = $_lang["settings_friendlyurls_alert2"];

+        }

+        elseif(is_writable($htaccess))

+        {

+            $_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);

+            if(!@file_put_contents($htaccess,$_))

+            {

+                $warnings[] = $_lang["settings_friendlyurls_alert2"];

+            }

+        }

+    }

+    elseif(is_file($sample_htaccess))

+    {

+        if(!@rename($sample_htaccess,$htaccess))

+        {

+            $warnings[] = $_lang["settings_friendlyurls_alert"];

+        }

+        elseif(MODX_BASE_URL!=='/')

+        {

+            $_ = file_get_contents($htaccess);

+            $_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);

+            if(!@file_put_contents($htaccess,$_))

+            {

+                $warnings[] = $_lang["settings_friendlyurls_alert2"];

+            }

+        }

+    }

 }

 

 if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

@@ -56,19 +56,19 @@ 
 $data['rb_base_dir']      = str_replace('[(base_path)]',MODX_BASE_PATH,$data['rb_base_dir']);

 

 if (isset($data) && count($data) > 0) {

-	if(isset($data['manager_language'])) {

-		$lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php';

-		if(is_file($lang_path)) {

-			include $lang_path;

+    if(isset($data['manager_language'])) {

+        $lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php';

+        if(is_file($lang_path)) {

+            include $lang_path;

             global $modx_lang_attribute;

             $data['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;

-		}

-	}

-	$savethese = array();

-	$data['sys_files_checksum'] = $modx->getManagerApi()->getSystemChecksum($data['check_files_onlogin']);

-	$data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute

-	foreach ($data as $k => $v) {

-		switch ($k) {

+        }

+    }

+    $savethese = array();

+    $data['sys_files_checksum'] = $modx->getManagerApi()->getSystemChecksum($data['check_files_onlogin']);

+    $data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute

+    foreach ($data as $k => $v) {

+        switch ($k) {

             case 'settings_version':{

                 if($modx->getVersionData('version')!=$data['settings_version']){

                     $modx->logEvent(17,2,'<pre>'.var_export($data['settings_version'],true).'</pre>','fake settings_version');

@@ -76,24 +76,24 @@ 
                 }

                 break;

             }

-			case 'error_page':

-			case 'unauthorized_page':

-			if (trim($v) == '' || !is_numeric($v)) {

-				$v = $data['site_start'];

-			}

-			break;

+            case 'error_page':

+            case 'unauthorized_page':

+            if (trim($v) == '' || !is_numeric($v)) {

+                $v = $data['site_start'];

+            }

+            break;

 

-			case 'lst_custom_contenttype':

-			case 'txt_custom_contenttype':

-				// Skip these

-				$k = '';

-				break;

-			case 'rb_base_dir':

-			case 'rb_base_url':

-			case 'filemanager_path':

-				$v = trim($v);

-				$v = rtrim($v,'/') . '/';

-				break;

+            case 'lst_custom_contenttype':

+            case 'txt_custom_contenttype':

+                // Skip these

+                $k = '';

+                break;

+            case 'rb_base_dir':

+            case 'rb_base_url':

+            case 'filemanager_path':

+                $v = trim($v);

+                $v = rtrim($v,'/') . '/';

+                break;

             case 'manager_language':

                 $langDir = realpath(MODX_MANAGER_PATH . 'includes/lang');

                 $langFile = realpath(MODX_MANAGER_PATH . 'includes/lang/' . $v . '.inc.php');

@@ -101,47 +101,47 @@ 
                 if($langDir !== $langFileDir || !file_exists($langFile)) {

                     $v = 'english';

                 }

-				break;

-			case 'smtppw':

-				if ($v !== '********************' && $v !== '') {

-					$v = trim($v);

-					$v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);

-					$v = str_replace('=','%',$v);

-				} elseif ($v === '********************') {

-					$k = '';

-				}

-				break;

-			case 'session_timeout':

-				$mail_check_timeperiod = $data['mail_check_timeperiod'];

-				$v = (int)$v < ($data['mail_check_timeperiod']/60+1) ? ($data['mail_check_timeperiod']/60+1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum

-				break;

-			default:

-			break;

-		}

-		$v = is_array($v) ? implode(",", $v) : $v;

+                break;

+            case 'smtppw':

+                if ($v !== '********************' && $v !== '') {

+                    $v = trim($v);

+                    $v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);

+                    $v = str_replace('=','%',$v);

+                } elseif ($v === '********************') {

+                    $k = '';

+                }

+                break;

+            case 'session_timeout':

+                $mail_check_timeperiod = $data['mail_check_timeperiod'];

+                $v = (int)$v < ($data['mail_check_timeperiod']/60+1) ? ($data['mail_check_timeperiod']/60+1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum

+                break;

+            default:

+            break;

+        }

+        $v = is_array($v) ? implode(",", $v) : $v;

 

-		$modx->config[$k] = $v;

+        $modx->config[$k] = $v;

 

-		if(!empty($k)) $savethese[] = '(\''.$modx->getDatabase()->escape($k).'\', \''.$modx->getDatabase()->escape($v).'\')';

-	}

+        if(!empty($k)) $savethese[] = '(\''.$modx->getDatabase()->escape($k).'\', \''.$modx->getDatabase()->escape($v).'\')';

+    }

 

-	// Run a single query to save all the values

-	$sql = "REPLACE INTO ".$modx->getDatabase()->getFullTableName("system_settings")." (setting_name, setting_value)

+    // Run a single query to save all the values

+    $sql = "REPLACE INTO ".$modx->getDatabase()->getFullTableName("system_settings")." (setting_name, setting_value)

 		VALUES ".implode(', ', $savethese);

-	$modx->getDatabase()->query($sql);

+    $modx->getDatabase()->query($sql);

 

-	// Reset Template Pages

-	if (isset($data['reset_template'])) {

-		$newtemplate = (int)$data['default_template'];

-		$oldtemplate = (int)$data['old_template'];

-		$tbl = $modx->getDatabase()->getFullTableName('site_content');

-		$reset = $data['reset_template'];

-		if($reset==1) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "type='document'");

-		else if($reset==2) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");

-	}

+    // Reset Template Pages

+    if (isset($data['reset_template'])) {

+        $newtemplate = (int)$data['default_template'];

+        $oldtemplate = (int)$data['old_template'];

+        $tbl = $modx->getDatabase()->getFullTableName('site_content');

+        $reset = $data['reset_template'];

+        if($reset==1) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "type='document'");

+        else if($reset==2) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");

+    }

 

-	// empty cache

-	$modx->clearCache('full');

+    // empty cache

+    $modx->clearCache('full');

 }

 $header="Location: index.php?a=7&r=10";

 header($header);

Spacing +39 added lines, -39 removed lines

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

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

-if(!$modx->hasPermission('settings')) {

+if (!$modx->hasPermission('settings')) {

 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 $data = $_POST;

 // lose the POST now, gets rid of quirky issue with Safari 3 - see FS#972

 unset($_POST);

 

-if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false)

+if ($data['friendly_urls'] === '1' && strpos($_SERVER['SERVER_SOFTWARE'], 'IIS') === false)

 {

-	$htaccess        = MODX_BASE_PATH . '.htaccess';

-	$sample_htaccess = MODX_BASE_PATH . 'ht.access';

-	$dir = '/' . trim(MODX_BASE_URL,'/');

-	if(is_file($htaccess))

+	$htaccess        = MODX_BASE_PATH.'.htaccess';

+	$sample_htaccess = MODX_BASE_PATH.'ht.access';

+	$dir = '/'.trim(MODX_BASE_URL, '/');

+	if (is_file($htaccess))

 	{

 		$_ = file_get_contents($htaccess);

-		if(strpos($_,'RewriteBase')===false)

+		if (strpos($_, 'RewriteBase') === false)

 		{

 			$warnings[] = $_lang["settings_friendlyurls_alert2"];

 		}

-		elseif(is_writable($htaccess))

+		elseif (is_writable($htaccess))

 		{

-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);

-			if(!@file_put_contents($htaccess,$_))

+			$_ = preg_replace('@RewriteBase.+@', "RewriteBase {$dir}", $_);

+			if (!@file_put_contents($htaccess, $_))

 			{

 				$warnings[] = $_lang["settings_friendlyurls_alert2"];

 			}

 		}

 	}

-	elseif(is_file($sample_htaccess))

+	elseif (is_file($sample_htaccess))

 	{

-		if(!@rename($sample_htaccess,$htaccess))

+		if (!@rename($sample_htaccess, $htaccess))

         {

         	$warnings[] = $_lang["settings_friendlyurls_alert"];

 		}

-		elseif(MODX_BASE_URL!=='/')

+		elseif (MODX_BASE_URL !== '/')

 		{

 			$_ = file_get_contents($htaccess);

-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);

-			if(!@file_put_contents($htaccess,$_))

+			$_ = preg_replace('@RewriteBase.+@', "RewriteBase {$dir}", $_);

+			if (!@file_put_contents($htaccess, $_))

 			{

 				$warnings[] = $_lang["settings_friendlyurls_alert2"];

 			}

@@ -48,17 +48,17 @@ 
 	}

 }

 

-if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

-    unlink(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css');

+if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {

+    unlink(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css');

 }

 

-$data['filemanager_path'] = str_replace('[(base_path)]',MODX_BASE_PATH,$data['filemanager_path']);

-$data['rb_base_dir']      = str_replace('[(base_path)]',MODX_BASE_PATH,$data['rb_base_dir']);

+$data['filemanager_path'] = str_replace('[(base_path)]', MODX_BASE_PATH, $data['filemanager_path']);

+$data['rb_base_dir']      = str_replace('[(base_path)]', MODX_BASE_PATH, $data['rb_base_dir']);

 

 if (isset($data) && count($data) > 0) {

-	if(isset($data['manager_language'])) {

-		$lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php';

-		if(is_file($lang_path)) {

+	if (isset($data['manager_language'])) {

+		$lang_path = MODX_MANAGER_PATH.'includes/lang/'.$data['manager_language'].'.inc.php';

+		if (is_file($lang_path)) {

 			include $lang_path;

             global $modx_lang_attribute;

             $data['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;

@@ -66,12 +66,12 @@ 
 	}

 	$savethese = array();

 	$data['sys_files_checksum'] = $modx->getManagerApi()->getSystemChecksum($data['check_files_onlogin']);

-	$data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute

+	$data['mail_check_timeperiod'] = (int) $data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute

 	foreach ($data as $k => $v) {

 		switch ($k) {

             case 'settings_version':{

-                if($modx->getVersionData('version')!=$data['settings_version']){

-                    $modx->logEvent(17,2,'<pre>'.var_export($data['settings_version'],true).'</pre>','fake settings_version');

+                if ($modx->getVersionData('version') != $data['settings_version']) {

+                    $modx->logEvent(17, 2, '<pre>'.var_export($data['settings_version'], true).'</pre>', 'fake settings_version');

                     $v = $modx->getVersionData('version');

                 }

                 break;

@@ -92,28 +92,28 @@ 
 			case 'rb_base_url':

 			case 'filemanager_path':

 				$v = trim($v);

-				$v = rtrim($v,'/') . '/';

+				$v = rtrim($v, '/').'/';

 				break;

             case 'manager_language':

-                $langDir = realpath(MODX_MANAGER_PATH . 'includes/lang');

-                $langFile = realpath(MODX_MANAGER_PATH . 'includes/lang/' . $v . '.inc.php');

+                $langDir = realpath(MODX_MANAGER_PATH.'includes/lang');

+                $langFile = realpath(MODX_MANAGER_PATH.'includes/lang/'.$v.'.inc.php');

                 $langFileDir = dirname($langFile);

-                if($langDir !== $langFileDir || !file_exists($langFile)) {

+                if ($langDir !== $langFileDir || !file_exists($langFile)) {

                     $v = 'english';

                 }

 				break;

 			case 'smtppw':

 				if ($v !== '********************' && $v !== '') {

 					$v = trim($v);

-					$v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);

-					$v = str_replace('=','%',$v);

+					$v = base64_encode($v).substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);

+					$v = str_replace('=', '%', $v);

 				} elseif ($v === '********************') {

 					$k = '';

 				}

 				break;

 			case 'session_timeout':

 				$mail_check_timeperiod = $data['mail_check_timeperiod'];

-				$v = (int)$v < ($data['mail_check_timeperiod']/60+1) ? ($data['mail_check_timeperiod']/60+1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum

+				$v = (int) $v < ($data['mail_check_timeperiod'] / 60 + 1) ? ($data['mail_check_timeperiod'] / 60 + 1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum

 				break;

 			default:

 			break;

@@ -122,7 +122,7 @@ 
 

 		$modx->config[$k] = $v;

 

-		if(!empty($k)) $savethese[] = '(\''.$modx->getDatabase()->escape($k).'\', \''.$modx->getDatabase()->escape($v).'\')';

+		if (!empty($k)) $savethese[] = '(\''.$modx->getDatabase()->escape($k).'\', \''.$modx->getDatabase()->escape($v).'\')';

 	}

 

 	// Run a single query to save all the values

@@ -132,16 +132,16 @@ 
 

 	// Reset Template Pages

 	if (isset($data['reset_template'])) {

-		$newtemplate = (int)$data['default_template'];

-		$oldtemplate = (int)$data['old_template'];

+		$newtemplate = (int) $data['default_template'];

+		$oldtemplate = (int) $data['old_template'];

 		$tbl = $modx->getDatabase()->getFullTableName('site_content');

 		$reset = $data['reset_template'];

-		if($reset==1) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "type='document'");

-		else if($reset==2) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");

+		if ($reset == 1) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "type='document'");

+		else if ($reset == 2) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");

 	}

 

 	// empty cache

 	$modx->clearCache('full');

 }

-$header="Location: index.php?a=7&r=10";

+$header = "Location: index.php?a=7&r=10";

 header($header);

Braces +31 added lines, -38 removed lines

@@ -1,64 +1,52 @@ 
 <?php

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

-if(!$modx->hasPermission('settings')) {

+if(!$modx->hasPermission('settings')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 $data = $_POST;

 // lose the POST now, gets rid of quirky issue with Safari 3 - see FS#972

 unset($_POST);

 

-if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false)

-{

+if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false) {
 	$htaccess        = MODX_BASE_PATH . '.htaccess';

 	$sample_htaccess = MODX_BASE_PATH . 'ht.access';

 	$dir = '/' . trim(MODX_BASE_URL,'/');

-	if(is_file($htaccess))

-	{

+	if(is_file($htaccess)) {
 		$_ = file_get_contents($htaccess);

-		if(strpos($_,'RewriteBase')===false)

-		{

+		if(strpos($_,'RewriteBase')===false) {
 			$warnings[] = $_lang["settings_friendlyurls_alert2"];

-		}

-		elseif(is_writable($htaccess))

-		{

+		} elseif(is_writable($htaccess)) {
 			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);

-			if(!@file_put_contents($htaccess,$_))

-			{

+			if(!@file_put_contents($htaccess,$_)) {
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];

 			}

 		}

-	}

-	elseif(is_file($sample_htaccess))

-	{

-		if(!@rename($sample_htaccess,$htaccess))

-        {

+	} elseif(is_file($sample_htaccess)) {
+		if(!@rename($sample_htaccess,$htaccess)) {
         	$warnings[] = $_lang["settings_friendlyurls_alert"];

-		}

-		elseif(MODX_BASE_URL!=='/')

-		{

+		} elseif(MODX_BASE_URL!=='/') {
 			$_ = file_get_contents($htaccess);

 			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);

-			if(!@file_put_contents($htaccess,$_))

-			{

+			if(!@file_put_contents($htaccess,$_)) {
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];

 			}

 		}

 	}

 }

 

-if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

+if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
     unlink(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css');

 }

 

 $data['filemanager_path'] = str_replace('[(base_path)]',MODX_BASE_PATH,$data['filemanager_path']);

 $data['rb_base_dir']      = str_replace('[(base_path)]',MODX_BASE_PATH,$data['rb_base_dir']);

 

-if (isset($data) && count($data) > 0) {

-	if(isset($data['manager_language'])) {

+if (isset($data) && count($data) > 0) {
+	if(isset($data['manager_language'])) {
 		$lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php';

-		if(is_file($lang_path)) {

+		if(is_file($lang_path)) {
 			include $lang_path;

             global $modx_lang_attribute;

             $data['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;

@@ -67,10 +55,10 @@ 
 	$savethese = array();

 	$data['sys_files_checksum'] = $modx->getManagerApi()->getSystemChecksum($data['check_files_onlogin']);

 	$data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute

-	foreach ($data as $k => $v) {

-		switch ($k) {

+	foreach ($data as $k => $v) {
+		switch ($k) {
             case 'settings_version':{

-                if($modx->getVersionData('version')!=$data['settings_version']){

+                if($modx->getVersionData('version')!=$data['settings_version']) {
                     $modx->logEvent(17,2,'<pre>'.var_export($data['settings_version'],true).'</pre>','fake settings_version');

                     $v = $modx->getVersionData('version');

                 }

@@ -78,7 +66,7 @@ 
             }

 			case 'error_page':

 			case 'unauthorized_page':

-			if (trim($v) == '' || !is_numeric($v)) {

+			if (trim($v) == '' || !is_numeric($v)) {
 				$v = $data['site_start'];

 			}

 			break;

@@ -98,16 +86,16 @@ 
                 $langDir = realpath(MODX_MANAGER_PATH . 'includes/lang');

                 $langFile = realpath(MODX_MANAGER_PATH . 'includes/lang/' . $v . '.inc.php');

                 $langFileDir = dirname($langFile);

-                if($langDir !== $langFileDir || !file_exists($langFile)) {

+                if($langDir !== $langFileDir || !file_exists($langFile)) {
                     $v = 'english';

                 }

 				break;

 			case 'smtppw':

-				if ($v !== '********************' && $v !== '') {

+				if ($v !== '********************' && $v !== '') {
 					$v = trim($v);

 					$v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7);

 					$v = str_replace('=','%',$v);

-				} elseif ($v === '********************') {

+				} elseif ($v === '********************') {
 					$k = '';

 				}

 				break;

@@ -122,7 +110,9 @@ 
 

 		$modx->config[$k] = $v;

 

-		if(!empty($k)) $savethese[] = '(\''.$modx->getDatabase()->escape($k).'\', \''.$modx->getDatabase()->escape($v).'\')';

+		if(!empty($k)) {
+		    $savethese[] = '(\''.$modx->getDatabase()->escape($k).'\', \''.$modx->getDatabase()->escape($v).'\')';
+		}
 	}

 

 	// Run a single query to save all the values

@@ -131,13 +121,16 @@ 
 	$modx->getDatabase()->query($sql);

 

 	// Reset Template Pages

-	if (isset($data['reset_template'])) {

+	if (isset($data['reset_template'])) {
 		$newtemplate = (int)$data['default_template'];

 		$oldtemplate = (int)$data['old_template'];

 		$tbl = $modx->getDatabase()->getFullTableName('site_content');

 		$reset = $data['reset_template'];

-		if($reset==1) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "type='document'");

-		else if($reset==2) $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");

+		if($reset==1) {
+		    $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "type='document'");
+		} else if($reset==2) {
+		    $modx->getDatabase()->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'");
+		}
 	}

 

 	// empty cache

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 		}

 		elseif(is_writable($htaccess))

 		{

-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);

+			$_ = preg_replace('@RewriteBase.+@',"rewritebase {$dir}", $_);

 			if(!@file_put_contents($htaccess,$_))

 			{

 				$warnings[] = $_lang["settings_friendlyurls_alert2"];

@@ -39,7 +39,7 @@ 
 		elseif(MODX_BASE_URL!=='/')

 		{

 			$_ = file_get_contents($htaccess);

-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);

+			$_ = preg_replace('@RewriteBase.+@',"rewritebase {$dir}", $_);

 			if(!@file_put_contents($htaccess,$_))

 			{

 				$warnings[] = $_lang["settings_friendlyurls_alert2"];

manager/processors/save_tmplvars.processor.php

Spacing +10 added lines, -10 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('save_template')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = (int)$_POST['id'];
+$id = (int) $_POST['id'];
 $name = trim($_POST['name']);
 $description = $_POST['description'];
 $caption = $_POST['caption'];
@@ -17,17 +17,17 @@ 
 $display = $_POST['display'];
 $params = $_POST['params'];
 $locked = isset($_POST['locked']) && $_POST['locked'] == 'on' ? 1 : 0;
-$origin = isset($_REQUEST['or']) ? (int)$_REQUEST['or'] : 76;
-$originId = isset($_REQUEST['oid']) ? (int)$_REQUEST['oid'] : null;
+$origin = isset($_REQUEST['or']) ? (int) $_REQUEST['or'] : 76;
+$originId = isset($_REQUEST['oid']) ? (int) $_REQUEST['oid'] : null;
 $currentdate = time() + $modx->config['server_offset_time'];
 
 //Kyle Jaebker - added category support
 if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) {
-    $categoryid = (int)$_POST['categoryid'];
+    $categoryid = (int) $_POST['categoryid'];
 } elseif (empty($_POST['newcategory']) && $_POST['categoryid'] <= 0) {
     $categoryid = 0;
 } else {
-    include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
     $categoryid = checkCategory($_POST['newcategory']);
     if (!$categoryid) {
         $categoryid = newCategory($_POST['newcategory']);
@@ -74,7 +74,7 @@ 
             'createdon' => $currentdate,
             'editedon' => $currentdate
         );
-        $tmplVar= EvolutionCMS\Models\SiteTmplvar::create($field);
+        $tmplVar = EvolutionCMS\Models\SiteTmplvar::create($field);
         $newid = $tmplVar->getKey();
 
         // save access permissions
@@ -96,7 +96,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "301&id=$newid" : "300";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $header = "Location: index.php?a=76&r=2";
@@ -158,11 +158,11 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "301&id=$id" : "300";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'] . "&or=" . $origin . "&oid=" . $originId;
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay']."&or=".$origin."&oid=".$originId;
             header($header);
         } else {
             $modx->unlockElement(2, $id);
-            $header = "Location: index.php?a=" . $origin . "&r=2" . (empty($originId) ? '' : '&id=' . $originId);
+            $header = "Location: index.php?a=".$origin."&r=2".(empty($originId) ? '' : '&id='.$originId);
             header($header);
         }
 

manager/processors/delete_template.processor.php

Indentation +16 added lines, -16 removed lines

@@ -1,22 +1,22 @@ 
 <?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('delete_template')) {
-	$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"]);
 }
 
 // delete the template, but first check it doesn't have any documents using it
 $rs = $modx->getDatabase()->select('id, pagetitle,introtext', $modx->getDatabase()->getFullTableName('site_content'), "template='{$id}' AND deleted=0");
 $limit = $modx->getDatabase()->getRecordCount($rs);
 if($limit > 0) {
-	include MODX_MANAGER_PATH . "includes/header.inc.php";
-	?>
+    include MODX_MANAGER_PATH . "includes/header.inc.php";
+    ?>
 
 	<h1><?php echo $_lang['manage_templates']; ?></h1>
 
@@ -28,20 +28,20 @@ 
 			<p>Documents using this template:</p>
 			<ul>
 				<?php
-				while($row = $modx->getDatabase()->getRow($rs)) {
-					echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['introtext'] != '' ? ' - ' . $row['introtext'] : '') . '</li>';
-				}
-				?>
+                while($row = $modx->getDatabase()->getRow($rs)) {
+                    echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['introtext'] != '' ? ' - ' . $row['introtext'] : '') . '</li>';
+                }
+                ?>
 			</ul>
 		</div>
 	</div>
 	<?php
-	include_once MODX_MANAGER_PATH . "includes/footer.inc.php";
-	exit;
+    include_once MODX_MANAGER_PATH . "includes/footer.inc.php";
+    exit;
 }
 
 if($id == $default_template) {
-	$modx->webAlertAndQuit("This template is set as the default template. Please choose a different default template in the MODX configuration before deleting this template.");
+    $modx->webAlertAndQuit("This template is set as the default template. Please choose a different default template in the MODX configuration before deleting this template.");
 }
 
 // Set the item name for logger
@@ -50,8 +50,8 @@ 
 
 // invoke OnBeforeTempFormDelete event
 $modx->invokeEvent("OnBeforeTempFormDelete", array(
-		"id" => $id
-	));
+        "id" => $id
+    ));
 
 // delete the document.
 $modx->getDatabase()->delete($modx->getDatabase()->getFullTableName('site_templates'), "id='{$id}'");
@@ -60,8 +60,8 @@ 
 
 // invoke OnTempFormDelete event
 $modx->invokeEvent("OnTempFormDelete", array(
-		"id" => $id
-	));
+        "id" => $id
+    ));
 
 // empty cache
 $modx->clearCache('full');

Spacing +10 added lines, -10 removed lines

@@ -1,21 +1,21 @@ 
 <?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_template')) {
+if (!$modx->hasPermission('delete_template')) {
 	$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"]);
 }
 
 // delete the template, but first check it doesn't have any documents using it
 $rs = $modx->getDatabase()->select('id, pagetitle,introtext', $modx->getDatabase()->getFullTableName('site_content'), "template='{$id}' AND deleted=0");
 $limit = $modx->getDatabase()->getRecordCount($rs);
-if($limit > 0) {
-	include MODX_MANAGER_PATH . "includes/header.inc.php";
+if ($limit > 0) {
+	include MODX_MANAGER_PATH."includes/header.inc.php";
 	?>
 
 	<h1><?php echo $_lang['manage_templates']; ?></h1>
@@ -28,19 +28,19 @@ 
 			<p>Documents using this template:</p>
 			<ul>
 				<?php
-				while($row = $modx->getDatabase()->getRow($rs)) {
-					echo '<li><span style="width: 200px"><a href="index.php?id=' . $row['id'] . '&a=27">' . $row['pagetitle'] . '</a></span>' . ($row['introtext'] != '' ? ' - ' . $row['introtext'] : '') . '</li>';
+				while ($row = $modx->getDatabase()->getRow($rs)) {
+					echo '<li><span style="width: 200px"><a href="index.php?id='.$row['id'].'&a=27">'.$row['pagetitle'].'</a></span>'.($row['introtext'] != '' ? ' - '.$row['introtext'] : '').'</li>';
 				}
 				?>
 			</ul>
 		</div>
 	</div>
 	<?php
-	include_once MODX_MANAGER_PATH . "includes/footer.inc.php";
+	include_once MODX_MANAGER_PATH."includes/footer.inc.php";
 	exit;
 }
 
-if($id == $default_template) {
+if ($id == $default_template) {
 	$modx->webAlertAndQuit("This template is set as the default template. Please choose a different default template in the MODX configuration before deleting this template.");
 }
 

manager/processors/save_web_user.processor.php

Indentation +156 added lines, -156 removed lines

@@ -1,17 +1,17 @@ 
 <?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"]);

 }

 

 $input = $_POST;

 foreach ($input as $k => $v) {

     if ($k !== 'comment' && $k !== 'user_groups') {

-		$v = $modx->getPhpCompat()->htmlspecialchars($v, ENT_NOQUOTES);

-	}

-	$input[$k] = $v;

+        $v = $modx->getPhpCompat()->htmlspecialchars($v, ENT_NOQUOTES);

+    }

+    $input[$k] = $v;

 }

 

 $id = (int)$input['id'];

@@ -45,81 +45,81 @@ 
 

 // verify password

 if ($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {

-	webAlertAndQuit("Password typed is mismatched", 88);

+    webAlertAndQuit("Password typed is mismatched", 88);

 }

 

 // 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!", 88);

+    webAlertAndQuit("E-mail address doesn't seem to be valid!", 88);

 }

 

 switch ($input['mode']) {

-	case '87' : // new user

-		// check if this user name already exist

-		if (EvolutionCMS\Models\WebUser::where('username', '=', $newusername)->first()) {

-			webAlertAndQuit("User name is already in use!", 88);

-		}

-

-		// check if the email address already exist

-		if ($modx->config['allow_multiple_emails'] != 1) {

-			if (EvolutionCMS\Models\WebUserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

-				webAlertAndQuit("Email is already in use!", 88);

-			}

-		}

-

-		// generate a new password for this user

+    case '87' : // new user

+        // check if this user name already exist

+        if (EvolutionCMS\Models\WebUser::where('username', '=', $newusername)->first()) {

+            webAlertAndQuit("User name is already in use!", 88);

+        }

+

+        // check if the email address already exist

+        if ($modx->config['allow_multiple_emails'] != 1) {

+            if (EvolutionCMS\Models\WebUserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

+                webAlertAndQuit("Email is already in use!", 88);

+            }

+        }

+

+        // generate a new password for this user

         if ($specifiedpassword != "" && $passwordgenmethod == "spec") {

             if (strlen($specifiedpassword) < 6) {

-				webAlertAndQuit("Password is too short!", 88);

-			} else {

-				$newpassword = $specifiedpassword;

-			}

+                webAlertAndQuit("Password is too short!", 88);

+            } else {

+                $newpassword = $specifiedpassword;

+            }

         } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

-			webAlertAndQuit("You didn't specify a password for this user!", 88);

+            webAlertAndQuit("You didn't specify a password for this user!", 88);

         } elseif ($passwordgenmethod == 'g') {

-			$newpassword = generate_password(8);

-		} else {

-			webAlertAndQuit("No password generation method specified!", 88);

-		}

-

-		// invoke OnBeforeWUsrFormSave event

-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(

-			"mode" => "new",

-		));

-

-		// create the user account

-		$field = array();

-		$field['username'] = $newusername;

-		$field['password'] = md5($newpassword);

-		$webUser= EvolutionCMS\Models\WebUser::create($field);

-		$internalKey = $webUser->getKey();

-		$field = compact( 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');

-		$webUser->attributes()->create($field);

+            $newpassword = generate_password(8);

+        } else {

+            webAlertAndQuit("No password generation method specified!", 88);

+        }

+

+        // invoke OnBeforeWUsrFormSave event

+        $modx->invokeEvent("OnBeforeWUsrFormSave", array(

+            "mode" => "new",

+        ));

+

+        // create the user account

+        $field = array();

+        $field['username'] = $newusername;

+        $field['password'] = md5($newpassword);

+        $webUser= EvolutionCMS\Models\WebUser::create($field);

+        $internalKey = $webUser->getKey();

+        $field = compact( 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');

+        $webUser->attributes()->create($field);

 

         $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

+        // Save User Settings

         saveWebUserSettings($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($modx->getConfig('use_udperms') == 1) {

-			if(!empty($user_groups)) {

-				for($i = 0; $i < count($user_groups); $i++) {

-					$field = array();

-					$field['webgroup'] = (int)$user_groups[$i];

-					$webUser->memberGroups()->create($field);

-				}

-			}

-		}

-		// end of user_groups stuff!

+        // 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($modx->getConfig('use_udperms') == 1) {

+            if(!empty($user_groups)) {

+                for($i = 0; $i < count($user_groups); $i++) {

+                    $field = array();

+                    $field['webgroup'] = (int)$user_groups[$i];

+                    $webUser->memberGroups()->create($field);

+                }

+            }

+        }

+        // end of user_groups stuff!

 

         // invoke OnWebSaveUser event

         $modx->invokeEvent("OnWebSaveUser", array(

@@ -140,23 +140,23 @@ 
         if ($passwordnotifymethod == 'e') {

             sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $websignupemail_message, $site_url);

             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 {

+                $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";

-			}

+                $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 MODX_MANAGER_PATH . "includes/header.inc.php";

-			?>

+            include_once MODX_MANAGER_PATH . "includes/header.inc.php";

+            ?>

 

 			<h1><?php echo $_lang['web_user_title']; ?></h1>

 

@@ -178,83 +178,83 @@ 
 			</div>

 			<?php

 

-			include_once MODX_MANAGER_PATH . "includes/footer.inc.php";

-		}

-		break;

-	case '88' : // edit user

-		// generate a new password for this user

+            include_once MODX_MANAGER_PATH . "includes/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!", 88);

-				} else {

-					$newpassword = $specifiedpassword;

-				}

+                    webAlertAndQuit("Password is too short!", 88);

+                } else {

+                    $newpassword = $specifiedpassword;

+                }

             } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

-				webAlertAndQuit("You didn't specify a password for this user!", 88);

+                webAlertAndQuit("You didn't specify a password for this user!", 88);

             } elseif ($passwordgenmethod == 'g') {

-				$newpassword = generate_password(8);

-			} else {

-				webAlertAndQuit("No password generation method specified!", 88);

-			}

-		}

+                $newpassword = generate_password(8);

+            } else {

+                webAlertAndQuit("No password generation method specified!", 88);

+            }

+        }

         if ($passwordnotifymethod == 'e') {

             sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $websignupemail_message, $site_url);

-		}

-

-		// check if the username already exist

-		if (EvolutionCMS\Models\WebUser::where('id', '!=', $id)->where('username', '=', $newusername)->first()) {

-			webAlertAndQuit("User name is already in use!", 88);

-		}

-

-		// check if the email address already exists

-		if ($modx->config['allow_multiple_emails'] != 1) {

-			if (EvolutionCMS\Models\WebUserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

-				webAlertAndQuit("Email is already in use!", 88);

-			}

-		}

-

-		// invoke OnBeforeWUsrFormSave event

-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(

-			"mode" => "upd",

-			"id" => $id

-		));

-

-		// update user name and password

-		$field = array();

-		$field['username'] = $newusername;

+        }

+

+        // check if the username already exist

+        if (EvolutionCMS\Models\WebUser::where('id', '!=', $id)->where('username', '=', $newusername)->first()) {

+            webAlertAndQuit("User name is already in use!", 88);

+        }

+

+        // check if the email address already exists

+        if ($modx->config['allow_multiple_emails'] != 1) {

+            if (EvolutionCMS\Models\WebUserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

+                webAlertAndQuit("Email is already in use!", 88);

+            }

+        }

+

+        // invoke OnBeforeWUsrFormSave event

+        $modx->invokeEvent("OnBeforeWUsrFormSave", array(

+            "mode" => "upd",

+            "id" => $id

+        ));

+

+        // update user name and password

+        $field = array();

+        $field['username'] = $newusername;

         if ($genpassword == 1) {

-			$field['password'] = md5($newpassword);

-		}

-		$webUser = EvolutionCMS\Models\WebUser::find($id);

-		$webUser->update($field);

+            $field['password'] = md5($newpassword);

+        }

+        $webUser = EvolutionCMS\Models\WebUser::find($id);

+        $webUser->update($field);

         $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state',

             'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil',

             'blockedafter');

-		$webUser->attributes->update($field);

+        $webUser->attributes->update($field);

 

-		// Save User Settings

+        // Save User Settings

         saveWebUserSettings($id);

 

-		// Set the item name for logger

-		$_SESSION['itemname'] = $newusername;

+        // 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($modx->getConfig('use_udperms') == 1) {

-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups

-			$webUser->memberGroups()->delete();

+        /*******************************************************************************/

+        // put the user in the user_groups he/ she should be in

+        // first, check that up_perms are switched on!

+        if($modx->getConfig('use_udperms') == 1) {

+            // as this is an existing user, delete his/ her entries in the groups before saving the new groups

+            $webUser->memberGroups()->delete();

             if (!empty($user_groups)) {

                 for ($i = 0; $i < count($user_groups); $i++) {

-					$field = array();

-					$field['webgroup'] = (int)$user_groups[$i];

-					$webUser->memberGroups()->create($field);

-				}

-			}

-		}

-		// end of user_groups stuff!

-		/*******************************************************************************/

+                    $field = array();

+                    $field['webgroup'] = (int)$user_groups[$i];

+                    $webUser->memberGroups()->create($field);

+                }

+            }

+        }

+        // end of user_groups stuff!

+        /*******************************************************************************/

 

         // invoke OnWebSaveUser event

         $modx->invokeEvent("OnWebSaveUser", array(

@@ -285,14 +285,14 @@ 
 

         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";

-			}

+                $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 MODX_MANAGER_PATH . "includes/header.inc.php";

-			?>

+            include_once MODX_MANAGER_PATH . "includes/header.inc.php";

+            ?>

 

 			<h1><?php echo $_lang['web_user_title']; ?></h1>

 

@@ -312,18 +312,18 @@ 
 			</div>

 			<?php

 

-			include_once MODX_MANAGER_PATH . "includes/footer.inc.php";

-		} else {

+            include_once MODX_MANAGER_PATH . "includes/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.", 88);

+                $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.", 88);

 }

Switch Indentation +226 added lines, -226 removed lines

@@ -54,109 +54,109 @@ 
 }

 

 switch ($input['mode']) {

-	case '87' : // new user

-		// check if this user name already exist

-		if (EvolutionCMS\Models\WebUser::where('username', '=', $newusername)->first()) {

-			webAlertAndQuit("User name is already in use!", 88);

-		}

-

-		// check if the email address already exist

-		if ($modx->config['allow_multiple_emails'] != 1) {

-			if (EvolutionCMS\Models\WebUserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

-				webAlertAndQuit("Email is already in use!", 88);

-			}

-		}

-

-		// generate a new password for this user

-        if ($specifiedpassword != "" && $passwordgenmethod == "spec") {

-            if (strlen($specifiedpassword) < 6) {

-				webAlertAndQuit("Password is too short!", 88);

-			} else {

-				$newpassword = $specifiedpassword;

-			}

-        } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

-			webAlertAndQuit("You didn't specify a password for this user!", 88);

-        } elseif ($passwordgenmethod == 'g') {

-			$newpassword = generate_password(8);

-		} else {

-			webAlertAndQuit("No password generation method specified!", 88);

-		}

-

-		// invoke OnBeforeWUsrFormSave event

-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(

-			"mode" => "new",

-		));

-

-		// create the user account

-		$field = array();

-		$field['username'] = $newusername;

-		$field['password'] = md5($newpassword);

-		$webUser= EvolutionCMS\Models\WebUser::create($field);

-		$internalKey = $webUser->getKey();

-		$field = compact( 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');

-		$webUser->attributes()->create($field);

-

-        $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

-        saveWebUserSettings($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($modx->getConfig('use_udperms') == 1) {

-			if(!empty($user_groups)) {

-				for($i = 0; $i < count($user_groups); $i++) {

-					$field = array();

-					$field['webgroup'] = (int)$user_groups[$i];

-					$webUser->memberGroups()->create($field);

-				}

-			}

-		}

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

-            sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $websignupemail_message, $site_url);

-            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 MODX_MANAGER_PATH . "includes/header.inc.php";

-			?>

+	    case '87' : // new user

+		    // check if this user name already exist

+		    if (EvolutionCMS\Models\WebUser::where('username', '=', $newusername)->first()) {

+			    webAlertAndQuit("User name is already in use!", 88);

+		    }

+

+		    // check if the email address already exist

+		    if ($modx->config['allow_multiple_emails'] != 1) {

+			    if (EvolutionCMS\Models\WebUserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

+				    webAlertAndQuit("Email is already in use!", 88);

+			    }

+		    }

+

+		    // generate a new password for this user

+            if ($specifiedpassword != "" && $passwordgenmethod == "spec") {

+                if (strlen($specifiedpassword) < 6) {

+				    webAlertAndQuit("Password is too short!", 88);

+			    } else {

+				    $newpassword = $specifiedpassword;

+			    }

+            } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

+			    webAlertAndQuit("You didn't specify a password for this user!", 88);

+            } elseif ($passwordgenmethod == 'g') {

+			    $newpassword = generate_password(8);

+		    } else {

+			    webAlertAndQuit("No password generation method specified!", 88);

+		    }

+

+		    // invoke OnBeforeWUsrFormSave event

+		    $modx->invokeEvent("OnBeforeWUsrFormSave", array(

+			    "mode" => "new",

+		    ));

+

+		    // create the user account

+		    $field = array();

+		    $field['username'] = $newusername;

+		    $field['password'] = md5($newpassword);

+		    $webUser= EvolutionCMS\Models\WebUser::create($field);

+		    $internalKey = $webUser->getKey();

+		    $field = compact( 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');

+		    $webUser->attributes()->create($field);

+

+            $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

+            saveWebUserSettings($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($modx->getConfig('use_udperms') == 1) {

+			    if(!empty($user_groups)) {

+				    for($i = 0; $i < count($user_groups); $i++) {

+					    $field = array();

+					    $field['webgroup'] = (int)$user_groups[$i];

+					    $webUser->memberGroups()->create($field);

+				    }

+			    }

+		    }

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

+                sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $websignupemail_message, $site_url);

+                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 MODX_MANAGER_PATH . "includes/header.inc.php";

+			    ?>

 

 			<h1><?php echo $_lang['web_user_title']; ?></h1>

 

@@ -178,121 +178,121 @@ 
 			</div>

 			<?php

 

-			include_once MODX_MANAGER_PATH . "includes/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!", 88);

-				} else {

-					$newpassword = $specifiedpassword;

-				}

-            } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

-				webAlertAndQuit("You didn't specify a password for this user!", 88);

-            } elseif ($passwordgenmethod == 'g') {

-				$newpassword = generate_password(8);

-			} else {

-				webAlertAndQuit("No password generation method specified!", 88);

-			}

-		}

-        if ($passwordnotifymethod == 'e') {

-            sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $websignupemail_message, $site_url);

-		}

-

-		// check if the username already exist

-		if (EvolutionCMS\Models\WebUser::where('id', '!=', $id)->where('username', '=', $newusername)->first()) {

-			webAlertAndQuit("User name is already in use!", 88);

-		}

-

-		// check if the email address already exists

-		if ($modx->config['allow_multiple_emails'] != 1) {

-			if (EvolutionCMS\Models\WebUserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

-				webAlertAndQuit("Email is already in use!", 88);

-			}

-		}

-

-		// invoke OnBeforeWUsrFormSave event

-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(

-			"mode" => "upd",

-			"id" => $id

-		));

-

-		// update user name and password

-		$field = array();

-		$field['username'] = $newusername;

-        if ($genpassword == 1) {

-			$field['password'] = md5($newpassword);

-		}

-		$webUser = EvolutionCMS\Models\WebUser::find($id);

-		$webUser->update($field);

-        $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state',

-            'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil',

-            'blockedafter');

-		$webUser->attributes->update($field);

-

-		// Save User Settings

-        saveWebUserSettings($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($modx->getConfig('use_udperms') == 1) {

-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups

-			$webUser->memberGroups()->delete();

-            if (!empty($user_groups)) {

-                for ($i = 0; $i < count($user_groups); $i++) {

-					$field = array();

-					$field['webgroup'] = (int)$user_groups[$i];

-					$webUser->memberGroups()->create($field);

-				}

-			}

-		}

-		// 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 MODX_MANAGER_PATH . "includes/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!", 88);

+				    } else {

+					    $newpassword = $specifiedpassword;

+				    }

+                } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

+				    webAlertAndQuit("You didn't specify a password for this user!", 88);

+                } elseif ($passwordgenmethod == 'g') {

+				    $newpassword = generate_password(8);

+			    } else {

+				    webAlertAndQuit("No password generation method specified!", 88);

+			    }

+		    }

+            if ($passwordnotifymethod == 'e') {

+                sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $websignupemail_message, $site_url);

+		    }

+

+		    // check if the username already exist

+		    if (EvolutionCMS\Models\WebUser::where('id', '!=', $id)->where('username', '=', $newusername)->first()) {

+			    webAlertAndQuit("User name is already in use!", 88);

+		    }

+

+		    // check if the email address already exists

+		    if ($modx->config['allow_multiple_emails'] != 1) {

+			    if (EvolutionCMS\Models\WebUserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

+				    webAlertAndQuit("Email is already in use!", 88);

+			    }

+		    }

+

+		    // invoke OnBeforeWUsrFormSave event

+		    $modx->invokeEvent("OnBeforeWUsrFormSave", array(

+			    "mode" => "upd",

+			    "id" => $id

+		    ));

+

+		    // update user name and password

+		    $field = array();

+		    $field['username'] = $newusername;

+            if ($genpassword == 1) {

+			    $field['password'] = md5($newpassword);

+		    }

+		    $webUser = EvolutionCMS\Models\WebUser::find($id);

+		    $webUser->update($field);

+            $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state',

+                'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil',

+                'blockedafter');

+		    $webUser->attributes->update($field);

+

+		    // Save User Settings

+            saveWebUserSettings($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($modx->getConfig('use_udperms') == 1) {

+			    // as this is an existing user, delete his/ her entries in the groups before saving the new groups

+			    $webUser->memberGroups()->delete();

+                if (!empty($user_groups)) {

+                    for ($i = 0; $i < count($user_groups); $i++) {

+					    $field = array();

+					    $field['webgroup'] = (int)$user_groups[$i];

+					    $webUser->memberGroups()->create($field);

+				    }

+			    }

+		    }

+		    // 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 MODX_MANAGER_PATH . "includes/header.inc.php";

-			?>

+			    include_once MODX_MANAGER_PATH . "includes/header.inc.php";

+			    ?>

 

 			<h1><?php echo $_lang['web_user_title']; ?></h1>

 

@@ -312,18 +312,18 @@ 
 			</div>

 			<?php

 

-			include_once MODX_MANAGER_PATH . "includes/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.", 88);

+			    include_once MODX_MANAGER_PATH . "includes/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.", 88);

 }

Spacing +17 added lines, -17 removed lines

@@ -14,7 +14,7 @@ 
 	$input[$k] = $v;

 }

 

-$id = (int)$input['id'];

+$id = (int) $input['id'];

 $oldusername = $input['oldusername'];

 $newusername = !empty ($input['newusername']) ? trim($input['newusername']) : "New User";

 $fullname = $input['fullname'];

@@ -91,9 +91,9 @@ 
 		$field = array();

 		$field['username'] = $newusername;

 		$field['password'] = md5($newpassword);

-		$webUser= EvolutionCMS\Models\WebUser::create($field);

+		$webUser = EvolutionCMS\Models\WebUser::create($field);

 		$internalKey = $webUser->getKey();

-		$field = compact( 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');

+		$field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');

 		$webUser->attributes()->create($field);

 

         $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street',

@@ -110,11 +110,11 @@ 
 		/*******************************************************************************/

 		// put the user in the user_groups he/ she should be in

 		// first, check that up_perms are switched on!

-		if($modx->getConfig('use_udperms') == 1) {

-			if(!empty($user_groups)) {

-				for($i = 0; $i < count($user_groups); $i++) {

+		if ($modx->getConfig('use_udperms') == 1) {

+			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];

 					$webUser->memberGroups()->create($field);

 				}

 			}

@@ -141,7 +141,7 @@ 
             sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $websignupemail_message, $site_url);

             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";

@@ -150,12 +150,12 @@ 
 		} else {

             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";

 			}

 

-			include_once MODX_MANAGER_PATH . "includes/header.inc.php";

+			include_once MODX_MANAGER_PATH."includes/header.inc.php";

 			?>

 

 			<h1><?php echo $_lang['web_user_title']; ?></h1>

@@ -178,7 +178,7 @@ 
 			</div>

 			<?php

 

-			include_once MODX_MANAGER_PATH . "includes/footer.inc.php";

+			include_once MODX_MANAGER_PATH."includes/footer.inc.php";

 		}

 		break;

 	case '88' : // edit user

@@ -242,13 +242,13 @@ 
 		/*******************************************************************************/

 		// put the user in the user_groups he/ she should be in

 		// first, check that up_perms are switched on!

-		if($modx->getConfig('use_udperms') == 1) {

+		if ($modx->getConfig('use_udperms') == 1) {

 			// as this is an existing user, delete his/ her entries in the groups before saving the new groups

 			$webUser->memberGroups()->delete();

             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];

 					$webUser->memberGroups()->create($field);

 				}

 			}

@@ -286,12 +286,12 @@ 
         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";

 			}

 

-			include_once MODX_MANAGER_PATH . "includes/header.inc.php";

+			include_once MODX_MANAGER_PATH."includes/header.inc.php";

 			?>

 

 			<h1><?php echo $_lang['web_user_title']; ?></h1>

@@ -312,11 +312,11 @@ 
 			</div>

 			<?php

 

-			include_once MODX_MANAGER_PATH . "includes/footer.inc.php";

+			include_once MODX_MANAGER_PATH."includes/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 = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];

 				header($header);

 			} else {

 				$header = "Location: index.php?a=99&r=2";

Braces +47 added lines, -47 removed lines

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

-if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

-if (!$modx->hasPermission('save_web_user')) {

+if (!$modx->hasPermission('save_web_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

 $input = $_POST;

-foreach ($input as $k => $v) {

-    if ($k !== 'comment' && $k !== 'user_groups') {

+foreach ($input as $k => $v) {
+    if ($k !== 'comment' && $k !== 'user_groups') {
 		$v = $modx->getPhpCompat()->htmlspecialchars($v, ENT_NOQUOTES);

 	}

 	$input[$k] = $v;

@@ -44,41 +44,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", 88);

 }

 

 // 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!", 88);

 }

 

-switch ($input['mode']) {

+switch ($input['mode']) {
 	case '87' : // new user

 		// check if this user name already exist

-		if (EvolutionCMS\Models\WebUser::where('username', '=', $newusername)->first()) {

+		if (EvolutionCMS\Models\WebUser::where('username', '=', $newusername)->first()) {
 			webAlertAndQuit("User name is already in use!", 88);

 		}

 

 		// check if the email address already exist

-		if ($modx->config['allow_multiple_emails'] != 1) {

-			if (EvolutionCMS\Models\WebUserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

+		if ($modx->config['allow_multiple_emails'] != 1) {
+			if (EvolutionCMS\Models\WebUserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {
 				webAlertAndQuit("Email is already in use!", 88);

 			}

 		}

 

 		// 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!", 88);

-			} else {

+			} else {
 				$newpassword = $specifiedpassword;

 			}

-        } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

+        } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {
 			webAlertAndQuit("You didn't specify a password for this user!", 88);

-        } elseif ($passwordgenmethod == 'g') {

+        } elseif ($passwordgenmethod == 'g') {
 			$newpassword = generate_password(8);

-		} else {

+		} else {
 			webAlertAndQuit("No password generation method specified!", 88);

 		}

 

@@ -110,9 +110,9 @@ 
 		/*******************************************************************************/

 		// put the user in the user_groups he/ she should be in

 		// first, check that up_perms are switched on!

-		if($modx->getConfig('use_udperms') == 1) {

-			if(!empty($user_groups)) {

-				for($i = 0; $i < count($user_groups); $i++) {

+		if($modx->getConfig('use_udperms') == 1) {
+			if(!empty($user_groups)) {
+				for($i = 0; $i < count($user_groups); $i++) {
 					$field = array();

 					$field['webgroup'] = (int)$user_groups[$i];

 					$webUser->memberGroups()->create($field);

@@ -137,21 +137,21 @@ 
             "id" => $internalKey

         ));

 

-        if ($passwordnotifymethod == 'e') {

+        if ($passwordnotifymethod == 'e') {
             sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $websignupemail_message, $site_url);

-            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($header);

-			} else {

+			} else {
 				$header = "Location: index.php?a=99&r=2";

 				header($header);

 			}

-		} else {

-            if ($input['stay'] != '') {

+		} else {
+            if ($input['stay'] != '') {
 				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";

 				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];

-			} else {

+			} else {
 				$stayUrl = "index.php?a=99&r=2";

 			}

 

@@ -183,33 +183,33 @@ 
 		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!", 88);

-				} else {

+				} else {
 					$newpassword = $specifiedpassword;

 				}

-            } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {

+            } elseif ($specifiedpassword == "" && $passwordgenmethod == "spec") {
 				webAlertAndQuit("You didn't specify a password for this user!", 88);

-            } elseif ($passwordgenmethod == 'g') {

+            } elseif ($passwordgenmethod == 'g') {
 				$newpassword = generate_password(8);

-			} else {

+			} else {
 				webAlertAndQuit("No password generation method specified!", 88);

 			}

 		}

-        if ($passwordnotifymethod == 'e') {

+        if ($passwordnotifymethod == 'e') {
             sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $websignupemail_message, $site_url);

 		}

 

 		// check if the username already exist

-		if (EvolutionCMS\Models\WebUser::where('id', '!=', $id)->where('username', '=', $newusername)->first()) {

+		if (EvolutionCMS\Models\WebUser::where('id', '!=', $id)->where('username', '=', $newusername)->first()) {
 			webAlertAndQuit("User name is already in use!", 88);

 		}

 

 		// check if the email address already exists

-		if ($modx->config['allow_multiple_emails'] != 1) {

-			if (EvolutionCMS\Models\WebUserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {

+		if ($modx->config['allow_multiple_emails'] != 1) {
+			if (EvolutionCMS\Models\WebUserAttribute::where('internalKey', '!=', $id)->where('email', '=', $email)->first()) {
 				webAlertAndQuit("Email is already in use!", 88);

 			}

 		}

@@ -223,7 +223,7 @@ 
 		// update user name and password

 		$field = array();

 		$field['username'] = $newusername;

-        if ($genpassword == 1) {

+        if ($genpassword == 1) {
 			$field['password'] = md5($newpassword);

 		}

 		$webUser = EvolutionCMS\Models\WebUser::find($id);

@@ -242,11 +242,11 @@ 
 		/*******************************************************************************/

 		// put the user in the user_groups he/ she should be in

 		// first, check that up_perms are switched on!

-		if($modx->getConfig('use_udperms') == 1) {

+		if($modx->getConfig('use_udperms') == 1) {
 			// as this is an existing user, delete his/ her entries in the groups before saving the new groups

 			$webUser->memberGroups()->delete();

-            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];

 					$webUser->memberGroups()->create($field);

@@ -269,7 +269,7 @@ 
         ));

 

         // invoke OnWebChangePassword event

-        if ($genpassword == 1) {

+        if ($genpassword == 1) {
             $modx->invokeEvent("OnWebChangePassword", array(

                 "userid" => $id,

                 "username" => $newusername,

@@ -283,11 +283,11 @@ 
             "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'];

-			} else {

+			} else {
 				$stayUrl = "index.php?a=99&r=2";

 			}

 

@@ -313,12 +313,12 @@ 
 			<?php

 

 			include_once MODX_MANAGER_PATH . "includes/footer.inc.php";

-		} else {

-            if ($input['stay'] != '') {

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

+			} else {
 				$header = "Location: index.php?a=99&r=2";

 				header($header);

 			}