evolution-cms / evolution

install/setup.info.php

Indentation +64 added lines, -64 removed lines

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

manager/actions/welcome.static.php

Indentation +226 added lines, -226 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,70 +17,70 @@ 
 

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

 }

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

@@ -128,11 +128,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();

@@ -141,13 +141,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>):

@@ -165,33 +165,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>

@@ -232,17 +232,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-sm-6',

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

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

-	'body' => '

+    'menuindex' => '10',

+    'id' => 'welcome',

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

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

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

+    'body' => '

 				<div class="wm_buttons card-body"> 

 					<!--@IF:[[#hasPermission?key=new_user]] OR [[#hasPermission?key=edit_user]]--> 

 					<span class="wm_button">

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

 				</div>

 		',

-	'hide'=>'0'

+    'hide'=>'0'

 );

 $widgets['onlineinfo'] = array(

-	'menuindex' => '20',

-	'id' => 'onlineinfo',

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

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

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

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

-	'hide'=>'0'

+    'menuindex' => '20',

+    'id' => 'onlineinfo',

+    'cols' => 'col-sm-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(

@@ -366,7 +366,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));

     }

@@ -374,21 +374,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'];

@@ -396,27 +396,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

@@ -424,8 +424,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, '[%', '%]');

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

 

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

-	$content .= $js;

+    $content .= $js;

 }

 

 echo $content;

@@ -443,7 +443,7 @@ 
 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>

 //</span>

 function getTplWidget() { // recent document info

-	return '

+    return '

 		<div class="[+cols+]" id="[+id+]">

 			<div class="card"[+cardAttr+]>

 				<div class="card-header"[+headAttr+]> <i class="fa [+icon+]"></i> [+title+] </div>

@@ -454,11 +454,11 @@ 
 }

 

 function getRecentInfo() { // recent document info

-	global $modx;

+    global $modx;

 

-	$modx->addSnippet('recentInfoList', 'getRecentInfoList');

+    $modx->addSnippet('recentInfoList', 'getRecentInfoList');

 

-	$html = '

+    $html = '

 			<div class="table-responsive">

 				<table class="table data">

 					<thead>

@@ -476,96 +476,96 @@ 
 				</table>

 			</div>

 ';

-	return $html;

+    return $html;

 }

 

 function getRecentInfoList() {

-	global $modx;

-

-	$rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

-

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

-		return '<tr><td>[%no_activity_message%]</td></tr>';

-	}

-

-	$tpl = getRecentInfoRowTpl();

-

-	$btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&amp;id=[+id+]" target="main"><i class="fa fa-edit fa-fw"></i></a> ';

-	$btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

-

-	$output = array();

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

-		$docid = $ph['id'];

-		$_ = $modx->getUserInfo($ph['editedby']);

-		$ph['username'] = $_['username'];

-

-		if($ph['deleted'] == 1) {

-			$ph['status'] = 'deleted text-danger';

-		} elseif($ph['published'] == 0) {

-			$ph['status'] = 'unpublished font-italic text-muted';

-		} else {

-			$ph['status'] = 'published';

-		}

-

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

-			$ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

-		} else {

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

-		}

-

-		$preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : '';

-		$ph['preview_btn'] = str_replace(array(

-			'[+id+]',

-			'[+preview_disabled+]'

-		), array(

-			$docid,

-			$preview_disabled

-		), $btntpl['preview_btn']);

-

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

-			if($ph['deleted'] == 0) {

-				$delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

-			} else {

-				$delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

-			}

-			$ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);

-		} else {

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

-		}

-

-		if($ph['deleted'] == 1 && $ph['published'] == 0) {

-			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 1 && $ph['published'] == 1) {

-			$publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-		} elseif($ph['deleted'] == 0 && $ph['published'] == 0) {

-			$publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-		} else {

-			$publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-		}

-		$ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);

-

-		$ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

-

-		if($ph['longtitle'] == '') {

-			$ph['longtitle'] = '(<i>[%not_set%]</i>)';

-		}

-		if($ph['description'] == '') {

-			$ph['description'] = '(<i>[%not_set%]</i>)';

-		}

-		if($ph['introtext'] == '') {

-			$ph['introtext'] = '(<i>[%not_set%]</i>)';

-		}

-		if($ph['alias'] == '') {

-			$ph['alias'] = '(<i>[%not_set%]</i>)';

-		}

-

-		$output[] = $modx->parseText($tpl, $ph);

-	}

-	return implode("\n", $output);

+    global $modx;

+

+    $rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

+

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

+        return '<tr><td>[%no_activity_message%]</td></tr>';

+    }

+

+    $tpl = getRecentInfoRowTpl();

+

+    $btntpl['edit'] = '<a title="[%edit_resource%]" href="index.php?a=27&amp;id=[+id+]" target="main"><i class="fa fa-edit fa-fw"></i></a> ';

+    $btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

+

+    $output = array();

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

+        $docid = $ph['id'];

+        $_ = $modx->getUserInfo($ph['editedby']);

+        $ph['username'] = $_['username'];

+

+        if($ph['deleted'] == 1) {

+            $ph['status'] = 'deleted text-danger';

+        } elseif($ph['published'] == 0) {

+            $ph['status'] = 'unpublished font-italic text-muted';

+        } else {

+            $ph['status'] = 'published';

+        }

+

+        if($modx->hasPermission('edit_document')) {

+            $ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

+        } else {

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

+        }

+

+        $preview_disabled = ($ph['deleted'] == 1) ? 'disabled' : '';

+        $ph['preview_btn'] = str_replace(array(

+            '[+id+]',

+            '[+preview_disabled+]'

+        ), array(

+            $docid,

+            $preview_disabled

+        ), $btntpl['preview_btn']);

+

+        if($modx->hasPermission('delete_document')) {

+            if($ph['deleted'] == 0) {

+                $delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

+            } else {

+                $delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

+            }

+            $ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);

+        } else {

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

+        }

+

+        if($ph['deleted'] == 1 && $ph['published'] == 0) {

+            $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

+        } elseif($ph['deleted'] == 1 && $ph['published'] == 1) {

+            $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

+        } elseif($ph['deleted'] == 0 && $ph['published'] == 0) {

+            $publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

+        } else {

+            $publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

+        }

+        $ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);

+

+        $ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

+

+        if($ph['longtitle'] == '') {

+            $ph['longtitle'] = '(<i>[%not_set%]</i>)';

+        }

+        if($ph['description'] == '') {

+            $ph['description'] = '(<i>[%not_set%]</i>)';

+        }

+        if($ph['introtext'] == '') {

+            $ph['introtext'] = '(<i>[%not_set%]</i>)';

+        }

+        if($ph['alias'] == '') {

+            $ph['alias'] = '(<i>[%not_set%]</i>)';

+        }

+

+        $output[] = $modx->parseText($tpl, $ph);

+    }

+    return implode("\n", $output);

 }

 

 function getRecentInfoRowTpl() {

-	$tpl = '

+    $tpl = '

 						<tr>

 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>

 							<td data-toggle="collapse" data-target=".collapse[+id+]"><a class="[+status+]" title="[%edit_resource%]" href="index.php?a=3&amp;id=[+id+]" target="main">[+pagetitle+]</a></td>

@@ -589,16 +589,16 @@ 
 								</div>

 							</td>

 						</tr>';

-	return $tpl;

+    return $tpl;

 }

 

 // setup icons

 function wrapIcon($i, $action) {

-	return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

+    return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

 }

 

 function getStartUpScript() {

-	$script = '

+    $script = '

         <script type="text/javascript">

         function hideConfigCheckWarning(key) {

         	var xhr = new XMLHttpRequest();

@@ -622,5 +622,5 @@ 
 		})(jQuery);        

         </script>

 ';

-	return $script;

+    return $script;

 }

manager/actions/mutate_tmplvars.dynamic.php

Indentation +117 added lines, -117 removed lines

@@ -1,12 +1,12 @@ 
 <?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('edit_template') && $modx->manager->action == '301') {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 if(!$modx->hasPermission('new_template') && $modx->manager->action == '300') {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -20,7 +20,7 @@ 
 
 // check to see the snippet editor isn't locked
 if($lockedEl = $modx->elementIsLocked(2, $id)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar']));
 }
 // end check for lock
 
@@ -30,25 +30,25 @@ 
 global $content;
 $content = array();
 if(isset($_GET['id'])) {
-	$rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'");
-	$content = $modx->db->getRow($rs);
-	if(!$content) {
-		header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}");
-	}
-
-	$_SESSION['itemname'] = $content['caption'];
-	if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) {
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-	}
+    $rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'");
+    $content = $modx->db->getRow($rs);
+    if(!$content) {
+        header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}");
+    }
+
+    $_SESSION['itemname'] = $content['caption'];
+    if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) {
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    }
 } else if(isset($_REQUEST['itemname'])) {
-	$content['name'] = $_REQUEST['itemname'];
+    $content['name'] = $_REQUEST['itemname'];
 } else {
-	$_SESSION['itemname'] = $_lang["new_tmplvars"];
-	$content['category'] = (int)$_REQUEST['catid'];
+    $_SESSION['itemname'] = $_lang["new_tmplvars"];
+    $content['category'] = (int)$_REQUEST['catid'];
 }
 
 if($modx->manager->hasFormValues()) {
-	$modx->manager->loadFormValues();
+    $modx->manager->loadFormValues();
 }
 
 $content = array_merge($content, $_POST);
@@ -62,7 +62,7 @@ 
 $RTEditors = '';
 $evtOut = $modx->invokeEvent('OnRichTextEditorRegister', array('forfrontend' => 1));
 if(is_array($evtOut)) {
-	$RTEditors = implode(',', $evtOut);
+    $RTEditors = implode(',', $evtOut);
 }
 
 ?>
@@ -277,12 +277,12 @@ 
 
 <form name="mutate" method="post" action="index.php" enctype="multipart/form-data">
 	<?php
-	// invoke OnTVFormPrerender event
-	$evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id));
-	if(is_array($evtOut)) {
-		echo implode("", $evtOut);
-	}
-	?>
+    // invoke OnTVFormPrerender event
+    $evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id));
+    if(is_array($evtOut)) {
+        echo implode("", $evtOut);
+    }
+    ?>
 	<input type="hidden" name="id" value="<?= $content['id'] ?>">
 	<input type="hidden" name="a" value="302">
 	<input type="hidden" name="or" value="<?= $origin ?>">
@@ -343,11 +343,11 @@ 
 						<select name="categoryid" class="form-control" onChange="documentDirty=true;">
 							<option>&nbsp;</option>
 							<?php
-							include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
-							foreach(getCategories() as $n => $v) {
-								echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>";
-							}
-							?>
+                            include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+                            foreach(getCategories() as $n => $v) {
+                                echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>";
+                            }
+                            ?>
 						</select>
 					</div>
 				</div>
@@ -383,14 +383,14 @@ 
 							<optgroup label="Custom Type">
 								<option value="custom_tv" <?= ($content['type'] == 'custom_tv' ? "selected='selected'" : "") ?>>Custom Input</option>
 								<?php
-								$custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs');
-								foreach($custom_tvs as $ctv) {
-									if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') {
-										$selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : "");
-										echo '<option value="custom_tv:' . $ctv . '"  ' . $selected . '>' . $ctv . '</option>';
-									}
-								}
-								?>
+                                $custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs');
+                                foreach($custom_tvs as $ctv) {
+                                    if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') {
+                                        $selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : "");
+                                        echo '<option value="custom_tv:' . $ctv . '"  ' . $selected . '>' . $ctv . '</option>';
+                                    }
+                                }
+                                ?>
 							</optgroup>
 						</select>
 					</div>
@@ -455,63 +455,63 @@ 
 					<a class="btn btn-secondary btn-sm" href="javascript:;" onClick="check_toggle(); return false;"><?= $_lang['check_toggle'] ?></a>
 				</div>
 				<?php
-				$rs = $modx->db->select(sprintf("tpl.id AS id, templatename, tpl.description AS tpldescription, tpl.locked AS tpllocked, tpl.selectable AS selectable, tmplvarid, if(isnull(cat.category),'%s',cat.category) AS category, cat.id AS catid", $_lang['no_category']), sprintf("%s as tpl
+                $rs = $modx->db->select(sprintf("tpl.id AS id, templatename, tpl.description AS tpldescription, tpl.locked AS tpllocked, tpl.selectable AS selectable, tmplvarid, if(isnull(cat.category),'%s',cat.category) AS category, cat.id AS catid", $_lang['no_category']), sprintf("%s as tpl
                     LEFT JOIN %s as stt ON stt.templateid=tpl.id AND stt.tmplvarid='%s'
                     LEFT JOIN %s as cat ON tpl.category=cat.id", $modx->getFullTableName('site_templates'), $modx->getFullTableName('site_tmplvar_templates'), $id, $modx->getFullTableName('categories')), '', "category, templatename");
 
-				$tplList = '<ul>';
-				$preCat = '';
-				$insideUl = 0;
-				while($row = $modx->db->getRow($rs)) {
-					$row['category'] = stripslashes($row['category']); //pixelchutes
-					if($preCat !== $row['category']) {
-						$tplList .= $insideUl ? '</ul>' : '';
-						$tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
-						$insideUl = 1;
-					}
-
-					if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) {
-						$checked = true;
-					} elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) {
-						$checked = true;
-					} elseif($id == 0 && is_array($_POST['template'])) {
-						$checked = in_array($row['id'], $_POST['template']);
-					} else {
-						$checked = $row['tmplvarid'];
-					}
-					$selectable = !$row['selectable'] ? ' class="disabled"' : '';
-					$checked = $checked ? ' checked="checked"' : '';
-					$tplId = '&nbsp;<small>(' . $row['id'] . ')</small>';
-					$desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : '';
-
-					$tplInfo = array();
-					if($row['tpllocked']) {
-						$tplInfo[] = $_lang['locked'];
-					}
-					if($row['id'] == $modx->config['default_template']) {
-						$tplInfo[] = $_lang['defaulttemplate_title'];
-					}
-					$tplInfo = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';
-
-					$tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo);
-					$tplList .= '</li>';
-
-					$preCat = $row['category'];
-				}
-				$tplList .= $insideUl ? '</ul>' : '';
-				$tplList .= '</ul>';
-				echo $tplList;
-
-				?>
+                $tplList = '<ul>';
+                $preCat = '';
+                $insideUl = 0;
+                while($row = $modx->db->getRow($rs)) {
+                    $row['category'] = stripslashes($row['category']); //pixelchutes
+                    if($preCat !== $row['category']) {
+                        $tplList .= $insideUl ? '</ul>' : '';
+                        $tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
+                        $insideUl = 1;
+                    }
+
+                    if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) {
+                        $checked = true;
+                    } elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) {
+                        $checked = true;
+                    } elseif($id == 0 && is_array($_POST['template'])) {
+                        $checked = in_array($row['id'], $_POST['template']);
+                    } else {
+                        $checked = $row['tmplvarid'];
+                    }
+                    $selectable = !$row['selectable'] ? ' class="disabled"' : '';
+                    $checked = $checked ? ' checked="checked"' : '';
+                    $tplId = '&nbsp;<small>(' . $row['id'] . ')</small>';
+                    $desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : '';
+
+                    $tplInfo = array();
+                    if($row['tpllocked']) {
+                        $tplInfo[] = $_lang['locked'];
+                    }
+                    if($row['id'] == $modx->config['default_template']) {
+                        $tplInfo[] = $_lang['defaulttemplate_title'];
+                    }
+                    $tplInfo = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';
+
+                    $tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo);
+                    $tplList .= '</li>';
+
+                    $preCat = $row['category'];
+                }
+                $tplList .= $insideUl ? '</ul>' : '';
+                $tplList .= '</ul>';
+                echo $tplList;
+
+                ?>
 
 				<!-- Access Permissions -->
 				<?php
