evolution-cms / evolution

manager/processors/save_user.processor.php

Switch Indentation +237 added lines, -237 removed lines

@@ -69,110 +69,110 @@ 
 }
 
 switch($input['mode']) {
-	case '11' : // new user
-		// check if this user name already exist
-		$rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s'", $modx->db->escape($newusername)));
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exist
-		$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND id!='%s'", $modx->db->escape($email), $id));
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
-				webAlertAndQuit("Password is too short!");
-			} else {
-				$newpassword = $specifiedpassword;
-			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
-			$newpassword = generate_password(8);
-		} else {
-			webAlertAndQuit("No password generation method specified!");
-		}
-
-		// invoke OnBeforeUserFormSave event
-		$modx->invokeEvent("OnBeforeUserFormSave", array(
-			"mode" => "new",
-		));
-
-		// create the user account
-		$internalKey = $modx->db->insert(array('username' => $modx->db->escape($newusername)), $tbl_manager_users);
-
-		$field = array();
-		$field['password'] = $modx->phpass->HashPassword($newpassword);
-		$modx->db->update($field, $tbl_manager_users, "id='{$internalKey}'");
-
-		$field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->insert($field, $tbl_user_attributes);
-
-		// Save user settings
-		saveUserSettings($internalKey);
-
-		// invoke OnManagerSaveUser event
-		$modx->invokeEvent("OnManagerSaveUser", array(
-			"mode" => "new",
-			"userid" => $internalKey,
-			"username" => $newusername,
-			"userpassword" => $newpassword,
-			"useremail" => $email,
-			"userfullname" => $fullname,
-			"userroleid" => $role
-		));
-
-		// invoke OnUserFormSave event
-		$modx->invokeEvent("OnUserFormSave", array(
-			"mode" => "new",
-			"id" => $internalKey
-		));
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$f = array();
-					$f['user_group'] = (int)$user_groups[$i];
-					$f['member'] = $internalKey;
-					$modx->db->insert($f, $tbl_member_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=75&r=2";
-				header($header);
-			}
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=75&r=2";
-			}
-
-			include_once "header.inc.php";
-			?>
+	    case '11' : // new user
+		    // check if this user name already exist
+		    $rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s'", $modx->db->escape($newusername)));
+		    $limit = $modx->db->getValue($rs);
+		    if($limit > 0) {
+			    webAlertAndQuit("User name is already in use!");
+		    }
+
+		    // check if the email address already exist
+		    $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND id!='%s'", $modx->db->escape($email), $id));
+		    $limit = $modx->db->getValue($rs);
+		    if($limit > 0) {
+			    webAlertAndQuit("Email is already in use!");
+		    }
+
+		    // generate a new password for this user
+		    if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+			    if(strlen($specifiedpassword) < 6) {
+				    webAlertAndQuit("Password is too short!");
+			    } else {
+				    $newpassword = $specifiedpassword;
+			    }
+		    } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+			    webAlertAndQuit("You didn't specify a password for this user!");
+		    } elseif($passwordgenmethod == 'g') {
+			    $newpassword = generate_password(8);
+		    } else {
+			    webAlertAndQuit("No password generation method specified!");
+		    }
+
+		    // invoke OnBeforeUserFormSave event
+		    $modx->invokeEvent("OnBeforeUserFormSave", array(
+			    "mode" => "new",
+		    ));
+
+		    // create the user account
+		    $internalKey = $modx->db->insert(array('username' => $modx->db->escape($newusername)), $tbl_manager_users);
+
+		    $field = array();
+		    $field['password'] = $modx->phpass->HashPassword($newpassword);
+		    $modx->db->update($field, $tbl_manager_users, "id='{$internalKey}'");
+
+		    $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
+		    $field = $modx->db->escape($field);
+		    $modx->db->insert($field, $tbl_user_attributes);
+
+		    // Save user settings
+		    saveUserSettings($internalKey);
+
+		    // invoke OnManagerSaveUser event
+		    $modx->invokeEvent("OnManagerSaveUser", array(
+			    "mode" => "new",
+			    "userid" => $internalKey,
+			    "username" => $newusername,
+			    "userpassword" => $newpassword,
+			    "useremail" => $email,
+			    "userfullname" => $fullname,
+			    "userroleid" => $role
+		    ));
+
+		    // invoke OnUserFormSave event
+		    $modx->invokeEvent("OnUserFormSave", array(
+			    "mode" => "new",
+			    "id" => $internalKey
+		    ));
+
+		    // Set the item name for logger
+		    $_SESSION['itemname'] = $newusername;
+
+		    /*******************************************************************************/
+		    // put the user in the user_groups he/ she should be in
+		    // first, check that up_perms are switched on!
+		    if($use_udperms == 1) {
+			    if(!empty($user_groups)) {
+				    for($i = 0; $i < count($user_groups); $i++) {
+					    $f = array();
+					    $f['user_group'] = (int)$user_groups[$i];
+					    $f['member'] = $internalKey;
+					    $modx->db->insert($f, $tbl_member_groups);
+				    }
+			    }
+		    }
+		    // end of user_groups stuff!
+
+		    if($passwordnotifymethod == 'e') {
+			    sendMailMessage($email, $newusername, $newpassword, $fullname);
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
+				    $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				    header($header);
+			    } else {
+				    $header = "Location: index.php?a=75&r=2";
+				    header($header);
+			    }
+		    } else {
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
+				    $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+			    } else {
+				    $stayUrl = "index.php?a=75&r=2";
+			    }
+
+			    include_once "header.inc.php";
+			    ?>
 
 			<h1><?php echo $_lang['user_title']; ?></h1>
 
