evolution-cms / evolution

manager/actions/mutate_user.dynamic.php

Braces +42 added lines, -37 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;

@@ -22,16 +22,16 @@ 
 

 // 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)) {

+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,12 @@ 
 	// 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,11 +52,11 @@ 
 	// 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'];

-} else {

+} else {
 	$userdata = array();

 	$usersettings = array();

 	$usernamedata = array();

@@ -62,14 +64,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 +86,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")) {

+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'];

 }

 ?>

@@ -205,7 +207,7 @@ 
 	$evtOut = $modx->invokeEvent("OnUserFormPrerender", array(

 		"id" => $user

 	));

-	if(is_array($evtOut)) {

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

 	}

 	?>

@@ -305,10 +307,10 @@ 
 							?>

 							<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 {

+									} else {
 										$selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';

 									}

 									?>

@@ -360,7 +362,7 @@ 
 								<?php $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $userdata['country']; ?>

 								<option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> >&nbsp;</option>

 								<?php

-								foreach($_country_lang as $key => $country) {

+								foreach($_country_lang as $key => $country) {
 									echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";

 								}

 								?>

@@ -441,8 +443,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,14 +531,14 @@ 
 								<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']) {

+										if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
 											$attr .= 'selected="selected" ';

 										}

 										echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";

@@ -557,7 +559,7 @@ 
 								<?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) {

+								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"' : '';

@@ -644,8 +646,8 @@ 
 								// 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++) {

+								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";

 									}

@@ -685,7 +687,7 @@ 
 				<?php

 				// invoke OnInterfaceSettingsRender event

 				$evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");

-				if(is_array($evtOut)) {

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

 				}

 				?>

@@ -735,17 +737,20 @@ 
 					</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">

@@ -754,7 +759,7 @@ 
 				<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)) {

+				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 />";

 				}

 				}

@@ -768,7 +773,7 @@ 
 	$evtOut = $modx->invokeEvent("OnUserFormRender", array(

 		"id" => $user

 	));

-	if(is_array($evtOut)) {

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

 	}

 	?>

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>

@@ -555,15 +555,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>

@@ -640,17 +640,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'; ?>">

@@ -683,12 +683,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 -->

@@ -737,39 +737,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();

@@ -556,12 +556,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>

@@ -588,7 +588,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>

@@ -600,7 +600,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>

@@ -612,7 +612,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>

@@ -624,7 +624,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>

@@ -643,11 +643,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";

 									}

 								}

 								?>

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

 				// invoke OnInterfaceSettingsRender event

 				$evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");

-				if(is_array($evtOut)) {

+				if (is_array($evtOut)) {

 					echo implode("", $evtOut);

 				}

 				?>

@@ -712,7 +712,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) {

@@ -735,17 +735,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">

@@ -754,8 +754,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 />";

 				}

 				}

 				?>

@@ -768,7 +768,7 @@ 
 	$evtOut = $modx->invokeEvent("OnUserFormRender", array(

 		"id" => $user

 	));

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode("", $evtOut);

 	}

 	?>

manager/actions/category_mgr/inc/request_trigger.inc.php

Indentation +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 
             if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) )
             {
-               $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
+                $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
             }
 
             foreach( $cm->getCategories() as $category )
@@ -106,14 +106,14 @@ 
 
     if( empty( $category ) )
     {
-       $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
-       return;
+        $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
+        return;
     }
 
     if( $cm->isCategoryExists( $category ) )
     {
-       $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
-       return;
+        $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
+        return;
     }
 
     if( $cm->addCategory( $category, $rank ) !== 0 )

Spacing +49 added lines, -49 removed lines

@@ -2,16 +2,16 @@ 
 /**
  * Ajax Requests
  */
