Inspection of "Refactoring" - evolution-cms/evolution - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#716)

by Agel_Nash

created 2018-06-08 00:05 UTC

Status

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

@@ -38,7 +38,7 @@  discard block
 block discarded – undo
     {
         $found = $this->core->findElements(
             'chunk',
-            MODX_MANAGER_PATH . 'media/style/'. $this->theme .'/snippets/',
+            MODX_MANAGER_PATH.'media/style/'.$this->theme.'/snippets/',
             array('php')
         );
         foreach ($found as $name => $code) {
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
     {
         $found = $this->core->findElements(
             'chunk',
-            MODX_MANAGER_PATH . 'media/style/'. $this->theme .'/chunks/',
+            MODX_MANAGER_PATH.'media/style/'.$this->theme.'/chunks/',
             array('tpl', 'html')
         );
         foreach ($found as $name => $code) {
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
         $this->core->addSnippet(
             $name,
             $code,
-            $this->templateNamespace  . '#',
+            $this->templateNamespace.'#',
             array(
                 'managerTheme' => $this
             )
@@ -72,6 +72,6 @@  discard block
 block discarded – undo
 
     public function addChunk($name, $code)
     {
-        $this->core->addChunk($name, $code, $this->templateNamespace . '#');
+        $this->core->addChunk($name, $code, $this->templateNamespace.'#');
     }
 }

Please login to merge, or discard this patch.

manager/actions/welcome.static.php 3 patches

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

@@ -1,13 +1,13 @@  discard block
 block discarded – undo
 <?php
 if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
-	die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
+    die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
 }
 
 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,93 +17,93 @@  discard block
 block discarded – undo
 
 // 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);
 }
 
 $iconTpl = $modx->getChunk('manager#welcome\WrapIcon');
 // 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'] = sprintf($iconTpl,$icon, 75);
+    $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';
+    $ph['SecurityIcon'] = sprintf($iconTpl,$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'] = sprintf($iconTpl,$icon, 99);
+    $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';
+    $ph['WebUserIcon'] = sprintf($iconTpl,$icon, 99);
 }
 if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
-	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';
-	$ph['ModulesIcon'] = sprintf($iconTpl,$icon, 106);
+    $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';
+    $ph['ModulesIcon'] = sprintf($iconTpl,$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'] = sprintf($iconTpl,$icon, 76);
+    $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';
+    $ph['ResourcesIcon'] = sprintf($iconTpl,$icon, 76);
 }
 if($modx->hasPermission('bk_manager')) {
-	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';
-	$ph['BackupIcon'] = sprintf($iconTpl,$icon, 93);
+    $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';
+    $ph['BackupIcon'] = sprintf($iconTpl,$icon, 93);
 }
 if($modx->hasPermission('help')) {
-	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
-	$ph['HelpIcon'] = sprintf($iconTpl,$icon, 9);
+    $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
+    $ph['HelpIcon'] = sprintf($iconTpl,$icon, 9);
 }
 
 if($modx->hasPermission('new_document')) {
-	$icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';
-	$ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4);
-	$icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';
-	$ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72);
+    $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';
+    $ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4);
+    $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';
+    $ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72);
 }
 if($modx->hasPermission('assets_images')) {
-	$icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';
-	$ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72);
+    $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';
+    $ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72);
 }
 if($modx->hasPermission('assets_files')) {
-	$icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';
-	$ph['FilesIcon'] = sprintf($iconTpl,$icon, 72);
+    $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';
+    $ph['FilesIcon'] = sprintf($iconTpl,$icon, 72);
 }
 if($modx->hasPermission('change_password')) {
-	$icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';
-	$ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28);
+    $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';
+    $ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28);
 }
 $icon = '<i class="[&icons_logout_large&]"></i>[%logout%]';
 $ph['LogoutIcon'] = sprintf($iconTpl,$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
@@ -151,11 +151,11 @@  discard block
 block discarded – undo
 $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();
@@ -164,13 +164,13 @@  discard block
 block discarded – undo
 $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>):
@@ -188,33 +188,33 @@  discard block
 block discarded – undo
 	</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>
@@ -255,17 +255,17 @@  discard block
 block discarded – undo
 // 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">
@@ -339,25 +339,25 @@  discard block
 block discarded – undo
 					</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(
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
 // 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));
     }
@@ -393,21 +393,21 @@  discard block
 block discarded – undo
 }
 
 usort($widgets, function ($a, $b) {
-	return $a['menuindex'] - $b['menuindex'];
+    return $a['menuindex'] - $b['menuindex'];
 });
 
 $tpl = $modx->getChunk('manager#welcome\Widget');
 $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'];
@@ -415,27 +415,27 @@  discard block
 block discarded – undo
 $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
@@ -443,8 +443,8 @@  discard block
 block discarded – undo
 $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, '[%', '%]');
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
 $content = $modx->cleanUpMODXTags($content); //cleanup
 
 if($js = $modx->getRegisteredClientScripts()) {
-	$content .= $js;
+    $content .= $js;
 }
 
 echo $content;

Please login to merge, or discard this patch.

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

@@ -1,11 +1,11 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
 }
 
 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'))) {
+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>');
 }
@@ -16,16 +16,16 @@  discard block
 block discarded – undo
 $_SESSION['nrnewmessages'] = 0;
 
 // setup message info
-if($modx->hasPermission('messages')) {
-	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');
+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>)' : '';
+	$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';
+	$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);
@@ -33,56 +33,56 @@  discard block
 block discarded – undo
 
 $iconTpl = $modx->getChunk('manager#welcome\WrapIcon');
 // setup icons
-if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
+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'] = sprintf($iconTpl,$icon, 75);
+	$ph['SecurityIcon'] = sprintf($iconTpl, $icon, 75);
 }
-if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
+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'] = sprintf($iconTpl,$icon, 99);
+	$ph['WebUserIcon'] = sprintf($iconTpl, $icon, 99);
 }
-if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
+if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
 	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';
-	$ph['ModulesIcon'] = sprintf($iconTpl,$icon, 106);
+	$ph['ModulesIcon'] = sprintf($iconTpl, $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')) {
+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'] = sprintf($iconTpl,$icon, 76);
+	$ph['ResourcesIcon'] = sprintf($iconTpl, $icon, 76);
 }
