evolution-cms / evolution

manager/actions/mutate_module.dynamic.php

Spacing +36 added lines, -36 removed lines

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

 }

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

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

 	case 107:

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

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

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

 		}

 		break;

 	case 108:

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

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

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

 		}

 		break;

 	default:

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

 }

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

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

 // Get table names (alphabetical)

 $tbl_membergroup_names = $modx->getFullTableName('membergroup_names');

 $tbl_site_content = $modx->getFullTableName('site_content');

@@ -33,16 +33,16 @@ 
  *

  * @return string

  */

-function createGUID() {

+function createGUID(){

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

 	$r = rand();

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

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

 	$m = md5($u);

 	return $m;

 }

 

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

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

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

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

 }

 // end check for lock

@@ -50,29 +50,29 @@ 
 // Lock snippet for other users to edit

 $modx->lockElement(6, $id);

 

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

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

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

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

-	if(!$content) {

+	if (!$content) {

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

 	}

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

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

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

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

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

 	}

 } else {

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

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

 }

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

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

 	$modx->manager->loadFormValues();

 }

 

 // Add lock-element JS-Script

 $lockElementId = $id;

 $lockElementType = 6;

-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');

+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');

 ?>

 <script type="text/javascript">

 	function loadDependencies() {

@@ -419,7 +419,7 @@ 
 	function BrowseServer() {

 		var w = screen.width * 0.7;

 		var h = screen.height * 0.7;

-		OpenServerBrowser("<?= MODX_MANAGER_URL;?>media/browser/<?= $which_browser;?>/browser.php?Type=images", w, h);

+		OpenServerBrowser("<?= MODX_MANAGER_URL; ?>media/browser/<?= $which_browser; ?>/browser.php?Type=images", w, h);

 	}

 

 	function SetUrl(url, width, height, alt) {

@@ -439,7 +439,7 @@ 
 	<?php

 	// invoke OnModFormPrerender event

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

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode('', $evtOut);

 	}

 

@@ -453,7 +453,7 @@ 
 	<input type="hidden" name="mode" value="<?= $modx->manager->action ?>">

 

 	<h1>

-		<i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>

+		<i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>

 	</h1>

 

 	<?= $_style['actionbuttons']['dynamic']['element'] ?>

@@ -478,8 +478,8 @@ 
 						<div class="col-md-9 col-lg-10">

 							<div class="form-control-name clearfix">

 								<input name="name" type="text" maxlength="100" 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_module'] . "\n" . $_lang['lock_module_msg'] ?>" tooltip>

+								<?php if ($modx->hasPermission('save_role')): ?>

+									<label class="custom-control" title="<?= $_lang['lock_module']."\n".$_lang['lock_module_msg'] ?>" tooltip>

 										<input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />

 										<i class="fa fa-lock"></i>

 									</label>

@@ -501,9 +501,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 "\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";

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

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

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

 								}

 								?>

 							</select>

@@ -535,7 +535,7 @@ 
 				<div class="form-group">

 					<div class="form-row">

 						<label for="disabled"><input name="disabled" id="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> />

-							<?= ($content['disabled'] == 1 ? '<span class="text-danger">' . $_lang['module_disabled'] . '</span>' : $_lang['module_disabled']) ?></label>

+							<?= ($content['disabled'] == 1 ? '<span class="text-danger">'.$_lang['module_disabled'].'</span>' : $_lang['module_disabled']) ?></label>

 					</div>

 					<div class="form-row">

 						<label for="parse_docblock">

@@ -600,7 +600,7 @@ 
 			</div>

 			<!-- HTML text editor end -->

 		</div>

-		<?php if($modx->manager->action == '108'): ?>

+		<?php if ($modx->manager->action == '108'): ?>

 			<!-- Dependencies -->

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

 				<h2 class="tab"><?= $_lang['settings_dependencies'] ?></h2>

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

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

 

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

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

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

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

 					$grd->cssClass = 'grid';

 					$grd->columnHeaderClass = 'gridHeader';

 					$grd->itemClass = 'gridItem';

 					$grd->altItemClass = 'gridAltItem';

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

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

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

 					echo $grd->render();

 					?>

@@ -648,13 +648,13 @@ 
 			<h2 class="tab"><?= $_lang['access_permissions'] ?></h2>

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

 			<div class="container container-body">

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

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

 					<?php

 					// fetch user access permissions for the module

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

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

 

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

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

 						?>

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

@@ -682,22 +682,22 @@ 
 					}

 					$chk = '';

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

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

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

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

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

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

-							if($checked) {

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

+							if ($checked) {

 								$notPublic = true;

 							}

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

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

 						} else {

-							if($checked) {

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

+							if ($checked) {

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

 							}

 						}

 					}

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

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

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

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

 					}

 					echo $chks;

 					?>

@@ -718,7 +718,7 @@ 
 		<?php

 		// invoke OnModFormRender event

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

