evolution-cms / evolution

manager/processors/execute_module.processor.php

Spacing +13 added lines, -13 removed lines

@@ -1,22 +1,22 @@ 
 <?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('exec_module')) {
     $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"]);
 }
 
 // check if user has access permission, except admins
-if ($_SESSION['mgrRole']!=1) {
+if ($_SESSION['mgrRole'] != 1) {
     $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() . "'",
+        $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
@@ -28,14 +28,14 @@ 
             //if there are permissions and this member has permission, ofcourse
             //this is granted
             $permissionAccessInt = 1;
-        } elseif ($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) {
+    if ($permissionAccessInt == 0) {
         $modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
     }
 }
@@ -61,11 +61,11 @@ 
 
 
 $output = evalModule($content["modulecode"], $parameter);
-if (strpos(trim($output), '<')===0 && strpos(trim($output), '<?xml')!==0) {
+if (strpos(trim($output), '<') === 0 && strpos(trim($output), '<?xml') !== 0) {
     echo "<style>@supports (-webkit-overflow-scrolling: touch) {body,html {-webkit-overflow-scrolling: touch;overflow:auto!important;height:100%!important}}</style>"; // for iframe scroller
 }
 echo $output;
-include MODX_MANAGER_PATH . "includes/sysalert.display.inc.php";
+include MODX_MANAGER_PATH."includes/sysalert.display.inc.php";
 
 /**
  * evalModule
@@ -101,11 +101,11 @@ 
             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);
+        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;
+    return $mod.$msg;
 }

manager/processors/save_web_user.processor.php

Switch Indentation +204 added lines, -204 removed lines

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

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('save_web_user')) {
@@ -18,7 +18,7 @@ 
     $input[$k] = $v;
 }
 
-$id = (int)$input['id'];
+$id = (int) $input['id'];
 $oldusername = $input['oldusername'];
 $newusername = !empty($input['newusername']) ? trim($input['newusername']) : "New User";
 $esc_newusername = $modx->db->escape($newusername);
@@ -120,7 +120,7 @@ 
             if (!empty($user_groups)) {
                 for ($i = 0; $i < count($user_groups); $i++) {
                     $f = array();
-                    $f['webgroup'] = (int)$user_groups[$i];
+                    $f['webgroup'] = (int) $user_groups[$i];
                     $f['webuser'] = $internalKey;
                     $modx->db->insert($f, $tbl_web_groups);
                 }
@@ -148,7 +148,7 @@ 
             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 = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];
                 header($header);
             } else {
                 $header = "Location: index.php?a=99&r=2";
@@ -157,7 +157,7 @@ 
         } else {
             if ($input['stay'] != '') {
                 $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+                $stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay'];
             } else {
                 $stayUrl = "index.php?a=99&r=2";
             }
@@ -256,7 +256,7 @@ 
             if (!empty($user_groups)) {
                 for ($i = 0; $i < count($user_groups); $i++) {
                     $field = array();
-                    $field['webgroup'] = (int)$user_groups[$i];
+                    $field['webgroup'] = (int) $user_groups[$i];
                     $field['webuser'] = $id;
                     $modx->db->insert($field, $tbl_web_groups);
                 }
@@ -295,7 +295,7 @@ 
         if ($genpassword == 1 && $passwordnotifymethod == 's') {
             if ($input['stay'] != '') {
                 $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+                $stayUrl = "index.php?a={$a}&r=2&stay=".$input['stay'];
             } else {
                 $stayUrl = "index.php?a=99&r=2";
             }
@@ -324,7 +324,7 @@ 
         } else {
             if ($input['stay'] != '') {
                 $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                $header = "Location: index.php?a={$a}&r=2&stay=".$input['stay'];
                 header($header);
             } else {
                 $header = "Location: index.php?a=99&r=2";
@@ -345,13 +345,13 @@ 
 function save_user_quoted_printable($string)
 {
     $crlf = "\n";
-    $string = preg_replace('!(\r\n|\r|\n)!', $crlf, $string) . $crlf;
+    $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 . "'";
+    $f[] = '/([\011\040])'.$crlf.'/e';
+    $r[] = "'=' . sprintf('%02X', ord('\\1')) . '".$crlf."'";
     $string = preg_replace($f, $r, $string);
-    return trim(wordwrap($string, 70, ' =' . $crlf));
+    return trim(wordwrap($string, 70, ' ='.$crlf));
 }
 
 /**
@@ -427,7 +427,7 @@ 
     global $id, $modx;
     $mode = $_POST['mode'];
     $modx->manager->saveFormValues($mode);
-    $modx->webAlertAndQuit($msg, "index.php?a={$mode}" . ($mode == '88' ? "&id={$id}" : ''));
+    $modx->webAlertAndQuit($msg, "index.php?a={$mode}".($mode == '88' ? "&id={$id}" : ''));
 }
 
 // Generate password

manager/processors/move_document.processor.php

Spacing +11 added lines, -11 removed lines

@@ -1,18 +1,18 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('edit_document')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0;
-$documentID = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$newParentID = isset($_REQUEST['new_parent']) ? (int) $_REQUEST['new_parent'] : 0;
+$documentID = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // ok, two things to check.
 // first, document cannot be moved to itself
 // second, new parent must be a folder. If not, set it to folder.
-if ($documentID==$newParentID) {
+if ($documentID == $newParentID) {
     $modx->webAlertAndQuit($_lang["error_movedocument1"]);
 }
 if ($documentID <= 0) {
@@ -34,7 +34,7 @@ 
 
 if ($use_udperms == 1) {
     if ($oldparent != $newParentID) {
-        include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+        include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
         $udperms = new udperms();
         $udperms->user = $modx->getLoginUserID();
         $udperms->document = $newParentID;
@@ -53,12 +53,12 @@ 
 function allChildren($currDocID)
 {
     $modx = evolutionCMS();
-    $children= array();
+    $children = array();
     $currDocID = $modx->db->escape($currDocID);
     $rs = $modx->db->select('id', $modx->getFullTableName('site_content'), "parent = '{$currDocID}'");
-    while ($child= $modx->db->getRow($rs)) {
-        $children[]= $child['id'];
-        $children= array_merge($children, allChildren($child['id']));
+    while ($child = $modx->db->getRow($rs)) {
+        $children[] = $child['id'];
+        $children = array_merge($children, allChildren($child['id']));
     }
     return $children;
 }
@@ -93,7 +93,7 @@ 
     $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
     $limit = $modx->db->getValue($rs);
 
-    if (!$limit>0) {
+    if (!$limit > 0) {
         $modx->db->update(array(
             'isfolder' => 0,
         ), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
@@ -111,7 +111,7 @@ 
     // empty cache & sync site
     $modx->clearCache('full');
 
-    $header="Location: index.php?a=3&id={$documentID}&r=9";
+    $header = "Location: index.php?a=3&id={$documentID}&r=9";
     header($header);
 } else {
     $modx->webAlertAndQuit("You cannot move a document to a child document!");

manager/processors/delete_message.processor.php

Spacing +5 added lines, -5 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('messages')) {
     $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"]);
 }
 
@@ -18,12 +18,12 @@ 
     $modx->webAlertAndQuit("Wrong number of messages returned!");
 }
 
-if ($message['recipient']!=$modx->getLoginUserID()) {
+if ($message['recipient'] != $modx->getLoginUserID()) {
     $modx->webAlertAndQuit("You are not allowed to delete this message!");
 }
 
 // delete message
 $modx->db->delete($modx->getFullTableName('user_messages'), "id='{$id}'");
 
-$header="Location: index.php?a=10";
+$header = "Location: index.php?a=10";
 header($header);

manager/processors/save_tmplvars.processor.php

Spacing +9 added lines, -9 removed lines

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

manager/processors/login.processor.php

Spacing +13 added lines, -13 removed lines

@@ -3,16 +3,16 @@ 
     header('HTTP/1.0 404 Not Found');
     exit('error');
 }
-define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through
+define('IN_MANAGER_MODE', true); // we use this to make sure files are accessed through
 define('MODX_API_MODE', true);
-include_once(__DIR__ . '/../../index.php');
+include_once(__DIR__.'/../../index.php');
 $modx->db->connect();
 $modx->getSettings();
 $modx->invokeEvent('OnManagerPageInit');
 $modx->loadExtension('ManagerAPI');
 $modx->loadExtension('phpass');
 
-$core_path = MODX_MANAGER_PATH . 'includes/';
+$core_path = MODX_MANAGER_PATH.'includes/';
 // include_once the language file
 $_lang = array();
 include_once("{$core_path}lang/english.inc.php");
@@ -92,7 +92,7 @@ 
         $ip = "UNKNOWN";
     }
     $log = new logHandler;
-    $log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);
+    $log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: ".$ip);
     jsAlert($_lang['login_processor_many_failed_logins']);
     return;
 }
@@ -218,18 +218,18 @@ 
 $_SESSION['mgrPermissions'] = $modx->db->getRow($rs);
 
 // successful login so reset fail count and update key values
-$modx->db->update('failedlogincount=0, ' . 'logincount=logincount+1, ' . 'lastlogin=thislogin, ' . 'thislogin=' . time() . ', ' . "sessionid='{$currentsessionid}'", '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
+$modx->db->update('failedlogincount=0, '.'logincount=logincount+1, '.'lastlogin=thislogin, '.'thislogin='.time().', '."sessionid='{$currentsessionid}'", '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 
 // get user's document groups
 $i = 0;
-$rs = $modx->db->select('uga.documentgroup', $modx->getFullTableName('member_groups') . ' ug
-		INNER JOIN ' . $modx->getFullTableName('membergroup_access') . ' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");
+$rs = $modx->db->select('uga.documentgroup', $modx->getFullTableName('member_groups').' ug
+		INNER JOIN ' . $modx->getFullTableName('membergroup_access').' uga ON uga.membergroup=ug.user_group', "ug.member='{$internalKey}'");
 $_SESSION['mgrDocgroups'] = $modx->db->getColumn('documentgroup', $rs);
 
 $_SESSION['mgrToken'] = md5($currentsessionid);
 
 if ($rememberme == '1') {
-    $_SESSION['modx.mgr.session.cookie.lifetime'] = (int)$modx->config['session.cookie.lifetime'];
+    $_SESSION['modx.mgr.session.cookie.lifetime'] = (int) $modx->config['session.cookie.lifetime'];
 
     // Set a cookie separate from the session cookie with the username in it.
     // Are we using secure connection? If so, make sure the cookie is secure
@@ -274,16 +274,16 @@ 
 
 // check if we should redirect user to a web page
 $rs = $modx->db->select('setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_name='manager_login_startup'");
-$id = (int)$modx->db->getValue($rs);
+$id = (int) $modx->db->getValue($rs);
 if ($id > 0) {
-    $header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');
+    $header = 'Location: '.$modx->makeUrl($id, '', '', 'full');
     if ($_POST['ajax'] == 1) {
         echo $header;
     } else {
         header($header);
     }
 } else {
-    $header = 'Location: ' . MODX_MANAGER_URL;
+    $header = 'Location: '.MODX_MANAGER_URL;
     if ($_POST['ajax'] == 1) {
         echo $header;
     } else {
@@ -300,9 +300,9 @@ 
 {
     $modx = evolutionCMS();
     if ($_POST['ajax'] != 1) {
-        echo "<script>window.setTimeout(\"alert('" . addslashes($modx->db->escape($msg)) . "')\",10);history.go(-1)</script>";
+        echo "<script>window.setTimeout(\"alert('".addslashes($modx->db->escape($msg))."')\",10);history.go(-1)</script>";
     } else {
-        echo $msg . "\n";
+        echo $msg."\n";
     }
 }
 

Braces +2 added lines, -1 removed lines

@@ -393,7 +393,8 @@
     $failedlogins += 1;
 
     $fields = array('failedlogincount' => $failedlogins);
-    if ($failedlogins >= $failed_allowed) { //block user for too many fail attempts
+    if ($failedlogins >= $failed_allowed) {
+//block user for too many fail attempts
 
         $fields['blockeduntil'] = time() + ($blocked_minutes * 60);
     }

manager/processors/purge_plugin.processor.php

Spacing +1 added lines, -1 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) {
     exit();
 }
 

manager/processors/empty_table.processor.php

Spacing +2 added lines, -2 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('settings')) {
@@ -8,5 +8,5 @@ 
 
 $modx->db->truncate($modx->getFullTableName('manager_log'));
 
-$header="Location: index.php?a=13";
+$header = "Location: index.php?a=13";
 header($header);

manager/processors/delete_plugin.processor.php

Spacing +4 added lines, -4 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('delete_plugin')) {
     $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"]);
 }
 
@@ -37,5 +37,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=76&r=2";
+$header = "Location: index.php?a=76&r=2";
 header($header);