evolution-cms / evolution

install/setup.info.php

Indentation +64 added lines, -64 removed lines

@@ -170,70 +170,70 @@
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
-		if (intval($params['shareparams']) || !empty($params['dependencies'])) {
-			$dependencies = explode(',', $params['dependencies']);
-			foreach ($dependencies as $dependency) {
-				$dependency = explode(':', $dependency);
-				switch (trim($dependency[0])) {
-					case 'template':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'templates',
-							'column' => 'templatename',
-							'type' => 50,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'tv':
-					case 'tmplvar':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'tmplvars',
-							'column' => 'name',
-							'type' => 60,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'chunk':
-					case 'htmlsnippet':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'htmlsnippets',
-							'column' => 'name',
-							'type' => 10,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'snippet':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'snippets',
-							'column' => 'name',
-							'type' => 40,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'plugin':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'plugins',
-							'column' => 'name',
-							'type' => 30,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'resource':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'content',
-							'column' => 'pagetitle',
-							'type' => 20,
-							'name' => trim($dependency[1])
-						);
-						break;
-				}
-			}
-		}
+        if (intval($params['shareparams']) || !empty($params['dependencies'])) {
+            $dependencies = explode(',', $params['dependencies']);
+            foreach ($dependencies as $dependency) {
+                $dependency = explode(':', $dependency);
+                switch (trim($dependency[0])) {
+                    case 'template':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'templates',
+                            'column' => 'templatename',
+                            'type' => 50,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'tv':
+                    case 'tmplvar':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'tmplvars',
+                            'column' => 'name',
+                            'type' => 60,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'chunk':
+                    case 'htmlsnippet':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'htmlsnippets',
+                            'column' => 'name',
+                            'type' => 10,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'snippet':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'snippets',
+                            'column' => 'name',
+                            'type' => 40,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'plugin':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'plugins',
+                            'column' => 'name',
+                            'type' => 30,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'resource':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'content',
+                            'column' => 'pagetitle',
+                            'type' => 20,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                }
+            }
+        }
     }
     $d->close();
 }

