evolution-cms / evolution

manager/media/style/common/moo-datepicker/datepicker.inc.php

Spacing +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@
 <?php
-class DATEPICKER {
-    function __construct() {
+class DATEPICKER{
+    function __construct(){
     }
-    function getDP() {
+    function getDP(){
         $modx = evolutionCMS(); global$_lang;
 
         $tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        return $modx->parseText($tpl,$_lang,'[%','%]');
+        return $modx->parseText($tpl, $_lang, '[%', '%]');
     }
 }

Braces +6 added lines, -3 removed lines

@@ -1,8 +1,11 @@
 <?php
-class DATEPICKER {
-    function __construct() {
+class DATEPICKER
+{
+    function __construct()
+    {
     }
-    function getDP() {
+    function getDP()
+    {
         $modx = evolutionCMS(); global$_lang;
 
         $tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');

manager/processors/save_content.processor.php

Indentation +1 added lines, -1 removed lines

@@ -492,7 +492,7 @@
                 }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
                 $publishedon = $pub_date;
                 $publishedby = $modx->getLoginUserID();
-                   }elseif ($was_published && !$published) {
+                    }elseif ($was_published && !$published) {
                 $publishedon = 0;
                 $publishedby = 0;
             } else {

Switch Indentation +11 added lines, -11 removed lines

@@ -280,19 +280,19 @@
             // invoke OnBeforeDocFormSave event
             switch($modx->config['docid_incrmnt_method'])
             {
-            case '1':
-                $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
-                $where = "T1.id IS NULL";
-                $rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
-                $id = $modx->db->getValue($rs);
+                case '1':
+                    $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
+                    $where = "T1.id IS NULL";
+                    $rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
+                    $id = $modx->db->getValue($rs);
+                    break;
+                case '2':
+                    $rs = $modx->db->select('MAX(id)+1', $tbl_site_content);
+                    $id = $modx->db->getValue($rs);
                 break;
-            case '2':
-                $rs = $modx->db->select('MAX(id)+1', $tbl_site_content);
-                $id = $modx->db->getValue($rs);
-            break;
 
-            default:
-                $id = '';
+                default:
+                    $id = '';
             }
 
         $modx->invokeEvent("OnBeforeDocFormSave", array(

Spacing +12 added lines, -12 removed lines

@@ -278,7 +278,7 @@ 
         case 'new' :
 
             // invoke OnBeforeDocFormSave event
-            switch($modx->config['docid_incrmnt_method'])
+            switch ($modx->config['docid_incrmnt_method'])
             {
             case '1':
                 $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
@@ -489,7 +489,7 @@ 
             if (!$was_published && $published) {
                 $publishedon = $currentdate;
                 $publishedby = $modx->getLoginUserID();
-                }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
+                }elseif ((!empty($pub_date) && $pub_date <= $currentdate && $published)) {
                 $publishedon = $pub_date;
                 $publishedby = $modx->getLoginUserID();
                    }elseif ($was_published && !$published) {
@@ -501,7 +501,7 @@ 
             }
 
             // invoke OnBeforeDocFormSave event
-            $modx->invokeEvent("OnBeforeDocFormSave", array (
+            $modx->invokeEvent("OnBeforeDocFormSave", array(
                 "mode" => "upd",
                 "id" => $id
             ));
@@ -526,7 +526,7 @@ 
                 . "menuindex={$menuindex}, "
                 . "searchable={$searchable}, "
                 . "cacheable={$cacheable}, "
-                . "editedby=" . $modx->getLoginUserID() . ", "
+                . "editedby=".$modx->getLoginUserID().", "
                 . "editedon={$currentdate}, "
                 . "publishedon={$publishedon}, "
                 . "publishedby={$publishedby}, "
@@ -540,7 +540,7 @@ 
 
             // update template variables
             $rs = $modx->db->select('id, tmplvarid', $tbl_site_tmplvar_contentvalues, "contentid='{$id}'");
-            $tvIds = array ();
+            $tvIds = array();
             while ($row = $modx->db->getRow($rs)) {
                 $tvIds[$row['tmplvarid']] = $row['id'];
             }
@@ -593,7 +593,7 @@ 
                     'groups.id, groups.document_group',
                     "{$tbl_document_groups} AS groups
                     LEFT JOIN {$tbl_documentgroup_names} AS dgn ON dgn.id = groups.document_group",
-                    "((1=".(int)$isManager." AND dgn.private_memgroup) OR (1=".(int)$isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
+                    "((1=".(int) $isManager." AND dgn.private_memgroup) OR (1=".(int) $isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
                     );
                 $old_groups = array();
                 while ($row = $modx->db->getRow($rs)) $old_groups[$row['document_group']] = $row['id'];
@@ -605,7 +605,7 @@ 
                         unset($old_groups[$group]);
                         continue;
                     } elseif ($link_id == 'new') {
-                        $insertions[] = '('.(int)$group.','.$id.')';
+                        $insertions[] = '('.(int) $group.','.$id.')';
                     }
                 }
                 if (!empty($insertions)) {
@@ -637,17 +637,17 @@ 
 
 
             // invoke OnDocFormSave event
-            $modx->invokeEvent("OnDocFormSave", array (
+            $modx->invokeEvent("OnDocFormSave", array(
                 "mode" => "upd",
                 "id" => $id
             ));
 
             // secure web documents - flag as private
-            include MODX_MANAGER_PATH . "includes/secure_web_documents.inc.php";
+            include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
             secureWebDocument($id);
 
             // secure manager documents - flag as private
-            include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php";
+            include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
             secureMgrDocument($id);
 
             // Set the item name for logger
@@ -673,13 +673,13 @@ 
                         // document
                         $a = ($_POST['stay'] == '2') ? "27&id=$id" : "4&pid=$parent";
                     }
-                    $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'].$add_path;
+                    $header = "Location: index.php?a=".$a."&r=1&stay=".$_POST['stay'].$add_path;
                 } else {
                     $header = "Location: index.php?a=3&id=$id&r=1".$add_path;
                 }
             }
             if (headers_sent()) {
-                $header = str_replace('Location: ','',$header);
+                $header = str_replace('Location: ', '', $header);
                 echo "<script>document.location.href='$header';</script>\n";
             } else {
                 header($header);

Braces +23 added lines, -19 removed lines

@@ -134,8 +134,7 @@ 
         }
         //end webber
     }
-}
-elseif ($alias) {
+} elseif ($alias) {
     $alias = $modx->stripAlias($alias);
 }
 
@@ -149,8 +148,7 @@ 
 
     if ($pub_date < $currentdate) {
         $published = 1;
-    }
-    elseif ($pub_date > $currentdate) {
+    } elseif ($pub_date > $currentdate) {
         $published = 0;
     }
 }
@@ -278,8 +276,7 @@ 
         case 'new' :
 
             // invoke OnBeforeDocFormSave event
-            switch($modx->config['docid_incrmnt_method'])
-            {
+            switch($modx->config['docid_incrmnt_method']) {
             case '1':
                 $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
                 $where = "T1.id IS NULL";
@@ -347,8 +344,9 @@ 
             "alias_visible"    => $aliasvisible
         );
 
-        if ($id != '')
-            $dbInsert["id"] = $id;
+        if ($id != '') {
+                    $dbInsert["id"] = $id;
+        }
 
         $key = $modx->db->insert($dbInsert, $tbl_site_content);
 
@@ -424,11 +422,13 @@ 
         // redirect/stay options
         if ($_POST['stay'] != '') {
             // weblink
-            if ($_POST['mode'] == "72")
-                $a = ($_POST['stay'] == '2') ? "27&id=$key" : "72&pid=$parent";
+            if ($_POST['mode'] == "72") {
+                            $a = ($_POST['stay'] == '2') ? "27&id=$key" : "72&pid=$parent";
+            }
             // document
-            if ($_POST['mode'] == "4")
-                $a = ($_POST['stay'] == '2') ? "27&id=$key" : "4&pid=$parent";
+            if ($_POST['mode'] == "4") {
+                            $a = ($_POST['stay'] == '2') ? "27&id=$key" : "4&pid=$parent";
+            }
             $header = "Location: index.php?a=".$a."&r=1&stay=".$_POST['stay'];
         } else {
             $header = "Location: index.php?a=3&id=$key&r=1";
@@ -489,10 +489,10 @@ 
             if (!$was_published && $published) {
                 $publishedon = $currentdate;
                 $publishedby = $modx->getLoginUserID();
-                }elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
+                } elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
                 $publishedon = $pub_date;
                 $publishedby = $modx->getLoginUserID();
-                   }elseif ($was_published && !$published) {
+                   } elseif ($was_published && !$published) {
                 $publishedon = 0;
                 $publishedby = 0;
             } else {
@@ -548,7 +548,9 @@ 
             $tvChanges = array();
             foreach ($tmplvars as $field => $value) {
                 if (!is_array($value)) {
-                    if (isset($tvIds[$value])) $tvDeletions[] = $tvIds[$value];
+                    if (isset($tvIds[$value])) {
+                        $tvDeletions[] = $tvIds[$value];
+                    }
                 } else {
                     $tvId = $value[0];
                     $tvVal = $value[1];
@@ -596,7 +598,9 @@ 
                     "((1=".(int)$isManager." AND dgn.private_memgroup) OR (1=".(int)$isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
                     );
                 $old_groups = array();
-                while ($row = $modx->db->getRow($rs)) $old_groups[$row['document_group']] = $row['id'];
+                while ($row = $modx->db->getRow($rs)) {
+                    $old_groups[$row['document_group']] = $row['id'];
+                }
 
                 // update the permissions in the database
                 $insertions = $deletions = array();
@@ -658,9 +662,9 @@ 
                 $modx->clearCache('full');
             }
 
-            if ($_POST['refresh_preview'] == '1')
-                $header = "Location: ".MODX_SITE_URL."index.php?id=$id&z=manprev";
-            else {
+            if ($_POST['refresh_preview'] == '1') {
+                            $header = "Location: ".MODX_SITE_URL."index.php?id=$id&z=manprev";
+            } else {
                 if ($_POST['stay'] != '2' && $id > 0) {
                     $modx->unlockElement(7, $id);
                 }

manager/actions/help/version_notices/1.3.6.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) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 ?>

manager/actions/help/version_notices/1.4.1.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) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 ?>

manager/actions/help/version_notices/1.4.0.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) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 ?>

manager/actions/mutate_settings/tab6_filemanager_settings.inc.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
         <?php

             // invoke OnMiscSettingsRender event

             $evtOut = $modx->invokeEvent('OnFileManagerSettingsRender');

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if (is_array($evtOut)) echo implode("", $evtOut);

         ?>

     </td>

   </tr>

Braces +3 added lines, -1 removed lines

@@ -113,7 +113,9 @@
         <?php

             // invoke OnMiscSettingsRender event

             $evtOut = $modx->invokeEvent('OnFileManagerSettingsRender');

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if(is_array($evtOut)) {
+                echo implode("",$evtOut);
+            }
         ?>

     </td>

   </tr>

manager/actions/mutate_user.dynamic.php

Indentation +158 added lines, -158 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 switch($modx->manager->action) {
-	case 12:
-		if(!$modx->hasPermission('edit_user')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 11:
-		if(!$modx->hasPermission('new_user')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    case 12:
+        if(!$modx->hasPermission('edit_user')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    case 11:
+        if(!$modx->hasPermission('new_user')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    default:
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -23,75 +23,75 @@ 
 // check to see the snippet editor isn't locked
 $rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");
 if($username = $modx->db->getValue($rs)) {
-	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "user"));
+    $modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "user"));
 }
 // end check for lock
 
 if($modx->manager->action == '12') {
-	// get user attribute
-	$rs = $modx->db->select('*', $modx->getFullTableName('user_attributes'), "internalKey = '{$user}'");
-	$userdata = $modx->db->getRow($rs);
-	if(!$userdata) {
-		$modx->webAlertAndQuit("No user returned!");
-	}
-
-
-	// get user settings
-	$rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");
-	$usersettings = array();
-	while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
-	// manually extract so that user display settings are not overwritten
-	foreach($usersettings as $k => $v) {
-		if($k != 'manager_language' && $k != 'manager_theme') {
-			${$k} = $v;
-		}
-	}
-
-	// get user name
-	$rs = $modx->db->select('*', $modx->getFullTableName('manager_users'), "id = '{$user}'");
-	$usernamedata = $modx->db->getRow($rs);
-	if(!$usernamedata) {
-		$modx->webAlertAndQuit("No user returned while getting username!");
-	}
-	$_SESSION['itemname'] = $usernamedata['username'];
+    // get user attribute
+    $rs = $modx->db->select('*', $modx->getFullTableName('user_attributes'), "internalKey = '{$user}'");
+    $userdata = $modx->db->getRow($rs);
+    if(!$userdata) {
+        $modx->webAlertAndQuit("No user returned!");
+    }
+
+
+    // get user settings
+    $rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");
+    $usersettings = array();
+    while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
+    // manually extract so that user display settings are not overwritten
+    foreach($usersettings as $k => $v) {
+        if($k != 'manager_language' && $k != 'manager_theme') {
+            ${$k} = $v;
+        }
+    }
+
+    // get user name
+    $rs = $modx->db->select('*', $modx->getFullTableName('manager_users'), "id = '{$user}'");
+    $usernamedata = $modx->db->getRow($rs);
+    if(!$usernamedata) {
+        $modx->webAlertAndQuit("No user returned while getting username!");
+    }
+    $_SESSION['itemname'] = $usernamedata['username'];
 } else {
-	$userdata = array();
-	$usersettings = array();
-	$usernamedata = array();
-	$_SESSION['itemname'] = $_lang["new_user"];
+    $userdata = array();
+    $usersettings = array();
+    $usernamedata = array();
+    $_SESSION['itemname'] = $_lang["new_user"];
 }
 
 // avoid doubling htmlspecialchars (already encoded in DB)
 foreach($userdata as $key => $val) {
-	$userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);
+    $userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);
 };
 $usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']);
 
 // restore saved form
 $formRestored = false;
 if($modx->manager->hasFormValues()) {
-	$modx->manager->loadFormValues();
-	// restore post values
-	$userdata = array_merge($userdata, $_POST);
-	$userdata['dob'] = $modx->toTimeStamp($userdata['dob']);
-	$usernamedata['username'] = $userdata['newusername'];
-	$usernamedata['oldusername'] = $_POST['oldusername'];
-	$usersettings = array_merge($usersettings, $userdata);
-	$usersettings['allowed_days'] = is_array($_POST['allowed_days']) ? implode(",", $_POST['allowed_days']) : "";
-	extract($usersettings, EXTR_OVERWRITE);
+    $modx->manager->loadFormValues();
+    // restore post values
+    $userdata = array_merge($userdata, $_POST);
+    $userdata['dob'] = $modx->toTimeStamp($userdata['dob']);
+    $usernamedata['username'] = $userdata['newusername'];
+    $usernamedata['oldusername'] = $_POST['oldusername'];
+    $usersettings = array_merge($usersettings, $userdata);
+    $usersettings['allowed_days'] = is_array($_POST['allowed_days']) ? implode(",", $_POST['allowed_days']) : "";
+    extract($usersettings, EXTR_OVERWRITE);
 }
 
 // include the country list language file
 $_country_lang = array();
 include_once "lang/country/english_country.inc.php";
 if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {
-	include_once "lang/country/" . $manager_language . "_country.inc.php";
+    include_once "lang/country/" . $manager_language . "_country.inc.php";
 }
 asort($_country_lang);
 
 $displayStyle = ($_SESSION['browser'] === 'modern') ? 'table-row' : 'block';
 if($which_browser == 'default') {
-	$which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];
+    $which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];
 }
 ?>
 <script type="text/javascript">
@@ -201,14 +201,14 @@ 
 <form action="index.php?a=32" method="post" name="userform">
 	<?php
 
-	// invoke OnUserFormPrerender event
-	$evtOut = $modx->invokeEvent("OnUserFormPrerender", array(
-		"id" => $user
-	));
-	if(is_array($evtOut)) {
-		echo implode("", $evtOut);
-	}
-	?>
+    // invoke OnUserFormPrerender event
+    $evtOut = $modx->invokeEvent("OnUserFormPrerender", array(
+        "id" => $user
+    ));
+    if(is_array($evtOut)) {
+        echo implode("", $evtOut);
+    }
+    ?>
 	<input type="hidden" name="mode" value="<?php echo $modx->manager->action; ?>">
 	<input type="hidden" name="id" value="<?php echo $user ?>">
 	<input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" />
@@ -301,21 +301,21 @@ 
 						<td>&nbsp;</td>
 						<td><?php
 
-							$rs = $modx->db->select('name, id', '[+prefix+]user_roles', ($modx->hasPermission('save_role')) ? '' : 'id != 1');
-							?>
+                            $rs = $modx->db->select('name, id', '[+prefix+]user_roles', ($modx->hasPermission('save_role')) ? '' : 'id != 1');
+                            ?>
 							<select name="role" class="inputBox" onChange='documentDirty=true;' style="width:300px">
 								<?php
-								while($row = $modx->db->getRow($rs)) {
-									if($modx->manager->action == '11') {
-										$selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';
-									} else {
-										$selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';
-									}
-									?>
+                                while($row = $modx->db->getRow($rs)) {
+                                    if($modx->manager->action == '11') {
+                                        $selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';
+                                    } else {
+                                        $selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';
+                                    }
+                                    ?>
 									<option value="<?php echo $row['id']; ?>"<?php echo $selectedtext; ?>><?php echo $row['name']; ?></option>
 									<?php
-								}
-								?>
+                                }
+                                ?>
 							</select></td>
 					</tr>
 					<tr>
@@ -360,10 +360,10 @@ 
 								<?php $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $userdata['country']; ?>
 								<option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> >&nbsp;</option>
 								<?php
-								foreach($_country_lang as $key => $country) {
-									echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";
-								}
-								?>
+                                foreach($_country_lang as $key => $country) {
+                                    echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";
+                                }
+                                ?>
 							</select></td>
 					</tr>
 					<tr>
@@ -439,21 +439,21 @@ 
 						<td><select name="manager_language" class="inputBox" onChange="documentDirty=true">
 								<option value=""></option>
 								<?php
-								$activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';
-								$dir = dir("includes/lang");
-								while($file = $dir->read()) {
-									if(strpos($file, ".inc.php") > 0) {
-										$endpos = strpos($file, ".");
-										$languagename = substr($file, 0, $endpos);
-										$selectedtext = $languagename == $activelang ? "selected='selected'" : "";
-										?>
+                                $activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';
+                                $dir = dir("includes/lang");
+                                while($file = $dir->read()) {
+                                    if(strpos($file, ".inc.php") > 0) {
+                                        $endpos = strpos($file, ".");
+                                        $languagename = substr($file, 0, $endpos);
+                                        $selectedtext = $languagename == $activelang ? "selected='selected'" : "";
+                                        ?>
 										<option value="<?php echo $languagename; ?>" <?php echo $selectedtext; ?>><?php echo ucwords(str_replace("_", " ", $languagename)); ?></option>
 										<?php
 
-									}
-								}
-								$dir->close();
-								?>
+                                    }
+                                }
+                                $dir->close();
+                                ?>
 							</select></td>
 					</tr>
 					<tr>
@@ -528,22 +528,22 @@ 
 						<td><select name="manager_theme" class="inputBox" onChange="documentDirty=true;document.userform.theme_refresher.value = Date.parse(new Date());">
 								<option value=""></option>
 								<?php
-								$dir = dir("media/style/");
-								while($file = $dir->read()) {
-									if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
-										$themename = $file;
-										if($themename === 'common') {
-											continue;
-										}
-										$attr = 'value="' . $themename . '" ';
-										if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
-											$attr .= 'selected="selected" ';
-										}
-										echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";
-									}
-								}
-								$dir->close();
-								?>
+                                $dir = dir("media/style/");
+                                while($file = $dir->read()) {
+                                    if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
+                                        $themename = $file;
+                                        if($themename === 'common') {
+                                            continue;
+                                        }
+                                        $attr = 'value="' . $themename . '" ';
+                                        if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
+                                            $attr .= 'selected="selected" ';
+                                        }
+                                        echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";
+                                    }
+                                }
+                                $dir->close();
+                                ?>
 							</select>
 							<input type="hidden" name="theme_refresher" value=""></td>
 					</tr>