-				if($use_udperms == 1) {
-					// fetch permissions for the variable
-					$rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'");
-					$groupsarray = $modx->db->getColumn('documentgroup', $rs);
+                if($use_udperms == 1) {
+                    // fetch permissions for the variable
+                    $rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'");
+                    $groupsarray = $modx->db->getColumn('documentgroup', $rs);
 
-					?>
+                    ?>
 					<?php if($modx->hasPermission('access_permissions')) { ?>
 						<script type="text/javascript">
 							function makePublic(b) {
@@ -539,29 +539,29 @@ 
 						<!--<b><?php /*echo $_lang['access_permissions']; */ ?></b>-->
 						<p><?= $_lang['tmplvar_access_msg'] ?></p>
 						<?php
-						$chk = '';
-						$rs = $modx->db->select('name, id', $tbl_documentgroup_names);
-						if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
-							$groupsarray = $_POST['docgroups'];
-						}
-						while($row = $modx->db->getRow($rs)) {
-							$checked = in_array($row['id'], $groupsarray);
-							if($modx->hasPermission('access_permissions')) {
-								if($checked) {
-									$notPublic = true;
-								}
-								$chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>";
-							} else {
-								if($checked) {
-									echo "<input type='hidden' name='docgroups[]'  value='" . $row['id'] . "' />";
-								}
-							}
-						}
-						if($modx->hasPermission('access_permissions')) {
-							$chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks;
-						}
-						echo '<ul>' . $chks . '</ul>';
-						?>
+                        $chk = '';
+                        $rs = $modx->db->select('name, id', $tbl_documentgroup_names);
+                        if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
+                            $groupsarray = $_POST['docgroups'];
+                        }
+                        while($row = $modx->db->getRow($rs)) {
+                            $checked = in_array($row['id'], $groupsarray);
+                            if($modx->hasPermission('access_permissions')) {
+                                if($checked) {
+                                    $notPublic = true;
+                                }
+                                $chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>";
+                            } else {
+                                if($checked) {
+                                    echo "<input type='hidden' name='docgroups[]'  value='" . $row['id'] . "' />";
+                                }
+                            }
+                        }
+                        if($modx->hasPermission('access_permissions')) {
+                            $chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks;
+                        }
+                        echo '<ul>' . $chks . '</ul>';
+                        ?>
 					<?php } ?>
 				<?php } ?>
 
@@ -571,12 +571,12 @@ 
 		<input type="submit" name="save" style="display:none">
 
 		<?php
-		// invoke OnTVFormRender event
-		$evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id));
-		if(is_array($evtOut)) {
-			echo implode('', $evtOut);
-		}
-		?>
+        // invoke OnTVFormRender event
+        $evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id));
+        if(is_array($evtOut)) {
+            echo implode('', $evtOut);
+        }
+        ?>
 	</div>
 </form>
 <script type="text/javascript">setTimeout('showParameters()', 10);</script>

manager/includes/config_check.inc.php

Indentation +16 added lines, -16 removed lines

@@ -5,14 +5,14 @@ 
 
 // PROCESSOR FIRST
 if($_SESSION['mgrRole'] == 1) {
-	if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
-		$current = $modx->manager->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(!empty($current)) {
-			$modx->manager->setSystemChecksum($current);
-			$modx->clearCache('full');
-			$modx->config['sys_files_checksum'] = $current;
-		};
-	}
+    if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
+        $current = $modx->manager->getSystemChecksum($modx->config['check_files_onlogin']);
+        if(!empty($current)) {
+            $modx->manager->setSystemChecksum($current);
+            $modx->clearCache('full');
+            $modx->config['sys_files_checksum'] = $current;
+        };
+    }
 }
 
 // NOW CHECK CONFIG
@@ -20,15 +20,15 @@ 
 
 $sysfiles_check = $modx->manager->checkSystemChecksum();
 if ($sysfiles_check!=='0'){
-      $warningspresent = 1;
-      $warnings[] = array($_lang['configcheck_sysfiles_mod']);
+        $warningspresent = 1;
+        $warnings[] = array($_lang['configcheck_sysfiles_mod']);
 }
 
 if (is_writable("includes/config.inc.php")){
     // Warn if world writable
     if(@fileperms('includes/config.inc.php') & 0x0002) {
-      $warningspresent = 1;
-      $warnings[] = array($_lang['configcheck_configinc']);
+        $warningspresent = 1;
+        $warnings[] = array($_lang['configcheck_configinc']);
     }
 }
 
@@ -179,10 +179,10 @@ 
             break;
         case $_lang['configcheck_sysfiles_mod']:
             $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
