evolution-cms / evolution

manager/actions/welcome.static.php

Indentation +144 added lines, -144 removed lines

@@ -1,13 +1,13 @@ 
 <?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.');

 }

 

 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes

 

 if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

-	// seems to be a new install - send the user to the configuration page

-	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

+    // seems to be a new install - send the user to the configuration page

+    exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

 }

 

 // set placeholders

@@ -17,92 +17,92 @@ 
 

 // setup message info

 if($modx->hasPermission('messages')) {

-	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

-	$_SESSION['nrtotalmessages'] = $nrtotalmessages;

-	$_SESSION['nrnewmessages'] = $nrnewmessages;

-

-	$msg = array();

-	$msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';

-	$msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);

-	$nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';

-	$welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);

-	$msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);

-	$ph['MessageInfo'] = implode("\n", $msg);

+    include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

+    $_SESSION['nrtotalmessages'] = $nrtotalmessages;

+    $_SESSION['nrnewmessages'] = $nrnewmessages;

+

+    $msg = array();

+    $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);

+    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';

+    $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);

+    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';

+    $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);

+    $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);

+    $ph['MessageInfo'] = implode("\n", $msg);

 }

 

 // setup icons

 if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {

-	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

-	$ph['SecurityIcon'] = wrapIcon($icon, 75);

+    $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

+    $ph['SecurityIcon'] = wrapIcon($icon, 75);

 }

 if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {

-	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

-	$ph['WebUserIcon'] = wrapIcon($icon, 99);

+    $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

+    $ph['WebUserIcon'] = wrapIcon($icon, 99);

 }

 if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {

-	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

-	$ph['ModulesIcon'] = wrapIcon($icon, 106);

+    $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

+    $ph['ModulesIcon'] = wrapIcon($icon, 106);

 }

 if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

-	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

-	$ph['ResourcesIcon'] = wrapIcon($icon, 76);

+    $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

+    $ph['ResourcesIcon'] = wrapIcon($icon, 76);

 }

 if($modx->hasPermission('bk_manager')) {

-	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

-	$ph['BackupIcon'] = wrapIcon($icon, 93);

+    $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

+    $ph['BackupIcon'] = wrapIcon($icon, 93);

 }

 if($modx->hasPermission('help')) {

-	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

-	$ph['HelpIcon'] = wrapIcon($icon, 9);

+    $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

+    $ph['HelpIcon'] = wrapIcon($icon, 9);

 }

 

 if($modx->hasPermission('new_document')) {

-	$icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';

-	$ph['ResourceIcon'] = wrapIcon($icon, 4);

-	$icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';

-	$ph['WeblinkIcon'] = wrapIcon($icon, 72);

+    $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';

+    $ph['ResourceIcon'] = wrapIcon($icon, 4);

+    $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';

+    $ph['WeblinkIcon'] = wrapIcon($icon, 72);

 }

 if($modx->hasPermission('assets_images')) {

-	$icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';

-	$ph['ImagesIcon'] = wrapIcon($icon, 72);

+    $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';

+    $ph['ImagesIcon'] = wrapIcon($icon, 72);

 }

 if($modx->hasPermission('assets_files')) {

-	$icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';

-	$ph['FilesIcon'] = wrapIcon($icon, 72);

+    $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';

+    $ph['FilesIcon'] = wrapIcon($icon, 72);

 }

 if($modx->hasPermission('change_password')) {

-	$icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';

-	$ph['PasswordIcon'] = wrapIcon($icon, 28);

+    $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';

+    $ph['PasswordIcon'] = wrapIcon($icon, 28);

 }

 $icon = '<i class="[&icons_logout_large&]"></i>[%logout%]';

 $ph['LogoutIcon'] = wrapIcon($icon, 8);

 

 // do some config checks

 if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

-	include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

-	if($config_check_results != $_lang['configcheck_ok']) {

-		$ph['config_check_results'] = $config_check_results;

-		$ph['config_display'] = 'block';

-	} else {

-		$ph['config_display'] = 'none';

-	}

+    include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

+    if($config_check_results != $_lang['configcheck_ok']) {

+        $ph['config_check_results'] = $config_check_results;

+        $ph['config_display'] = 'block';

+    } else {

+        $ph['config_display'] = 'none';

+    }

 } else {

-	$ph['config_display'] = 'none';

+    $ph['config_display'] = 'none';

 }

 

 // Check logout-reminder

 if(isset($_SESSION['show_logout_reminder'])) {

-	switch($_SESSION['show_logout_reminder']['type']) {

-		case 'logout_reminder':

-			$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

-			$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

-			break;

-	}

-	$ph['show_logout_reminder'] = 'block';

-	unset($_SESSION['show_logout_reminder']);

+    switch($_SESSION['show_logout_reminder']['type']) {

+        case 'logout_reminder':

+            $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

+            $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

+            break;

+    }

+    $ph['show_logout_reminder'] = 'block';

+    unset($_SESSION['show_logout_reminder']);

 } else {

-	$ph['show_logout_reminder'] = 'none';

+    $ph['show_logout_reminder'] = 'none';

 }

 

 // Check multiple sessions

@@ -150,11 +150,11 @@ 
 $nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';

 

 $ph['UserInfo'] = $modx->parseText($tpl, array(

-	'username' => $modx->getLoginUserName(),

-	'role' => $_SESSION['mgrPermissions']['name'],

-	'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time),

-	'logincount' => $_SESSION['mgrLogincount'] + 1,

-	'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages)

+    'username' => $modx->getLoginUserName(),

+    'role' => $_SESSION['mgrPermissions']['name'],

+    'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time),

+    'logincount' => $_SESSION['mgrLogincount'] + 1,

+    'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages)

 ));

 

 $from = array();

@@ -163,13 +163,13 @@ 
 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');

 

 if($modx->db->getRecordCount($rs) < 1) {

-	$html = '<p>[%no_active_users_found%]</p>';

+    $html = '<p>[%no_active_users_found%]</p>';

 } else {

-	include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

-	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

-	$ph['now'] = strftime('%H:%M:%S', $now);

-	$timetocheck = ($now - (60 * 20)); //+$server_offset_time;

-	$html = '

+    include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

+    $now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

+    $ph['now'] = strftime('%H:%M:%S', $now);

+    $timetocheck = ($now - (60 * 20)); //+$server_offset_time;

+    $html = '

 	<div class="card-body">

 		[%onlineusers_message%] 

 		<b>[+now+]</b>):

@@ -187,33 +187,33 @@ 
 	</thead>

 	<tbody>';

 

-	$userList = array();

-	$userCount = array();

-	// Create userlist with session-count first before output

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

-		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

-

-		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

-		$webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" />&nbsp;' : '';

-		$ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip'];

-		$currentaction = getAction($activeusers['action'], $activeusers['id']);

-		$userList[] = array(

-			$idle,

-			'',

-			$activeusers['username'],

-			$webicon,

-			abs($activeusers['internalKey']),

-			$ip,

-			strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),

-			$currentaction

-		);

-	}

-	foreach($userList as $params) {

-		$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

-		$html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

-	}

-

-	$html .= '

+    $userList = array();

+    $userCount = array();

+    // Create userlist with session-count first before output

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

+        $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

+

+        $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

+        $webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" />&nbsp;' : '';

+        $ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip'];

+        $currentaction = getAction($activeusers['action'], $activeusers['id']);

+        $userList[] = array(

+            $idle,

+            '',

+            $activeusers['username'],

+            $webicon,

+            abs($activeusers['internalKey']),

+            $ip,

+            strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),

+            $currentaction

+        );

+    }

+    foreach($userList as $params) {

+        $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

+        $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

+    }

+

+    $html .= '

 	</tbody>

 	</table>

 </div>