install/actions/action_install.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 <form name="install" id="install_form" action="index.php?action=options" method="post">
 <?php
 if ($errors == 0) {
-	// check if install folder is removeable
+    // check if install folder is removeable
     if (is_writable("../install")) { ?>
 <span id="removeinstall" style="float:left;cursor:pointer;color:#505050;line-height:18px;" onclick="var chk=document.install.rminstaller; if(chk) chk.checked=!chk.checked;"><input type="checkbox" name="rminstaller" onclick="event.cancelBubble=true;" <?php echo (empty ($errors) ? 'checked="checked"' : '') ?> style="cursor:default;" /><?php echo $_lang['remove_install_folder_auto'] ?></span>
 <?php 

install/connection.databasetest.php

Indentation +2 added lines, -2 removed lines

@@ -8,10 +8,10 @@
 $self = 'install/connection.databasetest.php';
 $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");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once("lang.php");
 

install/functions.php

Indentation +69 added lines, -69 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 function install_sessionCheck()
 {
-	global $_lang;
+    global $_lang;
 	
-	// session loop-back tester
-	if(!isset($_GET['action']) || $_GET['action']!=='mode')
-	{
-		if(!isset($_SESSION['test']) || $_SESSION['test']!=1)
-		{
-			echo '
+    // session loop-back tester
+    if(!isset($_GET['action']) || $_GET['action']!=='mode')
+    {
+        if(!isset($_SESSION['test']) || $_SESSION['test']!=1)
+        {
+            echo '
 <html>
 <head>
 	<title>Install Problem</title>
@@ -27,86 +27,86 @@ 
 	</div>
 </body>
 </html>';
-		exit;
-		}
-	}
+        exit;
+        }
+    }
 }
 
 function parse($src,$ph,$left='[+',$right='+]')
 {
-	foreach($ph as $k=>$v)
-	{
-		$k = $left . $k . $right;
-		$src = str_replace($k,$v,$src);
-	}
-	return $src;
+    foreach($ph as $k=>$v)
+    {
+        $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'];
-	else                                $installmode = get_installmode();
+    if(isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode'];
+    else                                $installmode = get_installmode();
 
-	$ph['pagetitle']     = $_lang['modx_install'];
-	$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['footer1']       = $_lang['modx_footer1'];
-	$ph['footer2']       = $_lang['modx_footer2'];
-	$ph['current_year']  = date('Y');
-	return $ph;
+    $ph['pagetitle']     = $_lang['modx_install'];
+    $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['footer1']       = $_lang['modx_footer1'];
+    $ph['footer2']       = $_lang['modx_footer2'];
+    $ph['current_year']  = date('Y');
+    return $ph;
 }
 
 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'];
-	else
-	{
-		include_once("{$base_path}manager/includes/config.inc.php");
+    $conf_path = "{$base_path}manager/includes/config.inc.php";
+    if (!is_file($conf_path)) $installmode = 0;
+    elseif(isset($_POST['installmode'])) $installmode = $_POST['installmode'];
+    else
+    {
+        include_once("{$base_path}manager/includes/config.inc.php");
 		
-		if(!isset($dbase) || empty($dbase)) $installmode = 0;
-		else
-		{
-			$conn = mysqli_connect($database_server, $database_user, $database_password);
-			if($conn)
-			{
-				$_SESSION['database_server']   = $database_server;
-				$_SESSION['database_user']     = $database_user;
-				$_SESSION['database_password'] = $database_password;
+        if(!isset($dbase) || empty($dbase)) $installmode = 0;
+        else
+        {
+            $conn = mysqli_connect($database_server, $database_user, $database_password);
+            if($conn)
+            {
+                $_SESSION['database_server']   = $database_server;
+                $_SESSION['database_user']     = $database_user;
+                $_SESSION['database_password'] = $database_password;
 				
-				$dbase = trim($dbase, '`');
-				$rs = mysqli_select_db($conn, $dbase);
-			}
-			else $rs = false;
+                $dbase = trim($dbase, '`');
+                $rs = mysqli_select_db($conn, $dbase);
+            }
+            else $rs = false;
 			
-			if($rs)
-			{
-				$_SESSION['dbase']                      = $dbase;
-				$_SESSION['table_prefix']               = $table_prefix;
-				$_SESSION['database_collation']         = 'utf8_general_ci';
-				$_SESSION['database_connection_method'] = 'SET CHARACTER SET';
+            if($rs)
+            {
+                $_SESSION['dbase']                      = $dbase;
+                $_SESSION['table_prefix']               = $table_prefix;
+                $_SESSION['database_collation']         = 'utf8_general_ci';
+                $_SESSION['database_connection_method'] = 'SET CHARACTER SET';
 				
-				$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)
-				{
-					$row = mysqli_fetch_assoc($rs);
-					$settings_version = $row['setting_value'];
-				}
-				else $settings_version = '';
+                $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)
+                {
+                    $row = mysqli_fetch_assoc($rs);
+                    $settings_version = $row['setting_value'];
+                }
+                else $settings_version = '';
 				
-				if (empty($settings_version)) $installmode = 0;
-				else                          $installmode = 1;
-			}
-			else $installmode = 1;
-		}
-	}
-	return $installmode;
+                if (empty($settings_version)) $installmode = 0;
+                else                          $installmode = 1;
+            }
+            else $installmode = 1;
+        }
+    }
+    return $installmode;
 }

install/connection.servertest.php

Indentation +3 added lines, -3 removed lines

@@ -7,10 +7,10 @@ 
 $self = 'install/connection.servertest.php';
 $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");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once("lang.php");
 
@@ -31,7 +31,7 @@ 
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         $strictMode = false;
         foreach ($modes as $mode) {
-    		    if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
+                if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) $strictMode = true;
         }
         if ($strictMode) $output .= '<br /><span style="color:#FF0000;"> '.$_lang['strict_mode'].'</span>';
     }

install/connection.collation.php

Indentation +8 added lines, -8 removed lines

@@ -7,10 +7,10 @@ 
 $self = 'install/connection.collation.php';
 $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");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once('lang.php');
 
@@ -59,12 +59,12 @@ 
     $rs = array('recommend'=>'');
     $order = explode(',', $order);
     foreach($order as $v) {
-    	foreach($array as $name=>$sel) {
-        	if(strpos($name,$v)!==false) {
-        		$rs[$name] = $array[$name];
-        		unset($array[$name]);
-        	}
-    	}
+        foreach($array as $name=>$sel) {
+            if(strpos($name,$v)!==false) {
+                $rs[$name] = $array[$name];
+                unset($array[$name]);
+            }
+        }
     }
     $rs['unrecommend']='';
     return $rs + $array;

