Inspection of "return file back )" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( beaa53...e6bcf2 )

by Dmytro

created 2018-05-31 20:31 UTC

Status

Indentation +158 added lines, -158 removed lines patch added patch discarded remove patch

@@ -1,21 +1,21 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 // 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 @@  discard block
 block discarded – undo
 <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 @@  discard block
 block discarded – undo
 						<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 @@  discard block
 block discarded – undo
 								<?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 @@  discard block
 block discarded – undo
 						<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 @@  discard block
 block discarded – undo
 						<td><select name="manager_theme" class="inputBox" onChange="documentDirty=true;document.userform.theme_refresher.value = Date.parse(new Date());">
 								<option value=""></option>
 								<?php
-								$dir = dir("media/style/");
-								while($file = $dir->read()) {
-									if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
-										$themename = $file;
-										if($themename === 'common') {
-											continue;
-										}
-										$attr = 'value="' . $themename . '" ';
-										if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
-											$attr .= 'selected="selected" ';
-										}
-										echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";
-									}
-								}
-								$dir->close();
-								?>
+                                $dir = dir("media/style/");
+                                while($file = $dir->read()) {
+                                    if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
+                                        $themename = $file;
+                                        if($themename === 'common') {
+                                            continue;
+                                        }
+                                        $attr = 'value="' . $themename . '" ';
+                                        if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
+                                            $attr .= 'selected="selected" ';
+                                        }
+                                        echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";
+                                    }
+                                }
+                                $dir->close();
+                                ?>
 							</select>
 							<input type="hidden" name="theme_refresher" value=""></td>
 					</tr>
@@ -579,15 +579,15 @@  discard block
 block discarded – undo
 						<th><?php echo $_lang["which_browser_title"] ?></th>
 						<td><select name="which_browser" class="inputBox" onChange="documentDirty=true;">
 								<?php
-								$selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : '';
-								echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";
-								foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
-									$dir = str_replace('\\', '/', $dir);
-									$browser_name = substr($dir, strrpos($dir, '/') + 1);
-									$selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';
-									echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";
-								}
-								?>
+                                $selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : '';
+                                echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";
+                                foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
+                                    $dir = str_replace('\\', '/', $dir);
+                                    $browser_name = substr($dir, strrpos($dir, '/') + 1);
+                                    $selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';
+                                    echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";
+                                }
+                                ?>
 							</select></td>
 					</tr>
 					<tr>
@@ -664,17 +664,17 @@  discard block
 block discarded – undo
 								<option value=""></option>
 								<?php
 
-								$edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';
-								// invoke OnRichTextEditorRegister event
-								$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-								echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";
-								if(is_array($evtOut)) {
-									for($i = 0; $i < count($evtOut); $i++) {
-										$editor = $evtOut[$i];
-										echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";
-									}
-								}
-								?>
+                                $edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';
+                                // invoke OnRichTextEditorRegister event
+                                $evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
+                                echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";
+                                if(is_array($evtOut)) {
+                                    for($i = 0; $i < count($evtOut); $i++) {
+                                        $editor = $evtOut[$i];
+                                        echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";
+                                    }
+                                }
+                                ?>
 							</select></td>
 					</tr>
 					<tr id='editorRow1' style="display: <?php echo $use_editor == 1 ? $displayStyle : 'none'; ?>">
@@ -707,12 +707,12 @@  discard block
 block discarded – undo
 					</tr>
 				</table>
 				<?php
-				// invoke OnInterfaceSettingsRender event
-				$evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");
-				if(is_array($evtOut)) {
-					echo implode("", $evtOut);
-				}
-				?>
+                // invoke OnInterfaceSettingsRender event
+                $evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");
+                if(is_array($evtOut)) {
+                    echo implode("", $evtOut);
+                }
+                ?>
 			</div>
 
 			<!-- Photo -->
@@ -761,39 +761,39 @@  discard block
 block discarded – undo
 			</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>

Please login to merge, or discard this patch.

		@@ -1,21 +1,21 @@ discard block
		block discarded – undo
1	1	<?php
2	2	if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3		- die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
	3	+ die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5	5