@@ -194,125 +194,125 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		}
-		break;
-	case '12' : // edit user
-		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
-					webAlertAndQuit("Password is too short!");
-				} else {
-					$newpassword = $specifiedpassword;
-				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
-				$newpassword = generate_password(8);
-			} else {
-				webAlertAndQuit("No password generation method specified!");
-			}
-		}
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-		}
-
-		// check if the username already exist
-		$rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s' AND id!='%s'", $modx->db->escape($newusername), $id));
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exists
-		$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND internalKey!='%s'", $modx->db->escape($email), $id));
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// invoke OnBeforeUserFormSave event
-		$modx->invokeEvent("OnBeforeUserFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		// update user name and password
-		$field = array();
-		$field['username'] = $modx->db->escape($newusername);
-		if($genpassword == 1) {
-			$field['password'] = $modx->phpass->HashPassword($newpassword);
-		}
-		$modx->db->update($field, $tbl_manager_users, "id='{$id}'");
-		$field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->update($field, $tbl_user_attributes, "internalKey='{$id}'");
-
-		// Save user settings
-		saveUserSettings($id);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		// invoke OnManagerSaveUser event
-		$modx->invokeEvent("OnManagerSaveUser", array(
-			"mode" => "upd",
-			"userid" => $id,
-			"username" => $newusername,
-			"userpassword" => $newpassword,
-			"useremail" => $email,
-			"userfullname" => $fullname,
-			"userroleid" => $role,
-			"oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
-			"olduseremail" => (($oldemail != $email) ? $oldemail : "")
-		));
-
-		// invoke OnManagerChangePassword event
-		if($genpassword == 1) {
-			$modx->invokeEvent("OnManagerChangePassword", array(
-				"userid" => $id,
-				"username" => $newusername,
-				"userpassword" => $newpassword
-			));
-		}
-
-		// invoke OnUserFormSave event
-		$modx->invokeEvent("OnUserFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
-			$modx->db->delete($tbl_member_groups, "member='{$id}'");
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$field = array();
-					$field['user_group'] = (int)$user_groups[$i];
-					$field['member'] = $id;
-					$modx->db->insert($field, $tbl_member_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-		/*******************************************************************************/
-		if($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) {
-			$modx->webAlertAndQuit($_lang["user_changeddata"], 'javascript:top.location.href="index.php?a=8";');
-		}
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=75&r=2";
-			}
-
-			include_once "header.inc.php";
-			?>
+			    include_once "footer.inc.php";
+		    }
+		    break;
+	    case '12' : // edit user
+		    // generate a new password for this user
+		    if($genpassword == 1) {
+			    if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+				    if(strlen($specifiedpassword) < 6) {
+					    webAlertAndQuit("Password is too short!");
+				    } else {
+					    $newpassword = $specifiedpassword;
+				    }
+			    } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+				    webAlertAndQuit("You didn't specify a password for this user!");
+			    } elseif($passwordgenmethod == 'g') {
+				    $newpassword = generate_password(8);
+			    } else {
+				    webAlertAndQuit("No password generation method specified!");
+			    }
+		    }
+		    if($passwordnotifymethod == 'e') {
+			    sendMailMessage($email, $newusername, $newpassword, $fullname);
+		    }
+
+		    // check if the username already exist
+		    $rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s' AND id!='%s'", $modx->db->escape($newusername), $id));
+		    $limit = $modx->db->getValue($rs);
+		    if($limit > 0) {
+			    webAlertAndQuit("User name is already in use!");
+		    }
+
+		    // check if the email address already exists
+		    $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND internalKey!='%s'", $modx->db->escape($email), $id));
+		    $limit = $modx->db->getValue($rs);
+		    if($limit > 0) {
+			    webAlertAndQuit("Email is already in use!");
+		    }
+
+		    // invoke OnBeforeUserFormSave event
+		    $modx->invokeEvent("OnBeforeUserFormSave", array(
+			    "mode" => "upd",
+			    "id" => $id
+		    ));
+
+		    // update user name and password
+		    $field = array();
+		    $field['username'] = $modx->db->escape($newusername);
+		    if($genpassword == 1) {
+			    $field['password'] = $modx->phpass->HashPassword($newpassword);
+		    }
+		    $modx->db->update($field, $tbl_manager_users, "id='{$id}'");
+		    $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
+		    $field = $modx->db->escape($field);
+		    $modx->db->update($field, $tbl_user_attributes, "internalKey='{$id}'");
+
+		    // Save user settings
+		    saveUserSettings($id);
+
+		    // Set the item name for logger
+		    $_SESSION['itemname'] = $newusername;
+
+		    // invoke OnManagerSaveUser event
+		    $modx->invokeEvent("OnManagerSaveUser", array(
+			    "mode" => "upd",
+			    "userid" => $id,
+			    "username" => $newusername,
+			    "userpassword" => $newpassword,
+			    "useremail" => $email,
+			    "userfullname" => $fullname,
+			    "userroleid" => $role,
+			    "oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
+			    "olduseremail" => (($oldemail != $email) ? $oldemail : "")
+		    ));
+
+		    // invoke OnManagerChangePassword event
+		    if($genpassword == 1) {
+			    $modx->invokeEvent("OnManagerChangePassword", array(
+				    "userid" => $id,
+				    "username" => $newusername,
+				    "userpassword" => $newpassword
+			    ));
+		    }
+
+		    // invoke OnUserFormSave event
+		    $modx->invokeEvent("OnUserFormSave", array(
+			    "mode" => "upd",
+			    "id" => $id
+		    ));
+
+		    /*******************************************************************************/
+		    // put the user in the user_groups he/ she should be in
+		    // first, check that up_perms are switched on!
+		    if($use_udperms == 1) {
+			    // as this is an existing user, delete his/ her entries in the groups before saving the new groups
+			    $modx->db->delete($tbl_member_groups, "member='{$id}'");
+			    if(!empty($user_groups)) {
+				    for($i = 0; $i < count($user_groups); $i++) {
+					    $field = array();
+					    $field['user_group'] = (int)$user_groups[$i];
+					    $field['member'] = $id;
+					    $modx->db->insert($field, $tbl_member_groups);
+				    }
+			    }
+		    }
+		    // end of user_groups stuff!
+		    /*******************************************************************************/
+		    if($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) {
+			    $modx->webAlertAndQuit($_lang["user_changeddata"], 'javascript:top.location.href="index.php?a=8";');
+		    }
+		    if($genpassword == 1 && $passwordnotifymethod == 's') {
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
+				    $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+			    } else {
+				    $stayUrl = "index.php?a=75&r=2";
+			    }
+
+			    include_once "header.inc.php";
+			    ?>
 
 			<h1><?php echo $_lang['user_title']; ?></h1>
 