install/index.php

Indentation +2 added lines, -2 removed lines

@@ -16,10 +16,10 @@
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
 
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$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');
+    define('MGR_DIR', 'manager');
 }
 
 

manager/actions/mutate_user.dynamic.php

Switch Indentation +12 added lines, -12 removed lines

@@ -4,18 +4,18 @@
 }

 

 switch($modx->manager->action) {

-	case 12:

-		if(!$modx->hasPermission('edit_user')) {

-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-		}

-		break;

-	case 11:

-		if(!$modx->hasPermission('new_user')) {

-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-		}

-		break;

-	default:

-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

+	    case 12:

+		    if(!$modx->hasPermission('edit_user')) {

+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+		    }

+		    break;

+	    case 11:

+		    if(!$modx->hasPermission('new_user')) {

+			    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+		    }

+		    break;

+	    default:

+		    $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

 $user = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;

Indentation +158 added lines, -158 removed lines

@@ -1,21 +1,21 @@ 
 <?php

 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 

 switch($modx->manager->action) {

-	case 12:

-		if(!$modx->hasPermission('edit_user')) {

-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-		}

-		break;

-	case 11:

-		if(!$modx->hasPermission('new_user')) {

-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

-		}

-		break;

-	default:

-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

+    case 12:

+        if(!$modx->hasPermission('edit_user')) {

+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+        }

+        break;

+    case 11:

+        if(!$modx->hasPermission('new_user')) {

+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);

+        }

+        break;

+    default:

+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

 $user = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;

@@ -23,75 +23,75 @@ 
 // check to see the snippet editor isn't locked

 $rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");

 if($username = $modx->db->getValue($rs)) {

-	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "user"));

+    $modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "user"));

 }

 // end check for lock

 

 if($modx->manager->action == '12') {

-	// get user attribute

-	$rs = $modx->db->select('*', $modx->getFullTableName('user_attributes'), "internalKey = '{$user}'");

-	$userdata = $modx->db->getRow($rs);

-	if(!$userdata) {

-		$modx->webAlertAndQuit("No user returned!");

-	}

-

-

-	// get user settings

-	$rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");

-	$usersettings = array();

-	while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];

-	// manually extract so that user display settings are not overwritten

-	foreach($usersettings as $k => $v) {

-		if($k != 'manager_language' && $k != 'manager_theme') {

-			${$k} = $v;

-		}

-	}

-

-	// get user name

-	$rs = $modx->db->select('*', $modx->getFullTableName('manager_users'), "id = '{$user}'");

-	$usernamedata = $modx->db->getRow($rs);

-	if(!$usernamedata) {

-		$modx->webAlertAndQuit("No user returned while getting username!");

-	}

-	$_SESSION['itemname'] = $usernamedata['username'];

+    // get user attribute

+    $rs = $modx->db->select('*', $modx->getFullTableName('user_attributes'), "internalKey = '{$user}'");

+    $userdata = $modx->db->getRow($rs);

+    if(!$userdata) {

+        $modx->webAlertAndQuit("No user returned!");

+    }

+

+

+    // get user settings

+    $rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");

+    $usersettings = array();

+    while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];

+    // manually extract so that user display settings are not overwritten

+    foreach($usersettings as $k => $v) {

+        if($k != 'manager_language' && $k != 'manager_theme') {

+            ${$k} = $v;

+        }

+    }

+

+    // get user name

+    $rs = $modx->db->select('*', $modx->getFullTableName('manager_users'), "id = '{$user}'");

+    $usernamedata = $modx->db->getRow($rs);

+    if(!$usernamedata) {

+        $modx->webAlertAndQuit("No user returned while getting username!");

+    }

+    $_SESSION['itemname'] = $usernamedata['username'];

 } else {

-	$userdata = array();

-	$usersettings = array();

-	$usernamedata = array();

-	$_SESSION['itemname'] = $_lang["new_user"];

+    $userdata = array();

+    $usersettings = array();

+    $usernamedata = array();

+    $_SESSION['itemname'] = $_lang["new_user"];

 }

 

 // avoid doubling htmlspecialchars (already encoded in DB)

 foreach($userdata as $key => $val) {

-	$userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);