@@ -254,17 +254,17 @@ 
 // invoke event OnManagerWelcomePrerender

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

 if(is_array($evtOut)) {

-	$output = implode('', $evtOut);

-	$ph['OnManagerWelcomePrerender'] = $output;

+    $output = implode('', $evtOut);

+    $ph['OnManagerWelcomePrerender'] = $output;

 }

 

 $widgets['welcome'] = array(

-	'menuindex' => '10',

-	'id' => 'welcome',

-	'cols' => 'col-lg-6',

-	'icon' => 'fa-home',

-	'title' => '[%welcome_title%]',

-	'body' => '

+    'menuindex' => '10',

+    'id' => 'welcome',

+    'cols' => 'col-lg-6',

+    'icon' => 'fa-home',

+    'title' => '[%welcome_title%]',

+    'body' => '

 				<div class="wm_buttons card-body"> 

 					<!--@IF:[[#hasPermission?key=new_document]]--> 

 					<span class="wm_button">

@@ -338,25 +338,25 @@ 
 					</table>

 				</div>

 		',

-	'hide'=>'0'

+    'hide'=>'0'

 );

 $widgets['onlineinfo'] = array(

-	'menuindex' => '20',

-	'id' => 'onlineinfo',

-	'cols' => 'col-lg-6',

-	'icon' => 'fa-user',

-	'title' => '[%onlineusers_title%]',

-	'body' => '<div class="userstable">[+OnlineInfo+]</div>',

-	'hide'=>'0'

+    'menuindex' => '20',

+    'id' => 'onlineinfo',

+    'cols' => 'col-lg-6',

+    'icon' => 'fa-user',

+    'title' => '[%onlineusers_title%]',

+    'body' => '<div class="userstable">[+OnlineInfo+]</div>',

+    'hide'=>'0'

 );

 $widgets['recentinfo'] = array(

-	'menuindex' => '30',

-	'id' => 'modxrecent_widget',

-	'cols' => 'col-sm-12',

-	'icon' => 'fa-pencil-square-o',

-	'title' => '[%activity_title%]',

-	'body' => '<div class="widget-stage">[+RecentInfo+]</div>',

-	'hide'=>'0'

+    'menuindex' => '30',

+    'id' => 'modxrecent_widget',

+    'cols' => 'col-sm-12',

+    'icon' => 'fa-pencil-square-o',

+    'title' => '[%activity_title%]',

+    'body' => '<div class="widget-stage">[+RecentInfo+]</div>',

+    'hide'=>'0'

 );

 if ($modx->config['rss_url_news']) {

     $widgets['news'] = array(

@@ -384,7 +384,7 @@ 
 // invoke OnManagerWelcomeHome event

 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));

 if(is_array($sitewidgets)) {

-	$newwidgets = array();

+    $newwidgets = array();

     foreach($sitewidgets as $widget){

         $newwidgets = array_merge($newwidgets, unserialize($widget));

     }

@@ -392,21 +392,21 @@ 
 }

 

 usort($widgets, function ($a, $b) {

-	return $a['menuindex'] - $b['menuindex'];

+    return $a['menuindex'] - $b['menuindex'];

 });

 

 $tpl = getTplWidget();

 $output = '';

 foreach($widgets as $widget) {

-	if ($widget['hide'] != '1'){

-		$output .= $modx->parseText($tpl, $widget);

-	}

+    if ($widget['hide'] != '1'){

+        $output .= $modx->parseText($tpl, $widget);

+    }

 }

 $ph['widgets'] = $output;

 

 // load template

 if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

-	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

+    $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

 }

 

 $target = $modx->config['manager_welcome_tpl'];

@@ -414,27 +414,27 @@ 
 $target = $modx->mergeSettingsContent($target);

 

 if(substr($target, 0, 1) === '@') {

-	if(substr($target, 0, 6) === '@CHUNK') {

-		$content = $modx->getChunk(trim(substr($target, 7)));

-	} elseif(substr($target, 0, 5) === '@FILE') {

-		$content = file_get_contents(trim(substr($target, 6)));

-	} else {

-		$content = '';

-	}

+    if(substr($target, 0, 6) === '@CHUNK') {

+        $content = $modx->getChunk(trim(substr($target, 7)));

+    } elseif(substr($target, 0, 5) === '@FILE') {

+        $content = file_get_contents(trim(substr($target, 6)));

+    } else {

+        $content = '';

+    }

 } else {

-	$chunk = $modx->getChunk($target);

-	if($chunk !== false && !empty($chunk)) {

-		$content = $chunk;

-	} elseif(is_file(MODX_BASE_PATH . $target)) {

-		$content = file_get_contents(MODX_BASE_PATH . $target);

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

-	} elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible

-	{

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

-	} else {

-		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

-	}

+    $chunk = $modx->getChunk($target);

+    if($chunk !== false && !empty($chunk)) {

+        $content = $chunk;

+    } elseif(is_file(MODX_BASE_PATH . $target)) {

+        $content = file_get_contents(MODX_BASE_PATH . $target);

+    } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

+    } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible

+    {

+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

+    } else {

+        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

+    }

 }

 

 // merge placeholders

@@ -442,8 +442,8 @@ 
 $content = $modx->mergeSettingsContent($content);

 $content = $modx->parseText($content, $ph);

 if(strpos($content, '[+') !== false) {

-	$modx->toPlaceholders($ph);

-	$content = $modx->mergePlaceholderContent($content);

+    $modx->toPlaceholders($ph);

+    $content = $modx->mergePlaceholderContent($content);

 }

 $content = $modx->parseDocumentSource($content);

 $content = $modx->parseText($content, $_lang, '[%', '%]');

@@ -451,7 +451,7 @@ 
 $content = $modx->cleanUpMODXTags($content); //cleanup

 

 if($js = $modx->getRegisteredClientScripts()) {

-	$content .= $js;

+    $content .= $js;

 }

 

 echo $content;

manager/actions/mutate_role.dynamic.php