@@ -579,15 +579,15 @@ 
 						<th><?php echo $_lang["which_browser_title"] ?></th>
 						<td><select name="which_browser" class="inputBox" onChange="documentDirty=true;">
 								<?php
-								$selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : '';
-								echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";
-								foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
-									$dir = str_replace('\\', '/', $dir);
-									$browser_name = substr($dir, strrpos($dir, '/') + 1);
-									$selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';
-									echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";
-								}
-								?>
+                                $selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : '';
+                                echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";
+                                foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
+                                    $dir = str_replace('\\', '/', $dir);
+                                    $browser_name = substr($dir, strrpos($dir, '/') + 1);
+                                    $selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';
+                                    echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";
+                                }
+                                ?>
 							</select></td>
 					</tr>
 					<tr>
@@ -664,17 +664,17 @@ 
 								<option value=""></option>
 								<?php
 
-								$edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';
-								// invoke OnRichTextEditorRegister event
-								$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-								echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";
-								if(is_array($evtOut)) {
-									for($i = 0; $i < count($evtOut); $i++) {
-										$editor = $evtOut[$i];
-										echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";
-									}
-								}
-								?>
+                                $edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';
+                                // invoke OnRichTextEditorRegister event
+                                $evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
+                                echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";
+                                if(is_array($evtOut)) {
+                                    for($i = 0; $i < count($evtOut); $i++) {
+                                        $editor = $evtOut[$i];
+                                        echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";
+                                    }
+                                }
+                                ?>
 							</select></td>
 					</tr>
 					<tr id='editorRow1' style="display: <?php echo $use_editor == 1 ? $displayStyle : 'none'; ?>">