+    $userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);

 };

 $usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']);

 

 // restore saved form

 $formRestored = false;

 if($modx->manager->hasFormValues()) {

-	$modx->manager->loadFormValues();

-	// restore post values

-	$userdata = array_merge($userdata, $_POST);

-	$userdata['dob'] = $modx->toTimeStamp($userdata['dob']);

-	$usernamedata['username'] = $userdata['newusername'];

-	$usernamedata['oldusername'] = $_POST['oldusername'];

-	$usersettings = array_merge($usersettings, $userdata);

-	$usersettings['allowed_days'] = is_array($_POST['allowed_days']) ? implode(",", $_POST['allowed_days']) : "";

-	extract($usersettings, EXTR_OVERWRITE);

+    $modx->manager->loadFormValues();

+    // restore post values

+    $userdata = array_merge($userdata, $_POST);

+    $userdata['dob'] = $modx->toTimeStamp($userdata['dob']);

+    $usernamedata['username'] = $userdata['newusername'];

+    $usernamedata['oldusername'] = $_POST['oldusername'];

+    $usersettings = array_merge($usersettings, $userdata);

+    $usersettings['allowed_days'] = is_array($_POST['allowed_days']) ? implode(",", $_POST['allowed_days']) : "";

+    extract($usersettings, EXTR_OVERWRITE);

 }

 

 // include the country list language file

 $_country_lang = array();

 include_once "lang/country/english_country.inc.php";

 if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {

-	include_once "lang/country/" . $manager_language . "_country.inc.php";

+    include_once "lang/country/" . $manager_language . "_country.inc.php";

 }

 asort($_country_lang);

 

 $displayStyle = ($_SESSION['browser'] === 'modern') ? 'table-row' : 'block';

 if($which_browser == 'default') {

-	$which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];

+    $which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];

 }

 ?>

 <script type="text/javascript">

@@ -201,14 +201,14 @@ 
 <form action="index.php?a=32" method="post" name="userform">

 	<?php

 

-	// invoke OnUserFormPrerender event

-	$evtOut = $modx->invokeEvent("OnUserFormPrerender", array(

-		"id" => $user

-	));

-	if(is_array($evtOut)) {

-		echo implode("", $evtOut);

-	}

-	?>

+    // invoke OnUserFormPrerender event

+    $evtOut = $modx->invokeEvent("OnUserFormPrerender", array(

+        "id" => $user

+    ));

+    if(is_array($evtOut)) {

+        echo implode("", $evtOut);

+    }

+    ?>

 	<input type="hidden" name="mode" value="<?php echo $modx->manager->action; ?>">

 	<input type="hidden" name="id" value="<?php echo $user ?>">

 	<input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" />

@@ -301,21 +301,21 @@ 
 						<td>&nbsp;</td>

 						<td><?php

 

-							$rs = $modx->db->select('name, id', '[+prefix+]user_roles', ($modx->hasPermission('save_role')) ? '' : 'id != 1');

-							?>

+                            $rs = $modx->db->select('name, id', '[+prefix+]user_roles', ($modx->hasPermission('save_role')) ? '' : 'id != 1');

+                            ?>

 							<select name="role" class="inputBox" onChange='documentDirty=true;' style="width:300px">

 								<?php

-								while($row = $modx->db->getRow($rs)) {

-									if($modx->manager->action == '11') {

-										$selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';

-									} else {

-										$selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';

-									}

-									?>

+                                while($row = $modx->db->getRow($rs)) {

+                                    if($modx->manager->action == '11') {

+                                        $selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';

+                                    } else {

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

+                                    }

+                                    ?>

 									<option value="<?php echo $row['id']; ?>"<?php echo $selectedtext; ?>><?php echo $row['name']; ?></option>

 									<?php

-								}

-								?>

+                                }

+                                ?>

 							</select></td>

 					</tr>

 					<tr>

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

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

 								<?php

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

-									echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";

-								}

-								?>

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

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

+                                }

+                                ?>

 							</select></td>

 					</tr>

 					<tr>

@@ -439,21 +439,21 @@ 
 						<td><select name="manager_language" class="inputBox" onChange="documentDirty=true">

 								<option value=""></option>

 								<?php