@@ -332,20 +332,20 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=75&r=2";
-				header($header);
-			}
-		}
-		break;
-	default:
-		webAlertAndQuit("No operation set in request.");
+			    include_once "footer.inc.php";
+		    } else {
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
+				    $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				    header($header);
+			    } else {
+				    $header = "Location: index.php?a=75&r=2";
+				    header($header);
+			    }
+		    }
+		    break;
+	    default:
+		    webAlertAndQuit("No operation set in request.");
 }
 
 /**

manager/processors/save_template.processor.php

Switch Indentation +109 added lines, -109 removed lines

@@ -33,115 +33,115 @@
 }
 
 switch ($_POST['mode']) {
-    case '19':
-
-        // invoke OnBeforeTempFormSave event
-        $modx->invokeEvent("OnBeforeTempFormSave", array(
-            "mode" => "new",
-            "id" => $id
-        ));
-
-        // disallow duplicate names for new templates
-        $rs = $modx->db->select('COUNT(id)', $modx->getFullTableName('site_templates'), "templatename='{$templatename}'");
-        $count = $modx->db->getValue($rs);
-        if ($count > 0) {
-            $modx->manager->saveFormValues(19);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['template'], $templatename), "index.php?a=19");
-        }
-
-        //do stuff to save the new doc
-        $newid = $modx->db->insert(array(
-            'templatename' => $templatename,
-            'description' => $description,
-            'content' => $template,
-            'locked' => $locked,
-            'selectable' => $selectable,
-            'category' => $categoryid,
-            'createdon' => $currentdate,
-            'editedon' => $currentdate
-        ), $modx->getFullTableName('site_templates'));
-
-        // invoke OnTempFormSave event
-        $modx->invokeEvent("OnTempFormSave", array(
-            "mode" => "new",
-            "id" => $newid
-        ));
-        // Set new assigned Tvs
-        saveTemplateAccess($newid);
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $templatename;
-
-        // empty cache
-        $modx->clearCache('full');
-
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "16&id=$newid" : "19";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $header = "Location: index.php?a=76&r=2";
-            header($header);
-        }
-
-        break;
-    case '16':
-
-        // invoke OnBeforeTempFormSave event
-        $modx->invokeEvent("OnBeforeTempFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
-
-        // disallow duplicate names for templates
-        $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_templates'), "templatename='{$templatename}' AND id!='{$id}'");
-        $count = $modx->db->getValue($rs);
-        if ($count > 0) {
-            $modx->manager->saveFormValues(16);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['template'], $templatename), "index.php?a=16&id={$id}");
-        }
-
-        //do stuff to save the edited doc
-        $modx->db->update(array(
-            'templatename' => $templatename,
-            'description' => $description,
-            'content' => $template,
-            'locked' => $locked,
-            'selectable' => $selectable,
-            'category' => $categoryid,
-            'editedon' => $currentdate
-        ), $modx->getFullTableName('site_templates'), "id='{$id}'");
-        // Set new assigned Tvs
-        saveTemplateAccess($id);
-
-        // invoke OnTempFormSave event
-        $modx->invokeEvent("OnTempFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $templatename;
-
-        // first empty the cache
-        $modx->clearCache('full');
-
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "16&id=$id" : "19";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $modx->unlockElement(1, $id);
-            $header = "Location: index.php?a=76&r=2";
-            header($header);
-        }
-
-
-        break;
-    default:
-        $modx->webAlertAndQuit("No operation set in request.");
+        case '19':
+
+            // invoke OnBeforeTempFormSave event
+            $modx->invokeEvent("OnBeforeTempFormSave", array(
+                "mode" => "new",
+                "id" => $id
+            ));
+
+            // disallow duplicate names for new templates
+            $rs = $modx->db->select('COUNT(id)', $modx->getFullTableName('site_templates'), "templatename='{$templatename}'");
+            $count = $modx->db->getValue($rs);
+            if ($count > 0) {
+                $modx->manager->saveFormValues(19);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['template'], $templatename), "index.php?a=19");
+            }
+
+            //do stuff to save the new doc
+            $newid = $modx->db->insert(array(
+                'templatename' => $templatename,
+                'description' => $description,
+                'content' => $template,
+                'locked' => $locked,
+                'selectable' => $selectable,
+                'category' => $categoryid,
+                'createdon' => $currentdate,
+                'editedon' => $currentdate
+            ), $modx->getFullTableName('site_templates'));
+
+            // invoke OnTempFormSave event
+            $modx->invokeEvent("OnTempFormSave", array(
+                "mode" => "new",
+                "id" => $newid
+            ));
+            // Set new assigned Tvs
+            saveTemplateAccess($newid);
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $templatename;
+
+            // empty cache
+            $modx->clearCache('full');
+
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "16&id=$newid" : "19";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=76&r=2";
+                header($header);
+            }
+
+            break;
+        case '16':
+
+            // invoke OnBeforeTempFormSave event
+            $modx->invokeEvent("OnBeforeTempFormSave", array(
+                "mode" => "upd",
+                "id" => $id
+            ));
+
+            // disallow duplicate names for templates
+            $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_templates'), "templatename='{$templatename}' AND id!='{$id}'");
+            $count = $modx->db->getValue($rs);
+            if ($count > 0) {
+                $modx->manager->saveFormValues(16);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_general'], $_lang['template'], $templatename), "index.php?a=16&id={$id}");
+            }
+
+            //do stuff to save the edited doc
+            $modx->db->update(array(
+                'templatename' => $templatename,
+                'description' => $description,
+                'content' => $template,
+                'locked' => $locked,
+                'selectable' => $selectable,
+                'category' => $categoryid,
+                'editedon' => $currentdate
+            ), $modx->getFullTableName('site_templates'), "id='{$id}'");
+            // Set new assigned Tvs
+            saveTemplateAccess($id);
+
+            // invoke OnTempFormSave event
+            $modx->invokeEvent("OnTempFormSave", array(
+                "mode" => "upd",
+                "id" => $id
+            ));
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $templatename;
+
+            // first empty the cache
+            $modx->clearCache('full');
+
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "16&id=$id" : "19";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $modx->unlockElement(1, $id);
+                $header = "Location: index.php?a=76&r=2";
+                header($header);
+            }
+
+
+            break;
+        default:
+            $modx->webAlertAndQuit("No operation set in request.");
 }
 
 /**

manager/processors/save_web_user.processor.php

Switch Indentation +224 added lines, -224 removed lines

@@ -60,108 +60,108 @@ 
 }
 
 switch($input['mode']) {
-	case '87' : // new user
-		// check if this user name already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
+	    case '87' : // new user
+		    // check if this user name already exist
+		    $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
+		    $limit = $modx->db->getValue($rs);
+		    if($limit > 0) {
+			    webAlertAndQuit("User name is already in use!");
+		    }
+
+		    // check if the email address already exist
+		    $rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
+		    $limit = $modx->db->getValue($rs);
+		    if($limit > 0) {
+			    webAlertAndQuit("Email is already in use!");
+		    }
+
+		    // generate a new password for this user
+		    if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+			    if(strlen($specifiedpassword) < 6) {
+				    webAlertAndQuit("Password is too short!");
+			    } else {
+				    $newpassword = $specifiedpassword;
+			    }
+		    } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+			    webAlertAndQuit("You didn't specify a password for this user!");
+		    } elseif($passwordgenmethod == 'g') {
+			    $newpassword = generate_password(8);
+		    } else {
+			    webAlertAndQuit("No password generation method specified!");
+		    }
+
+		    // invoke OnBeforeWUsrFormSave event
+		    $modx->invokeEvent("OnBeforeWUsrFormSave", array(
+			    "mode" => "new",
+		    ));
+
+		    // create the user account
+		    $field = array();
+		    $field['username'] = $esc_newusername;
+		    $field['password'] = md5($newpassword);
+		    $internalKey = $modx->db->insert($field, $tbl_web_users);
+
+		    $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
+		    $field = $modx->db->escape($field);
+		    $modx->db->insert($field, $tbl_web_user_attributes);
+
+		    // Save User Settings
+		    saveUserSettings($internalKey);
+
+		    // Set the item name for logger
+		    $_SESSION['itemname'] = $newusername;
+
+		    /*******************************************************************************/
+		    // put the user in the user_groups he/ she should be in
+		    // first, check that up_perms are switched on!
+		    if($use_udperms == 1) {
+			    if(!empty($user_groups)) {
+				    for($i = 0; $i < count($user_groups); $i++) {
+					    $f = array();
+					    $f['webgroup'] = (int)$user_groups[$i];
+					    $f['webuser'] = $internalKey;
+					    $modx->db->insert($f, $tbl_web_groups);
+				    }
+			    }
+		    }
+		    // end of user_groups stuff!
+
+            // invoke OnWebSaveUser event
+            $modx->invokeEvent("OnWebSaveUser", array(
+                "mode" => "new",
+                "userid" => $internalKey,
+                "username" => $newusername,
+                "userpassword" => $newpassword,
+                "useremail" => $email,
+                "userfullname" => $fullname
+            ));
 