Indentation +106 added lines, -106 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((int) $modx->manager->action) {
-	case 35:
-		if(!$modx->hasPermission('edit_role')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 38:
-		if(!$modx->hasPermission('new_role')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    case 35:
+        if(!$modx->hasPermission('edit_role')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    case 38:
+        if(!$modx->hasPermission('new_role')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    default:
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $role = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -24,7 +24,7 @@ 
 
 // check to see the snippet editor isn't locked
 if($lockedEl = $modx->elementIsLocked(8, $role)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['role']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['role']));
 }
 // end check for lock
 
@@ -32,15 +32,15 @@ 
 $modx->lockElement(8, $role);
 
 if($modx->manager->action == '35') {
-	$rs = $modx->db->select('*', $tbl_user_roles, "id='{$role}'");
-	$roledata = $modx->db->getRow($rs);
-	if(!$roledata) {
-		$modx->webAlertAndQuit("No role returned!");
-	}
-	$_SESSION['itemname'] = $roledata['name'];
+    $rs = $modx->db->select('*', $tbl_user_roles, "id='{$role}'");
+    $roledata = $modx->db->getRow($rs);
+    if(!$roledata) {
+        $modx->webAlertAndQuit("No role returned!");
+    }
+    $_SESSION['itemname'] = $roledata['name'];
 } else {
-	$roledata = 0;
-	$_SESSION['itemname'] = $_lang["new_role"];
+    $roledata = 0;
+    $_SESSION['itemname'] = $_lang["new_role"];
 }
 
 // Add lock-element JS-Script
@@ -107,63 +107,63 @@ 
 							<div class="form-group">
 								<h3><?= $_lang['page_data_general'] ?></h3>
 								<?php
-								echo render_form('frames', $_lang['role_frames'], 'disabled');
-								echo render_form('home', $_lang['role_home'], 'disabled');
-								echo render_form('messages', $_lang['role_messages']);
-								echo render_form('logout', $_lang['role_logout'], 'disabled');
-								echo render_form('help', $_lang['role_help']);
-								echo render_form('action_ok', $_lang['role_actionok'], 'disabled');
-								echo render_form('error_dialog', $_lang['role_errors'], 'disabled');
-								echo render_form('about', $_lang['role_about'], 'disabled');
-								echo render_form('credits', $_lang['role_credits'], 'disabled');
-								echo render_form('change_password', $_lang['role_change_password']);
-								echo render_form('save_password', $_lang['role_save_password']);
-								?>
+                                echo render_form('frames', $_lang['role_frames'], 'disabled');
+                                echo render_form('home', $_lang['role_home'], 'disabled');
+                                echo render_form('messages', $_lang['role_messages']);
+                                echo render_form('logout', $_lang['role_logout'], 'disabled');
+                                echo render_form('help', $_lang['role_help']);
+                                echo render_form('action_ok', $_lang['role_actionok'], 'disabled');
+                                echo render_form('error_dialog', $_lang['role_errors'], 'disabled');
+                                echo render_form('about', $_lang['role_about'], 'disabled');
+                                echo render_form('credits', $_lang['role_credits'], 'disabled');
+                                echo render_form('change_password', $_lang['role_change_password']);
+                                echo render_form('save_password', $_lang['role_save_password']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_content_management'] ?></h3>
 								<?php
-								echo render_form('view_document', $_lang['role_view_docdata'], 'disabled');
-								echo render_form('new_document', $_lang['role_create_doc']);
-								echo render_form('edit_document', $_lang['role_edit_doc']);
-								echo render_form('change_resourcetype', $_lang['role_change_resourcetype']);
-								echo render_form('save_document', $_lang['role_save_doc']);
-								echo render_form('publish_document', $_lang['role_publish_doc']);
-								echo render_form('delete_document', $_lang['role_delete_doc']);
-								echo render_form('empty_trash', $_lang['role_empty_trash']);
-								echo render_form('empty_cache', $_lang['role_cache_refresh']);
-								echo render_form('view_unpublished', $_lang['role_view_unpublished']);
-								?>
+                                echo render_form('view_document', $_lang['role_view_docdata'], 'disabled');
+                                echo render_form('new_document', $_lang['role_create_doc']);
+                                echo render_form('edit_document', $_lang['role_edit_doc']);
+                                echo render_form('change_resourcetype', $_lang['role_change_resourcetype']);
+                                echo render_form('save_document', $_lang['role_save_doc']);
+                                echo render_form('publish_document', $_lang['role_publish_doc']);
+                                echo render_form('delete_document', $_lang['role_delete_doc']);
+                                echo render_form('empty_trash', $_lang['role_empty_trash']);
+                                echo render_form('empty_cache', $_lang['role_cache_refresh']);
+                                echo render_form('view_unpublished', $_lang['role_view_unpublished']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3 form-group">
 							<div class="form-group">
 								<h3><?= $_lang['role_file_management'] ?></h3>
 								<?php
-								echo render_form('file_manager', $_lang['role_file_manager']);
-								echo render_form('assets_files', $_lang['role_assets_files']);
-								echo render_form('assets_images', $_lang['role_assets_images']);
-								?>
+                                echo render_form('file_manager', $_lang['role_file_manager']);
+                                echo render_form('assets_files', $_lang['role_assets_files']);
+                                echo render_form('assets_images', $_lang['role_assets_images']);
+                                ?>
 							</div>
 							<div class="form-group">
 								<h3><?= $_lang['category_management'] ?></h3>
 								<?php
-								echo render_form('category_manager', $_lang['role_category_manager']);
-								?>
+                                echo render_form('category_manager', $_lang['role_category_manager']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_module_management'] ?></h3>
 								<?php
-								echo render_form('new_module', $_lang['role_new_module']);
-								echo render_form('edit_module', $_lang['role_edit_module']);
-								echo render_form('save_module', $_lang['role_save_module']);
-								echo render_form('delete_module', $_lang['role_delete_module']);
-								echo render_form('exec_module', $_lang['role_run_module']);
-								?>
+                                echo render_form('new_module', $_lang['role_new_module']);
+                                echo render_form('edit_module', $_lang['role_edit_module']);
+                                echo render_form('save_module', $_lang['role_save_module']);
+                                echo render_form('delete_module', $_lang['role_delete_module']);
+                                echo render_form('exec_module', $_lang['role_run_module']);
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -173,44 +173,44 @@ 
 							<div class="form-group">
 								<h3><?= $_lang['role_template_management'] ?></h3>
 								<?php
-								echo render_form('new_template', $_lang['role_create_template']);
-								echo render_form('edit_template', $_lang['role_edit_template']);
-								echo render_form('save_template', $_lang['role_save_template']);
-								echo render_form('delete_template', $_lang['role_delete_template']);
-								?>
+                                echo render_form('new_template', $_lang['role_create_template']);
+                                echo render_form('edit_template', $_lang['role_edit_template']);
+                                echo render_form('save_template', $_lang['role_save_template']);
+                                echo render_form('delete_template', $_lang['role_delete_template']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_snippet_management'] ?></h3>
 								<?php
-								echo render_form('new_snippet', $_lang['role_create_snippet']);
-								echo render_form('edit_snippet', $_lang['role_edit_snippet']);
-								echo render_form('save_snippet', $_lang['role_save_snippet']);
-								echo render_form('delete_snippet', $_lang['role_delete_snippet']);
-								?>
+                                echo render_form('new_snippet', $_lang['role_create_snippet']);
+                                echo render_form('edit_snippet', $_lang['role_edit_snippet']);
+                                echo render_form('save_snippet', $_lang['role_save_snippet']);
+                                echo render_form('delete_snippet', $_lang['role_delete_snippet']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_chunk_management'] ?></h3>
 								<?php
-								echo render_form('new_chunk', $_lang['role_create_chunk']);
-								echo render_form('edit_chunk', $_lang['role_edit_chunk']);
-								echo render_form('save_chunk', $_lang['role_save_chunk']);
-								echo render_form('delete_chunk', $_lang['role_delete_chunk']);
-								?>
+                                echo render_form('new_chunk', $_lang['role_create_chunk']);
+                                echo render_form('edit_chunk', $_lang['role_edit_chunk']);
+                                echo render_form('save_chunk', $_lang['role_save_chunk']);
+                                echo render_form('delete_chunk', $_lang['role_delete_chunk']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_plugin_management'] ?></h3>
 								<?php
-								echo render_form('new_plugin', $_lang['role_create_plugin']);
-								echo render_form('edit_plugin', $_lang['role_edit_plugin']);
-								echo render_form('save_plugin', $_lang['role_save_plugin']);
-								echo render_form('delete_plugin', $_lang['role_delete_plugin']);
-								?>
+                                echo render_form('new_plugin', $_lang['role_create_plugin']);
+                                echo render_form('edit_plugin', $_lang['role_edit_plugin']);
+                                echo render_form('save_plugin', $_lang['role_save_plugin']);
+                                echo render_form('delete_plugin', $_lang['role_delete_plugin']);
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -220,42 +220,42 @@ 
 							<div class="form-group">
 								<h3><?= $_lang['role_user_management'] ?></h3>
 								<?php
-								echo render_form('new_user', $_lang['role_new_user']);
-								echo render_form('edit_user', $_lang['role_edit_user']);
-								echo render_form('save_user', $_lang['role_save_user']);
-								echo render_form('delete_user', $_lang['role_delete_user']);
-								?>
+                                echo render_form('new_user', $_lang['role_new_user']);
+                                echo render_form('edit_user', $_lang['role_edit_user']);
+                                echo render_form('save_user', $_lang['role_save_user']);
+                                echo render_form('delete_user', $_lang['role_delete_user']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_web_user_management'] ?></h3>
 								<?php
-								echo render_form('new_web_user', $_lang['role_new_web_user']);
-								echo render_form('edit_web_user', $_lang['role_edit_web_user']);
-								echo render_form('save_web_user', $_lang['role_save_web_user']);
-								echo render_form('delete_web_user', $_lang['role_delete_web_user']);
-								?>
+                                echo render_form('new_web_user', $_lang['role_new_web_user']);
+                                echo render_form('edit_web_user', $_lang['role_edit_web_user']);
+                                echo render_form('save_web_user', $_lang['role_save_web_user']);
+                                echo render_form('delete_web_user', $_lang['role_delete_web_user']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_udperms'] ?></h3>
 								<?php
-								echo render_form('access_permissions', $_lang['role_access_persmissions']);
-								echo render_form('web_access_permissions', $_lang['role_web_access_persmissions']);
-								?>
+                                echo render_form('access_permissions', $_lang['role_access_persmissions']);
+                                echo render_form('web_access_permissions', $_lang['role_web_access_persmissions']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_role_management'] ?></h3>
 								<?php
-								echo render_form('new_role', $_lang['role_new_role']);
-								echo render_form('edit_role', $_lang['role_edit_role']);
-								echo render_form('save_role', $_lang['role_save_role']);
-								echo render_form('delete_role', $_lang['role_delete_role']);
-								?>
+                                echo render_form('new_role', $_lang['role_new_role']);
+                                echo render_form('edit_role', $_lang['role_edit_role']);
+                                echo render_form('save_role', $_lang['role_save_role']);
+                                echo render_form('delete_role', $_lang['role_delete_role']);
+                                ?>
 							</div>
 						</div>
 					</div>
@@ -265,23 +265,23 @@ 
 							<div class="form-group">
 								<h3><?= $_lang['role_eventlog_management'] ?></h3>
 								<?php
-								echo render_form('view_eventlog', $_lang['role_view_eventlog']);
-								echo render_form('delete_eventlog', $_lang['role_delete_eventlog']);
-								?>
+                                echo render_form('view_eventlog', $_lang['role_view_eventlog']);
+                                echo render_form('delete_eventlog', $_lang['role_delete_eventlog']);
+                                ?>
 							</div>
 						</div>
 						<div class="col-sm-6 col-lg-3">
 							<div class="form-group">
 								<h3><?= $_lang['role_config_management'] ?></h3>
 								<?php
-								echo render_form('logs', $_lang['role_view_logs']);
-								echo render_form('settings', $_lang['role_edit_settings']);
-								echo render_form('bk_manager', $_lang['role_bk_manager']);
-								echo render_form('import_static', $_lang['role_import_static']);
-								echo render_form('export_static', $_lang['role_export_static']);
-								echo render_form('remove_locks', $_lang['role_remove_locks']);
-								echo render_form('display_locks', $_lang['role_display_locks']);
-								?>
+                                echo render_form('logs', $_lang['role_view_logs']);
+                                echo render_form('settings', $_lang['role_edit_settings']);
+                                echo render_form('bk_manager', $_lang['role_bk_manager']);
+                                echo render_form('import_static', $_lang['role_import_static']);
+                                echo render_form('export_static', $_lang['role_export_static']);
+                                echo render_form('remove_locks', $_lang['role_remove_locks']);
+                                echo render_form('display_locks', $_lang['role_display_locks']);
+                                ?>
 							</div>
 						</div>
 					</div>

manager/processors/execute_module.processor.php

Indentation +27 added lines, -27 removed lines

@@ -3,51 +3,51 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('exec_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // check if user has access permission, except admins
 if($_SESSION['mgrRole']!=1){
-	$rs = $modx->db->select(
-		'sma.usergroup,mg.member',
-		$modx->getFullTableName("site_module_access")." sma
+    $rs = $modx->db->select(
+        'sma.usergroup,mg.member',
+        $modx->getFullTableName("site_module_access")." sma
 			LEFT JOIN ".$modx->getFullTableName("member_groups")." mg ON mg.user_group = sma.usergroup AND member='".$modx->getLoginUserID()."'",
-		"sma.module = '{$id}'"
-		);
-	//initialize permission to -1, if it stays -1 no permissions
-	//attached so permission granted
-	$permissionAccessInt = -1;
+        "sma.module = '{$id}'"
+        );
+    //initialize permission to -1, if it stays -1 no permissions
+    //attached so permission granted
+    $permissionAccessInt = -1;
 
-	while ($row = $modx->db->getRow($rs)) {
-		if($row["usergroup"] && $row["member"]) {
-			//if there are permissions and this member has permission, ofcourse
-			//this is granted
-			$permissionAccessInt = 1;
-		} elseif ($permissionAccessInt==-1) {
-			//if there are permissions but this member has no permission and the
-			//variable was still in init state we set permission to 0; no permissions
-			$permissionAccessInt = 0;
-		}
-	}
+    while ($row = $modx->db->getRow($rs)) {
+        if($row["usergroup"] && $row["member"]) {
+            //if there are permissions and this member has permission, ofcourse
+            //this is granted
+            $permissionAccessInt = 1;
+        } elseif ($permissionAccessInt==-1) {
+            //if there are permissions but this member has no permission and the
+            //variable was still in init state we set permission to 0; no permissions
+            $permissionAccessInt = 0;
+        }
+    }
 
-	if($permissionAccessInt==0) {
-		$modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
-	}
+    if($permissionAccessInt==0) {
+        $modx->webAlertAndQuit("You do not sufficient privileges to execute this module.", "index.php?a=106");
+    }
 }
 
 // get module data
 $rs = $modx->db->select('*', $modx->getFullTableName("site_modules"), "id='{$id}'");
 $content = $modx->db->getRow($rs);
 if(!$content) {
-	$modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106");
+    $modx->webAlertAndQuit("No record found for id {$id}.", "index.php?a=106");
 }
 if($content['disabled']) {
-	$modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106");
+    $modx->webAlertAndQuit("This module is disabled and cannot be executed.", "index.php?a=106");
 }
 
 // Set the item name for logger
@@ -62,7 +62,7 @@ 
 
 $output = evalModule($content["modulecode"],$parameter);
 if (strpos(trim($output),'<')===0 && strpos(trim($output),'<?xml')!==0) {
-	echo "<style>@supports (-webkit-overflow-scrolling: touch) {body,html {-webkit-overflow-scrolling: touch;overflow:auto!important;height:100%!important}}</style>"; // for iframe scroller
+    echo "<style>@supports (-webkit-overflow-scrolling: touch) {body,html {-webkit-overflow-scrolling: touch;overflow:auto!important;height:100%!important}}</style>"; // for iframe scroller
 }
 echo $output;
 include MODX_MANAGER_PATH."includes/sysalert.display.inc.php";

manager/processors/save_user.processor.php

Indentation +251 added lines, -251 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $modx->loadExtension('phpass');
@@ -45,134 +45,134 @@ 
 
 // verify password
 if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
-	webAlertAndQuit("Password typed is mismatched");
+    webAlertAndQuit("Password typed is mismatched");
 }
 
 // verify email
 if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
-	webAlertAndQuit("E-mail address doesn't seem to be valid!");
+    webAlertAndQuit("E-mail address doesn't seem to be valid!");
 }
 
 // verify admin security
 if($_SESSION['mgrRole'] != 1) {
-	// Check to see if user tried to spoof a "1" (admin) role
-	if(!$modx->hasPermission('save_role')) {
-		webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!");
-	}
-	// Verify that the user being edited wasn't an admin and the user ID got spoofed
-	$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, "internalKey='{$id}' AND role=1");
-	$limit = $modx->db->getValue($rs);
-	if($limit > 0) {
-		webAlertAndQuit("You cannot alter an administrative user.");
-	}
+    // Check to see if user tried to spoof a "1" (admin) role
+    if(!$modx->hasPermission('save_role')) {
+        webAlertAndQuit("Illegal attempt to create/modify administrator by non-administrator!");
+    }
+    // Verify that the user being edited wasn't an admin and the user ID got spoofed
+    $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, "internalKey='{$id}' AND role=1");
+    $limit = $modx->db->getValue($rs);
+    if($limit > 0) {
+        webAlertAndQuit("You cannot alter an administrative user.");
+    }
 
 }
 
 switch($input['mode']) {
-	case '11' : // new user
-		// check if this user name already exist
-		$rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s'", $modx->db->escape($newusername)));
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exist
-		$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND id!='%s'", $modx->db->escape($email), $id));
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
-				webAlertAndQuit("Password is too short!");
-			} else {
-				$newpassword = $specifiedpassword;
-			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
-			$newpassword = generate_password(8);
-		} else {
-			webAlertAndQuit("No password generation method specified!");
-		}
-
-		// invoke OnBeforeUserFormSave event
-		$modx->invokeEvent("OnBeforeUserFormSave", array(
-			"mode" => "new",
-		));
-
-		// create the user account
-		$internalKey = $modx->db->insert(array('username' => $modx->db->escape($newusername)), $tbl_manager_users);
-
-		$field = array();
-		$field['password'] = $modx->phpass->HashPassword($newpassword);
-		$modx->db->update($field, $tbl_manager_users, "id='{$internalKey}'");
-
-		$field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->insert($field, $tbl_user_attributes);
-
-		// Save user settings
-		saveUserSettings($internalKey);
-
-		// invoke OnManagerSaveUser event
-		$modx->invokeEvent("OnManagerSaveUser", array(
-			"mode" => "new",
-			"userid" => $internalKey,
-			"username" => $newusername,
-			"userpassword" => $newpassword,
-			"useremail" => $email,
-			"userfullname" => $fullname,
-			"userroleid" => $role
-		));
-
-		// invoke OnUserFormSave event
-		$modx->invokeEvent("OnUserFormSave", array(
-			"mode" => "new",
-			"id" => $internalKey
-		));
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$f = array();
-					$f['user_group'] = (int)$user_groups[$i];
-					$f['member'] = $internalKey;
-					$modx->db->insert($f, $tbl_member_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=75&r=2";
-				header($header);
-			}
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=75&r=2";
-			}
-
-			include_once "header.inc.php";
-			?>
+    case '11' : // new user
+        // check if this user name already exist
+        $rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s'", $modx->db->escape($newusername)));
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("User name is already in use!");
+        }
+
+        // check if the email address already exist
+        $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND id!='%s'", $modx->db->escape($email), $id));
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("Email is already in use!");
+        }
+
+        // generate a new password for this user
+        if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+            if(strlen($specifiedpassword) < 6) {
+                webAlertAndQuit("Password is too short!");
+            } else {
+                $newpassword = $specifiedpassword;
+            }
+        } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+            webAlertAndQuit("You didn't specify a password for this user!");
+        } elseif($passwordgenmethod == 'g') {
+            $newpassword = generate_password(8);
+        } else {
+            webAlertAndQuit("No password generation method specified!");
+        }
+
+        // invoke OnBeforeUserFormSave event
+        $modx->invokeEvent("OnBeforeUserFormSave", array(
+            "mode" => "new",
+        ));
+
+        // create the user account
+        $internalKey = $modx->db->insert(array('username' => $modx->db->escape($newusername)), $tbl_manager_users);
+
+        $field = array();
+        $field['password'] = $modx->phpass->HashPassword($newpassword);
+        $modx->db->update($field, $tbl_manager_users, "id='{$internalKey}'");
+
+        $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
+        $field = $modx->db->escape($field);
+        $modx->db->insert($field, $tbl_user_attributes);
+
+        // Save user settings
+        saveUserSettings($internalKey);
+
+        // invoke OnManagerSaveUser event
+        $modx->invokeEvent("OnManagerSaveUser", array(
+            "mode" => "new",
+            "userid" => $internalKey,
+            "username" => $newusername,
+            "userpassword" => $newpassword,
+            "useremail" => $email,
+            "userfullname" => $fullname,
+            "userroleid" => $role
+        ));
+
+        // invoke OnUserFormSave event
+        $modx->invokeEvent("OnUserFormSave", array(
+            "mode" => "new",
+            "id" => $internalKey
+        ));
+
+        // Set the item name for logger
+        $_SESSION['itemname'] = $newusername;
+
+        /*******************************************************************************/
+        // put the user in the user_groups he/ she should be in
+        // first, check that up_perms are switched on!
+        if($use_udperms == 1) {
+            if(!empty($user_groups)) {
+                for($i = 0; $i < count($user_groups); $i++) {
+                    $f = array();
+                    $f['user_group'] = (int)$user_groups[$i];
+                    $f['member'] = $internalKey;
+                    $modx->db->insert($f, $tbl_member_groups);
+                }
+            }
+        }
+        // end of user_groups stuff!
+
+        if($passwordnotifymethod == 'e') {
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=75&r=2";
+                header($header);
+            }
+        } else {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "12&id={$internalKey}" : "11";
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+            } else {
+                $stayUrl = "index.php?a=75&r=2";
+            }
+
+            include_once "header.inc.php";
+            ?>
 
 			<h1><?php echo $_lang['user_title']; ?></h1>
 
@@ -194,125 +194,125 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		}
-		break;
-	case '12' : // edit user
-		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
-					webAlertAndQuit("Password is too short!");
-				} else {
-					$newpassword = $specifiedpassword;
-				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
-				$newpassword = generate_password(8);
-			} else {
-				webAlertAndQuit("No password generation method specified!");
-			}
-		}
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-		}
-
-		// check if the username already exist
-		$rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s' AND id!='%s'", $modx->db->escape($newusername), $id));
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exists
-		$rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND internalKey!='%s'", $modx->db->escape($email), $id));
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("Email is already in use!");
-		}
-
-		// invoke OnBeforeUserFormSave event
-		$modx->invokeEvent("OnBeforeUserFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		// update user name and password
-		$field = array();
-		$field['username'] = $modx->db->escape($newusername);
-		if($genpassword == 1) {
-			$field['password'] = $modx->phpass->HashPassword($newpassword);
-		}
-		$modx->db->update($field, $tbl_manager_users, "id='{$id}'");
-		$field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->update($field, $tbl_user_attributes, "internalKey='{$id}'");
-
-		// Save user settings
-		saveUserSettings($id);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		// invoke OnManagerSaveUser event
-		$modx->invokeEvent("OnManagerSaveUser", array(
-			"mode" => "upd",
-			"userid" => $id,
-			"username" => $newusername,
-			"userpassword" => $newpassword,
-			"useremail" => $email,
-			"userfullname" => $fullname,
-			"userroleid" => $role,
-			"oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
-			"olduseremail" => (($oldemail != $email) ? $oldemail : "")
-		));
-
-		// invoke OnManagerChangePassword event
-		if($genpassword == 1) {
-			$modx->invokeEvent("OnManagerChangePassword", array(
-				"userid" => $id,
-				"username" => $newusername,
-				"userpassword" => $newpassword
-			));
-		}
-
-		// invoke OnUserFormSave event
-		$modx->invokeEvent("OnUserFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
-			$modx->db->delete($tbl_member_groups, "member='{$id}'");
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$field = array();
-					$field['user_group'] = (int)$user_groups[$i];
-					$field['member'] = $id;
-					$modx->db->insert($field, $tbl_member_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-		/*******************************************************************************/
-		if($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) {
-			$modx->webAlertAndQuit($_lang["user_changeddata"], 'javascript:top.location.href="index.php?a=8";');
-		}
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=75&r=2";
-			}
-
-			include_once "header.inc.php";
-			?>
+            include_once "footer.inc.php";
+        }
+        break;
+    case '12' : // edit user
+        // generate a new password for this user
+        if($genpassword == 1) {
+            if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+                if(strlen($specifiedpassword) < 6) {
+                    webAlertAndQuit("Password is too short!");
+                } else {
+                    $newpassword = $specifiedpassword;
+                }
+            } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+                webAlertAndQuit("You didn't specify a password for this user!");
+            } elseif($passwordgenmethod == 'g') {
+                $newpassword = generate_password(8);
+            } else {
+                webAlertAndQuit("No password generation method specified!");
+            }
+        }
+        if($passwordnotifymethod == 'e') {
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
+        }
+
+        // check if the username already exist
+        $rs = $modx->db->select('count(id)', $tbl_manager_users, sprintf("username='%s' AND id!='%s'", $modx->db->escape($newusername), $id));
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("User name is already in use!");
+        }
+
+        // check if the email address already exists
+        $rs = $modx->db->select('count(internalKey)', $tbl_user_attributes, sprintf("email='%s' AND internalKey!='%s'", $modx->db->escape($email), $id));
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("Email is already in use!");
+        }
+
+        // invoke OnBeforeUserFormSave event
+        $modx->invokeEvent("OnBeforeUserFormSave", array(
+            "mode" => "upd",
+            "id" => $id
+        ));
+
+        // update user name and password
+        $field = array();
+        $field['username'] = $modx->db->escape($newusername);
+        if($genpassword == 1) {
+            $field['password'] = $modx->phpass->HashPassword($newpassword);
+        }
+        $modx->db->update($field, $tbl_manager_users, "id='{$id}'");
+        $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
+        $field = $modx->db->escape($field);
+        $modx->db->update($field, $tbl_user_attributes, "internalKey='{$id}'");
+
+        // Save user settings
+        saveUserSettings($id);
+
+        // Set the item name for logger
+        $_SESSION['itemname'] = $newusername;
+
+        // invoke OnManagerSaveUser event
+        $modx->invokeEvent("OnManagerSaveUser", array(
+            "mode" => "upd",
+            "userid" => $id,
+            "username" => $newusername,
+            "userpassword" => $newpassword,
+            "useremail" => $email,
+            "userfullname" => $fullname,
+            "userroleid" => $role,
+            "oldusername" => (($oldusername != $newusername) ? $oldusername : ""),
+            "olduseremail" => (($oldemail != $email) ? $oldemail : "")
+        ));
+
+        // invoke OnManagerChangePassword event
+        if($genpassword == 1) {
+            $modx->invokeEvent("OnManagerChangePassword", array(
+                "userid" => $id,
+                "username" => $newusername,
+                "userpassword" => $newpassword
+            ));
+        }
+
+        // invoke OnUserFormSave event
+        $modx->invokeEvent("OnUserFormSave", array(
+            "mode" => "upd",
+            "id" => $id
+        ));
+
+        /*******************************************************************************/
+        // put the user in the user_groups he/ she should be in
+        // first, check that up_perms are switched on!
+        if($use_udperms == 1) {
+            // as this is an existing user, delete his/ her entries in the groups before saving the new groups
+            $modx->db->delete($tbl_member_groups, "member='{$id}'");
+            if(!empty($user_groups)) {
+                for($i = 0; $i < count($user_groups); $i++) {
+                    $field = array();
+                    $field['user_group'] = (int)$user_groups[$i];
+                    $field['member'] = $id;
+                    $modx->db->insert($field, $tbl_member_groups);
+                }
+            }
+        }
+        // end of user_groups stuff!
+        /*******************************************************************************/
+        if($id == $modx->getLoginUserID() && ($genpassword !== 1 && $passwordnotifymethod != 's')) {
+            $modx->webAlertAndQuit($_lang["user_changeddata"], 'javascript:top.location.href="index.php?a=8";');
+        }
+        if($genpassword == 1 && $passwordnotifymethod == 's') {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+            } else {
+                $stayUrl = "index.php?a=75&r=2";
+            }
+
+            include_once "header.inc.php";
+            ?>
 
 			<h1><?php echo $_lang['user_title']; ?></h1>
 