-								$activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';

-								$dir = dir("includes/lang");

-								while($file = $dir->read()) {

-									if(strpos($file, ".inc.php") > 0) {

-										$endpos = strpos($file, ".");

-										$languagename = substr($file, 0, $endpos);

-										$selectedtext = $languagename == $activelang ? "selected='selected'" : "";

-										?>

+                                $activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';

+                                $dir = dir("includes/lang");

+                                while($file = $dir->read()) {

+                                    if(strpos($file, ".inc.php") > 0) {

+                                        $endpos = strpos($file, ".");

+                                        $languagename = substr($file, 0, $endpos);

+                                        $selectedtext = $languagename == $activelang ? "selected='selected'" : "";

+                                        ?>

 										<option value="<?php echo $languagename; ?>" <?php echo $selectedtext; ?>><?php echo ucwords(str_replace("_", " ", $languagename)); ?></option>

 										<?php

 

-									}

-								}

-								$dir->close();

-								?>

+                                    }

+                                }

+                                $dir->close();

+                                ?>

 							</select></td>

 					</tr>

 					<tr>

@@ -528,22 +528,22 @@ 
 						<td><select name="manager_theme" class="inputBox" onChange="documentDirty=true;document.userform.theme_refresher.value = Date.parse(new Date());">

 								<option value=""></option>

 								<?php

-								$dir = dir("media/style/");

-								while($file = $dir->read()) {

-									if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {

-										$themename = $file;

-										if($themename === 'common') {

-											continue;

-										}

-										$attr = 'value="' . $themename . '" ';

-										if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {

-											$attr .= 'selected="selected" ';

-										}

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

-									}

-								}

-								$dir->close();

-								?>

+                                $dir = dir("media/style/");

+                                while($file = $dir->read()) {

+                                    if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {

+                                        $themename = $file;

+                                        if($themename === 'common') {

+                                            continue;

+                                        }

+                                        $attr = 'value="' . $themename . '" ';

+                                        if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {

+                                            $attr .= 'selected="selected" ';

+                                        }

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

+                                    }

+                                }

+                                $dir->close();

+                                ?>

 							</select>

 							<input type="hidden" name="theme_refresher" value=""></td>

 					</tr>

@@ -555,15 +555,15 @@ 
 						<th><?php echo $_lang["which_browser_title"] ?></th>

 						<td><select name="which_browser" class="inputBox" onChange="documentDirty=true;">

 								<?php

-								$selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : '';

-								echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";

-								foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {

-									$dir = str_replace('\\', '/', $dir);

-									$browser_name = substr($dir, strrpos($dir, '/') + 1);

-									$selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';

-									echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";

-								}

-								?>

+                                $selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : '';

+                                echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";

+                                foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {

+                                    $dir = str_replace('\\', '/', $dir);

+                                    $browser_name = substr($dir, strrpos($dir, '/') + 1);

+                                    $selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';

+                                    echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";

+                                }

+                                ?>

 							</select></td>

 					</tr>

 					<tr>

@@ -640,17 +640,17 @@ 
 								<option value=""></option>

 								<?php

 

-								$edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';

-								// invoke OnRichTextEditorRegister event

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

-								echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";

-								if(is_array($evtOut)) {

-									for($i = 0; $i < count($evtOut); $i++) {

-										$editor = $evtOut[$i];

-										echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";

-									}

-								}

-								?>

+                                $edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';

+                                // invoke OnRichTextEditorRegister event

+                                $evtOut = $modx->invokeEvent("OnRichTextEditorRegister");

+                                echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";

+                                if(is_array($evtOut)) {

+                                    for($i = 0; $i < count($evtOut); $i++) {

+                                        $editor = $evtOut[$i];

+                                        echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";

+                                    }

+                                }

+                                ?>

 							</select></td>

 					</tr>

 					<tr id='editorRow1' style="display: <?php echo $use_editor == 1 ? $displayStyle : 'none'; ?>">

@@ -683,12 +683,12 @@ 
 					</tr>

 				</table>

 				<?php

-				// invoke OnInterfaceSettingsRender event

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

-				if(is_array($evtOut)) {

-					echo implode("", $evtOut);

-				}

-				?>

+                // invoke OnInterfaceSettingsRender event

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