-			$warnings[$i][2] = '<ul><li>'. implode('</li><li>', $sysfiles_check) .'</li></ul>';
-			if($modx->hasPermission('settings')) {
-				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
-			}
+            $warnings[$i][2] = '<ul><li>'. implode('</li><li>', $sysfiles_check) .'</li></ul>';
+            if($modx->hasPermission('settings')) {
+                $warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
+            }
             if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1]." ".implode(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
             break;
         case $_lang['configcheck_lang_difference'] :

manager/frames/nodes.functions.inc.php

Indentation +553 added lines, -553 removed lines

@@ -1,6 +1,6 @@ 
 <?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.');
 }
 
 /**
@@ -12,443 +12,443 @@ 
  * @return string
  */
 function makeHTML($indent, $parent, $expandAll, $theme, $hereid = '') {
-	global $modx;
-	global $icons, $iconsPrivate, $_style;
-	global $_lang, $opened, $opened2, $closed2; //added global vars
-	global $modx_textdir;
-
-	$output = '';
-
-	// setup spacer
-	$level = 0;
-	$spacer = '<span class="indent">';
-	for($i = 2; $i <= $indent; $i++) {
-		$spacer .= '<i></i>';
-		$level++;
-	}
-	$spacer .= '</span>';
-
-	// manage order-by
-	if(!isset($_SESSION['tree_sortby']) && !isset($_SESSION['tree_sortdir'])) {
-		// This is the first startup, set default sort order
-		$_SESSION['tree_sortby'] = 'menuindex';
-		$_SESSION['tree_sortdir'] = 'ASC';
-	}
-
-	switch($_SESSION['tree_sortby']) {
-		case 'createdon':
-		case 'editedon':
-		case 'publishedon':
-		case 'pub_date':
-		case 'unpub_date':
-			$sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'], 'sc.' . $_SESSION['tree_sortby']);
-			break;
-		default:
-			$sortby = 'sc.' . $_SESSION['tree_sortby'];
-	};
-
-	$orderby = $modx->db->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
-
-	// Folder sorting gets special setup ;) Add menuindex and pagetitle
-	if($_SESSION['tree_sortby'] == 'isfolder') {
-		$orderby .= ', menuindex ASC, pagetitle';
-	}
-
-	$tblsc = $modx->getFullTableName('site_content');
-	$tbldg = $modx->getFullTableName('document_groups');
-	$tblst = $modx->getFullTableName('site_templates');
-	// get document groups for current user
-	$docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
-	$showProtected = false;
-	if(isset ($modx->config['tree_show_protected'])) {
-		$showProtected = (boolean) $modx->config['tree_show_protected'];
-	}
-	$mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
-	if($showProtected == false) {
-		$access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
-	} else {
-		$access = '';
-	}
-	$docgrp_cond = $docgrp ? "OR dg.document_group IN ({$docgrp})" : '';
-	$field = "DISTINCT sc.id, pagetitle, longtitle, menutitle, parent, isfolder, published, pub_date, unpub_date, richtext, searchable, cacheable, deleted, type, template, templatename, menuindex, donthit, hidemenu, alias, contentType, privateweb, privatemgr,
+    global $modx;
+    global $icons, $iconsPrivate, $_style;
+    global $_lang, $opened, $opened2, $closed2; //added global vars
+    global $modx_textdir;
+
+    $output = '';
+
+    // setup spacer
+    $level = 0;
+    $spacer = '<span class="indent">';
+    for($i = 2; $i <= $indent; $i++) {
+        $spacer .= '<i></i>';
+        $level++;
+    }
+    $spacer .= '</span>';
+
+    // manage order-by
+    if(!isset($_SESSION['tree_sortby']) && !isset($_SESSION['tree_sortdir'])) {
+        // This is the first startup, set default sort order
+        $_SESSION['tree_sortby'] = 'menuindex';
+        $_SESSION['tree_sortdir'] = 'ASC';
+    }
+
+    switch($_SESSION['tree_sortby']) {
+        case 'createdon':
+        case 'editedon':
+        case 'publishedon':
+        case 'pub_date':
+        case 'unpub_date':
+            $sortby = sprintf('CASE WHEN %s IS NULL THEN 1 ELSE 0 END, %s', 'sc.' . $_SESSION['tree_sortby'], 'sc.' . $_SESSION['tree_sortby']);
+            break;
+        default:
+            $sortby = 'sc.' . $_SESSION['tree_sortby'];
+    };
+
+    $orderby = $modx->db->escape($sortby . ' ' . $_SESSION['tree_sortdir']);
+
+    // Folder sorting gets special setup ;) Add menuindex and pagetitle
+    if($_SESSION['tree_sortby'] == 'isfolder') {
+        $orderby .= ', menuindex ASC, pagetitle';
+    }
+
+    $tblsc = $modx->getFullTableName('site_content');
+    $tbldg = $modx->getFullTableName('document_groups');
+    $tblst = $modx->getFullTableName('site_templates');
+    // get document groups for current user
+    $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
+    $showProtected = false;
+    if(isset ($modx->config['tree_show_protected'])) {
+        $showProtected = (boolean) $modx->config['tree_show_protected'];
+    }
+    $mgrRole = (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
+    if($showProtected == false) {
+        $access = "AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+    } else {
+        $access = '';
+    }
+    $docgrp_cond = $docgrp ? "OR dg.document_group IN ({$docgrp})" : '';
+    $field = "DISTINCT sc.id, pagetitle, longtitle, menutitle, parent, isfolder, published, pub_date, unpub_date, richtext, searchable, cacheable, deleted, type, template, templatename, menuindex, donthit, hidemenu, alias, contentType, privateweb, privatemgr,
         MAX(IF(1={$mgrRole} OR sc.privatemgr=0 {$docgrp_cond}, 1, 0)) AS hasAccess, GROUP_CONCAT(document_group SEPARATOR ',') AS roles";
-	$from = "{$tblsc} AS sc LEFT JOIN {$tbldg} dg on dg.document = sc.id LEFT JOIN {$tblst} st on st.id = sc.template";
-	$where = "(parent={$parent}) {$access} GROUP BY sc.id";
-	$result = $modx->db->select($field, $from, $where, $orderby);
-	if($modx->db->getRecordCount($result) == 0) {
-		$output .= sprintf('<div><a class="empty">%s%s&nbsp;<span class="empty">%s</span></a></div>', $spacer, $_style['tree_deletedpage'], $_lang['empty_folder']);
-	}
-
-	$nodeNameSource = $_SESSION['tree_nodename'] == 'default' ? $modx->config['resource_tree_node_name'] : $_SESSION['tree_nodename'];
-
-	while($row = $modx->db->getRow($result)) {
-		$node = '';
-
-		$nodetitle = getNodeTitle($nodeNameSource, $row);
-		$nodetitleDisplay = $nodetitle;
-
-		$treeNodeClass = 'node';
-		$treeNodeClass .= $row['hasAccess'] == 0 ? ' protected' : '';
-
-		if($row['deleted'] == 1) {
-			$treeNodeClass .= ' deleted';
-			//$nodetitleDisplay = sprintf('<span class="deletedNode">%s</span>', $nodetitle);
-		} elseif($row['published'] == 0) {
-			$treeNodeClass .= ' unpublished';
-			//$nodetitleDisplay = sprintf('<span class="unpublishedNode">%s</span>', $nodetitle);
-		} elseif($row['hidemenu'] == 1) {
-			$treeNodeClass .= ' hidemenu';
-			//$nodetitleDisplay = sprintf('<span class="notInMenuNode%s">%s</span>', $protectedClass, $nodetitle);
-		} else {
-			//$nodetitleDisplay = sprintf('<span class="publishedNode%s">%s</span>', $protectedClass, $nodetitle);
-		}
-
-		if($row['id'] == $hereid) {
-			$treeNodeClass .= ' current';
-		}
-
-		$weblinkDisplay = $row['type'] == 'reference' ? sprintf('&nbsp;%s', $_style['tree_linkgo']) : '';
-		$pageIdDisplay = '<small>(' . ($modx_textdir ? '&rlm;' : '') . $row['id'] . ')</small>';
-
-		// Prepare displaying user-locks
-		$lockedByUser = '';
-		$rowLock = $modx->elementIsLocked(7, $row['id'], true);
-		if($rowLock && $modx->hasPermission('display_locks')) {
-			if($rowLock['sid'] == $modx->sid) {
-				$title = $modx->parseText($_lang["lock_element_editing"], array(
-					'element_type' => $_lang["lock_element_type_7"],
-					'lasthit_df' => $rowLock['lasthit_df']
-				));
-				$lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>';
-			} else {
-				$title = $modx->parseText($_lang["lock_element_locked_by"], array(
-					'element_type' => $_lang["lock_element_type_7"],
-					'username' => $rowLock['username'],
-					'lasthit_df' => $rowLock['lasthit_df']
-				));
-				if($modx->hasPermission('remove_locks')) {
-					$lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
-				} else {
-					$lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
-				}
-			}
-		}
-
-		$url = $modx->makeUrl($row['id']);
-
-		$title = '';
-		if(isDateNode($nodeNameSource)) {
-			$title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]';
-		}
-		$title .= $_lang['id'] . ': ' . $row['id'];
-		$title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle'];
-		$title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex'];
-		$title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-');
-		$title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename'];
-		$title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']);
-		$title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']);
-		$title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']);
-		$title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
-		$title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
-		$title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
-		$title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
-		$title = $modx->htmlspecialchars($title);
-		$title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
-
-		$data = array(
-			'id' => $row['id'],
-			'pagetitle' => $row['pagetitle'],
-			'longtitle' => $row['longtitle'],
-			'menutitle' => $row['menutitle'],
-			'parent' => $parent,
-			'isfolder' => $row['isfolder'],
-			'published' => $row['published'],
-			'deleted' => $row['deleted'],
-			'type' => $row['type'],
-			'menuindex' => $row['menuindex'],
-			'donthit' => $row['donthit'],
-			'hidemenu' => $row['hidemenu'],
-			'alias' => $row['alias'],
-			'contenttype' => $row['contentType'],
-			'privateweb' => $row['privateweb'],
-			'privatemgr' => $row['privatemgr'],
-			'hasAccess' => $row['hasAccess'],
-			'template' => $row['template'],
-			'nodetitle' => $nodetitle,
-			'url' => $url,
-			'title' => $title,
-			'nodetitleDisplay' => $nodetitleDisplay,
-			'weblinkDisplay' => $weblinkDisplay,
-			'pageIdDisplay' => $pageIdDisplay,
-			'lockedByUser' => $lockedByUser,
-			'treeNodeClass' => $treeNodeClass,
-			'treeNodeSelected' => $row['id'] == $hereid ? ' treeNodeSelected' : '',
-			'tree_page_click' => $modx->config['tree_page_click'],
-			'showChildren' => 1,
-			'openFolder' => 1,
-			'contextmenu' => '',
-			'tree_minusnode' => $_style['tree_minusnode'],
-			'tree_plusnode' => $_style['tree_plusnode'],
-			'spacer' => $spacer,
-			'subMenuState' => '',
-			'level' => $level,
-			'isPrivate' => 0,
-			'roles' => ($row['roles'] ? $row['roles'] : '')
-		);
-
-		$ph = $data;
-		$ph['nodetitle_esc'] = addslashes($nodetitle);
-		$ph['indent'] = $indent + 1;
-		$ph['expandAll'] = $expandAll;
-		$ph['isPrivate'] = ($row['privateweb'] || $row['privatemgr']) ? 1 : 0;
-
-		if(!$row['isfolder']) {
-			$tpl = getTplSingleNode();
-			switch($row['id']) {
-				case $modx->config['site_start']            :
-					$icon = $_style['tree_page_home'];
-					break;
-				case $modx->config['error_page']            :
-					$icon = $_style['tree_page_404'];
-					break;
-				case $modx->config['site_unavailable_page'] :
-					$icon = $_style['tree_page_hourglass'];
-					break;
-				case $modx->config['unauthorized_page']     :
-					$icon = $_style['tree_page_info'];
-					break;
-				default:
-					if(isset($icons[$row['contentType']])) {
-						$icon = $icons[$row['contentType']];
-					} else {
-						$icon = $_style['tree_page'];
-					}
-			}
-			$ph['icon'] = $icon;
-
-			// invoke OnManagerNodePrerender event
-			$prenode = $modx->invokeEvent("OnManagerNodePrerender", array('ph' => $ph));
-			if(is_array($prenode)) {
-				$phnew = array();
-				foreach($prenode as $pnode) {
-					$phnew = array_merge($phnew, unserialize($pnode));
-				}
-				$ph = (count($phnew) > 0) ? $phnew : $ph;
-			}
-
-			if($ph['contextmenu']) {
-				$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
-			}
-
-			if($_SESSION['tree_show_only_folders']) {
-				if($row['parent'] == 0) {
-					$node .= $modx->parseText($tpl, $ph);
-				} else {
-					$node .= '';
-				}
-			} else {
-				$node .= $modx->parseText($tpl, $ph);
-			}
-
-		} else {
-			$ph['icon_folder_open'] = $_style['tree_folderopen_new'];
-			$ph['icon_folder_close'] = $_style['tree_folder_new'];
-
-			if($_SESSION['tree_show_only_folders']) {
-				$tpl = getTplFolderNodeNotChildren();
-				$checkFolders = checkIsFolder($row['id'], 1) ? 1 : 0; // folders
-				$checkDocs = checkIsFolder($row['id'], 0) ? 1 : 0; // no folders
-				$ph['tree_page_click'] = 3;
-
-				// expandAll: two type for partial expansion
-				if($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
-					if($expandAll == 1) {
-						$opened2[] = $row['id'];
-					}
-					$ph['icon'] = $ph['icon_folder_open'];
-					$ph['icon_node_toggle'] = $ph['tree_minusnode'];
-					$ph['node_toggle'] = 1;
-					$ph['subMenuState'] = ' open';
-
-					if(($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
-						$ph['showChildren'] = 1;
-						$ph['icon_node_toggle'] = '';
-						$ph['icon'] = $ph['icon_folder_close'];
-					} elseif(!$checkDocs && $checkFolders) {
-						$ph['showChildren'] = 0;
-						$ph['openFolder'] = 2;
-					} else {
-						$ph['openFolder'] = 2;
-					}
-
-					// invoke OnManagerNodePrerender event
-					$prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
-						'ph' => $ph,
-						'opened' => '1'
-					));
-					if(is_array($prenode)) {
-						$phnew = array();
-						foreach($prenode as $pnode) {
-							$phnew = array_merge($phnew, unserialize($pnode));
-						}
-						$ph = (count($phnew) > 0) ? $phnew : $ph;
-					}
-
-					if($ph['contextmenu']) {
-						$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
-					}
-
-					$node .= $modx->parseText($tpl, $ph);
-					if($checkFolders) {
-						$node .= makeHTML($indent + 1, $row['id'], $expandAll, $theme, $hereid);
-					}
-					$node .= '</div></div>';
-				} else {
-					$closed2[] = $row['id'];
-					$ph['icon'] = $ph['icon_folder_close'];
-					$ph['icon_node_toggle'] = $ph['tree_plusnode'];
-					$ph['node_toggle'] = 0;
-
-					if(($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
-						$ph['showChildren'] = 1;
-						$ph['icon_node_toggle'] = '';
-					} elseif(!$checkDocs && $checkFolders) {
-						$ph['showChildren'] = 0;
-						$ph['openFolder'] = 2;
-					} else {
-						$ph['openFolder'] = 2;
-					}
-
-					// invoke OnManagerNodePrerender event
-					$prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
-						'ph' => $ph,
-						'opened' => '0'
-					));
-					if(is_array($prenode)) {
-						$phnew = array();
-						foreach($prenode as $pnode) {
-							$phnew = array_merge($phnew, unserialize($pnode));
-						}
-						$ph = (count($phnew) > 0) ? $phnew : $ph;
-					}
-
-					if($ph['contextmenu']) {
-						$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
-					}
-
-					$node .= $modx->parseText($tpl, $ph);
-					$node .= '</div></div>';
-				}
-			} else {
-				$tpl = getTplFolderNode();
-				// expandAll: two type for partial expansion
-				if($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
-					if($expandAll == 1) {
-						$opened2[] = $row['id'];
-					}
-					$ph['icon'] = $ph['icon_folder_open'];
-					$ph['icon_node_toggle'] = $ph['tree_minusnode'];
-					$ph['node_toggle'] = 1;
-					$ph['subMenuState'] = ' open';
-
-					if($ph['donthit'] == 1) {
-						$ph['tree_page_click'] = 3;
-						$ph['icon_node_toggle'] = '';
-						$ph['icon'] = $ph['icon_folder_close'];
-						$ph['showChildren'] = 0;
-					}
-
-					// invoke OnManagerNodePrerender event
-					$prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
-						'ph' => $ph,
-						'opened' => '1'
-					));
-					if(is_array($prenode)) {
-						$phnew = array();
-						foreach($prenode as $pnode) {
-							$phnew = array_merge($phnew, unserialize($pnode));
-						}
-						$ph = (count($phnew) > 0) ? $phnew : $ph;
-						if($ph['showChildren'] == 0) {
-							unset($opened2[$row['id']]);
-							$ph['node_toggle'] = 0;
-							$ph['subMenuState'] = '';
-						}
-					}
-
-					if($ph['showChildren'] == 0) {
-						$ph['icon_node_toggle'] = '';
-						$ph['donthit'] = 1;
-						$ph['icon'] = $ph['icon_folder_close'];
-						$tpl = getTplFolderNodeNotChildren();
-					}
-
-					if($ph['contextmenu']) {
-						$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
-					}
-
-					$node .= $modx->parseText($tpl, $ph);
-					if($ph['donthit'] == 0) {
-						$node .= makeHTML($indent + 1, $row['id'], $expandAll, $theme, $hereid);
-					}
-					$node .= '</div></div>';
-				} else {
-					$closed2[] = $row['id'];
-					$ph['icon'] = $ph['icon_folder_close'];
-					$ph['icon_node_toggle'] = $ph['tree_plusnode'];
-					$ph['node_toggle'] = 0;
-
-					if($ph['donthit'] == 1) {
-						$ph['tree_page_click'] = 3;
-						$ph['icon_node_toggle'] = '';
-						$ph['icon'] = $ph['icon_folder_close'];
-						$ph['showChildren'] = 0;
-					}
-
-					// invoke OnManagerNodePrerender event
-					$prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
-						'ph' => $ph,
-						'opened' => '0'
-					));
-					if(is_array($prenode)) {
-						$phnew = array();
-						foreach($prenode as $pnode) {
-							$phnew = array_merge($phnew, unserialize($pnode));
-						}
-						$ph = (count($phnew) > 0) ? $phnew : $ph;
-					}
-
-					if($ph['showChildren'] == 0) {
-						$ph['icon_node_toggle'] = '';
-						$ph['donthit'] = 1;
-						$ph['icon'] = $ph['icon_folder_close'];
-						$tpl = getTplFolderNodeNotChildren();
-					}
-
-					if($ph['contextmenu']) {
-						$ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
-					}
-
-					$node .= $modx->parseText($tpl, $ph);
-					$node .= '</div></div>';
-				}
-			}
-		}
-
-		// invoke OnManagerNodeRender event
-		$data['node'] = $node;
-		$evtOut = $modx->invokeEvent('OnManagerNodeRender', $data);
-		if(is_array($evtOut)) {
-			$evtOut = implode("\n", $evtOut);
-		}
-		if($evtOut != '') {
-			$node = trim($evtOut);
-		}
-
-		$output .= $node;
-	}
-
-	return $output;
+    $from = "{$tblsc} AS sc LEFT JOIN {$tbldg} dg on dg.document = sc.id LEFT JOIN {$tblst} st on st.id = sc.template";
+    $where = "(parent={$parent}) {$access} GROUP BY sc.id";
+    $result = $modx->db->select($field, $from, $where, $orderby);
+    if($modx->db->getRecordCount($result) == 0) {
+        $output .= sprintf('<div><a class="empty">%s%s&nbsp;<span class="empty">%s</span></a></div>', $spacer, $_style['tree_deletedpage'], $_lang['empty_folder']);
+    }
+
+    $nodeNameSource = $_SESSION['tree_nodename'] == 'default' ? $modx->config['resource_tree_node_name'] : $_SESSION['tree_nodename'];
+
+    while($row = $modx->db->getRow($result)) {
+        $node = '';
+
+        $nodetitle = getNodeTitle($nodeNameSource, $row);
+        $nodetitleDisplay = $nodetitle;
+
+        $treeNodeClass = 'node';
+        $treeNodeClass .= $row['hasAccess'] == 0 ? ' protected' : '';
+
+        if($row['deleted'] == 1) {
+            $treeNodeClass .= ' deleted';
+            //$nodetitleDisplay = sprintf('<span class="deletedNode">%s</span>', $nodetitle);
+        } elseif($row['published'] == 0) {
+            $treeNodeClass .= ' unpublished';
+            //$nodetitleDisplay = sprintf('<span class="unpublishedNode">%s</span>', $nodetitle);
+        } elseif($row['hidemenu'] == 1) {
+            $treeNodeClass .= ' hidemenu';
+            //$nodetitleDisplay = sprintf('<span class="notInMenuNode%s">%s</span>', $protectedClass, $nodetitle);
+        } else {
+            //$nodetitleDisplay = sprintf('<span class="publishedNode%s">%s</span>', $protectedClass, $nodetitle);
+        }
+
+        if($row['id'] == $hereid) {
+            $treeNodeClass .= ' current';
+        }
+
+        $weblinkDisplay = $row['type'] == 'reference' ? sprintf('&nbsp;%s', $_style['tree_linkgo']) : '';
+        $pageIdDisplay = '<small>(' . ($modx_textdir ? '&rlm;' : '') . $row['id'] . ')</small>';
+
+        // Prepare displaying user-locks
+        $lockedByUser = '';
+        $rowLock = $modx->elementIsLocked(7, $row['id'], true);
+        if($rowLock && $modx->hasPermission('display_locks')) {
+            if($rowLock['sid'] == $modx->sid) {
+                $title = $modx->parseText($_lang["lock_element_editing"], array(
+                    'element_type' => $_lang["lock_element_type_7"],
+                    'lasthit_df' => $rowLock['lasthit_df']
+                ));
+                $lockedByUser = '<span title="' . $title . '" class="editResource">' . $_style['tree_preview_resource'] . '</span>';
+            } else {
+                $title = $modx->parseText($_lang["lock_element_locked_by"], array(
+                    'element_type' => $_lang["lock_element_type_7"],
+                    'username' => $rowLock['username'],
+                    'lasthit_df' => $rowLock['lasthit_df']
+                ));
+                if($modx->hasPermission('remove_locks')) {
+                    $lockedByUser = '<span onclick="modx.tree.unlockElement(7, ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                } else {
+                    $lockedByUser = '<span title="' . $title . '" class="lockedResource">' . $_style['icons_secured'] . '</span>';
+                }
+            }
+        }
+
+        $url = $modx->makeUrl($row['id']);
+
+        $title = '';
+        if(isDateNode($nodeNameSource)) {
+            $title = $_lang['pagetitle'] . ': ' . $row['pagetitle'] . '[+lf+]';
+        }
+        $title .= $_lang['id'] . ': ' . $row['id'];
+        $title .= '[+lf+]' . $_lang['resource_opt_menu_title'] . ': ' . $row['menutitle'];
+        $title .= '[+lf+]' . $_lang['resource_opt_menu_index'] . ': ' . $row['menuindex'];
+        $title .= '[+lf+]' . $_lang['alias'] . ': ' . (!empty($row['alias']) ? $row['alias'] : '-');
+        $title .= '[+lf+]' . $_lang['template'] . ': ' . $row['templatename'];
+        $title .= '[+lf+]' . $_lang['publish_date'] . ': ' . $modx->toDateFormat($row['pub_date']);
+        $title .= '[+lf+]' . $_lang['unpublish_date'] . ': ' . $modx->toDateFormat($row['unpub_date']);
+        $title .= '[+lf+]' . $_lang['page_data_web_access'] . ': ' . ($row['privateweb'] ? $_lang['private'] : $_lang['public']);
+        $title .= '[+lf+]' . $_lang['page_data_mgr_access'] . ': ' . ($row['privatemgr'] ? $_lang['private'] : $_lang['public']);
+        $title .= '[+lf+]' . $_lang['resource_opt_richtext'] . ': ' . ($row['richtext'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= '[+lf+]' . $_lang['page_data_searchable'] . ': ' . ($row['searchable'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title .= '[+lf+]' . $_lang['page_data_cacheable'] . ': ' . ($row['cacheable'] == 0 ? $_lang['no'] : $_lang['yes']);
+        $title = $modx->htmlspecialchars($title);
+        $title = str_replace('[+lf+]', ' &#13;', $title);   // replace line-breaks with empty space as fall-back
+
+        $data = array(
+            'id' => $row['id'],
+            'pagetitle' => $row['pagetitle'],
+            'longtitle' => $row['longtitle'],
+            'menutitle' => $row['menutitle'],
+            'parent' => $parent,
+            'isfolder' => $row['isfolder'],
+            'published' => $row['published'],
+            'deleted' => $row['deleted'],
+            'type' => $row['type'],
+            'menuindex' => $row['menuindex'],
+            'donthit' => $row['donthit'],
+            'hidemenu' => $row['hidemenu'],
+            'alias' => $row['alias'],
+            'contenttype' => $row['contentType'],
+            'privateweb' => $row['privateweb'],
+            'privatemgr' => $row['privatemgr'],
+            'hasAccess' => $row['hasAccess'],
+            'template' => $row['template'],
+            'nodetitle' => $nodetitle,
+            'url' => $url,
+            'title' => $title,
+            'nodetitleDisplay' => $nodetitleDisplay,
+            'weblinkDisplay' => $weblinkDisplay,
+            'pageIdDisplay' => $pageIdDisplay,
+            'lockedByUser' => $lockedByUser,
+            'treeNodeClass' => $treeNodeClass,
+            'treeNodeSelected' => $row['id'] == $hereid ? ' treeNodeSelected' : '',
+            'tree_page_click' => $modx->config['tree_page_click'],
+            'showChildren' => 1,
+            'openFolder' => 1,
+            'contextmenu' => '',
+            'tree_minusnode' => $_style['tree_minusnode'],
+            'tree_plusnode' => $_style['tree_plusnode'],
+            'spacer' => $spacer,
+            'subMenuState' => '',
+            'level' => $level,
+            'isPrivate' => 0,
+            'roles' => ($row['roles'] ? $row['roles'] : '')
+        );
+
+        $ph = $data;
+        $ph['nodetitle_esc'] = addslashes($nodetitle);
+        $ph['indent'] = $indent + 1;
+        $ph['expandAll'] = $expandAll;
+        $ph['isPrivate'] = ($row['privateweb'] || $row['privatemgr']) ? 1 : 0;
+
+        if(!$row['isfolder']) {
+            $tpl = getTplSingleNode();
+            switch($row['id']) {
+                case $modx->config['site_start']            :
+                    $icon = $_style['tree_page_home'];
+                    break;
+                case $modx->config['error_page']            :
+                    $icon = $_style['tree_page_404'];
+                    break;
+                case $modx->config['site_unavailable_page'] :
+                    $icon = $_style['tree_page_hourglass'];
+                    break;
+                case $modx->config['unauthorized_page']     :
+                    $icon = $_style['tree_page_info'];
+                    break;
+                default:
+                    if(isset($icons[$row['contentType']])) {
+                        $icon = $icons[$row['contentType']];
+                    } else {
+                        $icon = $_style['tree_page'];
+                    }
+            }
+            $ph['icon'] = $icon;
+
+            // invoke OnManagerNodePrerender event
+            $prenode = $modx->invokeEvent("OnManagerNodePrerender", array('ph' => $ph));
+            if(is_array($prenode)) {
+                $phnew = array();
+                foreach($prenode as $pnode) {
+                    $phnew = array_merge($phnew, unserialize($pnode));
+                }
+                $ph = (count($phnew) > 0) ? $phnew : $ph;
+            }
+
+            if($ph['contextmenu']) {
+                $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+            }
+
+            if($_SESSION['tree_show_only_folders']) {
+                if($row['parent'] == 0) {
+                    $node .= $modx->parseText($tpl, $ph);
+                } else {
+                    $node .= '';
+                }
+            } else {
+                $node .= $modx->parseText($tpl, $ph);
+            }
+
+        } else {
+            $ph['icon_folder_open'] = $_style['tree_folderopen_new'];
+            $ph['icon_folder_close'] = $_style['tree_folder_new'];
+
+            if($_SESSION['tree_show_only_folders']) {
+                $tpl = getTplFolderNodeNotChildren();
+                $checkFolders = checkIsFolder($row['id'], 1) ? 1 : 0; // folders
+                $checkDocs = checkIsFolder($row['id'], 0) ? 1 : 0; // no folders
+                $ph['tree_page_click'] = 3;
+
+                // expandAll: two type for partial expansion
+                if($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
+                    if($expandAll == 1) {
+                        $opened2[] = $row['id'];
+                    }
+                    $ph['icon'] = $ph['icon_folder_open'];
+                    $ph['icon_node_toggle'] = $ph['tree_minusnode'];
+                    $ph['node_toggle'] = 1;
+                    $ph['subMenuState'] = ' open';
+
+                    if(($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
+                        $ph['showChildren'] = 1;
+                        $ph['icon_node_toggle'] = '';
+                        $ph['icon'] = $ph['icon_folder_close'];
+                    } elseif(!$checkDocs && $checkFolders) {
+                        $ph['showChildren'] = 0;
+                        $ph['openFolder'] = 2;
+                    } else {
+                        $ph['openFolder'] = 2;
+                    }
+
+                    // invoke OnManagerNodePrerender event
+                    $prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
+                        'ph' => $ph,
+                        'opened' => '1'
+                    ));
+                    if(is_array($prenode)) {
+                        $phnew = array();
+                        foreach($prenode as $pnode) {
+                            $phnew = array_merge($phnew, unserialize($pnode));
+                        }
+                        $ph = (count($phnew) > 0) ? $phnew : $ph;
+                    }
+
+                    if($ph['contextmenu']) {
+                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                    }
+
+                    $node .= $modx->parseText($tpl, $ph);
+                    if($checkFolders) {
+                        $node .= makeHTML($indent + 1, $row['id'], $expandAll, $theme, $hereid);
+                    }
+                    $node .= '</div></div>';
+                } else {
+                    $closed2[] = $row['id'];
+                    $ph['icon'] = $ph['icon_folder_close'];
+                    $ph['icon_node_toggle'] = $ph['tree_plusnode'];
+                    $ph['node_toggle'] = 0;
+
+                    if(($checkDocs && !$checkFolders) || (!$checkDocs && !$checkFolders)) {
+                        $ph['showChildren'] = 1;
+                        $ph['icon_node_toggle'] = '';
+                    } elseif(!$checkDocs && $checkFolders) {
+                        $ph['showChildren'] = 0;
+                        $ph['openFolder'] = 2;
+                    } else {
+                        $ph['openFolder'] = 2;
+                    }
+
+                    // invoke OnManagerNodePrerender event
+                    $prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
+                        'ph' => $ph,
+                        'opened' => '0'
+                    ));
+                    if(is_array($prenode)) {
+                        $phnew = array();
+                        foreach($prenode as $pnode) {
+                            $phnew = array_merge($phnew, unserialize($pnode));
+                        }
+                        $ph = (count($phnew) > 0) ? $phnew : $ph;
+                    }
+
+                    if($ph['contextmenu']) {
+                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                    }
+
+                    $node .= $modx->parseText($tpl, $ph);
+                    $node .= '</div></div>';
+                }
+            } else {
+                $tpl = getTplFolderNode();
+                // expandAll: two type for partial expansion
+                if($expandAll == 1 || ($expandAll == 2 && in_array($row['id'], $opened))) {
+                    if($expandAll == 1) {
+                        $opened2[] = $row['id'];
+                    }
+                    $ph['icon'] = $ph['icon_folder_open'];
+                    $ph['icon_node_toggle'] = $ph['tree_minusnode'];
+                    $ph['node_toggle'] = 1;
+                    $ph['subMenuState'] = ' open';
+
+                    if($ph['donthit'] == 1) {
+                        $ph['tree_page_click'] = 3;
+                        $ph['icon_node_toggle'] = '';
+                        $ph['icon'] = $ph['icon_folder_close'];
+                        $ph['showChildren'] = 0;
+                    }
+
+                    // invoke OnManagerNodePrerender event
+                    $prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
+                        'ph' => $ph,
+                        'opened' => '1'
+                    ));
+                    if(is_array($prenode)) {
+                        $phnew = array();
+                        foreach($prenode as $pnode) {
+                            $phnew = array_merge($phnew, unserialize($pnode));
+                        }
+                        $ph = (count($phnew) > 0) ? $phnew : $ph;
+                        if($ph['showChildren'] == 0) {
+                            unset($opened2[$row['id']]);
+                            $ph['node_toggle'] = 0;
+                            $ph['subMenuState'] = '';
+                        }
+                    }
+
+                    if($ph['showChildren'] == 0) {
+                        $ph['icon_node_toggle'] = '';
+                        $ph['donthit'] = 1;
+                        $ph['icon'] = $ph['icon_folder_close'];
+                        $tpl = getTplFolderNodeNotChildren();
+                    }
+
+                    if($ph['contextmenu']) {
+                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                    }
+
+                    $node .= $modx->parseText($tpl, $ph);
+                    if($ph['donthit'] == 0) {
+                        $node .= makeHTML($indent + 1, $row['id'], $expandAll, $theme, $hereid);
+                    }
+                    $node .= '</div></div>';
+                } else {
+                    $closed2[] = $row['id'];
+                    $ph['icon'] = $ph['icon_folder_close'];
+                    $ph['icon_node_toggle'] = $ph['tree_plusnode'];
+                    $ph['node_toggle'] = 0;
+
+                    if($ph['donthit'] == 1) {
+                        $ph['tree_page_click'] = 3;
+                        $ph['icon_node_toggle'] = '';
+                        $ph['icon'] = $ph['icon_folder_close'];
+                        $ph['showChildren'] = 0;
+                    }
+
+                    // invoke OnManagerNodePrerender event
+                    $prenode = $modx->invokeEvent("OnManagerNodePrerender", array(
+                        'ph' => $ph,
+                        'opened' => '0'
+                    ));
+                    if(is_array($prenode)) {
+                        $phnew = array();
+                        foreach($prenode as $pnode) {
+                            $phnew = array_merge($phnew, unserialize($pnode));
+                        }
+                        $ph = (count($phnew) > 0) ? $phnew : $ph;
+                    }
+
+                    if($ph['showChildren'] == 0) {
+                        $ph['icon_node_toggle'] = '';
+                        $ph['donthit'] = 1;
+                        $ph['icon'] = $ph['icon_folder_close'];
+                        $tpl = getTplFolderNodeNotChildren();
+                    }
+
+                    if($ph['contextmenu']) {
+                        $ph['contextmenu'] = ' data-contextmenu="' . _htmlentities($ph['contextmenu']) . '"';
+                    }
+
+                    $node .= $modx->parseText($tpl, $ph);
+                    $node .= '</div></div>';
+                }
+            }
+        }
+
+        // invoke OnManagerNodeRender event
+        $data['node'] = $node;
+        $evtOut = $modx->invokeEvent('OnManagerNodeRender', $data);
+        if(is_array($evtOut)) {
+            $evtOut = implode("\n", $evtOut);
+        }
+        if($evtOut != '') {
+            $node = trim($evtOut);
+        }
+
+        $output .= $node;
+    }
+
+    return $output;
 }
 
 /**
@@ -456,30 +456,30 @@ 
  * @return array
  */
 function getIconInfo($_style) {
-	if(!isset($_style['tree_page_gif'])) {
-		$_style['tree_page_gif'] = $_style['tree_page'];
-	}
-	if(!isset($_style['tree_page_jpg'])) {
-		$_style['tree_page_jpg'] = $_style['tree_page'];
-	}
-	if(!isset($_style['tree_page_png'])) {
-		$_style['tree_page_png'] = $_style['tree_page'];
-	}
-	$icons = array(
-		'text/html' => $_style['tree_page_html'],
-		'text/plain' => $_style['tree_page'],
-		'text/xml' => $_style['tree_page_xml'],
-		'text/css' => $_style['tree_page_css'],
-		'text/javascript' => $_style['tree_page_js'],
-		'application/rss+xml' => $_style['tree_page_rss'],
-		'application/pdf' => $_style['tree_page_pdf'],
-		'application/vnd.ms-word' => $_style['tree_page_word'],
-		'application/vnd.ms-excel' => $_style['tree_page_excel'],
-		'image/gif' => $_style['tree_page_gif'],
-		'image/jpg' => $_style['tree_page_jpg'],
-		'image/png' => $_style['tree_page_png']
-	);
-	return $icons;
+    if(!isset($_style['tree_page_gif'])) {
+        $_style['tree_page_gif'] = $_style['tree_page'];
+    }
+    if(!isset($_style['tree_page_jpg'])) {
+        $_style['tree_page_jpg'] = $_style['tree_page'];
+    }
+    if(!isset($_style['tree_page_png'])) {
+        $_style['tree_page_png'] = $_style['tree_page'];
+    }
+    $icons = array(
+        'text/html' => $_style['tree_page_html'],
+        'text/plain' => $_style['tree_page'],
+        'text/xml' => $_style['tree_page_xml'],
+        'text/css' => $_style['tree_page_css'],
+        'text/javascript' => $_style['tree_page_js'],
+        'application/rss+xml' => $_style['tree_page_rss'],
+        'application/pdf' => $_style['tree_page_pdf'],
+        'application/vnd.ms-word' => $_style['tree_page_word'],
+        'application/vnd.ms-excel' => $_style['tree_page_excel'],
+        'image/gif' => $_style['tree_page_gif'],
+        'image/jpg' => $_style['tree_page_jpg'],
+        'image/png' => $_style['tree_page_png']
+    );
+    return $icons;
 }
 
 /**
@@ -487,30 +487,30 @@ 
  * @return array
  */
 function getPrivateIconInfo($_style) {
-	if(!isset($_style['tree_page_gif_secure'])) {
-		$_style['tree_page_gif_secure'] = $_style['tree_page_secure'];
-	}
-	if(!isset($_style['tree_page_jpg_secure'])) {
-		$_style['tree_page_jpg_secure'] = $_style['tree_page_secure'];
-	}
-	if(!isset($_style['tree_page_png_secure'])) {
-		$_style['tree_page_png_secure'] = $_style['tree_page_secure'];
-	}
-	$iconsPrivate = array(
-		'text/html' => $_style['tree_page_html_secure'],
-		'text/plain' => $_style['tree_page_secure'],
-		'text/xml' => $_style['tree_page_xml_secure'],
-		'text/css' => $_style['tree_page_css_secure'],
-		'text/javascript' => $_style['tree_page_js_secure'],
-		'application/rss+xml' => $_style['tree_page_rss_secure'],
-		'application/pdf' => $_style['tree_page_pdf_secure'],
-		'application/vnd.ms-word' => $_style['tree_page_word_secure'],
-		'application/vnd.ms-excel' => $_style['tree_page_excel_secure'],
-		'image/gif' => $_style['tree_page_gif_secure'],
-		'image/jpg' => $_style['tree_page_jpg_secure'],
-		'image/png' => $_style['tree_page_png_secure']
-	);
-	return $iconsPrivate;
+    if(!isset($_style['tree_page_gif_secure'])) {
+        $_style['tree_page_gif_secure'] = $_style['tree_page_secure'];
+    }
+    if(!isset($_style['tree_page_jpg_secure'])) {
+        $_style['tree_page_jpg_secure'] = $_style['tree_page_secure'];
+    }
+    if(!isset($_style['tree_page_png_secure'])) {
+        $_style['tree_page_png_secure'] = $_style['tree_page_secure'];
+    }
+    $iconsPrivate = array(
+        'text/html' => $_style['tree_page_html_secure'],
+        'text/plain' => $_style['tree_page_secure'],
+        'text/xml' => $_style['tree_page_xml_secure'],
+        'text/css' => $_style['tree_page_css_secure'],
+        'text/javascript' => $_style['tree_page_js_secure'],
+        'application/rss+xml' => $_style['tree_page_rss_secure'],
+        'application/pdf' => $_style['tree_page_pdf_secure'],
+        'application/vnd.ms-word' => $_style['tree_page_word_secure'],
+        'application/vnd.ms-excel' => $_style['tree_page_excel_secure'],
+        'image/gif' => $_style['tree_page_gif_secure'],
+        'image/jpg' => $_style['tree_page_jpg_secure'],
+        'image/png' => $_style['tree_page_png_secure']
+    );
+    return $iconsPrivate;
 }
 
 /**
@@ -519,49 +519,49 @@ 
  * @return string
  */
 function getNodeTitle($nodeNameSource, $row) {
-	global $modx;
-
-	switch($nodeNameSource) {
-		case 'menutitle':
-			$nodetitle = $row['menutitle'] ? $row['menutitle'] : $row['pagetitle'];
-			break;
-		case 'alias':
-			$nodetitle = $row['alias'] ? $row['alias'] : $row['id'];
-			if(strpos($row['alias'], '.') === false) {
-				if($row['isfolder'] != 1 || $modx->config['make_folders'] != 1) {
-					$nodetitle .= $modx->config['friendly_url_suffix'];
-				}
-			}
-			$nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle;
-			break;
-		case 'pagetitle':
-			$nodetitle = $row['pagetitle'];
-			break;
-		case 'longtitle':
-			$nodetitle = $row['longtitle'] ? $row['longtitle'] : $row['pagetitle'];
-			break;
-		case 'createdon':
-		case 'editedon':
-		case 'publishedon':
-		case 'pub_date':
-		case 'unpub_date':
-			$doc = $modx->getDocumentObject('id', $row['id']);
-			$date = $doc[$nodeNameSource];
-			if(!empty($date)) {
-				$nodetitle = $modx->toDateFormat($date);
-			} else {
-				$nodetitle = '- - -';
-			}
-			break;
-		default:
-			$nodetitle = $row['pagetitle'];
-	}
-	$nodetitle = $modx->htmlspecialchars(str_replace(array(
-		"\r\n",
-		"\n",
-		"\r"
-	), ' ', $nodetitle), ENT_COMPAT);
-	return $nodetitle;
+    global $modx;
+
+    switch($nodeNameSource) {
+        case 'menutitle':
+            $nodetitle = $row['menutitle'] ? $row['menutitle'] : $row['pagetitle'];
+            break;
+        case 'alias':
+            $nodetitle = $row['alias'] ? $row['alias'] : $row['id'];
+            if(strpos($row['alias'], '.') === false) {
+                if($row['isfolder'] != 1 || $modx->config['make_folders'] != 1) {
+                    $nodetitle .= $modx->config['friendly_url_suffix'];
+                }
+            }
+            $nodetitle = $modx->config['friendly_url_prefix'] . $nodetitle;
+            break;
+        case 'pagetitle':
+            $nodetitle = $row['pagetitle'];
+            break;
+        case 'longtitle':
+            $nodetitle = $row['longtitle'] ? $row['longtitle'] : $row['pagetitle'];
+            break;
+        case 'createdon':
+        case 'editedon':
+        case 'publishedon':
+        case 'pub_date':
+        case 'unpub_date':
+            $doc = $modx->getDocumentObject('id', $row['id']);
+            $date = $doc[$nodeNameSource];
+            if(!empty($date)) {
+                $nodetitle = $modx->toDateFormat($date);
+            } else {
+                $nodetitle = '- - -';
+            }
+            break;
+        default:
+            $nodetitle = $row['pagetitle'];
+    }
+    $nodetitle = $modx->htmlspecialchars(str_replace(array(
+        "\r\n",
+        "\n",
+        "\r"
+    ), ' ', $nodetitle), ENT_COMPAT);
+    return $nodetitle;
 }
 
 /**
@@ -569,16 +569,16 @@ 
  * @return bool
  */
 function isDateNode($nodeNameSource) {
-	switch($nodeNameSource) {
-		case 'createdon':
-		case 'editedon':
-		case 'publishedon':
-		case 'pub_date':
-		case 'unpub_date':
-			return true;
-		default:
-			return false;
-	}
+    switch($nodeNameSource) {
+        case 'createdon':
+        case 'editedon':
+        case 'publishedon':
+        case 'pub_date':
+        case 'unpub_date':
+            return true;
+        default:
+            return false;
+    }
 }
 
 /**
@@ -587,9 +587,9 @@ 
  * @return int
  */
 function checkIsFolder($parent = 0, $isfolder = 1) {
-	global $modx;
+    global $modx;
 
-	return (int) $modx->db->getValue($modx->db->query('SELECT count(*) FROM ' . $modx->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
+    return (int) $modx->db->getValue($modx->db->query('SELECT count(*) FROM ' . $modx->getFullTableName('site_content') . ' WHERE parent=' . $parent . ' AND isfolder=' . $isfolder . ' '));
 }
 
 /**
@@ -597,19 +597,19 @@ 
  * @return string
  */
 function _htmlentities($array) {
-	global $modx;
+    global $modx;
 
-	$array = json_encode($array, JSON_UNESCAPED_UNICODE);
-	$array = htmlentities($array, ENT_COMPAT, $modx->config['modx_charset']);
+    $array = json_encode($array, JSON_UNESCAPED_UNICODE);
+    $array = htmlentities($array, ENT_COMPAT, $modx->config['modx_charset']);
 
-	return $array;
+    return $array;
 }
 
 /**
  * @return string
  */
 function getTplSingleNode() {
-	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
+    return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
         data-id="[+id+]"
@@ -636,7 +636,7 @@ 
  * @return string
  */
 function getTplFolderNode() {
-	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
+    return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
         data-id="[+id+]"
@@ -675,7 +675,7 @@ 
  * @return string
  */
 function getTplFolderNodeNotChildren() {
-	return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
+    return '<div id="node[+id+]"><a class="[+treeNodeClass+]"
         onclick="modx.tree.treeAction(event,[+id+]);"
         oncontextmenu="modx.tree.showPopup(event,[+id+],\'[+nodetitle_esc+]\');"
         data-id="[+id+]"
@@ -711,10 +711,10 @@ 
  * @param bool $flag
  */
 function dbug($str, $flag = false) {
-	print('<pre>');
-	print_r($str);
-	print('</pre>');
-	if($flag) {
-		exit;
-	}
+    print('<pre>');
+    print_r($str);
+    print('</pre>');
+    if($flag) {
+        exit;
+    }
 }

manager/actions/resources/functions.inc.php

Indentation +165 added lines, -165 removed lines

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

 }

 

 $tpl = array(

-	'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'),

-	'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

-	'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

-	'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

-	'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')

+    'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'),

+    'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

+    'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

+    'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

+    'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl')

 );

 

 /**

@@ -17,9 +17,9 @@ 
  * @return string

  */

 function parsePh($tpl, $ph) {

-	global $modx, $_lang;

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

-	return $modx->parseText($tpl, $ph);

+    global $modx, $_lang;

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

+    return $modx->parseText($tpl, $ph);

 }

 

 /**

@@ -27,11 +27,11 @@ 
  * @return string

  */

 function renderViewSwitchButtons($cssId) {

-	global $modx, $_lang, $tpl;

+    global $modx, $_lang, $tpl;

 

-	return parsePh($tpl['viewForm'], array(

-		'cssId' => $cssId

-	));

+    return parsePh($tpl['viewForm'], array(

+        'cssId' => $cssId

+    ));

 }

 

 /**

@@ -40,52 +40,52 @@ 
  * @return string

  */

 function createResourceList($resourceTable, $resources) {

-	global $modx, $_lang, $_style, $modx_textdir, $tpl;

+    global $modx, $_lang, $_style, $modx_textdir, $tpl;

 

-	$items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;

+    $items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;

 

-	if( ! is_array($items) || empty($items)) {

-		return $_lang['no_results'];

-	}

+    if( ! is_array($items) || empty($items)) {

+        return $_lang['no_results'];

+    }

 

-	// Prepare elements- and categories-list

-	$elements = array();

-	$categories = array();

-	foreach($items as $row) {

-		$catid = $row['catid'] ? $row['catid'] : 0;

-		$categories[$catid] = array('name' => stripslashes($row['category']));

-		$elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);

-	}

