evolution-cms / evolution

manager/includes/extenders/dbapi.mysql.class.inc.php

Doc Comments +12 added lines

@@ -268,6 +268,7 @@ 
     /**
      * @name:  delete
      *
+     * @param string $from
      */
     public function delete($from, $where = '', $orderby = '', $limit = '')
     {
@@ -414,6 +415,9 @@ 
         }
     }
 
+    /**
+     * @param string $table
+     */
     public function save($fields, $table, $where = '')
     {
 
@@ -444,6 +448,7 @@ 
     /**
      * @name:  freeResult
      *
+     * @param mysqli_result $rs
      */
     public function freeResult($rs)
     {
@@ -554,6 +559,7 @@ 
      * @name:  getColumn
      * @desc:  returns an array of the values found on colun $name
      * @param: $dsq - dataset or query string
+     * @param string $name
      */
     public function getColumn($name, $dsq)
     {
@@ -720,6 +726,9 @@ 
         return $result;
     }
 
+    /**
+     * @param string $table_name
+     */
     public function optimize($table_name)
     {
         $rs = $this->query("OPTIMIZE TABLE {$table_name}");
@@ -730,6 +739,9 @@ 
         return $rs;
     }
 
+    /**
+     * @param string $table_name
+     */
     public function truncate($table_name)
     {
         $rs = $this->query("TRUNCATE {$table_name}");

manager/includes/functions/tv.php

Doc Comments +3 added lines, -3 removed lines

@@ -172,7 +172,7 @@ 
      *
      * @param string $param
      * @param array $tvsArray
-     * @return mixed
+     * @return string
      */
     function parseTvValues($param, $tvsArray)
     {
@@ -566,7 +566,7 @@ 
     /**
      * returns an array if a delimiter is present. returns array is a recordset is present
      *
-     * @param $src
+     * @param string $src
      * @param string $delim
      * @param string $type
      * @param bool $columns
@@ -1022,7 +1022,7 @@ 
 
 if (! function_exists('ParseIntputOptions')) {
     /**
-     * @param string|array|mysqli_result $v
+     * @param string $v
      * @return array
      */
     function ParseIntputOptions($v)

manager/includes/src/Event.php

Doc Comments +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getOutput()
     {

manager/includes/extenders/phpcompat.class.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
      * @param int $flags
      * @param string $encode
      * @param int $safecount
-     * @return string|array
+     * @return null|string
      */
     public function htmlspecialchars($str = '', $flags = ENT_COMPAT, $encode = '', $safecount = 0)
     {

manager/includes/functions/actions/files.php

Doc Comments +2 added lines, -2 removed lines

@@ -745,7 +745,7 @@ 
 if(!function_exists('removeLastPath')) {
     /**
      * @param string $string
-     * @return bool|string
+     * @return string|false
      */
     function removeLastPath($string)
     {
@@ -763,7 +763,7 @@ 
 if(!function_exists('getExtension')) {
     /**
      * @param string $string
-     * @return bool|string
+     * @return string|false
      */
     function getExtension($string)
     {

manager/includes/functions/actions/import.php

Doc Comments +1 added lines, -1 removed lines

@@ -357,7 +357,7 @@
 if(!function_exists('getFileContent')) {
     /**
      * @param string $filepath
-     * @return bool|string
+     * @return null|string
      */
     function getFileContent($filepath)
     {

manager/includes/src/Core.php

Doc Comments +23 added lines, -23 removed lines

@@ -266,7 +266,7 @@ 
      * MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php"
      * $extname - extension name in lowercase
      *
-     * @param $extname
+     * @param string $extname
      * @param bool $reload
      * @return bool
      */
@@ -309,7 +309,7 @@ 
      * @param int $count_attempts
      * @param string $type $type
      * @param string $responseCode
-     * @return bool|null
+     * @return false|null
      * @global string $base_url
      * @global string $site_url
      */
@@ -1010,7 +1010,7 @@ 
     }
 
     /**
-     * @param $contents
+     * @param string $contents
      * @return mixed
      */
     public function RecoveryEscapedTags($contents)
@@ -1034,7 +1034,7 @@ 
     }
 
     /**
-     * @param $tstart
+     * @param double $tstart
      * @return array
      */
     public function getTimerStats($tstart)
@@ -1800,7 +1800,7 @@ 
 
     /**
      * Remove Comment-Tags from output like <!--@- Comment -@-->
-     * @param $content
+     * @param string $content
      * @param string $left
      * @param string $right
      * @return mixed
@@ -1973,7 +1973,7 @@ 
     /**
      * Run snippets as per the tags in $documentSource and replace the tags with the returned values.
      *
-     * @param $content
+     * @param string $content
      * @return string
      * @internal param string $documentSource
      */
@@ -3008,7 +3008,7 @@ 
 
     /**
      * @param $templateID
-     * @return mixed
+     * @return string
      */
     public function _getTemplateCodeFromDB($templateID)
     {
@@ -3051,7 +3051,7 @@ 
     /**
      * @param $id
      * @param int $top
-     * @return mixed
+     * @return string
      */
     public function getUltimateParentId($id, $top = 0)
     {
@@ -3391,7 +3391,7 @@ 
      *
      * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role
      * @param int $id Element- / Resource-id
-     * @return bool
+     * @return false|null
      */
     public function lockElement($type, $id)
     {
@@ -3413,7 +3413,7 @@ 
      * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role
      * @param int $id Element- / Resource-id
      * @param bool $includeAllUsers true = Deletes not only own user-locks
-     * @return bool
+     * @return false|null
      */
     public function unlockElement($type, $id, $includeAllUsers = false)
     {
@@ -3927,7 +3927,7 @@ 
      *                     Default: 1
      * @param string $fields List of fields
      *                       Default: id, pagetitle, description, alias
-     * @return boolean|array
+     * @return string
      */
     public function getPageInfo($pageid = -1, $active = 1, $fields = 'id, pagetitle, description, alias')
     {
@@ -4019,7 +4019,7 @@ 
      *
      * @param string $type
      * @param bool $report
-     * @return bool
+     * @return boolean|null
      */
     public function clearCache($type = '', $report = false)
     {
@@ -4385,7 +4385,7 @@ 
      * - Placeholders prefix. Default: '{'.
      * @param string $suffix {string}
      * - Placeholders suffix. Default: '}'.
-     * @return bool|mixed|string {string; false} - Parsed chunk or false if $chunkArr is not array.
+     * @return false|string {string; false} - Parsed chunk or false if $chunkArr is not array.
      * - Parsed chunk or false if $chunkArr is not array.
      */
     public function parseChunk($chunkName, $chunkArr, $prefix = '{', $suffix = '}')
@@ -5357,7 +5357,7 @@ 
      * Remove event listener - only for use within the current execution cycle
      *
      * @param string $evtName
-     * @return boolean
+     * @return false|null
      */
     public function removeEventListener($evtName)
     {
@@ -5381,7 +5381,7 @@ 
      *
      * @param string $evtName
      * @param array $extParams Parameters available to plugins. Each array key will be the PHP variable name, and the array value will be the variable value.
-     * @return boolean|array
+     * @return false|null
      */
     public function invokeEvent($evtName, $extParams = array())
     {
@@ -5976,7 +5976,7 @@ 
 
     /**
      * @param string $str
-     * @return bool|mixed|string
+     * @return string
      */
     public function atBindFileContent($str = '')
     {
@@ -6027,8 +6027,8 @@ 
     }
 
     /**
-     * @param $str
-     * @return bool|string
+     * @param string $str
+     * @return false|string
      */
     public function getExtFromFilename($str)
     {
@@ -6056,7 +6056,7 @@ 
      * @param string $text Error message
      * @param string $file File where the error was detected
      * @param string $line Line number within $file
-     * @return boolean
+     * @return boolean|null
      */
     public function phpError($nr, $text, $file, $line)
     {
@@ -6108,7 +6108,7 @@ 
      * @param string $text
      * @param string $line
      * @param string $output
-     * @return bool
+     * @return null|boolean
      */
     public function messageQuit($msg = 'unspecified error', $query = '', $is_error = true, $nr = '', $file = '', $source = '', $text = '', $line = '', $output = '')
     {
@@ -6523,7 +6523,7 @@ 
 
     /**
      * @param string $str
-     * @return bool|mixed|string
+     * @return string
      */
     public function atBindInclude($str = '')
     {
@@ -6574,7 +6574,7 @@ 
      * @param $str
      * @param int $flags
      * @param string $encode
-     * @return mixed
+     * @return null|string
      */
     public function htmlspecialchars($str, $flags = ENT_COMPAT, $encode = '')
     {
@@ -6583,7 +6583,7 @@ 
     }
 
     /**
-     * @param $string
+     * @param string $string
      * @param bool $returnData
      * @return bool|mixed
      */

manager/processors/save_template.processor.php

Switch Indentation +109 added lines, -109 removed lines

@@ -33,113 +33,113 @@
 }
 
 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_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!", 12);
-		}
-
-		// 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!", 12);
-		}
-
-		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
-				webAlertAndQuit("Password is too short!", 12);
-			} else {
-				$newpassword = $specifiedpassword;
-			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-			webAlertAndQuit("You didn't specify a password for this user!", 12);
-		} elseif($passwordgenmethod == 'g') {
-			$newpassword = generate_password(8);
-		} else {
-			webAlertAndQuit("No password generation method specified!", 12);
-		}
-
-		// invoke OnBeforeUserFormSave event
-		$modx->invokeEvent("OnBeforeUserFormSave", array(
-			"mode" => "new",
-		));
-
-		// create the user account
-		$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
-        saveManagerUserSettings($internalKey);
-
-		// invoke OnManagerSaveUser event
-		$modx->invokeEvent("OnManagerSaveUser", array(
-			"mode" => "new",
-			"userid" => $internalKey,
-			"username" => $newusername,
-			"userpassword" => $newpassword,
-			"useremail" => $email,
-			"userfullname" => $fullname,
-			"userroleid" => $role
-		));
-
-		// invoke OnUserFormSave event
-		$modx->invokeEvent("OnUserFormSave", array(
-			"mode" => "new",
-			"id" => $internalKey
-		));
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($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') {
-            sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=75&r=2";
-				header($header);
-			}
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=75&r=2";
-			}
-
-			include_once "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!", 12);
+		    }
+
+		    // 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!", 12);
+		    }
+
+		    // generate a new password for this user
+		    if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+			    if(strlen($specifiedpassword) < 6) {
+				    webAlertAndQuit("Password is too short!", 12);
+			    } else {
+				    $newpassword = $specifiedpassword;
+			    }
+		    } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+			    webAlertAndQuit("You didn't specify a password for this user!", 12);
+		    } elseif($passwordgenmethod == 'g') {
+			    $newpassword = generate_password(8);
+		    } else {
+			    webAlertAndQuit("No password generation method specified!", 12);
+		    }
+
+		    // invoke OnBeforeUserFormSave event
+		    $modx->invokeEvent("OnBeforeUserFormSave", array(
+			    "mode" => "new",
+		    ));
+
+		    // create the user account
+		    $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
+            saveManagerUserSettings($internalKey);
+
+		    // invoke OnManagerSaveUser event
+		    $modx->invokeEvent("OnManagerSaveUser", array(
+			    "mode" => "new",
+			    "userid" => $internalKey,
+			    "username" => $newusername,
+			    "userpassword" => $newpassword,
+			    "useremail" => $email,
+			    "userfullname" => $fullname,
+			    "userroleid" => $role
+		    ));
+
+		    // invoke OnUserFormSave event
+		    $modx->invokeEvent("OnUserFormSave", array(
+			    "mode" => "new",
+			    "id" => $internalKey
+		    ));
+
+		    // Set the item name for logger
+		    $_SESSION['itemname'] = $newusername;
+
+		    /*******************************************************************************/
+		    // put the user in the user_groups he/ she should be in
+		    // first, check that up_perms are switched on!
+		    if($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') {
+                sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
+				    $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+				    header($header);
+			    } else {
+				    $header = "Location: index.php?a=75&r=2";
+				    header($header);
+			    }
+		    } else {
+			    if($input['stay'] != '') {
+				    $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
+				    $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+			    } else {
+				    $stayUrl = "index.php?a=75&r=2";
+			    }
+
+			    include_once "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!", 12);
-				} else {
-					$newpassword = $specifiedpassword;
-				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-				webAlertAndQuit("You didn't specify a password for this user!", 12);
-			} elseif($passwordgenmethod == 'g') {
-				$newpassword = generate_password(8);
-			} else {
-				webAlertAndQuit("No password generation method specified!", 12);
-			}
-		}
-		if($passwordnotifymethod == 'e') {
-            sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);
-		}
-
-		// check if the username already exist
-		$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!", 12);
-		}
-
-		// 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!", 12);
-		}
-
-		// 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
-        saveManagerUserSettings($id);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		// invoke OnManagerSaveUser event
-		$modx->invokeEvent("OnManagerSaveUser", array(
-			"mode" => "upd",
-			"userid" => $id,
-			"username" => $newusername,
-			"userpassword" => $newpassword,
-			"useremail" => $email,
-			"userfullname" => $fullname,
-			"userroleid" => $role,
-			"oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
-			"olduseremail" => (($oldemail != $email) ? $oldemail : "")
-		));
-
-		// invoke OnManagerChangePassword event
-		if($genpassword == 1) {
-			$modx->invokeEvent("OnManagerChangePassword", array(
-				"userid" => $id,
-				"username" => $newusername,
-				"userpassword" => $newpassword
-			));
-		}
-
-		// invoke OnUserFormSave event
-		$modx->invokeEvent("OnUserFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($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!", 12);
+				    } else {
+					    $newpassword = $specifiedpassword;
+				    }
+			    } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+				    webAlertAndQuit("You didn't specify a password for this user!", 12);
+			    } elseif($passwordgenmethod == 'g') {
+				    $newpassword = generate_password(8);
+			    } else {
+				    webAlertAndQuit("No password generation method specified!", 12);
+			    }
+		    }
+		    if($passwordnotifymethod == 'e') {
+                sendMailMessageForUser($email, $newusername, $newpassword, $fullname, $signupemail_message, MODX_MANAGER_URL);
+		    }
+
+		    // check if the username already exist
+		    $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!", 12);
+		    }
+
+		    // 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!", 12);
+		    }
+
+		    // 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
+            saveManagerUserSettings($id);
+
+		    // Set the item name for logger
+		    $_SESSION['itemname'] = $newusername;
+
+		    // invoke OnManagerSaveUser event
+		    $modx->invokeEvent("OnManagerSaveUser", array(
+			    "mode" => "upd",
+			    "userid" => $id,
+			    "username" => $newusername,
+			    "userpassword" => $newpassword,
+			    "useremail" => $email,
+			    "userfullname" => $fullname,
+			    "userroleid" => $role,
+			    "oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
+			    "olduseremail" => (($oldemail != $email) ? $oldemail : "")
+		    ));
+
+		    // invoke OnManagerChangePassword event
+		    if($genpassword == 1) {
+			    $modx->invokeEvent("OnManagerChangePassword", array(
+				    "userid" => $id,
+				    "username" => $newusername,
+				    "userpassword" => $newpassword
+			    ));
+		    }
+
+		    // invoke OnUserFormSave event
+		    $modx->invokeEvent("OnUserFormSave", array(
+			    "mode" => "upd",
+			    "id" => $id
+		    ));
+
+		    /*******************************************************************************/
+		    // put the user in the user_groups he/ she should be in
+		    // first, check that up_perms are switched on!
+		    if($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,18 +332,18 @@ 
 			</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.", 12);
+			    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.", 12);
 }