@@ -332,20 +332,20 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=75&r=2";
-				header($header);
-			}
-		}
-		break;
-	default:
-		webAlertAndQuit("No operation set in request.");
+            include_once "footer.inc.php";
+        } else {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "12&id={$id}" : "11";
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=75&r=2";
+                header($header);
+            }
+        }
+        break;
+    default:
+        webAlertAndQuit("No operation set in request.");
 }
 
 if(!function_exists('sendMailMessage')) {

manager/processors/duplicate_module.processor.php

Indentation +30 added lines, -30 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_module')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 if(!function_exists('createGUID')) {
@@ -36,40 +36,40 @@ 
 
 // duplicate module
 $newid = $modx->db->insert(
-	array(
-		'name'=>'',
-		'description'=>'',
-		'disabled'=>'',
-		'category'=>'',
-		'wrap'=>'',
-		'icon'=>'',
-		'enable_resource'=>'',
-		'resourcefile'=>'',
-		'createdon'=>'',
-		'editedon'=>'',
-		'guid'=>'',
-		'enable_sharedparams'=>'',
-		'properties'=>'',
-		'modulecode'=>'',
-		), $modx->getFullTableName('site_modules'), // Insert into
-	"CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, category, wrap, icon, enable_resource, resourcefile, createdon, editedon, '".createGUID()."' AS guid, enable_sharedparams, properties, modulecode", $modx->getFullTableName('site_modules'), "id='{$id}'"); // Copy from
+    array(
+        'name'=>'',
+        'description'=>'',
+        'disabled'=>'',
+        'category'=>'',
+        'wrap'=>'',
+        'icon'=>'',
+        'enable_resource'=>'',
+        'resourcefile'=>'',
+        'createdon'=>'',
+        'editedon'=>'',
+        'guid'=>'',
+        'enable_sharedparams'=>'',
+        'properties'=>'',
+        'modulecode'=>'',
+        ), $modx->getFullTableName('site_modules'), // Insert into
+    "CONCAT(name, ' {$_lang['duplicated_el_suffix']}{$count}') AS name, description, '1' AS disabled, category, wrap, icon, enable_resource, resourcefile, createdon, editedon, '".createGUID()."' AS guid, enable_sharedparams, properties, modulecode", $modx->getFullTableName('site_modules'), "id='{$id}'"); // Copy from
 
 // duplicate module dependencies
 $modx->db->insert(
-	array(
-		'module'=>'',
-		'resource'=>'',
-		'type'=>'',
-		), $modx->getFullTableName('site_module_depobj'), // Insert into
-	"'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from
+    array(
+        'module'=>'',
+        'resource'=>'',
+        'type'=>'',
+        ), $modx->getFullTableName('site_module_depobj'), // Insert into
+    "'{$newid}', resource, type", $modx->getFullTableName('site_module_depobj'), "module='{$id}'"); // Copy from
 
 // duplicate module user group access
 $modx->db->insert(
-	array(
-		'module'=>'',
-		'usergroup'=>'',
-		), $modx->getFullTableName('site_module_access'), // Insert into
-	"'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from
+    array(
+        'module'=>'',
+        'usergroup'=>'',
+        ), $modx->getFullTableName('site_module_access'), // Insert into
+    "'{$newid}', usergroup", $modx->getFullTableName('site_module_access'), "module='{$id}'"); // Copy from
 
 // Set the item name for logger
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$newid}'"));