+    // Prepare elements- and categories-list

+    $elements = array();

+    $categories = array();

+    foreach($items as $row) {

+        $catid = $row['catid'] ? $row['catid'] : 0;

+        $categories[$catid] = array('name' => stripslashes($row['category']));

+        $elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);

+    }

 

-	// Now render categories / panel-collapse

-	$panelGroup = '';

-	foreach($elements as $catid => $elList) {

-		// Add panel-heading / category-collapse to output

-		$panelGroup .= parsePh($tpl['panelHeading'], array(

-			'tab' => $resourceTable,

-			'category' => $categories[$catid]['name'],

-			'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

-			'catid' => $catid,

-		));

+    // Now render categories / panel-collapse

+    $panelGroup = '';

+    foreach($elements as $catid => $elList) {

+        // Add panel-heading / category-collapse to output

+        $panelGroup .= parsePh($tpl['panelHeading'], array(

+            'tab' => $resourceTable,

+            'category' => $categories[$catid]['name'],

+            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

+            'catid' => $catid,

+        ));

 

-		// Prepare content for panel-collapse

-		$panelCollapse = '';

-		foreach($elList as $el) {

-			$panelCollapse .= parsePh($tpl['elementsRow'], $el);

-		}

+        // Prepare content for panel-collapse

+        $panelCollapse = '';

+        foreach($elList as $el) {

+            $panelCollapse .= parsePh($tpl['elementsRow'], $el);

+        }

 

-		// Add panel-collapse with elements to output

-		$panelGroup .= parsePh($tpl['panelCollapse'], array(

-			'tab' => $resourceTable,

-			'catid' => $catid,

-			'wrapper' => $panelCollapse,

-		));

-	}

+        // Add panel-collapse with elements to output

+        $panelGroup .= parsePh($tpl['panelCollapse'], array(

+            'tab' => $resourceTable,

+            'catid' => $catid,

+            'wrapper' => $panelCollapse,

+        ));

+    }

 