-if($modx->hasPermission('bk_manager')) {
+if ($modx->hasPermission('bk_manager')) {
 	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';
-	$ph['BackupIcon'] = sprintf($iconTpl,$icon, 93);
+	$ph['BackupIcon'] = sprintf($iconTpl, $icon, 93);
 }
-if($modx->hasPermission('help')) {
+if ($modx->hasPermission('help')) {
 	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
-	$ph['HelpIcon'] = sprintf($iconTpl,$icon, 9);
+	$ph['HelpIcon'] = sprintf($iconTpl, $icon, 9);
 }
 
-if($modx->hasPermission('new_document')) {
+if ($modx->hasPermission('new_document')) {
 	$icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';
-	$ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4);
+	$ph['ResourceIcon'] = sprintf($iconTpl, $icon, 4);
 	$icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';
-	$ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72);
+	$ph['WeblinkIcon'] = sprintf($iconTpl, $icon, 72);
 }
-if($modx->hasPermission('assets_images')) {
+if ($modx->hasPermission('assets_images')) {
 	$icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';
-	$ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72);
+	$ph['ImagesIcon'] = sprintf($iconTpl, $icon, 72);
 }
-if($modx->hasPermission('assets_files')) {
+if ($modx->hasPermission('assets_files')) {
 	$icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';
-	$ph['FilesIcon'] = sprintf($iconTpl,$icon, 72);
+	$ph['FilesIcon'] = sprintf($iconTpl, $icon, 72);
 }
-if($modx->hasPermission('change_password')) {
+if ($modx->hasPermission('change_password')) {
 	$icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';
-	$ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28);
+	$ph['PasswordIcon'] = sprintf($iconTpl, $icon, 28);
 }
 $icon = '<i class="[&icons_logout_large&]"></i>[%logout%]';
-$ph['LogoutIcon'] = sprintf($iconTpl,$icon, 8);
+$ph['LogoutIcon'] = sprintf($iconTpl, $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']) {
+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 {
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
 }
 
 // Check logout-reminder
-if(isset($_SESSION['show_logout_reminder'])) {
-	switch($_SESSION['show_logout_reminder']['type']) {
+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']);
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
 	</tr>
 </table>';
 
-$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';
+$nrnewmessages = '<span class="text-danger">'.$_SESSION['nrnewmessages'].'</span>';
 
 $ph['UserInfo'] = $modx->parseText($tpl, array(
 	'username' => $modx->getLoginUserName(),
@@ -163,10 +163,10 @@  discard block
 block discarded – undo
 $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";
 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
 
-if($modx->db->getRecordCount($rs) < 1) {
+if ($modx->db->getRecordCount($rs) < 1) {
 	$html = '<p>[%no_active_users_found%]</p>';
 } else {
-	include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
+	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;
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
 	$userList = array();
 	$userCount = array();
 	// Create userlist with session-count first before output
-	while($activeusers = $modx->db->getRow($rs)) {
+	while ($activeusers = $modx->db->getRow($rs)) {
 		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;
 
 		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';
@@ -209,9 +209,9 @@  discard block
 block discarded – undo
 			$currentaction
 		);
 	}
-	foreach($userList as $params) {
+	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 .= "\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 .= '
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
 $ph['OnlineInfo'] = $html;
 
 // include rss feeds for important forum topics
-include_once(MODX_MANAGER_PATH . 'includes/rss.inc.php');
+include_once(MODX_MANAGER_PATH.'includes/rss.inc.php');
 $ph['modx_security_notices_content'] = $feedData['modx_security_notices_content'];
 $ph['modx_news_content'] = $feedData['modx_news_content'];
 
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
 
 // invoke event OnManagerWelcomePrerender
 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
-if(is_array($evtOut)) {
+if (is_array($evtOut)) {
 	$output = implode('', $evtOut);
 	$ph['OnManagerWelcomePrerender'] = $output;
 }
@@ -384,57 +384,57 @@  discard block
 block discarded – undo
 
 // invoke OnManagerWelcomeHome event
 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
-if(is_array($sitewidgets)) {
+if (is_array($sitewidgets)) {
 	$newwidgets = array();
-    foreach($sitewidgets as $widget){
+    foreach ($sitewidgets as $widget) {
         $newwidgets = array_merge($newwidgets, unserialize($widget));
     }
     $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;
 }
 
-usort($widgets, function ($a, $b) {
+usort($widgets, function($a, $b){
 	return $a['menuindex'] - $b['menuindex'];
 });
 
 $tpl = $modx->getChunk('manager#welcome\Widget');
 $output = '';
-foreach($widgets as $widget) {
-	if ($widget['hide'] != '1'){
+foreach ($widgets as $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';
+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';
 }
 
 $target = $modx->config['manager_welcome_tpl'];
 $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
 $target = $modx->mergeSettingsContent($target);
 
-if(substr($target, 0, 1) === '@') {
-	if(substr($target, 0, 6) === '@CHUNK') {
+if (substr($target, 0, 1) === '@') {
+	if (substr($target, 0, 6) === '@CHUNK') {
 		$content = $modx->getChunk(trim(substr($target, 7)));
-	} elseif(substr($target, 0, 5) === '@FILE') {
+	} 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)) {
+	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
+	} 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');
+		$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');
+		$content = file_get_contents(MODX_MANAGER_PATH.'media/style/common/welcome.tpl');
 	}
 }
 
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
 $content = $modx->mergeConditionalTagsContent($content);
 $content = $modx->mergeSettingsContent($content);
 $content = $modx->parseText($content, $ph);
-if(strpos($content, '[+') !== false) {
+if (strpos($content, '[+') !== false) {
 	$modx->toPlaceholders($ph);
 	$content = $modx->mergePlaceholderContent($content);
 }
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
 $content = $modx->parseText($content, $_style, '[&', '&]');
 $content = $modx->cleanUpMODXTags($content); //cleanup
 
-if($js = $modx->getRegisteredClientScripts()) {
+if ($js = $modx->getRegisteredClientScripts()) {
 	$content .= $js;
 }
 

Please login to merge, or discard this patch.

Braces +48 added lines, -46 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@  discard block
 block discarded – undo
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
 }
 
 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'))) {
+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>');
 }
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
 $_SESSION['nrnewmessages'] = 0;
 
 // setup message info
-if($modx->hasPermission('messages')) {
+if($modx->hasPermission('messages')) {
 	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');
 	$_SESSION['nrtotalmessages'] = $nrtotalmessages;
 	$_SESSION['nrnewmessages'] = $nrnewmessages;
@@ -33,46 +33,46 @@  discard block
 block discarded – undo
 
 $iconTpl = $modx->getChunk('manager#welcome\WrapIcon');
 // setup icons
-if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
+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'] = sprintf($iconTpl,$icon, 75);
 }
-if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
+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'] = sprintf($iconTpl,$icon, 99);
 }
-if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
+if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
 	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';
 	$ph['ModulesIcon'] = sprintf($iconTpl,$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')) {
+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'] = sprintf($iconTpl,$icon, 76);
 }
-if($modx->hasPermission('bk_manager')) {
+if($modx->hasPermission('bk_manager')) {
 	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';
 	$ph['BackupIcon'] = sprintf($iconTpl,$icon, 93);
 }
-if($modx->hasPermission('help')) {
+if($modx->hasPermission('help')) {
 	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
 	$ph['HelpIcon'] = sprintf($iconTpl,$icon, 9);
 }
 
-if($modx->hasPermission('new_document')) {
+if($modx->hasPermission('new_document')) {
 	$icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';
 	$ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4);
 	$icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';
 	$ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72);
 }
-if($modx->hasPermission('assets_images')) {
+if($modx->hasPermission('assets_images')) {
 	$icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';
 	$ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72);
 }
-if($modx->hasPermission('assets_files')) {
+if($modx->hasPermission('assets_files')) {
 	$icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';
 	$ph['FilesIcon'] = sprintf($iconTpl,$icon, 72);
 }
-if($modx->hasPermission('change_password')) {
+if($modx->hasPermission('change_password')) {
 	$icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';
 	$ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28);
 }
@@ -80,21 +80,21 @@  discard block
 block discarded – undo
 $ph['LogoutIcon'] = sprintf($iconTpl,$icon, 8);
 
 // do some config checks
-if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
+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']) {
+	if($config_check_results != $_lang['configcheck_ok']) {
 		$ph['config_check_results'] = $config_check_results;
 		$ph['config_display'] = 'block';
-	} else {
+	} else {
 		$ph['config_display'] = 'none';
 	}
-} else {
+} else {
 	$ph['config_display'] = 'none';
 }
 
 // Check logout-reminder
-if(isset($_SESSION['show_logout_reminder'])) {
-	switch($_SESSION['show_logout_reminder']['type']) {
+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']);
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
 	}
 	$ph['show_logout_reminder'] = 'block';
 	unset($_SESSION['show_logout_reminder']);
-} else {
+} else {
 	$ph['show_logout_reminder'] = 'none';
 }
 
@@ -163,9 +163,9 @@  discard block
 block discarded – undo
 $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";
 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
 
-if($modx->db->getRecordCount($rs) < 1) {
+if($modx->db->getRecordCount($rs) < 1) {
 	$html = '<p>[%no_active_users_found%]</p>';
-} else {
+} else {
 	include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
 	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;
 	$ph['now'] = strftime('%H:%M:%S', $now);
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
 	$userList = array();
 	$userCount = array();
 	// Create userlist with session-count first before output
-	while($activeusers = $modx->db->getRow($rs)) {
+	while($activeusers = $modx->db->getRow($rs)) {
 		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;
 
 		$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
 			$currentaction
 		);
 	}
-	foreach($userList as $params) {
+	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);
 	}
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
 
 // invoke event OnManagerWelcomePrerender
 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
-if(is_array($evtOut)) {
+if(is_array($evtOut)) {
 	$output = implode('', $evtOut);
 	$ph['OnManagerWelcomePrerender'] = $output;
 }
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
 	'body' => '<div class="widget-stage">[+RecentInfo+]</div>',
 	'hide'=>'0'
 );
-if ($modx->config['rss_url_news']) {
+if ($modx->config['rss_url_news']) {
     $widgets['news'] = array(
         'menuindex' => '40',
         'id' => 'news',
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
         'hide'=>'0'
     );
 }
-if ($modx->config['rss_url_security']) {
+if ($modx->config['rss_url_security']) {
     $widgets['security'] = array(
         'menuindex' => '50',
         'id' => 'security',
@@ -384,29 +384,29 @@  discard block
 block discarded – undo
 
 // invoke OnManagerWelcomeHome event
 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
-if(is_array($sitewidgets)) {
+if(is_array($sitewidgets)) {
 	$newwidgets = array();
-    foreach($sitewidgets as $widget){
+    foreach($sitewidgets as $widget) {
         $newwidgets = array_merge($newwidgets, unserialize($widget));
     }
     $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;
 }
 
-usort($widgets, function ($a, $b) {
+usort($widgets, function ($a, $b){
 	return $a['menuindex'] - $b['menuindex'];
 });
 
 $tpl = $modx->getChunk('manager#welcome\Widget');
 $output = '';
-foreach($widgets as $widget) {
-	if ($widget['hide'] != '1'){
+foreach($widgets as $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'])) {
+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';
 }
 
@@ -414,26 +414,28 @@  discard block
 block discarded – undo
 $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
 $target = $modx->mergeSettingsContent($target);
 
-if(substr($target, 0, 1) === '@') {
-	if(substr($target, 0, 6) === '@CHUNK') {
+if(substr($target, 0, 1) === '@') {
+	if(substr($target, 0, 6) === '@CHUNK') {
 		$content = $modx->getChunk(trim(substr($target, 7)));
-	} elseif(substr($target, 0, 5) === '@FILE') {
+	} elseif(substr($target, 0, 5) === '@FILE') {
 		$content = file_get_contents(trim(substr($target, 6)));
-	} else {
+	} else {
 		$content = '';
 	}
-} else {
+} else {
 	$chunk = $modx->getChunk($target);
-	if($chunk !== false && !empty($chunk)) {
+	if($chunk !== false && !empty($chunk)) {
 		$content = $chunk;
-	} elseif(is_file(MODX_BASE_PATH . $target)) {
+	} 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')) {
+	} 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
+	} 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/' . $modx->config['manager_theme'] . '/html/welcome.html');
+	}
+	} else {
 		$content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');
 	}
 }
@@ -442,7 +444,7 @@  discard block
 block discarded – undo
 $content = $modx->mergeConditionalTagsContent($content);
 $content = $modx->mergeSettingsContent($content);
 $content = $modx->parseText($content, $ph);
-if(strpos($content, '[+') !== false) {
+if(strpos($content, '[+') !== false) {
 	$modx->toPlaceholders($ph);
 	$content = $modx->mergePlaceholderContent($content);
 }
@@ -451,7 +453,7 @@  discard block
 block discarded – undo
 $content = $modx->parseText($content, $_style, '[&', '&]');
 $content = $modx->cleanUpMODXTags($content); //cleanup
 
-if($js = $modx->getRegisteredClientScripts()) {
+if($js = $modx->getRegisteredClientScripts()) {
 	$content .= $js;
 }
 

Please login to merge, or discard this patch.

		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38	{
39	39	$found = $this->core->findElements(
40	40	'chunk',
41		- MODX_MANAGER_PATH . 'media/style/'. $this->theme .'/snippets/',
	41	+ MODX_MANAGER_PATH.'media/style/'.$this->theme.'/snippets/',
42	42	array('php')
43	43	);
44	44	foreach ($found as $name => $code) {
		@@ -50,7 +50,7 @@ discard block
		block discarded – undo
50	50	{
51	51	$found = $this->core->findElements(
52	52	'chunk',
53		- MODX_MANAGER_PATH . 'media/style/'. $this->theme .'/chunks/',
	53	+ MODX_MANAGER_PATH.'media/style/'.$this->theme.'/chunks/',
54	54	array('tpl', 'html')
55	55	);
56	56	foreach ($found as $name => $code) {
		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	$this->core->addSnippet(
64	64	$name,
65	65	$code,
66		- $this->templateNamespace . '#',
	66	+ $this->templateNamespace.'#',
67	67	array(
68	68	'managerTheme' => $this
69	69	)
		@@ -72,6 +72,6 @@ discard block
		block discarded – undo
72	72
73	73	public function addChunk($name, $code)
74	74	{
75		- $this->core->addChunk($name, $code, $this->templateNamespace . '#');
	75	+ $this->core->addChunk($name, $code, $this->templateNamespace.'#');
76	76	}
77	77	}

		@@ -1,13 +1,13 @@ discard block
		block discarded – undo
1	1	<?php
2	2	if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3		- die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
	3	+ die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
4	4	}
5	5
6	6	unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes
7	7
8	8	if($modx->hasPermission('settings') && (!isset($settings_version) \|\| $settings_version != $modx->getVersionData('version'))) {
9		- // seems to be a new install - send the user to the configuration page
10		- exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
	9	+ // seems to be a new install - send the user to the configuration page
	10	+ exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
11	11	}
12	12
13	13	// set placeholders
		@@ -17,93 +17,93 @@ discard block
		block discarded – undo
17	17
18	18	// setup message info
19	19	if($modx->hasPermission('messages')) {
20		- include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');
21		- $_SESSION['nrtotalmessages'] = $nrtotalmessages;
22		- $_SESSION['nrnewmessages'] = $nrnewmessages;
23		-
24		- $msg = array();
25		- $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
26		- $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';
27		- $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold"> <a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
28		- $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';
29		- $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);
30		- $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
31		- $ph['MessageInfo'] = implode("\n", $msg);
	20	+ include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');
	21	+ $_SESSION['nrtotalmessages'] = $nrtotalmessages;
	22	+ $_SESSION['nrnewmessages'] = $nrnewmessages;
	23	+
	24	+ $msg = array();
	25	+ $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
	26	+ $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';
	27	+ $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold"> <a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
	28	+ $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';
	29	+ $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);
	30	+ $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
	31	+ $ph['MessageInfo'] = implode("\n", $msg);
32	32	}
33	33
34	34	$iconTpl = $modx->getChunk('manager#welcome\WrapIcon');
35	35	// setup icons
36	36	if($modx->hasPermission('new_user') \|\| $modx->hasPermission('edit_user')) {
37		- $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';
38		- $ph['SecurityIcon'] = sprintf($iconTpl,$icon, 75);
	37	+ $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';
	38	+ $ph['SecurityIcon'] = sprintf($iconTpl,$icon, 75);
39	39	}
40	40	if($modx->hasPermission('new_web_user') \|\| $modx->hasPermission('edit_web_user')) {
41		- $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';
42		- $ph['WebUserIcon'] = sprintf($iconTpl,$icon, 99);
	41	+ $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';
	42	+ $ph['WebUserIcon'] = sprintf($iconTpl,$icon, 99);
43	43	}
44	44	if($modx->hasPermission('new_module') \|\| $modx->hasPermission('edit_module')) {
45		- $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';
46		- $ph['ModulesIcon'] = sprintf($iconTpl,$icon, 106);
	45	+ $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';
	46	+ $ph['ModulesIcon'] = sprintf($iconTpl,$icon, 106);
47	47	}
48	48	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')) {
49		- $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';
50		- $ph['ResourcesIcon'] = sprintf($iconTpl,$icon, 76);
	49	+ $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';
	50	+ $ph['ResourcesIcon'] = sprintf($iconTpl,$icon, 76);
51	51	}
52	52	if($modx->hasPermission('bk_manager')) {
53		- $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';
54		- $ph['BackupIcon'] = sprintf($iconTpl,$icon, 93);
	53	+ $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';
	54	+ $ph['BackupIcon'] = sprintf($iconTpl,$icon, 93);
55	55	}
56	56	if($modx->hasPermission('help')) {
57		- $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
58		- $ph['HelpIcon'] = sprintf($iconTpl,$icon, 9);
	57	+ $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
	58	+ $ph['HelpIcon'] = sprintf($iconTpl,$icon, 9);
59	59	}
60	60
61	61	if($modx->hasPermission('new_document')) {
62		- $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';
63		- $ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4);
64		- $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';
65		- $ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72);
	62	+ $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';
	63	+ $ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4);
	64	+ $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';
	65	+ $ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72);
66	66	}
67	67	if($modx->hasPermission('assets_images')) {
68		- $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';
69		- $ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72);
	68	+ $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';
	69	+ $ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72);
70	70	}
71	71	if($modx->hasPermission('assets_files')) {
72		- $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';
73		- $ph['FilesIcon'] = sprintf($iconTpl,$icon, 72);
	72	+ $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';
	73	+ $ph['FilesIcon'] = sprintf($iconTpl,$icon, 72);
74	74	}
75	75	if($modx->hasPermission('change_password')) {
76		- $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';
77		- $ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28);
	76	+ $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';
	77	+ $ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28);
78	78	}
79	79	$icon = '<i class="[&icons_logout_large&]"></i>[%logout%]';
80	80	$ph['LogoutIcon'] = sprintf($iconTpl,$icon, 8);
81	81
82	82	// do some config checks
83	83	if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) \|\| $modx->config['warning_visibility'] == 1) {
84		- include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');
85		- if($config_check_results != $_lang['configcheck_ok']) {
86		- $ph['config_check_results'] = $config_check_results;
87		- $ph['config_display'] = 'block';
88		- } else {
89		- $ph['config_display'] = 'none';
90		- }
	84	+ include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');
	85	+ if($config_check_results != $_lang['configcheck_ok']) {
	86	+ $ph['config_check_results'] = $config_check_results;
	87	+ $ph['config_display'] = 'block';
	88	+ } else {
	89	+ $ph['config_display'] = 'none';
	90	+ }
91	91	} else {
92		- $ph['config_display'] = 'none';
	92	+ $ph['config_display'] = 'none';
93	93	}
94	94
95	95	// Check logout-reminder
96	96	if(isset($_SESSION['show_logout_reminder'])) {
97		- switch($_SESSION['show_logout_reminder']['type']) {
98		- case 'logout_reminder':
99		- $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');
100		- $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
101		- break;
102		- }
103		- $ph['show_logout_reminder'] = 'block';
104		- unset($_SESSION['show_logout_reminder']);
	97	+ switch($_SESSION['show_logout_reminder']['type']) {
	98	+ case 'logout_reminder':
	99	+ $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');
	100	+ $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
	101	+ break;
	102	+ }
	103	+ $ph['show_logout_reminder'] = 'block';
	104	+ unset($_SESSION['show_logout_reminder']);
105	105	} else {
106		- $ph['show_logout_reminder'] = 'none';
	106	+ $ph['show_logout_reminder'] = 'none';
107	107	}
108	108
109	109	// Check multiple sessions
		@@ -151,11 +151,11 @@ discard block
		block discarded – undo
151	151	$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';
152	152
153	153	$ph['UserInfo'] = $modx->parseText($tpl, array(
154		- 'username' => $modx->getLoginUserName(),
155		- 'role' => $_SESSION['mgrPermissions']['name'],
156		- 'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time),
157		- 'logincount' => $_SESSION['mgrLogincount'] + 1,
158		- 'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages)
	154	+ 'username' => $modx->getLoginUserName(),
	155	+ 'role' => $_SESSION['mgrPermissions']['name'],
	156	+ 'lastlogin' => $modx->toDateFormat($_SESSION['mgrLastlogin'] + $server_offset_time),
	157	+ 'logincount' => $_SESSION['mgrLogincount'] + 1,
	158	+ 'msginfo' => sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages)
159	159	));
160	160
161	161	$from = array();
		@@ -164,13 +164,13 @@ discard block
		block discarded – undo
164	164	$rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
165	165
166	166	if($modx->db->getRecordCount($rs) < 1) {
167		- $html = '<p>[%no_active_users_found%]</p>';
	167	+ $html = '<p>[%no_active_users_found%]</p>';
168	168	} else {
169		- include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
170		- $now = $_SERVER['REQUEST_TIME'] + $server_offset_time;
171		- $ph['now'] = strftime('%H:%M:%S', $now);
172		- $timetocheck = ($now - (60 * 20)); //+$server_offset_time;
173		- $html = '
	169	+ include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
	170	+ $now = $_SERVER['REQUEST_TIME'] + $server_offset_time;
	171	+ $ph['now'] = strftime('%H:%M:%S', $now);
	172	+ $timetocheck = ($now - (60 * 20)); //+$server_offset_time;
	173	+ $html = '
174	174	<div class="card-body">
175	175	[%onlineusers_message%]
176	176	<b>[+now+]</b>):
		@@ -188,33 +188,33 @@ discard block
		block discarded – undo
188	188	</thead>
189	189	<tbody>';
190	190
191		- $userList = array();
192		- $userCount = array();
193		- // Create userlist with session-count first before output
194		- while($activeusers = $modx->db->getRow($rs)) {
195		- $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;
196		-
197		- $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';
198		- $webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" /> ' : '';
199		- $ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip'];
200		- $currentaction = getAction($activeusers['action'], $activeusers['id']);
201		- $userList[] = array(
202		- $idle,
203		- '',
204		- $activeusers['username'],
205		- $webicon,
206		- abs($activeusers['internalKey']),
207		- $ip,
208		- strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),
209		- $currentaction
210		- );
211		- }
212		- foreach($userList as $params) {
213		- $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';
214		- $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);
215		- }
216		-
217		- $html .= '
	191	+ $userList = array();
	192	+ $userCount = array();
	193	+ // Create userlist with session-count first before output
	194	+ while($activeusers = $modx->db->getRow($rs)) {
	195	+ $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;
	196	+
	197	+ $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';
	198	+ $webicon = $activeusers['internalKey'] < 0 ? '<img src="[&tree_globe&]" alt="Web user" /> ' : '';
	199	+ $ip = $activeusers['ip'] === '::1' ? '127.0.0.1' : $activeusers['ip'];
	200	+ $currentaction = getAction($activeusers['action'], $activeusers['id']);
	201	+ $userList[] = array(
	202	+ $idle,
	203	+ '',
	204	+ $activeusers['username'],
	205	+ $webicon,
	206	+ abs($activeusers['internalKey']),
	207	+ $ip,
	208	+ strftime('%H:%M:%S', $activeusers['lasthit'] + $server_offset_time),
	209	+ $currentaction
	210	+ );
	211	+ }
	212	+ foreach($userList as $params) {
	213	+ $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';
	214	+ $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);
	215	+ }
	216	+
	217	+ $html .= '
218	218	</tbody>
219	219	</table>
220	220	</div>
		@@ -255,17 +255,17 @@ discard block
		block discarded – undo
255	255	// invoke event OnManagerWelcomePrerender
256	256	$evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
257	257	if(is_array($evtOut)) {
258		- $output = implode('', $evtOut);
259		- $ph['OnManagerWelcomePrerender'] = $output;
	258	+ $output = implode('', $evtOut);
	259	+ $ph['OnManagerWelcomePrerender'] = $output;
260	260	}
261	261
262	262	$widgets['welcome'] = array(
263		- 'menuindex' => '10',
264		- 'id' => 'welcome',
265		- 'cols' => 'col-lg-6',
266		- 'icon' => 'fa-home',
267		- 'title' => '[%welcome_title%]',
268		- 'body' => '
	263	+ 'menuindex' => '10',
	264	+ 'id' => 'welcome',
	265	+ 'cols' => 'col-lg-6',
	266	+ 'icon' => 'fa-home',
	267	+ 'title' => '[%welcome_title%]',
	268	+ 'body' => '
269	269	<div class="wm_buttons card-body">
270	270	<!--@IF:[[#hasPermission?key=new_document]]-->
271	271	<span class="wm_button">
		@@ -339,25 +339,25 @@ discard block
		block discarded – undo
339	339	</table>
340	340	</div>
341	341	',
342		- 'hide'=>'0'
	342	+ 'hide'=>'0'
343	343	);
344	344	$widgets['onlineinfo'] = array(
345		- 'menuindex' => '20',
346		- 'id' => 'onlineinfo',
347		- 'cols' => 'col-lg-6',
348		- 'icon' => 'fa-user',
349		- 'title' => '[%onlineusers_title%]',
350		- 'body' => '<div class="userstable">[+OnlineInfo+]</div>',
351		- 'hide'=>'0'
	345	+ 'menuindex' => '20',
	346	+ 'id' => 'onlineinfo',
	347	+ 'cols' => 'col-lg-6',
	348	+ 'icon' => 'fa-user',
	349	+ 'title' => '[%onlineusers_title%]',
	350	+ 'body' => '<div class="userstable">[+OnlineInfo+]</div>',
	351	+ 'hide'=>'0'
352	352	);
353	353	$widgets['recentinfo'] = array(
354		- 'menuindex' => '30',
355		- 'id' => 'modxrecent_widget',
356		- 'cols' => 'col-sm-12',
357		- 'icon' => 'fa-pencil-square-o',
358		- 'title' => '[%activity_title%]',
359		- 'body' => '<div class="widget-stage">[+RecentInfo+]</div>',
360		- 'hide'=>'0'
	354	+ 'menuindex' => '30',
	355	+ 'id' => 'modxrecent_widget',
	356	+ 'cols' => 'col-sm-12',
	357	+ 'icon' => 'fa-pencil-square-o',
	358	+ 'title' => '[%activity_title%]',
	359	+ 'body' => '<div class="widget-stage">[+RecentInfo+]</div>',
	360	+ 'hide'=>'0'
361	361	);
362	362	if ($modx->config['rss_url_news']) {
363	363	$widgets['news'] = array(
		@@ -385,7 +385,7 @@ discard block
		block discarded – undo
385	385	// invoke OnManagerWelcomeHome event
386	386	$sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
387	387	if(is_array($sitewidgets)) {
388		- $newwidgets = array();
	388	+ $newwidgets = array();
389	389	foreach($sitewidgets as $widget){
390	390	$newwidgets = array_merge($newwidgets, unserialize($widget));
391	391	}
		@@ -393,21 +393,21 @@ discard block
		block discarded – undo
393	393	}
394	394
395	395	usort($widgets, function ($a, $b) {
396		- return $a['menuindex'] - $b['menuindex'];
	396	+ return $a['menuindex'] - $b['menuindex'];
397	397	});
398	398
399	399	$tpl = $modx->getChunk('manager#welcome\Widget');
400	400	$output = '';
401	401	foreach($widgets as $widget) {
402		- if ($widget['hide'] != '1'){
403		- $output .= $modx->parseText($tpl, $widget);
404		- }
	402	+ if ($widget['hide'] != '1'){
	403	+ $output .= $modx->parseText($tpl, $widget);
	404	+ }
405	405	}
406	406	$ph['widgets'] = $output;
407	407
408	408	// load template
409	409	if(!isset($modx->config['manager_welcome_tpl']) \|\| empty($modx->config['manager_welcome_tpl'])) {
410		- $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';
	410	+ $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';
411	411	}
412	412
413	413	$target = $modx->config['manager_welcome_tpl'];
		@@ -415,27 +415,27 @@ discard block
		block discarded – undo
415	415	$target = $modx->mergeSettingsContent($target);
416	416
417	417	if(substr($target, 0, 1) === '@') {
418		- if(substr($target, 0, 6) === '@CHUNK') {
419		- $content = $modx->getChunk(trim(substr($target, 7)));
420		- } elseif(substr($target, 0, 5) === '@FILE') {
421		- $content = file_get_contents(trim(substr($target, 6)));
422		- } else {
423		- $content = '';
424		- }
	418	+ if(substr($target, 0, 6) === '@CHUNK') {
	419	+ $content = $modx->getChunk(trim(substr($target, 7)));
	420	+ } elseif(substr($target, 0, 5) === '@FILE') {
	421	+ $content = file_get_contents(trim(substr($target, 6)));
	422	+ } else {
	423	+ $content = '';
	424	+ }
425	425	} else {
426		- $chunk = $modx->getChunk($target);
427		- if($chunk !== false && !empty($chunk)) {
428		- $content = $chunk;
429		- } elseif(is_file(MODX_BASE_PATH . $target)) {
430		- $content = file_get_contents(MODX_BASE_PATH . $target);
431		- } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
432		- $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');
433		- } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible
434		- {
435		- $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');
436		- } else {
437		- $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');
438		- }
	426	+ $chunk = $modx->getChunk($target);
	427	+ if($chunk !== false && !empty($chunk)) {
	428	+ $content = $chunk;
	429	+ } elseif(is_file(MODX_BASE_PATH . $target)) {
	430	+ $content = file_get_contents(MODX_BASE_PATH . $target);
	431	+ } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
	432	+ $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');
	433	+ } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible
	434	+ {
	435	+ $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');
	436	+ } else {
	437	+ $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');
	438	+ }
439	439	}
440	440
441	441	// merge placeholders
		@@ -443,8 +443,8 @@ discard block
		block discarded – undo
443	443	$content = $modx->mergeSettingsContent($content);
444	444	$content = $modx->parseText($content, $ph);
445	445	if(strpos($content, '[+') !== false) {
446		- $modx->toPlaceholders($ph);
447		- $content = $modx->mergePlaceholderContent($content);
	446	+ $modx->toPlaceholders($ph);
	447	+ $content = $modx->mergePlaceholderContent($content);
448	448	}
449	449	$content = $modx->parseDocumentSource($content);
450	450	$content = $modx->parseText($content, $_lang, '[%', '%]');
		@@ -452,7 +452,7 @@ discard block
		block discarded – undo
452	452	$content = $modx->cleanUpMODXTags($content); //cleanup
453	453
454	454	if($js = $modx->getRegisteredClientScripts()) {
455		- $content .= $js;
	455	+ $content .= $js;
456	456	}
457	457
458	458	echo $content;

		@@ -1,11 +1,11 @@ discard block
		block discarded – undo
1	1	<?php
2		-if( ! defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
	2	+if (!defined('IN_MANAGER_MODE') \|\| IN_MANAGER_MODE !== true) {
3	3	die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');
4	4	}
5	5
6	6	unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes
7	7
8		-if($modx->hasPermission('settings') && (!isset($settings_version) \|\| $settings_version != $modx->getVersionData('version'))) {
	8	+if ($modx->hasPermission('settings') && (!isset($settings_version) \|\| $settings_version != $modx->getVersionData('version'))) {
9	9	// seems to be a new install - send the user to the configuration page
10	10	exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');
11	11	}
		@@ -16,16 +16,16 @@ discard block
		block discarded – undo
16	16	$_SESSION['nrnewmessages'] = 0;
17	17
18	18	// setup message info
19		-if($modx->hasPermission('messages')) {
20		- include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');
	19	+if ($modx->hasPermission('messages')) {
	20	+ include_once(MODX_MANAGER_PATH.'includes/messageCount.inc.php');
21	21	$_SESSION['nrtotalmessages'] = $nrtotalmessages;
22	22	$_SESSION['nrnewmessages'] = $nrnewmessages;
23	23
24	24	$msg = array();
25	25	$msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);
26		- $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';
	26	+ $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">'.$_SESSION['nrnewmessages'].'</span>)' : '';
27	27	$msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold"> <a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);
28		- $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';
	28	+ $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">'.$_SESSION['nrnewmessages'].'</span>' : '0';
29	29	$welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);
30	30	$msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);
31	31	$ph['MessageInfo'] = implode("\n", $msg);
		@@ -33,56 +33,56 @@ discard block
		block discarded – undo
33	33
34	34	$iconTpl = $modx->getChunk('manager#welcome\WrapIcon');
35	35	// setup icons
36		-if($modx->hasPermission('new_user') \|\| $modx->hasPermission('edit_user')) {
	36	+if ($modx->hasPermission('new_user') \|\| $modx->hasPermission('edit_user')) {
37	37	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';
38		- $ph['SecurityIcon'] = sprintf($iconTpl,$icon, 75);
	38	+ $ph['SecurityIcon'] = sprintf($iconTpl, $icon, 75);
39	39	}
40		-if($modx->hasPermission('new_web_user') \|\| $modx->hasPermission('edit_web_user')) {
	40	+if ($modx->hasPermission('new_web_user') \|\| $modx->hasPermission('edit_web_user')) {
41	41	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';
42		- $ph['WebUserIcon'] = sprintf($iconTpl,$icon, 99);
	42	+ $ph['WebUserIcon'] = sprintf($iconTpl, $icon, 99);
43	43	}
44		-if($modx->hasPermission('new_module') \|\| $modx->hasPermission('edit_module')) {
	44	+if ($modx->hasPermission('new_module') \|\| $modx->hasPermission('edit_module')) {
45	45	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';
46		- $ph['ModulesIcon'] = sprintf($iconTpl,$icon, 106);
	46	+ $ph['ModulesIcon'] = sprintf($iconTpl, $icon, 106);
47	47	}
48		-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')) {
	48	+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')) {
49	49	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';
50		- $ph['ResourcesIcon'] = sprintf($iconTpl,$icon, 76);
	50	+ $ph['ResourcesIcon'] = sprintf($iconTpl, $icon, 76);
51	51	}
52		-if($modx->hasPermission('bk_manager')) {
	52	+if ($modx->hasPermission('bk_manager')) {
53	53	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';
54		- $ph['BackupIcon'] = sprintf($iconTpl,$icon, 93);
	54	+ $ph['BackupIcon'] = sprintf($iconTpl, $icon, 93);
55	55	}
56		-if($modx->hasPermission('help')) {
	56	+if ($modx->hasPermission('help')) {
57	57	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';
58		- $ph['HelpIcon'] = sprintf($iconTpl,$icon, 9);
	58	+ $ph['HelpIcon'] = sprintf($iconTpl, $icon, 9);
59	59	}
60	60
61		-if($modx->hasPermission('new_document')) {
	61	+if ($modx->hasPermission('new_document')) {
62	62	$icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';
63		- $ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4);
	63	+ $ph['ResourceIcon'] = sprintf($iconTpl, $icon, 4);
64	64	$icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';
65		- $ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72);
	65	+ $ph['WeblinkIcon'] = sprintf($iconTpl, $icon, 72);
66	66	}
67		-if($modx->hasPermission('assets_images')) {
	67	+if ($modx->hasPermission('assets_images')) {
68	68	$icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';
69		- $ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72);
	69	+ $ph['ImagesIcon'] = sprintf($iconTpl, $icon, 72);
70	70	}
71		-if($modx->hasPermission('assets_files')) {
	71	+if ($modx->hasPermission('assets_files')) {
72	72	$icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';
73		- $ph['FilesIcon'] = sprintf($iconTpl,$icon, 72);
	73	+ $ph['FilesIcon'] = sprintf($iconTpl, $icon, 72);
74	74	}
75		-if($modx->hasPermission('change_password')) {
	75	+if ($modx->hasPermission('change_password')) {
76	76	$icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';
77		- $ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28);
	77	+ $ph['PasswordIcon'] = sprintf($iconTpl, $icon, 28);
78	78	}
79	79	$icon = '<i class="[&icons_logout_large&]"></i>[%logout%]';
80		-$ph['LogoutIcon'] = sprintf($iconTpl,$icon, 8);
	80	+$ph['LogoutIcon'] = sprintf($iconTpl, $icon, 8);
81	81
82	82	// do some config checks
83		-if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) \|\| $modx->config['warning_visibility'] == 1) {
84		- include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');
85		- if($config_check_results != $_lang['configcheck_ok']) {
	83	+if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) \|\| $modx->config['warning_visibility'] == 1) {
	84	+ include_once(MODX_MANAGER_PATH.'includes/config_check.inc.php');
	85	+ if ($config_check_results != $_lang['configcheck_ok']) {
86	86	$ph['config_check_results'] = $config_check_results;
87	87	$ph['config_display'] = 'block';
88	88	} else {
		@@ -93,8 +93,8 @@ discard block
		block discarded – undo
93	93	}
94	94
95	95	// Check logout-reminder
96		-if(isset($_SESSION['show_logout_reminder'])) {
97		- switch($_SESSION['show_logout_reminder']['type']) {
	96	+if (isset($_SESSION['show_logout_reminder'])) {
	97	+ switch ($_SESSION['show_logout_reminder']['type']) {
98	98	case 'logout_reminder':
99	99	$date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');
100	100	$ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	</tr>
149	149	</table>';
150	150
151		-$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';
	151	+$nrnewmessages = '<span class="text-danger">'.$_SESSION['nrnewmessages'].'</span>';
152	152
153	153	$ph['UserInfo'] = $modx->parseText($tpl, array(
154	154	'username' => $modx->getLoginUserName(),
		@@ -163,10 +163,10 @@ discard block
		block discarded – undo
163	163	$from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";
164	164	$rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');
165	165
166		-if($modx->db->getRecordCount($rs) < 1) {
	166	+if ($modx->db->getRecordCount($rs) < 1) {
167	167	$html = '<p>[%no_active_users_found%]</p>';
168	168	} else {
169		- include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
	169	+ include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php');
170	170	$now = $_SERVER['REQUEST_TIME'] + $server_offset_time;
171	171	$ph['now'] = strftime('%H:%M:%S', $now);
172	172	$timetocheck = ($now - (60 * 20)); //+$server_offset_time;
		@@ -191,7 +191,7 @@ discard block
		block discarded – undo
191	191	$userList = array();
192	192	$userCount = array();
193	193	// Create userlist with session-count first before output
194		- while($activeusers = $modx->db->getRow($rs)) {
	194	+ while ($activeusers = $modx->db->getRow($rs)) {
195	195	$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;
196	196
197	197	$idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';
		@@ -209,9 +209,9 @@ discard block
		block discarded – undo
209	209	$currentaction
210	210	);
211	211	}
212		- foreach($userList as $params) {
	212	+ foreach ($userList as $params) {
213	213	$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';
214		- $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);
	214	+ $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);
215	215	}
216	216
217	217	$html .= '
		@@ -223,7 +223,7 @@ discard block
		block discarded – undo
223	223	$ph['OnlineInfo'] = $html;
224	224
225	225	// include rss feeds for important forum topics
226		-include_once(MODX_MANAGER_PATH . 'includes/rss.inc.php');
	226	+include_once(MODX_MANAGER_PATH.'includes/rss.inc.php');
227	227	$ph['modx_security_notices_content'] = $feedData['modx_security_notices_content'];
228	228	$ph['modx_news_content'] = $feedData['modx_news_content'];
229	229
		@@ -254,7 +254,7 @@ discard block
		block discarded – undo
254	254
255	255	// invoke event OnManagerWelcomePrerender
256	256	$evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');
257		-if(is_array($evtOut)) {
	257	+if (is_array($evtOut)) {
258	258	$output = implode('', $evtOut);
259	259	$ph['OnManagerWelcomePrerender'] = $output;
260	260	}
		@@ -384,57 +384,57 @@ discard block
		block discarded – undo
384	384
385	385	// invoke OnManagerWelcomeHome event
386	386	$sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));
387		-if(is_array($sitewidgets)) {
	387	+if (is_array($sitewidgets)) {
388	388	$newwidgets = array();
389		- foreach($sitewidgets as $widget){
	389	+ foreach ($sitewidgets as $widget) {
390	390	$newwidgets = array_merge($newwidgets, unserialize($widget));
391	391	}
392	392	$widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;
393	393	}
394	394
395		-usort($widgets, function ($a, $b) {
	395	+usort($widgets, function($a, $b){
396	396	return $a['menuindex'] - $b['menuindex'];
397	397	});
398	398
399	399	$tpl = $modx->getChunk('manager#welcome\Widget');
400	400	$output = '';
401		-foreach($widgets as $widget) {
402		- if ($widget['hide'] != '1'){
	401	+foreach ($widgets as $widget) {
	402	+ if ($widget['hide'] != '1') {
403	403	$output .= $modx->parseText($tpl, $widget);
404	404	}
405	405	}
406	406	$ph['widgets'] = $output;
407	407
408	408	// load template
409		-if(!isset($modx->config['manager_welcome_tpl']) \|\| empty($modx->config['manager_welcome_tpl'])) {
410		- $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';
	409	+if (!isset($modx->config['manager_welcome_tpl']) \|\| empty($modx->config['manager_welcome_tpl'])) {
	410	+ $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH.'media/style/common/welcome.tpl';
411	411	}
412	412
413	413	$target = $modx->config['manager_welcome_tpl'];
414	414	$target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);
415	415	$target = $modx->mergeSettingsContent($target);
416	416
417		-if(substr($target, 0, 1) === '@') {
418		- if(substr($target, 0, 6) === '@CHUNK') {
	417	+if (substr($target, 0, 1) === '@') {
	418	+ if (substr($target, 0, 6) === '@CHUNK') {
419	419	$content = $modx->getChunk(trim(substr($target, 7)));
420		- } elseif(substr($target, 0, 5) === '@FILE') {
	420	+ } elseif (substr($target, 0, 5) === '@FILE') {
421	421	$content = file_get_contents(trim(substr($target, 6)));
422	422	} else {
423	423	$content = '';
424	424	}
425	425	} else {
426	426	$chunk = $modx->getChunk($target);
427		- if($chunk !== false && !empty($chunk)) {
	427	+ if ($chunk !== false && !empty($chunk)) {
428	428	$content = $chunk;
429		- } elseif(is_file(MODX_BASE_PATH . $target)) {
430		- $content = file_get_contents(MODX_BASE_PATH . $target);
431		- } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
432		- $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');
433		- } elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) // ClipperCMS compatible
	429	+ } elseif (is_file(MODX_BASE_PATH.$target)) {
	430	+ $content = file_get_contents(MODX_BASE_PATH.$target);
	431	+ } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl')) {
	432	+ $content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl');
	433	+ } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html')) // ClipperCMS compatible
434	434	{
435		- $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');
	435	+ $content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html');
436	436	} else {
437		- $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');
	437	+ $content = file_get_contents(MODX_MANAGER_PATH.'media/style/common/welcome.tpl');
438	438	}
439	439	}
440	440
		@@ -442,7 +442,7 @@ discard block
		block discarded – undo
442	442	$content = $modx->mergeConditionalTagsContent($content);
443	443	$content = $modx->mergeSettingsContent($content);
444	444	$content = $modx->parseText($content, $ph);
445		-if(strpos($content, '[+') !== false) {
	445	+if (strpos($content, '[+') !== false) {
446	446	$modx->toPlaceholders($ph);
447	447	$content = $modx->mergePlaceholderContent($content);
448	448	}
		@@ -451,7 +451,7 @@ discard block
		block discarded – undo
451	451	$content = $modx->parseText($content, $_style, '[&', '&]');
452	452	$content = $modx->cleanUpMODXTags($content); //cleanup
453	453
454		-if($js = $modx->getRegisteredClientScripts()) {
	454	+if ($js = $modx->getRegisteredClientScripts()) {
455	455	$content .= $js;
456	456	}
457	457

evolution-cms / evolution

Pull Request — develop (#716)

Status

Category

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

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

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

Braces +48 added lines, -46 removed lines patch added patch discarded remove patch