evolution-cms / evolution

manager/processors/save_web_user.processor.php

Indentation +277 added lines, -277 removed lines

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

manager/processors/duplicate_content.processor.php

Indentation +94 added lines, -94 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_document') || !$modx->hasPermission('save_document')) {
-	$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"]);
 }
 
 $children = array();
@@ -22,7 +22,7 @@ 
 $udperms->duplicateDoc = true;
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // Run the duplicator
@@ -43,103 +43,103 @@ 
  * @return int
  */
 function duplicateDocument($docid, $parent=null, $_toplevel=0) {
-	$modx = evolutionCMS(); global $_lang;
-
-	// invoke OnBeforeDocDuplicate event
-	$evtOut = $modx->invokeEvent('OnBeforeDocDuplicate', array(
-		'id' => $docid
-	));
-
-	// if( !in_array( 'false', array_values( $evtOut ) ) ){}
-	// TODO: Determine necessary handling for duplicateDocument "return $newparent" if OnBeforeDocDuplicate were able to conditially control duplication
-	// [DISABLED]: Proceed with duplicateDocument if OnBeforeDocDuplicate did not return false via: $event->output('false');
-
-	$userID = $modx->getLoginUserID();
-
-	$tblsc = $modx->getFullTableName('site_content');
-
-	// Grab the original document
-	$rs = $modx->db->select('*', $tblsc, "id='{$docid}'");
-	$content = $modx->db->getRow($rs);
-
-	// Handle incremental ID
-	switch($modx->config['docid_incrmnt_method'])
-	{
-		case '1':
-			$from = "{$tblsc} AS T0 LEFT JOIN {$tblsc} AS T1 ON T0.id + 1 = T1.id";
-			$rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
-			$content['id'] = $modx->db->getValue($rs);
-			break;
-		case '2':
-			$rs = $modx->db->select('MAX(id)+1',$tblsc);
-			$content['id'] = $modx->db->getValue($rs);
-			break;
-
-		default:
-			unset($content['id']); // remove the current id.
-	}
-
-	// Once we've grabbed the document object, start doing some modifications
-	if ($_toplevel == 0) {
-		// count duplicates
-		$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$docid}'"));
-		$pagetitle = $modx->db->escape($pagetitle);
-		$count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "pagetitle LIKE '{$pagetitle} Duplicate%'"));
-		if($count>=1) $count = ' '.($count+1);
-		else $count = '';
-
-		$content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
-		$content['alias'] = null;
-	} elseif($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
-		$content['alias'] = null;
-	}
-
-	// change the parent accordingly
-	if ($parent !== null) $content['parent'] = $parent;
-
-	// Change the author
-	$content['createdby'] = $userID;
-	$content['createdon'] = time();
-	// Remove other modification times
-	$content['editedby'] = $content['editedon'] = $content['deleted'] = $content['deletedby'] = $content['deletedon'] = 0;
-
-	// [FS#922] Should the published status be honored? - sirlancelot
+    $modx = evolutionCMS(); global $_lang;
+
+    // invoke OnBeforeDocDuplicate event
+    $evtOut = $modx->invokeEvent('OnBeforeDocDuplicate', array(
+        'id' => $docid
+    ));
+
+    // if( !in_array( 'false', array_values( $evtOut ) ) ){}
+    // TODO: Determine necessary handling for duplicateDocument "return $newparent" if OnBeforeDocDuplicate were able to conditially control duplication
+    // [DISABLED]: Proceed with duplicateDocument if OnBeforeDocDuplicate did not return false via: $event->output('false');
+
+    $userID = $modx->getLoginUserID();
+
+    $tblsc = $modx->getFullTableName('site_content');
+
+    // Grab the original document
+    $rs = $modx->db->select('*', $tblsc, "id='{$docid}'");
+    $content = $modx->db->getRow($rs);
+
+    // Handle incremental ID
+    switch($modx->config['docid_incrmnt_method'])
+    {
+        case '1':
+            $from = "{$tblsc} AS T0 LEFT JOIN {$tblsc} AS T1 ON T0.id + 1 = T1.id";
+            $rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
+            $content['id'] = $modx->db->getValue($rs);
+            break;
+        case '2':
+            $rs = $modx->db->select('MAX(id)+1',$tblsc);
+            $content['id'] = $modx->db->getValue($rs);
+            break;
+
+        default:
+            unset($content['id']); // remove the current id.
+    }
+
+    // Once we've grabbed the document object, start doing some modifications
+    if ($_toplevel == 0) {
+        // count duplicates
+        $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$docid}'"));
+        $pagetitle = $modx->db->escape($pagetitle);
+        $count = $modx->db->getRecordCount($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "pagetitle LIKE '{$pagetitle} Duplicate%'"));
+        if($count>=1) $count = ' '.($count+1);
+        else $count = '';
+
+        $content['pagetitle'] = $_lang['duplicated_el_suffix'].$count.' '.$content['pagetitle'];
+        $content['alias'] = null;
+    } elseif($modx->config['friendly_urls'] == 0 || $modx->config['allow_duplicate_alias'] == 0) {
+        $content['alias'] = null;
+    }
+
+    // change the parent accordingly
+    if ($parent !== null) $content['parent'] = $parent;
+
+    // Change the author
+    $content['createdby'] = $userID;
+    $content['createdon'] = time();
+    // Remove other modification times
+    $content['editedby'] = $content['editedon'] = $content['deleted'] = $content['deletedby'] = $content['deletedon'] = 0;
+
+    // [FS#922] Should the published status be honored? - sirlancelot
 //	if ($modx->hasPermission('publish_document')) {
 //		if ($modx->config['publish_default'])
 //			$content['pub_date'] = $content['pub_date']; // should this be changed to 1?
 //		else	$content['pub_date'] = 0;
 //	} else {
