evolution-cms / evolution

manager/processors/remove_installer.processor.php

Spacing +7 added lines, -7 removed lines

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

manager/processors/send_message.processor.php

Spacing +14 added lines, -14 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('messages')) {
@@ -10,17 +10,17 @@ 
 $userid = $_REQUEST['user'];
 $groupid = $_REQUEST['group'];
 $subject = $modx->db->escape($_REQUEST['messagesubject']);
-if ($subject=="") {
-    $subject="(no subject)";
+if ($subject == "") {
+    $subject = "(no subject)";
 }
 $message = $modx->db->escape($_REQUEST['messagebody']);
-if ($message=="") {
-    $message="(no message)";
+if ($message == "") {
+    $message = "(no message)";
 }
 $postdate = time();
 
-if ($sendto=='u') {
-    if ($userid==0) {
+if ($sendto == 'u') {
+    if ($userid == 0) {
         $modx->webAlertAndQuit($_lang["error_no_user_selected"]);
     }
     $modx->db->insert(
@@ -35,12 +35,12 @@ 
         ), $modx->getFullTableName('user_messages'));
 }
 
-if ($sendto=='g') {
-    if ($groupid==0) {
+if ($sendto == 'g') {
+    if ($groupid == 0) {
         $modx->webAlertAndQuit($_lang["error_no_group_selected"]);
     }
-    $rs = $modx->db->select('internalKey', $modx->getFullTableName('user_attributes'), "role='{$groupid}' AND internalKey!='" . $modx->getLoginUserID() . "'");
-    while ($row=$modx->db->getRow($rs)) {
+    $rs = $modx->db->select('internalKey', $modx->getFullTableName('user_attributes'), "role='{$groupid}' AND internalKey!='".$modx->getLoginUserID()."'");
+    while ($row = $modx->db->getRow($rs)) {
         $modx->db->insert(
             array(
                 'recipient' => $row['internalKey'],
@@ -55,9 +55,9 @@ 
 }
 
 
-if ($sendto=='a') {
-    $rs = $modx->db->select('id', $modx->getFullTableName('manager_users'), "id!='" . $modx->getLoginUserID() . "'");
-    while ($row=$modx->db->getRow($rs)) {
+if ($sendto == 'a') {
+    $rs = $modx->db->select('id', $modx->getFullTableName('manager_users'), "id!='".$modx->getLoginUserID()."'");
+    while ($row = $modx->db->getRow($rs)) {
         $modx->db->insert(
             array(
                 'recipient' => $row['id'],

manager/processors/access_groups.processor.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('access_permissions')) {
@@ -50,7 +50,7 @@ 
     break;
     case "delete_user_group":
         $updategroupaccess = true;
-        $usergroup = (int)$_REQUEST['usergroup'];
+        $usergroup = (int) $_REQUEST['usergroup'];
         if (empty($usergroup)) {
             $modx->webAlertAndQuit("No user group id specified for deletion.");
         } else {
@@ -62,7 +62,7 @@ 
         }
     break;
     case "delete_document_group":
-        $group = (int)$_REQUEST['documentgroup'];
+        $group = (int) $_REQUEST['documentgroup'];
         if (empty($group)) {
             $modx->webAlertAndQuit("No document group id specified for deletion.");
         } else {
@@ -78,7 +78,7 @@ 
         if (empty($newgroupname)) {
             $modx->webAlertAndQuit("No group name specified.");
         }
-        $groupid = (int)$_REQUEST['groupid'];
+        $groupid = (int) $_REQUEST['groupid'];
         if (empty($groupid)) {
             $modx->webAlertAndQuit("No group id specified for rename.");
         }
@@ -90,7 +90,7 @@ 
         if (empty($newgroupname)) {
             $modx->webAlertAndQuit("No group name specified.");
         }
-        $groupid = (int)$_REQUEST['groupid'];
+        $groupid = (int) $_REQUEST['groupid'];
         if (empty($groupid)) {
             $modx->webAlertAndQuit("No group id specified for rename.");
         }
@@ -99,11 +99,11 @@ 
     break;
     case "add_document_group_to_user_group":
         $updategroupaccess = true;
-        $usergroup = (int)$_REQUEST['usergroup'];
-        $docgroup = (int)$_REQUEST['docgroup'];
+        $usergroup = (int) $_REQUEST['usergroup'];
+        $docgroup = (int) $_REQUEST['docgroup'];
         $rs = $modx->db->select('COUNT(*)', $tbl_membergroup_access, "membergroup='{$usergroup}' AND documentgroup='{$docgroup}'");
         $limit = $modx->db->getValue($rs);
-        if ($limit<=0) {
+        if ($limit <= 0) {
             $modx->db->insert(array('membergroup' => $usergroup, 'documentgroup' => $docgroup), $tbl_membergroup_access);
         } else {
             //alert user that coupling already exists?
@@ -111,7 +111,7 @@ 
     break;
     case "remove_document_group_from_user_group":
         $updategroupaccess = true;
-        $coupling = (int)$_REQUEST['coupling'];
+        $coupling = (int) $_REQUEST['coupling'];
         $modx->db->delete($tbl_membergroup_access, "id='{$coupling}'");
     break;
     default:
@@ -119,8 +119,8 @@ 
 }
 
 // secure manager documents - flag as private
-if ($updategroupaccess==true) {
-    include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php";
+if ($updategroupaccess == true) {
+    include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
     secureMgrDocument();
 
     // Update the private group column

manager/processors/duplicate_template.processor.php

Spacing +6 added lines, -6 removed lines

@@ -1,21 +1,21 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('new_template')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if ($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
     $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('templatename', $modx->getFullTableName('site_templates'), "templatename LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if ($count>=1) {
-    $count = ' ' . ($count+1);
+if ($count >= 1) {
+    $count = ' '.($count + 1);
 } else {
     $count = '';
 }
@@ -44,5 +44,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new template
-$header="Location: index.php?r=2&a=16&id=$newid";
+$header = "Location: index.php?r=2&a=16&id=$newid";
 header($header);

manager/processors/save_htmlsnippet.processor.php

Spacing +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('save_chunk')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = (int)$_POST['id'];
+$id = (int) $_POST['id'];
 $snippet = $modx->db->escape($_POST['post']);
 $name = $modx->db->escape(trim($_POST['name']));
 $description = $modx->db->escape($_POST['description']);
@@ -16,11 +16,11 @@ 
 
 //Kyle Jaebker - added category support
 if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) {
-    $categoryid = (int)$_POST['categoryid'];
+    $categoryid = (int) $_POST['categoryid'];
 } elseif (empty($_POST['newcategory']) && $_POST['categoryid'] <= 0) {
     $categoryid = 0;
 } else {
-    include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
     $categoryid = checkCategory($_POST['newcategory']);
     if (!$categoryid) {
         $categoryid = newCategory($_POST['newcategory']);
@@ -80,7 +80,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "78&id=$newid" : "77";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $header = "Location: index.php?a=76&r=2";
@@ -129,7 +129,7 @@ 
         // finished emptying cache - redirect
         if ($_POST['stay'] != '') {
             $a = ($_POST['stay'] == '2') ? "78&id=$id" : "77";
-            $header = "Location: index.php?a=" . $a . "&r=2&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $modx->unlockElement(3, $id);

manager/processors/save_user.processor.php

Switch Indentation +209 added lines, -209 removed lines

@@ -68,109 +68,109 @@ 
 }
 
 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!");
-        }
+        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!");
-        }
+            // 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!");
+            // 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 {
-                $newpassword = $specifiedpassword;
+                webAlertAndQuit("No password generation method specified!");
             }
-        } 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);
+            // 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'];
+            // 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 {
-                $stayUrl = "index.php?a=75&r=2";
-            }
+                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"; ?>
+                include_once "header.inc.php"; ?>
 
 			<h1><?php echo $_lang['user_title']; ?></h1>
 
@@ -192,124 +192,124 @@ 
 			</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!");
+                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 {
-                    $newpassword = $specifiedpassword;
+                    webAlertAndQuit("No password generation method specified!");
                 }
-            } 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);
-        }
+            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 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!");
-        }
+            // 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
-        ));
+            // 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(
+            // 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
+                "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
             ));
-        }
 
-        // 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);
+            /*******************************************************************************/
+            // 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";
+            // 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 "header.inc.php"; ?>
 
 			<h1><?php echo $_lang['user_title']; ?></h1>
 
@@ -329,20 +329,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);
+                include_once "footer.inc.php";
             } else {
-                $header = "Location: index.php?a=75&r=2";
-                header($header);
+                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.");
+            break;
+        default:
+            webAlertAndQuit("No operation set in request.");
 }
 
 /**

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('save_user')) {
@@ -14,7 +14,7 @@ 
 
 $input = $_POST;
 
-$id = (int)$input['id'];
+$id = (int) $input['id'];
 $oldusername = $input['oldusername'];
 $newusername = !empty($input['newusername']) ? trim($input['newusername']) : "New User";
 $fullname = $input['fullname'];
@@ -144,7 +144,7 @@ 
             if (!empty($user_groups)) {
                 for ($i = 0; $i < count($user_groups); $i++) {
                     $f = array();
-                    $f['user_group'] = (int)$user_groups[$i];
+                    $f['user_group'] = (int) $user_groups[$i];
                     $f['member'] = $internalKey;
                     $modx->db->insert($f, $tbl_member_groups);
                 }
@@ -156,7 +156,7 @@ 
             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 = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];
                 header($header);
             } else {
                 $header = "Location: index.php?a=75&r=2";
@@ -165,7 +165,7 @@ 
         } else {
             if ($input['stay'] != '') {
                 $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+                $stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay'];
             } else {
                 $stayUrl = "index.php?a=75&r=2";
             }
@@ -290,7 +290,7 @@ 
             if (!empty($user_groups)) {
                 for ($i = 0; $i < count($user_groups); $i++) {
                     $field = array();
-                    $field['user_group'] = (int)$user_groups[$i];
+                    $field['user_group'] = (int) $user_groups[$i];
                     $field['member'] = $id;
                     $modx->db->insert($field, $tbl_member_groups);
                 }
@@ -304,7 +304,7 @@ 
         if ($genpassword == 1 && $passwordnotifymethod == 's') {
             if ($input['stay'] != '') {
                 $a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
-                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+                $stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay'];
             } else {
                 $stayUrl = "index.php?a=75&r=2";
             }
@@ -323,7 +323,7 @@ 
 				<div class="sectionHeader"><?php echo $_lang['user_title']; ?></div>
 				<div class="sectionBody">
 					<div id="disp">
-						<p><?php echo sprintf($_lang["password_msg"], $modx->htmlspecialchars($newusername), $modx->htmlspecialchars($newpassword)) . (($id == $modx->getLoginUserID()) ? ' ' . $_lang['user_changeddata'] : ''); ?></p>
+						<p><?php echo sprintf($_lang["password_msg"], $modx->htmlspecialchars($newusername), $modx->htmlspecialchars($newpassword)).(($id == $modx->getLoginUserID()) ? ' '.$_lang['user_changeddata'] : ''); ?></p>
 					</div>
 				</div>
 			</div>
@@ -333,7 +333,7 @@ 
         } else {
             if ($input['stay'] != '') {
                 $a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
-                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                $header = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];
                 header($header);
             } else {
                 $header = "Location: index.php?a=75&r=2";
@@ -449,10 +449,10 @@ 
     }
 
     foreach ($defaults as $k) {
-        if (isset($settings['default_' . $k]) && $settings['default_' . $k] == '1') {
+        if (isset($settings['default_'.$k]) && $settings['default_'.$k] == '1') {
             unset($settings[$k]);
         }
-        unset($settings['default_' . $k]);
+        unset($settings['default_'.$k]);
     }
 
     $modx->db->delete($tbl_user_settings, "user='{$id}'");
@@ -482,7 +482,7 @@ 
     global $id, $modx;
     $mode = $_POST['mode'];
     $modx->manager->saveFormValues($mode);
-    $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '12' ? "&id={$id}" : ''));
+    $modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode == '12' ? "&id={$id}" : ''));
 }
 
 /**

manager/processors/save_template.processor.php

Spacing +7 added lines, -7 removed lines

@@ -1,27 +1,27 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('save_template')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = (int)$_POST['id'];
+$id = (int) $_POST['id'];
 $template = $modx->db->escape($_POST['post']);
 $templatename = $modx->db->escape(trim($_POST['templatename']));
 $description = $modx->db->escape($_POST['description']);
 $locked = $_POST['locked'] == 'on' ? 1 : 0;
-$selectable = $id == $modx->config['default_template'] ? 1 :    // Force selectable
+$selectable = $id == $modx->config['default_template'] ? 1 : // Force selectable
     $_POST['selectable'] == 'on' ? 1 : 0;
 $currentdate = time() + $modx->config['server_offset_time'];
 
 //Kyle Jaebker - added category support
 if (empty($_POST['newcategory']) && $_POST['categoryid'] > 0) {
-    $categoryid = (int)$_POST['categoryid'];
+    $categoryid = (int) $_POST['categoryid'];
 } elseif (empty($_POST['newcategory']) && $_POST['categoryid'] <= 0) {
     $categoryid = 0;
 } else {
-    include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+    include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
     $categoryid = checkCategory($_POST['newcategory']);
     if (!$categoryid) {
         $categoryid = newCategory($_POST['newcategory']);
@@ -78,7 +78,7 @@ 
         // 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 = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $header = "Location: index.php?a=76&r=2";
@@ -130,7 +130,7 @@ 
         // 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 = "Location: index.php?a=".$a."&r=2&stay=".$_POST['stay'];
             header($header);
         } else {
             $modx->unlockElement(1, $id);

manager/processors/export_site.processor.php

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('export_static')) {
@@ -12,17 +12,17 @@ 
 $modx->loadExtension('EXPORT_SITE');
 
 
-if (is_dir(MODX_BASE_PATH . 'temp')) {
-    $export_dir = MODX_BASE_PATH . 'temp/export';
-} elseif (is_dir(MODX_BASE_PATH . 'assets')) {
-    $export_dir = MODX_BASE_PATH . 'assets/export';
+if (is_dir(MODX_BASE_PATH.'temp')) {
+    $export_dir = MODX_BASE_PATH.'temp/export';
+} elseif (is_dir(MODX_BASE_PATH.'assets')) {
+    $export_dir = MODX_BASE_PATH.'assets/export';
 }
 $modx->export->targetDir = $export_dir;
 
-if (strpos($modx->config['base_path'], "{$export_dir}/")===0 && 0 <= strlen(str_replace("{$export_dir}/", '', $modx->config['base_path']))) {
+if (strpos($modx->config['base_path'], "{$export_dir}/") === 0 && 0 <= strlen(str_replace("{$export_dir}/", '', $modx->config['base_path']))) {
     return $_lang['export_site.static.php6'];
-} elseif ($modx->config['rb_base_dir'] === $export_dir . '/') {
-    return $modx->parsePlaceholder($_lang['export_site.static.php7'], 'rb_base_url=' . $modx->config['base_url'] . $modx->config['rb_base_url']);
+} elseif ($modx->config['rb_base_dir'] === $export_dir.'/') {
+    return $modx->parsePlaceholder($_lang['export_site.static.php7'], 'rb_base_url='.$modx->config['base_url'].$modx->config['rb_base_url']);
 } elseif (!is_writable($export_dir)) {
     return $_lang['export_site_target_unwritable'];
 }
@@ -37,10 +37,10 @@ 
 $repl_after      = $_POST['repl_after'];
 $includenoncache = $_POST['includenoncache'];
 
-if ($ignore_ids!==$_POST['ignore_ids']
- ||$includenoncache!==$_POST['includenoncache']
- ||$repl_before!==$_POST['repl_before']
- ||$repl_after !==$_POST['repl_after']) {
+if ($ignore_ids !== $_POST['ignore_ids']
+ ||$includenoncache !== $_POST['includenoncache']
+ ||$repl_before !== $_POST['repl_before']
+ ||$repl_after !== $_POST['repl_after']) {
     $modx->clearCache('full');
 }
 
@@ -56,5 +56,5 @@ 
 
 $exportend = $modx->export->get_mtime();
 $totaltime = ($exportend - $modx->export->exportstart);
-$output .= sprintf('<p>' . $_lang["export_site_time"] . '</p>', round($totaltime, 3));
+$output .= sprintf('<p>'.$_lang["export_site_time"].'</p>', round($totaltime, 3));
 return $output;

manager/processors/optimize_table.processor.php

Spacing +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if (!($modx->hasPermission('settings') && ($modx->hasPermission('logs')||$modx->hasPermission('bk_manager')))) {
+if (!($modx->hasPermission('settings') && ($modx->hasPermission('logs') || $modx->hasPermission('bk_manager')))) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -28,6 +28,6 @@ 
     $modx->webAlertAndQuit($_lang["error_no_optimise_tablename"]);
 }
 
-$mode = (int)$_REQUEST['mode'];
-$header="Location: index.php?a={$mode}&s=4";
+$mode = (int) $_REQUEST['mode'];
+$header = "Location: index.php?a={$mode}&s=4";
 header($header);