Inspection of "Commented "plugin locks" / lock-file" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( 00fbcc...663a1f )

unknown

created 2018-02-22 19:03 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -43,10 +43,10 @@
 block discarded – undo
 	var chk = document.install.rminstaller;
 	if(chk && chk.checked) {
 		// remove install folder and files
-		window.location.href = "../<?php echo MGR_DIR;?>/processors/remove_installer.processor.php?rminstall=1";
+		window.location.href = "../<?php echo MGR_DIR; ?>/processors/remove_installer.processor.php?rminstall=1";
 	}
 	else {
-		window.location.href = "../<?php echo MGR_DIR;?>/";
+		window.location.href = "../<?php echo MGR_DIR; ?>/";
 	}
 }
 /* ]]> */

Please login to merge, or discard this patch.

install/connection.databasetest.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -6,12 +6,12 @@  discard block
 block discarded – undo
 $installMode = $_POST['installMode'];
 
 $self = 'install/connection.databasetest.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once("lang.php");
 
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
-        if (! mysqli_query($conn, $query)){
+        if (!mysqli_query($conn, $query)) {
             $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
         }
         else {

Please login to merge, or discard this patch.

install/functions.php 1 patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -4,9 +4,9 @@  discard block
 block discarded – undo
 	global $_lang;
 	
 	// session loop-back tester
-	if(!isset($_GET['action']) || $_GET['action']!=='mode')
+	if (!isset($_GET['action']) || $_GET['action'] !== 'mode')
 	{
-		if(!isset($_SESSION['test']) || $_SESSION['test']!=1)
+		if (!isset($_SESSION['test']) || $_SESSION['test'] != 1)
 		{
 			echo '
 <html>
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
 </head>
 <body>
 	<div class="install">
-		<p>' . $_lang["session_problem"] . '</p>
-		<p><a href="./">' .$_lang["session_problem_try_again"] . '</a></p>
+		<p>' . $_lang["session_problem"].'</p>
+		<p><a href="./">' .$_lang["session_problem_try_again"].'</a></p>
 	</div>
 </body>
 </html>';
@@ -32,28 +32,28 @@  discard block
 block discarded – undo
 	}
 }
 
-function parse($src,$ph,$left='[+',$right='+]')
+function parse($src, $ph, $left = '[+', $right = '+]')
 {
-	foreach($ph as $k=>$v)
+	foreach ($ph as $k=>$v)
 	{
-		$k = $left . $k . $right;
-		$src = str_replace($k,$v,$src);
+		$k = $left.$k.$right;
+		$src = str_replace($k, $v, $src);
 	}
 	return $src;
 }
 
 function ph()
 {
-	global $_lang,$moduleName,$moduleVersion,$modx_textdir,$modx_release_date;
+	global $_lang, $moduleName, $moduleVersion, $modx_textdir, $modx_release_date;
 
-	if(isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
+	if (isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
 	else                                $installmode = get_installmode();
 
 	$ph['pagetitle']     = $_lang['modx_install'];
-	$ph['textdir']       = $modx_textdir ? ' id="rtl"':'';
+	$ph['textdir']       = $modx_textdir ? ' id="rtl"' : '';
 	$ph['help_link']     = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd'];
 	$ph['version']       = $moduleVersion;
-	$ph['release_date']  = ($modx_textdir ? '&rlm;':'') . $modx_release_date;
+	$ph['release_date']  = ($modx_textdir ? '&rlm;' : '').$modx_release_date;
 	$ph['footer1']       = $_lang['modx_footer1'];
 	$ph['footer2']       = $_lang['modx_footer2'];
 	$ph['current_year']  = date('Y');
@@ -62,20 +62,20 @@  discard block
 block discarded – undo
 
 function get_installmode()
 {
-	global $base_path,$database_server, $database_user, $database_password, $dbase, $table_prefix;
+	global $base_path, $database_server, $database_user, $database_password, $dbase, $table_prefix;
 	
 	$conf_path = "{$base_path}manager/includes/config.inc.php";
 	if (!is_file($conf_path)) $installmode = 0;
-	elseif(isset($_POST['installmode'])) $installmode = $_POST['installmode'];
+	elseif (isset($_POST['installmode'])) $installmode = $_POST['installmode'];
 	else
 	{
 		include_once("{$base_path}manager/includes/config.inc.php");
 		
-		if(!isset($dbase) || empty($dbase)) $installmode = 0;
+		if (!isset($dbase) || empty($dbase)) $installmode = 0;
 		else
 		{
 			$conn = mysqli_connect($database_server, $database_user, $database_password);
-			if($conn)
+			if ($conn)
 			{
 				$_SESSION['database_server']   = $database_server;
 				$_SESSION['database_user']     = $database_user;
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
 			}
 			else $rs = false;
 			
-			if($rs)
+			if ($rs)
 			{
 				$_SESSION['dbase']                      = $dbase;
 				$_SESSION['table_prefix']               = $table_prefix;
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
 				
 				$tbl_system_settings = "`{$dbase}`.`{$table_prefix}system_settings`";
 				$rs = mysqli_query($conn, "SELECT setting_value FROM {$tbl_system_settings} WHERE setting_name='settings_version'");
-				if($rs)
+				if ($rs)
 				{
 					$row = mysqli_fetch_assoc($rs);
 					$settings_version = $row['setting_value'];

Please login to merge, or discard this patch.

install/connection.servertest.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -5,12 +5,12 @@  discard block
 block discarded – undo
 $pwd = $_POST['pwd'];
 
 $self = 'install/connection.servertest.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once("lang.php");
 
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
     $output .= '<span id="server_pass" style="color:#80c000;"> '.$_lang['status_passed_server'].'</span>';
 
     // Mysql version check
-    if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) {
+    if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
         $output .= '<br /><span style="color:#FF0000;"> '.$_lang['mysql_5051'].'</span>';
     }
     // Mode check
     $mysqlmode = mysqli_query($conn, "SELECT @@session.sql_mode");
-    if (@mysqli_num_rows($mysqlmode) > 0){
+    if (@mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         $strictMode = false;
         foreach ($modes as $mode) {

Please login to merge, or discard this patch.

install/connection.collation.php 1 patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -5,17 +5,17 @@  discard block
 block discarded – undo
 $pwd = $_POST['pwd'];
 
 $self = 'install/connection.collation.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once('lang.php');
 
 $conn = mysqli_connect($host, $uid, $pwd);
-if(!$conn) exit('can not connect');
+if (!$conn) exit('can not connect');
 
 // get collation
 $rs = mysqli_query($conn, "SHOW COLLATION");
@@ -29,20 +29,20 @@  discard block
 block discarded – undo
     $database_collation = htmlentities($_POST['database_collation']);
     $recommend_collation = $_lang['recommend_collation'];
     
-    if    (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
-    elseif(isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
-    elseif(isset($_['utf8_general_ci']))    $_['utf8_general_ci']    = ' selected';
-    elseif(isset($_[$database_collation]))  $_[$database_collation]  = ' selected';
+    if (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
+    elseif (isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
+    elseif (isset($_['utf8_general_ci']))    $_['utf8_general_ci']    = ' selected';
+    elseif (isset($_[$database_collation]))  $_[$database_collation]  = ' selected';
     
-    $_ = sortItem($_,$_lang['recommend_collations_order']);
+    $_ = sortItem($_, $_lang['recommend_collations_order']);
     
-    foreach($_ as $collation=>$selected) {
+    foreach ($_ as $collation=>$selected) {
         $collation = htmlentities($collation);
         // if(substr($collation,0,4)!=='utf8') continue;
-        if(strpos($collation,'sjis')===0) continue;
-        if($collation=='recommend')
+        if (strpos($collation, 'sjis') === 0) continue;
+        if ($collation == 'recommend')
             $output .= '<optgroup label="recommend">';
-        elseif($collation=='unrecommend')
+        elseif ($collation == 'unrecommend')
             $output .= '</optgroup><optgroup label="unrecommend">';
         else
             $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
@@ -55,17 +55,17 @@  discard block
 block discarded – undo
 
 
 
-function sortItem($array=array(),$order='utf8mb4,utf8') {
+function sortItem($array = array(), $order = 'utf8mb4,utf8'){
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
-    foreach($order as $v) {
-    	foreach($array as $name=>$sel) {
-        	if(strpos($name,$v)!==false) {
+    foreach ($order as $v) {
+    	foreach ($array as $name=>$sel) {
+        	if (strpos($name, $v) !== false) {
         		$rs[$name] = $array[$name];
         		unset($array[$name]);
         	}
     	}
     }
-    $rs['unrecommend']='';
+    $rs['unrecommend'] = '';
     return $rs + $array;
 }

Please login to merge, or discard this patch.

install/index.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
 }
 
 $self = 'install/index.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 require_once("{$base_path}install/functions.php");
 
 // set error reporting
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
 	define('MGR_DIR', 'manager');
 }
 
@@ -38,26 +38,26 @@  discard block
 block discarded – undo
 $moduleSQLDataFile = "setup.data.sql";
 $moduleSQLResetFile = "setup.data.reset.sql";
 
-$moduleChunks = array (); // chunks - array : name, description, type - 0:file or 1:content, file or content
-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content
-$moduleSnippets = array (); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
-$modulePlugins = array (); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
-$moduleModules = array (); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
-$moduleTVs = array (); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
+$moduleChunks = array(); // chunks - array : name, description, type - 0:file or 1:content, file or content
+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content
+$moduleSnippets = array(); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
+$modulePlugins = array(); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
+$moduleModules = array(); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
+$moduleTVs = array(); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
 $moduleDependencies = array(); // module depedencies - array : module, table, column, type, name
 
-$errors= 0;
+$errors = 0;
 
 // get post back status
 $isPostBack = (count($_POST));
 
 $ph = ph();
-$ph = array_merge($ph,$_lang);
+$ph = array_merge($ph, $_lang);
 $ph['install_language'] = $install_language;
 
 ob_start();
-$action= isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
+$action = isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
 if (!@include_once("actions/action_{$action}.php")) {
     die ("Invalid install action attempted. [action={$action}]");
 }
@@ -65,5 +65,5 @@  discard block
 block discarded – undo
 ob_end_clean();
 
 $tpl = file_get_contents("{$base_path}install/template.tpl");
-echo parse($tpl,$ph);
+echo parse($tpl, $ph);
 

Please login to merge, or discard this patch.

manager/actions/mutate_user.dynamic.php 2 patches

Switch Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -4,18 +4,18 @@
 block discarded – undo
 }
 
 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']) ? intval($_REQUEST['id']) : 0;

Please login to merge, or discard this patch.

Spacing +57 added lines, -57 removed lines patch added patch discarded remove patch

@@ -1,16 +1,16 @@  discard block
 block discarded – undo
 <?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;
@@ -21,17 +21,17 @@  discard block
 block discarded – undo
 $user = isset($_REQUEST['id']) ? intval($_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 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 }
 
 // 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 @@  discard block
 block discarded – undo
 // 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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 	$evtOut = $modx->invokeEvent("OnUserFormPrerender", array(
 		"id" => $user
 	));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
 	<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 @@  discard block
 block discarded – undo
 				<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 @@  discard block
 block discarded – undo
 						<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 @@  discard block
 block discarded – undo
 							?>
 							<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 @@  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>
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
 						<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 @@  discard block
 block discarded – undo
 						</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 @@  discard block
 block discarded – undo
 								<?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 @@  discard block
 block discarded – undo
 								<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 @@  discard block
 block discarded – undo
 						<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 @@  discard block
 block discarded – undo
 					</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 @@  discard block
 block discarded – undo
 					</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 @@  discard block
 block discarded – undo
 					</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 @@  discard block
 block discarded – undo
 					</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 @@  discard block
 block discarded – undo
 								$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 @@  discard block
 block discarded – undo
 				<?php
 				// invoke OnInterfaceSettingsRender event
 				$evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");
-				if(is_array($evtOut)) {
+				if (is_array($evtOut)) {
 					echo implode("", $evtOut);
 				}
 				?>
@@ -712,7 +712,7 @@  discard block
 block discarded – undo
 					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 @@  discard block
 block discarded – undo
 					</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 @@  discard block
 block discarded – undo
 				<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 @@  discard block
 block discarded – undo
 	$evtOut = $modx->invokeEvent("OnUserFormRender", array(
 		"id" => $user
 	));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>

Please login to merge, or discard this patch.

manager/actions/mutate_web_user.dynamic.php 2 patches

Switch Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -4,18 +4,18 @@
 block discarded – undo
 }
 
 switch($modx->manager->action) {
-	case 88:
-		if(!$modx->hasPermission('edit_web_user')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 87:
-		if(!$modx->hasPermission('new_web_user')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+	    case 88:
+		    if(!$modx->hasPermission('edit_web_user')) {
+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+		    }
+		    break;
+	    case 87:
+		    if(!$modx->hasPermission('new_web_user')) {
+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+		    }
+		    break;
+	    default:
+		    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $user = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;

Please login to merge, or discard this patch.

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -1,16 +1,16 @@  discard block
 block discarded – undo
 <?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 88:
-		if(!$modx->hasPermission('edit_web_user')) {
+		if (!$modx->hasPermission('edit_web_user')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
 	case 87:
-		if(!$modx->hasPermission('new_web_user')) {
+		if (!$modx->hasPermission('new_web_user')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
@@ -22,30 +22,30 @@  discard block
 block discarded – undo
 
 
 // check to see the snippet editor isn't locked
-$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=88 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");
-if($username = $modx->db->getValue($rs)) {
+$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=88 AND id='{$user}' AND internalKey!='".$modx->getLoginUserID()."'");
+if ($username = $modx->db->getValue($rs)) {
 	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "web user"));
 }
 // end check for lock
 
-if($modx->manager->action == '88') {
+if ($modx->manager->action == '88') {
 	// get user attributes
 	$rs = $modx->db->select('*', $modx->getFullTableName('web_user_attributes'), "internalKey = '{$user}'");
 	$userdata = $modx->db->getRow($rs);
-	if(!$userdata) {
+	if (!$userdata) {
 		$modx->webAlertAndQuit("No user returned!");
 	}
 
 	// get user settings
 	$rs = $modx->db->select('*', $modx->getFullTableName('web_user_settings'), "webuser = '{$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'];
 	extract($usersettings, EXTR_OVERWRITE);
 
 	// get user name
 	$rs = $modx->db->select('*', $modx->getFullTableName('web_users'), "id = '{$user}'");
 	$usernamedata = $modx->db->getRow($rs);
-	if(!$usernamedata) {
+	if (!$usernamedata) {
 		$modx->webAlertAndQuit("No user returned while getting username!");
 	}
 	$_SESSION['itemname'] = $usernamedata['username'];
@@ -57,14 +57,14 @@  discard block
 block discarded – undo
 }
 
 // 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);
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
 
 // include the country list language file
 $_country_lang = array();
-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";
 } else {
 	include_once "lang/country/english_country.inc.php";
 }
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
 	<?php
 	// invoke OnWUsrFormPrerender event
 	$evtOut = $modx->invokeEvent("OnWUsrFormPrerender", array("id" => $user));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
 	<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-users"></i><?= ($usernamedata['username'] ? $usernamedata['username'] . '<small>(' . $usernamedata['id'] . ')</small>' : $_lang['web_user_title']) ?>
+        <i class="fa fa fa-users"></i><?= ($usernamedata['username'] ? $usernamedata['username'].'<small>('.$usernamedata['id'].')</small>' : $_lang['web_user_title']) ?>
     </h1>
 
 	<?php echo $_style['actionbuttons']['dynamic']['user'] ?>
@@ -218,13 +218,13 @@  discard block
 block discarded – undo
 				<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['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) { ?>
+							<?php if ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) { ?>
 								<b><?php echo $_lang['user_is_blocked']; ?></b>
 							<?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 == '88' && (!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']); ?>" />
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
 						<td><input type="text" name="newusername" class="inputBox" value="<?php echo $modx->htmlspecialchars(isset($_POST['newusername']) ? $_POST['newusername'] : $usernamedata['username']); ?>" onChange='documentDirty=true;' maxlength="100" /></td>
 					</tr>
 					<tr>
-						<th><?php echo $modx->manager->action == '87' ? $_lang['password'] . ":" : $_lang['change_password_new'] . ":"; ?></th>
+						<th><?php echo $modx->manager->action == '87' ? $_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 == "87" ? " checked disabled" : ""; ?>>
 							<input type="hidden" name="newpassword" value="<?php echo $modx->manager->action == "87" ? 1 : 0; ?>" onChange="documentDirty=true;" />
@@ -324,8 +324,8 @@  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>
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
 						<td>&nbsp;</td>
 						<td><textarea type="text" name="comment" class="inputBox" rows="5" onChange="documentDirty=true;"><?php echo $modx->htmlspecialchars(isset($_POST['comment']) ? $_POST['comment'] : $userdata['comment']); ?></textarea></td>
 					</tr>
-					<?php if($modx->manager->action == '88') { ?>
+					<?php if ($modx->manager->action == '88') { ?>
 						<tr>
 							<th><?php echo $_lang['user_logincount']; ?>:</th>
 							<td>&nbsp;</td>
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
 					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) {
@@ -491,22 +491,22 @@  discard block
 block discarded – undo
 						<td class='comment'><?php echo $_lang["user_photo_message"] ?></td>
 					</tr>
 					<tr>
-						<td colspan="2" align="center"><img name="iphoto" src="<?php echo isset($_POST['photo']) ? (strpos($_POST['photo'], "http://") === false ? MODX_SITE_URL : "") . $_POST['photo'] : !empty($userdata['photo']) ? (strpos($userdata['photo'], "http://") === false ? MODX_SITE_URL : "") . $userdata['photo'] : $_style["tx"]; ?>" /></td>
+						<td colspan="2" align="center"><img name="iphoto" src="<?php echo isset($_POST['photo']) ? (strpos($_POST['photo'], "http://") === false ? MODX_SITE_URL : "").$_POST['photo'] : !empty($userdata['photo']) ? (strpos($userdata['photo'], "http://") === false ? MODX_SITE_URL : "").$userdata['photo'] : $_style["tx"]; ?>" /></td>
 					</tr>
 				</table>
 			</div>
 			<?php
-			if($use_udperms == 1) {
+			if ($use_udperms == 1) {
 
 			$groupsarray = array();
 
-			if($modx->manager->action == '88') { // only do this bit if the user is being edited
+			if ($modx->manager->action == '88') { // only do this bit if the user is being edited
 				$rs = $modx->db->select('webgroup', $modx->getFullTableName('web_groups'), "webuser='{$user}'");
 				$groupsarray = $modx->db->getColumn('webgroup', $rs);
 			}
 			// retain selected user 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="tabPermissions">
@@ -515,8 +515,8 @@  discard block
 block discarded – undo
 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>
 				<?php
 				$rs = $modx->db->select('name, id', $modx->getFullTableName('webgroup_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 />';
 				}
 				}
 				?>
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
 			$evtOut = $modx->invokeEvent("OnWUsrFormRender", array(
 				"id" => $user
 			));
-			if(is_array($evtOut)) {
+			if (is_array($evtOut)) {
 				echo implode("", $evtOut);
 			}
 			?>

Please login to merge, or discard this patch.

manager/actions/mutate_module.dynamic.php 2 patches

Switch Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -3,18 +3,18 @@
 block discarded – undo
 	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 107:
-		if(!$modx->hasPermission('new_module')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 108:
-		if(!$modx->hasPermission('edit_module')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+	    case 107:
+		    if(!$modx->hasPermission('new_module')) {
+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+		    }
+		    break;
+	    case 108:
+		    if(!$modx->hasPermission('edit_module')) {
+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+		    }
+		    break;
+	    default:
+		    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 // Get table names (alphabetical)

Please login to merge, or discard this patch.

Spacing +35 added lines, -35 removed lines patch added patch discarded remove patch

@@ -1,15 +1,15 @@  discard block
 block discarded – undo
 <?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 107:
-		if(!$modx->hasPermission('new_module')) {
+		if (!$modx->hasPermission('new_module')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
 	case 108:
-		if(!$modx->hasPermission('edit_module')) {
+		if (!$modx->hasPermission('edit_module')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
@@ -29,16 +29,16 @@  discard block
 block discarded – undo
 $tbl_site_templates = $modx->getFullTableName('site_templates');
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 // create globally unique identifiers (guid)
-function createGUID() {
+function createGUID(){
 	srand((double) microtime() * 1000000);
 	$r = rand();
-	$u = uniqid(getmypid() . $r . (double) microtime() * 1000000, 1);
+	$u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1);
 	$m = md5($u);
 	return $m;
 }
 
 // check to see the module editor isn't locked
-if($lockedEl = $modx->elementIsLocked(6, $id)) {
+if ($lockedEl = $modx->elementIsLocked(6, $id)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));
 }
 // end check for lock
@@ -46,29 +46,29 @@  discard block
 block discarded – undo
 // Lock snippet for other users to edit
 $modx->lockElement(6, $id);
 
-if(isset($_GET['id'])) {
+if (isset($_GET['id'])) {
 	$rs = $modx->db->select('*', $tbl_site_modules, "id='{$id}'");
 	$content = $modx->db->getRow($rs);
-	if(!$content) {
+	if (!$content) {
 		$modx->webAlertAndQuit("Module not found for id '{$id}'.");
 	}
 	$content['properties'] = str_replace("&", "&amp;", $content['properties']);
 	$_SESSION['itemname'] = $content['name'];
-	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
+	if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 	}
 } else {
 	$_SESSION['itemname'] = $_lang["new_module"];
 	$content['wrap'] = '1';
 }
-if($modx->manager->hasFormValues()) {
+if ($modx->manager->hasFormValues()) {
 	$modx->manager->loadFormValues();
 }
 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 6;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 ?>
 <script type="text/javascript">
 	function loadDependencies() {
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
 	function BrowseServer() {
 		var w = screen.width * 0.7;
 		var h = screen.height * 0.7;
-		OpenServerBrowser("<?= MODX_MANAGER_URL;?>media/browser/<?= $which_browser;?>/browser.php?Type=images", w, h);
+		OpenServerBrowser("<?= MODX_MANAGER_URL; ?>media/browser/<?= $which_browser; ?>/browser.php?Type=images", w, h);
 	}
 
 	function SetUrl(url, width, height, alt) {
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
 	<?php
 	// invoke OnModFormPrerender event
 	$evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode('', $evtOut);
 	}
 
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
 	<input type="hidden" name="mode" value="<?= $modx->manager->action ?>">
 
 	<h1>
-		<i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>
+		<i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>
 	</h1>
 
 	<?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -474,8 +474,8 @@  discard block
 block discarded – undo
 						<div class="col-md-9 col-lg-10">
 							<div class="form-control-name clearfix">
 								<input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
-								<?php if($modx->hasPermission('save_role')): ?>
-									<label class="custom-control" title="<?= $_lang['lock_module'] . "\n" . $_lang['lock_module_msg'] ?>" tooltip>
+								<?php if ($modx->hasPermission('save_role')): ?>
+									<label class="custom-control" title="<?= $_lang['lock_module']."\n".$_lang['lock_module_msg'] ?>" tooltip>
 										<input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
 										<i class="fa fa-lock"></i>
 									</label>
@@ -497,9 +497,9 @@  discard block
 block discarded – undo
 							<select name="categoryid" class="form-control" onchange="documentDirty=true;">
 								<option>&nbsp;</option>
 								<?php
-								include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
-								foreach(getCategories() as $n => $v) {
-									echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";
+								include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
+								foreach (getCategories() as $n => $v) {
+									echo "\t\t\t".'<option value="'.$v['id'].'"'.($content['category'] == $v['id'] ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v['category'])."</option>\n";
 								}
 								?>
 							</select>
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
 				<div class="form-group">
 					<div class="form-row">
 						<label for="disabled"><input name="disabled" id="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> />
-							<?= ($content['disabled'] == 1 ? '<span class="text-danger">' . $_lang['module_disabled'] . '</span>' : $_lang['module_disabled']) ?></label>
+							<?= ($content['disabled'] == 1 ? '<span class="text-danger">'.$_lang['module_disabled'].'</span>' : $_lang['module_disabled']) ?></label>
 					</div>
 					<div class="form-row">
 						<label for="parse_docblock">
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
 			</div>
 			<!-- HTML text editor end -->
 		</div>
-		<?php if($modx->manager->action == '108'): ?>
+		<?php if ($modx->manager->action == '108'): ?>
 			<!-- Dependencies -->
 			<div class="tab-page" id="tabDepend">
 				<h2 class="tab"><?= $_lang['settings_dependencies'] ?></h2>
@@ -624,14 +624,14 @@  discard block
 block discarded – undo
 						LEFT JOIN {$tbl_site_templates} AS st ON st.id = smd.resource AND smd.type = 50
 						LEFT JOIN {$tbl_site_tmplvars} AS sv ON sv.id = smd.resource AND smd.type = 60", "smd.module='{$id}'", 'smd.type,name');
 
-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+					include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
 					$grd = new DataGrid('', $ds, 0); // set page size to 0 t show all items
 					$grd->noRecordMsg = $_lang['no_records_found'];
 					$grd->cssClass = 'grid';
 					$grd->columnHeaderClass = 'gridHeader';
 					$grd->itemClass = 'gridItem';
 					$grd->altItemClass = 'gridAltItem';
-					$grd->columns = $_lang['element_name'] . " ," . $_lang['type'];
+					$grd->columns = $_lang['element_name']." ,".$_lang['type'];
 					$grd->fields = "name,type";
 					echo $grd->render();
 					?>
@@ -644,13 +644,13 @@  discard block
 block discarded – undo
 			<h2 class="tab"><?= $_lang['access_permissions'] ?></h2>
 			<script type="text/javascript">tp.addTabPage(document.getElementById("tabPermissions"));</script>
 			<div class="container container-body">
-				<?php if($use_udperms == 1) : ?>
+				<?php if ($use_udperms == 1) : ?>
 					<?php
 					// fetch user access permissions for the module
 					$rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'");
 					$groupsarray = $modx->db->getColumn('usergroup', $rs);
 
-					if($modx->hasPermission('access_permissions')) {
+					if ($modx->hasPermission('access_permissions')) {
 						?>
 						<!-- User Group Access Permissions -->
 						<script type="text/javascript">
@@ -678,22 +678,22 @@  discard block
 block discarded – undo
 					}
 					$chk = '';
 					$rs = $modx->db->select('name, id', $tbl_membergroup_names, '', 'name');
-					while($row = $modx->db->getRow($rs)) {
+					while ($row = $modx->db->getRow($rs)) {
 						$groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();
 						$checked = in_array($row['id'], $groupsarray);
-						if($modx->hasPermission('access_permissions')) {
-							if($checked) {
+						if ($modx->hasPermission('access_permissions')) {
+							if ($checked) {
 								$notPublic = true;
 							}
-							$chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n";
+							$chks .= '<label><input type="checkbox" name="usrgroups[]" value="'.$row['id'].'"'.($checked ? ' checked="checked"' : '').' onclick="makePublic(false)" /> '.$row['name']."</label><br />\n";
 						} else {
-							if($checked) {
-								$chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;
+							if ($checked) {
+								$chks = '<input type="hidden" name="usrgroups[]"  value="'.$row['id'].'" />'."\n".$chks;
 							}
 						}
 					}
-					if($modx->hasPermission('access_permissions')) {
-						$chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks;
+					if ($modx->hasPermission('access_permissions')) {
+						$chks = '<label><input type="checkbox" name="chkallgroups"'.(!$notPublic ? ' checked="checked"' : '').' onclick="makePublic(true)" /><span class="warning"> '.$_lang['all_usr_groups'].'</span></label><br />'."\n".$chks;
 					}
 					echo $chks;
 					?>
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
 		<?php
 		// invoke OnModFormRender event
 		$evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id));
-		if(is_array($evtOut)) {
+		if (is_array($evtOut)) {
 			echo implode('', $evtOut);
 		}
 		?>

Please login to merge, or discard this patch.

		@@ -43,10 +43,10 @@
		block discarded – undo
43	43	var chk = document.install.rminstaller;
44	44	if(chk && chk.checked) {
45	45	// remove install folder and files
46		- window.location.href = "../<?php echo MGR_DIR;?>/processors/remove_installer.processor.php?rminstall=1";
	46	+ window.location.href = "../<?php echo MGR_DIR; ?>/processors/remove_installer.processor.php?rminstall=1";
47	47	}
48	48	else {
49		- window.location.href = "../<?php echo MGR_DIR;?>/";
	49	+ window.location.href = "../<?php echo MGR_DIR; ?>/";
50	50	}
51	51	}
52	52	/* ]]> */

		@@ -6,12 +6,12 @@ discard block
		block discarded – undo
6	6	$installMode = $_POST['installMode'];
7	7
8	8	$self = 'install/connection.databasetest.php';
9		-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
	9	+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
10	10	if (is_file("{$base_path}assets/cache/siteManager.php")) {
11	11	include_once("{$base_path}assets/cache/siteManager.php");
12	12	}
13		-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
14		- define('MGR_DIR','manager');
	13	+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
	14	+ define('MGR_DIR', 'manager');
15	15	}
16	16	require_once("lang.php");
17	17
		@@ -31,7 +31,7 @@ discard block
		block discarded – undo
31	31	$database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
32	32	$query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
33	33
34		- if (! mysqli_query($conn, $query)){
	34	+ if (!mysqli_query($conn, $query)) {
35	35	$output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
36	36	}
37	37	else {

		@@ -4,9 +4,9 @@ discard block
		block discarded – undo
4	4	global $_lang;
5	5
6	6	// session loop-back tester
7		- if(!isset($_GET['action']) \|\| $_GET['action']!=='mode')
	7	+ if (!isset($_GET['action']) \|\| $_GET['action'] !== 'mode')
8	8	{
9		- if(!isset($_SESSION['test']) \|\| $_SESSION['test']!=1)
	9	+ if (!isset($_SESSION['test']) \|\| $_SESSION['test'] != 1)
10	10	{
11	11	echo '
12	12	<html>
		@@ -22,8 +22,8 @@ discard block
		block discarded – undo
22	22	</head>
23	23	<body>
24	24	<div class="install">
25		- <p>' . $_lang["session_problem"] . '</p>
26		- <p><a href="./">' .$_lang["session_problem_try_again"] . '</a></p>
	25	+ <p>' . $_lang["session_problem"].'</p>
	26	+ <p><a href="./">' .$_lang["session_problem_try_again"].'</a></p>
27	27	</div>
28	28	</body>
29	29	</html>';
		@@ -32,28 +32,28 @@ discard block
		block discarded – undo
32	32	}
33	33	}
34	34
35		-function parse($src,$ph,$left='[+',$right='+]')
	35	+function parse($src, $ph, $left = '[+', $right = '+]')
36	36	{
37		- foreach($ph as $k=>$v)
	37	+ foreach ($ph as $k=>$v)
38	38	{
39		- $k = $left . $k . $right;
40		- $src = str_replace($k,$v,$src);
	39	+ $k = $left.$k.$right;
	40	+ $src = str_replace($k, $v, $src);
41	41	}
42	42	return $src;
43	43	}
44	44
45	45	function ph()
46	46	{
47		- global $_lang,$moduleName,$moduleVersion,$modx_textdir,$modx_release_date;
	47	+ global $_lang, $moduleName, $moduleVersion, $modx_textdir, $modx_release_date;
48	48
49		- if(isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
	49	+ if (isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
50	50	else $installmode = get_installmode();
51	51
52	52	$ph['pagetitle'] = $_lang['modx_install'];
53		- $ph['textdir'] = $modx_textdir ? ' id="rtl"':'';
	53	+ $ph['textdir'] = $modx_textdir ? ' id="rtl"' : '';
54	54	$ph['help_link'] = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd'];
55	55	$ph['version'] = $moduleVersion;
56		- $ph['release_date'] = ($modx_textdir ? '&rlm;':'') . $modx_release_date;
	56	+ $ph['release_date'] = ($modx_textdir ? '&rlm;' : '').$modx_release_date;
57	57	$ph['footer1'] = $_lang['modx_footer1'];
58	58	$ph['footer2'] = $_lang['modx_footer2'];
59	59	$ph['current_year'] = date('Y');
		@@ -62,20 +62,20 @@ discard block
		block discarded – undo
62	62
63	63	function get_installmode()
64	64	{
65		- global $base_path,$database_server, $database_user, $database_password, $dbase, $table_prefix;
	65	+ global $base_path, $database_server, $database_user, $database_password, $dbase, $table_prefix;
66	66
67	67	$conf_path = "{$base_path}manager/includes/config.inc.php";
68	68	if (!is_file($conf_path)) $installmode = 0;
69		- elseif(isset($_POST['installmode'])) $installmode = $_POST['installmode'];
	69	+ elseif (isset($_POST['installmode'])) $installmode = $_POST['installmode'];
70	70	else
71	71	{
72	72	include_once("{$base_path}manager/includes/config.inc.php");
73	73
74		- if(!isset($dbase) \|\| empty($dbase)) $installmode = 0;
	74	+ if (!isset($dbase) \|\| empty($dbase)) $installmode = 0;
75	75	else
76	76	{
77	77	$conn = mysqli_connect($database_server, $database_user, $database_password);
78		- if($conn)
	78	+ if ($conn)
79	79	{
80	80	$_SESSION['database_server'] = $database_server;
81	81	$_SESSION['database_user'] = $database_user;
		@@ -86,7 +86,7 @@ discard block
		block discarded – undo
86	86	}
87	87	else $rs = false;
88	88
89		- if($rs)
	89	+ if ($rs)
90	90	{
91	91	$_SESSION['dbase'] = $dbase;
92	92	$_SESSION['table_prefix'] = $table_prefix;
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95
96	96	$tbl_system_settings = "`{$dbase}`.`{$table_prefix}system_settings`";
97	97	$rs = mysqli_query($conn, "SELECT setting_value FROM {$tbl_system_settings} WHERE setting_name='settings_version'");
98		- if($rs)
	98	+ if ($rs)
99	99	{
100	100	$row = mysqli_fetch_assoc($rs);
101	101	$settings_version = $row['setting_value'];

		@@ -5,12 +5,12 @@ discard block
		block discarded – undo
5	5	$pwd = $_POST['pwd'];
6	6
7	7	$self = 'install/connection.servertest.php';
8		-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
	8	+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
9	9	if (is_file("{$base_path}assets/cache/siteManager.php")) {
10	10	include_once("{$base_path}assets/cache/siteManager.php");
11	11	}
12		-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
13		- define('MGR_DIR','manager');
	12	+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
	13	+ define('MGR_DIR', 'manager');
14	14	}
15	15	require_once("lang.php");
16	16
		@@ -22,12 +22,12 @@ discard block
		block discarded – undo
22	22	$output .= '<span id="server_pass" style="color:#80c000;"> '.$_lang['status_passed_server'].'</span>';
23	23
24	24	// Mysql version check
25		- if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) {
	25	+ if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
26	26	$output .= '<br /><span style="color:#FF0000;"> '.$_lang['mysql_5051'].'</span>';
27	27	}
28	28	// Mode check
29	29	$mysqlmode = mysqli_query($conn, "SELECT @@session.sql_mode");
30		- if (@mysqli_num_rows($mysqlmode) > 0){
	30	+ if (@mysqli_num_rows($mysqlmode) > 0) {
31	31	$modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
32	32	$strictMode = false;
33	33	foreach ($modes as $mode) {

		@@ -5,17 +5,17 @@ discard block
		block discarded – undo
5	5	$pwd = $_POST['pwd'];
6	6
7	7	$self = 'install/connection.collation.php';
8		-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
	8	+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
9	9	if (is_file("{$base_path}assets/cache/siteManager.php")) {
10	10	include_once("{$base_path}assets/cache/siteManager.php");
11	11	}
12		-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
13		- define('MGR_DIR','manager');
	12	+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
	13	+ define('MGR_DIR', 'manager');
14	14	}
15	15	require_once('lang.php');
16	16
17	17	$conn = mysqli_connect($host, $uid, $pwd);
18		-if(!$conn) exit('can not connect');
	18	+if (!$conn) exit('can not connect');
19	19
20	20	// get collation
21	21	$rs = mysqli_query($conn, "SHOW COLLATION");
		@@ -29,20 +29,20 @@ discard block
		block discarded – undo
29	29	$database_collation = htmlentities($_POST['database_collation']);
30	30	$recommend_collation = $_lang['recommend_collation'];
31	31
32		- if (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
33		- elseif(isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
34		- elseif(isset($_['utf8_general_ci'])) $_['utf8_general_ci'] = ' selected';
35		- elseif(isset($_[$database_collation])) $_[$database_collation] = ' selected';
	32	+ if (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected';
	33	+ elseif (isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected';
	34	+ elseif (isset($_['utf8_general_ci'])) $_['utf8_general_ci'] = ' selected';
	35	+ elseif (isset($_[$database_collation])) $_[$database_collation] = ' selected';
36	36
37		- $_ = sortItem($_,$_lang['recommend_collations_order']);
	37	+ $_ = sortItem($_, $_lang['recommend_collations_order']);
38	38
39		- foreach($_ as $collation=>$selected) {
	39	+ foreach ($_ as $collation=>$selected) {
40	40	$collation = htmlentities($collation);
41	41	// if(substr($collation,0,4)!=='utf8') continue;
42		- if(strpos($collation,'sjis')===0) continue;
43		- if($collation=='recommend')
	42	+ if (strpos($collation, 'sjis') === 0) continue;
	43	+ if ($collation == 'recommend')
44	44	$output .= '<optgroup label="recommend">';
45		- elseif($collation=='unrecommend')
	45	+ elseif ($collation == 'unrecommend')
46	46	$output .= '</optgroup><optgroup label="unrecommend">';
47	47	else
48	48	$output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation);
		@@ -55,17 +55,17 @@ discard block
		block discarded – undo
55	55
56	56
57	57
58		-function sortItem($array=array(),$order='utf8mb4,utf8') {
	58	+function sortItem($array = array(), $order = 'utf8mb4,utf8'){
59	59	$rs = array('recommend'=>'');
60	60	$order = explode(',', $order);
61		- foreach($order as $v) {
62		- foreach($array as $name=>$sel) {
63		- if(strpos($name,$v)!==false) {
	61	+ foreach ($order as $v) {
	62	+ foreach ($array as $name=>$sel) {
	63	+ if (strpos($name, $v) !== false) {
64	64	$rs[$name] = $array[$name];
65	65	unset($array[$name]);
66	66	}
67	67	}
68	68	}
69		- $rs['unrecommend']='';
	69	+ $rs['unrecommend'] = '';
70	70	return $rs + $array;
71	71	}

		@@ -9,7 +9,7 @@ discard block
		block discarded – undo
9	9	}
10	10
11	11	$self = 'install/index.php';
12		-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
	12	+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
13	13	require_once("{$base_path}install/functions.php");
14	14
15	15	// set error reporting
		@@ -18,7 +18,7 @@ discard block
		block discarded – undo
18	18	if (is_file("{$base_path}assets/cache/siteManager.php")) {
19	19	include_once("{$base_path}assets/cache/siteManager.php");
20	20	}
21		-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
	21	+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
22	22	define('MGR_DIR', 'manager');
23	23	}
24	24
		@@ -38,26 +38,26 @@ discard block
		block discarded – undo
38	38	$moduleSQLDataFile = "setup.data.sql";
39	39	$moduleSQLResetFile = "setup.data.reset.sql";
40	40
41		-$moduleChunks = array (); // chunks - array : name, description, type - 0:file or 1:content, file or content
42		-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content
43		-$moduleSnippets = array (); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
44		-$modulePlugins = array (); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
45		-$moduleModules = array (); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
46		-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
47		-$moduleTVs = array (); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
	41	+$moduleChunks = array(); // chunks - array : name, description, type - 0:file or 1:content, file or content
	42	+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content
	43	+$moduleSnippets = array(); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
	44	+$modulePlugins = array(); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
	45	+$moduleModules = array(); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
	46	+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
	47	+$moduleTVs = array(); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
48	48	$moduleDependencies = array(); // module depedencies - array : module, table, column, type, name
49	49
50		-$errors= 0;
	50	+$errors = 0;
51	51
52	52	// get post back status
53	53	$isPostBack = (count($_POST));
54	54
55	55	$ph = ph();
56		-$ph = array_merge($ph,$_lang);
	56	+$ph = array_merge($ph, $_lang);
57	57	$ph['install_language'] = $install_language;
58	58
59	59	ob_start();
60		-$action= isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
	60	+$action = isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
61	61	if (!@include_once("actions/action_{$action}.php")) {
62	62	die ("Invalid install action attempted. [action={$action}]");
63	63	}
		@@ -65,5 +65,5 @@ discard block
		block discarded – undo
65	65	ob_end_clean();
66	66
67	67	$tpl = file_get_contents("{$base_path}install/template.tpl");
68		-echo parse($tpl,$ph);
	68	+echo parse($tpl, $ph);
69	69

		@@ -4,18 +4,18 @@
		block discarded – undo
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']) ? intval($_REQUEST['id']) : 0;

		@@ -1,16 +1,16 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	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		-switch($modx->manager->action) {
	6	+switch ($modx->manager->action) {
7	7	case 12:
8		- if(!$modx->hasPermission('edit_user')) {
	8	+ if (!$modx->hasPermission('edit_user')) {
9	9	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
10	10	}
11	11	break;
12	12	case 11:
13		- if(!$modx->hasPermission('new_user')) {
	13	+ if (!$modx->hasPermission('new_user')) {
14	14	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
15	15	}
16	16	break;
		@@ -21,17 +21,17 @@ discard block
		block discarded – undo
21	21	$user = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
22	22
23	23	// check to see the snippet editor isn't locked
24		-$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");
25		-if($username = $modx->db->getValue($rs)) {
	24	+$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='".$modx->getLoginUserID()."'");
	25	+if ($username = $modx->db->getValue($rs)) {
26	26	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "user"));
27	27	}
28	28	// end check for lock
29	29
30		-if($modx->manager->action == '12') {
	30	+if ($modx->manager->action == '12') {
31	31	// get user attribute
32	32	$rs = $modx->db->select('*', $modx->getFullTableName('user_attributes'), "internalKey = '{$user}'");
33	33	$userdata = $modx->db->getRow($rs);
34		- if(!$userdata) {
	34	+ if (!$userdata) {
35	35	$modx->webAlertAndQuit("No user returned!");
36	36	}
37	37
		@@ -39,10 +39,10 @@ discard block
		block discarded – undo
39	39	// get user settings
40	40	$rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");
41	41	$usersettings = array();
42		- while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
	42	+ while ($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
43	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') {
	44	+ foreach ($usersettings as $k => $v) {
	45	+ if ($k != 'manager_language' && $k != 'manager_theme') {
46	46	${$k} = $v;
47	47	}
48	48	}
		@@ -50,7 +50,7 @@ discard block
		block discarded – undo
50	50	// get user name
51	51	$rs = $modx->db->select('*', $modx->getFullTableName('manager_users'), "id = '{$user}'");
52	52	$usernamedata = $modx->db->getRow($rs);
53		- if(!$usernamedata) {
	53	+ if (!$usernamedata) {
54	54	$modx->webAlertAndQuit("No user returned while getting username!");
55	55	}
56	56	$_SESSION['itemname'] = $usernamedata['username'];
		@@ -62,14 +62,14 @@ discard block
		block discarded – undo
62	62	}
63	63
64	64	// avoid doubling htmlspecialchars (already encoded in DB)
65		-foreach($userdata as $key => $val) {
	65	+foreach ($userdata as $key => $val) {
66	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		-if($modx->manager->hasFormValues()) {
	72	+if ($modx->manager->hasFormValues()) {
73	73	$modx->manager->loadFormValues();
74	74	// restore post values
75	75	$userdata = array_merge($userdata, $_POST);
		@@ -84,13 +84,13 @@ discard block
		block discarded – undo
84	84	// include the country list language file
85	85	$_country_lang = array();
86	86	include_once "lang/country/english_country.inc.php";
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";
	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";
89	89	}
90	90	asort($_country_lang);
91	91
92	92	$displayStyle = ($_SESSION['browser'] === 'modern') ? 'table-row' : 'block';
93		-if($which_browser == 'default') {
	93	+if ($which_browser == 'default') {
94	94	$which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];
95	95	}
96	96	?>
		@@ -182,7 +182,7 @@ discard block
		block discarded – undo
182	182	document.userform.save.click();
183	183	},
184	184	delete: function() {
185		- <?php if($_GET['id'] == $modx->getLoginUserID()) { ?>
	185	+ <?php if ($_GET['id'] == $modx->getLoginUserID()) { ?>
186	186	alert("<?php echo $_lang['alert_delete_self']; ?>");
187	187	<?php } else { ?>
188	188	if(confirm("<?php echo $_lang['confirm_delete_user']; ?>") === true) {
		@@ -205,7 +205,7 @@ discard block
		block discarded – undo
205	205	$evtOut = $modx->invokeEvent("OnUserFormPrerender", array(
206	206	"id" => $user
207	207	));
208		- if(is_array($evtOut)) {
	208	+ if (is_array($evtOut)) {
209	209	echo implode("", $evtOut);
210	210	}
211	211	?>
		@@ -214,7 +214,7 @@ discard block
		block discarded – undo
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" ?>" />
215	215
216	216	<h1>
217		- <i class="fa fa fa-user"></i><?= ($usernamedata['username'] ? $usernamedata['username'] . '<small>(' . $usernamedata['id'] . ')</small>' : $_lang['user_title']) ?>
	217	+ <i class="fa fa fa-user"></i><?= ($usernamedata['username'] ? $usernamedata['username'].'<small>('.$usernamedata['id'].')</small>' : $_lang['user_title']) ?>
218	218	</h1>
219	219
220	220	<?php echo $_style['actionbuttons']['dynamic']['user'] ?>
		@@ -232,13 +232,13 @@ discard block
		block discarded – undo
232	232	<table border="0" cellspacing="0" cellpadding="3" class="table table--edit table--editUser">
233	233	<tr>
234	234	<td colspan="3"><span id="blocked" class="warning">
235		- <?php if($userdata['blocked'] == 1 \|\| ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) \|\| $userdata['failedlogins'] > 3) { ?>
	235	+ <?php if ($userdata['blocked'] == 1 \|\| ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) \|\| $userdata['failedlogins'] > 3) { ?>
236	236	<?php echo $_lang['user_is_blocked']; ?>
237	237	<?php } ?>
238	238	</span>
239	239	<br /></td>
240	240	</tr>
241		- <?php if(!empty($userdata['id'])) { ?>
	241	+ <?php if (!empty($userdata['id'])) { ?>
242	242	<tr id="showname" style="display: <?php echo ($modx->manager->action == '12' && (!isset($usernamedata['oldusername']) \|\| $usernamedata['oldusername'] == $usernamedata['username'])) ? $displayStyle : 'none'; ?> ">
243	243	<td colspan="3"><i class="<?php echo $_style["icons_user"] ?>"></i> <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>
244	244	<input type="hidden" name="oldusername" value="<?php echo $modx->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?>" />
		@@ -251,7 +251,7 @@ discard block
		block discarded – undo
251	251	<td><input type="text" name="newusername" class="inputBox" value="<?php echo $modx->htmlspecialchars($usernamedata['username']); ?>" onChange='documentDirty=true;' maxlength="100" /></td>
252	252	</tr>
253	253	<tr>
254		- <th><?php echo $modx->manager->action == '11' ? $_lang['password'] . ":" : $_lang['change_password_new'] . ":"; ?></th>
	254	+ <th><?php echo $modx->manager->action == '11' ? $_lang['password'].":" : $_lang['change_password_new'].":"; ?></th>
255	255	<td> </td>
256	256	<td><input name="newpasswordcheck" type="checkbox" onClick="changestate(document.userform.newpassword);changePasswordState(document.userform.newpassword);"<?php echo $modx->manager->action == "11" ? " checked disabled" : ""; ?>>
257	257	<input type="hidden" name="newpassword" value="<?php echo $modx->manager->action == "11" ? 1 : 0; ?>" onChange="documentDirty=true;" />
		@@ -305,8 +305,8 @@ discard block
		block discarded – undo
305	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') {
	308	+ while ($row = $modx->db->getRow($rs)) {
	309	+ if ($modx->manager->action == '11') {
310	310	$selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';
311	311	} else {
312	312	$selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';
		@@ -360,8 +360,8 @@ 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>";
	363	+ foreach ($_country_lang as $key => $country) {
	364	+ echo "<option value=\"$key\"".(isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '').">$country</option>";
365	365	}
366	366	?>
367	367	</select></td>
		@@ -387,7 +387,7 @@ discard block
		block discarded – undo
387	387	<td> </td>
388	388	<td><textarea type="text" name="comment" class="inputBox" rows="5" onChange="documentDirty=true;"><?php echo $modx->htmlspecialchars($userdata['comment']); ?></textarea></td>
389	389	</tr>
390		- <?php if($modx->manager->action == '12') { ?>
	390	+ <?php if ($modx->manager->action == '12') { ?>
391	391	<tr>
392	392	<th><?php echo $_lang['user_logincount']; ?>:</th>
393	393	<td> </td>
		@@ -424,7 +424,7 @@ discard block
		block discarded – undo
424	424	</tr>
425	425	<?php } ?>
426	426	</table>
427		- <?php if($_GET['id'] == $modx->getLoginUserID()) { ?>
	427	+ <?php if ($_GET['id'] == $modx->getLoginUserID()) { ?>
428	428	<p><?php echo $_lang['user_edit_self_msg']; ?></p>
429	429	<?php } ?>
430	430	</div>
		@@ -441,8 +441,8 @@ discard block
		block discarded – undo
441	441	<?php
442	442	$activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';
443	443	$dir = dir("includes/lang");
444		- while($file = $dir->read()) {
445		- if(strpos($file, ".inc.php") > 0) {
	444	+ while ($file = $dir->read()) {
	445	+ if (strpos($file, ".inc.php") > 0) {
446	446	$endpos = strpos($file, ".");
447	447	$languagename = substr($file, 0, $endpos);
448	448	$selectedtext = $languagename == $activelang ? "selected='selected'" : "";
		@@ -529,17 +529,17 @@ discard block
		block discarded – undo
529	529	<option value=""></option>
530	530	<?php
531	531	$dir = dir("media/style/");
532		- while($file = $dir->read()) {
533		- if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
	532	+ while ($file = $dir->read()) {
	533	+ if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
534	534	$themename = $file;
535		- if($themename === 'common') {
	535	+ if ($themename === 'common') {
536	536	continue;
537	537	}
538		- $attr = 'value="' . $themename . '" ';
539		- if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
	538	+ $attr = 'value="'.$themename.'" ';
	539	+ if (isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
540	540	$attr .= 'selected="selected" ';
541	541	}
542		- echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";
	542	+ echo "\t\t<option ".rtrim($attr).'>'.ucwords(str_replace("_", " ", $themename))."</option>\n";
543	543	}
544	544	}
545	545	$dir->close();
		@@ -556,12 +556,12 @@ discard block
		block discarded – undo
556	556	<td><select name="which_browser" class="inputBox" onChange="documentDirty=true;">
557	557	<?php
558	558	$selected = 'default' == $usersettings['which_browser'] \|\| !$usersettings['which_browser'] ? ' selected="selected"' : '';
559		- echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";
560		- foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
	559	+ echo '<option value="default"'.$selected.'>'.$_lang['option_default']."</option>\n";
	560	+ foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
561	561	$dir = str_replace('\\', '/', $dir);
562	562	$browser_name = substr($dir, strrpos($dir, '/') + 1);
563	563	$selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';
564		- echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";
	564	+ echo '<option value="'.$browser_name.'"'.$selected.'>'."{$browser_name}</option>\n";
565	565	}
566	566	?>
567	567	</select></td>
		@@ -588,7 +588,7 @@ discard block
		block discarded – undo
588	588	</tr>
589	589	<tr>
590	590	<td> </td>
591		- <td class='comment'><?php echo $_lang["uploadable_images_message"] . $_lang["user_upload_message"] ?></td>
	591	+ <td class='comment'><?php echo $_lang["uploadable_images_message"].$_lang["user_upload_message"] ?></td>
592	592	</tr>
593	593	<tr>
594	594	<th><?php echo $_lang["uploadable_media_title"] ?></th>
		@@ -600,7 +600,7 @@ discard block
		block discarded – undo
600	600	</tr>
601	601	<tr>
602	602	<td> </td>
603		- <td class='comment'><?php echo $_lang["uploadable_media_message"] . $_lang["user_upload_message"] ?></td>
	603	+ <td class='comment'><?php echo $_lang["uploadable_media_message"].$_lang["user_upload_message"] ?></td>
604	604	</tr>
605	605	<tr>
606	606	<th><?php echo $_lang["uploadable_flash_title"] ?></th>
		@@ -612,7 +612,7 @@ discard block
		block discarded – undo
612	612	</tr>
613	613	<tr>
614	614	<td> </td>
615		- <td class='comment'><?php echo $_lang["uploadable_flash_message"] . $_lang["user_upload_message"] ?></td>
	615	+ <td class='comment'><?php echo $_lang["uploadable_flash_message"].$_lang["user_upload_message"] ?></td>
616	616	</tr>
617	617	<tr>
618	618	<th><?php echo $_lang["uploadable_files_title"] ?></th>
		@@ -624,7 +624,7 @@ discard block
		block discarded – undo
624	624	</tr>
625	625	<tr>
626	626	<td> </td>
627		- <td class='comment'><?php echo $_lang["uploadable_files_message"] . $_lang["user_upload_message"] ?></td>
	627	+ <td class='comment'><?php echo $_lang["uploadable_files_message"].$_lang["user_upload_message"] ?></td>
628	628	</tr>
629	629	<tr class='row2'>
630	630	<th><?php echo $_lang["upload_maxsize_title"] ?></th>
		@@ -643,11 +643,11 @@ discard block
		block discarded – undo
643	643	$edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';
644	644	// invoke OnRichTextEditorRegister event
645	645	$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
646		- echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";
647		- if(is_array($evtOut)) {
648		- for($i = 0; $i < count($evtOut); $i++) {
	646	+ echo "<option value='none'".($edt == 'none' ? " selected='selected'" : "").">".$_lang["none"]."</option>\n";
	647	+ if (is_array($evtOut)) {
	648	+ for ($i = 0; $i < count($evtOut); $i++) {
649	649	$editor = $evtOut[$i];
650		- echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";
	650	+ echo "<option value='$editor'".($edt == $editor ? " selected='selected'" : "").">$editor</option>\n";
651	651	}
652	652	}
653	653	?>
		@@ -685,7 +685,7 @@ discard block
		block discarded – undo
685	685	<?php
686	686	// invoke OnInterfaceSettingsRender event
687	687	$evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");
688		- if(is_array($evtOut)) {
	688	+ if (is_array($evtOut)) {
689	689	echo implode("", $evtOut);
690	690	}
691	691	?>
		@@ -712,7 +712,7 @@ discard block
		block discarded – undo
712	712	function BrowseServer() {
713	713	var w = screen.width * 0.7;
714	714	var h = screen.height * 0.7;
715		- OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);
	715	+ OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);
716	716	}
717	717
718	718	function SetUrl(url, width, height, alt) {
		@@ -735,17 +735,17 @@ discard block
		block discarded – undo
735	735	</tr>
736	736	</table>
737	737	</div>
738		- <?php if($use_udperms == 1) {
	738	+ <?php if ($use_udperms == 1) {
739	739
740	740	$groupsarray = array();
741	741
742		- if($modx->manager->action == '12') { // only do this bit if the user is being edited
	742	+ if ($modx->manager->action == '12') { // only do this bit if the user is being edited
743	743	$rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");
744	744	$groupsarray = $modx->db->getColumn('user_group', $rs);
745	745	}
746	746	// retain selected doc groups between post
747		- if(is_array($_POST['user_groups'])) {
748		- foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
	747	+ if (is_array($_POST['user_groups'])) {
	748	+ foreach ($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
749	749	}
750	750	?>
751	751	<div class="tab-page" id="tabAccess">
		@@ -754,8 +754,8 @@ discard block
		block discarded – undo
754	754	<p><?php echo $_lang['access_permissions_user_message'] ?></p>
755	755	<?php
756	756	$rs = $modx->db->select('name, id', $modx->getFullTableName('membergroup_names'), '', 'name');
757		- while($row = $modx->db->getRow($rs)) {
758		- echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />";
	757	+ while ($row = $modx->db->getRow($rs)) {
	758	+ echo "<label><input type='checkbox' name='user_groups[]' value='".$row['id']."'".(in_array($row['id'], $groupsarray) ? " checked='checked'" : "")." />".$row['name']."</label><br />";
759	759	}
760	760	}
761	761	?>
		@@ -768,7 +768,7 @@ discard block
		block discarded – undo
768	768	$evtOut = $modx->invokeEvent("OnUserFormRender", array(
769	769	"id" => $user
770	770	));
771		- if(is_array($evtOut)) {
	771	+ if (is_array($evtOut)) {
772	772	echo implode("", $evtOut);
773	773	}
774	774	?>

		@@ -3,18 +3,18 @@
		block discarded – undo
3	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	switch($modx->manager->action) {
6		- case 107:
7		- if(!$modx->hasPermission('new_module')) {
8		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
9		- }
10		- break;
11		- case 108:
12		- if(!$modx->hasPermission('edit_module')) {
13		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
14		- }
15		- break;
16		- default:
17		- $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	6	+ case 107:
	7	+ if(!$modx->hasPermission('new_module')) {
	8	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	9	+ }
	10	+ break;
	11	+ case 108:
	12	+ if(!$modx->hasPermission('edit_module')) {
	13	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
	14	+ }
	15	+ break;
	16	+ default:
	17	+ $modx->webAlertAndQuit($_lang["error_no_privileges"]);
18	18	}
19	19	$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
20	20	// Get table names (alphabetical)

		@@ -1,15 +1,15 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4	4	}
5		-switch($modx->manager->action) {
	5	+switch ($modx->manager->action) {
6	6	case 107:
7		- if(!$modx->hasPermission('new_module')) {
	7	+ if (!$modx->hasPermission('new_module')) {
8	8	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
9	9	}
10	10	break;
11	11	case 108:
12		- if(!$modx->hasPermission('edit_module')) {
	12	+ if (!$modx->hasPermission('edit_module')) {
13	13	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
14	14	}
15	15	break;
		@@ -29,16 +29,16 @@ discard block
		block discarded – undo
29	29	$tbl_site_templates = $modx->getFullTableName('site_templates');
30	30	$tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
31	31	// create globally unique identifiers (guid)
32		-function createGUID() {
	32	+function createGUID(){
33	33	srand((double) microtime() * 1000000);
34	34	$r = rand();
35		- $u = uniqid(getmypid() . $r . (double) microtime() * 1000000, 1);
	35	+ $u = uniqid(getmypid().$r.(double) microtime() * 1000000, 1);
36	36	$m = md5($u);
37	37	return $m;
38	38	}
39	39
40	40	// check to see the module editor isn't locked
41		-if($lockedEl = $modx->elementIsLocked(6, $id)) {
	41	+if ($lockedEl = $modx->elementIsLocked(6, $id)) {
42	42	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));
43	43	}
44	44	// end check for lock
		@@ -46,29 +46,29 @@ discard block
		block discarded – undo
46	46	// Lock snippet for other users to edit
47	47	$modx->lockElement(6, $id);
48	48
49		-if(isset($_GET['id'])) {
	49	+if (isset($_GET['id'])) {
50	50	$rs = $modx->db->select('*', $tbl_site_modules, "id='{$id}'");
51	51	$content = $modx->db->getRow($rs);
52		- if(!$content) {
	52	+ if (!$content) {
53	53	$modx->webAlertAndQuit("Module not found for id '{$id}'.");
54	54	}
55	55	$content['properties'] = str_replace("&", "&", $content['properties']);
56	56	$_SESSION['itemname'] = $content['name'];
57		- if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
	57	+ if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
58	58	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
59	59	}
60	60	} else {
61	61	$_SESSION['itemname'] = $_lang["new_module"];
62	62	$content['wrap'] = '1';
63	63	}
64		-if($modx->manager->hasFormValues()) {
	64	+if ($modx->manager->hasFormValues()) {
65	65	$modx->manager->loadFormValues();
66	66	}
67	67
68	68	// Add lock-element JS-Script
69	69	$lockElementId = $id;
70	70	$lockElementType = 6;
71		-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
	71	+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
72	72	?>
73	73	<script type="text/javascript">
74	74	function loadDependencies() {
		@@ -415,7 +415,7 @@ discard block
		block discarded – undo
415	415	function BrowseServer() {
416	416	var w = screen.width * 0.7;
417	417	var h = screen.height * 0.7;
418		- OpenServerBrowser("<?= MODX_MANAGER_URL;?>media/browser/<?= $which_browser;?>/browser.php?Type=images", w, h);
	418	+ OpenServerBrowser("<?= MODX_MANAGER_URL; ?>media/browser/<?= $which_browser; ?>/browser.php?Type=images", w, h);
419	419	}
420	420
421	421	function SetUrl(url, width, height, alt) {
		@@ -435,7 +435,7 @@ discard block
		block discarded – undo
435	435	<?php
436	436	// invoke OnModFormPrerender event
437	437	$evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));
438		- if(is_array($evtOut)) {
	438	+ if (is_array($evtOut)) {
439	439	echo implode('', $evtOut);
440	440	}
441	441
		@@ -449,7 +449,7 @@ discard block
		block discarded – undo
449	449	<input type="hidden" name="mode" value="<?= $modx->manager->action ?>">
450	450
451	451	<h1>
452		- <i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>
	452	+ <i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>
453	453	</h1>
454	454
455	455	<?= $_style['actionbuttons']['dynamic']['element'] ?>
		@@ -474,8 +474,8 @@ discard block
		block discarded – undo
474	474	<div class="col-md-9 col-lg-10">
475	475	<div class="form-control-name clearfix">
476	476	<input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
477		- <?php if($modx->hasPermission('save_role')): ?>
478		- <label class="custom-control" title="<?= $_lang['lock_module'] . "\n" . $_lang['lock_module_msg'] ?>" tooltip>
	477	+ <?php if ($modx->hasPermission('save_role')): ?>
	478	+ <label class="custom-control" title="<?= $_lang['lock_module']."\n".$_lang['lock_module_msg'] ?>" tooltip>
479	479	<input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
480	480	<i class="fa fa-lock"></i>
481	481	</label>
		@@ -497,9 +497,9 @@ discard block
		block discarded – undo
497	497	<select name="categoryid" class="form-control" onchange="documentDirty=true;">
498	498	<option> </option>
499	499	<?php
500		- include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
501		- foreach(getCategories() as $n => $v) {
502		- echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";
	500	+ include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
	501	+ foreach (getCategories() as $n => $v) {
	502	+ echo "\t\t\t".'<option value="'.$v['id'].'"'.($content['category'] == $v['id'] ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v['category'])."</option>\n";
503	503	}
504	504	?>
505	505	</select>
		@@ -531,7 +531,7 @@ discard block
		block discarded – undo
531	531	<div class="form-group">
532	532	<div class="form-row">
533	533	<label for="disabled"><input name="disabled" id="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> />
534		- <?= ($content['disabled'] == 1 ? '<span class="text-danger">' . $_lang['module_disabled'] . '</span>' : $_lang['module_disabled']) ?></label>
	534	+ <?= ($content['disabled'] == 1 ? '<span class="text-danger">'.$_lang['module_disabled'].'</span>' : $_lang['module_disabled']) ?></label>
535	535	</div>
536	536	<div class="form-row">
537	537	<label for="parse_docblock">
		@@ -596,7 +596,7 @@ discard block
		block discarded – undo
596	596	</div>
597	597	<!-- HTML text editor end -->
598	598	</div>
599		- <?php if($modx->manager->action == '108'): ?>
	599	+ <?php if ($modx->manager->action == '108'): ?>
600	600	<!-- Dependencies -->
601	601	<div class="tab-page" id="tabDepend">
602	602	<h2 class="tab"><?= $_lang['settings_dependencies'] ?></h2>
		@@ -624,14 +624,14 @@ discard block
		block discarded – undo
624	624	LEFT JOIN {$tbl_site_templates} AS st ON st.id = smd.resource AND smd.type = 50
625	625	LEFT JOIN {$tbl_site_tmplvars} AS sv ON sv.id = smd.resource AND smd.type = 60", "smd.module='{$id}'", 'smd.type,name');
626	626
627		- include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
	627	+ include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
628	628	$grd = new DataGrid('', $ds, 0); // set page size to 0 t show all items
629	629	$grd->noRecordMsg = $_lang['no_records_found'];
630	630	$grd->cssClass = 'grid';
631	631	$grd->columnHeaderClass = 'gridHeader';
632	632	$grd->itemClass = 'gridItem';
633	633	$grd->altItemClass = 'gridAltItem';
634		- $grd->columns = $_lang['element_name'] . " ," . $_lang['type'];
	634	+ $grd->columns = $_lang['element_name']." ,".$_lang['type'];
635	635	$grd->fields = "name,type";
636	636	echo $grd->render();
637	637	?>
		@@ -644,13 +644,13 @@ discard block
		block discarded – undo
644	644	<h2 class="tab"><?= $_lang['access_permissions'] ?></h2>
645	645	<script type="text/javascript">tp.addTabPage(document.getElementById("tabPermissions"));</script>
646	646	<div class="container container-body">
647		- <?php if($use_udperms == 1) : ?>
	647	+ <?php if ($use_udperms == 1) : ?>
648	648	<?php
649	649	// fetch user access permissions for the module
650	650	$rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'");
651	651	$groupsarray = $modx->db->getColumn('usergroup', $rs);
652	652
653		- if($modx->hasPermission('access_permissions')) {
	653	+ if ($modx->hasPermission('access_permissions')) {
654	654	?>
655	655	<!-- User Group Access Permissions -->
656	656	<script type="text/javascript">
		@@ -678,22 +678,22 @@ discard block
		block discarded – undo
678	678	}
679	679	$chk = '';
680	680	$rs = $modx->db->select('name, id', $tbl_membergroup_names, '', 'name');
681		- while($row = $modx->db->getRow($rs)) {
	681	+ while ($row = $modx->db->getRow($rs)) {
682	682	$groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();
683	683	$checked = in_array($row['id'], $groupsarray);
684		- if($modx->hasPermission('access_permissions')) {
685		- if($checked) {
	684	+ if ($modx->hasPermission('access_permissions')) {
	685	+ if ($checked) {
686	686	$notPublic = true;
687	687	}
688		- $chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n";
	688	+ $chks .= '<label><input type="checkbox" name="usrgroups[]" value="'.$row['id'].'"'.($checked ? ' checked="checked"' : '').' onclick="makePublic(false)" /> '.$row['name']."</label><br />\n";
689	689	} else {
690		- if($checked) {
691		- $chks = '<input type="hidden" name="usrgroups[]" value="' . $row['id'] . '" />' . "\n" . $chks;
	690	+ if ($checked) {
	691	+ $chks = '<input type="hidden" name="usrgroups[]" value="'.$row['id'].'" />'."\n".$chks;
692	692	}
693	693	}
694	694	}
695		- if($modx->hasPermission('access_permissions')) {
696		- $chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks;
	695	+ if ($modx->hasPermission('access_permissions')) {
	696	+ $chks = '<label><input type="checkbox" name="chkallgroups"'.(!$notPublic ? ' checked="checked"' : '').' onclick="makePublic(true)" /><span class="warning"> '.$_lang['all_usr_groups'].'</span></label><br />'."\n".$chks;
697	697	}
698	698	echo $chks;
699	699	?>
		@@ -714,7 +714,7 @@ discard block
		block discarded – undo
714	714	<?php
715	715	// invoke OnModFormRender event
716	716	$evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id));
717		- if(is_array($evtOut)) {
	717	+ if (is_array($evtOut)) {
718	718	echo implode('', $evtOut);
719	719	}
720	720	?>

evolution-cms / evolution

Push — develop ( 00fbcc...663a1f )

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Switch Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +57 added lines, -57 removed lines patch added patch discarded remove patch

Switch Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch

Switch Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +35 added lines, -35 removed lines patch added patch discarded remove patch