-		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
-				webAlertAndQuit("Password is too short!");
-			} else {
-				$newpassword = $specifiedpassword;
-			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
-			$newpassword = generate_password(8);
-		} else {
-			webAlertAndQuit("No password generation method specified!");
-		}
+            // invoke OnWUsrFormSave event
+            $modx->invokeEvent("OnWUsrFormSave", array(
+                "mode" => "new",
+                "id" => $internalKey
+            ));
 
-		// invoke OnBeforeWUsrFormSave event
-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(
-			"mode" => "new",
-		));
-
-		// create the user account
-		$field = array();
-		$field['username'] = $esc_newusername;
-		$field['password'] = md5($newpassword);
-		$internalKey = $modx->db->insert($field, $tbl_web_users);
-
-		$field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->insert($field, $tbl_web_user_attributes);
-
-		// Save User Settings
-		saveUserSettings($internalKey);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$f = array();
-					$f['webgroup'] = (int)$user_groups[$i];
-					$f['webuser'] = $internalKey;
-					$modx->db->insert($f, $tbl_web_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-
-        // invoke OnWebSaveUser event
-        $modx->invokeEvent("OnWebSaveUser", array(
-            "mode" => "new",
-            "userid" => $internalKey,
-            "username" => $newusername,
-            "userpassword" => $newpassword,
-            "useremail" => $email,
-            "userfullname" => $fullname
-        ));
-
-        // invoke OnWUsrFormSave event
-        $modx->invokeEvent("OnWUsrFormSave", array(
-            "mode" => "new",
-            "id" => $internalKey
-        ));
-
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=99&r=2";
-				header($header);
-			}
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=99&r=2";
-			}
-
-			include_once "header.inc.php";
-			?>
+		    if($passwordnotifymethod == 'e') {
+			    sendMailMessage($email, $newusername, $newpassword, $fullname);
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
+				    $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				    header($header);
+			    } else {
+				    $header = "Location: index.php?a=99&r=2";
+				    header($header);
+			    }
+		    } else {
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
+				    $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+			    } else {
+				    $stayUrl = "index.php?a=99&r=2";
+			    }
+
+			    include_once "header.inc.php";
+			    ?>
 
 			<h1><?php echo $_lang['web_user_title']; ?></h1>
 
@@ -183,122 +183,122 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		}
-		break;
-	case '88' : // edit user
-		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
-					webAlertAndQuit("Password is too short!");
-				} else {
-					$newpassword = $specifiedpassword;
-				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
-				$newpassword = generate_password(8);
-			} else {
-				webAlertAndQuit("No password generation method specified!");
-			}
-		}
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-		}
-
-		// check if the username already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exists
-		$rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// invoke OnBeforeWUsrFormSave event
-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		// update user name and password
-		$field = array();
-		$field['username'] = $esc_newusername;
-		if($genpassword == 1) {
-			$field['password'] = md5($newpassword);
-		}
-		$modx->db->update($field, $tbl_web_users, "id='{$id}'");
-		$field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'");
-
-		// Save User Settings
-		saveUserSettings($id);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
-			$modx->db->delete($tbl_web_groups, "webuser='{$id}'");
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$field = array();
-					$field['webgroup'] = (int)$user_groups[$i];
-					$field['webuser'] = $id;
-					$modx->db->insert($field, $tbl_web_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-		/*******************************************************************************/
-
-        // invoke OnWebSaveUser event
-        $modx->invokeEvent("OnWebSaveUser", array(
-            "mode" => "upd",
-            "userid" => $id,
-            "username" => $newusername,
-            "userpassword" => $newpassword,
-            "useremail" => $email,
-            "userfullname" => $fullname,
-            "oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
-            "olduseremail" => (($oldemail != $email) ? $oldemail : "")
-        ));
-
-        // invoke OnWebChangePassword event
-        if($genpassword == 1) {
-            $modx->invokeEvent("OnWebChangePassword", array(
+			    include_once "footer.inc.php";
+		    }
+		    break;
+	    case '88' : // edit user
+		    // generate a new password for this user
+		    if($genpassword == 1) {
+			    if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+				    if(strlen($specifiedpassword) < 6) {
+					    webAlertAndQuit("Password is too short!");
+				    } else {
+					    $newpassword = $specifiedpassword;
+				    }
+			    } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+				    webAlertAndQuit("You didn't specify a password for this user!");
+			    } elseif($passwordgenmethod == 'g') {
+				    $newpassword = generate_password(8);
+			    } else {
+				    webAlertAndQuit("No password generation method specified!");
+			    }
+		    }
+		    if($passwordnotifymethod == 'e') {
+			    sendMailMessage($email, $newusername, $newpassword, $fullname);
+		    }
+
+		    // check if the username already exist
+		    $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
+		    $limit = $modx->db->getValue($rs);
+		    if($limit > 0) {
+			    webAlertAndQuit("User name is already in use!");
+		    }
+
+		    // check if the email address already exists
+		    $rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
+		    $limit = $modx->db->getValue($rs);
+		    if($limit > 0) {
+			    webAlertAndQuit("Email is already in use!");
+		    }
+
+		    // invoke OnBeforeWUsrFormSave event
+		    $modx->invokeEvent("OnBeforeWUsrFormSave", array(
+			    "mode" => "upd",
+			    "id" => $id
+		    ));
+
+		    // update user name and password
+		    $field = array();
+		    $field['username'] = $esc_newusername;
+		    if($genpassword == 1) {
+			    $field['password'] = md5($newpassword);
+		    }
+		    $modx->db->update($field, $tbl_web_users, "id='{$id}'");
+		    $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
+		    $field = $modx->db->escape($field);
+		    $modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'");
+
+		    // Save User Settings
+		    saveUserSettings($id);
+
+		    // Set the item name for logger
+		    $_SESSION['itemname'] = $newusername;
+
+		    /*******************************************************************************/
+		    // put the user in the user_groups he/ she should be in
+		    // first, check that up_perms are switched on!
+		    if($use_udperms == 1) {
+			    // as this is an existing user, delete his/ her entries in the groups before saving the new groups
+			    $modx->db->delete($tbl_web_groups, "webuser='{$id}'");
+			    if(!empty($user_groups)) {
+				    for($i = 0; $i < count($user_groups); $i++) {
+					    $field = array();
+					    $field['webgroup'] = (int)$user_groups[$i];
+					    $field['webuser'] = $id;
+					    $modx->db->insert($field, $tbl_web_groups);
+				    }
+			    }
+		    }
+		    // end of user_groups stuff!
+		    /*******************************************************************************/
+
+            // invoke OnWebSaveUser event
+            $modx->invokeEvent("OnWebSaveUser", array(
+                "mode" => "upd",
                 "userid" => $id,
                 "username" => $newusername,
-                "userpassword" => $newpassword
+                "userpassword" => $newpassword,
+                "useremail" => $email,
+                "userfullname" => $fullname,
+                "oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
+                "olduseremail" => (($oldemail != $email) ? $oldemail : "")
             ));
-        }
 