-		// User can't publish documents
+        // User can't publish documents
 //		$content['published'] = $content['pub_date'] = 0;
 //	}
 
     // Set the published status to unpublished by default (see above ... commit #3388)
     $content['published'] = $content['pub_date'] = 0;
 
-	// Escape the proper strings
-	$content = $modx->db->escape($content);
+    // Escape the proper strings
+    $content = $modx->db->escape($content);
 
-	// Duplicate the Document
-	$newparent = $modx->db->insert($content, $tblsc);
+    // Duplicate the Document
+    $newparent = $modx->db->insert($content, $tblsc);
 
-	// duplicate document's TVs
-	duplicateTVs($docid, $newparent);
-	duplicateAccess($docid, $newparent);
+    // duplicate document's TVs
+    duplicateTVs($docid, $newparent);
+    duplicateAccess($docid, $newparent);
 
-	// invoke OnDocDuplicate event
-	$evtOut = $modx->invokeEvent('OnDocDuplicate', array(
-		'id' => $docid,
-		'new_id' => $newparent
-	));
+    // invoke OnDocDuplicate event
+    $evtOut = $modx->invokeEvent('OnDocDuplicate', array(
+        'id' => $docid,
+        'new_id' => $newparent
+    ));
 
-	// Start duplicating all the child documents that aren't deleted.
-	$_toplevel++;
-	$rs = $modx->db->select('id', $tblsc, "parent='{$docid}' AND deleted=0", 'id ASC');
-		while ($row = $modx->db->getRow($rs))
-			duplicateDocument($row['id'], $newparent, $_toplevel);
+    // Start duplicating all the child documents that aren't deleted.
+    $_toplevel++;
+    $rs = $modx->db->select('id', $tblsc, "parent='{$docid}' AND deleted=0", 'id ASC');
+        while ($row = $modx->db->getRow($rs))
+            duplicateDocument($row['id'], $newparent, $_toplevel);
 
-	// return the new doc id
-	return $newparent;
+    // return the new doc id
+    return $newparent;
 }
 
 /**
@@ -149,17 +149,17 @@ 
  * @param int $newid
  */
 function duplicateTVs($oldid, $newid){
-	$modx = evolutionCMS();
+    $modx = evolutionCMS();
 
-	$tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
+    $tbltvc = $modx->getFullTableName('site_tmplvar_contentvalues');
 
     $newid = (int)$newid;
     $oldid = (int)$oldid;
 
     $modx->db->insert(
-		array('contentid'=>'', 'tmplvarid'=>'', 'value'=>''), $tbltvc, // Insert into
-		"{$newid}, tmplvarid, value", $tbltvc, "contentid='{$oldid}'" // Copy from
-	);
+        array('contentid'=>'', 'tmplvarid'=>'', 'value'=>''), $tbltvc, // Insert into
+        "{$newid}, tmplvarid, value", $tbltvc, "contentid='{$oldid}'" // Copy from
+    );
 }
 
 /**
@@ -169,15 +169,15 @@ 
  * @param int $newid
  */
 function duplicateAccess($oldid, $newid){
-	$modx = evolutionCMS();
+    $modx = evolutionCMS();
 
-	$tbldg = $modx->getFullTableName('document_groups');
+    $tbldg = $modx->getFullTableName('document_groups');
 
     $newid = (int)$newid;
     $oldid = (int)$oldid;
 
     $modx->db->insert(
-		array('document'=>'', 'document_group'=>''), $tbldg, // Insert into
-		"{$newid}, document_group", $tbldg, "document='{$oldid}'" // Copy from
-	);
+        array('document'=>'', 'document_group'=>''), $tbldg, // Insert into
+        "{$newid}, document_group", $tbldg, "document='{$oldid}'" // Copy from
+    );
 }