6	6	switch($modx->manager->action) {
7		- case 12:
8		- if(!$modx->hasPermission('edit_user')) {
9		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
10		- }
11		- break;
12		- case 11:
13		- if(!$modx->hasPermission('new_user')) {
14		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
15		- }
16		- break;
17		- default:
18		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	7	+ case 12:
	8	+ if(!$modx->hasPermission('edit_user')) {
	9	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	10	+ }
	11	+ break;
	12	+ case 11:
	13	+ if(!$modx->hasPermission('new_user')) {
	14	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	15	+ }
	16	+ break;
	17	+ default:
	18	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
19	19	}
20	20
21	21	$user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
		@@ -23,75 +23,75 @@ discard block
		block discarded – undo
23	23	// check to see the snippet editor isn't locked
24	24	$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");
25	25	if($username = $modx->db->getValue($rs)) {
26		- $modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "user"));
	26	+ $modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "user"));
27	27	}
28	28	// end check for lock
29	29
30	30	if($modx->manager->action == '12') {
31		- // get user attribute
32		- $rs = $modx->db->select('*', $modx->getFullTableName('user_attributes'), "internalKey = '{$user}'");
33		- $userdata = $modx->db->getRow($rs);
34		- if(!$userdata) {
35		- $modx->webAlertAndQuit("No user returned!");
36		- }
37		-
38		-
39		- // get user settings
40		- $rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");
41		- $usersettings = array();
42		- while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
43		- // manually extract so that user display settings are not overwritten
44		- foreach($usersettings as $k => $v) {
45		- if($k != 'manager_language' && $k != 'manager_theme') {
46		- ${$k} = $v;
47		- }
48		- }
49		-
50		- // get user name
51		- $rs = $modx->db->select('*', $modx->getFullTableName('manager_users'), "id = '{$user}'");
52		- $usernamedata = $modx->db->getRow($rs);
53		- if(!$usernamedata) {
54		- $modx->webAlertAndQuit("No user returned while getting username!");
55		- }
56		- $_SESSION['itemname'] = $usernamedata['username'];
	31	+ // get user attribute
	32	+ $rs = $modx->db->select('*', $modx->getFullTableName('user_attributes'), "internalKey = '{$user}'");
	33	+ $userdata = $modx->db->getRow($rs);
	34	+ if(!$userdata) {
	35	+ $modx->webAlertAndQuit("No user returned!");
	36	+ }
	37	+
	38	+
	39	+ // get user settings
	40	+ $rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");
	41	+ $usersettings = array();
	42	+ while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
	43	+ // manually extract so that user display settings are not overwritten
	44	+ foreach($usersettings as $k => $v) {
	45	+ if($k != 'manager_language' && $k != 'manager_theme') {
	46	+ ${$k} = $v;
	47	+ }
	48	+ }
	49	+
	50	+ // get user name
	51	+ $rs = $modx->db->select('*', $modx->getFullTableName('manager_users'), "id = '{$user}'");
	52	+ $usernamedata = $modx->db->getRow($rs);
	53	+ if(!$usernamedata) {
	54	+ $modx->webAlertAndQuit("No user returned while getting username!");
	55	+ }
	56	+ $_SESSION['itemname'] = $usernamedata['username'];
57	57	} else {
58		- $userdata = array();
59		- $usersettings = array();
60		- $usernamedata = array();
61		- $_SESSION['itemname'] = $_lang["new_user"];
	58	+ $userdata = array();
	59	+ $usersettings = array();
	60	+ $usernamedata = array();
	61	+ $_SESSION['itemname'] = $_lang["new_user"];
62	62	}
63	63
64	64	// avoid doubling htmlspecialchars (already encoded in DB)
65	65	foreach($userdata as $key => $val) {
66		- $userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);
	66	+ $userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);
