evolution-cms / evolution

install/actions/action_options.php

Spacing +21 added lines, -21 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
 
-if( ! function_exists('getTemplates')) {
+if (!function_exists('getTemplates')) {
     /**
      * @param array $presets
      * @return string
@@ -26,12 +26,12 @@ 
             $i++;
         }
         if (0 < count($_)) {
-            return '<h3>[%templates%]</h3>' . implode("\n", $_);
+            return '<h3>[%templates%]</h3>'.implode("\n", $_);
         }
     }
 }
 
-if( ! function_exists('getTVs')) {
+if (!function_exists('getTVs')) {
     /**
      * @param array $presets
      * @return string
@@ -57,12 +57,12 @@ 
             $i++;
         }
         if (0 < count($_)) {
-            return '<h3>[%tvs%]</h3>' . implode("\n", $_);
+            return '<h3>[%tvs%]</h3>'.implode("\n", $_);
         }
     }
 }
 
-if( ! function_exists('getChunks')) {
+if (!function_exists('getChunks')) {
     /**
      * display chunks
      *
@@ -89,12 +89,12 @@ 
             $i++;
         }
         if (0 < count($_)) {
-            return '<h3>[%chunks%]</h3>' . implode("\n", $_);
+            return '<h3>[%chunks%]</h3>'.implode("\n", $_);
         }
     }
 }
 
-if( ! function_exists('getModules')) {
+if (!function_exists('getModules')) {
     /**
      * display modules
      *
@@ -121,12 +121,12 @@ 
             $i++;
         }
         if (0 < count($_)) {
-            return '<h3>[%modules%]</h3>' . implode("\n", $_);
+            return '<h3>[%modules%]</h3>'.implode("\n", $_);
         }
     }
 }
 
-if( ! function_exists('getPlugins')) {
+if (!function_exists('getPlugins')) {
     /**
      * display plugins
      *
@@ -157,12 +157,12 @@ 
             $i++;
         }
         if (0 < count($_)) {
-            return '<h3>[%plugins%]</h3>' . implode("\n", $_);
+            return '<h3>[%plugins%]</h3>'.implode("\n", $_);
         }
     }
 }
 
-if( ! function_exists('getSnippets')) {
+if (!function_exists('getSnippets')) {
     /**
      * display snippets
      *
@@ -189,24 +189,24 @@ 
             $i++;
         }
         if (0 < count($_)) {
-            return '<h3>[%snippets%]</h3>' . implode("\n", $_);
+            return '<h3>[%snippets%]</h3>'.implode("\n", $_);
         }
     }
 }
 
-switch($installMode){
+switch ($installMode) {
     case 0:
     case 2:
         $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci';
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $_POST['database_connection_charset'] = $database_charset;
-        if(empty($_SESSION['databaseloginpassword']))
+        if (empty($_SESSION['databaseloginpassword']))
             $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword'];
-        if(empty($_SESSION['databaseloginname']))
+        if (empty($_SESSION['databaseloginname']))
             $_SESSION['databaseloginname'] = $_POST['databaseloginname'];
         break;
     case 1:
-        include $base_path . MGR_DIR . '/includes/config.inc.php';
+        include $base_path.MGR_DIR.'/includes/config.inc.php';
         if (@ $conn = mysqli_connect($database_server, $database_user, $database_password)) {
             if (@ mysqli_query($conn, "USE {$dbase}")) {
                 if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) {
@@ -261,7 +261,7 @@ 
 $ph['checked'] = isset ($_POST['installdata']) && $_POST['installdata'] == "1" ? 'checked' : '';
 
 # load setup information file
-include($base_path . 'install/setup.info.php');
+include($base_path.'install/setup.info.php');
 $ph['templates'] = getTemplates($moduleTemplates);
 $ph['tvs']       = getTVs($moduleTVs);
 $ph['chunks']    = getChunks($moduleChunks);
@@ -271,6 +271,6 @@ 
 
 $ph['action'] = ($installMode == 1) ? 'mode' : 'connection';
 
-$tpl = file_get_contents($base_path . 'install/actions/tpl_options.html');
-$content = parse($tpl,$ph);
-echo parse($content,$_lang,'[%','%]');
+$tpl = file_get_contents($base_path.'install/actions/tpl_options.html');
+$content = parse($tpl, $ph);
+echo parse($content, $_lang, '[%', '%]');

manager/actions/resources/functions.inc.php

Spacing +49 added lines, -49 removed lines

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

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

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

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

 }

 

 $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')

 );

 

-function parsePh($tpl, $ph) {

+function parsePh($tpl, $ph){

 	global $modx, $_lang;

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

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

 }

 

-function renderViewSwitchButtons($cssId) {

+function renderViewSwitchButtons($cssId){

 	global $modx, $_lang, $tpl;

 

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

@@ -25,19 +25,19 @@ 
 	));

 }

 

-function createResourceList($resourceTable, $resources) {

+function createResourceList($resourceTable, $resources){

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

 

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

 

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

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

 		return $_lang['no_results'];

 	}

 

 	// Prepare elements- and categories-list

 	$elements = array();

 	$categories = array();

-	foreach($items as $row) {

+	foreach ($items as $row) {

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

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

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

@@ -45,18 +45,18 @@ 
 

 	// Now render categories / panel-collapse

 	$panelGroup = '';

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

+	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>' : '',

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

 			'catid' => $catid,

 		));

 

 		// Prepare content for panel-collapse

 		$panelCollapse = '';

-		foreach($elList as $el) {

+		foreach ($elList as $el) {

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

 		}

 

@@ -74,30 +74,30 @@ 
 	));

 }

 

-function createCombinedView($resources) {

+function createCombinedView($resources){

 	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;

 

-	if(!$itemsPerCategory) {

+	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'),

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

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

 		// Prepare collapse content / elements-list

 		$panelCollapse = '';

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

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

 			$resourceTable = $el['type'];

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

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

@@ -107,7 +107,7 @@ 
 		$panelGroup .= parsePh($tpl['panelHeading'], array(

 			'tab' => 'categories_list',

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

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

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

 			'catid' => $catid,

 		));

 

@@ -131,14 +131,14 @@ 
  * @param $resources

  * @return array

  */

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

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

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

 

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

 

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

 

-	switch($resourceTable){

+	switch ($resourceTable) {

         case 'site_templates':

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

             $lockElementType = 1;

@@ -175,65 +175,65 @@ 
 	// Prepare displaying user-locks

 	$lockedByUser = '';

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

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

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

+	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],

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

+			$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],

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

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

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

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

+	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 = !empty($row['description']) ? ' '.$row['description'] : '';

 	}

 

 	// Special marks

 	$tplInfo = array();

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

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

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

 	}

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

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

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

 	}

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

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

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

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

 

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

 

 	// Placeholders for elements-row

 	return array(

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

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

 		'lockedByUser' => $lockedByUser,

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

 		'caption' => $caption,

manager/actions/welcome.static.php

Spacing +65 added lines, -65 removed lines

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

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

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

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

 }

 

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

 

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

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

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

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

 }

@@ -16,50 +16,50 @@ 
 $_SESSION['nrnewmessages'] = 0;

 

 // setup message info

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

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

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

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

 	$_SESSION['nrtotalmessages'] = $nrtotalmessages;

 	$_SESSION['nrnewmessages'] = $nrnewmessages;

 

 	$msg = array();

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

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

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

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

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

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

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

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

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

 }

 

 // setup icons

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

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

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

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

 }

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

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

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

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

 }

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

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

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

 	$ph['ModulesIcon'] = 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')) {

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

 }

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

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

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

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

 }

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

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

 	$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']) {

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

@@ -70,8 +70,8 @@ 
 }

 

 // Check logout-reminder

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

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

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

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

 		case 'logout_reminder':

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

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

@@ -125,7 +125,7 @@ 
 	</tr>

 </table>';

 

-$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';

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

 

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

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

@@ -140,10 +140,10 @@ 
 $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";

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

 

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

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

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

 } else {

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

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

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

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

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

@@ -168,7 +168,7 @@ 
 	$userList = array();

 	$userCount = array();

 	// Create userlist with session-count first before output

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

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

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

 

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

@@ -186,9 +186,9 @@ 
 			$currentaction

 		);

 	}

-	foreach($userList as $params) {

+	foreach ($userList as $params) {

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

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

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

 	}

 

 	$html .= '

@@ -200,7 +200,7 @@ 
 $ph['OnlineInfo'] = $html;

 

 // include rss feeds for important forum topics

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

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

 $ph['modx_security_notices_content'] = $feedData['modx_security_notices_content'];

 $ph['modx_news_content'] = $feedData['modx_news_content'];

 

@@ -231,7 +231,7 @@ 
 

 // invoke event OnManagerWelcomePrerender

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

-if(is_array($evtOut)) {

+if (is_array($evtOut)) {

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

 	$ph['OnManagerWelcomePrerender'] = $output;

 }

@@ -365,57 +365,57 @@ 
 

 // invoke OnManagerWelcomeHome event

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

-if(is_array($sitewidgets)) {

+if (is_array($sitewidgets)) {

 	$newwidgets = array();

-    foreach($sitewidgets as $widget){

+    foreach ($sitewidgets as $widget) {

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

     }

     $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;

 }

 

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

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

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

 });

 

 $tpl = getTplWidget();

 $output = '';

-foreach($widgets as $widget) {

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

+foreach ($widgets as $widget) {

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

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

 	}

 }

 $ph['widgets'] = $output;

 

 // load template

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

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

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

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

 }

 

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

 $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);

 $target = $modx->mergeSettingsContent($target);

 

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

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

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

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

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

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

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

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

 	} else {

 		$content = '';

 	}

 } else {

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

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

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

 		$content = $chunk;

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

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

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

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

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

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

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

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

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

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

 	{

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

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

 	} else {

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

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

 	}

 }

 

@@ -423,7 +423,7 @@ 
 $content = $modx->mergeConditionalTagsContent($content);

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

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

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

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

 	$modx->toPlaceholders($ph);

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

 }

@@ -432,7 +432,7 @@ 
 $content = $modx->parseText($content, $_style, '[&', '&]');

 $content = $modx->cleanUpMODXTags($content); //cleanup

 

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

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

 	$content .= $js;

 }

 

@@ -442,7 +442,7 @@ 
 //	<a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a>

 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>

 //</span>

-function getTplWidget() { // recent document info

+function getTplWidget(){ // recent document info

 	return '

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

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

@@ -453,7 +453,7 @@ 
 ';

 }

 

-function getRecentInfo() { // recent document info

+function getRecentInfo(){ // recent document info

 	global $modx;

 

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

@@ -479,12 +479,12 @@ 
 	return $html;

 }

 

-function getRecentInfoList() {

+function getRecentInfoList(){

 	global $modx;

 

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

 

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

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

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

 	}

 

@@ -494,20 +494,20 @@ 
 	$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)) {

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

 		$docid = $ph['id'];

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

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

 

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

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

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

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

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

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

 		} else {

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

 		}

 

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

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

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

 		} else {

 			$ph['edit_btn'] = '';

@@ -522,8 +522,8 @@ 
 			$preview_disabled

 		), $btntpl['preview_btn']);

 

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

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

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

@@ -533,11 +533,11 @@ 
 			$ph['delete_btn'] = '';

 		}

 

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

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

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

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

@@ -546,16 +546,16 @@ 
 

 		$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'] == '') {

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

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

 		}

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

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

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

 		}

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

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

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

 		}

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

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

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

 		}

 

@@ -564,7 +564,7 @@ 
 	return implode("\n", $output);

 }

 