-	return parsePh($tpl['panelGroup'], array(

-		'resourceTable' => $resourceTable,

-		'wrapper' => $panelGroup

-	));

+    return parsePh($tpl['panelGroup'], array(

+        'resourceTable' => $resourceTable,

+        'wrapper' => $panelGroup

+    ));

 }

 

 /**

@@ -93,54 +93,54 @@ 
  * @return string

  */

 function createCombinedView($resources) {

-	global $modx, $_lang, $_style, $modx_textdir;

+    global $modx, $_lang, $_style, $modx_textdir;

 

-	$itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;

-	$types = isset($resources->types) ? $resources->types : false;

-	$categories = isset($resources->categories) ? $resources->categories : false;

+    $itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;

+    $types = isset($resources->types) ? $resources->types : false;

+    $categories = isset($resources->categories) ? $resources->categories : false;

 

-	if(!$itemsPerCategory) {

-		return $_lang['no_results'];

-	}

+    if(!$itemsPerCategory) {

+        return $_lang['no_results'];

+    }

 

-	$tpl = array(

-		'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

-		'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

-		'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

-		'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl'),

-	);

+    $tpl = array(

+        'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'),

+        'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'),

+        'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'),

+        'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl'),

+    );

 

-	// Easily loop through $itemsPerCategory-Array

-	$panelGroup = '';

-	foreach($categories as $catid => $category) {

-		// Prepare collapse content / elements-list

-		$panelCollapse = '';

-		foreach($itemsPerCategory[$catid] as $el) {

-			$resourceTable = $el['type'];

-			$ph = prepareElementRowPh($el, $resourceTable, $resources);

-			$panelCollapse .= parsePh($tpl['elementsRow'], $ph);

-		}

+    // Easily loop through $itemsPerCategory-Array

+    $panelGroup = '';

+    foreach($categories as $catid => $category) {

+        // Prepare collapse content / elements-list

+        $panelCollapse = '';

+        foreach($itemsPerCategory[$catid] as $el) {

+            $resourceTable = $el['type'];

+            $ph = prepareElementRowPh($el, $resourceTable, $resources);

+            $panelCollapse .= parsePh($tpl['elementsRow'], $ph);

+        }

 

-		// Add panel-heading / button

-		$panelGroup .= parsePh($tpl['panelHeading'], array(

-			'tab' => 'categories_list',

-			'category' => $categories[$catid],

-			'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

-			'catid' => $catid,

-		));

+        // Add panel-heading / button

+        $panelGroup .= parsePh($tpl['panelHeading'], array(

+            'tab' => 'categories_list',

+            'category' => $categories[$catid],

+            'categoryid' => $catid != '' ? ' <small>(' . $catid . ')</small>' : '',

+            'catid' => $catid,

+        ));

 

-		// Add panel

-		$panelGroup .= parsePh($tpl['panelCollapse'], array(

-			'tab' => 'categories_list',

-			'catid' => $catid,

-			'wrapper' => $panelCollapse,

-		));

-	}

+        // Add panel

+        $panelGroup .= parsePh($tpl['panelCollapse'], array(

+            'tab' => 'categories_list',

+            'catid' => $catid,

+            'wrapper' => $panelCollapse,

+        ));

+    }

 

-	return parsePh($tpl['panelGroup'], array(

-		'resourceTable' => 'categories_list',

-		'wrapper' => $panelGroup

-	));

+    return parsePh($tpl['panelGroup'], array(

+        'resourceTable' => 'categories_list',

+        'wrapper' => $panelGroup

+    ));

 }

 

 /**

@@ -150,13 +150,13 @@ 
  * @return array

  */

 function prepareElementRowPh($row, $resourceTable, $resources) {

-	global $modx, $modx_textdir, $_style, $_lang;

+    global $modx, $modx_textdir, $_style, $_lang;

 

-	$types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;

+    $types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;

 

-	$_lang["confirm_delete"] = $_lang["delete"];

+    $_lang["confirm_delete"] = $_lang["delete"];

 

-	switch($resourceTable){

+    switch($resourceTable){

         case 'site_templates':

             $class = $row['selectable'] ? '' : 'disabledPlugin';

             $lockElementType = 1;

@@ -190,77 +190,77 @@ 
             return array();

     }

 

-	// Prepare displaying user-locks

-	$lockedByUser = '';

-	$rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);

-	if($rowLock && $modx->hasPermission('display_locks')) {

-		if($rowLock['sid'] == $modx->sid) {

-			$title = $modx->parseText($_lang["lock_element_editing"], array(

-				'element_type' => $_lang["lock_element_type_" . $lockElementType],

-				'lasthit_df' => $rowLock['lasthit_df']

-			));

-			$lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';

-		} else {

-			$title = $modx->parseText($_lang["lock_element_locked_by"], array(

-				'element_type' => $_lang["lock_element_type_" . $lockElementType],

-				'username' => $rowLock['username'],

-				'lasthit_df' => $rowLock['lasthit_df']

-			));

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

-				$lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';

-			} else {

-				$lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';

-			}

-		}

-	}

-	if($lockedByUser) {

-		$lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';

-	}

+    // Prepare displaying user-locks

+    $lockedByUser = '';

+    $rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);

+    if($rowLock && $modx->hasPermission('display_locks')) {

+        if($rowLock['sid'] == $modx->sid) {

+            $title = $modx->parseText($_lang["lock_element_editing"], array(

+                'element_type' => $_lang["lock_element_type_" . $lockElementType],

+                'lasthit_df' => $rowLock['lasthit_df']

+            ));

+            $lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';

+        } else {

+            $title = $modx->parseText($_lang["lock_element_locked_by"], array(

+                'element_type' => $_lang["lock_element_type_" . $lockElementType],

+                'username' => $rowLock['username'],

+                'lasthit_df' => $rowLock['lasthit_df']

+            ));

+            if($modx->hasPermission('remove_locks')) {

+                $lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';

+            } else {

+                $lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';

+            }

+        }

+    }

+    if($lockedByUser) {

+        $lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';

+    }

 

-	// Caption

-	if($resourceTable == 'site_tmplvars') {

-		$caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];

-	} else {

-		$caption = !empty($row['description']) ? ' ' . $row['description'] : '';

-	}

+    // Caption

+    if($resourceTable == 'site_tmplvars') {

+        $caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];

+    } else {

+        $caption = !empty($row['description']) ? ' ' . $row['description'] : '';

+    }

 

-	// Special marks

-	$tplInfo = array();

-	if($row['locked']) {

-		$tplInfo[] = $_lang['locked'];

-	}

-	if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

-		$tplInfo[] = $_lang['defaulttemplate_title'];

-	}

-	$marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';

+    // Special marks

+    $tplInfo = array();

+    if($row['locked']) {

+        $tplInfo[] = $_lang['locked'];

+    }

+    if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

+        $tplInfo[] = $_lang['defaulttemplate_title'];

+    }

+    $marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';

 

-	/* row buttons */

-	$buttons = '';

-	if($modx->hasPermission($types['actions']['edit'][1])) {

-		$buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';

-	}

-	if($modx->hasPermission($types['actions']['duplicate'][1])) {

-		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';

-	}

-	if($modx->hasPermission($types['actions']['remove'][1])) {

-		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';

-	}

-	$buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';

+    /* row buttons */

+    $buttons = '';

+    if($modx->hasPermission($types['actions']['edit'][1])) {

+        $buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';

+    }

+    if($modx->hasPermission($types['actions']['duplicate'][1])) {

+        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';

+    }

+    if($modx->hasPermission($types['actions']['remove'][1])) {

+        $buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';

+    }

+    $buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';

 

-	$catid = $row['catid'] ? $row['catid'] : 0;

+    $catid = $row['catid'] ? $row['catid'] : 0;

 

-	// Placeholders for elements-row

-	return array(

-		'class' => $class ? ' class="' . $class . '"' : '',

-		'lockedByUser' => $lockedByUser,

-		'name' => $row['name'],

-		'caption' => $caption,

-		'buttons' => $buttons,

-		'marks' => $marks,

-		'id' => $row['id'],

-		'resourceTable' => $resourceTable,

-		'actionEdit' => $types['actions']['edit'][0],

-		'catid' => $catid,

-		'textdir' => $modx_textdir ? '&rlm;' : '',

-	);

+    // Placeholders for elements-row