-        // invoke OnWUsrFormSave event
-        $modx->invokeEvent("OnWUsrFormSave", array(
-            "mode" => "upd",
-            "id" => $id
-        ));
+            // invoke OnWebChangePassword event
+            if($genpassword == 1) {
+                $modx->invokeEvent("OnWebChangePassword", array(
+                    "userid" => $id,
+                    "username" => $newusername,
+                    "userpassword" => $newpassword
+                ));
+            }
+
+            // invoke OnWUsrFormSave event
+            $modx->invokeEvent("OnWUsrFormSave", array(
+                "mode" => "upd",
+                "id" => $id
+            ));
 
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=99&r=2";
-			}
+		    if($genpassword == 1 && $passwordnotifymethod == 's') {
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
+				    $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+			    } else {
+				    $stayUrl = "index.php?a=99&r=2";
+			    }
 
-			include_once "header.inc.php";
-			?>
+			    include_once "header.inc.php";
+			    ?>
 
 			<h1><?php echo $_lang['web_user_title']; ?></h1>
 
@@ -318,20 +318,20 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=99&r=2";
-				header($header);
-			}
-		}
-		break;
-	default :
-		webAlertAndQuit("No operation set in request.");
+			    include_once "footer.inc.php";
+		    } else {
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
+				    $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				    header($header);
+			    } else {
+				    $header = "Location: index.php?a=99&r=2";
+				    header($header);
+			    }
+		    }
+		    break;
+	    default :
+		    webAlertAndQuit("No operation set in request.");
 }
 
 /**

manager/processors/save_module.processor.php

Switch Indentation +117 added lines, -117 removed lines

@@ -59,125 +59,125 @@
 }
 
 switch ($_POST['mode']) {
-    case '107':
-        // invoke OnBeforeModFormSave event
-        $modx->invokeEvent("OnBeforeModFormSave", array(
-                "mode" => "new",
-                "id" => $id
-            ));
-
-        // disallow duplicate names for new modules
-        $rs = $modx->db->select('count(id)', $modx->getFullTableName('site_modules'), "name='{$name}'");
-        $count = $modx->db->getValue($rs);
-        if ($count > 0) {
-            $modx->manager->saveFormValues(107);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_module'], $name), "index.php?a=107");
-        }
+        case '107':
+            // invoke OnBeforeModFormSave event
+            $modx->invokeEvent("OnBeforeModFormSave", array(
+                    "mode" => "new",
+                    "id" => $id
+                ));
+
+            // disallow duplicate names for new modules
+            $rs = $modx->db->select('count(id)', $modx->getFullTableName('site_modules'), "name='{$name}'");
+            $count = $modx->db->getValue($rs);
+            if ($count > 0) {
+                $modx->manager->saveFormValues(107);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_module'], $name), "index.php?a=107");
+            }
 
-        // save the new module
-        $newid = $modx->db->insert(array(
-            'name' => $name,
-            'description' => $description,
-            'disabled' => $disabled,
-            'wrap' => $wrap,
-            'locked' => $locked,
-            'icon' => $icon,
-            'resourcefile' => $resourcefile,
-            'enable_resource' => $enable_resource,
-            'category' => $categoryid,
-            'enable_sharedparams' => $enable_sharedparams,
-            'guid' => $guid,
-            'modulecode' => $modulecode,
-            'properties' => $properties,
-            'createdon' => $currentdate,
-            'editedon' => $currentdate
-        ), $modx->getFullTableName('site_modules'));
-
-        // save user group access permissions
-        saveUserGroupAccessPermissons();
-
-        // invoke OnModFormSave event
-        $modx->invokeEvent("OnModFormSave", array(
-                "mode" => "new",
-                "id" => $newid
-            ));
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $name;
-
-        // empty cache
-        $modx->clearCache('full');
-
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "108&id=$newid" : "107";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $header = "Location: index.php?a=106&r=2";
-            header($header);
-        }
-        break;
-    case '108':
-        // invoke OnBeforeModFormSave event
-        $modx->invokeEvent("OnBeforeModFormSave", array(
-                "mode" => "upd",
-                "id" => $id
-            ));
-
-        // disallow duplicate names for new modules
-        $rs = $modx->db->select('count(id)', $modx->getFullTableName('site_modules'), "name='{$name}' AND id!='{$id}'");
-        if ($modx->db->getValue($rs) > 0) {
-            $modx->manager->saveFormValues(108);
-            $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_module'], $name), "index.php?a=108&id={$id}");
-        }
+            // save the new module
+            $newid = $modx->db->insert(array(
+                'name' => $name,
+                'description' => $description,
+                'disabled' => $disabled,
+                'wrap' => $wrap,
+                'locked' => $locked,
+                'icon' => $icon,
+                'resourcefile' => $resourcefile,
+                'enable_resource' => $enable_resource,
+                'category' => $categoryid,
+                'enable_sharedparams' => $enable_sharedparams,
+                'guid' => $guid,
+                'modulecode' => $modulecode,
+                'properties' => $properties,
+                'createdon' => $currentdate,
+                'editedon' => $currentdate
+            ), $modx->getFullTableName('site_modules'));
+
+            // save user group access permissions
+            saveUserGroupAccessPermissons();
+
+            // invoke OnModFormSave event
+            $modx->invokeEvent("OnModFormSave", array(
+                    "mode" => "new",
+                    "id" => $newid
+                ));
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $name;
+
+            // empty cache
+            $modx->clearCache('full');
+
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "108&id=$newid" : "107";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=106&r=2";
+                header($header);
+            }
+            break;
+        case '108':
+            // invoke OnBeforeModFormSave event
+            $modx->invokeEvent("OnBeforeModFormSave", array(
+                    "mode" => "upd",
+                    "id" => $id
+                ));
+
+            // disallow duplicate names for new modules
+            $rs = $modx->db->select('count(id)', $modx->getFullTableName('site_modules'), "name='{$name}' AND id!='{$id}'");
+            if ($modx->db->getValue($rs) > 0) {
+                $modx->manager->saveFormValues(108);
+                $modx->webAlertAndQuit(sprintf($_lang['duplicate_name_found_module'], $name), "index.php?a=108&id={$id}");
+            }
 
-        // save the edited module
-        $modx->db->update(array(
-            'name' => $name,
-            'description' => $description,
-            'icon' => $icon,
-            'enable_resource' => $enable_resource,
-            'resourcefile' => $resourcefile,
-            'disabled' => $disabled,
-            'wrap' => $wrap,
-            'locked' => $locked,
-            'category' => $categoryid,
-            'enable_sharedparams' => $enable_sharedparams,
-            'guid' => $guid,
-            'modulecode' => $modulecode,
-            'properties' => $properties,
-            'editedon' => $currentdate
-        ), $modx->getFullTableName('site_modules'), "id='{$id}'");
-
-        // save user group access permissions
-        saveUserGroupAccessPermissons();
-
-        // invoke OnModFormSave event
-        $modx->invokeEvent("OnModFormSave", array(
-                "mode" => "upd",
-                "id" => $id
-            ));
-
-        // Set the item name for logger
-        $_SESSION['itemname'] = $name;
-
-        // empty cache
-        $modx->clearCache('full');
-
-        // finished emptying cache - redirect
-        if ($_POST['stay'] != '') {
-            $a = ($_POST['stay'] == '2') ? "108&id=$id" : "107";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
-            header($header);
-        } else {
-            $modx->unlockElement(6, $id);
-            $header = "Location: index.php?a=106&r=2";
-            header($header);
-        }
-        break;
-    default:
-        $modx->webAlertAndQuit("No operation set in request.");
+            // save the edited module
+            $modx->db->update(array(
+                'name' => $name,
+                'description' => $description,
+                'icon' => $icon,
+                'enable_resource' => $enable_resource,
+                'resourcefile' => $resourcefile,
+                'disabled' => $disabled,
+                'wrap' => $wrap,
+                'locked' => $locked,
+                'category' => $categoryid,
+                'enable_sharedparams' => $enable_sharedparams,
+                'guid' => $guid,
+                'modulecode' => $modulecode,
+                'properties' => $properties,
+                'editedon' => $currentdate
+            ), $modx->getFullTableName('site_modules'), "id='{$id}'");
+
+            // save user group access permissions
+            saveUserGroupAccessPermissons();
+
+            // invoke OnModFormSave event
+            $modx->invokeEvent("OnModFormSave", array(
+                    "mode" => "upd",
+                    "id" => $id
+                ));
+
+            // Set the item name for logger
+            $_SESSION['itemname'] = $name;
+
+            // empty cache
+            $modx->clearCache('full');
+
+            // finished emptying cache - redirect
+            if ($_POST['stay'] != '') {
+                $a = ($_POST['stay'] == '2') ? "108&id=$id" : "107";
+                $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+                header($header);
+            } else {
+                $modx->unlockElement(6, $id);
+                $header = "Location: index.php?a=106&r=2";
+                header($header);
+            }
+            break;
+        default:
+            $modx->webAlertAndQuit("No operation set in request.");
 }
 
 /**

manager/processors/save_content.processor.php

Switch Indentation +213 added lines, -213 removed lines

@@ -275,11 +275,11 @@ 
 }
 
 switch ($actionToTake) {
-    case 'new' :
+        case 'new' :
 
-        // invoke OnBeforeDocFormSave event
-        switch($modx->config['docid_incrmnt_method'])
-        {
+            // invoke OnBeforeDocFormSave event
+            switch($modx->config['docid_incrmnt_method'])
+            {
             case '1':
                 $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
                 $where = "T1.id IS NULL";
@@ -293,7 +293,7 @@ 
 
             default:
                 $id = '';
-        }
+            }
 
         $modx->invokeEvent("OnBeforeDocFormSave", array (
             "mode" => "new",
@@ -444,248 +444,248 @@ 
 
 
         break;
-    case 'edit' :
-
-        // get the document's current parent
-        $oldparent = $existingDocument['parent'];
-        $doctype = $existingDocument['type'];
-
-        if ($id == $site_start && $published == 0) {
-            $modx->manager->saveFormValues(27);
-            $modx->webAlertAndQuit("Document is linked to site_start variable and cannot be unpublished!");
-        }
-        $today = $_SERVER['REQUEST_TIME'] + $modx->config['server_offset_time'];
-        if ($id == $site_start && ($pub_date > $today || $unpub_date != "0")) {
-            $modx->manager->saveFormValues(27);
-            $modx->webAlertAndQuit("Document is linked to site_start variable and cannot have publish or unpublish dates set!");
-        }
-        if ($parent == $id) {
-            $modx->manager->saveFormValues(27);
-            $modx->webAlertAndQuit("Document can not be it's own parent!");
-        }
+        case 'edit' :
 
-        $parents = $modx->getParentIds($parent);
-        if (in_array($id, $parents)) {
-            $modx->webAlertAndQuit("Document descendant can not be it's parent!");
-        }
+            // get the document's current parent
+            $oldparent = $existingDocument['parent'];
+            $doctype = $existingDocument['type'];
 
-        // check to see document is a folder
-        $rs = $modx->db->select('count(id)', $tbl_site_content, "parent='{$id}'");
-        $count = $modx->db->getValue($rs);
-        if ($count > 0) {
-            $isfolder = 1;
-        }
+            if ($id == $site_start && $published == 0) {
+                $modx->manager->saveFormValues(27);
+                $modx->webAlertAndQuit("Document is linked to site_start variable and cannot be unpublished!");
+            }
+            $today = $_SERVER['REQUEST_TIME'] + $modx->config['server_offset_time'];
+            if ($id == $site_start && ($pub_date > $today || $unpub_date != "0")) {
+                $modx->manager->saveFormValues(27);
+                $modx->webAlertAndQuit("Document is linked to site_start variable and cannot have publish or unpublish dates set!");
+            }
+            if ($parent == $id) {
+                $modx->manager->saveFormValues(27);
+                $modx->webAlertAndQuit("Document can not be it's own parent!");
+            }
 
-        // set publishedon and publishedby
-        $was_published = $existingDocument['published'];
+            $parents = $modx->getParentIds($parent);
+            if (in_array($id, $parents)) {
+                $modx->webAlertAndQuit("Document descendant can not be it's parent!");
+            }
 
-        // keep original publish state, if change is not permitted
-        if (!$modx->hasPermission('publish_document')) {
-            $published = $was_published;
-            $pub_date = 'pub_date';
-            $unpub_date = 'unpub_date';
-        }
+            // check to see document is a folder
+            $rs = $modx->db->select('count(id)', $tbl_site_content, "parent='{$id}'");
+            $count = $modx->db->getValue($rs);
+            if ($count > 0) {
+                $isfolder = 1;
+            }
 
-        // if it was changed from unpublished to published
-        if (!$was_published && $published) {
-            $publishedon = $currentdate;
-            $publishedby = $modx->getLoginUserID();
-            }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
-            $publishedon = $pub_date;
-            $publishedby = $modx->getLoginUserID();
-               }elseif ($was_published && !$published) {
-            $publishedon = 0;
-            $publishedby = 0;
-        } else {
-            $publishedon = 'publishedon';
-            $publishedby = 'publishedby';
-        }
+            // set publishedon and publishedby
+            $was_published = $existingDocument['published'];
 
-        // invoke OnBeforeDocFormSave event
-        $modx->invokeEvent("OnBeforeDocFormSave", array (
-            "mode" => "upd",
-            "id" => $id
-        ));
+            // keep original publish state, if change is not permitted
+            if (!$modx->hasPermission('publish_document')) {
+                $published = $was_published;
+                $pub_date = 'pub_date';
+                $unpub_date = 'unpub_date';
+            }
 
-        // update the document
-        $modx->db->update(
-            "introtext='{$introtext}', "
-            . "content='{$content}', "
-            . "pagetitle='{$pagetitle}', "
-            . "longtitle='{$longtitle}', "
-            . "type='{$type}', "
-            . "description='{$description}', "
-            . "alias='{$alias}', "
-            . "link_attributes='{$link_attributes}', "
-            . "isfolder={$isfolder}, "
-            . "richtext={$richtext}, "
-            . "published={$published}, "
-            . "pub_date={$pub_date}, "
-            . "unpub_date={$unpub_date}, "
-            . "parent={$parent}, "
-            . "template={$template}, "
-            . "menuindex={$menuindex}, "
-            . "searchable={$searchable}, "
-            . "cacheable={$cacheable}, "
-            . "editedby=" . $modx->getLoginUserID() . ", "
-            . "editedon={$currentdate}, "
-            . "publishedon={$publishedon}, "
-            . "publishedby={$publishedby}, "
-            . "contentType='{$contentType}', "
-            . "content_dispo={$contentdispo}, "
-            . "donthit={$donthit}, "
-            . "menutitle='{$menutitle}', "
-            . "hidemenu={$hidemenu}, "
-            . "alias_visible={$aliasvisible}"
-            , $tbl_site_content, "id='{$id}'");
-
-        // update template variables
-        $rs = $modx->db->select('id, tmplvarid', $tbl_site_tmplvar_contentvalues, "contentid='{$id}'");
-        $tvIds = array ();
-        while ($row = $modx->db->getRow($rs)) {
-            $tvIds[$row['tmplvarid']] = $row['id'];
-        }
-        $tvDeletions = array();
-        $tvChanges = array();
-        foreach ($tmplvars as $field => $value) {
-            if (!is_array($value)) {
-                if (isset($tvIds[$value])) $tvDeletions[] = $tvIds[$value];
+            // if it was changed from unpublished to published
+            if (!$was_published && $published) {
+                $publishedon = $currentdate;
+                $publishedby = $modx->getLoginUserID();
+                }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
+                $publishedon = $pub_date;
+                $publishedby = $modx->getLoginUserID();
+                   }elseif ($was_published && !$published) {
+                $publishedon = 0;
+                $publishedby = 0;
             } else {
-                $tvId = $value[0];
-                $tvVal = $value[1];
+                $publishedon = 'publishedon';
+                $publishedby = 'publishedby';
+            }
 
-                if (isset($tvIds[$tvId])) {
-                    $tvChanges[] = array(array('tmplvarid' => $tvId, 'contentid' => $id, 'value' => $modx->db->escape($tvVal)), array('id' => $tvIds[$tvId]));
+            // invoke OnBeforeDocFormSave event
+            $modx->invokeEvent("OnBeforeDocFormSave", array (
+                "mode" => "upd",
+                "id" => $id
+            ));
+
+            // update the document
+            $modx->db->update(
+                "introtext='{$introtext}', "
+                . "content='{$content}', "
+                . "pagetitle='{$pagetitle}', "
+                . "longtitle='{$longtitle}', "
+                . "type='{$type}', "
+                . "description='{$description}', "
+                . "alias='{$alias}', "
+                . "link_attributes='{$link_attributes}', "
+                . "isfolder={$isfolder}, "
+                . "richtext={$richtext}, "
+                . "published={$published}, "
+                . "pub_date={$pub_date}, "
+                . "unpub_date={$unpub_date}, "
+                . "parent={$parent}, "
+                . "template={$template}, "
+                . "menuindex={$menuindex}, "
+                . "searchable={$searchable}, "
+                . "cacheable={$cacheable}, "
+                . "editedby=" . $modx->getLoginUserID() . ", "
+                . "editedon={$currentdate}, "
+                . "publishedon={$publishedon}, "
+                . "publishedby={$publishedby}, "
+                . "contentType='{$contentType}', "
+                . "content_dispo={$contentdispo}, "
+                . "donthit={$donthit}, "
+                . "menutitle='{$menutitle}', "
+                . "hidemenu={$hidemenu}, "
+                . "alias_visible={$aliasvisible}"
+                , $tbl_site_content, "id='{$id}'");
+
+            // update template variables
+            $rs = $modx->db->select('id, tmplvarid', $tbl_site_tmplvar_contentvalues, "contentid='{$id}'");
+            $tvIds = array ();
+            while ($row = $modx->db->getRow($rs)) {
+                $tvIds[$row['tmplvarid']] = $row['id'];
+            }
+            $tvDeletions = array();
+            $tvChanges = array();
+            foreach ($tmplvars as $field => $value) {
+                if (!is_array($value)) {
+                    if (isset($tvIds[$value])) $tvDeletions[] = $tvIds[$value];
                 } else {
-                    $tvAdded[] = array('tmplvarid' => $tvId, 'contentid' => $id, 'value' => $modx->db->escape($tvVal));
+                    $tvId = $value[0];
+                    $tvVal = $value[1];
+
+                    if (isset($tvIds[$tvId])) {
+                        $tvChanges[] = array(array('tmplvarid' => $tvId, 'contentid' => $id, 'value' => $modx->db->escape($tvVal)), array('id' => $tvIds[$tvId]));
+                    } else {
+                        $tvAdded[] = array('tmplvarid' => $tvId, 'contentid' => $id, 'value' => $modx->db->escape($tvVal));
+                    }
                 }
             }
-        }
 
-        if (!empty($tvDeletions)) {
-            $modx->db->delete($tbl_site_tmplvar_contentvalues, 'id IN('.implode(',', $tvDeletions).')');
-        }
-
-        if (!empty($tvAdded)) {
-            foreach ($tvAdded as $tv) {
-                $modx->db->insert($tv, $tbl_site_tmplvar_contentvalues);
+            if (!empty($tvDeletions)) {
+                $modx->db->delete($tbl_site_tmplvar_contentvalues, 'id IN('.implode(',', $tvDeletions).')');
             }
-        }
 
-        if (!empty($tvChanges)) {
-            foreach ($tvChanges as $tv) {
-                $modx->db->update($tv[0], $tbl_site_tmplvar_contentvalues, "id='{$tv[1]['id']}'");
+            if (!empty($tvAdded)) {
+                foreach ($tvAdded as $tv) {
+                    $modx->db->insert($tv, $tbl_site_tmplvar_contentvalues);
+                }
             }
-        }
 
-        // set document permissions
-        if ($use_udperms == 1 && is_array($document_groups)) {
-            $new_groups = array();
-            // process the new input
-            foreach ($document_groups as $value_pair) {
-                list($group, $link_id) = explode(',', $value_pair); // @see actions/mutate_content.dynamic.php @ line 1138 (permissions list)
-                $new_groups[$group] = $link_id;
+            if (!empty($tvChanges)) {
+                foreach ($tvChanges as $tv) {
+                    $modx->db->update($tv[0], $tbl_site_tmplvar_contentvalues, "id='{$tv[1]['id']}'");
+                }
             }
 
-            // grab the current set of permissions on this document the user can access
-            $isManager = $modx->hasPermission('access_permissions');
-            $isWeb     = $modx->hasPermission('web_access_permissions');
-            $rs = $modx->db->select(
-                'groups.id, groups.document_group',
-                "{$tbl_document_groups} AS groups
+            // set document permissions
+            if ($use_udperms == 1 && is_array($document_groups)) {
+                $new_groups = array();
+                // process the new input
+                foreach ($document_groups as $value_pair) {
+                    list($group, $link_id) = explode(',', $value_pair); // @see actions/mutate_content.dynamic.php @ line 1138 (permissions list)
+                    $new_groups[$group] = $link_id;
+                }
+
+                // grab the current set of permissions on this document the user can access
+                $isManager = $modx->hasPermission('access_permissions');
+                $isWeb     = $modx->hasPermission('web_access_permissions');
+                $rs = $modx->db->select(
+                    'groups.id, groups.document_group',
+                    "{$tbl_document_groups} AS groups
                     LEFT JOIN {$tbl_documentgroup_names} AS dgn ON dgn.id = groups.document_group",
-                "((1=".(int)$isManager." AND dgn.private_memgroup) OR (1=".(int)$isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
-                );
-            $old_groups = array();
-            while ($row = $modx->db->getRow($rs)) $old_groups[$row['document_group']] = $row['id'];
-
-            // update the permissions in the database
-            $insertions = $deletions = array();
-            foreach ($new_groups as $group => $link_id) {
-                if (array_key_exists($group, $old_groups)) {
-                    unset($old_groups[$group]);
-                    continue;
-                } elseif ($link_id == 'new') {
-                    $insertions[] = '('.(int)$group.','.$id.')';
+                    "((1=".(int)$isManager." AND dgn.private_memgroup) OR (1=".(int)$isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
+                    );
+                $old_groups = array();
+                while ($row = $modx->db->getRow($rs)) $old_groups[$row['document_group']] = $row['id'];
+
+                // update the permissions in the database
+                $insertions = $deletions = array();
+                foreach ($new_groups as $group => $link_id) {
+                    if (array_key_exists($group, $old_groups)) {
+                        unset($old_groups[$group]);
+                        continue;
+                    } elseif ($link_id == 'new') {
+                        $insertions[] = '('.(int)$group.','.$id.')';
+                    }
+                }
+                if (!empty($insertions)) {
+                    $modx->db->query("INSERT INTO {$tbl_document_groups} (document_group, document) VALUES ".implode(',', $insertions));
+                }
+                if (!empty($old_groups)) {
+                    $modx->db->delete($tbl_document_groups, "id IN (".implode(',', $old_groups).")");
+                }
+                // necessary to remove all permissions as document is public
+                if ((isset($_POST['chkalldocs']) && $_POST['chkalldocs'] == 'on')) {
+                    $modx->db->delete($tbl_document_groups, "document='{$id}'");
                 }
             }
-            if (!empty($insertions)) {
-                $modx->db->query("INSERT INTO {$tbl_document_groups} (document_group, document) VALUES ".implode(',', $insertions));
-            }
-            if (!empty($old_groups)) {
-                $modx->db->delete($tbl_document_groups, "id IN (".implode(',', $old_groups).")");
-            }
-            // necessary to remove all permissions as document is public
-            if ((isset($_POST['chkalldocs']) && $_POST['chkalldocs'] == 'on')) {
-                $modx->db->delete($tbl_document_groups, "document='{$id}'");
+
+            // do the parent stuff
+            if ($parent != 0) {
+                $fields = array('isfolder' => 1);
+                $modx->db->update($fields, $tbl_site_content, "id='{$_REQUEST['parent']}'");
             }
-        }
 
-        // do the parent stuff
-        if ($parent != 0) {
-            $fields = array('isfolder' => 1);
-            $modx->db->update($fields, $tbl_site_content, "id='{$_REQUEST['parent']}'");
-        }
+            // finished moving the document, now check to see if the old_parent should no longer be a folder
+            $rs = $modx->db->select('COUNT(id)', $tbl_site_content, "parent='{$oldparent}'");
+            $limit = $modx->db->getValue($rs);
 
-        // finished moving the document, now check to see if the old_parent should no longer be a folder
-        $rs = $modx->db->select('COUNT(id)', $tbl_site_content, "parent='{$oldparent}'");
-        $limit = $modx->db->getValue($rs);
+            if ($limit == 0) {
+                $fields = array('isfolder' => 0);
+                $modx->db->update($fields, $tbl_site_content, "id='{$oldparent}'");
+            }
 
-        if ($limit == 0) {
-            $fields = array('isfolder' => 0);
-            $modx->db->update($fields, $tbl_site_content, "id='{$oldparent}'");
-        }
 
+            // invoke OnDocFormSave event
+            $modx->invokeEvent("OnDocFormSave", array (
+                "mode" => "upd",
+                "id" => $id
+            ));
 
-        // invoke OnDocFormSave event
-        $modx->invokeEvent("OnDocFormSave", array (
-            "mode" => "upd",
-            "id" => $id
-        ));
+            // secure web documents - flag as private
+            include MODX_MANAGER_PATH . "includes/secure_web_documents.inc.php";
+            secureWebDocument($id);
 
-        // secure web documents - flag as private
-        include MODX_MANAGER_PATH . "includes/secure_web_documents.inc.php";
-        secureWebDocument($id);
-
-        // secure manager documents - flag as private
-        include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php";
-        secureMgrDocument($id);
+            // secure manager documents - flag as private
+            include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php";
+            secureMgrDocument($id);
 
-        // Set the item name for logger
-        $_SESSION['itemname'] = $no_esc_pagetitle;
+            // Set the item name for logger
+            $_SESSION['itemname'] = $no_esc_pagetitle;
 
-        if ($syncsite == 1) {
-            // empty cache
-            $modx->clearCache('full');
-        }
+            if ($syncsite == 1) {
+                // empty cache
+                $modx->clearCache('full');
+            }
 
-        if ($_POST['refresh_preview'] == '1')
-            $header = "Location: ".MODX_SITE_URL."index.php?id=$id&z=manprev";
-        else {
-            if ($_POST['stay'] != '2' && $id > 0) {
-                $modx->unlockElement(7, $id);
-            }
-            if ($_POST['stay'] != '') {
-                $id = $_REQUEST['id'];
-                if ($type == "reference") {
-                    // weblink
-                    $a = ($_POST['stay'] == '2') ? "27&id=$id" : "72&pid=$parent";
+            if ($_POST['refresh_preview'] == '1')
+                $header = "Location: ".MODX_SITE_URL."index.php?id=$id&z=manprev";
+            else {
+                if ($_POST['stay'] != '2' && $id > 0) {
+                    $modx->unlockElement(7, $id);
+                }
+                if ($_POST['stay'] != '') {
+                    $id = $_REQUEST['id'];
+                    if ($type == "reference") {
+                        // weblink
+                        $a = ($_POST['stay'] == '2') ? "27&id=$id" : "72&pid=$parent";
+                    } else {
+                        // document
+                        $a = ($_POST['stay'] == '2') ? "27&id=$id" : "4&pid=$parent";
+                    }
+                    $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'].$add_path;
                 } else {
-                    // document
-                    $a = ($_POST['stay'] == '2') ? "27&id=$id" : "4&pid=$parent";
+                    $header = "Location: index.php?a=3&id=$id&r=1".$add_path;
                 }
-                $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'].$add_path;
+            }
+            if (headers_sent()) {
+                $header = str_replace('Location: ','',$header);
+                echo "<script>document.location.href='$header';</script>\n";
             } else {
-                $header = "Location: index.php?a=3&id=$id&r=1".$add_path;
+                header($header);
             }
-        }
-        if (headers_sent()) {
-            $header = str_replace('Location: ','',$header);
-            echo "<script>document.location.href='$header';</script>\n";
-        } else {
-            header($header);
-        }
-        break;
-    default :
-        $modx->webAlertAndQuit("No operation set in request.");
+            break;
+        default :
+            $modx->webAlertAndQuit("No operation set in request.");
 }