67	67	};
68	68	$usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']);
69	69
70	70	// restore saved form
71	71	$formRestored = false;
72	72	if($modx->manager->hasFormValues()) {
73		- $modx->manager->loadFormValues();
74		- // restore post values
75		- $userdata = array_merge($userdata, $_POST);
76		- $userdata['dob'] = $modx->toTimeStamp($userdata['dob']);
77		- $usernamedata['username'] = $userdata['newusername'];
78		- $usernamedata['oldusername'] = $_POST['oldusername'];
79		- $usersettings = array_merge($usersettings, $userdata);
80		- $usersettings['allowed_days'] = is_array($_POST['allowed_days']) ? implode(",", $_POST['allowed_days']) : "";
81		- extract($usersettings, EXTR_OVERWRITE);
	73	+ $modx->manager->loadFormValues();
	74	+ // restore post values
	75	+ $userdata = array_merge($userdata, $_POST);
	76	+ $userdata['dob'] = $modx->toTimeStamp($userdata['dob']);
	77	+ $usernamedata['username'] = $userdata['newusername'];
	78	+ $usernamedata['oldusername'] = $_POST['oldusername'];
	79	+ $usersettings = array_merge($usersettings, $userdata);
	80	+ $usersettings['allowed_days'] = is_array($_POST['allowed_days']) ? implode(",", $_POST['allowed_days']) : "";
	81	+ extract($usersettings, EXTR_OVERWRITE);
82	82	}
83	83
84	84	// include the country list language file
85	85	$_country_lang = array();
86	86	include_once "lang/country/english_country.inc.php";
87	87	if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {
88		- include_once "lang/country/" . $manager_language . "_country.inc.php";
	88	+ include_once "lang/country/" . $manager_language . "_country.inc.php";
89	89	}
90	90	asort($_country_lang);
91	91
92	92	$displayStyle = ($_SESSION['browser'] === 'modern') ? 'table-row' : 'block';
93	93	if($which_browser == 'default') {
94		- $which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];
	94	+ $which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];
95	95	}
96	96	?>
97	97	<script type="text/javascript">
		@@ -201,14 +201,14 @@ discard block
		block discarded – undo
201	201	<form action="index.php?a=32" method="post" name="userform">
202	202	<?php
203	203
204		- // invoke OnUserFormPrerender event
205		- $evtOut = $modx->invokeEvent("OnUserFormPrerender", array(
206		- "id" => $user
207		- ));
208		- if(is_array($evtOut)) {
209		- echo implode("", $evtOut);
210		- }
211		- ?>
	204	+ // invoke OnUserFormPrerender event
	205	+ $evtOut = $modx->invokeEvent("OnUserFormPrerender", array(
	206	+ "id" => $user
	207	+ ));
	208	+ if(is_array($evtOut)) {
	209	+ echo implode("", $evtOut);
	210	+ }
	211	+ ?>
212	212	<input type="hidden" name="mode" value="<?php echo $modx->manager->action; ?>">
213	213	<input type="hidden" name="id" value="<?php echo $user ?>">
214	214	<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 @@ discard block
		block discarded – undo
301	301	<td> </td>
302	302	<td><?php
303	303
304		- $rs = $modx->db->select('name, id', '[+prefix+]user_roles', ($modx->hasPermission('save_role')) ? '' : 'id != 1');
305		- ?>
	304	+ $rs = $modx->db->select('name, id', '[+prefix+]user_roles', ($modx->hasPermission('save_role')) ? '' : 'id != 1');
	305	+ ?>
306	306	<select name="role" class="inputBox" onChange='documentDirty=true;' style="width:300px">
307	307	<?php
308		- while($row = $modx->db->getRow($rs)) {
309		- if($modx->manager->action == '11') {
310		- $selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';
311		- } else {
312		- $selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';
313		- }
314		- ?>
	308	+ while($row = $modx->db->getRow($rs)) {
	309	+ if($modx->manager->action == '11') {
	310	+ $selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';
	311	+ } else {
	312	+ $selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';
	313	+ }
	314	+ ?>
315	315	<option value="<?php echo $row['id']; ?>"<?php echo $selectedtext; ?>><?php echo $row['name']; ?></option>
316	316	<?php
317		- }
318		- ?>
	317	+ }
	318	+ ?>
319	319	</select></td>
320	320	</tr>
321	321	<tr>
		@@ -360,10 +360,10 @@ discard block
		block discarded – undo
360	360	<?php $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $userdata['country']; ?>
361	361	<option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> > </option>
362	362	<?php
363		- foreach($_country_lang as $key => $country) {
364		- echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";
365		- }
366		- ?>
	363	+ foreach($_country_lang as $key => $country) {
	364	+ echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";
	365	+ }
	366	+ ?>