manager/processors/move_document.processor.php

Indentation +55 added lines, -55 removed lines

@@ -3,7 +3,7 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('edit_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $newParentID = isset($_REQUEST['new_parent']) ? (int)$_REQUEST['new_parent'] : 0;
@@ -25,16 +25,16 @@ 
 // check user has permission to move document to chosen location
 
 if ($use_udperms == 1) {
-	if ($oldparent != $newParentID) {
-		$udperms = new EvolutionCMS\Legacy\Permissions();
-		$udperms->user = $modx->getLoginUserID();
-		$udperms->document = $newParentID;
-		$udperms->role = $_SESSION['mgrRole'];
-
-		 if (!$udperms->checkPermissions()) {
-			$modx->webAlertAndQuit($_lang["access_permission_parent_denied"]);
-		 }
-	}
+    if ($oldparent != $newParentID) {
+        $udperms = new EvolutionCMS\Legacy\Permissions();
+        $udperms->user = $modx->getLoginUserID();
+        $udperms->document = $newParentID;
+        $udperms->role = $_SESSION['mgrRole'];
+
+            if (!$udperms->checkPermissions()) {
+            $modx->webAlertAndQuit($_lang["access_permission_parent_denied"]);
+            }
+    }
 }
 
 if(!function_exists('allChildren')) {
@@ -58,55 +58,55 @@ 
 }
 
 $evtOut = $modx->invokeEvent("onBeforeMoveDocument", array (
-	"id_document" => $documentID,
-	"old_parent" => $oldparent,
-	"new_parent" => $newParentID
+    "id_document" => $documentID,
+    "old_parent" => $oldparent,
+    "new_parent" => $newParentID
 ));
 if (is_array($evtOut) && count($evtOut) > 0){
-	$newParent = array_pop($evtOut);
-	if($newParent == $oldparent) {
-		$modx->webAlertAndQuit($_lang["error_movedocument2"]);
-	}else{
-		$newParentID = $newParent;
-	}
+    $newParent = array_pop($evtOut);
+    if($newParent == $oldparent) {
+        $modx->webAlertAndQuit($_lang["error_movedocument2"]);
+    }else{
+        $newParentID = $newParent;
+    }
 }
 
 $children = allChildren($documentID);
 if (!array_search($newParentID, $children)) {
-	$modx->db->update(array(
-		'isfolder' => 1,
-	), $modx->getFullTableName('site_content'), "id='{$newParentID}'");
-
-	$modx->db->update(array(
-		'parent'   => $newParentID,
-		'editedby' => $modx->getLoginUserID(),
-		'editedon' => time(),
-	), $modx->getFullTableName('site_content'), "id='{$documentID}'");
-
-	// finished moving the document, now check to see if the old_parent should no longer be a folder.
-	$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
-	$limit = $modx->db->getValue($rs);
-
-	if(!$limit>0) {
-		$modx->db->update(array(
-			'isfolder' => 0,
-		), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
-	}
-	// Set the item name for logger
-	$pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
-	$_SESSION['itemname'] = $pagetitle;
-
-	$modx->invokeEvent("onAfterMoveDocument", array (
-		"id_document" => $documentID,
-		"old_parent" => $oldparent,
-		"new_parent" => $newParentID
-	));
-
-	// empty cache & sync site
-	$modx->clearCache('full');
-
-	$header="Location: index.php?a=3&id={$documentID}&r=9";
-	header($header);
+    $modx->db->update(array(
+        'isfolder' => 1,
+    ), $modx->getFullTableName('site_content'), "id='{$newParentID}'");
+
+    $modx->db->update(array(
+        'parent'   => $newParentID,
+        'editedby' => $modx->getLoginUserID(),
+        'editedon' => time(),
+    ), $modx->getFullTableName('site_content'), "id='{$documentID}'");
+
+    // finished moving the document, now check to see if the old_parent should no longer be a folder.
+    $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('site_content'), "parent='{$oldparent}'");
+    $limit = $modx->db->getValue($rs);
+
+    if(!$limit>0) {
+        $modx->db->update(array(
+            'isfolder' => 0,
+        ), $modx->getFullTableName('site_content'), "id='{$oldparent}'");
+    }
+    // Set the item name for logger
+    $pagetitle = $modx->db->getValue($modx->db->select('pagetitle', $modx->getFullTableName('site_content'), "id='{$documentID}'"));
+    $_SESSION['itemname'] = $pagetitle;
+
+    $modx->invokeEvent("onAfterMoveDocument", array (
+        "id_document" => $documentID,
+        "old_parent" => $oldparent,
+        "new_parent" => $newParentID
+    ));
+
+    // empty cache & sync site
+    $modx->clearCache('full');
+
+    $header="Location: index.php?a=3&id={$documentID}&r=9";
+    header($header);
 } else {
-	$modx->webAlertAndQuit("You cannot move a document to a child document!");
+    $modx->webAlertAndQuit("You cannot move a document to a child document!");
 }

manager/processors/save_web_user.processor.php

Indentation +198 added lines, -198 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('save_web_user')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $tbl_web_users = $modx->getFullTableName('web_users');
@@ -12,10 +12,10 @@ 
 
 $input = $_POST;
 foreach($input as $k => $v) {
-	if($k !== 'comment') {
-		$v = sanitize($v);
-	}
-	$input[$k] = $v;
+    if($k !== 'comment') {
+        $v = sanitize($v);
+    }
+    $input[$k] = $v;
 }
 
 $id = (int)$input['id'];
@@ -51,82 +51,82 @@ 
 
 // verify password
 if($passwordgenmethod == "spec" && $input['specifiedpassword'] != $input['confirmpassword']) {
-	webAlertAndQuit("Password typed is mismatched");
+    webAlertAndQuit("Password typed is mismatched");
 }
 
 // verify email
 if($email == '' || !preg_match("/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i", $email)) {
-	webAlertAndQuit("E-mail address doesn't seem to be valid!");
+    webAlertAndQuit("E-mail address doesn't seem to be valid!");
 }
 
 switch($input['mode']) {
-	case '87' : // new user
-		// check if this user name already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exist
-		if ($modx->config['allow_multiple_emails'] != 1) {
-			$rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
-			$limit = $modx->db->getValue($rs);
-			if($limit > 0) {
-				webAlertAndQuit("Email is already in use!");
-			}
-		}
-
-		// generate a new password for this user
-		if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-			if(strlen($specifiedpassword) < 6) {
-				webAlertAndQuit("Password is too short!");
-			} else {
-				$newpassword = $specifiedpassword;
-			}
-		} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-			webAlertAndQuit("You didn't specify a password for this user!");
-		} elseif($passwordgenmethod == 'g') {
-			$newpassword = generate_password(8);
-		} else {
-			webAlertAndQuit("No password generation method specified!");
-		}
-
-		// invoke OnBeforeWUsrFormSave event
-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(
-			"mode" => "new",
-		));
-
-		// create the user account
-		$field = array();
-		$field['username'] = $esc_newusername;
-		$field['password'] = md5($newpassword);
-		$internalKey = $modx->db->insert($field, $tbl_web_users);
-
-		$field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->insert($field, $tbl_web_user_attributes);
-
-		// Save User Settings
-		saveUserSettings($internalKey);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$f = array();
-					$f['webgroup'] = (int)$user_groups[$i];
-					$f['webuser'] = $internalKey;
-					$modx->db->insert($f, $tbl_web_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
+    case '87' : // new user
+        // check if this user name already exist
+        $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("User name is already in use!");
+        }
+
+        // check if the email address already exist
+        if ($modx->config['allow_multiple_emails'] != 1) {
+            $rs = $modx->db->select('count(id)', $tbl_web_user_attributes, "email='{$esc_email}' AND id!='{$id}'");
+            $limit = $modx->db->getValue($rs);
+            if($limit > 0) {
+                webAlertAndQuit("Email is already in use!");
+            }
+        }
+
+        // generate a new password for this user
+        if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+            if(strlen($specifiedpassword) < 6) {
+                webAlertAndQuit("Password is too short!");
+            } else {
+                $newpassword = $specifiedpassword;
+            }
+        } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+            webAlertAndQuit("You didn't specify a password for this user!");
+        } elseif($passwordgenmethod == 'g') {
+            $newpassword = generate_password(8);
+        } else {
+            webAlertAndQuit("No password generation method specified!");
+        }
+
+        // invoke OnBeforeWUsrFormSave event
+        $modx->invokeEvent("OnBeforeWUsrFormSave", array(
+            "mode" => "new",
+        ));
+
+        // create the user account
+        $field = array();
+        $field['username'] = $esc_newusername;
+        $field['password'] = md5($newpassword);
+        $internalKey = $modx->db->insert($field, $tbl_web_users);
+
+        $field = compact('internalKey', 'fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'blocked', 'blockeduntil', 'blockedafter');
+        $field = $modx->db->escape($field);
+        $modx->db->insert($field, $tbl_web_user_attributes);
+
+        // Save User Settings
+        saveUserSettings($internalKey);
+
+        // Set the item name for logger
+        $_SESSION['itemname'] = $newusername;
+
+        /*******************************************************************************/
+        // put the user in the user_groups he/ she should be in
+        // first, check that up_perms are switched on!
+        if($use_udperms == 1) {
+            if(!empty($user_groups)) {
+                for($i = 0; $i < count($user_groups); $i++) {
+                    $f = array();
+                    $f['webgroup'] = (int)$user_groups[$i];
+                    $f['webuser'] = $internalKey;
+                    $modx->db->insert($f, $tbl_web_groups);
+                }
+            }
+        }
+        // end of user_groups stuff!
 
         // invoke OnWebSaveUser event
         $modx->invokeEvent("OnWebSaveUser", array(
@@ -144,26 +144,26 @@ 
             "id" => $internalKey
         ));
 
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=99&r=2";
-				header($header);
-			}
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=99&r=2";
-			}
-
-			include_once "header.inc.php";
-			?>
+        if($passwordnotifymethod == 'e') {
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=99&r=2";
+                header($header);
+            }
+        } else {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$internalKey}" : "87";
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+            } else {
+                $stayUrl = "index.php?a=99&r=2";
+            }
+
+            include_once "header.inc.php";
+            ?>
 
 			<h1><?php echo $_lang['web_user_title']; ?></h1>
 