@@ -707,12 +707,12 @@ 
 					</tr>
 				</table>
 				<?php
-				// invoke OnInterfaceSettingsRender event
-				$evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");
-				if(is_array($evtOut)) {
-					echo implode("", $evtOut);
-				}
-				?>
+                // invoke OnInterfaceSettingsRender event
+                $evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");
+                if(is_array($evtOut)) {
+                    echo implode("", $evtOut);
+                }
+                ?>
 			</div>
 
 			<!-- Photo -->
@@ -761,39 +761,39 @@ 
 			</div>
 			<?php if($use_udperms == 1) {
 
-			$groupsarray = array();
-
-			if($modx->manager->action == '12') { // only do this bit if the user is being edited
-				$rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");
-				$groupsarray = $modx->db->getColumn('user_group', $rs);
-			}
-			// retain selected doc groups between post
-			if(is_array($_POST['user_groups'])) {
-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
-			}
-			?>
+            $groupsarray = array();
+
+            if($modx->manager->action == '12') { // only do this bit if the user is being edited
+                $rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");
+                $groupsarray = $modx->db->getColumn('user_group', $rs);
+            }
+            // retain selected doc groups between post
+            if(is_array($_POST['user_groups'])) {
+                foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
+            }
+            ?>
 			<div class="tab-page" id="tabAccess">
 				<h2 class="tab"><?php echo $_lang["access_permissions"] ?></h2>
 				<script type="text/javascript">tpUser.addTabPage(document.getElementById("tabAccess"));</script>
 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>
 				<?php
-				$rs = $modx->db->select('name, id', $modx->getFullTableName('membergroup_names'), '', 'name');
-				while($row = $modx->db->getRow($rs)) {
-					echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />";
-				}
-				}
-				?>
+                $rs = $modx->db->select('name, id', $modx->getFullTableName('membergroup_names'), '', 'name');
+                while($row = $modx->db->getRow($rs)) {
+                    echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />";
+                }
+                }
+                ?>
 			</div>
 		</div>
 	</div>
 	<input type="submit" name="save" style="display:none">
 	<?php