367	367	</select></td>
368	368	</tr>
369	369	<tr>
		@@ -439,21 +439,21 @@ discard block
		block discarded – undo
439	439	<td><select name="manager_language" class="inputBox" onChange="documentDirty=true">
440	440	<option value=""></option>
441	441	<?php
442		- $activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';
443		- $dir = dir("includes/lang");
444		- while($file = $dir->read()) {
445		- if(strpos($file, ".inc.php") > 0) {
446		- $endpos = strpos($file, ".");
447		- $languagename = substr($file, 0, $endpos);
448		- $selectedtext = $languagename == $activelang ? "selected='selected'" : "";
449		- ?>
	442	+ $activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';
	443	+ $dir = dir("includes/lang");
	444	+ while($file = $dir->read()) {
	445	+ if(strpos($file, ".inc.php") > 0) {
	446	+ $endpos = strpos($file, ".");
	447	+ $languagename = substr($file, 0, $endpos);
	448	+ $selectedtext = $languagename == $activelang ? "selected='selected'" : "";
	449	+ ?>
450	450	<option value="<?php echo $languagename; ?>" <?php echo $selectedtext; ?>><?php echo ucwords(str_replace("_", " ", $languagename)); ?></option>
451	451	<?php
452	452
453		- }
454		- }
455		- $dir->close();
456		- ?>
	453	+ }
	454	+ }
	455	+ $dir->close();
	456	+ ?>
457	457	</select></td>
458	458	</tr>
459	459	<tr>
		@@ -528,22 +528,22 @@ discard block
		block discarded – undo
528	528	<td><select name="manager_theme" class="inputBox" onChange="documentDirty=true;document.userform.theme_refresher.value = Date.parse(new Date());">
529	529	<option value=""></option>
530	530	<?php
531		- $dir = dir("media/style/");
532		- while($file = $dir->read()) {
533		- if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
534		- $themename = $file;
535		- if($themename === 'common') {
536		- continue;
537		- }
538		- $attr = 'value="' . $themename . '" ';
539		- if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
540		- $attr .= 'selected="selected" ';
541		- }
542		- echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";
543		- }
544		- }
545		- $dir->close();
546		- ?>
	531	+ $dir = dir("media/style/");
	532	+ while($file = $dir->read()) {
	533	+ if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
	534	+ $themename = $file;
	535	+ if($themename === 'common') {
	536	+ continue;
	537	+ }
	538	+ $attr = 'value="' . $themename . '" ';
	539	+ if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
	540	+ $attr .= 'selected="selected" ';
	541	+ }
	542	+ echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";
	543	+ }
	544	+ }
	545	+ $dir->close();
	546	+ ?>
547	547	</select>
548	548	<input type="hidden" name="theme_refresher" value=""></td>
549	549	</tr>
		@@ -579,15 +579,15 @@ discard block
		block discarded – undo
579	579	<th><?php echo $_lang["which_browser_title"] ?></th>
580	580	<td><select name="which_browser" class="inputBox" onChange="documentDirty=true;">
581	581	<?php
582		- $selected = 'default' == $usersettings['which_browser'] \|\| !$usersettings['which_browser'] ? ' selected="selected"' : '';
583		- echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";
584		- foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
585		- $dir = str_replace('\\', '/', $dir);
586		- $browser_name = substr($dir, strrpos($dir, '/') + 1);
587		- $selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';
588		- echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";
589		- }
590		- ?>
	582	+ $selected = 'default' == $usersettings['which_browser'] \|\| !$usersettings['which_browser'] ? ' selected="selected"' : '';
	583	+ echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";
	584	+ foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
	585	+ $dir = str_replace('\\', '/', $dir);
	586	+ $browser_name = substr($dir, strrpos($dir, '/') + 1);
	587	+ $selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';
	588	+ echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";
	589	+ }
	590	+ ?>
591	591	</select></td>
592	592	</tr>
593	593	<tr>
		@@ -664,17 +664,17 @@ discard block
		block discarded – undo