-function getRecentInfoRowTpl() {

+function getRecentInfoRowTpl(){

 	$tpl = '

 						<tr>

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

@@ -593,11 +593,11 @@ 
 }

 

 // setup icons

-function wrapIcon($i, $action) {

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

 }

 

-function getStartUpScript() {

+function getStartUpScript(){

 	$script = '

         <script type="text/javascript">

         function hideConfigCheckWarning(key) {

manager/actions/mutate_tmplvars.dynamic.php

Spacing +53 added lines, -53 removed lines

@@ -1,17 +1,17 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('edit_template') && $modx->manager->action == '301') {
+if (!$modx->hasPermission('edit_template') && $modx->manager->action == '301') {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
-if(!$modx->hasPermission('new_template') && $modx->manager->action == '300') {
+if (!$modx->hasPermission('new_template') && $modx->manager->action == '300') {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
-$origin = isset($_REQUEST['or']) ? (int)$_REQUEST['or'] : 76;
-$originId = isset($_REQUEST['oid']) ? (int)$_REQUEST['oid'] : NULL;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
+$origin = isset($_REQUEST['or']) ? (int) $_REQUEST['or'] : 76;
+$originId = isset($_REQUEST['oid']) ? (int) $_REQUEST['oid'] : NULL;
 
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 $tbl_site_templates = $modx->getFullTableName('site_templates');
@@ -19,7 +19,7 @@ 
 $tbl_documentgroup_names = $modx->getFullTableName('documentgroup_names');
 
 // check to see the snippet editor isn't locked
-if($lockedEl = $modx->elementIsLocked(2, $id)) {
+if ($lockedEl = $modx->elementIsLocked(2, $id)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar']));
 }
 // end check for lock
@@ -29,25 +29,25 @@ 
 
 global $content;
 $content = array();
-if(isset($_GET['id'])) {
+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}");
+	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) {
+	if ($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) {
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 	}
-} else if(isset($_REQUEST['itemname'])) {
+} else if (isset($_REQUEST['itemname'])) {
 	$content['name'] = $_REQUEST['itemname'];
 } else {
 	$_SESSION['itemname'] = $_lang["new_tmplvars"];
-	$content['category'] = (int)$_REQUEST['catid'];
+	$content['category'] = (int) $_REQUEST['catid'];
 }
 
-if($modx->manager->hasFormValues()) {
+if ($modx->manager->hasFormValues()) {
 	$modx->manager->loadFormValues();
 }
 
@@ -56,12 +56,12 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 2;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 
 // get available RichText Editors
 $RTEditors = '';
 $evtOut = $modx->invokeEvent('OnRichTextEditorRegister', array('forfrontend' => 1));
-if(is_array($evtOut)) {
+if (is_array($evtOut)) {
 	$RTEditors = implode(',', $evtOut);
 }
 
@@ -107,7 +107,7 @@ 
 		},
 		cancel: function() {
 			documentDirty = false;
-			document.location.href = 'index.php?a=<?= $origin ?><?=(empty($originId) ? '' : '&id=' . $originId) ?>';
+			document.location.href = 'index.php?a=<?= $origin ?><?=(empty($originId) ? '' : '&id='.$originId) ?>';
 		}
 	};
 
@@ -279,7 +279,7 @@ 
 	<?php
 	// invoke OnTVFormPrerender event
 	$evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>
@@ -291,7 +291,7 @@ 
 	<input type="hidden" name="params" value="<?= $modx->htmlspecialchars($content['display_params']) ?>">
 
 	<h1>
-		<i class="fa fa-list-alt"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_tmplvars']) ?><i class="fa fa-question-circle help"></i>
+		<i class="fa fa-list-alt"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_tmplvars']) ?><i class="fa fa-question-circle help"></i>
 	</h1>
 
 	<?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -314,8 +314,8 @@ 
 					<div class="col-md-9 col-lg-10">
 						<div class="form-control-name clearfix">
 							<input name="name" type="text" maxlength="50" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
-							<?php if($modx->hasPermission('save_role')): ?>
-								<label class="custom-control" title="<?= $_lang['lock_tmplvars'] . "\n" . $_lang['lock_tmplvars_msg'] ?>" tooltip>
+							<?php if ($modx->hasPermission('save_role')): ?>
+								<label class="custom-control" title="<?= $_lang['lock_tmplvars']."\n".$_lang['lock_tmplvars_msg'] ?>" tooltip>
 									<input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
 									<i class="fa fa-lock"></i>
 								</label>
@@ -343,9 +343,9 @@ 
 						<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>
@@ -383,11 +383,11 @@ 
 							<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>';
 									}
 								}
 								?>
@@ -462,36 +462,36 @@ 
 				$tplList = '<ul>';
 				$preCat = '';
 				$insideUl = 0;
-				while($row = $modx->db->getRow($rs)) {
+				while ($row = $modx->db->getRow($rs)) {
 					$row['category'] = stripslashes($row['category']); //pixelchutes
-					if($preCat !== $row['category']) {
+					if ($preCat !== $row['category']) {
 						$tplList .= $insideUl ? '</ul>' : '';
-						$tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><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']) {
+					if ($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) {
 						$checked = true;
-					} elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) {
+					} elseif (isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) {
 						$checked = true;
-					} elseif($id == 0 && is_array($_POST['template'])) {
+					} 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'] : '';
+					$tplId = '&nbsp;<small>('.$row['id'].')</small>';
+					$desc = !empty($row['tpldescription']) ? ' - '.$row['tpldescription'] : '';
 
 					$tplInfo = array();
-					if($row['tpllocked']) {
+					if ($row['tpllocked']) {
 						$tplInfo[] = $_lang['locked'];
 					}
-					if($row['id'] == $modx->config['default_template']) {
+					if ($row['id'] == $modx->config['default_template']) {
 						$tplInfo[] = $_lang['defaulttemplate_title'];
 					}
-					$tplInfo = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';
+					$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>';
@@ -506,13 +506,13 @@ 
 
 				<!-- Access Permissions -->
 				<?php
-				if($use_udperms == 1) {
+				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')) { ?>
+					<?php if ($modx->hasPermission('access_permissions')) { ?>
 						<script type="text/javascript">
 							function makePublic(b) {
 								var notPublic = false;
@@ -541,26 +541,26 @@ 
 						<?php
 						$chk = '';
 						$rs = $modx->db->select('name, id', $tbl_documentgroup_names);
-						if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
+						if (empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) {
 							$groupsarray = $_POST['docgroups'];
 						}
-						while($row = $modx->db->getRow($rs)) {
+						while ($row = $modx->db->getRow($rs)) {
 							$checked = in_array($row['id'], $groupsarray);
-							if($modx->hasPermission('access_permissions')) {
-								if($checked) {
+							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>";
+								$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 ($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;
+						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>';
+						echo '<ul>'.$chks.'</ul>';
 						?>
 					<?php } ?>
 				<?php } ?>
@@ -573,7 +573,7 @@ 
 		<?php
 		// invoke OnTVFormRender event
 		$evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id));
-		if(is_array($evtOut)) {
+		if (is_array($evtOut)) {
 			echo implode('', $evtOut);
 		}
 		?>

manager/processors/delete_snippet.processor.php

Spacing +5 added lines, -5 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('delete_snippet')) {
+if (!$modx->hasPermission('delete_snippet')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
-if($id==0) {
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
+if ($id == 0) {
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
@@ -34,5 +34,5 @@ 
 $modx->clearCache('full');
 
 // finished emptying cache - redirect
-$header="Location: index.php?a=76&r=2";
+$header = "Location: index.php?a=76&r=2";
 header($header);

manager/includes/extenders/modifiers.class.inc.php

Spacing +350 added lines, -350 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-if(!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
+if (!defined('MODX_CORE_PATH')) define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
 
-class MODIFIERS {
+class MODIFIERS{
 
     public $placeholders = array();
     public $vars = array();
@@ -30,14 +30,14 @@ 
         $this->condModifiers = '=,is,eq,equals,ne,neq,notequals,isnot,isnt,not,%,isempty,isnotempty,isntempty,>=,gte,eg,gte,greaterthan,>,gt,isgreaterthan,isgt,lowerthan,<,lt,<=,lte,islte,islowerthan,islt,el,find,in,inarray,in_array,fnmatch,wcard,wcard_match,wildcard,wildcard_match,is_file,is_dir,file_exists,is_readable,is_writable,is_image,regex,preg,preg_match,memberof,mo,isinrole,ir';
     }
 
-    public function phxFilter($key,$value,$modifiers)
+    public function phxFilter($key, $value, $modifiers)
     {
         global $modx;
-        if(substr($modifiers,0,3)!=='id(') $value = $this->parseDocumentSource($value);
+        if (substr($modifiers, 0, 3) !== 'id(') $value = $this->parseDocumentSource($value);
         $this->srcValue = $value;
         $modifiers = trim($modifiers);
-        $modifiers = ':'.trim($modifiers,':');
-        $modifiers = str_replace(array("\r\n","\r"), "\n", $modifiers);
+        $modifiers = ':'.trim($modifiers, ':');
+        $modifiers = str_replace(array("\r\n", "\r"), "\n", $modifiers);
         $modifiers = $this->splitEachModifiers($modifiers);
 
         $this->placeholders = array();
@@ -45,118 +45,118 @@ 
         $this->placeholders['dummy'] = '';
         $this->condition = array();
         $this->vars = array();
-        $this->vars['name']    = & $key;
-        $value = $this->parsePhx($key,$value,$modifiers);
+        $this->vars['name'] = & $key;
+        $value = $this->parsePhx($key, $value, $modifiers);
         $this->vars = array();
         return $value;
     }
 
-    public function _getDelim($mode,$modifiers) {
-        $c = substr($modifiers,0,1);
-        if(!in_array($c, array('"', "'", '`')) ) return false;
+    public function _getDelim($mode, $modifiers){
+        $c = substr($modifiers, 0, 1);
+        if (!in_array($c, array('"', "'", '`'))) return false;
 
-        $modifiers = substr($modifiers,1);
-        $closure = $mode=='(' ? "{$c})" : $c;
-        if(strpos($modifiers, $closure)===false) return false;
+        $modifiers = substr($modifiers, 1);
+        $closure = $mode == '(' ? "{$c})" : $c;
+        if (strpos($modifiers, $closure) === false) return false;
 
         return  $c;
     }
 
-    public function _getOpt($mode,$delim,$modifiers) {
-        if($delim) {
-            if($mode=='(') return substr($modifiers,1,strpos($modifiers, $delim . ')' )-1);
+    public function _getOpt($mode, $delim, $modifiers){
+        if ($delim) {
+            if ($mode == '(') return substr($modifiers, 1, strpos($modifiers, $delim.')') - 1);
 
-            return substr($modifiers,1,strpos($modifiers,$delim,1)-1);
+            return substr($modifiers, 1, strpos($modifiers, $delim, 1) - 1);
         }
         else {
-            if($mode=='(') return substr($modifiers,0,strpos($modifiers, ')') );
+            if ($mode == '(') return substr($modifiers, 0, strpos($modifiers, ')'));
 
             $chars = str_split($modifiers);
-            $opt='';
-            foreach($chars as $c) {
-                if($c==':' || $c==')') break;
-                $opt .=$c;
+            $opt = '';
+            foreach ($chars as $c) {
+                if ($c == ':' || $c == ')') break;
+                $opt .= $c;
             }
             return $opt;
         }
     }
-    public function _getRemainModifiers($mode,$delim,$modifiers) {
-        if($delim) {
-            if($mode=='(')
-                return $this->_fetchContent($modifiers, $delim . ')');
+    public function _getRemainModifiers($mode, $delim, $modifiers){
+        if ($delim) {
+            if ($mode == '(')
+                return $this->_fetchContent($modifiers, $delim.')');
             else {
                 $modifiers = trim($modifiers);
-                $modifiers = substr($modifiers,1);
+                $modifiers = substr($modifiers, 1);
                 return $this->_fetchContent($modifiers, $delim);
             }
         }
         else {
-            if($mode=='(') return $this->_fetchContent($modifiers, ')');
+            if ($mode == '(') return $this->_fetchContent($modifiers, ')');
             $chars = str_split($modifiers);
-            foreach($chars as $c) {
-                if($c==':') return $modifiers;
-                else $modifiers = substr($modifiers,1);
+            foreach ($chars as $c) {
+                if ($c == ':') return $modifiers;
+                else $modifiers = substr($modifiers, 1);
             }
             return $modifiers;
         }
     }
 
-    public function _fetchContent($string,$delim) {
+    public function _fetchContent($string, $delim){
         $len = strlen($delim);
         $string = $this->parseDocumentSource($string);
-        return substr($string,strpos($string, $delim)+$len);
+        return substr($string, strpos($string, $delim) + $len);
     }
 
-    public function splitEachModifiers($modifiers) {
+    public function splitEachModifiers($modifiers){
         global $modx;
 
         $cmd = '';
         $bt = '';
         $result = array();
-        while($bt!==$modifiers) {
+        while ($bt !== $modifiers) {
             $bt = $modifiers;
-            $c = substr($modifiers,0,1);
-            $modifiers = substr($modifiers,1);
+            $c = substr($modifiers, 0, 1);
+            $modifiers = substr($modifiers, 1);
 
-            if($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
-                $c = substr($modifiers,strlen($match[1]),1);
+            if ($c === ':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+                $c = substr($modifiers, strlen($match[1]), 1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
-                if($c==='(') $modifiers = substr($modifiers,strlen($match[1])+1);
-                else         $modifiers = substr($modifiers,strlen($match[1]));
+                if ($c === '(') $modifiers = substr($modifiers, strlen($match[1]) + 1);
+                else         $modifiers = substr($modifiers, strlen($match[1]));
 
-                $delim     = $this->_getDelim($c,$modifiers);
-                $opt       = $this->_getOpt($c,$delim,$modifiers);
-                $modifiers = trim($this->_getRemainModifiers($c,$delim,$modifiers));
+                $delim     = $this->_getDelim($c, $modifiers);
+                $opt       = $this->_getOpt($c, $delim, $modifiers);
+                $modifiers = trim($this->_getRemainModifiers($c, $delim, $modifiers));
 
-                $result[]=array('cmd'=>trim($match[1]),'opt'=>$opt,'debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($match[1]), 'opt'=>$opt, 'debuginfo'=>$debuginfo);
                 $cmd = '';
             }
-            elseif(in_array($c,array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
-                $modifiers = substr($modifiers,strlen($match[0]));
-                $result[]=array('cmd'=>'math','opt'=>'%s'.$c.$match[0]);
+            elseif (in_array($c, array('+', '-', '*', '/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
+                $modifiers = substr($modifiers, strlen($match[0]));
+                $result[] = array('cmd'=>'math', 'opt'=>'%s'.$c.$match[0]);
                 $cmd = '';
             }
-            elseif($c==='(' || $c==='=') {
+            elseif ($c === '(' || $c === '=') {
                 $modifiers = $m1 = trim($modifiers);
-                $delim     = $this->_getDelim($c,$modifiers);
-                $opt       = $this->_getOpt($c,$delim,$modifiers);
-                $modifiers = trim($this->_getRemainModifiers($c,$delim,$modifiers));
+                $delim     = $this->_getDelim($c, $modifiers);
+                $opt       = $this->_getOpt($c, $delim, $modifiers);
+                $modifiers = trim($this->_getRemainModifiers($c, $delim, $modifiers));
                 $debuginfo = "#i=1 #c=[{$c}] #delim=[{$delim}] #m1=[{$m1}] remainMdf=[{$modifiers}]";
 
-                $result[]=array('cmd'=>trim($cmd),'opt'=>$opt,'debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($cmd), 'opt'=>$opt, 'debuginfo'=>$debuginfo);
 
                 $cmd = '';
             }
-            elseif($c==':') {
+            elseif ($c == ':') {
                 $debuginfo = "#i=2 #c=[{$c}] #m=[{$modifiers}]";
-                if($cmd!=='') $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                if ($cmd !== '') $result[] = array('cmd'=>trim($cmd), 'opt'=>'', 'debuginfo'=>$debuginfo);
 
                 $cmd = '';
             }
-            elseif(trim($modifiers)=='' && trim($cmd)!=='') {
+            elseif (trim($modifiers) == '' && trim($cmd) !== '') {
                 $debuginfo = "#i=3 #c=[{$c}] #m=[{$modifiers}]";
                 $cmd .= $c;
-                $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($cmd), 'opt'=>'', 'debuginfo'=>$debuginfo);
 
                 break;
             }
@@ -165,65 +165,65 @@ 
             }
         }
 
-        if(empty($result)) return array();
+        if (empty($result)) return array();
 
-        foreach($result as $i=>$a)
+        foreach ($result as $i=>$a)
         {
             $a['opt'] = $this->parseDocumentSource($a['opt']);
-            $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'],$this->placeholders);
+            $result[$i]['opt'] = $modx->mergePlaceholderContent($a['opt'], $this->placeholders);
         }
 
         return $result;
     }
 
-    public function parsePhx($key,$value,$modifiers)
+    public function parsePhx($key, $value, $modifiers)
     {
         global $modx;
         $lastKey = '';
-        $cacheKey = md5(sprintf('parsePhx#%s#%s#%s',$key,$value,print_r($modifiers,true)));
-        if(isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
-        if(empty($modifiers)) return '';
+        $cacheKey = md5(sprintf('parsePhx#%s#%s#%s', $key, $value, print_r($modifiers, true)));
+        if (isset($this->tmpCache[$cacheKey])) return $this->tmpCache[$cacheKey];
+        if (empty($modifiers)) return '';
 
-        foreach($modifiers as $m)
+        foreach ($modifiers as $m)
         {
             $lastKey = strtolower($m['cmd']);
         }
-        $_ = explode(',',$this->condModifiers);
-        if(in_array($lastKey,$_))
+        $_ = explode(',', $this->condModifiers);
+        if (in_array($lastKey, $_))
         {
-            $modifiers[] = array('cmd'=>'then','opt'=>'1');
-            $modifiers[] = array('cmd'=>'else','opt'=>'0');
+            $modifiers[] = array('cmd'=>'then', 'opt'=>'1');
+            $modifiers[] = array('cmd'=>'else', 'opt'=>'0');
         }
 
-        foreach($modifiers as $i=>$a)
+        foreach ($modifiers as $i=>$a)
         {
-            $value = $this->Filter($key,$value, $a['cmd'], $a['opt']);
+            $value = $this->Filter($key, $value, $a['cmd'], $a['opt']);
         }
         $this->tmpCache[$cacheKey] = $value;
         return $value;
     }
 
     // Parser: modifier detection and eXtended processing if needed
-    public function Filter($key, $value, $cmd, $opt='')
+    public function Filter($key, $value, $cmd, $opt = '')
     {
         global $modx;
 
-        if($key==='documentObject') $value = $modx->documentIdentifier;
+        if ($key === 'documentObject') $value = $modx->documentIdentifier;
         $cmd = $this->parseDocumentSource($cmd);
-        if(preg_match('@^[1-9][/0-9]*$@',$cmd))
+        if (preg_match('@^[1-9][/0-9]*$@', $cmd))
         {
-            if(strpos($cmd,'/')!==false)
-                $cmd = $this->substr($cmd,strrpos($cmd,'/')+1);
+            if (strpos($cmd, '/') !== false)
+                $cmd = $this->substr($cmd, strrpos($cmd, '/') + 1);
             $opt = $cmd;
             $cmd = 'id';
         }
 
-        if(isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
-        elseif(isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
+        if (isset($modx->snippetCache["phx:{$cmd}"]))   $this->elmName = "phx:{$cmd}";
+        elseif (isset($modx->chunkCache["phx:{$cmd}"])) $this->elmName = "phx:{$cmd}";
         else                                           $this->elmName = '';
 
         $cmd = strtolower($cmd);
-        if($this->elmName!=='')
+        if ($this->elmName !== '')
             $value = $this->getValueFromElement($key, $value, $cmd, $opt);
         else
             $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
@@ -233,12 +233,12 @@ 
         return $value;
     }
 
-    public function isEmpty($cmd,$value)
+    public function isEmpty($cmd, $value)
     {
-        if($value!=='') return false;
+        if ($value !== '') return false;
 
-        $_ = explode(',', $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
-        if(in_array($cmd,$_)) return false;
+        $_ = explode(',', $this->condModifiers.',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
+        if (in_array($cmd, $_)) return false;
         else                  return true;
     }
 
@@ -246,7 +246,7 @@ 
     {
         global $modx;
 
-        if($this->isEmpty($cmd,$value)) return '';
+        if ($this->isEmpty($cmd, $value)) return '';
 
         $this->key = $key;
         $this->value  = $value;
@@ -257,83 +257,83 @@ 
             #####  Conditional Modifiers
             case 'input':
             case 'if':
-                if(!$opt) return $value;
+                if (!$opt) return $value;
                 return $opt;
             case '=':
             case 'eq':
             case 'is':
             case 'equals':
-                $this->condition[] = (int)($value == $opt); break;
+                $this->condition[] = (int) ($value == $opt); break;
             case 'neq':
             case 'ne':
             case 'notequals':
             case 'isnot':
             case 'isnt':
             case 'not':
-                $this->condition[] = (int)($value != $opt);break;
+                $this->condition[] = (int) ($value != $opt); break;
             case '%':
-                $this->condition[] = (int)($value%$opt==0);break;
+                $this->condition[] = (int) ($value % $opt == 0); break;
             case 'isempty':
-                $this->condition[] = (int)(empty($value)); break;
+                $this->condition[] = (int) (empty($value)); break;
             case 'isntempty':
             case 'isnotempty':
-                $this->condition[] = (int)(!empty($value)); break;
+                $this->condition[] = (int) (!empty($value)); break;
             case '>=':
             case 'gte':
             case 'eg':
             case 'isgte':
-                $this->condition[] = (int)($value >= $opt);break;
+                $this->condition[] = (int) ($value >= $opt); break;
             case '<=':
             case 'lte':
             case 'el':
             case 'islte':
-                $this->condition[] = (int)($value <= $opt);break;
+                $this->condition[] = (int) ($value <= $opt); break;
             case '>':
             case 'gt':
             case 'greaterthan':
             case 'isgreaterthan':
             case 'isgt':
-                $this->condition[] = (int)($value > $opt);break;
+                $this->condition[] = (int) ($value > $opt); break;
             case '<':
             case 'lt':
             case 'lowerthan':
             case 'islowerthan':
             case 'islt':
-                $this->condition[] = (int)($value < $opt);break;
+                $this->condition[] = (int) ($value < $opt); break;
             case 'find':
-                $this->condition[] = (int)(strpos($value, $opt)!==false);break;
+                $this->condition[] = (int) (strpos($value, $opt) !== false); break;
             case 'inarray':
             case 'in_array':
             case 'in':
                 $opt = explode(',', $opt);
-                $this->condition[] = (int)(in_array($value, $opt)!==false);break;
+                $this->condition[] = (int) (in_array($value, $opt) !== false); break;
             case 'wildcard_match':
             case 'wcard_match':
             case 'wildcard':
             case 'wcard':
             case 'fnmatch':
-                $this->condition[] = (int)(fnmatch($opt, $value)!==false);break;
+                $this->condition[] = (int) (fnmatch($opt, $value) !== false); break;
             case 'is_file':
             case 'is_dir':
             case 'file_exists':
             case 'is_readable':
             case 'is_writable':
-                if(!$opt) $path = $value;
+                if (!$opt) $path = $value;
                 else      $path = $opt;
-                if(strpos($path,MODX_MANAGER_PATH)!==false) exit('Can not read core path');
-                if(strpos($path,$modx->config['base_path'])===false) $path = ltrim($path,'/');
-                $this->condition[] = (int)($cmd($path)!==false);break;
+                if (strpos($path, MODX_MANAGER_PATH) !== false) exit('Can not read core path');
+                if (strpos($path, $modx->config['base_path']) === false) $path = ltrim($path, '/');
+                $this->condition[] = (int) ($cmd($path) !== false); break;
             case 'is_image':
-                if(!$opt) $path = $value;
+                if (!$opt) $path = $value;
                 else      $path = $opt;
-                if(!is_file($path)) {$this->condition[]='0';break;}
+                if (!is_file($path)) {$this->condition[] = '0'; break; }
                 $_ = getimagesize($path);
-                $this->condition[] = (int)($_[0]);break;
+                $this->condition[] = (int) ($_[0]); break;
             case 'regex':
             case 'preg':
             case 'preg_match':
             case 'isinrole':
-            $this->condition[] = (int)(preg_match($opt,$value));break;
+            $this->condition[] = (int) (preg_match($opt, $value)); break;
             case 'ir':
             case 'memberof':
             case 'mo':
@@ -341,50 +341,50 @@ 
                 $this->condition[] = $this->includeMdfFile('memberof');
                 break;
             case 'or':
-                $this->condition[] = '||';break;
+                $this->condition[] = '||'; break;
             case 'and':
-                $this->condition[] = '&&';break;
+                $this->condition[] = '&&'; break;
             case 'show':
             case 'this':
-                $conditional = implode(' ',$this->condition);
-                $isvalid = (int)(eval("return ({$conditional});"));
+                $conditional = implode(' ', $this->condition);
+                $isvalid = (int) (eval("return ({$conditional});"));
                 if ($isvalid) return $this->srcValue;
                 return NULL;
             case 'then':
-                $conditional = implode(' ',$this->condition);
-                $isvalid = (int)eval("return ({$conditional});");
+                $conditional = implode(' ', $this->condition);
+                $isvalid = (int) eval("return ({$conditional});");
                 if ($isvalid)  return $opt;
                 return null;
             case 'else':
-                $conditional = implode(' ',$this->condition);
-                $isvalid = (int)eval("return ({$conditional});");
+                $conditional = implode(' ', $this->condition);
+                $isvalid = (int) eval("return ({$conditional});");
                 if (!$isvalid) return $opt;
                 break;
             case 'select':
             case 'switch':
-                $raw = explode('&',$opt);
+                $raw = explode('&', $opt);
                 $map = array();
                 $c = count($raw);
-                for($m=0; $m<$c; $m++) {
-                    $mi = explode('=',$raw[$m],2);
+                for ($m = 0; $m < $c; $m++) {
+                    $mi = explode('=', $raw[$m], 2);
                     $map[$mi[0]] = $mi[1];
                 }
-                if(isset($map[$value])) return $map[$value];
+                if (isset($map[$value])) return $map[$value];
                 else                    return '';
             ##### End of Conditional Modifiers
 
             #####  Encode / Decode / Hash / Escape
             case 'htmlent':
             case 'htmlentities':
-                return htmlentities($value,ENT_QUOTES,$modx->config['modx_charset']);
+                return htmlentities($value, ENT_QUOTES, $modx->config['modx_charset']);
             case 'html_entity_decode':
             case 'decode_html':
             case 'html_decode':
-                return html_entity_decode($value,ENT_QUOTES,$modx->config['modx_charset']);
+                return html_entity_decode($value, ENT_QUOTES, $modx->config['modx_charset']);
             case 'esc':
             case 'escape':
                 $value = preg_replace('/&amp;(#[0-9]+|[a-z]+);/i', '&$1;', htmlspecialchars($value, ENT_QUOTES, $modx->config['modx_charset']));
-                return str_replace(array('[', ']', '`'),array('&#91;', '&#93;', '&#96;'),$value);
+                return str_replace(array('[', ']', '`'), array('&#91;', '&#93;', '&#96;'), $value);
             case 'sql_escape':
             case 'encode_js':
                 return $modx->db->escape($value);
@@ -394,39 +394,39 @@ 
             case 'html_encode':
                 return preg_replace('/&amp;(#[0-9]+|[a-z]+);/i', '&$1;', htmlspecialchars($value, ENT_QUOTES, $modx->config['modx_charset']));
             case 'spam_protect':
-                return str_replace(array('@','.'),array('&#64;','&#46;'),$value);
+                return str_replace(array('@', '.'), array('&#64;', '&#46;'), $value);
             case 'strip':
-                if($opt==='') $opt = ' ';
+                if ($opt === '') $opt = ' ';
                 return preg_replace('/[\n\r\t\s]+/', $opt, $value);
             case 'strip_linefeeds':
-                return str_replace(array("\n","\r"), '', $value);
+                return str_replace(array("\n", "\r"), '', $value);
             case 'notags':
             case 'strip_tags':
             case 'remove_html':
-                if($opt!=='')
+                if ($opt !== '')
                 {
                     $param = array();
-                    foreach(explode(',',$opt) as $v)
+                    foreach (explode(',', $opt) as $v)
                     {
-                        $v = trim($v,'</> ');
+                        $v = trim($v, '</> ');
                         $param[] = "<{$v}>";
                     }
-                    $params = implode(',',$param);
+                    $params = implode(',', $param);
                 }
                 else $params = '';
-                if(!strpos($params,'<br>')===false) {
-                    $value = preg_replace('@(<br[ /]*>)\n@','$1',$value);
-                    $value = preg_replace('@<br[ /]*>@',"\n",$value);
+                if (!strpos($params, '<br>') === false) {
+                    $value = preg_replace('@(<br[ /]*>)\n@', '$1', $value);
+                    $value = preg_replace('@<br[ /]*>@', "\n", $value);
                 }
-                return $this->strip_tags($value,$params);
+                return $this->strip_tags($value, $params);
             case 'urlencode':
             case 'url_encode':
             case 'encode_url':
                 return urlencode($value);
             case 'base64_decode':
-                if($opt!=='false') $opt = true;
+                if ($opt !== 'false') $opt = true;
                 else               $opt = false;
-                return base64_decode($value,$opt);
+                return base64_decode($value, $opt);
             case 'encode_sha1': $cmd = 'sha1';
             case 'addslashes':
             case 'urldecode':
@@ -450,18 +450,18 @@ 
             case 'upper_case':
                 return $this->strtoupper($value);
             case 'capitalize':
-                $_ = explode(' ',$value);
-                foreach($_ as $i=>$v)
+                $_ = explode(' ', $value);
+                foreach ($_ as $i=>$v)
                 {
                     $_[$i] = ucfirst($v);
                 }
-                return implode(' ',$_);
+                return implode(' ', $_);
             case 'zenhan':
-                if(empty($opt)) $opt='VKas';
-                return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
+                if (empty($opt)) $opt = 'VKas';
+                return mb_convert_kana($value, $opt, $modx->config['modx_charset']);
             case 'hanzen':
-                if(empty($opt)) $opt='VKAS';
-                return mb_convert_kana($value,$opt,$modx->config['modx_charset']);
+                if (empty($opt)) $opt = 'VKAS';
+                return mb_convert_kana($value, $opt, $modx->config['modx_charset']);
             case 'str_shuffle':
             case 'shuffle':
                 return $this->str_shuffle($value);
@@ -475,7 +475,7 @@ 
                 return $this->strlen($value);
             case 'count_words':
                 $value = trim($value);
-                return count(preg_split('/\s+/',$value));
+                return count(preg_split('/\s+/', $value));
             case 'str_word_count':
             case 'word_count':
             case 'wordcount':
@@ -483,55 +483,55 @@ 
             case 'count_paragraphs':
                 $value = trim($value);
                 $value = preg_replace('/\r/', '', $value);
-                return count(preg_split('/\n+/',$value));
+                return count(preg_split('/\n+/', $value));
             case 'strpos':
-                if($opt!=0&&empty($opt)) return $value;
-                return $this->strpos($value,$opt);
+                if ($opt != 0 && empty($opt)) return $value;
+                return $this->strpos($value, $opt);
             case 'wordwrap':
                 // default: 70
-                  $wrapat = (int)$opt > 0 ? (int)$opt : 70;
+                  $wrapat = (int) $opt > 0 ? (int) $opt : 70;
                 if (version_compare(PHP_VERSION, '5.3.0') >= 0) return $this->includeMdfFile('wordwrap');
-                else return preg_replace("@(\b\w+\b)@e","wordwrap('\\1',\$wrapat,' ',1)",$value);
+                else return preg_replace("@(\b\w+\b)@e", "wordwrap('\\1',\$wrapat,' ',1)", $value);
             case 'wrap_text':
-                $width = preg_match('/^[1-9][0-9]*$/',$opt) ? $opt : 70;
-                if($modx->config['manager_language']==='japanese-utf8') {
+                $width = preg_match('/^[1-9][0-9]*$/', $opt) ? $opt : 70;
+                if ($modx->config['manager_language'] === 'japanese-utf8') {
                     $chunk = array();
-                    $bt='';
-                    while($bt!=$value) {
+                    $bt = '';
+                    while ($bt != $value) {
                         $bt = $value;
-                        if($this->strlen($value)<$width) {
+                        if ($this->strlen($value) < $width) {
                             $chunk[] = $value;
                             break;
                         }
-                        $chunk[] = $this->substr($value,0,$width);
-                        $value = $this->substr($value,$width);
+                        $chunk[] = $this->substr($value, 0, $width);
+                        $value = $this->substr($value, $width);
                     }
-                    return implode("\n",$chunk);
+                    return implode("\n", $chunk);
                 }
                 else
-                    return wordwrap($value,$width,"\n",true);
+                    return wordwrap($value, $width, "\n", true);
             case 'substr':
-                if(empty($opt)) break;
-                if(strpos($opt,',')!==false) {
-                    list($b,$e) = explode(',',$opt,2);
-                    return $this->substr($value,$b,(int)$e);
+                if (empty($opt)) break;
+                if (strpos($opt, ',') !== false) {
+                    list($b, $e) = explode(',', $opt, 2);
+                    return $this->substr($value, $b, (int) $e);
                 }
-                else return $this->substr($value,$opt);
+                else return $this->substr($value, $opt);
             case 'limit':
             case 'trim_to': // http://www.movabletype.jp/documentation/appendices/modifiers/trim_to.html
-                if(strpos($opt,'+')!==false)
-                    list($len,$str) = explode('+',$opt,2);
+                if (strpos($opt, '+') !== false)
+                    list($len, $str) = explode('+', $opt, 2);
                 else {
                     $len = $opt;
                     $str = '';
                 }
-                if($len==='') $len = 100;
-                if(abs($len) > $this->strlen($value)) $str ='';
-                if(preg_match('/^[1-9][0-9]*$/',$len)) {
-                    return $this->substr($value,0,$len) . $str;
+                if ($len === '') $len = 100;
+                if (abs($len) > $this->strlen($value)) $str = '';
+                if (preg_match('/^[1-9][0-9]*$/', $len)) {
+                    return $this->substr($value, 0, $len).$str;
                 }
-                elseif(preg_match('/^\-[1-9][0-9]*$/',$len)) {
-                    return $str . $this->substr($value,$len);
+                elseif (preg_match('/^\-[1-9][0-9]*$/', $len)) {
+                    return $str.$this->substr($value, $len);
                 }
                 break;
             case 'summary':
@@ -540,81 +540,81 @@ 
                 return $this->includeMdfFile('summary');
             case 'replace':
             case 'str_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                if    (substr_count($opt, ',') ==1) $delim = ',';
-                elseif(substr_count($opt, '|') ==1) $delim = '|';
-                elseif(substr_count($opt, '=>')==1) $delim = '=>';
-                elseif(substr_count($opt, '/') ==1) $delim = '/';
+                if (empty($opt) || strpos($opt, ',') === false) break;
+                if (substr_count($opt, ',') == 1) $delim = ',';
+                elseif (substr_count($opt, '|') == 1) $delim = '|';
+                elseif (substr_count($opt, '=>') == 1) $delim = '=>';
+                elseif (substr_count($opt, '/') == 1) $delim = '/';
                 else break;
-                list($s,$r) = explode($delim,$opt);
-                if($value!=='') return str_replace($s,$r,$value);
+                list($s, $r) = explode($delim, $opt);
+                if ($value !== '') return str_replace($s, $r, $value);
                 break;
             case 'replace_to':
             case 'tpl':
-                if($value!=='') return str_replace(array('[+value+]','[+output+]','{value}','%s'),$value,$opt);
+                if ($value !== '') return str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), $value, $opt);
                 break;
             case 'eachtpl':
-                $value = explode('||',$value);
+                $value = explode('||', $value);
                 $_ = array();
-                foreach($value as $v) {
-                    $_[] = str_replace(array('[+value+]','[+output+]','{value}','%s'),$v,$opt);
+                foreach ($value as $v) {
+                    $_[] = str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), $v, $opt);
                 }
                 return implode("\n", $_);
             case 'array_pop':
             case 'array_shift':
-                if(strpos($value,'||')!==false) $delim = '||';
+                if (strpos($value, '||') !== false) $delim = '||';
                 else                            $delim = ',';
-                return $cmd(explode($delim,$value));
+                return $cmd(explode($delim, $value));
             case 'preg_replace':
             case 'regex_replace':
-                if(empty($opt) || strpos($opt,',')===false) break;
-                list($s,$r) = explode(',',$opt,2);
-                if($value!=='') return preg_replace($s,$r,$value);
+                if (empty($opt) || strpos($opt, ',') === false) break;
+                list($s, $r) = explode(',', $opt, 2);
+                if ($value !== '') return preg_replace($s, $r, $value);
                 break;
             case 'cat':
             case 'concatenate':
             case '.':
-                if($value!=='') return $value . $opt;
+                if ($value !== '') return $value.$opt;
                 break;
             case 'sprintf':
             case 'string_format':
-                if($value!=='') return sprintf($opt,$value);
+                if ($value !== '') return sprintf($opt, $value);
                 break;
             case 'number_format':
-                    if($opt=='') $opt = 0;
-                    return number_format($value,$opt);
+                    if ($opt == '') $opt = 0;
+                    return number_format($value, $opt);
             case 'money_format':
-                    setlocale(LC_MONETARY,setlocale(LC_TIME,0));
-                    if($value!=='') return money_format($opt,(double)$value);
+                    setlocale(LC_MONETARY, setlocale(LC_TIME, 0));
+                    if ($value !== '') return money_format($opt, (double) $value);
                     break;
             case 'tobool':
                 return boolval($value);
             case 'nl2lf':
-                if($value!=='') return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                if ($value !== '') return str_replace(array("\r\n", "\n", "\r"), '\n', $value);
                 break;
             case 'br2nl':
                 return preg_replace('@<br[\s/]*>@i', "\n", $value);
             case 'nl2br':
                 if (version_compare(PHP_VERSION, '5.3.0', '<'))
                     return nl2br($value);
-                if($opt!=='')
+                if ($opt !== '')
                 {
                     $opt = trim($opt);
                     $opt = strtolower($opt);
-                    if($opt==='false') $opt = false;
-                    elseif($opt==='0') $opt = false;
+                    if ($opt === 'false') $opt = false;
+                    elseif ($opt === '0') $opt = false;
                     else               $opt = true;
                 }
-                elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html')
+                elseif (isset($modx->config['mce_element_format']) && $modx->config['mce_element_format'] === 'html')
                                        $opt = false;
                 else                   $opt = true;
-                return nl2br($value,$opt);
+                return nl2br($value, $opt);
             case 'ltrim':
             case 'rtrim':
             case 'trim': // ref http://mblo.info/modifiers/custom-modifiers/rtrim_opt.html
-                if($opt==='')
+                if ($opt === '')
                     return $cmd($value);
-                else return $cmd($value,$opt);
+                else return $cmd($value, $opt);
             // These are all straight wrappers for PHP functions
             case 'ucfirst':
             case 'lcfirst':
@@ -625,58 +625,58 @@ 
             case 'strftime':
             case 'date':
             case 'dateformat':
-                if(empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                if(strpos($opt,'%')!==false)
-                    return strftime($opt,0+$value);
+                if (empty($opt)) $opt = $modx->toDateFormat(null, 'formatOnly');
+                if (!preg_match('@^[0-9]+$@', $value)) $value = strtotime($value);
+                if (strpos($opt, '%') !== false)
+                    return strftime($opt, 0 + $value);
                 else
-                    return date($opt,0+$value);
+                    return date($opt, 0 + $value);
             case 'time':
-                if(empty($opt)) $opt = '%H:%M';
-                if(!preg_match('@^[0-9]+$@',$value)) $value = strtotime($value);
-                return strftime($opt,0+$value);
+                if (empty($opt)) $opt = '%H:%M';
+                if (!preg_match('@^[0-9]+$@', $value)) $value = strtotime($value);
+                return strftime($opt, 0 + $value);
             case 'strtotime':
                 return strtotime($value);
             #####  mathematical function
             case 'toint':
-                return (int)$value;
+                return (int) $value;
             case 'tofloat':
                 return floatval($value);
             case 'round':
-                if(!$opt) $opt = 0;
-                return $cmd($value,$opt);
+                if (!$opt) $opt = 0;
+                return $cmd($value, $opt);
             case 'max':
             case 'min':
-                return $cmd(explode(',',$value));
+                return $cmd(explode(',', $value));
             case 'floor':
             case 'ceil':
             case 'abs':
                 return $cmd($value);
             case 'math':
             case 'calc':
-                $value = (int)$value;
-                if(empty($value)) $value = '0';
-                $filter = str_replace(array('[+value+]','[+output+]','{value}','%s'),'?',$opt);
-                $filter = preg_replace('@([a-zA-Z\n\r\t\s])@','',$filter);
-                if(strpos($filter,'?')===false) $filter = "?{$filter}";
-                $filter = str_replace('?',$value,$filter);
+                $value = (int) $value;
+                if (empty($value)) $value = '0';
+                $filter = str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), '?', $opt);
+                $filter = preg_replace('@([a-zA-Z\n\r\t\s])@', '', $filter);
+                if (strpos($filter, '?') === false) $filter = "?{$filter}";
+                $filter = str_replace('?', $value, $filter);
                 return eval("return {$filter};");
             case 'count':
-                if($value=='') return 0;
-                $value = explode(',',$value);
+                if ($value == '') return 0;
+                $value = explode(',', $value);
                 return count($value);
             case 'sort':
             case 'rsort':
-                if(strpos($value,"\n")!==false) $delim="\n";
+                if (strpos($value, "\n") !== false) $delim = "\n";
                 else $delim = ',';
-                $swap = explode($delim,$value);
-                if(!$opt) $opt = SORT_REGULAR;
+                $swap = explode($delim, $value);
+                if (!$opt) $opt = SORT_REGULAR;
                 else      $opt = constant($opt);
-                $cmd($swap,$opt);
-                return implode($delim,$swap);
+                $cmd($swap, $opt);
+                return implode($delim, $swap);
             #####  Resource fields
             case 'id':
-                if($opt) return $this->getDocumentObject($opt,$key);
+                if ($opt) return $this->getDocumentObject($opt, $key);
                 break;
             case 'type':
             case 'contenttype':
@@ -713,36 +713,36 @@ 
             case 'privatemgr':
             case 'content_dispo':
             case 'hidemenu':
-                if($cmd==='contenttype') $cmd = 'contentType';
-                return $this->getDocumentObject($value,$cmd);
+                if ($cmd === 'contenttype') $cmd = 'contentType';
+                return $this->getDocumentObject($value, $cmd);
             case 'title':
-                $pagetitle = $this->getDocumentObject($value,'pagetitle');
-                $longtitle = $this->getDocumentObject($value,'longtitle');
+                $pagetitle = $this->getDocumentObject($value, 'pagetitle');
+                $longtitle = $this->getDocumentObject($value, 'longtitle');
                 return $longtitle ? $longtitle : $pagetitle;
             case 'shorttitle':
-                $pagetitle = $this->getDocumentObject($value,'pagetitle');
-                $menutitle = $this->getDocumentObject($value,'menutitle');
+                $pagetitle = $this->getDocumentObject($value, 'pagetitle');
+                $menutitle = $this->getDocumentObject($value, 'menutitle');
                 return $menutitle ? $menutitle : $pagetitle;
             case 'templatename':
-                $rs = $modx->db->select('templatename','[+prefix+]site_templates',"id='{$value}'");
+                $rs = $modx->db->select('templatename', '[+prefix+]site_templates', "id='{$value}'");
                 $templateName = $modx->db->getValue($rs);
                 return !$templateName ? '(blank)' : $templateName;
             case 'getfield':
-                if(!$opt) $opt = 'content';
-                return $modx->getField($opt,$value);
+                if (!$opt) $opt = 'content';
+                return $modx->getField($opt, $value);
             case 'children':
             case 'childids':
-                if($value=='') $value = 0; // 値がない場合はルートと見なす
+                if ($value == '') $value = 0; // 値がない場合はルートと見なす
                 $published = 1;
-                if($opt=='') $opt = 'page';
-                $_ = explode(',',$opt);
+                if ($opt == '') $opt = 'page';
+                $_ = explode(',', $opt);
                 $where = array();
-                foreach($_ as $opt) {
-                    switch(trim($opt)) {
+                foreach ($_ as $opt) {
+                    switch (trim($opt)) {
                         case 'page'; case '!folder'; case '!isfolder': $where[] = 'sc.isfolder=0'; break;
                         case 'folder'; case 'isfolder':                $where[] = 'sc.isfolder=1'; break;
-                        case  'menu';  case  'show_menu':              $where[] = 'sc.hidemenu=0'; break;
-                        case '!menu';  case '!show_menu':              $where[] = 'sc.hidemenu=1'; break;
+                        case  'menu'; case  'show_menu':              $where[] = 'sc.hidemenu=0'; break;
+                        case '!menu'; case '!show_menu':              $where[] = 'sc.hidemenu=1'; break;
                         case  'published':                             $published = 1; break;
                         case '!published':                             $published = 0; break;
                     }
@@ -750,69 +750,69 @@ 
                 $where = implode(' AND ', $where);
                 $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where);
                 $result = array();
-                foreach((array)$children as $child){
+                foreach ((array) $children as $child) {
                     $result[] = $child['id'];
                 }
                 return implode(',', $result);
             case 'fullurl':
-                if(!is_numeric($value)) return $value;
+                if (!is_numeric($value)) return $value;
                 return $modx->makeUrl($value);
             case 'makeurl':
-                if(!is_numeric($value)) return $value;
-                if(!$opt) $opt = 'full';
-                return $modx->makeUrl($value,'','',$opt);
+                if (!is_numeric($value)) return $value;
+                if (!$opt) $opt = 'full';
+                return $modx->makeUrl($value, '', '', $opt);
 
             #####  File system
             case 'getimageinfo':
             case 'imageinfo':
-                if(!is_file($value)) return '';
+                if (!is_file($value)) return '';
                 $_ = getimagesize($value);
-                if(!$_[0]) return '';
+                if (!$_[0]) return '';
                 $info['width']  = $_[0];
                 $info['height'] = $_[1];
-                if    ($_[0] > $_[1]) $info['aspect'] = 'landscape';
-                elseif($_[0] < $_[1]) $info['aspect'] = 'portrait';
+                if ($_[0] > $_[1]) $info['aspect'] = 'landscape';
+                elseif ($_[0] < $_[1]) $info['aspect'] = 'portrait';
                 else                  $info['aspect'] = 'square';
-                switch($_[2]) {
+                switch ($_[2]) {
                     case IMAGETYPE_GIF  : $info['type'] = 'gif'; break;
                     case IMAGETYPE_JPEG : $info['type'] = 'jpg'; break;
                     case IMAGETYPE_PNG  : $info['type'] = 'png'; break;
                     default             : $info['type'] = 'unknown';
                 }
                 $info['attrib'] = $_[3];
-                switch($opt) {
+                switch ($opt) {
                     case 'width' : return $info['width'];
                     case 'height': return $info['height'];
                     case 'aspect': return $info['aspect'];
                     case 'type'  : return $info['type'];
                     case 'attrib': return $info['attrib'];
-                    default      : return print_r($info,true);
+                    default      : return print_r($info, true);
                 }
 
             case 'file_get_contents':
             case 'readfile':
-                if(!is_file($value)) return $value;
+                if (!is_file($value)) return $value;
                 $value = realpath($value);
-                if(strpos($value,MODX_MANAGER_PATH)!==false) exit('Can not read core file');
-                $ext = strtolower(substr($value,-4));
-                if($ext==='.php') exit('Can not read php file');
-                if($ext==='.cgi') exit('Can not read cgi file');
+                if (strpos($value, MODX_MANAGER_PATH) !== false) exit('Can not read core file');
+                $ext = strtolower(substr($value, -4));
+                if ($ext === '.php') exit('Can not read php file');
+                if ($ext === '.cgi') exit('Can not read cgi file');
                 return file_get_contents($value);
             case 'filesize':
-                if($value == '') return '';
+                if ($value == '') return '';
                 $filename = $value;
 
                 $site_url = $modx->config['site_url'];
-                if(strpos($filename,$site_url) === 0)
-                    $filename = substr($filename,0,strlen($site_url));
-                $filename = trim($filename,'/');
+                if (strpos($filename, $site_url) === 0)
+                    $filename = substr($filename, 0, strlen($site_url));
+                $filename = trim($filename, '/');
 
-                $opt = trim($opt,'/');
-                if($opt!=='') $opt .= '/';
+                $opt = trim($opt, '/');
+                if ($opt !== '') $opt .= '/';
 
                 $filename = MODX_BASE_PATH.$opt.$filename;
 
-                if(is_file($filename)){
+                if (is_file($filename)) {
                     clearstatcache();
                     $size = filesize($filename);
                     return $size;
@@ -845,10 +845,10 @@ 
                 $this->opt = $cmd;
                 return $this->includeMdfFile('moduser');
             case 'userinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if (empty($opt)) $this->opt = 'username';
                 return $this->includeMdfFile('moduser');
             case 'webuserinfo':
-                if(empty($opt)) $this->opt = 'username';
+                if (empty($opt)) $this->opt = 'username';
                 $this->value = -$value;
                 return $this->includeMdfFile('moduser');
             #####  Special functions
@@ -859,27 +859,27 @@ 
             case 'ifnotempty':
                 if (!empty($value)) return $opt; break;
             case 'datagrid':
-                include_once(MODX_CORE_PATH . 'controls/datagrid.class.php');
+                include_once(MODX_CORE_PATH.'controls/datagrid.class.php');
                 $grd = new DataGrid(null, trim($value));
                 $grd->itemStyle = '';
                 $grd->altItemStyle = '';
-                $pos = strpos($value,"\n");
-                if($pos) $_ = substr($value,0,$pos);
+                $pos = strpos($value, "\n");
+                if ($pos) $_ = substr($value, 0, $pos);
                 else $_ = $pos;
-                $grd->cdelim = strpos($_,"\t")!==false ? 'tab' : ',';
+                $grd->cdelim = strpos($_, "\t") !== false ? 'tab' : ',';
                 return $grd->render();
             case 'rotate':
             case 'evenodd':
-                if(strpos($opt,',')===false) $opt = 'odd,even';
+                if (strpos($opt, ',') === false) $opt = 'odd,even';
                 $_ = explode(',', $opt);
                 $c = count($_);
                 $i = $value + $c;
                 $i = $i % $c;
                 return $_[$i];
             case 'takeval':
-                $arr = explode(",",$opt);
+                $arr = explode(",", $opt);
                 $idx = $value;
-                if(!is_numeric($idx)) return $value;
+                if (!is_numeric($idx)) return $value;
                 return $arr[$idx];
             case 'getimage':
                 return $this->includeMdfFile('getimage');
@@ -887,17 +887,17 @@ 
                     return $modx->nicesize($value);
             case 'googlemap':
             case 'googlemaps':
-                if(empty($opt)) $opt = 'border:none;width:500px;height:350px;';
+                if (empty($opt)) $opt = 'border:none;width:500px;height:350px;';
                 $tpl = '<iframe style="[+style+]" src="https://maps.google.co.jp/maps?ll=[+value+]&output=embed&z=15"></iframe>';
                 $ph['style'] = $opt;
                 $ph['value'] = $value;
-                return $modx->parseText($tpl,$ph);
+                return $modx->parseText($tpl, $ph);
             case 'youtube':
             case 'youtube16x9':
-                if(empty($opt)) $opt = 560;
-                $h = round($opt*0.5625);
+                if (empty($opt)) $opt = 560;
+                $h = round($opt * 0.5625);
                 $tpl = '<iframe width="%s" height="%s" src="https://www.youtube.com/embed/%s" frameborder="0" allowfullscreen></iframe>';
-                return sprintf($tpl,$opt,$h,$value);
+                return sprintf($tpl, $opt, $h, $value);
             //case 'youtube4x3':%s*0.75＋25
             case 'setvar':
                 $modx->placeholders[$opt] = $value;
@@ -927,7 +927,7 @@ 
         return $value;
     }
 
-    public function includeMdfFile($cmd) {
+    public function includeMdfFile($cmd){
         global $modx;
         $key = $this->key;
         $value  = $this->value;
@@ -938,54 +938,54 @@ 
     public function getValueFromElement($key, $value, $cmd, $opt)
     {
         global $modx;
-        if( isset($modx->snippetCache[$this->elmName]) )
+        if (isset($modx->snippetCache[$this->elmName]))
         {
             $php = $modx->snippetCache[$this->elmName];
         }
         else
         {
             $esc_elmName = $modx->db->escape($this->elmName);
-            $result = $modx->db->select('snippet','[+prefix+]site_snippets',"name='{$esc_elmName}'");
+            $result = $modx->db->select('snippet', '[+prefix+]site_snippets', "name='{$esc_elmName}'");
             $total = $modx->db->getRecordCount($result);
-            if($total == 1)
+            if ($total == 1)
             {
                 $row = $modx->db->getRow($result);
                 $php = $row['snippet'];
             }
-            elseif($total == 0)
+            elseif ($total == 0)
             {
                 $assets_path = MODX_BASE_PATH.'assets/';
-                if(is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
+                if (is_file($assets_path."modifiers/mdf_{$cmd}.inc.php"))
                     $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
-                elseif(is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
+                elseif (is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php"))
                     $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
-                elseif(is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
+                elseif (is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php"))
                     $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
                 else $modifiers_path = false;
 
-                if($modifiers_path !== false) {
+                if ($modifiers_path !== false) {
                     $php = @file_get_contents($modifiers_path);
                     $php = trim($php);
-                    if(substr($php,0,5)==='<?php') $php = substr($php,6);
-                    if(substr($php,0,2)==='<?')    $php = substr($php,3);
-                    if(substr($php,-2)==='?>')     $php = substr($php,0,-2);
-                    if($this->elmName!=='')
+                    if (substr($php, 0, 5) === '<?php') $php = substr($php, 6);
+                    if (substr($php, 0, 2) === '<?')    $php = substr($php, 3);
+                    if (substr($php, -2) === '?>')     $php = substr($php, 0, -2);
+                    if ($this->elmName !== '')
                         $modx->snippetCache[$this->elmName.'Props'] = '';
                 }
                 else
                     $php = false;
             }
             else $php = false;
-            if($this->elmName!=='') $modx->snippetCache[$this->elmName]= $php;
+            if ($this->elmName !== '') $modx->snippetCache[$this->elmName] = $php;
         }
-        if($php==='') $php=false;
+        if ($php === '') $php = false;
 
-        if($php===false) $html = $modx->getChunk($this->elmName);
+        if ($php === false) $html = $modx->getChunk($this->elmName);
         else             $html = false;
 
         $self = '[+output+]';
 
-        if($php !== false)
+        if ($php !== false)
         {
             ob_start();
             $options = $opt;
@@ -998,71 +998,71 @@ 
             $this->vars['options'] = & $opt;
             $custom = eval($php);
             $msg = ob_get_contents();
-            if($value===$this->bt) $value = $msg . $custom;
+            if ($value === $this->bt) $value = $msg.$custom;
             ob_end_clean();
         }
-        elseif($html!==false && isset($value) && $value!=='')
+        elseif ($html !== false && isset($value) && $value !== '')
         {
-            $html = str_replace(array($self,'[+value+]'), $value, $html);
-            $value = str_replace(array('[+options+]','[+param+]'), $opt, $html);
+            $html = str_replace(array($self, '[+value+]'), $value, $html);
+            $value = str_replace(array('[+options+]', '[+param+]'), $opt, $html);
         }
         else return false;
 
-        if($php===false && $html===false && $value!==''
-           && (strpos($cmd,'[+value+]')!==false || strpos($cmd,$self)!==false))
+        if ($php === false && $html === false && $value !== ''
+           && (strpos($cmd, '[+value+]') !== false || strpos($cmd, $self) !== false))
         {
-            $value = str_replace(array('[+value+]',$self),$value,$cmd);
+            $value = str_replace(array('[+value+]', $self), $value, $cmd);
         }
         return $value;
     }
 
-    public function parseDocumentSource($content='')
+    public function parseDocumentSource($content = '')
     {
         global $modx;
 
-        if(strpos($content,'[')===false && strpos($content,'{')===false) return $content;
+        if (strpos($content, '[') === false && strpos($content, '{') === false) return $content;
 
-        if(!$modx->maxParserPasses) $modx->maxParserPasses = 10;
-        $bt='';
-        $i=0;
-        while($bt!==$content)
+        if (!$modx->maxParserPasses) $modx->maxParserPasses = 10;
+        $bt = '';
+        $i = 0;
+        while ($bt !== $content)
         {
             $bt = $content;
-            if(strpos($content,'[*')!==false && $modx->documentIdentifier)
+            if (strpos($content, '[*') !== false && $modx->documentIdentifier)
                                               $content = $modx->mergeDocumentContent($content);
-            if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content);
-            if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content);
-            if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content);
-            if(strpos($content,'[[')!==false) $content = $modx->evalSnippets($content);
+            if (strpos($content, '[(') !== false) $content = $modx->mergeSettingsContent($content);
+            if (strpos($content, '{{') !== false) $content = $modx->mergeChunkContent($content);
+            if (strpos($content, '[!') !== false) $content = str_replace(array('[!', '!]'), array('[[', ']]'), $content);
+            if (strpos($content, '[[') !== false) $content = $modx->evalSnippets($content);
 
-            if($content===$bt)              break;
-            if($modx->maxParserPasses < $i) break;
+            if ($content === $bt)              break;
+            if ($modx->maxParserPasses < $i) break;
             $i++;
         }
         return $content;
     }
 
-    public function getDocumentObject($target='',$field='pagetitle')
+    public function getDocumentObject($target = '', $field = 'pagetitle')
     {
         global $modx;
 
         $target = trim($target);
-        if(empty($target)) $target = $modx->config['site_start'];
-        if(preg_match('@^[1-9][0-9]*$@',$target)) $method='id';
+        if (empty($target)) $target = $modx->config['site_start'];
+        if (preg_match('@^[1-9][0-9]*$@', $target)) $method = 'id';
         else $method = 'alias';
 
-        if(!isset($this->documentObject[$target]))
+        if (!isset($this->documentObject[$target]))
         {
-            $this->documentObject[$target] = $modx->getDocumentObject($method,$target,'direct');
+            $this->documentObject[$target] = $modx->getDocumentObject($method, $target, 'direct');
         }
 
-        if($this->documentObject[$target]['publishedon']==='0')
+        if ($this->documentObject[$target]['publishedon'] === '0')
             return '';
-        elseif(isset($this->documentObject[$target][$field]))
+        elseif (isset($this->documentObject[$target][$field]))
         {
-            if(is_array($this->documentObject[$target][$field]))
+            if (is_array($this->documentObject[$target][$field]))
             {
-                $a = $modx->getTemplateVarOutput($field,$target);
+                $a = $modx->getTemplateVarOutput($field, $target);
                 $this->documentObject[$target][$field] = $a[$field];
             }
         }
@@ -1071,8 +1071,8 @@ 
         return $this->documentObject[$target][$field];
     }
 
-    public function setPlaceholders($value = '', $key = '', $path = '') {
-        if($path!=='') $key = "{$path}.{$key}";
+    public function setPlaceholders($value = '', $key = '', $path = ''){
+        if ($path !== '') $key = "{$path}.{$key}";
         if (is_array($value)) {
             foreach ($value as $subkey => $subval) {
                 $this->setPlaceholders($subval, $subkey, $key);
@@ -1082,77 +1082,77 @@ 
     }
 
     // Sets a placeholder variable which can only be access by Modifiers
-    public function setModifiersVariable($key, $value) {
+    public function setModifiersVariable($key, $value){
         if ($key != 'phx' && $key != 'dummy') $this->placeholders[$key] = $value;
     }
 
     //mbstring
-    public function substr($str, $s, $l = null) {
+    public function substr($str, $s, $l = null){
         global $modx;
-        if(is_null($l)) $l = $this->strlen($str);
+        if (is_null($l)) $l = $this->strlen($str);
         if (function_exists('mb_substr'))
         {
-            if(strpos($str,"\r")!==false)
-                $str = str_replace(array("\r\n","\r"), "\n", $str);
+            if (strpos($str, "\r") !== false)
+                $str = str_replace(array("\r\n", "\r"), "\n", $str);
             return mb_substr($str, $s, $l, $modx->config['modx_charset']);
         }
         return substr($str, $s, $l);
     }
-    public function strpos($haystack,$needle,$offset=0) {
+    public function strpos($haystack, $needle, $offset = 0){
         global $modx;
-        if (function_exists('mb_strpos')) return mb_strpos($haystack,$needle,$offset,$modx->config['modx_charset']);
-        return strpos($haystack,$needle,$offset);
+        if (function_exists('mb_strpos')) return mb_strpos($haystack, $needle, $offset, $modx->config['modx_charset']);
+        return strpos($haystack, $needle, $offset);
     }
-    public function strlen($str) {
+    public function strlen($str){
         global $modx;
-        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str),$modx->config['modx_charset']);
+        if (function_exists('mb_strlen')) return mb_strlen(str_replace("\r\n", "\n", $str), $modx->config['modx_charset']);
         return strlen($str);
     }
-    public function strtolower($str) {
+    public function strtolower($str){
         if (function_exists('mb_strtolower')) return mb_strtolower($str);
         return strtolower($str);
     }
-    public function strtoupper($str) {
+    public function strtoupper($str){
         if (function_exists('mb_strtoupper')) return mb_strtoupper($str);
         return strtoupper($str);
     }
-    public function ucfirst($str) {
+    public function ucfirst($str){
         if (function_exists('mb_strtoupper'))
             return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         return ucfirst($str);
     }
-    public function lcfirst($str) {
+    public function lcfirst($str){
         if (function_exists('mb_strtolower'))
             return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         return lcfirst($str);
     }
-    public function ucwords($str) {
+    public function ucwords($str){
         if (function_exists('mb_convert_case'))
             return mb_convert_case($str, MB_CASE_TITLE);
         return ucwords($str);
     }
-    public function strrev($str) {
+    public function strrev($str){
         preg_match_all('/./us', $str, $ar);
         return implode(array_reverse($ar[0]));
     }
-    public function str_shuffle($str) {
+    public function str_shuffle($str){
         preg_match_all('/./us', $str, $ar);
         shuffle($ar[0]);
         return implode($ar[0]);
     }
-    public function str_word_count($str) {
-        return count(preg_split('~[^\p{L}\p{N}\']+~u',$str));
+    public function str_word_count($str){
+        return count(preg_split('~[^\p{L}\p{N}\']+~u', $str));
     }
-    public function strip_tags($value,$params='') {
+    public function strip_tags($value, $params = ''){
         global $modx;
 
-        if(stripos($params,'style')===false && stripos($value,'</style>')!==false) {
+        if (stripos($params, 'style') === false && stripos($value, '</style>') !== false) {
             $value = preg_replace('@<style.*?>.*?</style>@is', '', $value);
         }
-        if(stripos($params,'script')===false && stripos($value,'</script>')!==false) {
+        if (stripos($params, 'script') === false && stripos($value, '</script>') !== false) {
             $value = preg_replace('@<script.*?>.*?</script>@is', '', $value);
         }
 
-        return trim(strip_tags($value,$params));
+        return trim(strip_tags($value, $params));
     }
 }

manager/includes/charsets.php

Spacing +17 added lines, -17 removed lines

@@ -65,26 +65,26 @@
 $_['macintosh']         = 'Western European (Mac) - macintosh';
 $_['Windows-1252']      = 'Western European (Windows) - Windows-1252';
 
-if($modx_charset     == 'euc-jp')      $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
-elseif($modx_charset == 'shift_jis')   $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
-elseif($modx_charset == 'iso-2022-jp') $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp';
-elseif($modx_charset == 'csISO2022JP') $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP';
-elseif($modx_charset == 'EUC-CN')            $_['EUC-CN']            = 'Chinese Simplified (EUC) - EUC-CN';
-elseif($modx_charset == 'hz-gb-2312')        $_['hz-gb-2312']        = 'Chinese Simplified (HZ) - hz-gb-2312';
-elseif($modx_charset == 'x-mac-chinesesimp') $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp';
-elseif($modx_charset == 'x-Chinese-CNS')     $_['x-Chinese-CNS']     = 'Chinese Traditional (CNS) - x-Chinese-CNS';
-elseif($modx_charset == 'x-Chinese-Eten')    $_['x-Chinese-Eten']    = 'Chinese Traditional (Eten) - x-Chinese-Eten';
-elseif($modx_charset == 'x-mac-chinesetrad') $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad';
-elseif($modx_charset == 'ks_c_5601-1987') $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987';
-elseif($modx_charset == 'euc-kr')         $_['euc-kr']         = 'Korean (EUC) - euc-kr';
-elseif($modx_charset == 'iso-2022-kr')    $_['iso-2022-kr']    = 'Korean (ISO) - iso-2022-kr';
-elseif($modx_charset == 'Johab')          $_['Johab']          = 'Korean (Johab) - Johab';
-elseif($modx_charset == 'x-mac-korean')   $_['x-mac-korean']   = 'Korean (Mac) - x-mac-korean';
+if ($modx_charset == 'euc-jp')      $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
+elseif ($modx_charset == 'shift_jis')   $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
+elseif ($modx_charset == 'iso-2022-jp') $_['iso-2022-jp'] = 'Japanese (JIS-Allow 1 byte Kana - SO/SI) - iso-2022-jp';
+elseif ($modx_charset == 'csISO2022JP') $_['csISO2022JP'] = 'Japanese (JIS-Allow 1 byte Kana) - csISO2022JP';
+elseif ($modx_charset == 'EUC-CN')            $_['EUC-CN']            = 'Chinese Simplified (EUC) - EUC-CN';
+elseif ($modx_charset == 'hz-gb-2312')        $_['hz-gb-2312']        = 'Chinese Simplified (HZ) - hz-gb-2312';
+elseif ($modx_charset == 'x-mac-chinesesimp') $_['x-mac-chinesesimp'] = 'Chinese Simplified (Mac) - x-mac-chinesesimp';
+elseif ($modx_charset == 'x-Chinese-CNS')     $_['x-Chinese-CNS']     = 'Chinese Traditional (CNS) - x-Chinese-CNS';
+elseif ($modx_charset == 'x-Chinese-Eten')    $_['x-Chinese-Eten']    = 'Chinese Traditional (Eten) - x-Chinese-Eten';
+elseif ($modx_charset == 'x-mac-chinesetrad') $_['x-mac-chinesetrad'] = 'Chinese Traditional (Mac) - x-mac-chinesetrad';
+elseif ($modx_charset == 'ks_c_5601-1987') $_['ks_c_5601-1987'] = 'Korean - ks_c_5601-1987';
+elseif ($modx_charset == 'euc-kr')         $_['euc-kr']         = 'Korean (EUC) - euc-kr';
+elseif ($modx_charset == 'iso-2022-kr')    $_['iso-2022-kr']    = 'Korean (ISO) - iso-2022-kr';
+elseif ($modx_charset == 'Johab')          $_['Johab']          = 'Korean (Johab) - Johab';
+elseif ($modx_charset == 'x-mac-korean')   $_['x-mac-korean']   = 'Korean (Mac) - x-mac-korean';
 
 $tpl = '<option value="%s" %s>%s</option>';
 $options = array();
-foreach($_ as $value=>$label) {
-    $selected = $value===$modx_charset ? 'selected' : '';
+foreach ($_ as $value=>$label) {
+    $selected = $value === $modx_charset ? 'selected' : '';
     $options[] = sprintf($tpl, $value, $selected, $label);
 }
 echo implode("\n", $options);

manager/includes/config_check.inc.php

Spacing +41 added lines, -41 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 // PROCESSOR FIRST
-if($_SESSION['mgrRole'] == 1) {
-	if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
+if ($_SESSION['mgrRole'] == 1) {
+	if ($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
 		$current = $modx->manager->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(!empty($current)) {
+		if (!empty($current)) {
 			$modx->manager->setSystemChecksum($current);
 			$modx->clearCache('full');
 			$modx->config['sys_files_checksum'] = $current;
@@ -19,14 +19,14 @@ 
 $warningspresent = 0;
 
 $sysfiles_check = $modx->manager->checkSystemChecksum();
-if ($sysfiles_check!=='0'){
+if ($sysfiles_check !== '0') {
       $warningspresent = 1;
       $warnings[] = array($_lang['configcheck_sysfiles_mod']);
 }
 
-if (is_writable("includes/config.inc.php")){
+if (is_writable("includes/config.inc.php")) {
     // Warn if world writable
-    if(@fileperms('includes/config.inc.php') & 0x0002) {
+    if (@fileperms('includes/config.inc.php') & 0x0002) {
       $warningspresent = 1;
       $warnings[] = array($_lang['configcheck_configinc']);
     }
@@ -42,8 +42,8 @@ 
     $warnings[] = array($_lang['configcheck_php_gdzip']);
 }
 
-if(!isset($modx->config['_hide_configcheck_validate_referer']) || $modx->config['_hide_configcheck_validate_referer'] !== '1') {
-    if(isset($_SESSION['mgrPermissions']['settings']) && $_SESSION['mgrPermissions']['settings'] == '1') {
+if (!isset($modx->config['_hide_configcheck_validate_referer']) || $modx->config['_hide_configcheck_validate_referer'] !== '1') {
+    if (isset($_SESSION['mgrPermissions']['settings']) && $_SESSION['mgrPermissions']['settings'] == '1') {
         if ($modx->db->getValue($modx->db->select('COUNT(setting_value)', $modx->getFullTableName('system_settings'), "setting_name='validate_referer' AND setting_value='0'"))) {
             $warningspresent = 1;
             $warnings[] = array($_lang['configcheck_validate_referer']);
@@ -52,11 +52,11 @@ 
 }
 
 // check for Template Switcher plugin
-if(!isset($modx->config['_hide_configcheck_templateswitcher_present']) || $modx->config['_hide_configcheck_templateswitcher_present'] !== '1') {
-    if(isset($_SESSION['mgrPermissions']['edit_plugin']) && $_SESSION['mgrPermissions']['edit_plugin'] == '1') {
+if (!isset($modx->config['_hide_configcheck_templateswitcher_present']) || $modx->config['_hide_configcheck_templateswitcher_present'] !== '1') {
+    if (isset($_SESSION['mgrPermissions']['edit_plugin']) && $_SESSION['mgrPermissions']['edit_plugin'] == '1') {
         $rs = $modx->db->select('name, disabled', $modx->getFullTableName('site_plugins'), "name IN ('TemplateSwitcher', 'Template Switcher', 'templateswitcher', 'template_switcher', 'template switcher') OR plugincode LIKE '%TemplateSwitcher%'");
         $row = $modx->db->getRow($rs);
-        if($row && $row['disabled'] == 0) {
+        if ($row && $row['disabled'] == 0) {
             $warningspresent = 1;
             $warnings[] = array($_lang['configcheck_templateswitcher_present']);
             $tplName = $row['name'];
@@ -117,36 +117,36 @@ 
 }
 
 if (!function_exists('checkSiteCache')) {
-    function checkSiteCache() {
+    function checkSiteCache(){
         global $modx;
-        $checked= true;
-        if (file_exists($modx->config['base_path'] . 'assets/cache/siteCache.idx.php')) {
-            $checked= @include_once ($modx->config['base_path'] . 'assets/cache/siteCache.idx.php');
+        $checked = true;
+        if (file_exists($modx->config['base_path'].'assets/cache/siteCache.idx.php')) {
+            $checked = @include_once ($modx->config['base_path'].'assets/cache/siteCache.idx.php');
         }
         return $checked;
     }
 }
 
-if (!is_writable(MODX_BASE_PATH . "assets/cache/")) {
+if (!is_writable(MODX_BASE_PATH."assets/cache/")) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_cache']);
 }
 
 if (!checkSiteCache()) {
     $warningspresent = 1;
-    $warnings[]= array($lang['configcheck_sitecache_integrity']);
+    $warnings[] = array($lang['configcheck_sitecache_integrity']);
 }
 
-if (!is_writable(MODX_BASE_PATH . "assets/images/")) {
+if (!is_writable(MODX_BASE_PATH."assets/images/")) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_images']);
 }
 
-if(strpos($modx->config['rb_base_dir'],MODX_BASE_PATH)!==0) {
+if (strpos($modx->config['rb_base_dir'], MODX_BASE_PATH) !== 0) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_rb_base_dir']);
 }
-if(strpos($modx->config['filemanager_path'],MODX_BASE_PATH)!==0) {
+if (strpos($modx->config['filemanager_path'], MODX_BASE_PATH) !== 0) {
     $warningspresent = 1;
     $warnings[] = array($_lang['configcheck_filemanager_path']);
 }
@@ -154,36 +154,36 @@ 
 // clear file info cache
 clearstatcache();
 
-if ($warningspresent==1) {
+if ($warningspresent == 1) {
 
-if(!isset($modx->config['send_errormail'])) $modx->config['send_errormail']='3';
+if (!isset($modx->config['send_errormail'])) $modx->config['send_errormail'] = '3';
 $config_check_results = "<h3>".$_lang['configcheck_notok']."</h3>";
 
-for ($i=0;$i<count($warnings);$i++) {
+for ($i = 0; $i < count($warnings); $i++) {
     switch ($warnings[$i][0]) {
         case $_lang['configcheck_configinc'];
             $warnings[$i][1] = $_lang['configcheck_configinc_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_configinc']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_configinc']);
             break;
         case $_lang['configcheck_installer'] :
             $warnings[$i][1] = $_lang['configcheck_installer_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1],$_lang['configcheck_installer']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_installer']);
             break;
         case $_lang['configcheck_cache'] :
             $warnings[$i][1] = $_lang['configcheck_cache_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_cache']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_cache']);
             break;
         case $_lang['configcheck_images'] :
             $warnings[$i][1] = $_lang['configcheck_images_msg'];
-            if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,2,$warnings[$i][1],$_lang['configcheck_images']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_images']);
             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']);
+            if (!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0, 3, $warnings[$i][1]." ".implode(', ', $sysfiles_check), $_lang['configcheck_sysfiles_mod']);
             break;
         case $_lang['configcheck_lang_difference'] :
             $warnings[$i][1] = $_lang['configcheck_lang_difference_msg'];
@@ -205,18 +205,18 @@ 
             break;
         case $_lang['configcheck_validate_referer'] :
             $msg = $_lang['configcheck_validate_referer_msg'];
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
+            $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
             $warnings[$i][1] = "<span id=\"validate_referer_warning_wrapper\">{$msg}</span>\n";
             break;
         case $_lang['configcheck_templateswitcher_present'] :
             $msg = $_lang["configcheck_templateswitcher_present_msg"];
-            if(isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_disable"];
+            if (isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
+                $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_disable"];
             }
-            if(isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_delete"];
+            if (isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
+                $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_delete"];
             }
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
+            $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
             $warnings[$i][1] = "<span id=\"templateswitcher_present_warning_wrapper\">{$msg}</span>\n";
             break;
         case $_lang['configcheck_rb_base_dir'] :
@@ -229,7 +229,7 @@ 
             $warnings[$i][1] = $_lang['configcheck_default_msg'];
     }
 
-    $admin_warning = $_SESSION['mgrRole']!=1 ? $_lang['configcheck_admin'] : "" ;
+    $admin_warning = $_SESSION['mgrRole'] != 1 ? $_lang['configcheck_admin'] : "";
     $config_check_results .= "
             <fieldset>
             <p><strong>".$_lang['configcheck_warning']."</strong> '".$warnings[$i][0]."'</p>
@@ -238,11 +238,11 @@ 
             ".(isset($warnings[$i][2]) ? '<div style="padding-left:1em">'.$warnings[$i][2].'</div>' : '')."
             </fieldset>
 ";
-        if ($i!=count($warnings)-1) {
+        if ($i != count($warnings) - 1) {
             $config_check_results .= "<br />";
         }
     }
-    $_SESSION["mgrConfigCheck"]=true;
+    $_SESSION["mgrConfigCheck"] = true;
 } else {
     $config_check_results = $_lang['configcheck_ok'];
 }

manager/includes/document.parser.class.inc.php

Spacing +266 added lines, -266 removed lines

@@ -205,7 +205,7 @@ 
      */
     function __call($method_name, $arguments)
     {
-        include_once(MODX_MANAGER_PATH . 'includes/extenders/deprecated.functions.inc.php');
+        include_once(MODX_MANAGER_PATH.'includes/extenders/deprecated.functions.inc.php');
         if (method_exists($this->old, $method_name)) {
             $error_type = 1;
         } else {
@@ -223,12 +223,12 @@ 
             $info = debug_backtrace();
             $m[] = $msg;
             if (!empty($this->currentSnippet)) {
-                $m[] = 'Snippet - ' . $this->currentSnippet;
+                $m[] = 'Snippet - '.$this->currentSnippet;
             } elseif (!empty($this->event->activePlugin)) {
-                $m[] = 'Plugin - ' . $this->event->activePlugin;
+                $m[] = 'Plugin - '.$this->event->activePlugin;
             }
             $m[] = $this->decoded_request_uri;
-            $m[] = str_replace('\\', '/', $info[0]['file']) . '(line:' . $info[0]['line'] . ')';
+            $m[] = str_replace('\\', '/', $info[0]['file']).'(line:'.$info[0]['line'].')';
             $msg = implode('<br />', $m);
             $this->logEvent(0, $error_type, $msg, $title);
         }
@@ -245,7 +245,7 @@ 
     {
         $flag = false;
         if (is_scalar($connector) && !empty($connector) && isset($this->{$connector}) && $this->{$connector} instanceof DBAPI) {
-            $flag = (bool)$this->{$connector}->conn;
+            $flag = (bool) $this->{$connector}->conn;
         }
         return $flag;
     }
@@ -272,7 +272,7 @@ 
         }
         if (!$out && $flag) {
             $extname = trim(str_replace(array('..', '/', '\\'), '', strtolower($extname)));
-            $filename = MODX_MANAGER_PATH . "includes/extenders/ex_{$extname}.inc.php";
+            $filename = MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php";
             $out = is_file($filename) ? include $filename : false;
         }
         if ($out && !in_array($extname, $this->extensions)) {
@@ -289,7 +289,7 @@ 
     public function getMicroTime()
     {
         list ($usec, $sec) = explode(' ', microtime());
-        return ((float)$usec + (float)$sec);
+        return ((float) $usec + (float) $sec);
     }
 
     /**
@@ -313,7 +313,7 @@ 
             // append the redirect count string to the url
             $currentNumberOfRedirects = isset ($_REQUEST['err']) ? $_REQUEST['err'] : 0;
             if ($currentNumberOfRedirects > 3) {
-                $this->messageQuit('Redirection attempt failed - please ensure the document you\'re trying to redirect to exists. <p>Redirection URL: <i>' . $url . '</i></p>');
+                $this->messageQuit('Redirection attempt failed - please ensure the document you\'re trying to redirect to exists. <p>Redirection URL: <i>'.$url.'</i></p>');
             } else {
                 $currentNumberOfRedirects += 1;
                 if (strpos($url, "?") > 0) {
@@ -324,9 +324,9 @@ 
             }
         }
         if ($type == 'REDIRECT_REFRESH') {
-            $header = 'Refresh: 0;URL=' . $url;
+            $header = 'Refresh: 0;URL='.$url;
         } elseif ($type == 'REDIRECT_META') {
-            $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL=' . $url . '" />';
+            $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL='.$url.'" />';
             echo $header;
             exit;
         } elseif ($type == 'REDIRECT_HEADER' || empty ($type)) {
@@ -334,10 +334,10 @@ 
             global $base_url, $site_url;
             if (substr($url, 0, strlen($base_url)) == $base_url) {
                 // append $site_url to make it work with Location:
-                $url = $site_url . substr($url, strlen($base_url));
+                $url = $site_url.substr($url, strlen($base_url));
             }
             if (strpos($url, "\n") === false) {
-                $header = 'Location: ' . $url;
+                $header = 'Location: '.$url;
             } else {
                 $this->messageQuit('No newline allowed in redirect url.');
             }
@@ -346,7 +346,7 @@ 
             header($responseCode);
         }
 
-        if(!empty($header)) {
+        if (!empty($header)) {
             header($header);
         }
 
@@ -450,8 +450,8 @@ 
 
     private function recoverySiteCache()
     {
-        $site_cache_dir = MODX_BASE_PATH . $this->getCacheFolder();
-        $site_cache_path = $site_cache_dir . 'siteCache.idx.php';
+        $site_cache_dir = MODX_BASE_PATH.$this->getCacheFolder();
+        $site_cache_path = $site_cache_dir.'siteCache.idx.php';
 
         if (is_file($site_cache_path)) {
             include($site_cache_path);
@@ -460,7 +460,7 @@ 
             return;
         }
 
-        include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+        include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php');
         $cache = new synccache();
         $cache->setCachepath($site_cache_dir);
         $cache->setReport(false);
@@ -511,8 +511,8 @@ 
                 $this->invokeEvent("OnBeforeManagerPageInit");
             }
 
-            if (isset ($_SESSION[$usrType . 'UsrConfigSet'])) {
-                $usrSettings = &$_SESSION[$usrType . 'UsrConfigSet'];
+            if (isset ($_SESSION[$usrType.'UsrConfigSet'])) {
+                $usrSettings = &$_SESSION[$usrType.'UsrConfigSet'];
             } else {
                 if ($usrType == 'web') {
                     $from = $tbl_web_user_settings;
@@ -532,7 +532,7 @@ 
                     $usrSettings[$row['setting_name']] = $row['setting_value'];
                 }
                 if (isset ($usrType)) {
-                    $_SESSION[$usrType . 'UsrConfigSet'] = $usrSettings;
+                    $_SESSION[$usrType.'UsrConfigSet'] = $usrSettings;
                 } // store user settings in session
             }
         }
@@ -677,10 +677,10 @@ 
         $suf = $this->config['friendly_url_suffix'];
         $pre = preg_quote($pre, '/');
         $suf = preg_quote($suf, '/');
-        if ($pre && preg_match('@^' . $pre . '(.*)$@', $q, $_)) {
+        if ($pre && preg_match('@^'.$pre.'(.*)$@', $q, $_)) {
             $q = $_[1];
         }
-        if ($suf && preg_match('@(.*)' . $suf . '$@', $q, $_)) {
+        if ($suf && preg_match('@(.*)'.$suf.'$@', $q, $_)) {
             $q = $_[1];
         }
 
@@ -702,7 +702,7 @@ 
         if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */
             /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */
             if ($this->config['use_alias_path'] == 1) {
-                if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
+                if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir.'/'.$q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) {
                     $this->documentMethod = 'id';
                     return $q;
                 } else { /* not a valid id in terms of virtualDir, treat as alias */
@@ -736,7 +736,7 @@ 
      */
     public function getHashFile($key)
     {
-        return $this->getCacheFolder() . "docid_" . $key . ".pageCache.php";
+        return $this->getCacheFolder()."docid_".$key.".pageCache.php";
     }
 
     /**
@@ -747,9 +747,9 @@ 
         $hash = $id;
         $tmp = null;
         $params = array();
-        if(!empty($this->systemCacheKey)){
+        if (!empty($this->systemCacheKey)) {
             $hash = $this->systemCacheKey;
-        }else {
+        } else {
             if (!empty($_GET)) {
                 // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID.
                 $params = $_GET;
@@ -757,8 +757,8 @@ 
                 $hash .= '_'.md5(http_build_query($params));
             }
         }
-        $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params));
-        if (is_array($evtOut) && count($evtOut) > 0){
+        $evtOut = $this->invokeEvent("OnMakePageCacheKey", array("hash" => $hash, "id" => $id, 'params' => $params));
+        if (is_array($evtOut) && count($evtOut) > 0) {
             $tmp = array_pop($evtOut);
         }
         return empty($tmp) ? $hash : $tmp;
@@ -900,12 +900,12 @@ 
         if ($js = $this->getRegisteredClientStartupScripts()) {
             // change to just before closing </head>
             // $this->documentContent = preg_replace("/(<head[^>]*>)/i", "\\1\n".$js, $this->documentContent);
-            $this->documentOutput = preg_replace("/(<\/head>)/i", $js . "\n\\1", $this->documentOutput);
+            $this->documentOutput = preg_replace("/(<\/head>)/i", $js."\n\\1", $this->documentOutput);
         }
 
         // Insert jscripts & html block into template - template must have a </body> tag
         if ($js = $this->getRegisteredClientScripts()) {
-            $this->documentOutput = preg_replace("/(<\/body>)/i", $js . "\n\\1", $this->documentOutput);
+            $this->documentOutput = preg_replace("/(<\/body>)/i", $js."\n\\1", $this->documentOutput);
         }
         // End fix by sirlancelot
 
@@ -916,7 +916,7 @@ 
         // send out content-type and content-disposition headers
         if (IN_PARSER_MODE == "true") {
             $type = !empty ($this->contentTypes[$this->documentIdentifier]) ? $this->contentTypes[$this->documentIdentifier] : "text/html";
-            header('Content-Type: ' . $type . '; charset=' . $this->config['modx_charset']);
+            header('Content-Type: '.$type.'; charset='.$this->config['modx_charset']);
             //            if (($this->documentIdentifier == $this->config['error_page']) || $redirect_error)
             //                header('HTTP/1.0 404 Not Found');
             if (!$this->checkPreview() && $this->documentObject['content_dispo'] == 1) {
@@ -934,7 +934,7 @@ 
                     $name = preg_replace('|-+|', '-', $name);
                     $name = trim($name, '-');
                 }
-                $header = 'Content-Disposition: attachment; filename=' . $name;
+                $header = 'Content-Disposition: attachment; filename='.$name;
                 header($header);
             }
         }
@@ -942,7 +942,7 @@ 
 
         $stats = $this->getTimerStats($this->tstart);
 
-        $out =& $this->documentOutput;
+        $out = & $this->documentOutput;
         $out = str_replace("[^q^]", $stats['queries'], $out);
         $out = str_replace("[^qt^]", $stats['queryTime'], $out);
         $out = str_replace("[^p^]", $stats['phpTime'], $out);
@@ -981,17 +981,17 @@ 
                 $sc .= sprintf("%s. %s (%s)<br>", $s, $sname, sprintf("%2.2f ms", $t)); // currentSnippet
                 $tt += $t;
             }
-            echo "<fieldset><legend><b>Snippets</b> (" . count($this->snippetsTime) . " / " . sprintf("%2.2f ms", $tt) . ")</legend>{$sc}</fieldset><br />";
+            echo "<fieldset><legend><b>Snippets</b> (".count($this->snippetsTime)." / ".sprintf("%2.2f ms", $tt).")</legend>{$sc}</fieldset><br />";
             echo $this->snippetsCode;
         }
         if ($this->dumpPlugins) {
             $ps = "";
             $tt = 0;
             foreach ($this->pluginsTime as $s => $t) {
-                $ps .= "$s (" . sprintf("%2.2f ms", $t * 1000) . ")<br>";
+                $ps .= "$s (".sprintf("%2.2f ms", $t * 1000).")<br>";
                 $tt += $t;
             }
-            echo "<fieldset><legend><b>Plugins</b> (" . count($this->pluginsTime) . " / " . sprintf("%2.2f ms", $tt * 1000) . ")</legend>{$ps}</fieldset><br />";
+            echo "<fieldset><legend><b>Plugins</b> (".count($this->pluginsTime)." / ".sprintf("%2.2f ms", $tt * 1000).")</legend>{$ps}</fieldset><br />";
             echo $this->pluginsCode;
         }
 
@@ -1017,7 +1017,7 @@ 
         $srcTags = explode(',', $tags);
         $repTags = array();
         foreach ($srcTags as $tag) {
-            $repTags[] = '\\' . $tag[0] . '\\' . $tag[1];
+            $repTags[] = '\\'.$tag[0].'\\'.$tag[1];
         }
         return array($srcTags, $repTags);
     }
@@ -1039,7 +1039,7 @@ 
         $stats['phpTime'] = sprintf("%2.4f s", $stats['phpTime']);
         $stats['source'] = $this->documentGenerated == 1 ? "database" : "cache";
         $stats['queries'] = isset ($this->executedQueries) ? $this->executedQueries : 0;
-        $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024) . " mb";
+        $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024)." mb";
 
         return $stats;
     }
@@ -1072,7 +1072,7 @@ 
     {
         $cacheRefreshTime = 0;
         $recent_update = 0;
-        @include(MODX_BASE_PATH . $this->getCacheFolder() . 'sitePublishing.idx.php');
+        @include(MODX_BASE_PATH.$this->getCacheFolder().'sitePublishing.idx.php');
         $this->recentUpdate = $recent_update;
 
         $timeNow = $_SERVER['REQUEST_TIME'] + $this->config['server_offset_time'];
@@ -1126,8 +1126,8 @@ 
                 }
 
                 $docObjSerial = serialize($this->documentObject);
-                $cacheContent = $docObjSerial . "<!--__MODxCacheSpliter__-->" . $this->documentContent;
-                $page_cache_path = MODX_BASE_PATH . $this->getHashFile($this->cacheKey);
+                $cacheContent = $docObjSerial."<!--__MODxCacheSpliter__-->".$this->documentContent;
+                $page_cache_path = MODX_BASE_PATH.$this->getHashFile($this->cacheKey);
                 file_put_contents($page_cache_path, "<?php die('Unauthorized access.'); ?>$cacheContent");
             }
         }
@@ -1169,16 +1169,16 @@ 
             return array();
         }
         $spacer = md5('<<<EVO>>>');
-        if($left==='{{' && strpos($content,';}}')!==false)  $content = str_replace(';}}', sprintf(';}%s}',   $spacer),$content);
-        if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content);
-        if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]',  $spacer),$content);
-        if($left==='[[' && strpos($content,']]]')!==false)  $content = str_replace(']]]', sprintf(']%s]]',   $spacer),$content);
+        if ($left === '{{' && strpos($content, ';}}') !== false)  $content = str_replace(';}}', sprintf(';}%s}', $spacer), $content);
+        if ($left === '{{' && strpos($content, '{{}}') !== false) $content = str_replace('{{}}', sprintf('{%$1s{}%$1s}', $spacer), $content);
+        if ($left === '[[' && strpos($content, ']]]]') !== false) $content = str_replace(']]]]', sprintf(']]%s]]', $spacer), $content);
+        if ($left === '[[' && strpos($content, ']]]') !== false)  $content = str_replace(']]]', sprintf(']%s]]', $spacer), $content);
 
         $pos['<![CDATA['] = strpos($content, '<![CDATA[');
         $pos[']]>'] = strpos($content, ']]>');
 
         if ($pos['<![CDATA['] !== false && $pos[']]>'] !== false) {
-            $content = substr($content, 0, $pos['<![CDATA[']) . substr($content, $pos[']]>'] + 3);
+            $content = substr($content, 0, $pos['<![CDATA[']).substr($content, $pos[']]>'] + 3);
         }
 
         $lp = explode($left, $content);
@@ -1242,8 +1242,8 @@ 
                 }
             }
         }
-        foreach($tags as $i=>$tag) {
-            if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag);
+        foreach ($tags as $i=>$tag) {
+            if (strpos($tag, $spacer) !== false) $tags[$i] = str_replace($spacer, '', $tag);
         }
         return $tags;
     }
@@ -1283,7 +1283,7 @@ 
         }
 
         foreach ($matches[1] as $i => $key) {
-            if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
+            if (strpos($key, '[+') !== false) continue; // Allow chunk {{chunk?&param=`xxx`}} with [*tv_name_[+param+]*] as content
             if (substr($key, 0, 1) == '#') {
                 $key = substr($key, 1);
             } // remove # for QuickEdit format
@@ -1303,8 +1303,8 @@ 
             }
 
             if (is_array($value)) {
-                include_once(MODX_MANAGER_PATH . 'includes/tmplvars.format.inc.php');
-                include_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php');
+                include_once(MODX_MANAGER_PATH.'includes/tmplvars.format.inc.php');
+                include_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php');
                 $value = getTVDisplayFormat($value[0], $value[1], $value[2], $value[3], $value[4]);
             }
 
@@ -1315,8 +1315,8 @@ 
 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -1483,8 +1483,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1537,7 +1537,7 @@ 
             }
 
             $value = $this->parseText($value, $params); // parse local scope placeholers for ConditionalTags
-            $value = $this->mergePlaceholderContent($value, $params);  // parse page global placeholers
+            $value = $this->mergePlaceholderContent($value, $params); // parse page global placeholers
             if ($this->config['enable_at_syntax']) {
                 $value = $this->mergeConditionalTagsContent($value);
             }
@@ -1552,8 +1552,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1611,8 +1611,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1636,7 +1636,7 @@ 
             return $content;
         }
 
-        $sp = '#' . md5('ConditionalTags' . $_SERVER['REQUEST_TIME']) . '#';
+        $sp = '#'.md5('ConditionalTags'.$_SERVER['REQUEST_TIME']).'#';
         $content = str_replace(array('<?php', '<?=', '<?', '?>'), array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), $content);
 
         $pieces = explode('<@IF:', $content);
@@ -1647,7 +1647,7 @@ 
             }
             list($cmd, $text) = explode('>', $split, 2);
             $cmd = str_replace("'", "\'", $cmd);
-            $content .= "<?php if(\$this->_parseCTagCMD('" . $cmd . "')): ?>";
+            $content .= "<?php if(\$this->_parseCTagCMD('".$cmd."')): ?>";
             $content .= $text;
         }
         $pieces = explode('<@ELSEIF:', $content);
@@ -1658,13 +1658,13 @@ 
             }
             list($cmd, $text) = explode('>', $split, 2);
             $cmd = str_replace("'", "\'", $cmd);
-            $content .= "<?php elseif(\$this->_parseCTagCMD('" . $cmd . "')): ?>";
+            $content .= "<?php elseif(\$this->_parseCTagCMD('".$cmd."')): ?>";
             $content .= $text;
         }
 
         $content = str_replace(array('<@ELSE>', '<@ENDIF>'), array('<?php else:?>', '<?php endif;?>'), $content);
         ob_start();
-        $content = eval('?>' . $content);
+        $content = eval('?>'.$content);
         $content = ob_get_clean();
         $content = str_replace(array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), array('<?php', '<?=', '<?', '?>'), $content);
 
@@ -1789,7 +1789,7 @@ 
         $matches = $this->getTagsFromContent($content, $left, $right);
         if (!empty($matches)) {
             foreach ($matches[0] as $i => $v) {
-                $addBreakMatches[$i] = $v . "\n";
+                $addBreakMatches[$i] = $v."\n";
             }
             $content = str_replace($addBreakMatches, '', $content);
             if (strpos($content, $left) !== false) {
@@ -1822,8 +1822,8 @@ 
             $s = &$matches[0][$i];
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $v, $content);
-            } elseif($this->debug) {
-                $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
         return $content;
@@ -1887,7 +1887,7 @@ 
                 $msg = ($msg === false) ? 'ob_get_contents() error' : $msg;
                 $this->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], 'Plugin', $error_info['message'], $error_info['line'], $msg);
                 if ($this->isBackend()) {
-                    $this->event->alert('An error occurred while loading. Please see the event log for more information.<p>' . $msg . '</p>');
+                    $this->event->alert('An error occurred while loading. Please see the event log for more information.<p>'.$msg.'</p>');
                 }
             }
         } else {
@@ -1933,7 +1933,7 @@ 
                 $echo = ($echo === false) ? 'ob_get_contents() error' : $echo;
                 $this->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], 'Snippet', $error_info['message'], $error_info['line'], $echo);
                 if ($this->isBackend()) {
-                    $this->event->alert('An error occurred while loading. Please see the event log for more information<p>' . $echo . $return . '</p>');
+                    $this->event->alert('An error occurred while loading. Please see the event log for more information<p>'.$echo.$return.'</p>');
                 }
             }
         }
@@ -1941,7 +1941,7 @@ 
         if (is_array($return) || is_object($return)) {
             return $return;
         } else {
-            return $echo . $return;
+            return $echo.$return;
         }
     }
 
@@ -1979,8 +1979,8 @@ 
                 }
                 if (strpos($content, $s) !== false) {
                     $content = str_replace($s, $value, $content);
-                } elseif($this->debug) {
-                    $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+                } elseif ($this->debug) {
+                    $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'].$s, 2);
                 }
                 continue;
             }
@@ -1991,8 +1991,8 @@ 
 
             if (strpos($content, $s) !== false) {
                 $content = str_replace($s, $value, $content);
-            } elseif($this->debug) {
-                $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -2083,7 +2083,7 @@ 
             $eventtime = sprintf('%2.2f ms', $eventtime * 1000);
             $code = str_replace("\t", '  ', $this->htmlspecialchars($value));
             $piece = str_replace("\t", '  ', $this->htmlspecialchars($piece));
-            $print_r_params = str_replace("\t", '  ', $this->htmlspecialchars('$modx->event->params = ' . print_r($params, true)));
+            $print_r_params = str_replace("\t", '  ', $this->htmlspecialchars('$modx->event->params = '.print_r($params, true)));
             $this->snippetsCode .= sprintf('<fieldset style="margin:1em;"><legend><b>%s</b>(%s)</legend><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">[[%s]]</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre></fieldset>', $snippetObject['name'], $eventtime, $piece, $print_r_params, $code);
             $this->snippetsTime[] = array('sname' => $key, 'time' => $eventtime);
         }
@@ -2327,7 +2327,7 @@ 
             $rs = $this->db->select('name,snippet,properties', '[+prefix+]site_snippets', $where);
             $count = $this->db->getRecordCount($rs);
             if (1 < $count) {
-                exit('Error $modx->_getSnippetObject()' . $snip_name);
+                exit('Error $modx->_getSnippetObject()'.$snip_name);
             }
             if ($count) {
                 $row = $this->db->getRow($rs);
@@ -2353,7 +2353,7 @@ 
     public function toAlias($text)
     {
         $suff = $this->config['friendly_url_suffix'];
-        return str_replace(array('.xml' . $suff, '.rss' . $suff, '.js' . $suff, '.css' . $suff, '.txt' . $suff, '.json' . $suff, '.pdf' . $suff), array('.xml', '.rss', '.js', '.css', '.txt', '.json', '.pdf'), $text);
+        return str_replace(array('.xml'.$suff, '.rss'.$suff, '.js'.$suff, '.css'.$suff, '.txt'.$suff, '.json'.$suff, '.pdf'.$suff), array('.xml', '.rss', '.js', '.css', '.txt', '.json', '.pdf'), $text);
     }
 
     /**
@@ -2385,7 +2385,7 @@ 
                 $suff = '/';
             }
 
-            $url = ($dir != '' ? $dir . '/' : '') . $pre . $alias . $suff;
+            $url = ($dir != '' ? $dir.'/' : '').$pre.$alias.$suff;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -2422,7 +2422,7 @@ 
                 preg_match_all('!\[\~([0-9]+)\~\]!ise', $documentSource, $match);
                 $ids = implode(',', array_unique($match['1']));
                 if ($ids) {
-                    $res = $this->db->select("id,alias,isfolder,parent,alias_visible", $this->getFullTableName('site_content'), "id IN (" . $ids . ") AND isfolder = '0'");
+                    $res = $this->db->select("id,alias,isfolder,parent,alias_visible", $this->getFullTableName('site_content'), "id IN (".$ids.") AND isfolder = '0'");
                     while ($row = $this->db->getRow($res)) {
                         if ($this->config['use_alias_path'] == '1' && $row['parent'] != 0) {
                             $parent = $row['parent'];
@@ -2433,7 +2433,7 @@ 
                                 $parent = $this->aliasListing[$parent]['parent'];
                             }
 
-                            $aliases[$row['id']] = $path . '/' . $row['alias'];
+                            $aliases[$row['id']] = $path.'/'.$row['alias'];
                         } else {
                             $aliases[$row['id']] = $row['alias'];
                         }
@@ -2445,7 +2445,7 @@ 
             $isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0);
             $pref = $this->config['friendly_url_prefix'];
             $suff = $this->config['friendly_url_suffix'];
-            $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
+            $documentSource = preg_replace_callback($in, function($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) {
                 global $modx;
                 $thealias = $aliases[$m[1]];
                 $thefolder = $isfolder[$m[1]];
@@ -2461,7 +2461,7 @@ 
 
         } else {
             $in = '!\[\~([0-9]+)\~\]!is';
-            $out = "index.php?id=" . '\1';
+            $out = "index.php?id=".'\1';
             $documentSource = preg_replace($in, $out, $documentSource);
         }
 
@@ -2482,7 +2482,7 @@ 
         $scheme = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
         $len_base_url = strlen($this->config['base_url']);
 
-        $url_path = $q;//LANG
+        $url_path = $q; //LANG
 
         if (substr($url_path, 0, $len_base_url) === $this->config['base_url']) {
             $url_path = substr($url_path, $len_base_url);
@@ -2494,7 +2494,7 @@ 
             $strictURL = substr($strictURL, $len_base_url);
         }
         $http_host = $_SERVER['HTTP_HOST'];
-        $requestedURL = "{$scheme}://{$http_host}" . '/' . $q; //LANG
+        $requestedURL = "{$scheme}://{$http_host}".'/'.$q; //LANG
 
         $site_url = $this->config['site_url'];
 
@@ -2510,7 +2510,7 @@ 
                 }
                 if ($this->config['base_url'] != $_SERVER['REQUEST_URI']) {
                     if (empty($_POST)) {
-                        if (($this->config['base_url'] . '?' . $qstring) != $_SERVER['REQUEST_URI']) {
+                        if (($this->config['base_url'].'?'.$qstring) != $_SERVER['REQUEST_URI']) {
                             $this->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.0 301 Moved Permanently');
                             exit(0);
                         }
@@ -2573,7 +2573,7 @@ 
                 $docgrp = implode(",", $docgrp);
             }
             // get document
-            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
             $rs = $this->db->select('sc.*', "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg ON dg.document = sc.id", "sc.{$method} = '{$identifier}' AND ({$access})", "", 1);
             if ($this->db->getRecordCount($rs) < 1) {
@@ -2609,9 +2609,9 @@ 
             }
             if ($documentObject['template']) {
                 // load TVs and merge with document - Orig by Apodigm - Docvars
-                $rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars") . " tv
-                INNER JOIN " . $this->getFullTableName("site_tmplvar_templates") . " tvtpl ON tvtpl.tmplvarid = tv.id
-                LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues") . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
+                $rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars")." tv
+                INNER JOIN " . $this->getFullTableName("site_tmplvar_templates")." tvtpl ON tvtpl.tmplvarid = tv.id
+                LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues")." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
                 $tmplvars = array();
                 while ($row = $this->db->getRow($rs)) {
                     $tmplvars[$row['name']] = array(
@@ -2657,7 +2657,7 @@ 
                 $st = md5($source);
             }
             if ($this->dumpSnippets == 1) {
-                $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS " . ($i + 1) . "</b></legend><p>The following snippets (if any) were parsed during this pass.</p>";
+                $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS ".($i + 1)."</b></legend><p>The following snippets (if any) were parsed during this pass.</p>";
             }
 
             // invoke OnParseDocument event
@@ -2743,7 +2743,7 @@ 
 
             // Check use_alias_path and check if $this->virtualDir is set to anything, then parse the path
             if ($this->config['use_alias_path'] == 1) {
-                $alias = (strlen($this->virtualDir) > 0 ? $this->virtualDir . '/' : '') . $this->documentIdentifier;
+                $alias = (strlen($this->virtualDir) > 0 ? $this->virtualDir.'/' : '').$this->documentIdentifier;
                 if (isset($this->documentListing[$alias])) {
                     $this->documentIdentifier = $this->documentListing[$alias];
                 } else {
@@ -2804,7 +2804,7 @@ 
                 } else {
                     $docAlias = $this->db->escape($this->documentIdentifier);
                     $rs = $this->db->select('id', $this->getFullTableName('site_content'), "deleted=0 and alias='{$docAlias}'");
-                    $this->documentIdentifier = (int)$this->db->getValue($rs);
+                    $this->documentIdentifier = (int) $this->db->getValue($rs);
                 }
             }
             $this->documentMethod = 'id';
@@ -2857,7 +2857,7 @@ 
                 $_REQUEST[$n] = $_GET[$n] = $v;
             }
         }
-        $_SERVER['PHP_SELF'] = $this->config['base_url'] . $qp['path'];
+        $_SERVER['PHP_SELF'] = $this->config['base_url'].$qp['path'];
         $this->q = $qp['path'];
         return $qp['path'];
     }
@@ -2951,7 +2951,7 @@ 
             $this->sendErrorPage();
         } else {
             // Inculde the necessary files to check document permissions
-            include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+            include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php');
             $udperms = new udperms();
             $udperms->user = $this->getLoginUserID();
             $udperms->document = $this->documentIdentifier;
@@ -3005,7 +3005,7 @@ 
         while ($id && $height--) {
             $thisid = $id;
             if ($this->config['aliaslistingfolder'] == 1) {
-                $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->db->getValue("SELECT `parent` FROM " . $this->getFullTableName("site_content") . " WHERE `id` = '{$id}' LIMIT 0,1");
+                $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->db->getValue("SELECT `parent` FROM ".$this->getFullTableName("site_content")." WHERE `id` = '{$id}' LIMIT 0,1");
                 if (!$id || $id == '0') {
                     break;
                 }
@@ -3056,15 +3056,15 @@ 
 
         if ($this->config['aliaslistingfolder'] == 1) {
 
-            $res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (" . $id . ") AND deleted = '0'");
+            $res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (".$id.") AND deleted = '0'");
             $idx = array();
             while ($row = $this->db->getRow($res)) {
                 $pAlias = '';
                 if (isset($this->aliasListing[$row['parent']])) {
-                    $pAlias .= !empty($this->aliasListing[$row['parent']]['path']) ? $this->aliasListing[$row['parent']]['path'] . '/' : '';
-                    $pAlias .= !empty($this->aliasListing[$row['parent']]['alias']) ? $this->aliasListing[$row['parent']]['alias'] . '/' : '';
+                    $pAlias .= !empty($this->aliasListing[$row['parent']]['path']) ? $this->aliasListing[$row['parent']]['path'].'/' : '';
+                    $pAlias .= !empty($this->aliasListing[$row['parent']]['alias']) ? $this->aliasListing[$row['parent']]['alias'].'/' : '';
                 };
-                $children[$pAlias . $row['alias']] = $row['id'];
+                $children[$pAlias.$row['alias']] = $row['id'];
                 if ($row['isfolder'] == 1) {
                     $idx[] = $row['id'];
                 }
@@ -3096,7 +3096,7 @@ 
                 $depth--;
 
                 foreach ($documentMap_cache[$id] as $childId) {
-                    $pkey = (strlen($this->aliasListing[$childId]['path']) ? "{$this->aliasListing[$childId]['path']}/" : '') . $this->aliasListing[$childId]['alias'];
+                    $pkey = (strlen($this->aliasListing[$childId]['path']) ? "{$this->aliasListing[$childId]['path']}/" : '').$this->aliasListing[$childId]['alias'];
                     if (!strlen($pkey)) {
                         $pkey = "{$childId}";
                     }
@@ -3125,7 +3125,7 @@ 
         if (substr(strtolower($url), 0, 11) == "javascript:") {
             $fnc = substr($url, 11);
         } elseif ($url) {
-            $fnc = "window.location.href='" . addslashes($url) . "';";
+            $fnc = "window.location.href='".addslashes($url)."';";
         } else {
             $fnc = "history.back(-1);";
         }
@@ -3134,7 +3134,7 @@ 
             <meta http-equiv=\"Content-Type\" content=\"text/html; charset={$modx_manager_charset};\">
             <script>
                 function __alertQuit() {
-                    alert('" . addslashes($msg) . "');
+                    alert('".addslashes($msg)."');
                     {$fnc}
                 }
                 window.setTimeout('__alertQuit();',100);
@@ -3158,7 +3158,7 @@ 
         if ($pms) {
             $state = ($pms[$pm] == 1);
         }
-        return (int)$state;
+        return (int) $state;
     }
 
     /**
@@ -3171,8 +3171,8 @@ 
      */
     public function elementIsLocked($type, $id, $includeThisUser = false)
     {
-        $id = (int)$id;
-        $type = (int)$type;
+        $id = (int) $id;
+        $type = (int) $type;
         if (!$type || !$id) {
             return null;
         }
@@ -3222,7 +3222,7 @@ 
             return $lockedElements;
         }
 
-        $type = (int)$type;
+        $type = (int) $type;
         if (isset($lockedElements[$type])) {
             return $lockedElements[$type];
         } else {
@@ -3239,7 +3239,7 @@ 
             $this->lockedElements = array();
             $this->cleanupExpiredLocks();
 
-            $rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks') . " ul
+            $rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks')." ul
                 LEFT JOIN {$this->getFullTableName('manager_users')} mu on ul.internalKey = mu.id");
             while ($row = $this->db->getRow($rs)) {
                 $this->lockedElements[$row['elementType']][$row['elementId']] = array(
@@ -3262,7 +3262,7 @@ 
     public function cleanupExpiredLocks()
     {
         // Clean-up active_user_sessions first
-        $timeout = (int)$this->config['session_timeout'] < 2 ? 120 : $this->config['session_timeout'] * 60; // session.js pings every 10min, updateMail() in mainMenu pings every minute, so 2min is minimum
+        $timeout = (int) $this->config['session_timeout'] < 2 ? 120 : $this->config['session_timeout'] * 60; // session.js pings every 10min, updateMail() in mainMenu pings every minute, so 2min is minimum
         $validSessionTimeLimit = $this->time - $timeout;
         $this->db->delete($this->getFullTableName('active_user_sessions'), "lasthit < {$validSessionTimeLimit}");
 
@@ -3275,7 +3275,7 @@ 
             foreach ($rs as $row) {
                 $userSids[] = $row['sid'];
             }
-            $userSids = "'" . implode("','", $userSids) . "'";
+            $userSids = "'".implode("','", $userSids)."'";
             $this->db->delete($this->getFullTableName('active_user_locks'), "sid NOT IN({$userSids})");
         } else {
             $this->db->delete($this->getFullTableName('active_user_locks'));
@@ -3359,8 +3359,8 @@ 
     public function lockElement($type, $id)
     {
         $userId = $this->isBackend() && $_SESSION['mgrInternalKey'] ? $_SESSION['mgrInternalKey'] : 0;
-        $type = (int)$type;
-        $id = (int)$id;
+        $type = (int) $type;
+        $id = (int) $id;
         if (!$type || !$id || !$userId) {
             return false;
         }
@@ -3381,8 +3381,8 @@ 
     public function unlockElement($type, $id, $includeAllUsers = false)
     {
         $userId = $this->isBackend() && $_SESSION['mgrInternalKey'] ? $_SESSION['mgrInternalKey'] : 0;
-        $type = (int)$type;
-        $id = (int)$id;
+        $type = (int) $type;
+        $id = (int) $id;
         if (!$type || !$id) {
             return false;
         }
@@ -3449,8 +3449,8 @@ 
         }
 
         $usertype = $this->isFrontend() ? 1 : 0;
-        $evtid = (int)$evtid;
-        $type = (int)$type;
+        $evtid = (int) $evtid;
+        $type = (int) $type;
 
         // Types: 1 = information, 2 = warning, 3 = error
         if ($type < 1) {
@@ -3472,8 +3472,8 @@ 
         if (isset($this->config['send_errormail']) && $this->config['send_errormail'] !== '0') {
             if ($this->config['send_errormail'] <= $type) {
                 $this->sendmail(array(
-                    'subject' => 'MODX System Error on ' . $this->config['site_name'],
-                    'body' => 'Source: ' . $source . ' - The details of the error could be seen in the MODX system events log.',
+                    'subject' => 'MODX System Error on '.$this->config['site_name'],
+                    'body' => 'Source: '.$source.' - The details of the error could be seen in the MODX system events log.',
                     'type' => 'text'
                 ));
             }
@@ -3521,7 +3521,7 @@ 
             $p['fromname'] = $userinfo['username'];
         }
         if ($msg === '' && !isset($p['body'])) {
-            $p['body'] = $_SERVER['REQUEST_URI'] . "\n" . $_SERVER['HTTP_USER_AGENT'] . "\n" . $_SERVER['HTTP_REFERER'];
+            $p['body'] = $_SERVER['REQUEST_URI']."\n".$_SERVER['HTTP_USER_AGENT']."\n".$_SERVER['HTTP_REFERER'];
         } elseif (is_string($msg) && 0 < strlen($msg)) {
             $p['body'] = $msg;
         }
@@ -3561,8 +3561,8 @@ 
             $files = array();
         }
         foreach ($files as $f) {
-            if (file_exists(MODX_BASE_PATH . $f) && is_file(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f)) {
-                $this->mail->AddAttachment(MODX_BASE_PATH . $f);
+            if (file_exists(MODX_BASE_PATH.$f) && is_file(MODX_BASE_PATH.$f) && is_readable(MODX_BASE_PATH.$f)) {
+                $this->mail->AddAttachment(MODX_BASE_PATH.$f);
             }
         }
         $rs = $this->mail->send();
@@ -3607,7 +3607,7 @@ 
      */
     public function isFrontend()
     {
-        return ! $this->isBackend();
+        return !$this->isBackend();
     }
 
     /**
@@ -3632,14 +3632,14 @@ 
         $tblsc = $this->getFullTableName("site_content");
         $tbldg = $this->getFullTableName("document_groups");
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
             $docgrp = implode(",", $docgrp);
         }
         // build query
-        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
         $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->db->makeArray($result);
@@ -3669,14 +3669,14 @@ 
         $tbldg = $this->getFullTableName("document_groups");
 
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
             $docgrp = implode(",", $docgrp);
         }
         // build query
-        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+        $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
         $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
                 LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND sc.published=1 AND sc.deleted=0 AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}");
         $resourceArray = $this->db->makeArray($result);
@@ -3711,16 +3711,16 @@ 
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        $published = ($published !== 'all') ? 'AND sc.published = ' . $published : '';
-        $deleted = ($deleted !== 'all') ? 'AND sc.deleted = ' . $deleted : '';
+        $published = ($published !== 'all') ? 'AND sc.published = '.$published : '';
+        $deleted = ($deleted !== 'all') ? 'AND sc.deleted = '.$deleted : '';
 
         if ($where != '') {
-            $where = 'AND ' . $where;
+            $where = 'AND '.$where;
         }
 
         // modify field names to use sc. table reference
-        $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-        $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+        $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+        $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
 
         // get document groups for current user
         if ($docgrp = $this->getUserDocGroups()) {
@@ -3728,7 +3728,7 @@ 
         }
 
         // build query
-        $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')');
+        $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')');
 
         $tblsc = $this->getFullTableName('site_content');
         $tbldg = $this->getFullTableName('document_groups');
@@ -3780,10 +3780,10 @@ 
             return false;
         } else {
             // modify field names to use sc. table reference
-            $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
-            $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
+            $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+            $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort))));
             if ($where != '') {
-                $where = 'AND ' . $where;
+                $where = 'AND '.$where;
             }
 
             $published = ($published !== 'all') ? "AND sc.published = '{$published}'" : '';
@@ -3794,13 +3794,13 @@ 
                 $docgrp = implode(',', $docgrp);
             }
 
-            $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')');
+            $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')');
 
             $tblsc = $this->getFullTableName('site_content');
             $tbldg = $this->getFullTableName('document_groups');
 
             $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc
-                    LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (" . implode(',', $ids) . ") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit);
+                    LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (".implode(',', $ids).") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit);
 
             $resourceArray = $this->db->makeArray($result);
 
@@ -3905,12 +3905,12 @@ 
             $tbldg = $this->getFullTableName("document_groups");
             $activeSql = $active == 1 ? "AND sc.published=1 AND sc.deleted=0" : "";
             // modify field names to use sc. table reference
-            $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
+            $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields))));
             // get document groups for current user
             if ($docgrp = $this->getUserDocGroups()) {
                 $docgrp = implode(",", $docgrp);
             }
-            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
+            $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)");
             $result = $this->db->select($fields, "{$tblsc} sc LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id='{$pageid}' {$activeSql}) AND ({$access})", "", 1);
             $pageInfo = $this->db->getRow($result);
 
@@ -3957,7 +3957,7 @@ 
     {
         if ($this->currentSnippet) {
             $tbl = $this->getFullTableName("site_snippets");
-            $rs = $this->db->select('id', $tbl, "name='" . $this->db->escape($this->currentSnippet) . "'", '', 1);
+            $rs = $this->db->select('id', $tbl, "name='".$this->db->escape($this->currentSnippet)."'", '', 1);
             if ($snippetId = $this->db->getValue($rs)) {
                 return $snippetId;
             }
@@ -3984,23 +3984,23 @@ 
      */
     public function clearCache($type = '', $report = false)
     {
-        $cache_dir = MODX_BASE_PATH . $this->getCacheFolder();
+        $cache_dir = MODX_BASE_PATH.$this->getCacheFolder();
         if (is_array($type)) {
             foreach ($type as $_) {
                 $this->clearCache($_, $report);
             }
         } elseif ($type == 'full') {
-            include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+            include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php');
             $sync = new synccache();
             $sync->setCachepath($cache_dir);
             $sync->setReport($report);
             $sync->emptyCache();
         } elseif (preg_match('@^[1-9][0-9]*$@', $type)) {
             $key = ($this->config['cache_type'] == 2) ? $this->makePageCacheKey($type) : $type;
-            $file_name = "docid_" . $key . "_*.pageCache.php";
-            $cache_path = $cache_dir . $file_name;
+            $file_name = "docid_".$key."_*.pageCache.php";
+            $cache_path = $cache_dir.$file_name;
             $files = glob($cache_path);
-            $files[] = $cache_dir . "docid_" . $key . ".pageCache.php";
+            $files[] = $cache_dir."docid_".$key.".pageCache.php";
             foreach ($files as $file) {
                 if (!is_file($file)) {
                     continue;
@@ -4008,7 +4008,7 @@ 
                 unlink($file);
             }
         } else {
-            $files = glob($cache_dir . '*');
+            $files = glob($cache_dir.'*');
             foreach ($files as $file) {
                 $name = basename($file);
                 if (strpos($name, '.pageCache.php') === false) {
@@ -4077,7 +4077,7 @@ 
                         $f_url_suffix = '/';
                     }
 
-                    $alPath = !empty ($al['path']) ? $al['path'] . '/' : '';
+                    $alPath = !empty ($al['path']) ? $al['path'].'/' : '';
 
                     if ($al && $al['alias']) {
                         $alias = $al['alias'];
@@ -4085,7 +4085,7 @@ 
 
                 }
 
-                $alias = $alPath . $f_url_prefix . $alias . $f_url_suffix;
+                $alias = $alPath.$f_url_prefix.$alias.$f_url_suffix;
                 $url = "{$alias}{$args}";
             } else {
                 $url = "index.php?id={$id}{$args}";
@@ -4104,7 +4104,7 @@ 
             }
 
             //TODO: check to make sure that $site_url incudes the url :port (e.g. :8080)
-            $host = $scheme == 'full' ? $this->config['site_url'] : $scheme . '://' . $_SERVER['HTTP_HOST'] . $host;
+            $host = $scheme == 'full' ? $this->config['site_url'] : $scheme.'://'.$_SERVER['HTTP_HOST'].$host;
         }
 
         //fix strictUrl by Bumkaka
@@ -4113,9 +4113,9 @@ 
         }
 
         if ($this->config['xhtml_urls']) {
-            $url = preg_replace("/&(?!amp;)/", "&amp;", $host . $virtualDir . $url);
+            $url = preg_replace("/&(?!amp;)/", "&amp;", $host.$virtualDir.$url);
         } else {
-            $url = $host . $virtualDir . $url;
+            $url = $host.$virtualDir.$url;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -4139,21 +4139,21 @@ 
         if (isset($this->aliasListing[$id])) {
             $out = $this->aliasListing[$id];
         } else {
-            $q = $this->db->query("SELECT id,alias,isfolder,parent FROM " . $this->getFullTableName("site_content") . " WHERE id=" . (int)$id);
+            $q = $this->db->query("SELECT id,alias,isfolder,parent FROM ".$this->getFullTableName("site_content")." WHERE id=".(int) $id);
             if ($this->db->getRecordCount($q) == '1') {
                 $q = $this->db->getRow($q);
                 $this->aliasListing[$id] = array(
-                    'id' => (int)$q['id'],
+                    'id' => (int) $q['id'],
                     'alias' => $q['alias'] == '' ? $q['id'] : $q['alias'],
-                    'parent' => (int)$q['parent'],
-                    'isfolder' => (int)$q['isfolder'],
+                    'parent' => (int) $q['parent'],
+                    'isfolder' => (int) $q['isfolder'],
                 );
                 if ($this->aliasListing[$id]['parent'] > 0) {
                     //fix alias_path_usage
                     if ($this->config['use_alias_path'] == '1') {
                         //&& $tmp['path'] != '' - fix error slash with epty path
                         $tmp = $this->getAliasListing($this->aliasListing[$id]['parent']);
-                        $this->aliasListing[$id]['path'] = $tmp['path'] . ($tmp['alias_visible'] ? (($tmp['parent'] > 0 && $tmp['path'] != '') ? '/' : '') . $tmp['alias'] : '');
+                        $this->aliasListing[$id]['path'] = $tmp['path'].($tmp['alias_visible'] ? (($tmp['parent'] > 0 && $tmp['path'] != '') ? '/' : '').$tmp['alias'] : '');
                     } else {
                         $this->aliasListing[$id]['path'] = '';
                     }
@@ -4194,7 +4194,7 @@ 
         $out = array();
         if (empty($this->version) || !is_array($this->version)) {
             //include for compatibility modx version < 1.0.10
-            include MODX_MANAGER_PATH . "includes/version.inc.php";
+            include MODX_MANAGER_PATH."includes/version.inc.php";
             $this->version = array();
             $this->version['version'] = isset($modx_version) ? $modx_version : '';
             $this->version['branch'] = isset($modx_branch) ? $modx_branch : '';
@@ -4216,18 +4216,18 @@ 
     {
         if (isset ($this->snippetCache[$snippetName])) {
             $snippet = $this->snippetCache[$snippetName];
-            $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : '';
+            $properties = !empty($this->snippetCache[$snippetName."Props"]) ? $this->snippetCache[$snippetName."Props"] : '';
         } else { // not in cache so let's check the db
-            $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->db->escape($snippetName) . "'  AND ss.disabled=0;";
+            $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM ".$this->getFullTableName("site_snippets")." as ss LEFT JOIN ".$this->getFullTableName('site_modules')." as sm on sm.guid=ss.moduleguid WHERE ss.`name`='".$this->db->escape($snippetName)."'  AND ss.disabled=0;";
             $result = $this->db->query($sql);
             if ($this->db->getRecordCount($result) == 1) {
                 $row = $this->db->getRow($result);
                 $snippet = $this->snippetCache[$snippetName] = $row['snippet'];
                 $mergedProperties = array_merge($this->parseProperties($row['properties']), $this->parseProperties($row['sharedproperties']));
-                $properties = $this->snippetCache[$snippetName . "Props"] = json_encode($mergedProperties);
+                $properties = $this->snippetCache[$snippetName."Props"] = json_encode($mergedProperties);
             } else {
                 $snippet = $this->snippetCache[$snippetName] = "return false;";
-                $properties = $this->snippetCache[$snippetName . "Props"] = '';
+                $properties = $this->snippetCache[$snippetName."Props"] = '';
             }
         }
         // load default params/properties
@@ -4327,8 +4327,8 @@ 
             }
             if (strpos($tpl, $s) !== false) {
                 $tpl = str_replace($s, $value, $tpl);
-            } elseif($this->debug) {
-                $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'] . $s, 2);
+            } elseif ($this->debug) {
+                $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'].$s, 2);
             }
         }
 
@@ -4377,7 +4377,7 @@ 
             case 'CODE':
                 break;
             case 'FILE':
-                $template = file_get_contents(MODX_BASE_PATH . $template);
+                $template = file_get_contents(MODX_BASE_PATH.$template);
                 break;
             case 'CHUNK':
                 $template = $this->getChunk($template);
@@ -4410,7 +4410,7 @@ 
         if ($mode !== 'formatOnly' && empty($timestamp)) {
             return '-';
         }
-        $timestamp = (int)$timestamp;
+        $timestamp = (int) $timestamp;
 
         switch ($this->config['datetime_format']) {
             case 'YYYY/mm/dd':
@@ -4430,7 +4430,7 @@ 
         }
 
         if (empty($mode)) {
-            $strTime = strftime($dateFormat . " %H:%M:%S", $timestamp);
+            $strTime = strftime($dateFormat." %H:%M:%S", $timestamp);
         } elseif ($mode == 'dateOnly') {
             $strTime = strftime($dateFormat, $timestamp);
         } elseif ($mode == 'formatOnly') {
@@ -4484,7 +4484,7 @@ 
             $S = 0;
         }
         $timeStamp = mktime($H, $M, $S, $m, $d, $Y);
-        $timeStamp = (int)$timeStamp;
+        $timeStamp = (int) $timeStamp;
         return $timeStamp;
     }
 
@@ -4526,7 +4526,7 @@ 
                     if ($v === 'value') {
                         unset($_[$i]);
                     } else {
-                        $_[$i] = 'tv.' . $v;
+                        $_[$i] = 'tv.'.$v;
                     }
                 }
                 $fields = implode(',', $_);
@@ -4535,12 +4535,12 @@ 
             }
 
             if ($tvsort != '') {
-                $tvsort = 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
+                $tvsort = 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $tvsort))));
             }
             if ($tvidnames == "*") {
                 $query = "tv.id<>0";
             } else {
-                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name") . " IN ('" . implode("','", $tvidnames) . "')";
+                $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name")." IN ('".implode("','", $tvidnames)."')";
             }
 
             $this->getUserDocGroups();
@@ -4684,7 +4684,7 @@ 
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        if (($idnames != '*' && !is_array($idnames)) || empty($idnames) ) {
+        if (($idnames != '*' && !is_array($idnames)) || empty($idnames)) {
             return false;
         } else {
 
@@ -4702,23 +4702,23 @@ 
             }
 
             // get user defined template variables
-            $fields = ($fields == '') ? 'tv.*' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $fields))));
-            $sort = ($sort == '') ? '' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $sort))));
+            $fields = ($fields == '') ? 'tv.*' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $fields))));
+            $sort = ($sort == '') ? '' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $sort))));
 
             if ($idnames == '*') {
                 $query = 'tv.id<>0';
             } else {
-                $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name') . " IN ('" . implode("','", $idnames) . "')";
+                $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name')." IN ('".implode("','", $idnames)."')";
             }
 
-            $rs = $this->db->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getFullTableName('site_tmplvars') . " tv
-                    INNER JOIN " . $this->getFullTableName('site_tmplvar_templates') . " tvtpl ON tvtpl.tmplvarid = tv.id
-                    LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues') . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'", "{$query} AND tvtpl.templateid = '{$docRow['template']}'", ($sort ? "{$sort} {$dir}" : ""));
+            $rs = $this->db->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getFullTableName('site_tmplvars')." tv
+                    INNER JOIN " . $this->getFullTableName('site_tmplvar_templates')." tvtpl ON tvtpl.tmplvarid = tv.id
+                    LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues')." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'", "{$query} AND tvtpl.templateid = '{$docRow['template']}'", ($sort ? "{$sort} {$dir}" : ""));
 
             $result = $this->db->makeArray($rs);
 
             // get default/built-in template variables
-            if(is_array($docRow)){
+            if (is_array($docRow)) {
                 ksort($docRow);
 
                 foreach ($docRow as $key => $value) {
@@ -4756,22 +4756,22 @@ 
      */
     public function getTemplateVarOutput($idnames = array(), $docid = '', $published = 1, $sep = '')
     {
-        if (is_array($idnames) && empty($idnames) ) {
+        if (is_array($idnames) && empty($idnames)) {
             return false;
         } else {
             $output = array();
             $vars = ($idnames == '*' || is_array($idnames)) ? $idnames : array($idnames);
 
-            $docid = (int)$docid > 0 ? (int)$docid : $this->documentIdentifier;
+            $docid = (int) $docid > 0 ? (int) $docid : $this->documentIdentifier;
             // remove sort for speed
             $result = $this->getTemplateVars($vars, '*', $docid, $published, '', '');
 
             if ($result == false) {
                 return false;
             } else {
-                $baspath = MODX_MANAGER_PATH . 'includes';
-                include_once $baspath . '/tmplvars.format.inc.php';
-                include_once $baspath . '/tmplvars.commands.inc.php';
+                $baspath = MODX_MANAGER_PATH.'includes';
+                include_once $baspath.'/tmplvars.format.inc.php';
+                include_once $baspath.'/tmplvars.commands.inc.php';
 
                 for ($i = 0; $i < count($result); $i++) {
                     $row = $result[$i];
@@ -4796,7 +4796,7 @@ 
      */
     public function getFullTableName($tbl)
     {
-        return $this->db->config['dbase'] . ".`" . $this->db->config['table_prefix'] . $tbl . "`";
+        return $this->db->config['dbase'].".`".$this->db->config['table_prefix'].$tbl."`";
     }
 
     /**
@@ -4875,7 +4875,7 @@ 
     public function getCachePath()
     {
         global $base_url;
-        $pth = $base_url . $this->getCacheFolder();
+        $pth = $base_url.$this->getCacheFolder();
         return $pth;
     }
 
@@ -4927,8 +4927,8 @@ 
         $out = false;
 
         if (!empty($context)) {
-            if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) {
-                $out = $_SESSION[$context . 'InternalKey'];
+            if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) {
+                $out = $_SESSION[$context.'InternalKey'];
             }
         } else {
             switch (true) {
@@ -4956,8 +4956,8 @@ 
         $out = false;
 
         if (!empty($context)) {
-            if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) {
-                $out = $_SESSION[$context . 'Shortname'];
+            if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) {
+                $out = $_SESSION[$context.'Shortname'];
             }
         } else {
             switch (true) {
@@ -5028,8 +5028,8 @@ 
      */
     public function getWebUserInfo($uid)
     {
-        $rs = $this->db->select('wu.username, wu.password, wua.*', $this->getFullTableName("web_users") . " wu
-                INNER JOIN " . $this->getFullTableName("web_user_attributes") . " wua ON wua.internalkey=wu.id", "wu.id='{$uid}'");
+        $rs = $this->db->select('wu.username, wu.password, wua.*', $this->getFullTableName("web_users")." wu
+                INNER JOIN " . $this->getFullTableName("web_user_attributes")." wua ON wua.internalkey=wu.id", "wu.id='{$uid}'");
         if ($row = $this->db->getRow($rs)) {
             if (!isset($row['usertype']) or !$row["usertype"]) {
                 $row["usertype"] = "web";
@@ -5065,7 +5065,7 @@ 
         } else if (is_array($dg)) {
             // resolve ids to names
             $dgn = array();
-            $ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (" . implode(",", $dg) . ")");
+            $ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (".implode(",", $dg).")");
             while ($row = $this->db->getRow($ds)) {
                 $dgn[] = $row['name'];
             }
@@ -5093,7 +5093,7 @@ 
         $rt = false;
         if ($_SESSION["webValidated"] == 1) {
             $tbl = $this->getFullTableName("web_users");
-            $ds = $this->db->select('id, username, password', $tbl, "id='" . $this->getLoginUserID() . "'");
+            $ds = $this->db->select('id, username, password', $tbl, "id='".$this->getLoginUserID()."'");
             if ($row = $this->db->getRow($ds)) {
                 if ($row["password"] == md5($oldPwd)) {
                     if (strlen($newPwd) < 6) {
@@ -5103,7 +5103,7 @@ 
                     } else {
                         $this->db->update(array(
                             'password' => $this->db->escape($newPwd),
-                        ), $tbl, "id='" . $this->getLoginUserID() . "'");
+                        ), $tbl, "id='".$this->getLoginUserID()."'");
                         // invoke OnWebChangePassword event
                         $this->invokeEvent("OnWebChangePassword", array(
                             "userid" => $row["id"],
@@ -5134,8 +5134,8 @@ 
         // check cache
         $grpNames = isset ($_SESSION['webUserGroupNames']) ? $_SESSION['webUserGroupNames'] : false;
         if (!is_array($grpNames)) {
-            $rs = $this->db->select('wgn.name', $this->getFullTableName("webgroup_names") . " wgn
-                    INNER JOIN " . $this->getFullTableName("web_groups") . " wg ON wg.webgroup=wgn.id AND wg.webuser='" . $this->getLoginUserID() . "'");
+            $rs = $this->db->select('wgn.name', $this->getFullTableName("webgroup_names")." wgn
+                    INNER JOIN " . $this->getFullTableName("web_groups")." wg ON wg.webgroup=wgn.id AND wg.webuser='".$this->getLoginUserID()."'");
             $grpNames = $this->db->getColumn("name", $rs);
             // save to cache
             $_SESSION['webUserGroupNames'] = $grpNames;
@@ -5168,7 +5168,7 @@ 
         if (strpos(strtolower($src), "<style") !== false || strpos(strtolower($src), "<link") !== false) {
             $this->sjscripts[$nextpos] = $src;
         } else {
-            $this->sjscripts[$nextpos] = "\t" . '<link rel="stylesheet" type="text/css" href="' . $src . '" ' . ($media ? 'media="' . $media . '" ' : '') . '/>';
+            $this->sjscripts[$nextpos] = "\t".'<link rel="stylesheet" type="text/css" href="'.$src.'" '.($media ? 'media="'.$media.'" ' : '').'/>';
         }
     }
 
@@ -5247,7 +5247,7 @@ 
         }
 
         if ($useThisVer && $plaintext != true && (strpos(strtolower($src), "<script") === false)) {
-            $src = "\t" . '<script type="text/javascript" src="' . $src . '"></script>';
+            $src = "\t".'<script type="text/javascript" src="'.$src.'"></script>';
         }
         if ($startup) {
             $pos = isset($overwritepos) ? $overwritepos : max(array_merge(array(0), array_keys($this->sjscripts))) + 1;
@@ -5393,7 +5393,7 @@ 
                 $eventtime = $this->getMicroTime() - $eventtime;
                 $this->pluginsCode .= sprintf('<fieldset><legend><b>%s / %s</b> (%2.2f ms)</legend>', $evtName, $pluginName, $eventtime * 1000);
                 foreach ($parameter as $k => $v) {
-                    $this->pluginsCode .= "{$k} => " . print_r($v, true) . '<br>';
+                    $this->pluginsCode .= "{$k} => ".print_r($v, true).'<br>';
                 }
                 $this->pluginsCode .= '</fieldset><br />';
                 $this->pluginsTime["{$evtName} / {$pluginName}"] += $eventtime;
@@ -5421,13 +5421,13 @@ 
         $plugin = array();
         if (isset ($this->pluginCache[$pluginName])) {
             $pluginCode = $this->pluginCache[$pluginName];
-            $pluginProperties = isset($this->pluginCache[$pluginName . "Props"]) ? $this->pluginCache[$pluginName . "Props"] : '';
+            $pluginProperties = isset($this->pluginCache[$pluginName."Props"]) ? $this->pluginCache[$pluginName."Props"] : '';
         } else {
             $pluginName = $this->db->escape($pluginName);
             $result = $this->db->select('name, plugincode, properties', $this->getFullTableName("site_plugins"), "name='{$pluginName}' AND disabled=0");
             if ($row = $this->db->getRow($result)) {
                 $pluginCode = $this->pluginCache[$row['name']] = $row['plugincode'];
-                $pluginProperties = $this->pluginCache[$row['name'] . "Props"] = $row['properties'];
+                $pluginProperties = $this->pluginCache[$row['name']."Props"] = $row['properties'];
             } else {
                 $pluginCode = $this->pluginCache[$pluginName] = "return false;";
                 $pluginProperties = '';
@@ -5534,7 +5534,7 @@ 
     public function parseDocBlockFromFile($element_dir, $filename, $escapeValues = false)
     {
         $params = array();
-        $fullpath = $element_dir . '/' . $filename;
+        $fullpath = $element_dir.'/'.$filename;
         if (is_readable($fullpath)) {
             $tpl = @fopen($fullpath, "r");
             if ($tpl) {
@@ -5701,8 +5701,8 @@ 
         $ph = array('site_url' => MODX_SITE_URL);
         $regexUrl = "/((http|https|ftp|ftps)\:\/\/[^\/]+(\/[^\s]+[^,.?!:;\s])?)/";
         $regexEmail = '#([0-9a-z]([-_.]?[0-9a-z])*@[0-9a-z]([-.]?[0-9a-z])*\\.[a-wyz][a-z](fo|g|l|m|mes|o|op|pa|ro|seum|t|u|v|z)?)#i';
-        $emailSubject = isset($parsed['name']) ? '?subject=' . $parsed['name'] : '';
-        $emailSubject .= isset($parsed['version']) ? ' v' . $parsed['version'] : '';
+        $emailSubject = isset($parsed['name']) ? '?subject='.$parsed['name'] : '';
+        $emailSubject .= isset($parsed['version']) ? ' v'.$parsed['version'] : '';
         foreach ($parsed as $key => $val) {
             if (is_array($val)) {
                 foreach ($val as $key2 => $val2) {
@@ -5711,7 +5711,7 @@ 
                         $val2 = preg_replace($regexUrl, "<a href=\"{$url[0]}\" target=\"_blank\">{$url[0]}</a> ", $val2);
                     }
                     if (preg_match($regexEmail, $val2, $url)) {
-                        $val2 = preg_replace($regexEmail, '<a href="mailto:\\1' . $emailSubject . '">\\1</a>', $val2);
+                        $val2 = preg_replace($regexEmail, '<a href="mailto:\\1'.$emailSubject.'">\\1</a>', $val2);
                     }
                     $parsed[$key][$key2] = $val2;
                 }
@@ -5721,7 +5721,7 @@ 
                     $val = preg_replace($regexUrl, "<a href=\"{$url[0]}\" target=\"_blank\">{$url[0]}</a> ", $val);
                 }
                 if (preg_match($regexEmail, $val, $url)) {
-                    $val = preg_replace($regexEmail, '<a href="mailto:\\1' . $emailSubject . '">\\1</a>', $val);
+                    $val = preg_replace($regexEmail, '<a href="mailto:\\1'.$emailSubject.'">\\1</a>', $val);
                 }
                 $parsed[$key] = $val;
             }
@@ -5735,32 +5735,32 @@ 
         );
 
         $nl = "\n";
-        $list = isset($parsed['logo']) ? '<img src="' . $this->config['base_url'] . ltrim($parsed['logo'], "/") . '" style="float:right;max-width:100px;height:auto;" />' . $nl : '';
-        $list .= '<p>' . $nl;
-        $list .= isset($parsed['name']) ? '<strong>' . $parsed['name'] . '</strong><br/>' . $nl : '';
-        $list .= isset($parsed['description']) ? $parsed['description'] . $nl : '';
-        $list .= '</p><br/>' . $nl;
-        $list .= isset($parsed['version']) ? '<p><strong>' . $_lang['version'] . ':</strong> ' . $parsed['version'] . '</p>' . $nl : '';
-        $list .= isset($parsed['license']) ? '<p><strong>' . $_lang['license'] . ':</strong> ' . $parsed['license'] . '</p>' . $nl : '';
-        $list .= isset($parsed['lastupdate']) ? '<p><strong>' . $_lang['last_update'] . ':</strong> ' . $parsed['lastupdate'] . '</p>' . $nl : '';
-        $list .= '<br/>' . $nl;
+        $list = isset($parsed['logo']) ? '<img src="'.$this->config['base_url'].ltrim($parsed['logo'], "/").'" style="float:right;max-width:100px;height:auto;" />'.$nl : '';
+        $list .= '<p>'.$nl;
+        $list .= isset($parsed['name']) ? '<strong>'.$parsed['name'].'</strong><br/>'.$nl : '';
+        $list .= isset($parsed['description']) ? $parsed['description'].$nl : '';
+        $list .= '</p><br/>'.$nl;
+        $list .= isset($parsed['version']) ? '<p><strong>'.$_lang['version'].':</strong> '.$parsed['version'].'</p>'.$nl : '';
+        $list .= isset($parsed['license']) ? '<p><strong>'.$_lang['license'].':</strong> '.$parsed['license'].'</p>'.$nl : '';
+        $list .= isset($parsed['lastupdate']) ? '<p><strong>'.$_lang['last_update'].':</strong> '.$parsed['lastupdate'].'</p>'.$nl : '';
+        $list .= '<br/>'.$nl;
         $first = true;
         foreach ($arrayParams as $param => $label) {
             if (isset($parsed[$param])) {
                 if ($first) {
-                    $list .= '<p><strong>' . $_lang['references'] . '</strong></p>' . $nl;
-                    $list .= '<ul class="docBlockList">' . $nl;
+                    $list .= '<p><strong>'.$_lang['references'].'</strong></p>'.$nl;
+                    $list .= '<ul class="docBlockList">'.$nl;
                     $first = false;
                 }
-                $list .= '    <li><strong>' . $label . '</strong>' . $nl;
-                $list .= '        <ul>' . $nl;
+                $list .= '    <li><strong>'.$label.'</strong>'.$nl;
+                $list .= '        <ul>'.$nl;
                 foreach ($parsed[$param] as $val) {
-                    $list .= '            <li>' . $val . '</li>' . $nl;
+                    $list .= '            <li>'.$val.'</li>'.$nl;
                 }
-                $list .= '        </ul></li>' . $nl;
+                $list .= '        </ul></li>'.$nl;
             }
         }
-        $list .= !$first ? '</ul>' . $nl : '';
+        $list .= !$first ? '</ul>'.$nl : '';
 
         return $list;
     }
@@ -5836,7 +5836,7 @@ 
      */
     public function addSnippet($name, $phpCode)
     {
-        $this->snippetCache['#' . $name] = $phpCode;
+        $this->snippetCache['#'.$name] = $phpCode;
     }
 
     /**
@@ -5845,7 +5845,7 @@ 
      */
     public function addChunk($name, $text)
     {
-        $this->chunkCache['#' . $name] = $text;
+        $this->chunkCache['#'.$name] = $text;
     }
 
     /**
@@ -5881,7 +5881,7 @@ 
         }
 
         if (!$isSafe) {
-            $msg = $phpcode . "\n" . $this->currentSnippet . "\n" . print_r($_SERVER, true);
+            $msg = $phpcode."\n".$this->currentSnippet."\n".print_r($_SERVER, true);
             $title = sprintf('Unknown eval was executed (%s)', $this->htmlspecialchars(substr(trim($phpcode), 0, 50)));
             $this->messageQuit($title, '', true, '', '', 'Parser', $msg);
             return;
@@ -5895,7 +5895,7 @@ 
             return 'array()';
         }
 
-        $output = $echo . $return;
+        $output = $echo.$return;
         modx_sanitize_gpc($output);
         return $this->htmlspecialchars($output); // Maybe, all html tags are dangerous
     }
@@ -5913,8 +5913,8 @@ 
 
         $safe = explode(',', $safe_functions);
 
-        $phpcode = rtrim($phpcode, ';') . ';';
-        $tokens = token_get_all('<?php ' . $phpcode);
+        $phpcode = rtrim($phpcode, ';').';';
+        $tokens = token_get_all('<?php '.$phpcode);
         foreach ($tokens as $i => $token) {
             if (!is_array($token)) {
                 continue;
@@ -5950,7 +5950,7 @@ 
     public function atBindFileContent($str = '')
     {
 
-        $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->config['rb_base_url'] . 'files/', '');
+        $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->config['rb_base_url'].'files/', '');
 
         if (stripos($str, '@FILE') !== 0) {
             return $str;
@@ -5973,7 +5973,7 @@ 
         $errorMsg = sprintf("Could not retrieve string '%s'.", $str);
 
         foreach ($search_path as $path) {
-            $file_path = MODX_BASE_PATH . $path . $str;
+            $file_path = MODX_BASE_PATH.$path.$str;
             if (strpos($file_path, MODX_MANAGER_PATH) === 0) {
                 return $errorMsg;
             } elseif (is_file($file_path)) {
@@ -5987,7 +5987,7 @@ 
             return $errorMsg;
         }
 
-        $content = (string)file_get_contents($file_path);
+        $content = (string) file_get_contents($file_path);
         if ($content === false) {
             return $errorMsg;
         }
@@ -6100,22 +6100,22 @@ 
 
         $version = isset ($GLOBALS['modx_version']) ? $GLOBALS['modx_version'] : '';
         $release_date = isset ($GLOBALS['release_date']) ? $GLOBALS['release_date'] : '';
-        $request_uri = "http://" . $_SERVER['HTTP_HOST'] . ($_SERVER["SERVER_PORT"] == 80 ? "" : (":" . $_SERVER["SERVER_PORT"])) . $_SERVER['REQUEST_URI'];
+        $request_uri = "http://".$_SERVER['HTTP_HOST'].($_SERVER["SERVER_PORT"] == 80 ? "" : (":".$_SERVER["SERVER_PORT"])).$_SERVER['REQUEST_URI'];
         $request_uri = $this->htmlspecialchars($request_uri, ENT_QUOTES, $this->config['modx_charset']);
         $ua = $this->htmlspecialchars($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES, $this->config['modx_charset']);
         $referer = $this->htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_QUOTES, $this->config['modx_charset']);
         if ($is_error) {
             $str = '<h2 style="color:red">&laquo; Evo Parse Error &raquo;</h2>';
             if ($msg != 'PHP Parse Error') {
-                $str .= '<h3 style="color:red">' . $msg . '</h3>';
+                $str .= '<h3 style="color:red">'.$msg.'</h3>';
             }
         } else {
             $str = '<h2 style="color:#003399">&laquo; Evo Debug/ stop message &raquo;</h2>';
-            $str .= '<h3 style="color:#003399">' . $msg . '</h3>';
+            $str .= '<h3 style="color:#003399">'.$msg.'</h3>';
         }
 
         if (!empty ($query)) {
-            $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL &gt; <span id="sqlHolder">' . $query . '</span></div>';
+            $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL &gt; <span id="sqlHolder">'.$query.'</span></div>';
         }
 
         $errortype = array(
@@ -6138,13 +6138,13 @@ 
 
         if (!empty($nr) || !empty($file)) {
             if ($text != '') {
-                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : ' . $text . '</div>';
+                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : '.$text.'</div>';
             }
             if ($output != '') {
-                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">' . $output . '</div>';
+                $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">'.$output.'</div>';
             }
             if ($nr !== '') {
-                $table[] = array('ErrorType[num]', $errortype [$nr] . "[" . $nr . "]");
+                $table[] = array('ErrorType[num]', $errortype [$nr]."[".$nr."]");
             }
             if ($file) {
                 $table[] = array('File', $file);
@@ -6164,7 +6164,7 @@ 
         }
 
         if (!empty($this->event->activePlugin)) {
-            $table[] = array('Current Plugin', $this->event->activePlugin . '(' . $this->event->name . ')');
+            $table[] = array('Current Plugin', $this->event->activePlugin.'('.$this->event->name.')');
         }
 
         $str .= $MakeTable->create($table, array('Error information', ''));
@@ -6174,17 +6174,17 @@ 
         $table[] = array('REQUEST_URI', $request_uri);
 
         if ($this->manager->action) {
-            include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');
+            include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php');
             global $action_list;
             $actionName = (isset($action_list[$this->manager->action])) ? " - {$action_list[$this->manager->action]}" : '';
 
-            $table[] = array('Manager action', $this->manager->action . $actionName);
+            $table[] = array('Manager action', $this->manager->action.$actionName);
         }
 
         if (preg_match('@^[0-9]+@', $this->documentIdentifier)) {
             $resource = $this->getDocumentObject('id', $this->documentIdentifier);
             $url = $this->makeUrl($this->documentIdentifier, '', '', 'full');
-            $table[] = array('Resource', '[' . $this->documentIdentifier . '] <a href="' . $url . '" target="_blank">' . $resource['pagetitle'] . '</a>');
+            $table[] = array('Resource', '['.$this->documentIdentifier.'] <a href="'.$url.'" target="_blank">'.$resource['pagetitle'].'</a>');
         }
         $table[] = array('Referer', $referer);
         $table[] = array('User Agent', $ua);
@@ -6205,7 +6205,7 @@ 
 
         $mem = memory_get_peak_usage(true);
         $total_mem = $mem - $this->mstart;
-        $total_mem = ($total_mem / 1024 / 1024) . ' mb';
+        $total_mem = ($total_mem / 1024 / 1024).' mb';
 
         $queryTime = $this->queryTime;
         $phpTime = $totalTime - $queryTime;
@@ -6226,18 +6226,18 @@ 
         $str .= $this->get_backtrace(debug_backtrace());
         // Log error
         if (!empty($this->currentSnippet)) {
-            $source = 'Snippet - ' . $this->currentSnippet;
+            $source = 'Snippet - '.$this->currentSnippet;
         } elseif (!empty($this->event->activePlugin)) {
-            $source = 'Plugin - ' . $this->event->activePlugin;
+            $source = 'Plugin - '.$this->event->activePlugin;
         } elseif ($source !== '') {
-            $source = 'Parser - ' . $source;
+            $source = 'Parser - '.$source;
         } elseif ($query !== '') {
             $source = 'SQL Query';
         } else {
             $source = 'Parser';
         }
         if ($msg) {
-            $source .= ' / ' . $msg;
+            $source .= ' / '.$msg;
         }
         if (isset($actionName) && !empty($actionName)) {
             $source .= $actionName;
@@ -6269,12 +6269,12 @@ 
 
         // Display error
         if (isset($_SESSION['mgrValidated'])) {
-            echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager ' . $version . ' &raquo; ' . $release_date . '</title>
+            echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager '.$version.' &raquo; '.$release_date.'</title>
                  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-                 <link rel="stylesheet" type="text/css" href="' . $this->config['site_manager_url'] . 'media/style/' . $this->config['manager_theme'] . '/style.css" />
+                 <link rel="stylesheet" type="text/css" href="' . $this->config['site_manager_url'].'media/style/'.$this->config['manager_theme'].'/style.css" />
                  <style type="text/css">body { padding:10px; } td {font:inherit;}</style>
                  </head><body>
-                 ' . $str . '</body></html>';
+                 ' . $str.'</body></html>';
 
         } else {
             echo 'Error';
@@ -6312,7 +6312,7 @@ 
             switch ($val['type']) {
                 case '->':
                 case '::':
-                    $functionName = $val['function'] = $val['class'] . $val['type'] . $val['function'];
+                    $functionName = $val['function'] = $val['class'].$val['type'].$val['function'];
                     break;
                 default:
                     $functionName = $val['function'];
@@ -6322,7 +6322,7 @@ 
             $args = array_pad(array(), $_, '$var');
             $args = implode(", ", $args);
             $modx = &$this;
-            $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) {
+            $args = preg_replace_callback('/\$var/', function() use ($modx, &$tmp, $val) {
                 $arg = $val['args'][$tmp - 1];
                 switch (true) {
                     case is_null($arg): {
@@ -6334,7 +6334,7 @@ 
                         break;
                     }
                     case is_scalar($arg): {
-                        $out = strlen($arg) > 20 ? 'string $var' . $tmp : ("'" . $this->htmlspecialchars(str_replace("'", "\\'", $arg)) . "'");
+                        $out = strlen($arg) > 20 ? 'string $var'.$tmp : ("'".$this->htmlspecialchars(str_replace("'", "\\'", $arg))."'");
                         break;
                     }
                     case is_bool($arg): {
@@ -6342,23 +6342,23 @@ 
                         break;
                     }
                     case is_array($arg): {
-                        $out = 'array $var' . $tmp;
+                        $out = 'array $var'.$tmp;
                         break;
                     }
                     case is_object($arg): {
-                        $out = get_class($arg) . ' $var' . $tmp;
+                        $out = get_class($arg).' $var'.$tmp;
                         break;
                     }
                     default: {
-                        $out = '$var' . $tmp;
+                        $out = '$var'.$tmp;
                     }
                 }
                 $tmp++;
                 return $out;
             }, $args);
             $line = array(
-                "<strong>" . $functionName . "</strong>(" . $args . ")",
-                $path . " on line " . $val['line']
+                "<strong>".$functionName."</strong>(".$args.")",
+                $path." on line ".$val['line']
             );
             $table[] = array(implode("<br />", $line));
         }
@@ -6399,7 +6399,7 @@ 
             $alias = strip_tags($alias); // strip HTML
             $alias = preg_replace('/[^\.A-Za-z0-9 _-]/', '', $alias); // strip non-alphanumeric characters
             $alias = preg_replace('/\s+/', '-', $alias); // convert white-space to dash
-            $alias = preg_replace('/-+/', '-', $alias);  // convert multiple dashes to one
+            $alias = preg_replace('/-+/', '-', $alias); // convert multiple dashes to one
             $alias = trim($alias, '-'); // trim excess
             return $alias;
         }
@@ -6415,7 +6415,7 @@ 
         $precisions = count($sizes) - 1;
         foreach ($sizes as $unit => $bytes) {
             if ($size >= $bytes) {
-                return number_format($size / $bytes, $precisions) . ' ' . $unit;
+                return number_format($size / $bytes, $precisions).' '.$unit;
             }
             $precisions--;
         }
@@ -6519,10 +6519,10 @@ 
 
         if (strpos($str, MODX_MANAGER_PATH) === 0) {
             return false;
-        } elseif (is_file(MODX_BASE_PATH . $str)) {
-            $file_path = MODX_BASE_PATH . $str;
-        } elseif (is_file(MODX_BASE_PATH . "{$tpl_dir}{$str}")) {
-            $file_path = MODX_BASE_PATH . $tpl_dir . $str;
+        } elseif (is_file(MODX_BASE_PATH.$str)) {
+            $file_path = MODX_BASE_PATH.$str;
+        } elseif (is_file(MODX_BASE_PATH."{$tpl_dir}{$str}")) {
+            $file_path = MODX_BASE_PATH.$tpl_dir.$str;
         } else {
             return false;
         }
@@ -6648,7 +6648,7 @@ 
             $title = 'no title';
         }
         if (is_array($msg)) {
-            $msg = '<pre>' . print_r($msg, true) . '</pre>';
+            $msg = '<pre>'.print_r($msg, true).'</pre>';
         } elseif ($msg === '') {
             $msg = $_SERVER['REQUEST_URI'];
         }
@@ -6693,7 +6693,7 @@ 
         if (is_array($SystemAlertMsgQueque)) {
             $title = '';
             if ($this->name && $this->activePlugin) {
-                $title = "<div><b>" . $this->activePlugin . "</b> - <span style='color:maroon;'>" . $this->name . "</span></div>";
+                $title = "<div><b>".$this->activePlugin."</b> - <span style='color:maroon;'>".$this->name."</span></div>";
             }
             $SystemAlertMsgQueque[] = "$title<div style='margin-left:10px;margin-top:3px;'>$msg</div>";
         }