@@ -185,86 +185,86 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		}
-		break;
-	case '88' : // edit user
-		// generate a new password for this user
-		if($genpassword == 1) {
-			if($specifiedpassword != "" && $passwordgenmethod == "spec") {
-				if(strlen($specifiedpassword) < 6) {
-					webAlertAndQuit("Password is too short!");
-				} else {
-					$newpassword = $specifiedpassword;
-				}
-			} elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
-				webAlertAndQuit("You didn't specify a password for this user!");
-			} elseif($passwordgenmethod == 'g') {
-				$newpassword = generate_password(8);
-			} else {
-				webAlertAndQuit("No password generation method specified!");
-			}
-		}
-		if($passwordnotifymethod == 'e') {
-			sendMailMessage($email, $newusername, $newpassword, $fullname);
-		}
-
-		// check if the username already exist
-		$rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
-		$limit = $modx->db->getValue($rs);
-		if($limit > 0) {
-			webAlertAndQuit("User name is already in use!");
-		}
-
-		// check if the email address already exists
-		if ($modx->config['allow_multiple_emails'] != 1) {
-			$rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
-			$limit = $modx->db->getValue($rs);
-			if($limit > 0) {
-				webAlertAndQuit("Email is already in use!");
-			}
-		}
-
-		// invoke OnBeforeWUsrFormSave event
-		$modx->invokeEvent("OnBeforeWUsrFormSave", array(
-			"mode" => "upd",
-			"id" => $id
-		));
-
-		// update user name and password
-		$field = array();
-		$field['username'] = $esc_newusername;
-		if($genpassword == 1) {
-			$field['password'] = md5($newpassword);
-		}
-		$modx->db->update($field, $tbl_web_users, "id='{$id}'");
-		$field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
-		$field = $modx->db->escape($field);
-		$modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'");
-
-		// Save User Settings
-		saveUserSettings($id);
-
-		// Set the item name for logger
-		$_SESSION['itemname'] = $newusername;
-
-		/*******************************************************************************/
-		// put the user in the user_groups he/ she should be in
-		// first, check that up_perms are switched on!
-		if($use_udperms == 1) {
-			// as this is an existing user, delete his/ her entries in the groups before saving the new groups
-			$modx->db->delete($tbl_web_groups, "webuser='{$id}'");
-			if(!empty($user_groups)) {
-				for($i = 0; $i < count($user_groups); $i++) {
-					$field = array();
-					$field['webgroup'] = (int)$user_groups[$i];
-					$field['webuser'] = $id;
-					$modx->db->insert($field, $tbl_web_groups);
-				}
-			}
-		}
-		// end of user_groups stuff!
-		/*******************************************************************************/
+            include_once "footer.inc.php";
+        }
+        break;
+    case '88' : // edit user
+        // generate a new password for this user
+        if($genpassword == 1) {
+            if($specifiedpassword != "" && $passwordgenmethod == "spec") {
+                if(strlen($specifiedpassword) < 6) {
+                    webAlertAndQuit("Password is too short!");
+                } else {
+                    $newpassword = $specifiedpassword;
+                }
+            } elseif($specifiedpassword == "" && $passwordgenmethod == "spec") {
+                webAlertAndQuit("You didn't specify a password for this user!");
+            } elseif($passwordgenmethod == 'g') {
+                $newpassword = generate_password(8);
+            } else {
+                webAlertAndQuit("No password generation method specified!");
+            }
+        }
+        if($passwordnotifymethod == 'e') {
+            sendMailMessage($email, $newusername, $newpassword, $fullname);
+        }
+
+        // check if the username already exist
+        $rs = $modx->db->select('count(id)', $tbl_web_users, "username='{$esc_newusername}' AND id!='{$id}'");
+        $limit = $modx->db->getValue($rs);
+        if($limit > 0) {
+            webAlertAndQuit("User name is already in use!");
+        }
+
+        // check if the email address already exists
+        if ($modx->config['allow_multiple_emails'] != 1) {
+            $rs = $modx->db->select('count(internalKey)', $tbl_web_user_attributes, "email='{$esc_email}' AND internalKey!='{$id}'");
+            $limit = $modx->db->getValue($rs);
+            if($limit > 0) {
+                webAlertAndQuit("Email is already in use!");
+            }
+        }
+
+        // invoke OnBeforeWUsrFormSave event
+        $modx->invokeEvent("OnBeforeWUsrFormSave", array(
+            "mode" => "upd",
+            "id" => $id
+        ));
+
+        // update user name and password
+        $field = array();
+        $field['username'] = $esc_newusername;
+        if($genpassword == 1) {
+            $field['password'] = md5($newpassword);
+        }
+        $modx->db->update($field, $tbl_web_users, "id='{$id}'");
+        $field = compact('fullname', 'role', 'email', 'phone', 'mobilephone', 'fax', 'zip', 'street', 'city', 'state', 'country', 'gender', 'dob', 'photo', 'comment', 'failedlogincount', 'blocked', 'blockeduntil', 'blockedafter');
+        $field = $modx->db->escape($field);
+        $modx->db->update($field, $tbl_web_user_attributes, "internalKey='{$id}'");
+
+        // Save User Settings
+        saveUserSettings($id);
+
+        // Set the item name for logger
+        $_SESSION['itemname'] = $newusername;
+
+        /*******************************************************************************/
+        // put the user in the user_groups he/ she should be in
+        // first, check that up_perms are switched on!
+        if($use_udperms == 1) {
+            // as this is an existing user, delete his/ her entries in the groups before saving the new groups
+            $modx->db->delete($tbl_web_groups, "webuser='{$id}'");
+            if(!empty($user_groups)) {
+                for($i = 0; $i < count($user_groups); $i++) {
+                    $field = array();
+                    $field['webgroup'] = (int)$user_groups[$i];
+                    $field['webuser'] = $id;
+                    $modx->db->insert($field, $tbl_web_groups);
+                }
+            }
+        }
+        // end of user_groups stuff!
+        /*******************************************************************************/
 
         // invoke OnWebSaveUser event
         $modx->invokeEvent("OnWebSaveUser", array(
@@ -293,16 +293,16 @@ 
             "id" => $id
         ));
 