+    return array(

+        'class' => $class ? ' class="' . $class . '"' : '',

+        'lockedByUser' => $lockedByUser,

+        'name' => $row['name'],

+        'caption' => $caption,

+        'buttons' => $buttons,

+        'marks' => $marks,

+        'id' => $row['id'],

+        'resourceTable' => $resourceTable,

+        'actionEdit' => $types['actions']['edit'][0],

+        'catid' => $catid,

+        'textdir' => $modx_textdir ? '&rlm;' : '',

+    );

 }

manager/actions/resources/mgrResources.class.php

Indentation +98 added lines, -98 removed lines

@@ -7,7 +7,7 @@ 
     /**
      * @var array
      */
-	public $types = array();
+    public $types = array();
     /**
      * @var array
      */
@@ -25,73 +25,73 @@ 
      * mgrResources constructor.
      */
     public function __construct() {
-		$this->setTypes();
-		$this->queryItemsFromDB();
-		$this->prepareCategoryArrays();
-	}
+        $this->setTypes();
+        $this->queryItemsFromDB();
+        $this->prepareCategoryArrays();
+    }
 
     /**
      * @return void
      */
     public function setTypes() {
-		global $_lang;
-		$this->types['site_templates']    = array(
-			'title'=>$_lang["manage_templates"],
-			'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
-			'permissions'=>array('new_template','edit_template'),
-			'name'=>'templatename'
-		);
-		$this->types['site_tmplvars']     = array(
-			'title'=>$_lang["tmplvars"],
-			'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
-			'permissions'=>array('new_template','edit_template'),
-		);
-		$this->types['site_htmlsnippets'] = array(
-			'title'=>$_lang["manage_htmlsnippets"],
-			'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
-			'permissions'=>array('new_chunk','edit_chunk'),
-		);
-		$this->types['site_snippets']     = array(
-			'title'=>$_lang["manage_snippets"],
-			'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
-			'permissions'=>array('new_snippet','edit_snippet'),
-		);
-		$this->types['site_plugins']      = array(
-			'title'=>$_lang["manage_plugins"],
-			'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
-			'permissions'=>array('new_plugin','edit_plugin'),
-		);
-		$this->types['site_modules']      = array(
-			'title'=>$_lang["manage_modules"],
-			'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
-			'permissions'=>array('new_module','edit_module'),
-		);
-	}
+        global $_lang;
+        $this->types['site_templates']    = array(
+            'title'=>$_lang["manage_templates"],
+            'actions'=>array( 'edit'=>array(16,'edit_template'), 'duplicate'=>array(96,'new_template'), 'remove'=>array(21,'delete_template') ),
+            'permissions'=>array('new_template','edit_template'),
+            'name'=>'templatename'
+        );
+        $this->types['site_tmplvars']     = array(
+            'title'=>$_lang["tmplvars"],
+            'actions'=>array('edit'=>array(301,'edit_template'), 'duplicate'=>array(304,'edit_template'), 'remove'=>array(303,'edit_template')),
+            'permissions'=>array('new_template','edit_template'),
+        );
+        $this->types['site_htmlsnippets'] = array(
+            'title'=>$_lang["manage_htmlsnippets"],
+            'actions'=>array('edit'=>array(78,'edit_chunk'), 'duplicate'=>array(97,'new_chunk'), 'remove'=>array(80,'delete_chunk')),
+            'permissions'=>array('new_chunk','edit_chunk'),
+        );
+        $this->types['site_snippets']     = array(
+            'title'=>$_lang["manage_snippets"],
+            'actions'=>array('edit'=>array(22,'edit_snippet'), 'duplicate'=>array(98,'new_snippet'), 'remove'=>array(25,'delete_snippet')),
+            'permissions'=>array('new_snippet','edit_snippet'),
+        );
+        $this->types['site_plugins']      = array(
+            'title'=>$_lang["manage_plugins"],
+            'actions'=>array('edit'=>array(102,'edit_plugin'), 'duplicate'=>array(105,'new_plugin'), 'remove'=>array(104,'delete_plugin')),
+            'permissions'=>array('new_plugin','edit_plugin'),
+        );
+        $this->types['site_modules']      = array(
+            'title'=>$_lang["manage_modules"],
+            'actions'=>array('edit'=>array(108,'edit_module'), 'duplicate'=>array(111,'new_module'), 'remove'=>array(110,'delete_module')),
+            'permissions'=>array('new_module','edit_module'),
+        );
+    }
 
     /**
      * @return void
      */
     public function queryItemsFromDB() {
-		foreach($this->types as $resourceTable=>$type) {
-			if($this->hasAnyPermissions($type['permissions'])) {
-				$nameField = isset($type['name']) ? $type['name'] : 'name';
-				$this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
-		   }
-		 }
-	}
+        foreach($this->types as $resourceTable=>$type) {
+            if($this->hasAnyPermissions($type['permissions'])) {
+                $nameField = isset($type['name']) ? $type['name'] : 'name';
+                $this->items[$resourceTable] = $this->queryResources($resourceTable, $nameField);
+            }
+            }
+    }
 
     /**
      * @param array $permissions
      * @return bool
      */
     public function hasAnyPermissions($permissions) {
-		global $modx;
+        global $modx;
 
-		foreach($permissions as $p)
-			if($modx->hasPermission($p)) return true;
+        foreach($permissions as $p)
+            if($modx->hasPermission($p)) return true;
 
-		return false;
-	}
+        return false;
+    }
 
     /**
      * @param string $resourceTable
@@ -99,7 +99,7 @@ 
      * @return array|bool
      */
     public function queryResources($resourceTable, $nameField = 'name') {
-		global $modx, $_lang;
+        global $modx, $_lang;
 
         $allowed = array(
             'site_htmlsnippets',
@@ -107,59 +107,59 @@ 
             'site_plugins',
             'site_modules'
         );
-		$pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
-
-		$tvsql  = '';
-		$tvjoin = '';
-		if ($resourceTable === 'site_tmplvars') {
-			$tvsql    = 'site_tmplvars.caption, ';
-			$tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
-			$sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
-		}
-		else $sttfield = '';
-
-		$selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
-
-		$rs = $modx->db->select(
-			"{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
-			$modx->getFullTableName($resourceTable) . " AS {$resourceTable}
+        $pluginsql = !empty($resourceTable) && in_array($resourceTable, $allowed) ? $resourceTable . '.disabled, ' : '';
+
+        $tvsql  = '';
+        $tvjoin = '';
+        if ($resourceTable === 'site_tmplvars') {
+            $tvsql    = 'site_tmplvars.caption, ';
+            $tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
+            $sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+        }
+        else $sttfield = '';
+
+        $selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
+
+        $rs = $modx->db->select(
+            "{$sttfield} {$pluginsql} {$tvsql} {$resourceTable}.{$nameField} as name, {$resourceTable}.id, {$resourceTable}.description, {$resourceTable}.locked, {$selectableTemplates}IF(isnull(categories.category),'{$_lang['no_category']}',categories.category) as category, categories.id as catid",
+            $modx->getFullTableName($resourceTable) . " AS {$resourceTable}
 	            LEFT JOIN " . $modx->getFullTableName('categories') . " AS categories ON {$resourceTable}.category = categories.id {$tvjoin}",
-			"",
-			"category,name"
-		);
-		$limit = $modx->db->getRecordCount($rs);
+            "",
+            "category,name"
+        );
+        $limit = $modx->db->getRecordCount($rs);
 
-		if($limit < 1) return false;
+        if($limit < 1) return false;
 
-		$result = array();
-		while ($row = $modx->db->getRow($rs)) {
-			$result[] = $row;
-		}
-		return $result;
-	}
+        $result = array();
+        while ($row = $modx->db->getRow($rs)) {
+            $result[] = $row;
+        }
+        return $result;
+    }
 
     /**
      * @return void
      */
     public function prepareCategoryArrays() {
-		foreach($this->items as $type=>$items) {
-			foreach((array)$items as $item) {
-				$catid = $item['catid'] ? $item['catid'] : 0;
-				$this->categories[$catid] = $item['category'];
-
-				$item['type'] = $type;
-				$this->itemsPerCategory[$catid][] = $item;
-			}
-		}
-
-		// Sort categories by name
-		natcasesort($this->categories);
-
-		// Now sort by name
-		foreach($this->itemsPerCategory as $catid=>$items) {
-			usort($this->itemsPerCategory[$catid], function ($a, $b) {
-				return strcasecmp($a['name'], $b['name']);
-			});
-		}
-	}
+        foreach($this->items as $type=>$items) {
+            foreach((array)$items as $item) {
+                $catid = $item['catid'] ? $item['catid'] : 0;
+                $this->categories[$catid] = $item['category'];
+
+                $item['type'] = $type;
+                $this->itemsPerCategory[$catid][] = $item;
+            }
+        }
+
+        // Sort categories by name
+        natcasesort($this->categories);
+
+        // Now sort by name
+        foreach($this->itemsPerCategory as $catid=>$items) {
+            usort($this->itemsPerCategory[$catid], function ($a, $b) {
+                return strcasecmp($a['name'], $b['name']);
+            });
+        }
+    }
 }

manager/actions/mutate_content.dynamic.php

Indentation +411 added lines, -411 removed lines

@@ -1,6 +1,6 @@ 
 <?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.");
 }
 
 /********************/