-		if(is_array($evtOut)) {

+		if (is_array($evtOut)) {

 			echo implode('', $evtOut);

 		}

 		?>

manager/actions/import_site.static.php

Spacing +83 added lines, -83 removed lines

@@ -1,8 +1,8 @@ 
 <?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('import_static')) {
+if (!$modx->hasPermission('import_static')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -43,8 +43,8 @@ 
 	<div class="tab-page">
 		<div class="container container-body">
 			<?php
-			if(!isset($_POST['import'])) {
-				echo "<div class=\"element-edit-message\">" . $_lang['import_site_message'] . "</div>";
+			if (!isset($_POST['import'])) {
+				echo "<div class=\"element-edit-message\">".$_lang['import_site_message']."</div>";
 				?>
 				<form action="index.php" method="post" name="importFrm">
 					<input type="hidden" name="import" value="import" />
@@ -104,14 +104,14 @@ 
 /**
  * @return string
  */
-function run() {
+function run(){
 	global $modx, $_lang;
 
 	$tbl_site_content = $modx->getFullTableName('site_content');
 	$output = '';
 	$maxtime = $_POST['maxtime'];
 
-	if(!is_numeric($maxtime)) {
+	if (!is_numeric($maxtime)) {
 		$maxtime = 30;
 	}
 
@@ -122,17 +122,17 @@ 
 	$mtime = $mtime[1] + $mtime[0];
 	$importstart = $mtime;
 
-	if($_POST['reset'] == 'on') {
+	if ($_POST['reset'] == 'on') {
 		$modx->db->truncate($tbl_site_content);
 		$modx->db->query("ALTER TABLE {$tbl_site_content} AUTO_INCREMENT = 1");
 	}
 
-	$parent = (int)$_POST['parent'];
+	$parent = (int) $_POST['parent'];
 
-	if(is_dir(MODX_BASE_PATH . 'temp/import')) {
-		$filedir = MODX_BASE_PATH . 'temp/import/';
-	} elseif(is_dir(MODX_BASE_PATH . 'assets/import')) {
-		$filedir = MODX_BASE_PATH . 'assets/import/';
+	if (is_dir(MODX_BASE_PATH.'temp/import')) {
+		$filedir = MODX_BASE_PATH.'temp/import/';
+	} elseif (is_dir(MODX_BASE_PATH.'assets/import')) {
+		$filedir = MODX_BASE_PATH.'assets/import/';
 	} else {
         $filedir = '';
     }
@@ -143,10 +143,10 @@ 
 	$files = pop_index($files);
 
 	// no. of files to import
-	$output .= sprintf('<p>' . $_lang['import_files_found'] . '</p>', $filesfound);
+	$output .= sprintf('<p>'.$_lang['import_files_found'].'</p>', $filesfound);
 
 	// import files
-	if(0 < count($files)) {
+	if (0 < count($files)) {
 		$modx->db->update(array('isfolder' => 1), $tbl_site_content, "id='{$parent}'");
 		importFiles($parent, $filedir, $files, 'root');
 	}
@@ -156,9 +156,9 @@ 
 	$mtime = $mtime[1] + $mtime[0];
 	$importend = $mtime;
 	$totaltime = ($importend - $importstart);
-	$output .= sprintf('<p>' . $_lang['import_site_time'] . '</p>', round($totaltime, 3));
+	$output .= sprintf('<p>'.$_lang['import_site_time'].'</p>', round($totaltime, 3));
 
-	if($_POST['convert_link'] == 'on') {
+	if ($_POST['convert_link'] == 'on') {
 		convertLink();
 	}
 
@@ -171,7 +171,7 @@ 
  * @param array $files
  * @param string $mode
  */
-function importFiles($parent, $filedir, $files, $mode) {
+function importFiles($parent, $filedir, $files, $mode){
 	global $modx;
 	global $_lang, $allowedfiles;
 	global $search_default, $cache_default, $publish_default;
@@ -180,21 +180,21 @@ 
 	$tbl_system_settings = $modx->getFullTableName('system_settings');
 
 	$createdby = $modx->getLoginUserID();
-	if(!is_array($files)) {
+	if (!is_array($files)) {
 		return;
 	}
-	if($_POST['object'] === 'all') {
+	if ($_POST['object'] === 'all') {
 		$modx->config['default_template'] = '0';
 		$richtext = '0';
 	} else {
 		$richtext = '1';
 	}
 
-	foreach($files as $id => $value) {
-		if(is_array($value)) {
+	foreach ($files as $id => $value) {
+		if (is_array($value)) {
 			// create folder
 			$alias = $id;
-			printf('<span>' . $_lang['import_site_importing_document'] . '</span>', $alias);
+			printf('<span>'.$_lang['import_site_importing_document'].'</span>', $alias);
 			$field = array();
 			$field['type'] = 'document';
 			$field['contentType'] = 'text/html';
@@ -209,12 +209,12 @@ 
 			$field['isfolder'] = 1;
 			$field['menuindex'] = 1;
 			$find = false;
-			foreach(array(
+			foreach (array(
 						'index.html',
 						'index.htm'
 					) as $filename) {
-				$filepath = $filedir . $alias . '/' . $filename;
-				if($find === false && file_exists($filepath)) {
+				$filepath = $filedir.$alias.'/'.$filename;
+				if ($find === false && file_exists($filepath)) {
 					$file = getFileContent($filepath);
 					list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
 
@@ -226,17 +226,17 @@ 
 					$field['createdon'] = $date;
 					$field['editedon'] = $date;
 					$newid = $modx->db->insert($field, $tbl_site_content);
-					if($newid) {
+					if ($newid) {
 						$find = true;
-						echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-						importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+						echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
+						importFiles($newid, $filedir.$alias.'/', $value, 'sub');
 					} else {
-						echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+						echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->getLastError();
 						exit;
 					}
 				}
 			}
-			if($find === false) {
+			if ($find === false) {
 				$date = time();
 				$field['pagetitle'] = '---';
 				$field['content'] = '';
@@ -244,30 +244,30 @@ 
 				$field['editedon'] = $date;
 				$field['hidemenu'] = '1';
 				$newid = $modx->db->insert($field, $tbl_site_content);
-				if($newid) {
+				if ($newid) {
 					$find = true;
-					echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-					importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+					echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
+					importFiles($newid, $filedir.$alias.'/', $value, 'sub');
 				} else {
-					echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+					echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->getLastError();
 					exit;
 				}
 			}
 		} else {
 			// create document
-			if($mode == 'sub' && $value == 'index.html') {
+			if ($mode == 'sub' && $value == 'index.html') {
 				continue;
 			}
 			$filename = $value;
 			$fparts = explode('.', $value);
 			$alias = $fparts[0];
 			$ext = (count($fparts) > 1) ? $fparts[count($fparts) - 1] : "";
-			printf("<span>" . $_lang['import_site_importing_document'] . "</span>", $filename);
+			printf("<span>".$_lang['import_site_importing_document']."</span>", $filename);
 
-			if(!in_array($ext, $allowedfiles)) {
-				echo ' - <span class="fail">' . $_lang["import_site_skip"] . '</span><br />' . "\n";
+			if (!in_array($ext, $allowedfiles)) {
+				echo ' - <span class="fail">'.$_lang["import_site_skip"].'</span><br />'."\n";
 			} else {
-				$filepath = $filedir . $filename;
+				$filepath = $filedir.$filename;
 				$file = getFileContent($filepath);
 				list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
 
@@ -292,18 +292,18 @@ 
 				$field['isfolder'] = 0;
 				$field['menuindex'] = ($alias == 'index') ? 0 : 2;
 				$newid = $modx->db->insert($field, $tbl_site_content);
-				if($newid) {
-					echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
+				if ($newid) {
+					echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
 				} else {
-					echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+					echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->getLastError();
 					exit;
 				}
 
 				$is_site_start = false;
-				if($filename == 'index.html') {
+				if ($filename == 'index.html') {
 					$is_site_start = true;
 				}
-				if($is_site_start == true && $_POST['reset'] == 'on') {
+				if ($is_site_start == true && $_POST['reset'] == 'on') {
 					$modx->db->update(array('setting_value' => $newid), $tbl_system_settings, "setting_name='site_start'");
 					$modx->db->update(array('menuindex' => 0), $tbl_site_content, "id='{$newid}'");
 				}
@@ -318,26 +318,26 @@ 
  * @param int $count
  * @return array
  */
-function getFiles($directory, $listing = array(), $count = 0) {
+function getFiles($directory, $listing = array(), $count = 0){
 	global $_lang;
 	global $filesfound;
 	$dummy = $count;
-	if( ! empty($directory) && $files = scandir($directory)) {
-		foreach($files as $file) {
-			if($file == '.' || $file == '..') {
+	if (!empty($directory) && $files = scandir($directory)) {
+		foreach ($files as $file) {
+			if ($file == '.' || $file == '..') {
 				continue;
-			} elseif($h = @opendir($directory . $file . "/")) {
+			} elseif ($h = @opendir($directory.$file."/")) {
 				closedir($h);
 				$count = -1;
-				$listing[$file] = getFiles($directory . $file . "/", array(), $count + 1);
-			} elseif(strpos($file, '.htm') !== false) {
+				$listing[$file] = getFiles($directory.$file."/", array(), $count + 1);
+			} elseif (strpos($file, '.htm') !== false) {
 				$listing[$dummy] = $file;
 				$dummy = $dummy + 1;
 				$filesfound++;
 			}
 		}
 	} else {
-		echo '<p><span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_no_open_dir"] . $directory . ".</p>";
+		echo '<p><span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_no_open_dir"].$directory.".</p>";
 	}
 	return ($listing);
 }
@@ -346,11 +346,11 @@ 
  * @param string $filepath
  * @return bool|string
  */
-function getFileContent($filepath) {
+function getFileContent($filepath){
 	global $_lang;
 	// get the file
-	if(!$buffer = file_get_contents($filepath)) {
-		echo '<p><span class="fail">' . $_lang['import_site_failed'] . "</span> " . $_lang["import_site_failed_no_retrieve_file"] . $filepath . ".</p>";
+	if (!$buffer = file_get_contents($filepath)) {
+		echo '<p><span class="fail">'.$_lang['import_site_failed']."</span> ".$_lang["import_site_failed_no_retrieve_file"].$filepath.".</p>";
 	} else {
 		return $buffer;
 	}
@@ -360,17 +360,17 @@ 
  * @param array $array
  * @return array
  */
-function pop_index($array) {
+function pop_index($array){
 	$new_array = array();
-	foreach($array as $k => $v) {
-		if($v !== 'index.html' && $v !== 'index.htm') {
+	foreach ($array as $k => $v) {
+		if ($v !== 'index.html' && $v !== 'index.htm') {
 			$new_array[$k] = $v;
 		} else {
 			array_unshift($new_array, $v);
 		}
 	}
-	foreach($array as $k => $v) {
-		if(is_array($v)) {
+	foreach ($array as $k => $v) {
+		if (is_array($v)) {
 			$new_array[$k] = $v;
 		}
 	}
@@ -383,34 +383,34 @@ 
  * @param string $alias
  * @return array
  */
-function treatContent($src, $filename, $alias) {
+function treatContent($src, $filename, $alias){
 	global $modx;
 
 	$src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
 
-	if(preg_match("@<title>(.*)</title>@i", $src, $matches)) {
+	if (preg_match("@<title>(.*)</title>@i", $src, $matches)) {
 		$pagetitle = ($matches[1] !== '') ? $matches[1] : $filename;
 		$pagetitle = str_replace('[*pagetitle*]', '', $pagetitle);
 	} else {
 		$pagetitle = $alias;
 	}
-	if(!$pagetitle) {
+	if (!$pagetitle) {
 		$pagetitle = $alias;
 	}
 
-	if(preg_match('@<meta[^>]+"description"[^>]+content=[\'"](.*)[\'"].+>@i', $src, $matches)) {
+	if (preg_match('@<meta[^>]+"description"[^>]+content=[\'"](.*)[\'"].+>@i', $src, $matches)) {
 		$description = ($matches[1] !== '') ? $matches[1] : $filename;
 		$description = str_replace('[*description*]', '', $description);
 	} else {
 		$description = '';
 	}
 
-	if((preg_match("@<body[^>]*>(.*)[^<]+</body>@is", $src, $matches)) && $_POST['object'] == 'body') {
+	if ((preg_match("@<body[^>]*>(.*)[^<]+</body>@is", $src, $matches)) && $_POST['object'] == 'body') {
 		$content = $matches[1];
 	} else {
 		$content = $src;
 		$s = '/(<meta[^>]+charset\s*=)[^>"\'=]+(.+>)/i';
-		$r = '$1' . $modx->config['modx_charset'] . '$2';
+		$r = '$1'.$modx->config['modx_charset'].'$2';
 		$content = preg_replace($s, $r, $content);
 		$content = preg_replace('@<title>.*</title>@i', "<title>[*pagetitle*]</title>", $content);
 	}
@@ -427,7 +427,7 @@ 
 /**
  * @return void
  */
-function convertLink() {
+function convertLink(){
 	global $modx;
 	$tbl_site_content = $modx->getFullTableName('site_content');
 
@@ -435,33 +435,33 @@ 
 	$p = array();
     $target = array();
 	$dir = '';
-	while($row = $modx->db->getRow($rs)) {
+	while ($row = $modx->db->getRow($rs)) {
 		$id = $row['id'];
 		$array = explode('<a href=', $row['content']);
 		$c = 0;
-		foreach($array as $v) {
-			if($v[0] === '"') {
+		foreach ($array as $v) {
+			if ($v[0] === '"') {
 				$v = substr($v, 1);
 				list($href, $v) = explode('"', $v, 2);
 				$_ = $href;
-				if(strpos($_, $modx->config['site_url']) !== false) {
-					$_ = $modx->config['base_url'] . str_replace($modx->config['site_url'], '', $_);
+				if (strpos($_, $modx->config['site_url']) !== false) {
+					$_ = $modx->config['base_url'].str_replace($modx->config['site_url'], '', $_);
 				}
-				if($_[0] === '/') {
+				if ($_[0] === '/') {
 					$_ = substr($_, 1);
 				}
 				$_ = str_replace('/index.html', '.html', $_);
 				$level = substr_count($_, '../');
-				if(1 < $level) {
-					if(!isset($p[$id])) {
+				if (1 < $level) {
+					if (!isset($p[$id])) {
 						$p[$id] = $modx->getParentIds($id);
 					}
 					$k = array_keys($p[$id]);
-					while(0 < $level) {
+					while (0 < $level) {
 						$dir = array_shift($k);
 						$level--;
 					}
-					if($dir != '') {
+					if ($dir != '') {
 						$dir .= '/';
 					}
 				} else {
@@ -469,18 +469,18 @@ 
 				}
 
 				$_ = trim($_, './');
-				if(strpos($_, '/') !== false) {
+				if (strpos($_, '/') !== false) {
 					$_ = substr($_, strrpos($_, '/'));
 				}
-				$_ = $dir . str_replace('.html', '', $_);
-				if(!isset($target[$_])) {
+				$_ = $dir.str_replace('.html', '', $_);
+				if (!isset($target[$_])) {
 					$target[$_] = $modx->getIdFromAlias($_);
 				}
 				$target[$_] = trim($target[$_]);
-				if(!empty($target[$_])) {
-					$href = '[~' . $target[$_] . '~]';
+				if (!empty($target[$_])) {
+					$href = '[~'.$target[$_].'~]';
 				}
-				$array[$c] = '<a href="' . $href . '"' . $v;
+				$array[$c] = '<a href="'.$href.'"'.$v;
 			}
 			$c++;
 		}

manager/actions/mutate_role.dynamic.php

Spacing +12 added lines, -12 removed lines

@@ -1,16 +1,16 @@ 
 <?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.");
 }
 
-switch((int) $modx->manager->action) {
+switch ((int) $modx->manager->action) {
 	case 35:
-		if(!$modx->hasPermission('edit_role')) {
+		if (!$modx->hasPermission('edit_role')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
 	case 38:
-		if(!$modx->hasPermission('new_role')) {
+		if (!$modx->hasPermission('new_role')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
@@ -18,12 +18,12 @@ 
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$role = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$role = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 $tbl_user_roles = $modx->getFullTableName('user_roles');
 
 // check to see the snippet editor isn't locked
-if($lockedEl = $modx->elementIsLocked(8, $role)) {
+if ($lockedEl = $modx->elementIsLocked(8, $role)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['role']));
 }
 // end check for lock
@@ -31,10 +31,10 @@ 
 // Lock snippet for other users to edit
 $modx->lockElement(8, $role);
 
-if($modx->manager->action == '35') {
+if ($modx->manager->action == '35') {
 	$rs = $modx->db->select('*', $tbl_user_roles, "id='{$role}'");
 	$roledata = $modx->db->getRow($rs);
-	if(!$roledata) {
+	if (!$roledata) {
 		$modx->webAlertAndQuit("No role returned!");
 	}
 	$_SESSION['itemname'] = $roledata['name'];
@@ -46,7 +46,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $role;
 $lockElementType = 8;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 ?>
 	<script type="text/javascript">
 		function changestate(element) {
@@ -82,7 +82,7 @@ 
 		<input type="hidden" name="id" value="<?= $_GET['id'] ?>">
 
 		<h1>
-            <i class="fa fa-legal"></i><?= ($roledata['name'] ? $roledata['name'] . '<small>(' . $roledata['id'] . ')</small>' : $_lang['role_title']) ?>
+            <i class="fa fa-legal"></i><?= ($roledata['name'] ? $roledata['name'].'<small>('.$roledata['id'].')</small>' : $_lang['role_title']) ?>
         </h1>
 
 		<?= $_style['actionbuttons']['dynamic']['savedelete'] ?>
@@ -299,7 +299,7 @@ 
  * @param string $status
  * @return string
  */
-function render_form($name, $label, $status = '') {
+function render_form($name, $label, $status = ''){
 	global $modx, $roledata;
 
 	$tpl = '<label class="d-block" for="[+name+]check">
@@ -310,7 +310,7 @@ 
 
 	$checked = ($roledata[$name] == 1) ? 'checked' : '';
 	$value = ($roledata[$name] == 1) ? 1 : 0;
-	if($status == 'disabled') {
+	if ($status == 'disabled') {
 		$checked = 'checked';
 		$value = 1;
 		$set = 'fix';

manager/actions/help/01About_EVO.php

Spacing +13 added lines, -13 removed lines

@@ -1,21 +1,21 @@ 
 <?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.");
 }
-$logo= '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">';
+$logo = '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">';
 $downloadLinks = array(
-	0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'),
-	1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'),
-	2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'),
-	3=>array('title'=>$_lang["extras"],'link'=>array(
+	0=>array('title'=>$_lang["information"], 'link'=>'https://evo.im/'),
+	1=>array('title'=>$_lang["download"], 'link'=>'https://github.com/evolution-cms/evolution/releases'),
+	2=>array('title'=>$_lang["previous_releases"], 'link'=>'https://modx.com/download/evolution/previous-releases.html'),
+	3=>array('title'=>$_lang["extras"], 'link'=>array(
 		'http://extras.evolution-cms.com/',
 		'https://github.com/extras-evolution'
 	)),
 );
 
 $translationLinks = array(
-	0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'),
-	1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'),
+	0=>array('title'=>'Evolution CMS', 'link'=>'https://www.transifex.com/evolutioncms/evolution/'),
+	1=>array('title'=>$_lang["extras"], 'link'=>'https://www.transifex.com/evolutioncms/extras/'),
 );
 
 /**
@@ -23,20 +23,20 @@ 
  * @param array $linkArr
  * @return string
  */
-function createList($sectionHeader, $linkArr) {
+function createList($sectionHeader, $linkArr){
 	$output = '<div class="sectionHeader">'.$sectionHeader.'</div><div class="sectionBody">'."\n";
 	$output .= '<table width="500"  border="0" cellspacing="0" cellpadding="0">'."\n";
 	$links = '';
-	foreach($linkArr as $row) {
+	foreach ($linkArr as $row) {
 		if (!is_array($row['link'])) $row['link'] = array($row['link']);
 		foreach ($row['link'] as $link) {
 			$links .= $links != '' ? '<br/>' : '';
-			$links .= '<a href="' . $link . '" target="_blank">' . $link . '</a>';
+			$links .= '<a href="'.$link.'" target="_blank">'.$link.'</a>';
 		}
 		$output .= '
 		<tr>
-			<td align="left"><strong>' . $row["title"] . '</strong></td>
-			<td align="left">' . $links . '</td>
+			<td align="left"><strong>' . $row["title"].'</strong></td>
+			<td align="left">' . $links.'</td>
 		</tr>';
 		$links = '';
 	}

manager/actions/search.static.php

Spacing +76 added lines, -76 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     exit();
 }
 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes
@@ -41,9 +41,9 @@ 
                         <?php
                         $rs = $modx->db->select('*', $modx->getFullTableName('site_templates'));
                         $option[] = '<option value="">No selected</option>';
-                        $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? (int)$_REQUEST['templateid'] : '';
+                        $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? (int) $_REQUEST['templateid'] : '';
                         $selected = $templateid === 0 ? ' selected="selected"' : '';
-                        $option[] = '<option value="0"' . $selected . '>(blank)</option>';
+                        $option[] = '<option value="0"'.$selected.'>(blank)</option>';
                         while ($row = $modx->db->getRow($rs)) {
                             $templatename = htmlspecialchars($row['templatename'], ENT_QUOTES, $modx->config['modx_charset']);
                             $selected = $row['id'] == $templateid ? ' selected="selected"' : '';
@@ -86,7 +86,7 @@ 
     $searchfields = htmlentities(trim($_POST['searchfields']), ENT_QUOTES, $modx_manager_charset);
     $searchlongtitle = $modx->db->escape(trim($_REQUEST['searchfields']));
     $search_alias = $modx->db->escape(trim($_REQUEST['searchfields']));
-    $templateid = isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '' ? (int)$_REQUEST['templateid'] : '';
+    $templateid = isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '' ? (int) $_REQUEST['templateid'] : '';
     $searchcontent = $modx->db->escape($_REQUEST['content']);
 
     $fields = 'DISTINCT sc.id, contenttype, pagetitle, longtitle, description, introtext, menutitle, deleted, published, isfolder, type';
@@ -100,12 +100,12 @@ 
         $friendly_url_suffix = $modx->config['friendly_url_suffix'];
         $base_url = $modx->config['base_url'];
         $site_url = $modx->config['site_url'];
-        $url = preg_replace('@' . $friendly_url_suffix . '$@', '', $url);
+        $url = preg_replace('@'.$friendly_url_suffix.'$@', '', $url);
         if ($url[0] === '/') {
-            $url = preg_replace('@^' . $base_url . '@', '', $url);
+            $url = preg_replace('@^'.$base_url.'@', '', $url);
         }
         if (substr($url, 0, 4) === 'http') {
-            $url = preg_replace('@^' . $site_url . '@', '', $url);
+            $url = preg_replace('@^'.$site_url.'@', '', $url);
         }
         $idFromAlias = $modx->getIdFromAlias($url);
     }
@@ -118,18 +118,18 @@ 
 		$articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
 		$articul_result = $modx->db->query($articul_query);
 		$articul_id_array = $modx->db->makeArray($articul_result);
-		if(count($articul_id_array)>0){
+		if (count($articul_id_array) > 0) {
 			$articul_id = '';
 			$i = 1;
-			foreach( $articul_id_array as $articul ) {
-				$articul_id.=$articul['contentid'];
-				if($i !== count($articul_id_array)){
-					$articul_id.=',';
+			foreach ($articul_id_array as $articul) {
+				$articul_id .= $articul['contentid'];
+				if ($i !== count($articul_id_array)) {
+					$articul_id .= ',';
 				}
 				$i++;
 			}
 		$articul_id_query = " OR sc.id IN ({$articul_id})";
-		}else{
+		} else {
 			$articul_id_query = '';
 		}
 		/*end search by TV*/
@@ -137,7 +137,7 @@ 
         if (ctype_digit($searchfields)) {
             $sqladd .= "sc.id='{$searchfields}'";
             if (strlen($searchfields) > 3) {
-				$sqladd .= $articul_id_query;//search by TV
+				$sqladd .= $articul_id_query; //search by TV
                 $sqladd .= " OR sc.pagetitle LIKE '%{$searchfields}%'";
             }
         }
@@ -157,7 +157,7 @@ 
             $sqladd .= " OR sc.introtext LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.menutitle LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.alias LIKE '%{$search_alias}%'";
-			$sqladd .= $articul_id_query;//search by TV
+			$sqladd .= $articul_id_query; //search by TV
         }
     } else if ($idFromAlias) {
         $sqladd .= " sc.id='{$idFromAlias}'";
@@ -180,8 +180,8 @@ 
         $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
         $mgrRole = (isset ($_SESSION['mgrRole']) && $_SESSION['mgrRole'] == 1) ? 1 : 0;
         $docgrp_cond = $docgrp ? " OR dg.document_group IN ({$docgrp})" : '';
-        $fields .= ', MAX(IF(1=' . $mgrRole . ' OR sc.privatemgr=0' . $docgrp_cond . ',1,0)) AS hasAccess';
-        $sqladd = '(' . $sqladd . ") AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+        $fields .= ', MAX(IF(1='.$mgrRole.' OR sc.privatemgr=0'.$docgrp_cond.',1,0)) AS hasAccess';
+        $sqladd = '('.$sqladd.") AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
     }
 
     if ($sqladd) {
@@ -191,7 +191,7 @@ 
     $where = $sqladd;
 
     if ($where) {
-        $rs = $modx->db->select($fields, $tbl_site_content . ' AS sc LEFT JOIN ' . $tbldg . ' AS dg ON dg.document=sc.id', $where, 'sc.id');
+        $rs = $modx->db->select($fields, $tbl_site_content.' AS sc LEFT JOIN '.$tbldg.' AS dg ON dg.document=sc.id', $where, 'sc.id');
         $limit = $modx->db->getRecordCount($rs);
     } else {
         $limit = 0;
@@ -210,7 +210,7 @@ 
                 if ($limit < 1) {
                     echo $_lang['search_empty'];
                 } else {
-                    printf('<p>' . $_lang['search_results_returned_msg'] . '</p>', $limit);
+                    printf('<p>'.$_lang['search_results_returned_msg'].'</p>', $limit);
                     ?>
                     <script type="text/javascript" src="media/script/tablesort.js"></script>
                     <table class="grid sortabletable sortable-onload-2 rowstyle-even" id="table-1">
@@ -270,14 +270,14 @@ 
                                 if (function_exists('mb_strlen') && function_exists('mb_substr')) {
                                     ?>
                                     <td<?= $tdClass ?>>
-                                        <a href="index.php?a=27&id=<?= $row['id'] ?>"><?= mb_strlen($row['pagetitle'], $modx_manager_charset) > 70 ? mb_substr($row['pagetitle'], 0, 70, $modx_manager_charset) . "..." : $row['pagetitle'] ?></a>
+                                        <a href="index.php?a=27&id=<?= $row['id'] ?>"><?= mb_strlen($row['pagetitle'], $modx_manager_charset) > 70 ? mb_substr($row['pagetitle'], 0, 70, $modx_manager_charset)."..." : $row['pagetitle'] ?></a>
                                     </td>
-                                    <td<?= $tdClass ?>><?= mb_strlen($row['description'], $modx_manager_charset) > 70 ? mb_substr($row['description'], 0, 70, $modx_manager_charset) . "..." : $row['description'] ?></td>
+                                    <td<?= $tdClass ?>><?= mb_strlen($row['description'], $modx_manager_charset) > 70 ? mb_substr($row['description'], 0, 70, $modx_manager_charset)."..." : $row['description'] ?></td>
                                     <?php
                                 } else {
                                     ?>
-                                    <td<?= $tdClass ?>><?= strlen($row['pagetitle']) > 20 ? substr($row['pagetitle'], 0, 20) . '...' : $row['pagetitle'] ?></td>
-                                    <td<?= $tdClass ?>><?= strlen($row['description']) > 35 ? substr($row['description'], 0, 35) . '...' : $row['description'] ?></td>
+                                    <td<?= $tdClass ?>><?= strlen($row['pagetitle']) > 20 ? substr($row['pagetitle'], 0, 20).'...' : $row['pagetitle'] ?></td>
+                                    <td<?= $tdClass ?>><?= strlen($row['description']) > 35 ? substr($row['description'], 0, 35).'...' : $row['description'] ?></td>
                                     <?php
                                 }
                                 ?>
@@ -297,115 +297,115 @@ 
                 if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
                     $docscounts = $modx->db->getRecordCount($rs);
                     if ($docscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-sitemap"></i> ' . $_lang["manage_documents"] . ' (' . $docscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-sitemap"></i> '.$_lang["manage_documents"].' ('.$docscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList('', !$row['published'], $row['deleted']) . '><a href="index.php?a=27&id=' . $row['id'] . '" id="content_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['pagetitle'] . ' <small>(' . $row['id'] . ')</small>', $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList('', !$row['published'], $row['deleted']).'><a href="index.php?a=27&id='.$row['id'].'" id="content_'.$row['id'].'" target="main">'.highlightingCoincidence($row['pagetitle'].' <small>('.$row['id'].')</small>', $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //templates
                 if ($modx->hasPermission('edit_template')) {
-                    $rs = $modx->db->select("id,templatename,locked", $modx->getFullTableName('site_templates'), "`id` like '%" . $searchfields . "%' 
-					OR `templatename` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `content` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,templatename,locked", $modx->getFullTableName('site_templates'), "`id` like '%".$searchfields."%' 
+					OR `templatename` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `content` like '%" . $searchfields."%'");
                     $templatecounts = $modx->db->getRecordCount($rs);
                     if ($templatecounts > 0) {
-                        $output .= '<li><b><i class="fa fa-newspaper-o"></i> ' . $_lang["manage_templates"] . ' (' . $templatecounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-newspaper-o"></i> '.$_lang["manage_templates"].' ('.$templatecounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=16&id=' . $row['id'] . '" id="templates_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=16&id='.$row['id'].'" id="templates_'.$row['id'].'" target="main">'.highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //tvs
                 if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
-                    $rs = $modx->db->select("id,name,locked", $modx->getFullTableName('site_tmplvars'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `type` like '%" . $searchfields . "%' 
-					OR `elements` like '%" . $searchfields . "%' 
-					OR `display` like '%" . $searchfields . "%' 
-					OR `display_params` like '%" . $searchfields . "%' 
-					OR `default_text` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked", $modx->getFullTableName('site_tmplvars'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `type` like '%" . $searchfields."%' 
+					OR `elements` like '%" . $searchfields."%' 
+					OR `display` like '%" . $searchfields."%' 
+					OR `display_params` like '%" . $searchfields."%' 
+					OR `default_text` like '%" . $searchfields."%'");
                     $tvscounts = $modx->db->getRecordCount($rs);
                     if ($tvscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-list-alt"></i> ' . $_lang["settings_templvars"] . ' (' . $tvscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-list-alt"></i> '.$_lang["settings_templvars"].' ('.$tvscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=301&id=' . $row['id'] . '" id="tmplvars_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=301&id='.$row['id'].'" id="tmplvars_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //Chunks
                 if ($modx->hasPermission('edit_chunk')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_htmlsnippets'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%'     
-					OR `snippet` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_htmlsnippets'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%'     
+					OR `snippet` like '%" . $searchfields."%'");
                     $chunkscounts = $modx->db->getRecordCount($rs);
                     if ($chunkscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-th-large"></i> ' . $_lang["manage_htmlsnippets"] . ' (' . $chunkscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-th-large"></i> '.$_lang["manage_htmlsnippets"].' ('.$chunkscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=78&id=' . $row['id'] . '" id="htmlsnippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=78&id='.$row['id'].'" id="htmlsnippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //Snippets
                 if ($modx->hasPermission('edit_snippet')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_snippets'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `snippet` like '%" . $searchfields . "%'  
-					OR `properties` like '%" . $searchfields . "%'      
-					OR `moduleguid` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_snippets'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `snippet` like '%" . $searchfields."%'  
+					OR `properties` like '%" . $searchfields."%'      
+					OR `moduleguid` like '%" . $searchfields."%'");
                     $snippetscounts = $modx->db->getRecordCount($rs);
                     if ($snippetscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-code"></i> ' . $_lang["manage_snippets"] . ' (' . $snippetscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-code"></i> '.$_lang["manage_snippets"].' ('.$snippetscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=22&id=' . $row['id'] . '" id="snippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=22&id='.$row['id'].'" id="snippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //plugins
                 if ($modx->hasPermission('edit_plugin')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_plugins'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `plugincode` like '%" . $searchfields . "%'  
-					OR `properties` like '%" . $searchfields . "%'      
-					OR `moduleguid` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_plugins'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `plugincode` like '%" . $searchfields."%'  
+					OR `properties` like '%" . $searchfields."%'      
+					OR `moduleguid` like '%" . $searchfields."%'");
                     $pluginscounts = $modx->db->getRecordCount($rs);
                     if ($pluginscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-plug"></i> ' . $_lang["manage_plugins"] . ' (' . $pluginscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-plug"></i> '.$_lang["manage_plugins"].' ('.$pluginscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=102&id=' . $row['id'] . '" id="plugins_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=102&id='.$row['id'].'" id="plugins_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //modules
                 if ($modx->hasPermission('edit_module')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_modules'), "`id` like '%" . $searchfields . "%' 
-                    OR `name` like '%" . $searchfields . "%' 
-                    OR `description` like '%" . $searchfields . "%' 
-                    OR `modulecode` like '%" . $searchfields . "%'  
-                    OR `properties` like '%" . $searchfields . "%'  
-                    OR `guid` like '%" . $searchfields . "%'      
-                    OR `resourcefile` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_modules'), "`id` like '%".$searchfields."%' 
+                    OR `name` like '%" . $searchfields."%' 
+                    OR `description` like '%" . $searchfields."%' 
+                    OR `modulecode` like '%" . $searchfields."%'  
+                    OR `properties` like '%" . $searchfields."%'  
+                    OR `guid` like '%" . $searchfields."%'      
+                    OR `resourcefile` like '%" . $searchfields."%'");
                     $modulescounts = $modx->db->getRecordCount($rs);
                     if ($modulescounts > 0) {
-                        $output .= '<li><b><i class="fa fa-cogs"></i> ' . $_lang["modules"] . ' (' . $modulescounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-cogs"></i> '.$_lang["modules"].' ('.$modulescounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=108&id=' . $row['id'] . '" id="modules_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=108&id='.$row['id'].'" id="modules_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
-                echo $output ? '<div class="ajaxSearchResults"><ul>' . $output . '</ul></div>' : '1';
+                echo $output ? '<div class="ajaxSearchResults"><ul>'.$output.'</ul></div>' : '1';
             }
 
             ?>
@@ -421,13 +421,13 @@ 
  */
 function highlightingCoincidence($text, $search)
 {
-    $regexp = '!(' . str_replace(array(
+    $regexp = '!('.str_replace(array(
             '(',
             ')'
         ), array(
             '\(',
             '\)'
-        ), trim($search)) . ')!isu';
+        ), trim($search)).')!isu';
     return preg_replace($regexp, '<span class="text-danger">$1</span>', $text);
 }
 
@@ -450,7 +450,7 @@ 
         $class .= ' deleted';
     }
     if ($class) {
-        $class = ' class="' . trim($class) . '"';
+        $class = ' class="'.trim($class).'"';
     }
     return $class;
 }

manager/actions/mutate_plugin.dynamic.php

Spacing +17 added lines, -17 removed lines

@@ -1,5 +1,5 @@ 
 <?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.");
 }
 
@@ -18,7 +18,7 @@ 
         $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 $tbl_site_plugins = $modx->getFullTableName('site_plugins');
 $tbl_site_plugin_events = $modx->getFullTableName('site_plugin_events');
@@ -46,7 +46,7 @@ 
     $content['properties'] = str_replace("&", "&amp;", $content['properties']);
 } else {
     $_SESSION['itemname'] = $_lang["new_plugin"];
-    $content['category'] = (int)$_REQUEST['catid'];
+    $content['category'] = (int) $_REQUEST['catid'];
 }
 
 if ($modx->manager->hasFormValues()) {
@@ -56,7 +56,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 5;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 
 /**
  * @param bool $cond
@@ -478,7 +478,7 @@ 
     <input type="hidden" name="mode" value="<?= $modx->manager->action ?>">
 
     <h1>
-        <i class="fa fa-plug"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_plugin']) ?><i class="fa fa-question-circle help"></i>
+        <i class="fa fa-plug"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_plugin']) ?><i class="fa fa-question-circle help"></i>
     </h1>
 
     <?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -504,7 +504,7 @@ 
                             <div class="form-control-name clearfix">
                                 <input name="name" type="text" maxlength="100" 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_plugin'] . "\n" . $_lang['lock_plugin_msg'] ?>" tooltip>
+                                <label class="custom-control" title="<?= $_lang['lock_plugin']."\n".$_lang['lock_plugin_msg'] ?>" tooltip>
                                     <input name="locked" type="checkbox" value="on"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
                                     <i class="fa fa-lock"></i>
                                 </label>
@@ -528,9 +528,9 @@ 
                             <select name="categoryid" class="form-control" onchange="documentDirty=true;">
                                 <option>&nbsp;</option>
                                 <?php
-                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.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>";
+                                    echo '<option value="'.$v['id'].'"'.($content["category"] == $v["id"] ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v["category"])."</option>";
                                 }
                                 ?>
                             </select>
@@ -546,7 +546,7 @@ 
                 <?php if ($modx->hasPermission('save_role')): ?>
                 <div class="form-group">
                     <div class="form-row">
-                        <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['plugin_disabled'] . "</span>" : $_lang['plugin_disabled']) ?></label>
+                        <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['plugin_disabled']."</span>" : $_lang['plugin_disabled']) ?></label>
                     </div>
                     <div class="form-row">
                         <label>
@@ -593,11 +593,11 @@ 
                             <select name="moduleguid" class="form-control" onchange="documentDirty=true;">
                                 <option>&nbsp;</option>
                                 <?php
-                                $ds = $modx->db->select('sm.id,sm.name,sm.guid', $modx->getFullTableName("site_modules") . " sm 
-								INNER JOIN " . $modx->getFullTableName("site_module_depobj") . " smd ON smd.module=sm.id AND smd.type=30
-								INNER JOIN " . $modx->getFullTableName("site_plugins") . " sp ON sp.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams='1'", 'sm.name');
+                                $ds = $modx->db->select('sm.id,sm.name,sm.guid', $modx->getFullTableName("site_modules")." sm 
+								INNER JOIN " . $modx->getFullTableName("site_module_depobj")." smd ON smd.module=sm.id AND smd.type=30
+								INNER JOIN " . $modx->getFullTableName("site_plugins")." sp ON sp.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams='1'", 'sm.name');
                                 while ($row = $modx->db->getRow($ds)) {
-                                    echo "<option value='" . $row['guid'] . "'" . ($content["moduleguid"] == $row["guid"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($row["name"]) . "</option>";
+                                    echo "<option value='".$row['guid']."'".($content["moduleguid"] == $row["guid"] ? " selected='selected'" : "").">".$modx->htmlspecialchars($row["name"])."</option>";
                                 }
                                 ?>
                             </select>
@@ -658,7 +658,7 @@ 
                                 echoEventRows($evtnames);
                             }
                             echo '<hr class="clear">';
-                            echo '<div class="form-group"><b>' . $services[$srv - 1] . '</b></div>';
+                            echo '<div class="form-group"><b>'.$services[$srv - 1].'</b></div>';
                         }
                         // display group name
                         if ($grp != $row['groupname']) {
@@ -667,9 +667,9 @@ 
                                 echoEventRows($evtnames);
                             }
                             echo '<hr class="clear">';
-                            echo '<div class="form-group"><b>' . $row['groupname'] . '</b></div>';
+                            echo '<div class="form-group"><b>'.$row['groupname'].'</b></div>';
                         }
-                        $evtnames[] = '<input name="sysevents[]" id="' . $row['name'] . '" type="checkbox" ' . (in_array($row['id'], $evts) ? ' checked="checked" ' : '') . 'class="inputBox" value="' . $row['id'] . '" /> <label for="' . $row['name'] . '" ' . bold(in_array($row['id'], $evts)) . '> ' . $row['name'] . '</label>' . "\n";
+                        $evtnames[] = '<input name="sysevents[]" id="'.$row['name'].'" type="checkbox" '.(in_array($row['id'], $evts) ? ' checked="checked" ' : '').'class="inputBox" value="'.$row['id'].'" /> <label for="'.$row['name'].'" '.bold(in_array($row['id'], $evts)).'> '.$row['name'].'</label>'."\n";
                         if (count($evtnames) == 2) {
                             echoEventRows($evtnames);
                         }
@@ -681,7 +681,7 @@ 
 
                 function echoEventRows(&$evtnames)
                 {
-                    echo '<div class="row form-row"><div class="col-sm-6 col-md-4 col-lg-3">' . implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames) . '</div></div>';
+                    echo '<div class="row form-row"><div class="col-sm-6 col-md-4 col-lg-3">'.implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames).'</div></div>';
                     $evtnames = array();
                 }
 

manager/actions/category_mgr/inc/Module_Categories_Manager.php

Spacing +6 added lines, -6 removed lines

@@ -7,7 +7,7 @@ 
     die('Please use the MODx Backend.');
 }
 
-require_once realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'Categories.php';
+require_once realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'Categories.php';
 
 class Module_Categories_Manager extends Categories
 {
@@ -94,8 +94,8 @@ 
     {
         global $_lang, $_style;
 
-        $filename = trim($view_name) . '.tpl.phtml';
-        $file = self::get('views_dir') . $filename;
+        $filename = trim($view_name).'.tpl.phtml';
+        $file = self::get('views_dir').$filename;
         $view = &$this;
 
         if (is_file($file)
@@ -120,14 +120,14 @@ 
     {
 
         $_update = array(
-            'id'       => (int)$element_id,
-            'category' => (int)$category_id
+            'id'       => (int) $element_id,
+            'category' => (int) $category_id
         );
 
         $this->db->update(
             $_update,
             $this->db_tbl[$element],
-            "`id` = '" . (int)$element_id . "'"
+            "`id` = '".(int) $element_id."'"
         );
 
         return $this->db->getAffectedRows() === 1;

manager/actions/category_mgr/inc/Categories.php

Spacing +11 added lines, -11 removed lines

@@ -20,7 +20,7 @@ 
         $this->db_tbl['categories'] = $modx->getFullTableName('categories');
 
         foreach ($this->elements as $element) {
-            $this->db_tbl[$element] = $modx->getFullTableName('site_' . $element);
+            $this->db_tbl[$element] = $modx->getFullTableName('site_'.$element);
         }
     }
 
@@ -54,7 +54,7 @@ 
             $this->db->select(
                 '*',
                 $this->db_tbl['categories'],
-                "`" . $where . "` = '" . $this->db->escape($search) . "'"
+                "`".$where."` = '".$this->db->escape($search)."'"
             )
         );
 
@@ -71,9 +71,9 @@ 
     {
         $_value = $this->db->getValue(
             $this->db->select(
-                '`' . $value . '`',
+                '`'.$value.'`',
                 $this->db_tbl['categories'],
-                "`" . $where . "` = '" . $this->db->escape($search) . "'"
+                "`".$where."` = '".$this->db->escape($search)."'"
             )
         );
 
@@ -92,7 +92,7 @@ 
                 $this->db->select(
                     '*',
                     $this->db_tbl[$element],
-                    "`category` = '" . (int)$category_id . "'"
+                    "`category` = '".(int) $category_id."'"
                 )
             );
 
@@ -135,13 +135,13 @@ 
             $this->db->update(
                 $_update,
                 $this->db_tbl[$element],
-                "`category` = '" . (int)$category_id . "'"
+                "`category` = '".(int) $category_id."'"
             );
         }
 
         $this->db->delete(
             $this->db_tbl['categories'],
-            "`id` = '" . (int)$category_id . "'"
+            "`id` = '".(int) $category_id."'"
         );
 
         return $this->db->getAffectedRows() === 1;
@@ -160,13 +160,13 @@ 
 
         $_update = array(
             'category' => $this->db->escape($data['category']),
-            'rank'     => (int)$data['rank']
+            'rank'     => (int) $data['rank']
         );
 
         $this->db->update(
             $_update,
             $this->db_tbl['categories'],
-            "`id` = '" . (int)$category_id . "'"
+            "`id` = '".(int) $category_id."'"
         );
 
         if ($this->db->getAffectedRows() === 1) {
@@ -189,7 +189,7 @@ 
 
         $_insert = array(
             'category' => $this->db->escape($category_name),
-            'rank'     => (int)$category_rank
+            'rank'     => (int) $category_rank
         );
 
         $this->db->insert(
@@ -216,7 +216,7 @@ 
             $this->db->select(
                 '`id`',
                 $this->db_tbl['categories'],
-                "`category` = '" . $category . "'"
+                "`category` = '".$category."'"
             )
         );
 

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);
@@ -512,8 +512,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;
@@ -533,7 +533,7 @@ 
                     $usrSettings[$row['setting_name']] = $row['setting_value'];
                 }
                 if (isset ($usrType)) {
-                    $_SESSION[$usrType . 'UsrConfigSet'] = $usrSettings;
+                    $_SESSION[$usrType.'UsrConfigSet'] = $usrSettings;
                 } // store user settings in session
             }
         }
@@ -678,10 +678,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];
         }
 
@@ -703,7 +703,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 */
@@ -737,7 +737,7 @@ 
      */
     public function getHashFile($key)
     {
-        return $this->getCacheFolder() . "docid_" . $key . ".pageCache.php";
+        return $this->getCacheFolder()."docid_".$key.".pageCache.php";
     }
 
     /**
@@ -748,9 +748,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;
@@ -758,8 +758,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;
@@ -901,12 +901,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
 
@@ -917,7 +917,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) {
@@ -935,7 +935,7 @@ 
                     $name = preg_replace('|-+|', '-', $name);
                     $name = trim($name, '-');
                 }
-                $header = 'Content-Disposition: attachment; filename=' . $name;
+                $header = 'Content-Disposition: attachment; filename='.$name;
                 header($header);
             }
         }
@@ -943,7 +943,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);
@@ -982,17 +982,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;
         }
 
@@ -1018,7 +1018,7 @@ 
         $srcTags = explode(',', $tags);
         $repTags = array();
         foreach ($srcTags as $tag) {
-            $repTags[] = '\\' . $tag[0] . '\\' . $tag[1];
+            $repTags[] = '\\'.$tag[0].'\\'.$tag[1];
         }
         return array($srcTags, $repTags);
     }
@@ -1040,7 +1040,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;
     }
@@ -1073,7 +1073,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'];
@@ -1127,8 +1127,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");
             }
         }
@@ -1170,16 +1170,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);
@@ -1243,8 +1243,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;
     }
@@ -1284,7 +1284,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
@@ -1304,8 +1304,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]);
             }
 
@@ -1316,8 +1316,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);
             }
         }
 
@@ -1484,8 +1484,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;
@@ -1538,7 +1538,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);
             }
@@ -1553,8 +1553,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;
@@ -1612,8 +1612,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;
@@ -1637,7 +1637,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);
@@ -1648,7 +1648,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);
@@ -1659,13 +1659,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);
 
@@ -1790,7 +1790,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) {
@@ -1823,8 +1823,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;
@@ -1888,7 +1888,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 {
@@ -1934,7 +1934,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>');
                 }
             }
         }
@@ -1942,7 +1942,7 @@ 
         if (is_array($return) || is_object($return)) {
             return $return;
         } else {
-            return $echo . $return;
+            return $echo.$return;
         }
     }
 
@@ -1980,8 +1980,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;
             }
@@ -1992,8 +1992,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);
             }
         }
 
@@ -2084,7 +2084,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);
         }
@@ -2328,7 +2328,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);
@@ -2354,7 +2354,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);
     }
 
     /**
@@ -2386,7 +2386,7 @@ 
                 $suff = '/';
             }
 
-            $url = ($dir != '' ? $dir . '/' : '') . $pre . $alias . $suff;
+            $url = ($dir != '' ? $dir.'/' : '').$pre.$alias.$suff;
         }
 
         $evtOut = $this->invokeEvent('OnMakeDocUrl', array(
@@ -2423,7 +2423,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'];
@@ -2434,7 +2434,7 @@ 
                                 $parent = $this->aliasListing[$parent]['parent'];
                             }
 
-                            $aliases[$row['id']] = $path . '/' . $row['alias'];
+                            $aliases[$row['id']] = $path.'/'.$row['alias'];
                         } else {
                             $aliases[$row['id']] = $row['alias'];
                         }
@@ -2446,7 +2446,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]];
@@ -2462,7 +2462,7 @@ 
 
         } else {
             $in = '!\[\~([0-9]+)\~\]!is';
-            $out = "index.php?id=" . '\1';
+            $out = "index.php?id=".'\1';
             $documentSource = preg_replace($in, $out, $documentSource);
         }
 
@@ -2483,7 +2483,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);
@@ -2495,7 +2495,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'];
 
@@ -2511,7 +2511,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);
                         }
@@ -2574,7 +2574,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) {
@@ -2610,9 +2610,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(
@@ -2658,7 +2658,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
@@ -2744,7 +2744,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 {
@@ -2805,7 +2805,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';
@@ -2858,7 +2858,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'];
     }
@@ -2952,7 +2952,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;
@@ -3006,7 +3006,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;
                 }
@@ -3057,15 +3057,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'];
                 }
@@ -3097,7 +3097,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}";
                     }
@@ -3126,7 +3126,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);";
         }
@@ -3135,7 +3135,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);
@@ -3159,7 +3159,7 @@ 
         if ($pms) {
             $state = ($pms[$pm] === 1);
         }
-        return (int)$state;
+        return (int) $state;
     }
 
     /**
@@ -3172,8 +3172,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;
         }
@@ -3223,7 +3223,7 @@ 
             return $lockedElements;
         }
 
-        $type = (int)$type;
+        $type = (int) $type;
         if (isset($lockedElements[$type])) {
             return $lockedElements[$type];
         } else {
@@ -3240,7 +3240,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(
@@ -3263,7 +3263,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}");
 
@@ -3276,7 +3276,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'));
@@ -3360,8 +3360,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;
         }
@@ -3382,8 +3382,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;
         }
@@ -3450,8 +3450,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) {
@@ -3473,8 +3473,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'
                 ));
             }
@@ -3522,7 +3522,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;
         }
@@ -3562,8 +3562,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();
@@ -3608,7 +3608,7 @@ 
      */
     public function isFrontend()
     {
-        return ! $this->isBackend();
+        return !$this->isBackend();
     }
 
     /**
@@ -3633,14 +3633,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);
@@ -3670,14 +3670,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);
@@ -3712,16 +3712,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()) {
@@ -3729,7 +3729,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');
@@ -3781,10 +3781,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}'" : '';
@@ -3795,13 +3795,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);
 
@@ -3906,12 +3906,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);
 
@@ -3958,7 +3958,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;
             }
@@ -3985,23 +3985,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;
@@ -4009,7 +4009,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) {
@@ -4078,7 +4078,7 @@ 
                         $f_url_suffix = '/';
                     }
 
-                    $alPath = !empty ($al['path']) ? $al['path'] . '/' : '';
+                    $alPath = !empty ($al['path']) ? $al['path'].'/' : '';
 
                     if ($al && $al['alias']) {
                         $alias = $al['alias'];
@@ -4086,7 +4086,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}";
@@ -4105,7 +4105,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
@@ -4114,9 +4114,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(
@@ -4140,21 +4140,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'] = '';
                     }
@@ -4195,7 +4195,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 : '';
@@ -4217,18 +4217,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
@@ -4328,8 +4328,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);
             }
         }
 
@@ -4378,7 +4378,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);
@@ -4411,7 +4411,7 @@ 
         if ($mode !== 'formatOnly' && empty($timestamp)) {
             return '-';
         }
-        $timestamp = (int)$timestamp;
+        $timestamp = (int) $timestamp;
 
         switch ($this->config['datetime_format']) {
             case 'YYYY/mm/dd':
@@ -4431,7 +4431,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') {
@@ -4485,7 +4485,7 @@ 
             $S = 0;
         }
         $timeStamp = mktime($H, $M, $S, $m, $d, $Y);
-        $timeStamp = (int)$timeStamp;
+        $timeStamp = (int) $timeStamp;
         return $timeStamp;
     }
 
@@ -4527,7 +4527,7 @@ 
                     if ($v === 'value') {
                         unset($_[$i]);
                     } else {
-                        $_[$i] = 'tv.' . $v;
+                        $_[$i] = 'tv.'.$v;
                     }
                 }
                 $fields = implode(',', $_);
@@ -4536,12 +4536,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();
@@ -4685,7 +4685,7 @@ 
             return $this->tmpCache[__FUNCTION__][$cacheKey];
         }
 
-        if (($idnames != '*' && !is_array($idnames)) || empty($idnames) ) {
+        if (($idnames != '*' && !is_array($idnames)) || empty($idnames)) {
             return false;
         } else {
 
@@ -4703,23 +4703,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) {
@@ -4757,22 +4757,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];
@@ -4797,7 +4797,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."`";
     }
 
     /**
@@ -4876,7 +4876,7 @@ 
     public function getCachePath()
     {
         global $base_url;
-        $pth = $base_url . $this->getCacheFolder();
+        $pth = $base_url.$this->getCacheFolder();
         return $pth;
     }
 
@@ -4928,8 +4928,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) {
@@ -4957,8 +4957,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) {
@@ -5029,8 +5029,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";
@@ -5066,7 +5066,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'];
             }
@@ -5094,7 +5094,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) {
@@ -5104,7 +5104,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"],
@@ -5135,8 +5135,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;
@@ -5169,7 +5169,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.'" ' : '').'/>';
         }
     }
 
@@ -5248,7 +5248,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;
@@ -5395,7 +5395,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;
@@ -5423,13 +5423,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 = '';
@@ -5536,7 +5536,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) {
@@ -5703,8 +5703,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) {
@@ -5713,7 +5713,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;
                 }
@@ -5723,7 +5723,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;
             }
@@ -5737,32 +5737,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;
     }
@@ -5838,7 +5838,7 @@ 
      */
     public function addSnippet($name, $phpCode)
     {
-        $this->snippetCache['#' . $name] = $phpCode;
+        $this->snippetCache['#'.$name] = $phpCode;
     }
 
     /**
@@ -5847,7 +5847,7 @@ 
      */
     public function addChunk($name, $text)
     {
-        $this->chunkCache['#' . $name] = $text;
+        $this->chunkCache['#'.$name] = $text;
     }
 
     /**
@@ -5883,7 +5883,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;
@@ -5897,7 +5897,7 @@ 
             return 'array()';
         }
 
-        $output = $echo . $return;
+        $output = $echo.$return;
         modx_sanitize_gpc($output);
         return $this->htmlspecialchars($output); // Maybe, all html tags are dangerous
     }
@@ -5915,8 +5915,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;
@@ -5952,7 +5952,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;
@@ -5975,7 +5975,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)) {
@@ -5989,7 +5989,7 @@ 
             return $errorMsg;
         }
 
-        $content = (string)file_get_contents($file_path);
+        $content = (string) file_get_contents($file_path);
         if ($content === false) {
             return $errorMsg;
         }
@@ -6102,22 +6102,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(
@@ -6140,13 +6140,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);
@@ -6166,7 +6166,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', ''));
@@ -6176,17 +6176,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);
@@ -6207,7 +6207,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;
@@ -6228,18 +6228,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;
@@ -6271,12 +6271,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';
@@ -6314,7 +6314,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'];
@@ -6324,7 +6324,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): {
@@ -6336,7 +6336,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): {
@@ -6344,23 +6344,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));
         }
@@ -6401,7 +6401,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;
         }
@@ -6417,7 +6417,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--;
         }
@@ -6521,10 +6521,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;
         }
@@ -6650,7 +6650,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'];
         }
@@ -6695,7 +6695,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>";
         }