-		if($genpassword == 1 && $passwordnotifymethod == 's') {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
-			} else {
-				$stayUrl = "index.php?a=99&r=2";
-			}
+        if($genpassword == 1 && $passwordnotifymethod == 's') {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
+                $stayUrl = "index.php?a={$a}&r=2&stay=" . $input['stay'];
+            } else {
+                $stayUrl = "index.php?a=99&r=2";
+            }
 
-			include_once "header.inc.php";
-			?>
+            include_once "header.inc.php";
+            ?>
 
 			<h1><?php echo $_lang['web_user_title']; ?></h1>
 
@@ -322,20 +322,20 @@ 
 			</div>
 			<?php
 
-			include_once "footer.inc.php";
-		} else {
-			if($input['stay'] != '') {
-				$a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
-				$header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
-				header($header);
-			} else {
-				$header = "Location: index.php?a=99&r=2";
-				header($header);
-			}
-		}
-		break;
-	default :
-		webAlertAndQuit("No operation set in request.");
+            include_once "footer.inc.php";
+        } else {
+            if($input['stay'] != '') {
+                $a = ($input['stay'] == '2') ? "88&id={$id}" : "87";
+                $header = "Location: index.php?a={$a}&r=2&stay=" . $input['stay'];
+                header($header);
+            } else {
+                $header = "Location: index.php?a=99&r=2";
+                header($header);
+            }
+        }
+        break;
+    default :
+        webAlertAndQuit("No operation set in request.");
 }
 
 if(!function_exists('save_user_quoted_printable')) {

manager/processors/duplicate_content.processor.php

Indentation +3 added lines, -3 removed lines

@@ -3,12 +3,12 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if(!$modx->hasPermission('new_document') || !$modx->hasPermission('save_document')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_GET['id'])? (int)$_GET['id'] : 0;
 if($id==0) {
-	$modx->webAlertAndQuit($_lang["error_no_id"]);
+    $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 $children = array();
@@ -21,7 +21,7 @@ 
 $udperms->duplicateDoc = true;
 
 if(!$udperms->checkPermissions()) {
-	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    $modx->webAlertAndQuit($_lang["access_permission_denied"]);
 }
 
 // Run the duplicator

manager/processors/login.processor.php

Indentation +127 added lines, -127 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-	header('HTTP/1.0 404 Not Found');
-	exit('error');
+    header('HTTP/1.0 404 Not Found');
+    exit('error');
 }
 define('IN_MANAGER_MODE', true);  // we use this to make sure files are accessed through
 define('MODX_API_MODE', true);
@@ -18,12 +18,12 @@ 
 include_once("{$core_path}lang/english.inc.php");
 
 if($manager_language !== 'english' && is_file("{$core_path}lang/{$manager_language}.inc.php")) {
-	include_once("{$core_path}lang/{$manager_language}.inc.php");
+    include_once("{$core_path}lang/{$manager_language}.inc.php");
 }
 
 // Initialize System Alert Message Queque
 if(!isset($_SESSION['SystemAlertMsgQueque'])) {
-	$_SESSION['SystemAlertMsgQueque'] = array();
+    $_SESSION['SystemAlertMsgQueque'] = array();
 }
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
@@ -38,10 +38,10 @@ 
 
 // invoke OnBeforeManagerLogin event
 $modx->invokeEvent('OnBeforeManagerLogin', array(
-		'username' => $username,
-		'userpassword' => $givenPassword,
-		'rememberme' => $rememberme
-	));
+        'username' => $username,
+        'userpassword' => $givenPassword,
+        'rememberme' => $rememberme
+    ));
 $fields = 'mu.*, ua.*';
 $from = '[+prefix+]manager_users AS mu, [+prefix+]user_attributes AS ua';
 $where = "BINARY mu.username='{$username}' and ua.internalKey=mu.id";
@@ -49,8 +49,8 @@ 
 $limit = $modx->db->getRecordCount($rs);
 
 if($limit == 0 || $limit > 1) {
-	jsAlert($_lang['login_processor_unknown_user']);
-	return;
+    jsAlert($_lang['login_processor_unknown_user']);
+    return;
 }
 
 $row = $modx->db->getRow($rs);