@@ -12,30 +12,30 @@ 
 
 // check permissions
 switch($modx->manager->action) {
-	case 27:
-		if(!$modx->hasPermission('edit_document')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 85:
-	case 72:
-	case 4:
-		if(!$modx->hasPermission('new_document')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		} elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
-			// check user has permissions for parent
-			include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
-			$udperms = new udperms();
-			$udperms->user = $modx->getLoginUserID();
-			$udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
-			$udperms->role = $_SESSION['mgrRole'];
-			if(!$udperms->checkPermissions()) {
-				$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-			}
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    case 27:
+        if(!$modx->hasPermission('edit_document')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    case 85:
+    case 72:
+    case 4:
+        if(!$modx->hasPermission('new_document')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        } elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
+            // check user has permissions for parent
+            include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+            $udperms = new udperms();
+            $udperms->user = $modx->getLoginUserID();
+            $udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
+            $udperms->role = $_SESSION['mgrRole'];
+            if(!$udperms->checkPermissions()) {
+                $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+            }
+        }
+        break;
+    default:
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -54,22 +54,22 @@ 
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 
 if($modx->manager->action == 27) {
-	//editing an existing document
-	// check permissions on the document
-	include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
-	$udperms = new udperms();
-	$udperms->user = $modx->getLoginUserID();
-	$udperms->document = $id;
-	$udperms->role = $_SESSION['mgrRole'];
-
-	if(!$udperms->checkPermissions()) {
-		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-	}
+    //editing an existing document
+    // check permissions on the document
+    include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+    $udperms = new udperms();
+    $udperms->user = $modx->getLoginUserID();
+    $udperms->document = $id;
+    $udperms->role = $_SESSION['mgrRole'];
+
+    if(!$udperms->checkPermissions()) {
+        $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    }
 }
 
 // check to see if resource isn't locked
 if($lockedEl = $modx->elementIsLocked(7, $id)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
 }
 // end check for lock
 
@@ -78,74 +78,74 @@ 
 
 // get document groups for current user
 if($_SESSION['mgrDocgroups']) {
-	$docgrp = implode(',', $_SESSION['mgrDocgroups']);
+    $docgrp = implode(',', $_SESSION['mgrDocgroups']);
 }
 
 if(!empty ($id)) {
-	$access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
-	if($docgrp) {
-		$access .= " OR dg.document_group IN ({$docgrp})";
-	}
-	$rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
-	$content = array();
-	$content = $modx->db->getRow($rs);
-	$modx->documentObject = &$content;
-	if(!$content) {
-		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-	}
-	$_SESSION['itemname'] = $content['pagetitle'];
+    $access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
+    if($docgrp) {
+        $access .= " OR dg.document_group IN ({$docgrp})";
+    }
+    $rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
+    $content = array();
+    $content = $modx->db->getRow($rs);
+    $modx->documentObject = &$content;
+    if(!$content) {
+        $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    }
+    $_SESSION['itemname'] = $content['pagetitle'];
 } else {
-	$content = array();
+    $content = array();
 
-	if(isset($_REQUEST['newtemplate'])) {
-		$content['template'] = $_REQUEST['newtemplate'];
-	} else {
-		$content['template'] = getDefaultTemplate();
-	}
+    if(isset($_REQUEST['newtemplate'])) {
+        $content['template'] = $_REQUEST['newtemplate'];
+    } else {
+        $content['template'] = getDefaultTemplate();
+    }
 
-	$_SESSION['itemname'] = $_lang["new_resource"];
+    $_SESSION['itemname'] = $_lang["new_resource"];
 }
 
 // restore saved form
 $formRestored = $modx->manager->loadFormValues();
 if(isset($_REQUEST['newtemplate'])) {
-	$formRestored = true;
+    $formRestored = true;
 }
 
 // retain form values if template was changed
 // edited to convert pub_date and unpub_date
 // sottwell 02-09-2006
 if($formRestored == true) {
-	$content = array_merge($content, $_POST);
-	$content['content'] = $_POST['ta'];
-	if(empty ($content['pub_date'])) {
-		unset ($content['pub_date']);
-	} else {
-		$content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
-	}
-	if(empty ($content['unpub_date'])) {
-		unset ($content['unpub_date']);
-	} else {
-		$content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
-	}
+    $content = array_merge($content, $_POST);
+    $content['content'] = $_POST['ta'];
+    if(empty ($content['pub_date'])) {
+        unset ($content['pub_date']);
+    } else {
+        $content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
+    }
+    if(empty ($content['unpub_date'])) {
+        unset ($content['unpub_date']);
+    } else {
+        $content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
+    }
 }
 
 // increase menu index if this is a new document
 if(!isset ($_REQUEST['id'])) {
-	if(!isset ($modx->config['auto_menuindex'])) {
-		$modx->config['auto_menuindex'] = 1;
-	}
-	if($modx->config['auto_menuindex']) {
-		$pid = (int)$_REQUEST['pid'];
-		$rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
-		$content['menuindex'] = $modx->db->getValue($rs);
-	} else {
-		$content['menuindex'] = 0;
-	}
+    if(!isset ($modx->config['auto_menuindex'])) {
+        $modx->config['auto_menuindex'] = 1;
+    }
+    if($modx->config['auto_menuindex']) {
+        $pid = (int)$_REQUEST['pid'];
+        $rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
+        $content['menuindex'] = $modx->db->getValue($rs);
+    } else {
+        $content['menuindex'] = 0;
+    }
 }
 
 if(isset ($_POST['which_editor'])) {
-	$modx->config['which_editor'] = $_POST['which_editor'];
+    $modx->config['which_editor'] = $_POST['which_editor'];
 }
 
 // Add lock-element JS-Script
@@ -545,23 +545,23 @@ 
 
 	<form name="mutate" id="mutate" class="content" method="post" enctype="multipart/form-data" action="index.php" onsubmit="documentDirty=false;">
 		<?php
-		// invoke OnDocFormPrerender event
-		$evtOut = $modx->invokeEvent('OnDocFormPrerender', array(
-			'id' => $id,
-			'template' => $content['template']
-		));
-
-		if(is_array($evtOut)) {
-			echo implode('', $evtOut);
-		}
-
-		/*************************/
-		$dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : '';
-		$sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'createdon';
-		$page = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : '';
-		/*************************/
-
-		?>
+        // invoke OnDocFormPrerender event
+        $evtOut = $modx->invokeEvent('OnDocFormPrerender', array(
+            'id' => $id,
+            'template' => $content['template']
+        ));
+
+        if(is_array($evtOut)) {
+            echo implode('', $evtOut);
+        }
+
+        /*************************/
+        $dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : '';
+        $sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'createdon';
+        $page = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : '';
+        /*************************/
+
+        ?>
 		<input type="hidden" name="a" value="5" />
 		<input type="hidden" name="id" value="<?= $content['id'] ?>" />
 		<input type="hidden" name="mode" value="<?= $modx->manager->action ?>" />
@@ -576,54 +576,54 @@ 
 
 			<h1>
 				<i class="fa fa-pencil-square-o"></i><?php if(isset($_REQUEST['id'])) {
-					echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
-				} else {
-				    if ($modx->manager->action == '4') {
+                    echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
+                } else {
+                    if ($modx->manager->action == '4') {
                         echo $_lang['add_resource'];
                     } else if ($modx->manager->action == '72') {
                         echo $_lang['add_weblink'];
                     } else {
                         echo $_lang['create_resource_title'];
                     }
-				} ?>
+                } ?>
 			</h1>
 
 			<?= $_style['actionbuttons']['dynamic']['document'] ?>
 
 			<?php
-			// breadcrumbs
-			if($modx->config['use_breadcrumbs']) {
-				$temp = array();
-				$title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
-
-				if(isset($_REQUEST['id']) && $content['parent'] != 0) {
-					$bID = (int) $_REQUEST['id'];
-					$temp = $modx->getParentIds($bID);
-				} else if(isset($_REQUEST['pid'])) {
-					$bID = (int) $_REQUEST['pid'];
-					$temp = $modx->getParentIds($bID);
-					array_unshift($temp, $bID);
-				}
-
-				if($temp) {
-					$parents = implode(',', $temp);
-
-					if(!empty($parents)) {
-						$where = "FIND_IN_SET(id,'{$parents}') DESC";
-						$rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
-						while($row = $modx->db->getRow($rs)) {
-							$out .= '<li class="breadcrumbs__li">
+            // breadcrumbs
+            if($modx->config['use_breadcrumbs']) {
+                $temp = array();
+                $title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
+
+                if(isset($_REQUEST['id']) && $content['parent'] != 0) {
+                    $bID = (int) $_REQUEST['id'];
+                    $temp = $modx->getParentIds($bID);
+                } else if(isset($_REQUEST['pid'])) {
+                    $bID = (int) $_REQUEST['pid'];
+                    $temp = $modx->getParentIds($bID);
+                    array_unshift($temp, $bID);
+                }
+
+                if($temp) {
+                    $parents = implode(',', $temp);
+
+                    if(!empty($parents)) {
+                        $where = "FIND_IN_SET(id,'{$parents}') DESC";
+                        $rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
+                        while($row = $modx->db->getRow($rs)) {
+                            $out .= '<li class="breadcrumbs__li">
                                 <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a>
                                 <span class="breadcrumbs__sep">&gt;</span>
                             </li>';
-						}
-					}
-				}
+                        }
+                    }
+                }
 
-				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
-				echo '<ul class="breadcrumbs">' . $out . '</ul>';
-			}
-			?>
+                $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
+                echo '<ul class="breadcrumbs">' . $out . '</ul>';
+            }
+            ?>
 
 			<!-- start main wrapper -->
 			<div class="sectionBody">
@@ -635,13 +635,13 @@ 
 
 					<!-- General -->
 					<?php
-					$evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
-						'id' => $id
-					));
-					if(is_array($evtOut)) {
-						echo implode('', $evtOut);
-					} else {
-						?>
+                    $evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
+                        'id' => $id
+                    ));
+                    if(is_array($evtOut)) {
+                        echo implode('', $evtOut);
+                    } else {
+                        ?>
 						<div class="tab-page" id="tabGeneral">
 							<h2 class="tab"><?= $_lang['settings_general'] ?></h2>
 							<script type="text/javascript">tpSettings.addTabPage(document.getElementById("tabGeneral"));</script>
@@ -726,36 +726,36 @@ 
 										<select id="template" name="template" class="inputBox" onchange="templateWarning();">
 											<option value="0">(blank)</option>
 											<?php
-											$field = "t.templatename, t.selectable, t.id, c.category";
-											$from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
-											$rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC');
-											$currentCategory = '';
-											while($row = $modx->db->getRow($rs)) {
-												if($row['selectable'] != 1 && $row['id'] != $content['template']) {
-													continue;
-												};
-												// Skip if not selectable but show if selected!
-												$thisCategory = $row['category'];
-												if($thisCategory == null) {
-													$thisCategory = $_lang["no_category"];
-												}
-												if($thisCategory != $currentCategory) {
-													if($closeOptGroup) {
-														echo "\t\t\t\t\t</optgroup>\n";
-													}
-													echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
-													$closeOptGroup = true;
-												}
+                                            $field = "t.templatename, t.selectable, t.id, c.category";
+                                            $from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
+                                            $rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC');
+                                            $currentCategory = '';
+                                            while($row = $modx->db->getRow($rs)) {
+                                                if($row['selectable'] != 1 && $row['id'] != $content['template']) {
+                                                    continue;
+                                                };
+                                                // Skip if not selectable but show if selected!
+                                                $thisCategory = $row['category'];
+                                                if($thisCategory == null) {
+                                                    $thisCategory = $_lang["no_category"];
+                                                }
+                                                if($thisCategory != $currentCategory) {
+                                                    if($closeOptGroup) {
+                                                        echo "\t\t\t\t\t</optgroup>\n";
+                                                    }
+                                                    echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
+                                                    $closeOptGroup = true;
+                                                }
 
-												$selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
+                                                $selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
 
-												echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
-												$currentCategory = $thisCategory;
-											}
-											if($thisCategory != '') {
-												echo "\t\t\t\t\t</optgroup>\n";
-											}
-											?>
+                                                echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
+                                                $currentCategory = $thisCategory;
+                                            }
+                                            if($thisCategory != '') {
+                                                echo "\t\t\t\t\t</optgroup>\n";
+                                            }
+                                            ?>
 										</select>
 									</td>
 								</tr>
@@ -795,37 +795,37 @@ 
 									</td>
 									<td valign="top">
 										<?php
-										$parentlookup = false;
-										if(isset ($_REQUEST['id'])) {
-											if($content['parent'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $content['parent'];
-											}
-										} elseif(isset ($_REQUEST['pid'])) {
-											if($_REQUEST['pid'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $_REQUEST['pid'];
-											}
-										} elseif(isset($_POST['parent'])) {
-											if($_POST['parent'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $_POST['parent'];
-											}
-										} else {
-											$parentname = $site_name;
-											$content['parent'] = 0;
-										}
-										if($parentlookup !== false && is_numeric($parentlookup)) {
-											$rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
-											$parentname = $modx->db->getValue($rs);
-											if(!$parentname) {
-												$modx->webAlertAndQuit($_lang["error_no_parent"]);
-											}
-										}
-										?>
+                                        $parentlookup = false;
+                                        if(isset ($_REQUEST['id'])) {
+                                            if($content['parent'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $content['parent'];
+                                            }
+                                        } elseif(isset ($_REQUEST['pid'])) {
+                                            if($_REQUEST['pid'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $_REQUEST['pid'];
+                                            }
+                                        } elseif(isset($_POST['parent'])) {
+                                            if($_POST['parent'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $_POST['parent'];
+                                            }
+                                        } else {
+                                            $parentname = $site_name;
+                                            $content['parent'] = 0;
+                                        }
+                                        if($parentlookup !== false && is_numeric($parentlookup)) {
+                                            $rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
+                                            $parentname = $modx->db->getValue($rs);
+                                            if(!$parentname) {
+                                                $modx->webAlertAndQuit($_lang["error_no_parent"]);
+                                            }
+                                        }
+                                        ?>
 										<i id="plock" class="<?= $_style["actions_folder"] ?>" onclick="enableParentSelection(!allowParentSelection);"></i>
 										<b><span id="parentName"><?= (isset($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']) ?> (<?= $parentname ?>)</span></b>
 										<input type="hidden" name="parent" value="<?= (isset($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']) ?>" onchange="documentDirty=true;" />
@@ -833,7 +833,7 @@ 
 								</tr>
 								<tr></tr>
 								<?php
-								/*
+                                /*
 								if($content['type'] == 'reference' || $modx->manager->action == '72') {
 									?>
 									<tr>
@@ -861,7 +861,7 @@ 
 									</tr>
 									<?php
 								}*/
-								?>
+                                ?>
 
 								<?php if($content['type'] == 'document' || $modx->manager->action == '4') { ?>
 									<tr>
@@ -874,36 +874,36 @@ 
 													<select id="which_editor" class="form-control form-control-sm" size="1" name="which_editor" onchange="changeRTE();">
 													<option value="none"><?= $_lang['none'] ?></option>
 														<?php
-														// invoke OnRichTextEditorRegister event
-														$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-														if(is_array($evtOut)) {
-															for($i = 0; $i < count($evtOut); $i++) {
-																$editor = $evtOut[$i];
-																echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
-															}
-														}
-														?>
+                                                        // invoke OnRichTextEditorRegister event
+                                                        $evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
+                                                        if(is_array($evtOut)) {
+                                                            for($i = 0; $i < count($evtOut); $i++) {
+                                                                $editor = $evtOut[$i];
+                                                                echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
+                                                            }
+                                                        }
+                                                        ?>
 													</select>
 												</label>
 											</div>
 											<div id="content_body">
 												<?php
-												if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
-													$htmlContent = $content['content'];
-													?>
+                                                if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
+                                                    $htmlContent = $content['content'];
+                                                    ?>
 													<div class="section-editor clearfix">
 														<textarea id="ta" name="ta" onchange="documentDirty=true;"><?= $modx->htmlspecialchars($htmlContent) ?></textarea>
 													</div>
 													<?php
-													// Richtext-[*content*]
-													$richtexteditorIds = array();
-													$richtexteditorOptions = array();
-													$richtexteditorIds[$modx->config['which_editor']][] = 'ta';
-													$richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
-												} else {
-													echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
-												}
-												?>
+                                                    // Richtext-[*content*]
+                                                    $richtexteditorIds = array();
+                                                    $richtexteditorOptions = array();
+                                                    $richtexteditorIds[$modx->config['which_editor']][] = 'ta';
+                                                    $richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
+                                                } else {
+                                                    echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
+                                                }
+                                                ?>
 											</div>
 										</td>
 									</tr>
@@ -1190,8 +1190,8 @@ 
 
 								<?php
 
-								if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
-									?>
+                                if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
+                                    ?>
 									<tr>
 										<td>
 											<span class="warning"><?= $_lang['resource_type'] ?></span>
@@ -1213,15 +1213,15 @@ 
 										<td>
 											<select name="contentType" class="inputBox" onchange="documentDirty=true;">
 												<?php
-												if(!$content['contentType']) {
-													$content['contentType'] = 'text/html';
-												}
-												$custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
-												$ct = explode(",", $custom_contenttype);
-												for($i = 0; $i < count($ct); $i++) {
-													echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
-												}
-												?>
+                                                if(!$content['contentType']) {
+                                                    $content['contentType'] = 'text/html';
+                                                }
+                                                $custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
+                                                $ct = explode(",", $custom_contenttype);
+                                                for($i = 0; $i < count($ct); $i++) {
+                                                    echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
+                                                }
+                                                ?>
 											</select>
 										</td>
 									</tr>
@@ -1244,23 +1244,23 @@ 
 										</td>
 									</tr>
 									<?php
-								} else {
-									if($content['type'] != 'reference' && $modx->manager->action != '72') {
-										// non-admin managers creating or editing a document resource
-										?>
+                                } else {
+                                    if($content['type'] != 'reference' && $modx->manager->action != '72') {
+                                        // non-admin managers creating or editing a document resource
+                                        ?>
 										<input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" />
 										<input type="hidden" name="type" value="document" />
 										<input type="hidden" name="content_dispo" value="<?= (isset($content['content_dispo']) ? $content['content_dispo'] : '0') ?>" />
 										<?php
-									} else {
-										// non-admin managers creating or editing a reference (weblink) resource
-										?>
+                                    } else {
+                                        // non-admin managers creating or editing a reference (weblink) resource
+                                        ?>
 										<input type="hidden" name="type" value="reference" />
 										<input type="hidden" name="contentType" value="text/html" />
 										<?php
-									}
-								}//if mgrRole
-								?>
+                                    }
+                                }//if mgrRole
+                                ?>
 
 								<tr>
 									<td>
@@ -1343,112 +1343,112 @@ 
                     ?>
 
 						<?php
-					/*******************************
+                    /*******************************
 					 * Document Access Permissions */
-					if($use_udperms == 1) {
-						$groupsarray = array();
-						$sql = '';
-
-						$documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
-						if($documentId > 0) {
-							// Load up, the permissions from the parent (if new document) or existing document
-							$rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
-
-							// Load up the current permissions and names
-							$vs = array(
-								$tbl_document_group_names,
-								$tbl_document_groups,
-								$documentId
-							);
-							$from = vsprintf("%s AS dgn LEFT JOIN %s AS groups ON groups.document_group=dgn.id AND groups.document='%s'", $vs);
-							$rs = $modx->db->select('dgn.*, groups.id AS link_id', $from, '', 'name');
-						} else {
-							// Just load up the names, we're starting clean
-							$rs = $modx->db->select('*, NULL AS link_id', $tbl_document_group_names, '', 'name');
-						}
-
-						// retain selected doc groups between post
-						if(isset($_POST['docgroups'])) {
-							$groupsarray = array_merge($groupsarray, $_POST['docgroups']);
-						}
+                    if($use_udperms == 1) {
+                        $groupsarray = array();
+                        $sql = '';
+
+                        $documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
+                        if($documentId > 0) {
+                            // Load up, the permissions from the parent (if new document) or existing document
+                            $rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
+                            while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+
+                            // Load up the current permissions and names
+                            $vs = array(
+                                $tbl_document_group_names,
+                                $tbl_document_groups,
+                                $documentId
+                            );
+                            $from = vsprintf("%s AS dgn LEFT JOIN %s AS groups ON groups.document_group=dgn.id AND groups.document='%s'", $vs);
+                            $rs = $modx->db->select('dgn.*, groups.id AS link_id', $from, '', 'name');
+                        } else {
+                            // Just load up the names, we're starting clean
+                            $rs = $modx->db->select('*, NULL AS link_id', $tbl_document_group_names, '', 'name');
+                        }
+
+                        // retain selected doc groups between post
+                        if(isset($_POST['docgroups'])) {
+                            $groupsarray = array_merge($groupsarray, $_POST['docgroups']);
+                        }
+
+                        $isManager = $modx->hasPermission('access_permissions');
+                        $isWeb = $modx->hasPermission('web_access_permissions');
+
+                        // Setup Basic attributes for each Input box
+                        $inputAttributes = array(
+                            'type' => 'checkbox',
+                            'class' => 'checkbox',
+                            'name' => 'docgroups[]',
+                            'onclick' => 'makePublic(false);',
+                        );
+                        $permissions = array(); // New Permissions array list (this contains the HTML)
+                        $permissions_yes = 0; // count permissions the current mgr user has
+                        $permissions_no = 0; // count permissions the current mgr user doesn't have
+
+                        // Loop through the permissions list
+                        while($row = $modx->db->getRow($rs)) {
+
+                            // Create an inputValue pair (group ID and group link (if it exists))
+                            $inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
+                            $inputId = 'group-' . $row['id'];
+
+                            $checked = in_array($inputValue, $groupsarray);
+                            if($checked) {
+                                $notPublic = true;
+                            } // Mark as private access (either web or manager)
+
+                            // Skip the access permission if the user doesn't have access...
+                            if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
+                                continue;
+                            }
 
-						$isManager = $modx->hasPermission('access_permissions');
-						$isWeb = $modx->hasPermission('web_access_permissions');
-
-						// Setup Basic attributes for each Input box
-						$inputAttributes = array(
-							'type' => 'checkbox',
-							'class' => 'checkbox',
-							'name' => 'docgroups[]',
-							'onclick' => 'makePublic(false);',
-						);
-						$permissions = array(); // New Permissions array list (this contains the HTML)
-						$permissions_yes = 0; // count permissions the current mgr user has
-						$permissions_no = 0; // count permissions the current mgr user doesn't have
-
-						// Loop through the permissions list
-						while($row = $modx->db->getRow($rs)) {
-
-							// Create an inputValue pair (group ID and group link (if it exists))
-							$inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
-							$inputId = 'group-' . $row['id'];
-
-							$checked = in_array($inputValue, $groupsarray);
-							if($checked) {
-								$notPublic = true;
-							} // Mark as private access (either web or manager)
-
-							// Skip the access permission if the user doesn't have access...
-							if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
-								continue;
-							}
-
-							// Setup attributes for this Input box
-							$inputAttributes['id'] = $inputId;
-							$inputAttributes['value'] = $inputValue;
-							if($checked) {
-								$inputAttributes['checked'] = 'checked';
-							} else {
-								unset($inputAttributes['checked']);
-							}
-
-							// Create attribute string list
-							$inputString = array();
-							foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
-
-							// Make the <input> HTML
-							$inputHTML = '<input ' . implode(' ', $inputString) . ' />';
-
-							// does user have this permission?
-							$from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
-							$vs = array(
-								$row['id'],
-								$_SESSION['mgrInternalKey']
-							);
-							$where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
-							$rsp = $modx->db->select('COUNT(mg.id)', $from, $where);
-							$count = $modx->db->getValue($rsp);
-							if($count > 0) {
-								++$permissions_yes;
-							} else {
-								++$permissions_no;
-							}
-							$permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
-						}
-						// if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
-						if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
-							$permissions = array();
-						}
+                            // Setup attributes for this Input box
+                            $inputAttributes['id'] = $inputId;
+                            $inputAttributes['value'] = $inputValue;
+                            if($checked) {
+                                $inputAttributes['checked'] = 'checked';
+                            } else {
+                                unset($inputAttributes['checked']);
+                            }
 
-						// See if the Access Permissions section is worth displaying...
-						if(!empty($permissions)) {
-							// Add the "All Document Groups" item if we have rights in both contexts
-							if($isManager && $isWeb) {
-								array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
-							}
-							// Output the permissions list...
-							?>
+                            // Create attribute string list
+                            $inputString = array();
+                            foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
+
+                            // Make the <input> HTML
+                            $inputHTML = '<input ' . implode(' ', $inputString) . ' />';
+
+                            // does user have this permission?
+                            $from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
+                            $vs = array(
+                                $row['id'],
+                                $_SESSION['mgrInternalKey']
+                            );
+                            $where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
+                            $rsp = $modx->db->select('COUNT(mg.id)', $from, $where);
+                            $count = $modx->db->getValue($rsp);
+                            if($count > 0) {
+                                ++$permissions_yes;
+                            } else {
+                                ++$permissions_no;
+                            }
+                            $permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
+                        }
+                        // if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
+                        if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
+                            $permissions = array();
+                        }
+
+                        // See if the Access Permissions section is worth displaying...
+                        if(!empty($permissions)) {
+                            // Add the "All Document Groups" item if we have rights in both contexts
+                            if($isManager && $isWeb) {
+                                array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
+                            }
+                            // Output the permissions list...
+                            ?>
 							<!-- Access Permissions -->
 							<div class="tab-page" id="tabAccess">
 								<h2 class="tab" id="tab_access_header"><?= $_lang['access_permissions'] ?></h2>
@@ -1482,31 +1482,31 @@ 
 								</ul>
 							</div><!--div class="tab-page" id="tabAccess"-->
 							<?php
-						} // !empty($permissions)
-						elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
-							?>
+                        } // !empty($permissions)
+                        elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
+                            ?>
 							<p><?= $_lang["access_permissions_docs_collision"] ?></p>
 							<?php
 
-						}
-					}
-					/* End Document Access Permissions *
+                        }
+                    }
+                    /* End Document Access Permissions *
 					 ***********************************/
-					?>
+                    ?>
 
 					<input type="submit" name="save" style="display:none" />
 					<?php
 
-					// invoke OnDocFormRender event
-					$evtOut = $modx->invokeEvent('OnDocFormRender', array(
-						'id' => $id,
-						'template' => $content['template']
-					));
+                    // invoke OnDocFormRender event
+                    $evtOut = $modx->invokeEvent('OnDocFormRender', array(
+                        'id' => $id,
+                        'template' => $content['template']
+                    ));
 
-					if(is_array($evtOut)) {
-						echo implode('', $evtOut);
-					}
-					?>
+                    if(is_array($evtOut)) {
+                        echo implode('', $evtOut);
+                    }
+                    ?>
 				</div><!--div class="tab-pane" id="documentPane"-->
 			</div><!--div class="sectionBody"-->
 		</fieldset>
@@ -1517,63 +1517,63 @@ 
 	</script>
 <?php
 if(($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) {
-	if(is_array($richtexteditorIds)) {
-		foreach($richtexteditorIds as $editor => $elements) {
-			// invoke OnRichTextEditorInit event
-			$evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
-				'editor' => $editor,
-				'elements' => $elements,
-				'options' => $richtexteditorOptions[$editor]
-			));
-			if(is_array($evtOut)) {
-				echo implode('', $evtOut);
-			}
-		}
-	}
+    if(is_array($richtexteditorIds)) {
+        foreach($richtexteditorIds as $editor => $elements) {
+            // invoke OnRichTextEditorInit event
+            $evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
+                'editor' => $editor,
+                'elements' => $elements,
+                'options' => $richtexteditorOptions[$editor]
+            ));
+            if(is_array($evtOut)) {
+                echo implode('', $evtOut);
+            }
+        }
+    }
 }
 
 /**
  * @return string
  */
 function getDefaultTemplate() {
-	global $modx;
+    global $modx;
 
     $default_template = '';
-	switch($modx->config['auto_template_logic']) {
-		case 'sibling':
-			if(!isset($_GET['pid']) || empty($_GET['pid'])) {
-				$site_start = $modx->config['site_start'];
-				$where = "sc.isfolder=0 AND sc.id!='{$site_start}'";
-				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
-					$default_template = $sibl[0]['template'];
-				}
-			} else {
-				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
-					$default_template = $sibl[0]['template'];
-				} else {
-					$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-					if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
-						$default_template = $sibl[0]['template'];
-					}
-				}
-			}
-			if(isset($default_template)) {
-				break;
-			} // If $default_template could not be determined, fall back / through to "parent"-mode
-		case 'parent':
-			if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
-				$parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template');
-				if(isset($parent['template'])) {
-					$default_template = $parent['template'];
-				}
-			}
-			break;
-		case 'system':
-		default: // default_template is already set
-			$default_template = $modx->config['default_template'];
-	}
-
-	return empty($default_template) ? $modx->config['default_template'] : $default_template;
+    switch($modx->config['auto_template_logic']) {
+        case 'sibling':
+            if(!isset($_GET['pid']) || empty($_GET['pid'])) {
+                $site_start = $modx->config['site_start'];
+                $where = "sc.isfolder=0 AND sc.id!='{$site_start}'";
+                $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
+                if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                    $default_template = $sibl[0]['template'];
+                }
+            } else {
+                $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
+                if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                    $default_template = $sibl[0]['template'];
+                } else {
+                    $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
+                    if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                        $default_template = $sibl[0]['template'];
+                    }
+                }
+            }
+            if(isset($default_template)) {
+                break;
+            } // If $default_template could not be determined, fall back / through to "parent"-mode
+        case 'parent':
+            if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
+                $parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template');
+                if(isset($parent['template'])) {
+                    $default_template = $parent['template'];
+                }
+            }
+            break;
+        case 'system':
+        default: // default_template is already set
+            $default_template = $modx->config['default_template'];
+    }
+
+    return empty($default_template) ? $modx->config['default_template'] : $default_template;
 }