+                if(is_array($evtOut)) {

+                    echo implode("", $evtOut);

+                }

+                ?>

 			</div>

 

 			<!-- Photo -->

@@ -737,39 +737,39 @@ 
 			</div>

 			<?php if($use_udperms == 1) {

 

-			$groupsarray = array();

-

-			if($modx->manager->action == '12') { // only do this bit if the user is being edited

-				$rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");

-				$groupsarray = $modx->db->getColumn('user_group', $rs);

-			}

-			// retain selected doc groups between post

-			if(is_array($_POST['user_groups'])) {

-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;

-			}

-			?>

+            $groupsarray = array();

+

+            if($modx->manager->action == '12') { // only do this bit if the user is being edited

+                $rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");

+                $groupsarray = $modx->db->getColumn('user_group', $rs);

+            }

+            // retain selected doc groups between post

+            if(is_array($_POST['user_groups'])) {

+                foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;

+            }

+            ?>

 			<div class="tab-page" id="tabAccess">

 				<h2 class="tab"><?php echo $_lang["access_permissions"] ?></h2>

 				<script type="text/javascript">tpUser.addTabPage(document.getElementById("tabAccess"));</script>

 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>

 				<?php

-				$rs = $modx->db->select('name, id', $modx->getFullTableName('membergroup_names'), '', 'name');

-				while($row = $modx->db->getRow($rs)) {

-					echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />";

-				}

-				}

-				?>

+                $rs = $modx->db->select('name, id', $modx->getFullTableName('membergroup_names'), '', 'name');

+                while($row = $modx->db->getRow($rs)) {

+                    echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />";

+                }

+                }

+                ?>

 			</div>

 		</div>

 	</div>

 	<input type="submit" name="save" style="display:none">

 	<?php

-	// invoke OnUserFormRender event

-	$evtOut = $modx->invokeEvent("OnUserFormRender", array(

-		"id" => $user

-	));

-	if(is_array($evtOut)) {

-		echo implode("", $evtOut);

-	}

-	?>

+    // invoke OnUserFormRender event

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

+        "id" => $user

+    ));

+    if(is_array($evtOut)) {

+        echo implode("", $evtOut);

+    }

+    ?>

 </form>

manager/actions/mutate_web_user.dynamic.php

Switch Indentation +12 added lines, -12 removed lines

@@ -4,18 +4,18 @@
 }

 

 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;

Indentation +89 added lines, -89 removed lines

@@ -1,21 +1,21 @@ 
 <?php

 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 

 switch($modx->manager->action) {

-	case 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;

@@ -24,64 +24,64 @@ 
 // 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)) {

-	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "web user"));

+    $modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "web user"));

 }

 // end check for lock

 

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

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

-	extract($usersettings, EXTR_OVERWRITE);

-

-	// get user name

-	$rs = $modx->db->select('*', $modx->getFullTableName('web_users'), "id = '{$user}'");

-	$usernamedata = $modx->db->getRow($rs);

-	if(!$usernamedata) {

-		$modx->webAlertAndQuit("No user returned while getting username!");

-	}

-	$_SESSION['itemname'] = $usernamedata['username'];

+    // get user attributes

+    $rs = $modx->db->select('*', $modx->getFullTableName('web_user_attributes'), "internalKey = '{$user}'");

+    $userdata = $modx->db->getRow($rs);

+    if(!$userdata) {

+        $modx->webAlertAndQuit("No user returned!");

+    }

+

+    // get user settings

+    $rs = $modx->db->select('*', $modx->getFullTableName('web_user_settings'), "webuser = '{$user}'");

+    $usersettings = array();

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

+        $modx->webAlertAndQuit("No user returned while getting username!");

+    }

+    $_SESSION['itemname'] = $usernamedata['username'];

 } else {

-	$userdata = array();

-	$usersettings = array();

-	$usernamedata = array();

-	$_SESSION['itemname'] = $_lang["new_web_user"];

+    $userdata = array();

+    $usersettings = array();

+    $usernamedata = array();

+    $_SESSION['itemname'] = $_lang["new_web_user"];

 }

 

 // avoid doubling htmlspecialchars (already encoded in DB)

 foreach($userdata as $key => $val) {

-	$userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);