664	664	<option value=""></option>
665	665	<?php
666	666
667		- $edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';
668		- // invoke OnRichTextEditorRegister event
669		- $evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
670		- echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";
671		- if(is_array($evtOut)) {
672		- for($i = 0; $i < count($evtOut); $i++) {
673		- $editor = $evtOut[$i];
674		- echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";
675		- }
676		- }
677		- ?>
	667	+ $edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';
	668	+ // invoke OnRichTextEditorRegister event
	669	+ $evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
	670	+ echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";
	671	+ if(is_array($evtOut)) {
	672	+ for($i = 0; $i < count($evtOut); $i++) {
	673	+ $editor = $evtOut[$i];
	674	+ echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";
	675	+ }
	676	+ }
	677	+ ?>
678	678	</select></td>
679	679	</tr>
680	680	<tr id='editorRow1' style="display: <?php echo $use_editor == 1 ? $displayStyle : 'none'; ?>">
		@@ -707,12 +707,12 @@ discard block
		block discarded – undo
707	707	</tr>
708	708	</table>
709	709	<?php
710		- // invoke OnInterfaceSettingsRender event
711		- $evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");
712		- if(is_array($evtOut)) {
713		- echo implode("", $evtOut);
714		- }
715		- ?>
	710	+ // invoke OnInterfaceSettingsRender event
	711	+ $evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");
	712	+ if(is_array($evtOut)) {
	713	+ echo implode("", $evtOut);
	714	+ }
	715	+ ?>
716	716	</div>
717	717
718	718	<!-- Photo -->
		@@ -761,39 +761,39 @@ discard block
		block discarded – undo
761	761	</div>
762	762	<?php if($use_udperms == 1) {
763	763
764		- $groupsarray = array();
765		-
766		- if($modx->manager->action == '12') { // only do this bit if the user is being edited
767		- $rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");
768		- $groupsarray = $modx->db->getColumn('user_group', $rs);
769		- }
770		- // retain selected doc groups between post
771		- if(is_array($_POST['user_groups'])) {
772		- foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
773		- }
774		- ?>
	764	+ $groupsarray = array();
	765	+
	766	+ if($modx->manager->action == '12') { // only do this bit if the user is being edited
	767	+ $rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");
	768	+ $groupsarray = $modx->db->getColumn('user_group', $rs);
	769	+ }
	770	+ // retain selected doc groups between post
	771	+ if(is_array($_POST['user_groups'])) {
	772	+ foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
	773	+ }
	774	+ ?>
775	775	<div class="tab-page" id="tabAccess">
776	776	<h2 class="tab"><?php echo $_lang["access_permissions"] ?></h2>
777	777	<script type="text/javascript">tpUser.addTabPage(document.getElementById("tabAccess"));</script>
778	778	<p><?php echo $_lang['access_permissions_user_message'] ?></p>
779	779	<?php
780		- $rs = $modx->db->select('name, id', $modx->getFullTableName('membergroup_names'), '', 'name');
781		- while($row = $modx->db->getRow($rs)) {
782		- echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />";
783		- }
784		- }
785		- ?>
	780	+ $rs = $modx->db->select('name, id', $modx->getFullTableName('membergroup_names'), '', 'name');
	781	+ while($row = $modx->db->getRow($rs)) {
	782	+ echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />";
	783	+ }
	784	+ }
	785	+ ?>
786	786	</div>
787	787	</div>
788	788	</div>
789	789	<input type="submit" name="save" style="display:none">
790	790	<?php
791		- // invoke OnUserFormRender event
792		- $evtOut = $modx->invokeEvent("OnUserFormRender", array(
793		- "id" => $user
794		- ));
795		- if(is_array($evtOut)) {
796		- echo implode("", $evtOut);
797		- }
798		- ?>
	791	+ // invoke OnUserFormRender event
	792	+ $evtOut = $modx->invokeEvent("OnUserFormRender", array(
	793	+ "id" => $user
	794	+ ));
	795	+ if(is_array($evtOut)) {
	796	+ echo implode("", $evtOut);
	797	+ }
	798	+ ?>
799	799	</form>

evolution-cms / evolution

Push — develop ( beaa53...e6bcf2 )

Status

Category

Indentation +158 added lines, -158 removed lines patch added patch discarded remove patch