manager/actions/mutate_module.dynamic.php

Indentation +94 added lines, -94 removed lines

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

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

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

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

 }

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

-	case 107:

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

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

-		}

-		break;

-	case 108:

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

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

-		}

-		break;

-	default:

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

+    case 107:

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

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

+        }

+        break;

+    case 108:

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

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

+        }

+        break;

+    default:

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

 }

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

 // Get table names (alphabetical)

@@ -34,16 +34,16 @@ 
  * @return string

  */

 function createGUID() {

-	srand((double) microtime() * 1000000);

-	$r = rand();

-	$u = uniqid(getmypid() . $r . (double) microtime() * 1000000, 1);

-	$m = md5($u);

-	return $m;

+    srand((double) microtime() * 1000000);

+    $r = rand();

+    $u = uniqid(getmypid() . $r . (double) microtime() * 1000000, 1);

+    $m = md5($u);

+    return $m;

 }

 

 // check to see the module editor isn't locked

 if($lockedEl = $modx->elementIsLocked(6, $id)) {

-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));

+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));

 }

 // end check for lock

 

@@ -51,22 +51,22 @@ 
 $modx->lockElement(6, $id);

 

 if(isset($_GET['id'])) {

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

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

-	if(!$content) {

-		$modx->webAlertAndQuit("Module not found for id '{$id}'.");

-	}

-	$content['properties'] = str_replace("&", "&amp;", $content['properties']);

-	$_SESSION['itemname'] = $content['name'];

-	if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {

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

-	}

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

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

+    if(!$content) {

+        $modx->webAlertAndQuit("Module not found for id '{$id}'.");

+    }

+    $content['properties'] = str_replace("&", "&amp;", $content['properties']);

+    $_SESSION['itemname'] = $content['name'];

+    if($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {

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

+    }

 } else {

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

-	$content['wrap'] = '1';

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

+    $content['wrap'] = '1';

 }

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

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

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

 }

 

 // Add lock-element JS-Script

@@ -437,18 +437,18 @@ 
 

 <form name="mutate" id="mutate" class="module" method="post" action="index.php?a=109">

 	<?php

-	// invoke OnModFormPrerender event

-	$evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));

-	if(is_array($evtOut)) {

-		echo implode('', $evtOut);

-	}

-

-	// Prepare internal params & info-tab via parseDocBlock

-	$modulecode = isset($content['modulecode']) ? $modx->db->escape($content['modulecode']) : '';

-	$docBlock = $modx->parseDocBlockFromString($modulecode);

-	$docBlockList = $modx->convertDocBlockIntoList($docBlock);

-	$internal = array();

-	?>

+    // invoke OnModFormPrerender event

+    $evtOut = $modx->invokeEvent('OnModFormPrerender', array('id' => $id));

+    if(is_array($evtOut)) {

+        echo implode('', $evtOut);

+    }

+

+    // Prepare internal params & info-tab via parseDocBlock

+    $modulecode = isset($content['modulecode']) ? $modx->db->escape($content['modulecode']) : '';

+    $docBlock = $modx->parseDocBlockFromString($modulecode);

+    $docBlockList = $modx->convertDocBlockIntoList($docBlock);

+    $internal = array();

+    ?>

 	<input type="hidden" name="id" value="<?= $content['id'] ?>">

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

 

@@ -501,11 +501,11 @@ 
 							<select name="categoryid" class="form-control" onchange="documentDirty=true;">

 								<option>&nbsp;</option>

 								<?php

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

-								foreach(getCategories() as $n => $v) {

-									echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";

-								}

-								?>

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

+                                foreach(getCategories() as $n => $v) {

+                                    echo "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";

+                                }

+                                ?>

 							</select>

 						</div>

 					</div>

@@ -612,7 +612,7 @@ 
 							<i class="<?= $_style["actions_save"] ?>"></i> <?= $_lang['manage_depends'] ?></a>

 					</div>

 					<?php

-					$ds = $modx->db->select("smd.id, COALESCE(ss.name,st.templatename,sv.name,sc.name,sp.name,sd.pagetitle) AS name, 

+                    $ds = $modx->db->select("smd.id, COALESCE(ss.name,st.templatename,sv.name,sc.name,sp.name,sd.pagetitle) AS name, 

 					CASE smd.type

 						WHEN 10 THEN 'Chunk'

 						WHEN 20 THEN 'Document'

@@ -628,17 +628,17 @@ 
 						LEFT JOIN {$tbl_site_templates} AS st ON st.id = smd.resource AND smd.type = 50

 						LEFT JOIN {$tbl_site_tmplvars} AS sv ON sv.id = smd.resource AND smd.type = 60", "smd.module='{$id}'", 'smd.type,name');

 

-					include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";

-					$grd = new DataGrid('', $ds, 0); // set page size to 0 t show all items

-					$grd->noRecordMsg = $_lang['no_records_found'];

-					$grd->cssClass = 'grid';

-					$grd->columnHeaderClass = 'gridHeader';

-					$grd->itemClass = 'gridItem';

-					$grd->altItemClass = 'gridAltItem';

-					$grd->columns = $_lang['element_name'] . " ," . $_lang['type'];

-					$grd->fields = "name,type";

-					echo $grd->render();

-					?>

+                    include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";

+                    $grd = new DataGrid('', $ds, 0); // set page size to 0 t show all items

+                    $grd->noRecordMsg = $_lang['no_records_found'];

+                    $grd->cssClass = 'grid';

+                    $grd->columnHeaderClass = 'gridHeader';

+                    $grd->itemClass = 'gridItem';

+                    $grd->altItemClass = 'gridAltItem';

+                    $grd->columns = $_lang['element_name'] . " ," . $_lang['type'];

+                    $grd->fields = "name,type";

+                    echo $grd->render();

+                    ?>

 				</div>

 			</div>

 		<?php endif; ?>

@@ -650,12 +650,12 @@ 
 			<div class="container container-body">

 				<?php if($use_udperms == 1) : ?>

 					<?php

-					// fetch user access permissions for the module

-					$rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'");

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

+                    // fetch user access permissions for the module

+                    $rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'");

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

 

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

-						?>

+                    if($modx->hasPermission('access_permissions')) {

+                        ?>

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

 							function makePublic(b) {

@@ -679,28 +679,28 @@ 
 						</script>

 						<p><?= $_lang['module_group_access_msg'] ?></p>

 						<?php

-					}

-					$chk = '';

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

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

-						$groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();

-						$checked = in_array($row['id'], $groupsarray);

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

-							if($checked) {

-								$notPublic = true;

-							}

-							$chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n";

-						} else {

-							if($checked) {

-								$chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;

-							}

-						}

-					}

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

-						$chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks;

-					}

-					echo $chks;

-					?>

+                    }

+                    $chk = '';

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

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

+                        $groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();

+                        $checked = in_array($row['id'], $groupsarray);

+                        if($modx->hasPermission('access_permissions')) {

+                            if($checked) {

+                                $notPublic = true;

+                            }

+                            $chks .= '<label><input type="checkbox" name="usrgroups[]" value="' . $row['id'] . '"' . ($checked ? ' checked="checked"' : '') . ' onclick="makePublic(false)" /> ' . $row['name'] . "</label><br />\n";

+                        } else {

+                            if($checked) {

+                                $chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;

+                            }

+                        }

+                    }

+                    if($modx->hasPermission('access_permissions')) {

+                        $chks = '<label><input type="checkbox" name="chkallgroups"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true)" /><span class="warning"> ' . $_lang['all_usr_groups'] . '</span></label><br />' . "\n" . $chks;

+                    }

+                    echo $chks;

+                    ?>

 				<?php endif; ?>

 			</div>

 		</div>

@@ -716,11 +716,11 @@ 
 

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

 		<?php

-		// invoke OnModFormRender event

-		$evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id));

-		if(is_array($evtOut)) {

-			echo implode('', $evtOut);

-		}

-		?>

+        // invoke OnModFormRender event

+        $evtOut = $modx->invokeEvent('OnModFormRender', array('id' => $id));

+        if(is_array($evtOut)) {

+            echo implode('', $evtOut);

+        }

+        ?>

 </form>

 <script type="text/javascript">setTimeout('showParameters();', 10);</script>