@@ -71,127 +71,127 @@ 
 // get the user settings from the database
 $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_value!=''");
 while($row = $modx->db->getRow($rs)) {
-	extract($row);
-	${$setting_name} = $setting_value;
+    extract($row);
+    ${$setting_name} = $setting_value;
 }
 
 // blocked due to number of login errors.
 if($failedlogins >= $failed_allowed && $blockeduntildate > time()) {
-	@session_destroy();
-	session_unset();
-	if($cip = getenv("HTTP_CLIENT_IP")) {
-		$ip = $cip;
-	} elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
-		$ip = $cip;
-	} elseif($cip = getenv("REMOTE_ADDR")) {
-		$ip = $cip;
-	} else {
-		$ip = "UNKNOWN";
-	}
-	$log = new EvolutionCMS\Legacy\LogHandler();
-	$log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);
-	jsAlert($_lang['login_processor_many_failed_logins']);
-	return;
+    @session_destroy();
+    session_unset();
+    if($cip = getenv("HTTP_CLIENT_IP")) {
+        $ip = $cip;
+    } elseif($cip = getenv("HTTP_X_FORWARDED_FOR")) {
+        $ip = $cip;
+    } elseif($cip = getenv("REMOTE_ADDR")) {
+        $ip = $cip;
+    } else {
+        $ip = "UNKNOWN";
+    }
+    $log = new EvolutionCMS\Legacy\LogHandler();
+    $log->initAndWriteLog("Login Fail (Temporary Block)", $internalKey, $username, "119", $internalKey, "IP: " . $ip);
+    jsAlert($_lang['login_processor_many_failed_logins']);
+    return;
 }
 
 // blocked due to number of login errors, but get to try again
 if($failedlogins >= $failed_allowed && $blockeduntildate < time()) {
-	$fields = array();
-	$fields['failedlogincount'] = '0';
-	$fields['blockeduntil'] = time() - 1;
-	$modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
+    $fields = array();
+    $fields['failedlogincount'] = '0';
+    $fields['blockeduntil'] = time() - 1;
+    $modx->db->update($fields, '[+prefix+]user_attributes', "internalKey='{$internalKey}'");
 }
 
 // this user has been blocked by an admin, so no way he's loggin in!
 if($blocked == '1') {
-	@session_destroy();
-	session_unset();
-	jsAlert($_lang['login_processor_blocked1']);
-	return;
+    @session_destroy();
+    session_unset();
+    jsAlert($_lang['login_processor_blocked1']);
+    return;
 }
 
 // blockuntil: this user has a block until date
 if($blockeduntildate > time()) {
-	@session_destroy();
-	session_unset();
-	jsAlert($_lang['login_processor_blocked2']);
-	return;
+    @session_destroy();
+    session_unset();
+    jsAlert($_lang['login_processor_blocked2']);
+    return;
 }
 
 // blockafter: this user has a block after date
 if($blockedafterdate > 0 && $blockedafterdate < time()) {
-	@session_destroy();
-	session_unset();
-	jsAlert($_lang['login_processor_blocked3']);
-	return;
+    @session_destroy();
+    session_unset();
+    jsAlert($_lang['login_processor_blocked3']);
+    return;
 }
 
 // allowed ip
 if($allowed_ip) {
-	if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
-		if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
-			jsAlert($_lang['login_processor_remotehost_ip']);
-			return;
-		}
-	}
-	if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
-		jsAlert($_lang['login_processor_remote_ip']);
-		return;
-	}
+    if(($hostname = gethostbyaddr($_SERVER['REMOTE_ADDR'])) && ($hostname != $_SERVER['REMOTE_ADDR'])) {
+        if(gethostbyname($hostname) != $_SERVER['REMOTE_ADDR']) {
+            jsAlert($_lang['login_processor_remotehost_ip']);
+            return;
+        }
+    }
+    if(!in_array($_SERVER['REMOTE_ADDR'], array_filter(array_map('trim', explode(',', $allowed_ip))))) {
+        jsAlert($_lang['login_processor_remote_ip']);
+        return;
+    }
 }
 
 // allowed days
 if($allowed_days) {
-	$date = getdate();
-	$day = $date['wday'] + 1;
-	if(!in_array($day,explode(',',$allowed_days))) {
-		jsAlert($_lang['login_processor_date']);
-		return;
-	}
+    $date = getdate();
+    $day = $date['wday'] + 1;
+    if(!in_array($day,explode(',',$allowed_days))) {
+        jsAlert($_lang['login_processor_date']);
+        return;
+    }
 }
 
 // invoke OnManagerAuthentication event
 $rt = $modx->invokeEvent('OnManagerAuthentication', array(
-		'userid' => $internalKey,
-		'username' => $username,
-		'userpassword' => $givenPassword,
-		'savedpassword' => $dbasePassword,
-		'rememberme' => $rememberme
-	));
+        'userid' => $internalKey,
+        'username' => $username,
+        'userpassword' => $givenPassword,
+        'savedpassword' => $dbasePassword,
+        'rememberme' => $rememberme
+    ));
 
 // check if plugin authenticated the user
 $matchPassword = false;
 if(!isset($rt) || !$rt || (is_array($rt) && !in_array(true, $rt))) {
-	// check user password - local authentication
-	$hashType = $modx->manager->getHashType($dbasePassword);
-	if($hashType == 'phpass') {
-		$matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
-	} elseif($hashType == 'md5') {
-		$matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} elseif($hashType == 'v1') {
-		$matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
-	} else {
-		$matchPassword = false;
-	}
+    // check user password - local authentication
+    $hashType = $modx->manager->getHashType($dbasePassword);
+    if($hashType == 'phpass') {
+        $matchPassword = login($username, $_REQUEST['password'], $dbasePassword);
+    } elseif($hashType == 'md5') {
+        $matchPassword = loginMD5($internalKey, $_REQUEST['password'], $dbasePassword, $username);
+    } elseif($hashType == 'v1') {
+        $matchPassword = loginV1($internalKey, $_REQUEST['password'], $dbasePassword, $username);
+    } else {
+        $matchPassword = false;
+    }
 } else if($rt === true || (is_array($rt) && in_array(true, $rt))) {
-	$matchPassword = true;
+    $matchPassword = true;
 }
 
 if(!$matchPassword) {
-	jsAlert($_lang['login_processor_wrong_password']);
-	incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
-	return;
+    jsAlert($_lang['login_processor_wrong_password']);
+    incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
+    return;
 }
 
 if($modx->config['use_captcha'] == 1) {
-	if(!isset ($_SESSION['veriword'])) {
-		jsAlert($_lang['login_processor_captcha_config']);
-		return;
-	} elseif($_SESSION['veriword'] != $captcha_code) {
-		jsAlert($_lang['login_processor_bad_code']);
-		incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
-		return;
-	}
+    if(!isset ($_SESSION['veriword'])) {
+        jsAlert($_lang['login_processor_captcha_config']);
+        return;
+    } elseif($_SESSION['veriword'] != $captcha_code) {
+        jsAlert($_lang['login_processor_bad_code']);
+        incrementFailedLoginCount($internalKey, $failedlogins, $failed_allowed, $blocked_minutes);
+        return;
+    }
 }
 
 $modx->cleanupExpiredLocks();
@@ -226,36 +226,36 @@ 
 $_SESSION['mgrToken'] = md5($currentsessionid);
 
 if($rememberme == '1') {
-	$_SESSION['modx.mgr.session.cookie.lifetime'] = (int)$modx->config['session.cookie.lifetime'];
-
-	// Set a cookie separate from the session cookie with the username in it.
-	// Are we using secure connection? If so, make sure the cookie is secure
-	global $https_port;
-
-	$secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
-	if(version_compare(PHP_VERSION, '5.2', '<')) {
-		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
-	} else {
-		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
-	}
+    $_SESSION['modx.mgr.session.cookie.lifetime'] = (int)$modx->config['session.cookie.lifetime'];
+
+    // Set a cookie separate from the session cookie with the username in it.
+    // Are we using secure connection? If so, make sure the cookie is secure
+    global $https_port;
+
+    $secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);
+    if(version_compare(PHP_VERSION, '5.2', '<')) {
+        setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
+    } else {
+        setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
+    }
 } else {
-	$_SESSION['modx.mgr.session.cookie.lifetime'] = 0;
+    $_SESSION['modx.mgr.session.cookie.lifetime'] = 0;
 
-	// Remove the Remember Me cookie
-	setcookie('modx_remember_manager', '', time() - 3600, MODX_BASE_URL);
+    // Remove the Remember Me cookie
+    setcookie('modx_remember_manager', '', time() - 3600, MODX_BASE_URL);
 }
 
 // Check if user already has an active session, if not check if user pressed logout end of last session
 $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_user_sessions'), "internalKey='{$internalKey}'");
 $activeSession = $modx->db->getValue($rs);
 if(!$activeSession) {
-	$rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
-	if($lastHit = $modx->db->getValue($rs)) {
-		$_SESSION['show_logout_reminder'] = array(
-			'type' => 'logout_reminder',
-			'lastHit' => $lastHit
-		);
-	}
+    $rs = $modx->db->select('lasthit', $modx->getFullTableName('active_users'), "internalKey='{$internalKey}' AND action != 8");
+    if($lastHit = $modx->db->getValue($rs)) {
+        $_SESSION['show_logout_reminder'] = array(
+            'type' => 'logout_reminder',
+            'lastHit' => $lastHit
+        );
+    }
 }
 
 $log = new EvolutionCMS\Legacy\LogHandler();
@@ -263,29 +263,29 @@ 
 
 // invoke OnManagerLogin event
 $modx->invokeEvent('OnManagerLogin', array(
-		'userid' => $internalKey,
-		'username' => $username,
-		'userpassword' => $givenPassword,
-		'rememberme' => $rememberme
-	));
+        'userid' => $internalKey,
+        'username' => $username,
+        'userpassword' => $givenPassword,
+        'rememberme' => $rememberme
+    ));
 
 // check if we should redirect user to a web page
 $rs = $modx->db->select('setting_value', '[+prefix+]user_settings', "user='{$internalKey}' AND setting_name='manager_login_startup'");
 $id = (int)$modx->db->getValue($rs);
 if($id > 0) {
-	$header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');
-	if($_POST['ajax'] == 1) {
-		echo $header;
-	} else {
-		header($header);
-	}
+    $header = 'Location: ' . $modx->makeUrl($id, '', '', 'full');
+    if($_POST['ajax'] == 1) {
+        echo $header;
+    } else {
+        header($header);
+    }
 } else {
-	$header = 'Location: ' . MODX_MANAGER_URL;
-	if($_POST['ajax'] == 1) {
-		echo $header;
-	} else {
-		header($header);
-	}
+    $header = 'Location: ' . MODX_MANAGER_URL;
+    if($_POST['ajax'] == 1) {
+        echo $header;
+    } else {
+        header($header);
+    }
 }
 
 if(!function_exists('jsAlert')) {