manager/processors/execute_module.processor.php

Indentation +57 added lines, -57 removed lines

@@ -3,51 +3,51 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('exec_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // check if user has access permission, except admins
 if($_SESSION['mgrRole']!=1){
-	$rs = $modx->db->select(
-		'sma.usergroup,mg.member',
-		$modx->getFullTableName("site_module_access")." sma
+    $rs = $modx->db->select(
+        'sma.usergroup,mg.member',
+        $modx->getFullTableName("site_module_access")." sma
 			LEFT JOIN ".$modx->getFullTableName("member_groups")." mg ON mg.user_group = sma.usergroup AND member='".$modx->getLoginUserID()."'",
-		"sma.module = '{$id}'"
-		);
-	//initialize permission to -1, if it stays -1 no permissions
-	//attached so permission granted
-	$permissionAccessInt = -1;
+        "sma.module = '{$id}'"
+        );
+    //initialize permission to -1, if it stays -1 no permissions
+    //attached so permission granted
+    $permissionAccessInt = -1;
 
-	while ($row = $modx->db->getRow($rs)) {
-		if($row["usergroup"] && $row["member"]) {
-			//if there are permissions and this member has permission, ofcourse
-			//this is granted
-			$permissionAccessInt = 1;
-		} elseif ($permissionAccessInt==-1) {
-			//if there are permissions but this member has no permission and the
-			//variable was still in init state we set permission to 0; no permissions
-			$permissionAccessInt = 0;
-		}
-	}
+    while ($row = $modx->db->getRow($rs)) {
+        if($row["usergroup"] && $row["member"]) {
+            //if there are permissions and this member has permission, ofcourse
+            //this is granted
+            $permissionAccessInt = 1;
+        } elseif ($permissionAccessInt==-1) {
+            //if there are permissions but this member has no permission and the
+            //variable was still in init state we set permission to 0; no permissions
+            $permissionAccessInt = 0;
+        }
+    }
 
-	if($permissionAccessInt==0) {
-		$modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
-	}
+    if($permissionAccessInt==0) {
+        $modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
+    }
 }
 
 // get module data
 $rs = $modx->db->select('*', $modx->getFullTableName("site_modules"), "id='{$id}'");
 $content = $modx->db->getRow($rs);
 if(!$content) {
-	$modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106");
+    $modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106");
 }
 if($content['disabled']) {
-	$modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106");
+    $modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106");
 }
 
 // Set the item name for logger
@@ -71,38 +71,38 @@ 
  * @return string
  */
 function evalModule($moduleCode,$params){
-	$modx = evolutionCMS();
-	$modx->event->params = &$params; // store params inside event object
-	if(is_array($params)) {
-		extract($params, EXTR_SKIP);
-	}
-	ob_start();
-	$mod = eval($moduleCode);
-	$msg = ob_get_contents();
-	ob_end_clean();
-	if (isset($php_errormsg))
-	{
-		$error_info = error_get_last();
+    $modx = evolutionCMS();
+    $modx->event->params = &$params; // store params inside event object
+    if(is_array($params)) {
+        extract($params, EXTR_SKIP);
+    }
+    ob_start();
+    $mod = eval($moduleCode);
+    $msg = ob_get_contents();
+    ob_end_clean();
+    if (isset($php_errormsg))
+    {
+        $error_info = error_get_last();
         switch($error_info['type'])
         {
-        	case E_NOTICE :
-        		$error_level = 1;
-        	case E_USER_NOTICE :
-        		break;
-        	case E_DEPRECATED :
-        	case E_USER_DEPRECATED :
-        	case E_STRICT :
-        		$error_level = 2;
-        		break;
-        	default:
-        		$error_level = 99;
+            case E_NOTICE :
+                $error_level = 1;
+            case E_USER_NOTICE :
+                break;
+            case E_DEPRECATED :
+            case E_USER_DEPRECATED :
+            case E_STRICT :
+                $error_level = 2;
+                break;
+            default:
+                $error_level = 99;
+        }
+        if($modx->config['error_reporting']==='99' || 2<$error_level)
+        {
+            $modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
+            $modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
         }
-		if($modx->config['error_reporting']==='99' || 2<$error_level)
-		{
-			$modx->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], $_SESSION['itemname'] . ' - Module', $error_info['message'], $error_info['line'], $msg);
-			$modx->event->alert("An error occurred while loading. Please see the event log for more information<p>{$msg}</p>");
-		}
-	}
-	unset($modx->event->params);
-	return $mod.$msg;
+    }
+    unset($modx->event->params);
+    return $mod.$msg;
 }