+    $userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);

 };

 $usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']);

 

 // restore saved form

 $formRestored = false;

 if($modx->manager->hasFormValues()) {

-	$modx->manager->loadFormValues();

-	// restore post values

-	$userdata = array_merge($userdata, $_POST);

-	$userdata['dob'] = $modx->toTimeStamp($userdata['dob']);

-	$usernamedata['username'] = $userdata['newusername'];

-	$usernamedata['oldusername'] = $_POST['oldusername'];

-	$usersettings = array_merge($usersettings, $userdata);

-	$usersettings['allowed_days'] = is_array($_POST['allowed_days']) ? implode(",", $_POST['allowed_days']) : "";

-	extract($usersettings, EXTR_OVERWRITE);

+    $modx->manager->loadFormValues();

+    // restore post values

+    $userdata = array_merge($userdata, $_POST);

+    $userdata['dob'] = $modx->toTimeStamp($userdata['dob']);

+    $usernamedata['username'] = $userdata['newusername'];

+    $usernamedata['oldusername'] = $_POST['oldusername'];

+    $usersettings = array_merge($usersettings, $userdata);

+    $usersettings['allowed_days'] = is_array($_POST['allowed_days']) ? implode(",", $_POST['allowed_days']) : "";

+    extract($usersettings, EXTR_OVERWRITE);

 }

 

 // include the country list language file

 $_country_lang = array();

 if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {

-	include_once "lang/country/" . $manager_language . "_country.inc.php";

+    include_once "lang/country/" . $manager_language . "_country.inc.php";

 } else {

-	include_once "lang/country/english_country.inc.php";

+    include_once "lang/country/english_country.inc.php";

 }

 asort($_country_lang);

 

@@ -189,12 +189,12 @@ 
 

 <form action="index.php?a=89" method="post" name="userform">

 	<?php

-	// invoke OnWUsrFormPrerender event

-	$evtOut = $modx->invokeEvent("OnWUsrFormPrerender", array("id" => $user));

-	if(is_array($evtOut)) {

-		echo implode("", $evtOut);

-	}

-	?>

+    // invoke OnWUsrFormPrerender event

+    $evtOut = $modx->invokeEvent("OnWUsrFormPrerender", array("id" => $user));

+    if(is_array($evtOut)) {

+        echo implode("", $evtOut);

+    }

+    ?>

 	<input type="hidden" name="mode" value="<?php echo $modx->manager->action; ?>" />

 	<input type="hidden" name="id" value="<?php echo $user ?>" />

 	<input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" />

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

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

 								<?php

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

-									echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";

-								}

-								?>

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

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

+                                }

+                                ?>

 							</select></td>

 					</tr>

 					<tr>

@@ -387,8 +387,8 @@ 
 								<i onClick="document.userform.blockedafter.value=''; return true;" class="clearDate <?php echo $_style["actions_calendar_delete"] ?>" data-tooltip="<?php echo $_lang['remove_date']; ?>"></i></td>

 						</tr>

 						<?php

-					}

-					?>

+                    }

+                    ?>

 				</table>

 			</div>

 

@@ -496,40 +496,40 @@ 
 				</table>

 			</div>

 			<?php

-			if($use_udperms == 1) {

-

-			$groupsarray = array();

-

-			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($use_udperms == 1) {

+

+            $groupsarray = array();

+

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

+            }

+            ?>

 			<div class="tab-page" id="tabPermissions">

 				<h2 class="tab"><?php echo $_lang['web_access_permissions'] ?></h2>

 				<script type="text/javascript">tpUser.addTabPage(document.getElementById("tabPermissions"));</script>

 				<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 />';

-				}

-				}

-				?>

+                $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 />';

+                }

+                }

+                ?>

 			</div>

 			<?php

-			// invoke OnWUsrFormRender event

-			$evtOut = $modx->invokeEvent("OnWUsrFormRender", array(

-				"id" => $user

-			));

-			if(is_array($evtOut)) {

-				echo implode("", $evtOut);

-			}

-			?>

+            // invoke OnWUsrFormRender event

+            $evtOut = $modx->invokeEvent("OnWUsrFormRender", array(

+                "id" => $user

+            ));

+            if(is_array($evtOut)) {

+                echo implode("", $evtOut);

+            }

+            ?>

 		</div>

 	</div>

 	<input type="submit" name="save" style="display:none">