-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( isset( $_REQUEST[$cm->get('request_key')]['ajax'] ) )
+if (isset($_REQUEST[$cm->get('request_key')]['ajax']))
 {
     $_data  = $_REQUEST[$cm->get('request_key')];
     $output = '';
     $task   = $_data['task'];
-    switch( $task )
+    switch ($task)
     {
         /**
          * get categories
@@ -19,19 +19,19 @@ 
         case 'categorize_load_elements':
             $elements = $_data['elements'];
 
-            if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) )
+            if ($uncategorized_elements = $cm->getAssignedElements(0, $_data['elements']))
             {
                $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
             }
 
-            foreach( $cm->getCategories() as $category )
+            foreach ($cm->getCategories() as $category)
             {
-                $category['elements'] = $cm->getAssignedElements( $category['id'], $_data['elements'] );
+                $category['elements'] = $cm->getAssignedElements($category['id'], $_data['elements']);
                 $output .= $cm->renderView('chunks/categorize/category', $category);
             }
             break;
     }
-    exit( $output );
+    exit($output);
 }
 /**
  * Categorize elements
@@ -41,7 +41,7 @@ 
  * @see http://modxcms.com/forums/index.php/topic,40430.msg251476.html#msg251476
  *
  */
-if( isset( $_POST[$cm->get('request_key')]['categorize']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['categorize']['submit']))
 {
     $_data = $_POST[$cm->get('request_key')]['categorize'];
     $_changes = 0;
@@ -54,15 +54,15 @@ 
         'categorize'
     );
 
-    if( !isset( $_data['elements'] ) )
+    if (!isset($_data['elements']))
     {
-        $cm->addMessage( $cm->txt('cm_unknown_error'), 'categorize' );
+        $cm->addMessage($cm->txt('cm_unknown_error'), 'categorize');
         return;
     }
 
-    foreach( $_data['elements'] as $element_id => $data )
+    foreach ($_data['elements'] as $element_id => $data)
     {
-        if( $cm->updateElement( $_data['elementsgroup'], $element_id, $data['category_id'] ) )
+        if ($cm->updateElement($_data['elementsgroup'], $element_id, $data['category_id']))
         {
             $cm->addMessage(
                 sprintf(
@@ -78,9 +78,9 @@ 
         }
     }
 
-    if( $_changes === 0 )
+    if ($_changes === 0)
     {
-        $cm->addMessage( $cm->txt('cm_no_categorization'), 'categorize' );
+        $cm->addMessage($cm->txt('cm_no_categorization'), 'categorize');
         return;
     }
     else
@@ -98,29 +98,29 @@ 
 /**
  * Add a new category
  */
-if( isset( $_POST[$cm->get('request_key')]['add']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['add']['submit']))
 {
     $_data    = $_POST[$cm->get('request_key')]['add']['data'];
-    $category = trim( html_entity_decode($_data['name']) );
+    $category = trim(html_entity_decode($_data['name']));
     $rank     = (int) $_data['rank'];
 
-    if( empty( $category ) )
+    if (empty($category))
     {
-       $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
+       $cm->addMessage($cm->txt('cm_enter_name_for_category'), 'add');
        return;
     }
 
-    if( $cm->isCategoryExists( $category ) )
+    if ($cm->isCategoryExists($category))
     {
-       $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
+       $cm->addMessage(sprintf($cm->txt('cm_category_x_exists'), $category), 'add');
        return;
     }
 
-    if( $cm->addCategory( $category, $rank ) !== 0 )
+    if ($cm->addCategory($category, $rank) !== 0)
     {
         $cm->addMessage(
             sprintf(
-                $cm->txt( 'cm_category_x_saved_at_position_y' ),
+                $cm->txt('cm_category_x_saved_at_position_y'),
                 $category,
                 $rank
             ),
@@ -129,26 +129,26 @@ 
     }
     else
     {
-        $cm->addMessage( $cm->txt('cm_unknown_error'), 'add' );
+        $cm->addMessage($cm->txt('cm_unknown_error'), 'add');
     }
 }
 
 /**
  * Sort categories
  */
-if( isset( $_POST[$cm->get('request_key')]['sort']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['sort']['submit']))
 {
     $categories = $_POST[$cm->get('request_key')]['sort']['data'];
     $_changes   = 0;
 
-    foreach( $categories as $category_id => $_data  )
+    foreach ($categories as $category_id => $_data)
     {
         $data = array(
-            'category' => urldecode( $_data['category'] ),
+            'category' => urldecode($_data['category']),
             'rank'     => $_data['rank']
         );
 
-        if( $cm->updateCategory( $category_id, $data ) )
+        if ($cm->updateCategory($category_id, $data))
         {
             $cm->addMessage(
                 sprintf(
@@ -162,9 +162,9 @@ 
         }
     }
 
-    if( $_changes === 0 )
+    if ($_changes === 0)
     {
-        $cm->addMessage( $cm->txt( 'cm_no_changes' ), 'sort');
+        $cm->addMessage($cm->txt('cm_no_changes'), 'sort');
     }
     else
     {
@@ -181,21 +181,21 @@ 
 /**
  * Edit categories
  */
-if( isset( $_POST[$cm->get('request_key')]['edit']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['edit']['submit']))
 {
     $categories = $_POST[$cm->get('request_key')]['edit']['data'];
     $_changes   = 0;
 
-    foreach( $categories as $category_id => $_data  )
+    foreach ($categories as $category_id => $_data)
     {
-        if( isset( $_data['delete'] ) )
+        if (isset($_data['delete']))
         {
-            if( $cm->deleteCategory( $category_id ) )
+            if ($cm->deleteCategory($category_id))
             {
                 $cm->addMessage(
                     sprintf(
                         $cm->txt('cm_category_x_deleted'),
-                        urldecode( $_data['origin'] )
+                        urldecode($_data['origin'])
                     ),
                     'edit'
                 );
@@ -205,16 +205,16 @@ 
         }
 
         $data = array(
-            'category' => trim( html_entity_decode( $_data['category'] ) ),
+            'category' => trim(html_entity_decode($_data['category'])),
             'rank'     => $_data['rank']
         );
 
-        if( $cm->updateCategory( $category_id, $data ) )
+        if ($cm->updateCategory($category_id, $data))
         {
             $cm->addMessage(
                 sprintf(
                     $cm->txt('cm_category_x_renamed_to_y'),
-                    urldecode( $_data['origin'] ),
+                    urldecode($_data['origin']),
                     $data['category']
                 ),
                 'edit'
@@ -223,26 +223,26 @@ 
         }
     }
 
-    if( $_changes === 0 )
+    if ($_changes === 0)
     {
-        $cm->addMessage( $cm->txt( 'cm_no_changes' ), 'edit');
+        $cm->addMessage($cm->txt('cm_no_changes'), 'edit');
     }
 }
 
 /**
  * Delete singel category by $_GET
  */
-if( isset( $_GET[$cm->get('request_key')]['delete'] )
-    && !empty( $_GET[$cm->get('request_key')]['delete'] ) )
+if (isset($_GET[$cm->get('request_key')]['delete'])
+    && !empty($_GET[$cm->get('request_key')]['delete']))
 {
-    $category_id = (int)$_GET[$cm->get('request_key')]['delete'];
+    $category_id = (int) $_GET[$cm->get('request_key')]['delete'];
 
-    if( $cm->deleteCategory( $category_id ) )
+    if ($cm->deleteCategory($category_id))
     {
         $cm->addMessage(
             sprintf(
                 $cm->txt('cm_category_x_deleted'),
-                urldecode( $_GET[$cm->get('request_key')]['category'] )
+                urldecode($_GET[$cm->get('request_key')]['category'])
             ),
             'edit'
         );
@@ -251,15 +251,15 @@ 
 /**
  * Translate phrases
  */
-if( isset( $_POST[$cm->get('request_key')]['translate']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['translate']['submit']))
 {
     $translations = $_POST[$cm->get('request_key')]['translate']['data'];
 
-    foreach( $translations as $native_phrase => $translation )
+    foreach ($translations as $native_phrase => $translation)
     {
-        $native_phrase = urldecode( $native_phrase );
+        $native_phrase = urldecode($native_phrase);
 
-        if( empty( $translation ) )
+        if (empty($translation))
         {
             $translation = $native_phrase;
 
@@ -272,7 +272,7 @@ 
             );
         }
 
-        $cm->c('Translator')->addTranslation( $native_phrase, $translation, 'phrase' );
+        $cm->c('Translator')->addTranslation($native_phrase, $translation, 'phrase');
 
         $cm->addMessage(
             sprintf(

Braces +31 added lines, -65 removed lines

@@ -6,26 +6,22 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-if( isset( $_REQUEST[$cm->get('request_key')]['ajax'] ) )
-{
+if( isset( $_REQUEST[$cm->get('request_key')]['ajax'] ) ) {
     $_data  = $_REQUEST[$cm->get('request_key')];
     $output = '';
     $task   = $_data['task'];
-    switch( $task )
-    {
+    switch( $task ) {
         /**
          * get categories
          */
         case 'categorize_load_elements':
             $elements = $_data['elements'];
 
-            if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) )
-            {
+            if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) ) {
                $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
             }
 
-            foreach( $cm->getCategories() as $category )
-            {
+            foreach( $cm->getCategories() as $category ) {
                 $category['elements'] = $cm->getAssignedElements( $category['id'], $_data['elements'] );
                 $output .= $cm->renderView('chunks/categorize/category', $category);
             }
@@ -41,8 +37,7 @@ 
  * @see http://modxcms.com/forums/index.php/topic,40430.msg251476.html#msg251476
  *
  */
-if( isset( $_POST[$cm->get('request_key')]['categorize']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['categorize']['submit'] ) ) {
     $_data = $_POST[$cm->get('request_key')]['categorize'];
     $_changes = 0;
 
@@ -54,16 +49,13 @@ 
         'categorize'
     );
 
-    if( !isset( $_data['elements'] ) )
-    {
+    if( !isset( $_data['elements'] ) ) {
         $cm->addMessage( $cm->txt('cm_unknown_error'), 'categorize' );
         return;
     }
 
-    foreach( $_data['elements'] as $element_id => $data )
-    {
-        if( $cm->updateElement( $_data['elementsgroup'], $element_id, $data['category_id'] ) )
-        {
+    foreach( $_data['elements'] as $element_id => $data ) {
+        if( $cm->updateElement( $_data['elementsgroup'], $element_id, $data['category_id'] ) ) {
             $cm->addMessage(
                 sprintf(
                     $cm->txt('cm_x_assigned_to_category_y'),
@@ -78,13 +70,10 @@ 
         }
     }
 
-    if( $_changes === 0 )
-    {
+    if( $_changes === 0 ) {
         $cm->addMessage( $cm->txt('cm_no_categorization'), 'categorize' );
         return;
-    }
-    else
-    {
+    } else {
         $cm->addMessage(
             sprintf(
                 $cm->txt('cm_x_changes_made'),
@@ -98,26 +87,22 @@ 
 /**
  * Add a new category
  */
-if( isset( $_POST[$cm->get('request_key')]['add']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['add']['submit'] ) ) {
     $_data    = $_POST[$cm->get('request_key')]['add']['data'];
     $category = trim( html_entity_decode($_data['name']) );
     $rank     = (int) $_data['rank'];
 
-    if( empty( $category ) )
-    {
+    if( empty( $category ) ) {
        $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
        return;
     }
 
-    if( $cm->isCategoryExists( $category ) )
-    {
+    if( $cm->isCategoryExists( $category ) ) {
        $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
        return;
     }
 
-    if( $cm->addCategory( $category, $rank ) !== 0 )
-    {
+    if( $cm->addCategory( $category, $rank ) !== 0 ) {
         $cm->addMessage(
             sprintf(
                 $cm->txt( 'cm_category_x_saved_at_position_y' ),
@@ -126,9 +111,7 @@ 
             ),
             'add'
         );
-    }
-    else
-    {
+    } else {
         $cm->addMessage( $cm->txt('cm_unknown_error'), 'add' );
     }
 }
@@ -136,20 +119,17 @@ 
 /**
  * Sort categories
  */
-if( isset( $_POST[$cm->get('request_key')]['sort']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['sort']['submit'] ) ) {
     $categories = $_POST[$cm->get('request_key')]['sort']['data'];
     $_changes   = 0;
 
-    foreach( $categories as $category_id => $_data  )
-    {
+    foreach( $categories as $category_id => $_data  ) {
         $data = array(
             'category' => urldecode( $_data['category'] ),
             'rank'     => $_data['rank']
         );
 
-        if( $cm->updateCategory( $category_id, $data ) )
-        {
+        if( $cm->updateCategory( $category_id, $data ) ) {
             $cm->addMessage(
                 sprintf(
                     $cm->txt('cm_category_x_moved_to_position_y'),
@@ -162,12 +142,9 @@ 
         }
     }
 
-    if( $_changes === 0 )
-    {
+    if( $_changes === 0 ) {
         $cm->addMessage( $cm->txt( 'cm_no_changes' ), 'sort');
-    }
-    else
-    {
+    } else {
         $cm->addMessage(
             sprintf(
                 $cm->txt('cm_x_changes_made'),
@@ -181,17 +158,13 @@ 
 /**
  * Edit categories
  */
-if( isset( $_POST[$cm->get('request_key')]['edit']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['edit']['submit'] ) ) {
     $categories = $_POST[$cm->get('request_key')]['edit']['data'];
     $_changes   = 0;
 
-    foreach( $categories as $category_id => $_data  )
-    {
-        if( isset( $_data['delete'] ) )
-        {
-            if( $cm->deleteCategory( $category_id ) )
-            {
+    foreach( $categories as $category_id => $_data  ) {
+        if( isset( $_data['delete'] ) ) {
+            if( $cm->deleteCategory( $category_id ) ) {
                 $cm->addMessage(
                     sprintf(
                         $cm->txt('cm_category_x_deleted'),
@@ -209,8 +182,7 @@ 
             'rank'     => $_data['rank']
         );
 
-        if( $cm->updateCategory( $category_id, $data ) )
-        {
+        if( $cm->updateCategory( $category_id, $data ) ) {
             $cm->addMessage(
                 sprintf(
                     $cm->txt('cm_category_x_renamed_to_y'),
@@ -223,8 +195,7 @@ 
         }
     }
 
-    if( $_changes === 0 )
-    {
+    if( $_changes === 0 ) {
         $cm->addMessage( $cm->txt( 'cm_no_changes' ), 'edit');
     }
 }
@@ -233,12 +204,10 @@ 
  * Delete singel category by $_GET
  */
 if( isset( $_GET[$cm->get('request_key')]['delete'] )
-    && !empty( $_GET[$cm->get('request_key')]['delete'] ) )
-{
+    && !empty( $_GET[$cm->get('request_key')]['delete'] ) ) {
     $category_id = (int)$_GET[$cm->get('request_key')]['delete'];
 
-    if( $cm->deleteCategory( $category_id ) )
-    {
+    if( $cm->deleteCategory( $category_id ) ) {
         $cm->addMessage(
             sprintf(
                 $cm->txt('cm_category_x_deleted'),
@@ -251,16 +220,13 @@ 
 /**
  * Translate phrases
  */
-if( isset( $_POST[$cm->get('request_key')]['translate']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['translate']['submit'] ) ) {
     $translations = $_POST[$cm->get('request_key')]['translate']['data'];
 
-    foreach( $translations as $native_phrase => $translation )
-    {
+    foreach( $translations as $native_phrase => $translation ) {
         $native_phrase = urldecode( $native_phrase );
 
-        if( empty( $translation ) )
-        {
+        if( empty( $translation ) ) {
             $translation = $native_phrase;
 
             $cm->addMessage(

manager/actions/eventlog_details.dynamic.php

Indentation +14 added lines, -14 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('view_eventlog')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // get id
@@ -41,18 +41,18 @@ 
 	<div class="tab-page">
 		<div class="container container-body">
 			<?php
-			$date = $modx->toDateFormat($content["createdon"]);
-			if($content["type"] == 1) {
-				$icon = $_style['actions_info'] . ' text-info';
-				$msgtype = $_lang["information"];
-			} else if($content["type"] == 2) {
-				$icon = $_style['actions_triangle'] . ' text-warning';
-				$msgtype = $_lang["warning"];
-			} else if($content["type"] == 3) {
-				$icon = $_style['actions_error'] . ' text-danger';
-				$msgtype = $_lang["error"];
-			}
-			?>
+            $date = $modx->toDateFormat($content["createdon"]);
+            if($content["type"] == 1) {
+                $icon = $_style['actions_info'] . ' text-info';
+                $msgtype = $_lang["information"];
+            } else if($content["type"] == 2) {
+                $icon = $_style['actions_triangle'] . ' text-warning';
+                $msgtype = $_lang["warning"];
+            } else if($content["type"] == 3) {
+                $icon = $_style['actions_error'] . ' text-danger';
+                $msgtype = $_lang["error"];
+            }
+            ?>
 			<p><b><?= $content['source'] . " - " . $_lang['eventlog_viewer'] ?></b></p>
 			<p>
 				<i class="<?= $icon ?>"></i> <?= $msgtype ?>

Spacing +13 added lines, -13 removed lines

@@ -1,17 +1,17 @@ 
 <?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('view_eventlog')) {
+if (!$modx->hasPermission('view_eventlog')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // get id
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
-$ds = $modx->db->select('el.*, IFNULL(wu.username,mu.username) as username', $modx->getFullTableName("event_log") . " el 
-		LEFT JOIN " . $modx->getFullTableName("manager_users") . " mu ON mu.id=el.user AND el.usertype=0
-		LEFT JOIN " . $modx->getFullTableName("web_users") . " wu ON wu.id=el.user AND el.usertype=1", "el.id='{$id}'");
+$ds = $modx->db->select('el.*, IFNULL(wu.username,mu.username) as username', $modx->getFullTableName("event_log")." el 
+		LEFT JOIN " . $modx->getFullTableName("manager_users")." mu ON mu.id=el.user AND el.usertype=0
+		LEFT JOIN " . $modx->getFullTableName("web_users")." wu ON wu.id=el.user AND el.usertype=1", "el.id='{$id}'");
 $content = $modx->db->getRow($ds);
 
 ?>
@@ -42,18 +42,18 @@ 
 		<div class="container container-body">
 			<?php
 			$date = $modx->toDateFormat($content["createdon"]);
-			if($content["type"] == 1) {
-				$icon = $_style['actions_info'] . ' text-info';
+			if ($content["type"] == 1) {
+				$icon = $_style['actions_info'].' text-info';
 				$msgtype = $_lang["information"];
-			} else if($content["type"] == 2) {
-				$icon = $_style['actions_triangle'] . ' text-warning';
+			} else if ($content["type"] == 2) {
+				$icon = $_style['actions_triangle'].' text-warning';
 				$msgtype = $_lang["warning"];
-			} else if($content["type"] == 3) {
-				$icon = $_style['actions_error'] . ' text-danger';
+			} else if ($content["type"] == 3) {
+				$icon = $_style['actions_error'].' text-danger';
 				$msgtype = $_lang["error"];
 			}
 			?>
-			<p><b><?= $content['source'] . " - " . $_lang['eventlog_viewer'] ?></b></p>
+			<p><b><?= $content['source']." - ".$_lang['eventlog_viewer'] ?></b></p>
 			<p>
 				<i class="<?= $icon ?>"></i> <?= $msgtype ?>
 			</p>

manager/includes/footer.inc.php

Indentation +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <?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.");
 }
 global $SystemAlertMsgQueque;
 // display system alert window if messages are available
 if(count($SystemAlertMsgQueque) > 0) {
-	include "sysalert.display.inc.php";
+    include "sysalert.display.inc.php";
 }
 ?>
 <script type='text/javascript'>
@@ -19,17 +19,17 @@ 
 </script>
 <?php
 if(in_array($modx->manager->action, array(
-	85,
-	27,
-	4,
-	72,
-	13,
-	11,
-	12,
-	87,
-	88
+    85,
+    27,
+    4,
+    72,
+    13,
+    11,
+    12,
+    87,
+    88
 ))) {
-	echo $modx->manager->loadDatePicker($modx->config['mgr_date_picker_path']);
+    echo $modx->manager->loadDatePicker($modx->config['mgr_date_picker_path']);
 }
 ?>
 </body>

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@ 
 <?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.");
 }
 global $SystemAlertMsgQueque;
 // display system alert window if messages are available
-if(count($SystemAlertMsgQueque) > 0) {
+if (count($SystemAlertMsgQueque) > 0) {
 	include "sysalert.display.inc.php";
 }
 ?>
@@ -18,7 +18,7 @@ 
 	});
 </script>
 <?php
-if(in_array($modx->manager->action, array(
+if (in_array($modx->manager->action, array(
 	85,
 	27,
 	4,

manager/processors/export_site.processor.php

Indentation +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('export_static')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $maxtime = (is_numeric($_POST['maxtime'])) ? $_POST['maxtime'] : 30;
@@ -17,11 +17,11 @@ 
 $modx->export->targetDir = $export_dir;
 
 if(strpos($modx->config['base_path'],"{$export_dir}/")===0 && 0 <= strlen(str_replace("{$export_dir}/",'',$modx->config['base_path'])))
-	return $_lang['export_site.static.php6'];
+    return $_lang['export_site.static.php6'];
 elseif($modx->config['rb_base_dir'] === $export_dir . '/')
-	return $modx->parsePlaceholder($_lang['export_site.static.php7'],'rb_base_url=' . $modx->config['base_url'] . $modx->config['rb_base_url']);
+    return $modx->parsePlaceholder($_lang['export_site.static.php7'],'rb_base_url=' . $modx->config['base_url'] . $modx->config['rb_base_url']);
 elseif(!is_writable($export_dir))
-	return $_lang['export_site_target_unwritable'];
+    return $_lang['export_site_target_unwritable'];
 
 $modx->export->generate_mode = $_POST['generate_mode'];
 
@@ -37,7 +37,7 @@ 
  ||$includenoncache!==$_POST['includenoncache']
  ||$repl_before!==$_POST['repl_before']
  ||$repl_after !==$_POST['repl_after']) {
-	$modx->clearCache('full');
+    $modx->clearCache('full');
 }
 
 $total = $modx->export->getTotal($_POST['ignore_ids'], $modx->config['export_includenoncache']);

Spacing +13 added lines, -13 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('export_static')) {
+if (!$modx->hasPermission('export_static')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -12,15 +12,15 @@ 
 $modx->loadExtension('EXPORT_SITE');
 
 
-if(is_dir(MODX_BASE_PATH . 'temp'))       $export_dir = MODX_BASE_PATH . 'temp/export';
-elseif(is_dir(MODX_BASE_PATH . 'assets')) $export_dir = MODX_BASE_PATH . 'assets/export';
+if (is_dir(MODX_BASE_PATH.'temp'))       $export_dir = MODX_BASE_PATH.'temp/export';
+elseif (is_dir(MODX_BASE_PATH.'assets')) $export_dir = MODX_BASE_PATH.'assets/export';
 $modx->export->targetDir = $export_dir;
 
-if(strpos($modx->config['base_path'],"{$export_dir}/")===0 && 0 <= strlen(str_replace("{$export_dir}/",'',$modx->config['base_path'])))
+if (strpos($modx->config['base_path'], "{$export_dir}/") === 0 && 0 <= strlen(str_replace("{$export_dir}/", '', $modx->config['base_path'])))
 	return $_lang['export_site.static.php6'];
-elseif($modx->config['rb_base_dir'] === $export_dir . '/')
-	return $modx->parsePlaceholder($_lang['export_site.static.php7'],'rb_base_url=' . $modx->config['base_url'] . $modx->config['rb_base_url']);
-elseif(!is_writable($export_dir))
+elseif ($modx->config['rb_base_dir'] === $export_dir.'/')
+	return $modx->parsePlaceholder($_lang['export_site.static.php7'], 'rb_base_url='.$modx->config['base_url'].$modx->config['rb_base_url']);
+elseif (!is_writable($export_dir))
 	return $_lang['export_site_target_unwritable'];
 
 $modx->export->generate_mode = $_POST['generate_mode'];
@@ -33,10 +33,10 @@ 
 $repl_after      = $_POST['repl_after'];
 $includenoncache = $_POST['includenoncache'];
 
-if($ignore_ids!==$_POST['ignore_ids']
- ||$includenoncache!==$_POST['includenoncache']
- ||$repl_before!==$_POST['repl_before']
- ||$repl_after !==$_POST['repl_after']) {
+if ($ignore_ids !== $_POST['ignore_ids']
+ ||$includenoncache !== $_POST['includenoncache']
+ ||$repl_before !== $_POST['repl_before']
+ ||$repl_after !== $_POST['repl_after']) {
 	$modx->clearCache('full');
 }
 
@@ -52,5 +52,5 @@ 
 
 $exportend = $modx->export->get_mtime();
 $totaltime = ($exportend - $modx->export->exportstart);
-$output .= sprintf ('<p>'.$_lang["export_site_time"].'</p>', round($totaltime, 3));
+$output .= sprintf('<p>'.$_lang["export_site_time"].'</p>', round($totaltime, 3));
 return $output;

Braces +9 added lines, -5 removed lines

@@ -12,16 +12,20 @@
 $modx->loadExtension('EXPORT_SITE');
 
 
-if(is_dir(MODX_BASE_PATH . 'temp'))       $export_dir = MODX_BASE_PATH . 'temp/export';
-elseif(is_dir(MODX_BASE_PATH . 'assets')) $export_dir = MODX_BASE_PATH . 'assets/export';
+if(is_dir(MODX_BASE_PATH . 'temp')) {
+    $export_dir = MODX_BASE_PATH . 'temp/export';
+} elseif(is_dir(MODX_BASE_PATH . 'assets')) {
+    $export_dir = MODX_BASE_PATH . 'assets/export';
+}
 $modx->export->targetDir = $export_dir;
 
-if(strpos($modx->config['base_path'],"{$export_dir}/")===0 && 0 <= strlen(str_replace("{$export_dir}/",'',$modx->config['base_path'])))
+if(strpos($modx->config['base_path'],"{$export_dir}/")===0 && 0 <= strlen(str_replace("{$export_dir}/",'',$modx->config['base_path']))) {
 	return $_lang['export_site.static.php6'];
-elseif($modx->config['rb_base_dir'] === $export_dir . '/')
+} elseif($modx->config['rb_base_dir'] === $export_dir . '/') {
 	return $modx->parsePlaceholder($_lang['export_site.static.php7'],'rb_base_url=' . $modx->config['base_url'] . $modx->config['rb_base_url']);
-elseif(!is_writable($export_dir))
+} elseif(!is_writable($export_dir)) {
 	return $_lang['export_site_target_unwritable'];
+}
 
 $modx->export->generate_mode = $_POST['generate_mode'];
 

manager/processors/duplicate_plugin.processor.php

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_plugins'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_plugins'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate Plugin
 $newid = $modx->db->insert(

Indentation +18 added lines, -18 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_plugin')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -19,25 +19,25 @@ 
 
 // duplicate Plugin
 $newid = $modx->db->insert(
-	array(
-		'name'=>'',
-		'description'=>'',
-		'disabled'=>'',
-		'moduleguid'=>'',
-		'plugincode'=>'',
-		'properties'=>'',
-		'category'=>'',
-		), $modx->getFullTableName('site_plugins'), // Insert into
-	"CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, moduleguid, plugincode, properties, category", $modx->getFullTableName('site_plugins'), "id='{$id}'"); // Copy from
+    array(
+        'name'=>'',
+        'description'=>'',
+        'disabled'=>'',
+        'moduleguid'=>'',
+        'plugincode'=>'',
+        'properties'=>'',
+        'category'=>'',
+        ), $modx->getFullTableName('site_plugins'), // Insert into
+    "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, moduleguid, plugincode, properties, category", $modx->getFullTableName('site_plugins'), "id='{$id}'"); // Copy from
 
 // duplicate Plugin Event Listeners
 $modx->db->insert(
-	array(
-		'pluginid'=>'',
-		'evtid'=>'',
-		'priority'=>'',
-		), $modx->getFullTableName('site_plugin_events'), // Insert into
-	"'{$newid}', evtid, priority", $modx->getFullTableName('site_plugin_events'), "pluginid='{$id}'"); // Copy from
+    array(
+        'pluginid'=>'',
+        'evtid'=>'',
+        'priority'=>'',
+        ), $modx->getFullTableName('site_plugin_events'), // Insert into
+    "'{$newid}', evtid, priority", $modx->getFullTableName('site_plugin_events'), "pluginid='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_plugins'), "id='{$newid}'"));

Spacing +6 added lines, -6 removed lines

@@ -1,20 +1,20 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('new_plugin')) {
+if (!$modx->hasPermission('new_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"]);
 }
 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_plugins'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_plugins'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate Plugin
@@ -44,5 +44,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new plugin
-$header="Location: index.php?r=2&a=102&id=$newid";
+$header = "Location: index.php?r=2&a=102&id=$newid";
 header($header);

manager/processors/duplicate_tmplvars.processor.php

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate TV
 $newid = $modx->db->insert(

Indentation +26 added lines, -26 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_template')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
@@ -19,37 +19,37 @@ 
 
 // duplicate TV
 $newid = $modx->db->insert(
-	array(
-		'type'=>'',
-		'name'=>'',
-		'caption'=>'',
-		'description'=>'',
-		'default_text'=>'',
-		'elements'=>'',
-		'rank'=>'',
-		'display'=>'',
-		'display_params'=>'',
-		'category'=>'',
-		), $modx->getFullTableName('site_tmplvars'), // Insert into
-	"type, CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, CONCAT(caption, ' Duplicate{$count}') AS caption, description, default_text, elements, rank, display, display_params, category", $modx->getFullTableName('site_tmplvars'), "id='{$id}'"); // Copy from
+    array(
+        'type'=>'',
+        'name'=>'',
+        'caption'=>'',
+        'description'=>'',
+        'default_text'=>'',
+        'elements'=>'',
+        'rank'=>'',
+        'display'=>'',
+        'display_params'=>'',
+        'category'=>'',
+        ), $modx->getFullTableName('site_tmplvars'), // Insert into
+    "type, CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, CONCAT(caption, ' Duplicate{$count}') AS caption, description, default_text, elements, rank, display, display_params, category", $modx->getFullTableName('site_tmplvars'), "id='{$id}'"); // Copy from
 
 
 // duplicate TV Template Access Permissions
 $modx->db->insert(
-	array(
-		'tmplvarid'=>'',
-		'templateid'=>'',
-		'rank'=>'',
-		), $modx->getFullTableName('site_tmplvar_templates'), // Insert into
-	"'{$newid}', templateid, rank", $modx->getFullTableName('site_tmplvar_templates'), "tmplvarid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'templateid'=>'',
+        'rank'=>'',
+        ), $modx->getFullTableName('site_tmplvar_templates'), // Insert into
+    "'{$newid}', templateid, rank", $modx->getFullTableName('site_tmplvar_templates'), "tmplvarid='{$id}'"); // Copy from
 
 // duplicate TV Access Permissions
 $modx->db->insert(
-	array(
-		'tmplvarid'=>'',
-		'documentgroup'=>'',
-		), $modx->getFullTableName('site_tmplvar_access'), // Insert into
-	"'{$newid}', documentgroup", $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); // Copy from
+    array(
+        'tmplvarid'=>'',
+        'documentgroup'=>'',
+        ), $modx->getFullTableName('site_tmplvar_access'), // Insert into
+    "'{$newid}', documentgroup", $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "id='{$newid}'"));

Spacing +6 added lines, -6 removed lines

@@ -1,20 +1,20 @@ 
 <?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_template')) {
+if (!$modx->hasPermission('edit_template')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_tmplvars'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
+if ($count >= 1) $count = ' '.($count + 1);
 else $count = '';
 
 // duplicate TV
@@ -56,5 +56,5 @@ 
 $_SESSION['itemname'] = $name;
 
 // finish duplicating - redirect to new variable
-$header="Location: index.php?r=2&a=301&id=$newid";
+$header = "Location: index.php?r=2&a=301&id=$newid";
 header($header);

manager/processors/remove_locks.processor.php

Braces +3 added lines, -1 removed lines

@@ -4,7 +4,9 @@
 }
 
 if(!isset($_GET['id'])) {
-	if(!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+	if(!$modx->hasPermission('remove_locks')) {
+	    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+	}
 
 	// Remove all locks
 	$modx->db->truncate($modx->getFullTableName('active_user_locks'));

Indentation +16 added lines, -16 removed lines

@@ -4,23 +4,23 @@
 }
 
 if(!isset($_GET['id'])) {
-	if(!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    if(!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 
-	// Remove all locks
-	$modx->db->truncate($modx->getFullTableName('active_user_locks'));
+    // Remove all locks
+    $modx->db->truncate($modx->getFullTableName('active_user_locks'));
 
-	$header = "Location: index.php?a=2";
-	header($header);
+    $header = "Location: index.php?a=2";
+    header($header);
 } else {
-	// Remove single locks via AJAX / window.onbeforeunload
-	$type = (int)$_GET['type'];
-	$id = (int)$_GET['id'];
-	$includeAllUsers = $modx->hasPermission('remove_locks'); // Enables usage of "unlock"-ajax-button
-	if($type && $id) {
-		$modx->unlockElement($type, $id, $includeAllUsers);
-		echo '1';
-		exit;
-	} else {
-		echo 'No type or id sent with request.';
-	}
+    // Remove single locks via AJAX / window.onbeforeunload
+    $type = (int)$_GET['type'];
+    $id = (int)$_GET['id'];
+    $includeAllUsers = $modx->hasPermission('remove_locks'); // Enables usage of "unlock"-ajax-button
+    if($type && $id) {
+        $modx->unlockElement($type, $id, $includeAllUsers);
+        echo '1';
+        exit;
+    } else {
+        echo 'No type or id sent with request.';
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@ 
 <?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(!isset($_GET['id'])) {
-	if(!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+if (!isset($_GET['id'])) {
+	if (!$modx->hasPermission('remove_locks')) $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 
 	// Remove all locks
 	$modx->db->truncate($modx->getFullTableName('active_user_locks'));
@@ -13,10 +13,10 @@ 
 	header($header);
 } else {
 	// Remove single locks via AJAX / window.onbeforeunload
-	$type = (int)$_GET['type'];
-	$id = (int)$_GET['id'];
+	$type = (int) $_GET['type'];
+	$id = (int) $_GET['id'];
 	$includeAllUsers = $modx->hasPermission('remove_locks'); // Enables usage of "unlock"-ajax-button
-	if($type && $id) {
+	if ($type && $id) {
 		$modx->unlockElement($type, $id, $includeAllUsers);
 		echo '1';
 		exit;

manager/processors/web_access_groups.processor.php

Braces +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 }
 
 // secure web documents - flag as private
-if($updategroupaccess==true){
+if($updategroupaccess==true) {
 	include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
 	secureWebDocument();
 

Indentation +95 added lines, -95 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('web_access_permissions')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // web access group processor.
@@ -20,111 +20,111 @@ 
 $operation = $_REQUEST['operation'];
 
 switch ($operation) {
-	case "add_user_group" :
-		$newgroup = $_REQUEST['newusergroup'];
-		if(empty($newgroup)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		} else {
-			$id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_webgroup_names);
+    case "add_user_group" :
+        $newgroup = $_REQUEST['newusergroup'];
+        if(empty($newgroup)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        } else {
+            $id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_webgroup_names);
 
-			// invoke OnWebCreateGroup event
-			$modx->invokeEvent('OnWebCreateGroup', array(
-				'groupid'   => $id,
-				'groupname' => $newgroup,
-			));
-		}
-	break;
-	case "add_document_group" :
-		$newgroup = $_REQUEST['newdocgroup'];
-		if(empty($newgroup)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		} else {
-			$id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_documentgroup_names);
+            // invoke OnWebCreateGroup event
+            $modx->invokeEvent('OnWebCreateGroup', array(
+                'groupid'   => $id,
+                'groupname' => $newgroup,
+            ));
+        }
+    break;
+    case "add_document_group" :
+        $newgroup = $_REQUEST['newdocgroup'];
+        if(empty($newgroup)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        } else {
+            $id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_documentgroup_names);
 
-			// invoke OnCreateDocGroup event
-			$modx->invokeEvent('OnCreateDocGroup', array(
-				'groupid'   => $id,
-				'groupname' => $newgroup,
-			));
-		}
-	break;
-	case "delete_user_group" :
-		$updategroupaccess = true;
-		$usergroup = (int)$_REQUEST['usergroup'];
-		if(empty($usergroup)) {
-			$modx->webAlertAndQuit("No user group id specified for deletion.");
-		} else {
-			$modx->db->delete($tbl_webgroup_names, "id='{$usergroup}'");
+            // invoke OnCreateDocGroup event
+            $modx->invokeEvent('OnCreateDocGroup', array(
+                'groupid'   => $id,
+                'groupname' => $newgroup,
+            ));
+        }
+    break;
+    case "delete_user_group" :
+        $updategroupaccess = true;
+        $usergroup = (int)$_REQUEST['usergroup'];
+        if(empty($usergroup)) {
+            $modx->webAlertAndQuit("No user group id specified for deletion.");
+        } else {
+            $modx->db->delete($tbl_webgroup_names, "id='{$usergroup}'");
 
-			$modx->db->delete($tbl_webgroup_access, "webgroup='{$usergroup}'");
+            $modx->db->delete($tbl_webgroup_access, "webgroup='{$usergroup}'");
 
-			$modx->db->delete($tbl_web_groups, "webuser='{$usergroup}'");
-		}
-	break;
-	case "delete_document_group" :
-		$group = (int)$_REQUEST['documentgroup'];
-		if(empty($group)) {
-			$modx->webAlertAndQuit("No document group id specified for deletion.");
-		} else {
-			$modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
+            $modx->db->delete($tbl_web_groups, "webuser='{$usergroup}'");
+        }
+    break;
+    case "delete_document_group" :
+        $group = (int)$_REQUEST['documentgroup'];
+        if(empty($group)) {
+            $modx->webAlertAndQuit("No document group id specified for deletion.");
+        } else {
+            $modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
 
-			$modx->db->delete($tbl_webgroup_access, "documentgroup='{$group}'");
+            $modx->db->delete($tbl_webgroup_access, "documentgroup='{$group}'");
 
-			$modx->db->delete($tbl_document_groups, "document_group='{$group}'");
-		}
-	break;
-	case "rename_user_group" :
-		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		}
-		$groupid = (int)$_REQUEST['groupid'];
-		if(empty($groupid)) {
-			$modx->webAlertAndQuit("No user group id specified for rename.");
-		}
-		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_webgroup_names, "id='{$groupid}'");
-	break;
-	case "rename_document_group" :
-		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
-			$modx->webAlertAndQuit("No group name specified.");
-		}
-		$groupid = (int)$_REQUEST['groupid'];
-		if(empty($groupid)) {
-			$modx->webAlertAndQuit("No document group id specified for rename.");
-		}
-		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'");
-	break;
-	case "add_document_group_to_user_group" :
-		$updategroupaccess = true;
-		$usergroup = (int)$_REQUEST['usergroup'];
-		$docgroup = (int)$_REQUEST['docgroup'];
-		$rs = $modx->db->select('COUNT(*)', $tbl_webgroup_access, "webgroup='{$usergroup}' AND documentgroup='{$docgroup}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit<=0) {
-			$modx->db->insert(array('webgroup'=>$usergroup, 'documentgroup'=>$docgroup), $tbl_webgroup_access);
-		} else {
-			//alert user that coupling already exists?
-		}
-	break;
-	case "remove_document_group_from_user_group" :
-		$updategroupaccess = true;
-		$coupling = (int)$_REQUEST['coupling'];
-		$modx->db->delete($tbl_webgroup_access, "id='{$coupling}'");
-	break;
-	default :
-		$modx->webAlertAndQuit("No operation set in request.");
+            $modx->db->delete($tbl_document_groups, "document_group='{$group}'");
+        }
+    break;
+    case "rename_user_group" :
+        $newgroupname = $_REQUEST['newgroupname'];
+        if(empty($newgroupname)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        }
+        $groupid = (int)$_REQUEST['groupid'];
+        if(empty($groupid)) {
+            $modx->webAlertAndQuit("No user group id specified for rename.");
+        }
+        $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_webgroup_names, "id='{$groupid}'");
+    break;
+    case "rename_document_group" :
+        $newgroupname = $_REQUEST['newgroupname'];
+        if(empty($newgroupname)) {
+            $modx->webAlertAndQuit("No group name specified.");
+        }
+        $groupid = (int)$_REQUEST['groupid'];
+        if(empty($groupid)) {
+            $modx->webAlertAndQuit("No document group id specified for rename.");
+        }
+        $modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'");
+    break;
+    case "add_document_group_to_user_group" :
+        $updategroupaccess = true;
+        $usergroup = (int)$_REQUEST['usergroup'];
+        $docgroup = (int)$_REQUEST['docgroup'];
+        $rs = $modx->db->select('COUNT(*)', $tbl_webgroup_access, "webgroup='{$usergroup}' AND documentgroup='{$docgroup}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit<=0) {
+            $modx->db->insert(array('webgroup'=>$usergroup, 'documentgroup'=>$docgroup), $tbl_webgroup_access);
+        } else {
+            //alert user that coupling already exists?
+        }
+    break;
+    case "remove_document_group_from_user_group" :
+        $updategroupaccess = true;
+        $coupling = (int)$_REQUEST['coupling'];
+        $modx->db->delete($tbl_webgroup_access, "id='{$coupling}'");
+    break;
+    default :
+        $modx->webAlertAndQuit("No operation set in request.");
 }
 
 // secure web documents - flag as private
 if($updategroupaccess==true){
-	include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
-	secureWebDocument();
+    include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
+    secureWebDocument();
 
-	// Update the private group column
-	$modx->db->update(
-		'dgn.private_webgroup = (wga.webgroup IS NOT NULL)',
-		"{$tbl_documentgroup_names} AS dgn LEFT JOIN {$tbl_webgroup_access} AS wga ON wga.documentgroup = dgn.id");
+    // Update the private group column
+    $modx->db->update(
+        'dgn.private_webgroup = (wga.webgroup IS NOT NULL)',
+        "{$tbl_documentgroup_names} AS dgn LEFT JOIN {$tbl_webgroup_access} AS wga ON wga.documentgroup = dgn.id");
 }
 
 $header = "Location: index.php?a=91";

Spacing +19 added lines, -19 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('web_access_permissions')) {
+if (!$modx->hasPermission('web_access_permissions')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -22,7 +22,7 @@ 
 switch ($operation) {
 	case "add_user_group" :
 		$newgroup = $_REQUEST['newusergroup'];
-		if(empty($newgroup)) {
+		if (empty($newgroup)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		} else {
 			$id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_webgroup_names);
@@ -36,7 +36,7 @@ 
 	break;
 	case "add_document_group" :
 		$newgroup = $_REQUEST['newdocgroup'];
-		if(empty($newgroup)) {
+		if (empty($newgroup)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		} else {
 			$id = $modx->db->insert(array('name'=>$modx->db->escape($newgroup)), $tbl_documentgroup_names);
@@ -50,8 +50,8 @@ 
 	break;
 	case "delete_user_group" :
 		$updategroupaccess = true;
-		$usergroup = (int)$_REQUEST['usergroup'];
-		if(empty($usergroup)) {
+		$usergroup = (int) $_REQUEST['usergroup'];
+		if (empty($usergroup)) {
 			$modx->webAlertAndQuit("No user group id specified for deletion.");
 		} else {
 			$modx->db->delete($tbl_webgroup_names, "id='{$usergroup}'");
@@ -62,8 +62,8 @@ 
 		}
 	break;
 	case "delete_document_group" :
-		$group = (int)$_REQUEST['documentgroup'];
-		if(empty($group)) {
+		$group = (int) $_REQUEST['documentgroup'];
+		if (empty($group)) {
 			$modx->webAlertAndQuit("No document group id specified for deletion.");
 		} else {
 			$modx->db->delete($tbl_documentgroup_names, "id='{$group}'");
@@ -75,33 +75,33 @@ 
 	break;
 	case "rename_user_group" :
 		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
+		if (empty($newgroupname)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		}
-		$groupid = (int)$_REQUEST['groupid'];
-		if(empty($groupid)) {
+		$groupid = (int) $_REQUEST['groupid'];
+		if (empty($groupid)) {
 			$modx->webAlertAndQuit("No user group id specified for rename.");
 		}
 		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_webgroup_names, "id='{$groupid}'");
 	break;
 	case "rename_document_group" :
 		$newgroupname = $_REQUEST['newgroupname'];
-		if(empty($newgroupname)) {
+		if (empty($newgroupname)) {
 			$modx->webAlertAndQuit("No group name specified.");
 		}
-		$groupid = (int)$_REQUEST['groupid'];
-		if(empty($groupid)) {
+		$groupid = (int) $_REQUEST['groupid'];
+		if (empty($groupid)) {
 			$modx->webAlertAndQuit("No document group id specified for rename.");
 		}
 		$modx->db->update(array('name' => $modx->db->escape($newgroupname)), $tbl_documentgroup_names, "id='{$groupid}'");
 	break;
 	case "add_document_group_to_user_group" :
 		$updategroupaccess = true;
-		$usergroup = (int)$_REQUEST['usergroup'];
-		$docgroup = (int)$_REQUEST['docgroup'];
+		$usergroup = (int) $_REQUEST['usergroup'];
+		$docgroup = (int) $_REQUEST['docgroup'];
 		$rs = $modx->db->select('COUNT(*)', $tbl_webgroup_access, "webgroup='{$usergroup}' AND documentgroup='{$docgroup}'");
 		$limit = $modx->db->getValue($rs);
-		if($limit<=0) {
+		if ($limit <= 0) {
 			$modx->db->insert(array('webgroup'=>$usergroup, 'documentgroup'=>$docgroup), $tbl_webgroup_access);
 		} else {
 			//alert user that coupling already exists?
@@ -109,7 +109,7 @@ 
 	break;
 	case "remove_document_group_from_user_group" :
 		$updategroupaccess = true;
-		$coupling = (int)$_REQUEST['coupling'];
+		$coupling = (int) $_REQUEST['coupling'];
 		$modx->db->delete($tbl_webgroup_access, "id='{$coupling}'");
 	break;
 	default :
@@ -117,7 +117,7 @@ 
 }
 
 // secure web documents - flag as private
-if($updategroupaccess==true){
+if ($updategroupaccess == true) {
 	include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
 	secureWebDocument();