-	// invoke OnUserFormRender event
-	$evtOut = $modx->invokeEvent("OnUserFormRender", array(
-		"id" => $user
-	));
-	if(is_array($evtOut)) {
-		echo implode("", $evtOut);
-	}
-	?>
+    // invoke OnUserFormRender event
+    $evtOut = $modx->invokeEvent("OnUserFormRender", array(
+        "id" => $user
+    ));
+    if(is_array($evtOut)) {
+        echo implode("", $evtOut);
+    }
+    ?>
 </form>

Switch Indentation +12 added lines, -12 removed lines

@@ -4,18 +4,18 @@
 }
 
 switch($modx->manager->action) {
-	case 12:
-		if(!$modx->hasPermission('edit_user')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 11:
-		if(!$modx->hasPermission('new_user')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+	    case 12:
+		    if(!$modx->hasPermission('edit_user')) {
+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+		    }
+		    break;
+	    case 11:
+		    if(!$modx->hasPermission('new_user')) {
+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+		    }
+		    break;
+	    default:
+		    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

Spacing +58 added lines, -58 removed lines

@@ -1,16 +1,16 @@ 
 <?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.");
 }
 
-switch($modx->manager->action) {
+switch ($modx->manager->action) {
 	case 12:
-		if(!$modx->hasPermission('edit_user')) {
+		if (!$modx->hasPermission('edit_user')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
 	case 11:
-		if(!$modx->hasPermission('new_user')) {
+		if (!$modx->hasPermission('new_user')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
@@ -18,20 +18,20 @@ 
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$user = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // check to see the snippet editor isn't locked
-$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");
-if($username = $modx->db->getValue($rs)) {
+$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='".$modx->getLoginUserID()."'");
+if ($username = $modx->db->getValue($rs)) {
 	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "user"));
 }
 // end check for lock
 
-if($modx->manager->action == '12') {
+if ($modx->manager->action == '12') {
 	// get user attribute
 	$rs = $modx->db->select('*', $modx->getFullTableName('user_attributes'), "internalKey = '{$user}'");
 	$userdata = $modx->db->getRow($rs);
-	if(!$userdata) {
+	if (!$userdata) {
 		$modx->webAlertAndQuit("No user returned!");
 	}
 
@@ -39,10 +39,10 @@ 
 	// get user settings
 	$rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");
 	$usersettings = array();
-	while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
+	while ($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
 	// manually extract so that user display settings are not overwritten
-	foreach($usersettings as $k => $v) {
-		if($k != 'manager_language' && $k != 'manager_theme') {
+	foreach ($usersettings as $k => $v) {
+		if ($k != 'manager_language' && $k != 'manager_theme') {
 			${$k} = $v;
 		}
 	}
@@ -50,7 +50,7 @@ 
 	// get user name
 	$rs = $modx->db->select('*', $modx->getFullTableName('manager_users'), "id = '{$user}'");
 	$usernamedata = $modx->db->getRow($rs);
-	if(!$usernamedata) {
+	if (!$usernamedata) {
 		$modx->webAlertAndQuit("No user returned while getting username!");
 	}
 	$_SESSION['itemname'] = $usernamedata['username'];
@@ -62,14 +62,14 @@ 
 }
 
 // avoid doubling htmlspecialchars (already encoded in DB)
-foreach($userdata as $key => $val) {
+foreach ($userdata as $key => $val) {
 	$userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);
 };
 $usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']);
 
 // restore saved form
 $formRestored = false;
-if($modx->manager->hasFormValues()) {
+if ($modx->manager->hasFormValues()) {
 	$modx->manager->loadFormValues();
 	// restore post values
 	$userdata = array_merge($userdata, $_POST);
@@ -84,13 +84,13 @@ 
 // include the country list language file
 $_country_lang = array();
 include_once "lang/country/english_country.inc.php";
-if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {
-	include_once "lang/country/" . $manager_language . "_country.inc.php";
+if ($manager_language != "english" && file_exists($modx->config['site_manager_path']."includes/lang/country/".$manager_language."_country.inc.php")) {
+	include_once "lang/country/".$manager_language."_country.inc.php";
 }
 asort($_country_lang);
 
 $displayStyle = ($_SESSION['browser'] === 'modern') ? 'table-row' : 'block';
-if($which_browser == 'default') {
+if ($which_browser == 'default') {
 	$which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];
 }
 ?>
@@ -182,7 +182,7 @@ 
 			document.userform.save.click();
 		},
 		delete: function() {
-			<?php if($_GET['id'] == $modx->getLoginUserID()) { ?>
+			<?php if ($_GET['id'] == $modx->getLoginUserID()) { ?>
 			alert("<?php echo $_lang['alert_delete_self']; ?>");
 			<?php } else { ?>
 			if(confirm("<?php echo $_lang['confirm_delete_user']; ?>") === true) {
@@ -205,7 +205,7 @@ 
 	$evtOut = $modx->invokeEvent("OnUserFormPrerender", array(
 		"id" => $user
 	));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>
@@ -214,7 +214,7 @@ 
 	<input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" />
 
 	<h1>
-        <i class="fa fa fa-user"></i><?= ($usernamedata['username'] ? $usernamedata['username'] . '<small>(' . $usernamedata['id'] . ')</small>' : $_lang['user_title']) ?>
+        <i class="fa fa fa-user"></i><?= ($usernamedata['username'] ? $usernamedata['username'].'<small>('.$usernamedata['id'].')</small>' : $_lang['user_title']) ?>
     </h1>
 
 	<?php echo $_style['actionbuttons']['dynamic']['user'] ?>
@@ -232,13 +232,13 @@ 
 				<table border="0" cellspacing="0" cellpadding="3" class="table table--edit table--editUser">
 					<tr>
 						<td colspan="3"><span id="blocked" class="warning">
-							<?php if($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || $userdata['failedlogins'] > 3) { ?>
+							<?php if ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || $userdata['failedlogins'] > 3) { ?>
 								<?php echo $_lang['user_is_blocked']; ?>
 							<?php } ?>
 							</span>
 							<br /></td>
 					</tr>
-					<?php if(!empty($userdata['id'])) { ?>
+					<?php if (!empty($userdata['id'])) { ?>
 						<tr id="showname" style="display: <?php echo ($modx->manager->action == '12' && (!isset($usernamedata['oldusername']) || $usernamedata['oldusername'] == $usernamedata['username'])) ? $displayStyle : 'none'; ?> ">
 							<td colspan="3"><i class="<?php echo $_style["icons_user"] ?>"></i>&nbsp;<b><?php echo $modx->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?></b> - <span class="comment"><a href="javascript:;" onClick="changeName();return false;"><?php echo $_lang["change_name"]; ?></a></span>
 								<input type="hidden" name="oldusername" value="<?php echo $modx->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?>" />
@@ -251,7 +251,7 @@ 
 						<td><input type="text" name="newusername" class="inputBox" value="<?php echo $modx->htmlspecialchars($usernamedata['username']); ?>" onChange='documentDirty=true;' maxlength="100" /></td>
 					</tr>
 					<tr>
-						<th><?php echo $modx->manager->action == '11' ? $_lang['password'] . ":" : $_lang['change_password_new'] . ":"; ?></th>
+						<th><?php echo $modx->manager->action == '11' ? $_lang['password'].":" : $_lang['change_password_new'].":"; ?></th>
 						<td>&nbsp;</td>
 						<td><input name="newpasswordcheck" type="checkbox" onClick="changestate(document.userform.newpassword);changePasswordState(document.userform.newpassword);"<?php echo $modx->manager->action == "11" ? " checked disabled" : ""; ?>>
 							<input type="hidden" name="newpassword" value="<?php echo $modx->manager->action == "11" ? 1 : 0; ?>" onChange="documentDirty=true;" />
@@ -305,8 +305,8 @@ 
 							?>
 							<select name="role" class="inputBox" onChange='documentDirty=true;' style="width:300px">
 								<?php
-								while($row = $modx->db->getRow($rs)) {
-									if($modx->manager->action == '11') {
+								while ($row = $modx->db->getRow($rs)) {
+									if ($modx->manager->action == '11') {
 										$selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';
 									} else {
 										$selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';
@@ -360,8 +360,8 @@ 
 								<?php $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $userdata['country']; ?>
 								<option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> >&nbsp;</option>
 								<?php
-								foreach($_country_lang as $key => $country) {
-									echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";
+								foreach ($_country_lang as $key => $country) {
+									echo "<option value=\"$key\"".(isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '').">$country</option>";
 								}
 								?>
 							</select></td>
@@ -387,7 +387,7 @@ 
 						<td>&nbsp;</td>
 						<td><textarea type="text" name="comment" class="inputBox" rows="5" onChange="documentDirty=true;"><?php echo $modx->htmlspecialchars($userdata['comment']); ?></textarea></td>
 					</tr>
-					<?php if($modx->manager->action == '12') { ?>
+					<?php if ($modx->manager->action == '12') { ?>
 						<tr>
 							<th><?php echo $_lang['user_logincount']; ?>:</th>
 							<td>&nbsp;</td>
@@ -424,7 +424,7 @@ 
 						</tr>
 					<?php } ?>
 				</table>
-				<?php if($_GET['id'] == $modx->getLoginUserID()) { ?>
+				<?php if ($_GET['id'] == $modx->getLoginUserID()) { ?>
 					<p><?php echo $_lang['user_edit_self_msg']; ?></p>
 				<?php } ?>
 			</div>
@@ -441,8 +441,8 @@ 
 								<?php
 								$activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';
 								$dir = dir("includes/lang");
-								while($file = $dir->read()) {
-									if(strpos($file, ".inc.php") > 0) {
+								while ($file = $dir->read()) {
+									if (strpos($file, ".inc.php") > 0) {
 										$endpos = strpos($file, ".");
 										$languagename = substr($file, 0, $endpos);
 										$selectedtext = $languagename == $activelang ? "selected='selected'" : "";
@@ -529,17 +529,17 @@ 
 								<option value=""></option>
 								<?php
 								$dir = dir("media/style/");
-								while($file = $dir->read()) {
-									if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
+								while ($file = $dir->read()) {
+									if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
 										$themename = $file;
-										if($themename === 'common') {
+										if ($themename === 'common') {
 											continue;
 										}
-										$attr = 'value="' . $themename . '" ';
-										if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
+										$attr = 'value="'.$themename.'" ';
+										if (isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
 											$attr .= 'selected="selected" ';
 										}
-										echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";
+										echo "\t\t<option ".rtrim($attr).'>'.ucwords(str_replace("_", " ", $themename))."</option>\n";
 									}
 								}
 								$dir->close();
@@ -580,12 +580,12 @@ 
 						<td><select name="which_browser" class="inputBox" onChange="documentDirty=true;">
 								<?php
 								$selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : '';
-								echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";
-								foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
+								echo '<option value="default"'.$selected.'>'.$_lang['option_default']."</option>\n";
+								foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
 									$dir = str_replace('\\', '/', $dir);
 									$browser_name = substr($dir, strrpos($dir, '/') + 1);
 									$selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';
-									echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";
+									echo '<option value="'.$browser_name.'"'.$selected.'>'."{$browser_name}</option>\n";
 								}
 								?>
 							</select></td>
@@ -612,7 +612,7 @@ 
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td class='comment'><?php echo $_lang["uploadable_images_message"] . $_lang["user_upload_message"] ?></td>
+						<td class='comment'><?php echo $_lang["uploadable_images_message"].$_lang["user_upload_message"] ?></td>
 					</tr>
 					<tr>
 						<th><?php echo $_lang["uploadable_media_title"] ?></th>
@@ -624,7 +624,7 @@ 
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td class='comment'><?php echo $_lang["uploadable_media_message"] . $_lang["user_upload_message"] ?></td>
+						<td class='comment'><?php echo $_lang["uploadable_media_message"].$_lang["user_upload_message"] ?></td>
 					</tr>
 					<tr>
 						<th><?php echo $_lang["uploadable_flash_title"] ?></th>
@@ -636,7 +636,7 @@ 
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td class='comment'><?php echo $_lang["uploadable_flash_message"] . $_lang["user_upload_message"] ?></td>
+						<td class='comment'><?php echo $_lang["uploadable_flash_message"].$_lang["user_upload_message"] ?></td>
 					</tr>
 					<tr>
 						<th><?php echo $_lang["uploadable_files_title"] ?></th>
@@ -648,7 +648,7 @@ 
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td class='comment'><?php echo $_lang["uploadable_files_message"] . $_lang["user_upload_message"] ?></td>
+						<td class='comment'><?php echo $_lang["uploadable_files_message"].$_lang["user_upload_message"] ?></td>
 					</tr>
 					<tr class='row2'>
 						<th><?php echo $_lang["upload_maxsize_title"] ?></th>
@@ -667,11 +667,11 @@ 
 								$edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';
 								// invoke OnRichTextEditorRegister event
 								$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-								echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";
-								if(is_array($evtOut)) {
-									for($i = 0; $i < count($evtOut); $i++) {
+								echo "<option value='none'".($edt == 'none' ? " selected='selected'" : "").">".$_lang["none"]."</option>\n";
+								if (is_array($evtOut)) {
+									for ($i = 0; $i < count($evtOut); $i++) {
 										$editor = $evtOut[$i];
-										echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";
+										echo "<option value='$editor'".($edt == $editor ? " selected='selected'" : "").">$editor</option>\n";
 									}
 								}
 								?>
@@ -709,7 +709,7 @@ 
 				<?php
 				// invoke OnInterfaceSettingsRender event
 				$evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");
-				if(is_array($evtOut)) {
+				if (is_array($evtOut)) {
 					echo implode("", $evtOut);
 				}
 				?>
@@ -736,7 +736,7 @@ 
 					function BrowseServer() {
 						var w = screen.width * 0.7;
 						var h = screen.height * 0.7;
-						OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);
+						OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);
 					}
 
 					function SetUrl(url, width, height, alt) {
@@ -759,17 +759,17 @@ 
 					</tr>
 				</table>
 			</div>
-			<?php if($use_udperms == 1) {
+			<?php if ($use_udperms == 1) {
 
 			$groupsarray = array();
 
-			if($modx->manager->action == '12') { // only do this bit if the user is being edited
+			if ($modx->manager->action == '12') { // only do this bit if the user is being edited
 				$rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");
 				$groupsarray = $modx->db->getColumn('user_group', $rs);
 			}
 			// retain selected doc groups between post
-			if(is_array($_POST['user_groups'])) {
-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
+			if (is_array($_POST['user_groups'])) {
+				foreach ($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
 			}
 			?>
 			<div class="tab-page" id="tabAccess">
@@ -778,8 +778,8 @@ 
 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>
 				<?php
 				$rs = $modx->db->select('name, id', $modx->getFullTableName('membergroup_names'), '', 'name');
-				while($row = $modx->db->getRow($rs)) {
-					echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />";
+				while ($row = $modx->db->getRow($rs)) {
+					echo "<label><input type='checkbox' name='user_groups[]' value='".$row['id']."'".(in_array($row['id'], $groupsarray) ? " checked='checked'" : "")." />".$row['name']."</label><br />";
 				}
 				}
 				?>
@@ -792,7 +792,7 @@ 
 	$evtOut = $modx->invokeEvent("OnUserFormRender", array(
 		"id" => $user
 	));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>

Braces +8 added lines, -3 removed lines

@@ -39,7 +39,9 @@ 
 	// get user settings
 	$rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");
 	$usersettings = array();
-	while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
+	while($row = $modx->db->getRow($rs)) {
+	    $usersettings[$row['setting_name']] = $row['setting_value'];
+	}
 	// manually extract so that user display settings are not overwritten
 	foreach($usersettings as $k => $v) {
 		if($k != 'manager_language' && $k != 'manager_theme') {
@@ -763,13 +765,16 @@ 
 
 			$groupsarray = array();
 
-			if($modx->manager->action == '12') { // only do this bit if the user is being edited
+			if($modx->manager->action == '12') {
+// only do this bit if the user is being edited
 				$rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");
 				$groupsarray = $modx->db->getColumn('user_group', $rs);
 			}
 			// retain selected doc groups between post
 			if(is_array($_POST['user_groups'])) {
-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
+				foreach($_POST['user_groups'] as $n => $v) {
+				    $groupsarray[] = $v;
+				}
 			}
 			?>
 			<div class="tab-page" id="tabAccess">

manager/includes/header.inc.php

Spacing +23 added lines, -23 removed lines

@@ -20,28 +20,28 @@ 
 $body_class = '';

 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');

 if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

-    $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

+    $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']];

 } elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {

-    $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];

+    $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']];

 }

 

-$css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;

+$css = 'media/style/'.$modx->config['manager_theme'].'/style.css?v='.$lastInstallTime;

 

 if ($modx->config['manager_theme'] == 'default') {

-    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')

-        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {

+    if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')

+        && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {

         $files = array(

-            'bootstrap' => MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css',

-            'font-awesome' => MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css',

-            'fonts' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css',

-            'forms' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css',

-            'mainmenu' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css',

-            'tree' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css',

-            'custom' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css',

-            'tabpane' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css',

-            'contextmenu' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css',

-            'index' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css',

-            'main' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css'

+            'bootstrap' => MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css',

+            'font-awesome' => MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css',

+            'fonts' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css',

+            'forms' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css',

+            'mainmenu' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css',

+            'tree' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css',

+            'custom' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css',

+            'tabpane' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css',

+            'contextmenu' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css',

+            'index' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css',

+            'main' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css'

         );

         $evtOut = $modx->invokeEvent('OnBeforeMinifyCss', array(

             'files' => $files,

@@ -58,16 +58,16 @@ 
             default:

                 $modx->webAlertAndQuit(sprintf($_lang['invalid_event_response'], 'OnBeforeMinifyManagerCss'));

         }

-        require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';

+        require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';

         $minifier = new Formatter\CSSMinify($files);

         $css = $minifier->minify();

         file_put_contents(

-            MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css',

+            MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css',

             $css

         );

     }

-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

-        $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;

+    if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {

+        $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;

     }

 }

 

@@ -82,7 +82,7 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>

     <link rel="stylesheet" type="text/css" href="<?= $css ?>"/>

     <script type="text/javascript" src="media/script/tabpane.js"></script>

-    <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>

+    <?= sprintf('<script type="text/javascript" src="%s"></script>'."\n", $modx->config['mgr_jquery_path']) ?>

     <?php if ($modx->config['show_picker'] != "0") { ?>

         <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js"

                 type="text/javascript"></script>

@@ -95,7 +95,7 @@ 
     <?php } ?>

 

     <!-- OnManagerMainFrameHeaderHTMLBlock -->

-    <?= $onManagerMainFrameHeaderHTMLBlock . "\n" ?>

+    <?= $onManagerMainFrameHeaderHTMLBlock."\n" ?>

 

     <script type="text/javascript">

       if (!evo) {

@@ -125,7 +125,7 @@ 
     <script>

         <?php

         if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {

-            echo 'doRefresh(' . $_REQUEST['r'] . ");\n";

+            echo 'doRefresh('.$_REQUEST['r'].");\n";

         }

         ?>

     </script>

Braces +10 added lines, -10 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.");

 }

@@ -10,26 +10,26 @@ 
 $modx_textdir = isset($modx_textdir) ? $modx_textdir : null;

 $onManagerMainFrameHeaderHTMLBlock = is_array($evtOut) ? implode("\n", $evtOut) : '';

 $textdir = $modx_textdir === 'rtl' ? 'rtl' : 'ltr';

-if (!isset($modx->config['mgr_jquery_path'])) {

+if (!isset($modx->config['mgr_jquery_path'])) {
     $modx->config['mgr_jquery_path'] = 'media/script/jquery/jquery.min.js';

 }

-if (!isset($modx->config['mgr_date_picker_path'])) {

+if (!isset($modx->config['mgr_date_picker_path'])) {
     $modx->config['mgr_date_picker_path'] = 'media/script/air-datepicker/datepicker.inc.php';

 }

 

 $body_class = '';

 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');

-if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

+if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
     $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

-} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {

+} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
     $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];

 }

 

 $css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;

 

-if ($modx->config['manager_theme'] == 'default') {

+if ($modx->config['manager_theme'] == 'default') {
     if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')

-        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {

+        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
         $files = array(

             'bootstrap' => MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css',

             'font-awesome' => MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css',

@@ -48,7 +48,7 @@ 
             'source' => 'manager',

             'theme' => $modx->config['manager_theme']

         ));

-        switch (true) {

+        switch (true) {
             case empty($evtOut):

             case is_array($evtOut) && count($evtOut) === 0:

                 break;

@@ -66,7 +66,7 @@ 
             $css

         );

     }

-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

+    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
         $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;

     }

 }

@@ -124,7 +124,7 @@ 
     <script src="media/script/main.js"></script>

     <script>

         <?php

-        if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {

+        if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
             echo 'doRefresh(' . $_REQUEST['r'] . ");\n";

         }

         ?>

manager/actions/user_management.static.php

Indentation +54 added lines, -54 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // initialize page view state - the $_PAGE object
@@ -11,12 +11,12 @@ 
 
 // get and save search string
 if($_REQUEST['op'] == 'reset') {
-	$query = '';
-	$_PAGE['vs']['search'] = '';
+    $query = '';
+    $_PAGE['vs']['search'] = '';
 } else {
-	$query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
-	$sqlQuery = $modx->db->escape($query);
-	$_PAGE['vs']['search'] = $query;
+    $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];
+    $sqlQuery = $modx->db->escape($query);
+    $_PAGE['vs']['search'] = $query;
 }
 
 // get & save listmode
@@ -120,55 +120,55 @@ 
 			<div class="row">
 				<div class="table-responsive">
 					<?php
-					$where = "";
-					if(!$modx->hasPermission('save_role')) {
-						$where .= (empty($where) ? "" : " AND ") . "mua.role != 1";
-					}
-					if(!empty($sqlQuery)) {
-						$where .= (empty($where) ? "" : " AND ") . "((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))";
-					}
-					$ds = $modx->db->select("mu.id, mu.username, rname.name AS role, mua.fullname, mua.email, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin, mua.logincount", $modx->getFullTableName('manager_users') . " AS mu 
+                    $where = "";
+                    if(!$modx->hasPermission('save_role')) {
+                        $where .= (empty($where) ? "" : " AND ") . "mua.role != 1";
+                    }
+                    if(!empty($sqlQuery)) {
+                        $where .= (empty($where) ? "" : " AND ") . "((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))";
+                    }
+                    $ds = $modx->db->select("mu.id, mu.username, rname.name AS role, mua.fullname, mua.email, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin, mua.logincount", $modx->getFullTableName('manager_users') . " AS mu 
 			INNER JOIN " . $modx->getFullTableName('user_attributes') . " AS mua ON mua.internalKey=mu.id 
 			LEFT JOIN " . $modx->getFullTableName('user_roles') . " AS rname ON mua.role=rname.id", $where, 'mua.blocked ASC, mua.thislogin DESC');
-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
-					$grd = new DataGrid('', $ds, $modx->config['number_of_results']); // set page size to 0 t show all items
-					$grd->noRecordMsg = $_lang["no_records_found"];
-					$grd->cssClass = "table data";
-					$grd->columnHeaderClass = "tableHeader";
-					$grd->itemClass = "tableItem";
-					$grd->altItemClass = "tableAltItem";
-					$grd->fields = "id,username,fullname,role,email,thislogin,logincount,blocked";
-					$grd->columns = implode(',', array(
-						$_lang["icon"],
-						$_lang["name"],
-						$_lang["user_full_name"],
-						$_lang['role'],
-						$_lang["email"],
-						$_lang["user_prevlogin"],
-						$_lang["user_logincount"],
-						$_lang["user_block"]
-					));
-					$grd->colWidths = "1%,,,,,1%,1%,1%";
-					$grd->colAligns = "center,,,,,right' nowrap='nowrap,right,center";
-					$grd->colTypes = implode('||', array(
-						'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="' . $_lang['click_to_context'] . '"><i class="' . $_style['icons_user'] . '"></i></a>',
-						'template:<a href="index.php?a=12&id=[+id+]" title="' . $_lang['click_to_edit_title'] . '">[+value+]</a>',
-						'template:[+fullname+]',
-						'template:[+role+]',
-						'template:[+email+]',
-						'date: ' . $modx->toDateFormat('[+thislogin+]', 'formatOnly') . ' %H:%M',
-						'template:[+logincount+]',
-						'template:[+blocked+]'
-					));
-					if($listmode == '1') {
-						$grd->pageSize = 0;
-					}
-					if($_REQUEST['op'] == 'reset') {
-						$grd->pageNumber = 1;
-					}
-					// render grid
-					echo $grd->render();
-					?>
+                    include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+                    $grd = new DataGrid('', $ds, $modx->config['number_of_results']); // set page size to 0 t show all items
+                    $grd->noRecordMsg = $_lang["no_records_found"];
+                    $grd->cssClass = "table data";
+                    $grd->columnHeaderClass = "tableHeader";
+                    $grd->itemClass = "tableItem";
+                    $grd->altItemClass = "tableAltItem";
+                    $grd->fields = "id,username,fullname,role,email,thislogin,logincount,blocked";
+                    $grd->columns = implode(',', array(
+                        $_lang["icon"],
+                        $_lang["name"],
+                        $_lang["user_full_name"],
+                        $_lang['role'],
+                        $_lang["email"],
+                        $_lang["user_prevlogin"],
+                        $_lang["user_logincount"],
+                        $_lang["user_block"]
+                    ));
+                    $grd->colWidths = "1%,,,,,1%,1%,1%";
+                    $grd->colAligns = "center,,,,,right' nowrap='nowrap,right,center";
+                    $grd->colTypes = implode('||', array(
+                        'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="' . $_lang['click_to_context'] . '"><i class="' . $_style['icons_user'] . '"></i></a>',
+                        'template:<a href="index.php?a=12&id=[+id+]" title="' . $_lang['click_to_edit_title'] . '">[+value+]</a>',
+                        'template:[+fullname+]',
+                        'template:[+role+]',
+                        'template:[+email+]',
+                        'date: ' . $modx->toDateFormat('[+thislogin+]', 'formatOnly') . ' %H:%M',
+                        'template:[+logincount+]',
+                        'template:[+blocked+]'
+                    ));
+                    if($listmode == '1') {
+                        $grd->pageSize = 0;
+                    }
+                    if($_REQUEST['op'] == 'reset') {
+                        $grd->pageNumber = 1;
+                    }
+                    // render grid
+                    echo $grd->render();
+                    ?>
 				</div>
 			</div>
 		</div>

Spacing +17 added lines, -17 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('edit_user')) {
+if (!$modx->hasPermission('edit_user')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -10,7 +10,7 @@ 
 $modx->manager->initPageViewState();
 
 // get and save search string
-if($_REQUEST['op'] == 'reset') {
+if ($_REQUEST['op'] == 'reset') {
 	$query = '';
 	$_PAGE['vs']['search'] = '';
 } else {
@@ -25,7 +25,7 @@ 
 
 
 // context menu
-include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";
+include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php";
 $cm = new ContextMenu("cntxm", 150);
 $cm->addItem($_lang["edit"], "js:menuAction(1)", $_style["actions_edit"], (!$modx->hasPermission('edit_user') ? 1 : 0));
 $cm->addItem($_lang["delete"], "js:menuAction(2)", $_style["actions_delete"], (!$modx->hasPermission('delete_user') ? 1 : 0));
@@ -121,16 +121,16 @@ 
 				<div class="table-responsive">
 					<?php
 					$where = "";
-					if(!$modx->hasPermission('save_role')) {
-						$where .= (empty($where) ? "" : " AND ") . "mua.role != 1";
+					if (!$modx->hasPermission('save_role')) {
+						$where .= (empty($where) ? "" : " AND ")."mua.role != 1";
 					}
-					if(!empty($sqlQuery)) {
-						$where .= (empty($where) ? "" : " AND ") . "((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))";
+					if (!empty($sqlQuery)) {
+						$where .= (empty($where) ? "" : " AND ")."((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))";
 					}
-					$ds = $modx->db->select("mu.id, mu.username, rname.name AS role, mua.fullname, mua.email, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin, mua.logincount", $modx->getFullTableName('manager_users') . " AS mu 
-			INNER JOIN " . $modx->getFullTableName('user_attributes') . " AS mua ON mua.internalKey=mu.id 
-			LEFT JOIN " . $modx->getFullTableName('user_roles') . " AS rname ON mua.role=rname.id", $where, 'mua.blocked ASC, mua.thislogin DESC');
-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+					$ds = $modx->db->select("mu.id, mu.username, rname.name AS role, mua.fullname, mua.email, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin, mua.logincount", $modx->getFullTableName('manager_users')." AS mu 
+			INNER JOIN " . $modx->getFullTableName('user_attributes')." AS mua ON mua.internalKey=mu.id 
+			LEFT JOIN " . $modx->getFullTableName('user_roles')." AS rname ON mua.role=rname.id", $where, 'mua.blocked ASC, mua.thislogin DESC');
+					include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
 					$grd = new DataGrid('', $ds, $modx->config['number_of_results']); // set page size to 0 t show all items
 					$grd->noRecordMsg = $_lang["no_records_found"];
 					$grd->cssClass = "table data";
@@ -151,19 +151,19 @@ 
 					$grd->colWidths = "1%,,,,,1%,1%,1%";
 					$grd->colAligns = "center,,,,,right' nowrap='nowrap,right,center";
 					$grd->colTypes = implode('||', array(
-						'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="' . $_lang['click_to_context'] . '"><i class="' . $_style['icons_user'] . '"></i></a>',
-						'template:<a href="index.php?a=12&id=[+id+]" title="' . $_lang['click_to_edit_title'] . '">[+value+]</a>',
+						'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="'.$_lang['click_to_context'].'"><i class="'.$_style['icons_user'].'"></i></a>',
+						'template:<a href="index.php?a=12&id=[+id+]" title="'.$_lang['click_to_edit_title'].'">[+value+]</a>',
 						'template:[+fullname+]',
 						'template:[+role+]',
 						'template:[+email+]',
-						'date: ' . $modx->toDateFormat('[+thislogin+]', 'formatOnly') . ' %H:%M',
+						'date: '.$modx->toDateFormat('[+thislogin+]', 'formatOnly').' %H:%M',
 						'template:[+logincount+]',
 						'template:[+blocked+]'
 					));
-					if($listmode == '1') {
+					if ($listmode == '1') {
 						$grd->pageSize = 0;
 					}
-					if($_REQUEST['op'] == 'reset') {
+					if ($_REQUEST['op'] == 'reset') {
 						$grd->pageNumber = 1;
 					}
 					// render grid