evolution-cms / evolution

manager/frames/nodes.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
  *  Build and return document tree view nodes
  *
  */
-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,11 +18,11 @@ 
     exit('send some data');
 } //??
 
-$indent = (int)$_REQUEST['indent'];
-$parent = (int)$_REQUEST['parent'];
-$expandAll = (int)$_REQUEST['expandAll'];
+$indent = (int) $_REQUEST['indent'];
+$parent = (int) $_REQUEST['parent'];
+$expandAll = (int) $_REQUEST['expandAll'];
 $output = '';
-$theme = $manager_theme . "/";
+$theme = $manager_theme."/";
 $hereid = isset($_REQUEST['id']) && is_numeric($_REQUEST['id']) ? $_REQUEST['id'] : '';
 
 if (isset($_REQUEST['showonlyfolders'])) {

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" />
@@ -101,14 +101,14 @@ 
 	</div>
 
 <?php
-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;
 	}
 
@@ -119,17 +119,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 = '';
     }
@@ -140,10 +140,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');
 	}
@@ -153,16 +153,16 @@ 
 	$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();
 	}
 
 	return $output;
 }
 
-function importFiles($parent, $filedir, $files, $mode) {
+function importFiles($parent, $filedir, $files, $mode){
 	global $modx;
 	global $_lang, $allowedfiles;
 	global $search_default, $cache_default, $publish_default;
@@ -171,21 +171,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';
@@ -200,12 +200,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);
 
@@ -217,17 +217,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'] = '';
@@ -235,30 +235,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);
 
@@ -283,18 +283,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}'");
 				}
@@ -303,85 +303,85 @@ 
 	}
 }
 
-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);
 }
 
-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;
 	}
 }
 
-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;
 		}
 	}
 	return $new_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);
 	}
@@ -395,7 +395,7 @@ 
 	);
 }
 
-function convertLink() {
+function convertLink(){
 	global $modx;
 	$tbl_site_content = $modx->getFullTableName('site_content');
 
@@ -403,33 +403,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 {
@@ -437,18 +437,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_content.dynamic.php

Spacing +146 added lines, -146 removed lines

@@ -1,35 +1,35 @@ 
 <?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.");
 }
 
 /********************/
-$sd = isset($_REQUEST['dir']) ? '&dir=' . $_REQUEST['dir'] : '&dir=DESC';
-$sb = isset($_REQUEST['sort']) ? '&sort=' . $_REQUEST['sort'] : '&sort=createdon';
-$pg = isset($_REQUEST['page']) ? '&page=' . (int) $_REQUEST['page'] : '';
-$add_path = $sd . $sb . $pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 /*******************/
 
 // check permissions
-switch($modx->manager->action) {
+switch ($modx->manager->action) {
 	case 27:
-		if(!$modx->hasPermission('edit_document')) {
+		if (!$modx->hasPermission('edit_document')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
 	case 85:
 	case 72:
 	case 4:
-		if(!$modx->hasPermission('new_document')) {
+		if (!$modx->hasPermission('new_document')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		} elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
+		} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
 			// check user has permissions for parent
-			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 = $modx->getLoginUserID();
 			$udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
 			$udperms->role = $_SESSION['mgrRole'];
-			if(!$udperms->checkPermissions()) {
+			if (!$udperms->checkPermissions()) {
 				$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 			}
 		}
@@ -38,7 +38,7 @@ 
 		$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_categories = $modx->getFullTableName('categories');
@@ -53,22 +53,22 @@ 
 $tbl_site_tmplvar_templates = $modx->getFullTableName('site_tmplvar_templates');
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 
-if($modx->manager->action == 27) {
+if ($modx->manager->action == 27) {
 	//editing an existing document
 	// check permissions on the document
-	include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+	include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php');
 	$udperms = new udperms();
 	$udperms->user = $modx->getLoginUserID();
 	$udperms->document = $id;
 	$udperms->role = $_SESSION['mgrRole'];
 
-	if(!$udperms->checkPermissions()) {
+	if (!$udperms->checkPermissions()) {
 		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 	}
 }
 
 // check to see if resource isn't locked
-if($lockedEl = $modx->elementIsLocked(7, $id)) {
+if ($lockedEl = $modx->elementIsLocked(7, $id)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
 }
 // end check for lock
@@ -77,27 +77,27 @@ 
 $modx->lockElement(7, $id);
 
 // get document groups for current user
-if($_SESSION['mgrDocgroups']) {
+if ($_SESSION['mgrDocgroups']) {
 	$docgrp = implode(',', $_SESSION['mgrDocgroups']);
 }
 
-if(!empty ($id)) {
+if (!empty ($id)) {
 	$access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
-	if($docgrp) {
+	if ($docgrp) {
 		$access .= " OR dg.document_group IN ({$docgrp})";
 	}
 	$rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
 	$content = array();
 	$content = $modx->db->getRow($rs);
 	$modx->documentObject = &$content;
-	if(!$content) {
+	if (!$content) {
 		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 	}
 	$_SESSION['itemname'] = $content['pagetitle'];
 } else {
 	$content = array();
 
-	if(isset($_REQUEST['newtemplate'])) {
+	if (isset($_REQUEST['newtemplate'])) {
 		$content['template'] = $_REQUEST['newtemplate'];
 	} else {
 		$content['template'] = getDefaultTemplate();
@@ -108,22 +108,22 @@ 
 
 // restore saved form
 $formRestored = $modx->manager->loadFormValues();
-if(isset($_REQUEST['newtemplate'])) {
+if (isset($_REQUEST['newtemplate'])) {
 	$formRestored = true;
 }
 
 // retain form values if template was changed
 // edited to convert pub_date and unpub_date
 // sottwell 02-09-2006
-if($formRestored == true) {
+if ($formRestored == true) {
 	$content = array_merge($content, $_POST);
 	$content['content'] = $_POST['ta'];
-	if(empty ($content['pub_date'])) {
+	if (empty ($content['pub_date'])) {
 		unset ($content['pub_date']);
 	} else {
 		$content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
 	}
-	if(empty ($content['unpub_date'])) {
+	if (empty ($content['unpub_date'])) {
 		unset ($content['unpub_date']);
 	} else {
 		$content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
@@ -131,12 +131,12 @@ 
 }
 
 // increase menu index if this is a new document
-if(!isset ($_REQUEST['id'])) {
-	if(!isset ($modx->config['auto_menuindex'])) {
+if (!isset ($_REQUEST['id'])) {
+	if (!isset ($modx->config['auto_menuindex'])) {
 		$modx->config['auto_menuindex'] = 1;
 	}
-	if($modx->config['auto_menuindex']) {
-		$pid = (int)$_REQUEST['pid'];
+	if ($modx->config['auto_menuindex']) {
+		$pid = (int) $_REQUEST['pid'];
 		$rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
 		$content['menuindex'] = $modx->db->getValue($rs);
 	} else {
@@ -144,14 +144,14 @@ 
 	}
 }
 
-if(isset ($_POST['which_editor'])) {
+if (isset ($_POST['which_editor'])) {
 	$modx->config['which_editor'] = $_POST['which_editor'];
 }
 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 7;
-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">
 		/* <![CDATA[ */
@@ -181,7 +181,7 @@ 
 			},
 			cancel: function() {
 				documentDirty = false;
-				document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id=' . $id . $add_path) ?>';
+				document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id='.$id.$add_path) ?>';
 			},
 			duplicate: function() {
 				if(confirm("<?= $_lang['confirm_resource_duplicate']?>") === true) {
@@ -189,7 +189,7 @@ 
 				}
 			},
 			view: function() {
-				window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'] . 'index.php?id=' . $id ?>', 'previeWin');
+				window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'].'index.php?id='.$id ?>', 'previeWin');
 			}
 		};
 
@@ -551,7 +551,7 @@ 
 			'template' => $content['template']
 		));
 
-		if(is_array($evtOut)) {
+		if (is_array($evtOut)) {
 			echo implode('', $evtOut);
 		}
 
@@ -575,8 +575,8 @@ 
 		<fieldset id="create_edit">
 
 			<h1>
-				<i class="fa fa-pencil-square-o"></i><?php if(isset($_REQUEST['id'])) {
-					echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
+				<i class="fa fa-pencil-square-o"></i><?php if (isset($_REQUEST['id'])) {
+					echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']).(iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '').'<small>('.$_REQUEST['id'].')</small>';
 				} else {
 				    if ($modx->manager->action == '4') {
                         echo $_lang['add_resource'];
@@ -592,36 +592,36 @@ 
 
 			<?php
 			// breadcrumbs
-			if($modx->config['use_breadcrumbs']) {
+			if ($modx->config['use_breadcrumbs']) {
 				$temp = array();
 				$title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
 
-				if(isset($_REQUEST['id']) && $content['parent'] != 0) {
+				if (isset($_REQUEST['id']) && $content['parent'] != 0) {
 					$bID = (int) $_REQUEST['id'];
 					$temp = $modx->getParentIds($bID);
-				} else if(isset($_REQUEST['pid'])) {
+				} else if (isset($_REQUEST['pid'])) {
 					$bID = (int) $_REQUEST['pid'];
 					$temp = $modx->getParentIds($bID);
 					array_unshift($temp, $bID);
 				}
 
-				if($temp) {
+				if ($temp) {
 					$parents = implode(',', $temp);
 
-					if(!empty($parents)) {
+					if (!empty($parents)) {
 						$where = "FIND_IN_SET(id,'{$parents}') DESC";
 						$rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
-						while($row = $modx->db->getRow($rs)) {
+						while ($row = $modx->db->getRow($rs)) {
 							$out .= '<li class="breadcrumbs__li">
-                                <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a>
+                                <a href="index.php?a=27&id=' . $row['id'].'" class="breadcrumbs__a">'.htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']).'</a>
                                 <span class="breadcrumbs__sep">&gt;</span>
                             </li>';
 						}
 					}
 				}
 
-				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
-				echo '<ul class="breadcrumbs">' . $out . '</ul>';
+				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">'.$title.'</li>';
+				echo '<ul class="breadcrumbs">'.$out.'</ul>';
 			}
 			?>
 
@@ -638,7 +638,7 @@ 
 					$evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
 						'id' => $id
 					));
-					if(is_array($evtOut)) {
+					if (is_array($evtOut)) {
 						echo implode('', $evtOut);
 					} else {
 						?>
@@ -694,7 +694,7 @@ 
 									</td>
 								</tr>
 
-								<?php if($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
+								<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
 
 									<tr>
 										<td><span class="warning"><?= $_lang['weblink'] ?></span>
@@ -730,17 +730,17 @@ 
 											$from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
 											$rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC');
 											$currentCategory = '';
-											while($row = $modx->db->getRow($rs)) {
-												if($row['selectable'] != 1 && $row['id'] != $content['template']) {
+											while ($row = $modx->db->getRow($rs)) {
+												if ($row['selectable'] != 1 && $row['id'] != $content['template']) {
 													continue;
 												};
 												// Skip if not selectable but show if selected!
 												$thisCategory = $row['category'];
-												if($thisCategory == null) {
+												if ($thisCategory == null) {
 													$thisCategory = $_lang["no_category"];
 												}
-												if($thisCategory != $currentCategory) {
-													if($closeOptGroup) {
+												if ($thisCategory != $currentCategory) {
+													if ($closeOptGroup) {
 														echo "\t\t\t\t\t</optgroup>\n";
 													}
 													echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
@@ -749,10 +749,10 @@ 
 
 												$selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
 
-												echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
+												echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n";
 												$currentCategory = $thisCategory;
 											}
-											if($thisCategory != '') {
+											if ($thisCategory != '') {
 												echo "\t\t\t\t\t</optgroup>\n";
 											}
 											?>
@@ -796,20 +796,20 @@ 
 									<td valign="top">
 										<?php
 										$parentlookup = false;
-										if(isset ($_REQUEST['id'])) {
-											if($content['parent'] == 0) {
+										if (isset ($_REQUEST['id'])) {
+											if ($content['parent'] == 0) {
 												$parentname = $site_name;
 											} else {
 												$parentlookup = $content['parent'];
 											}
-										} elseif(isset ($_REQUEST['pid'])) {
-											if($_REQUEST['pid'] == 0) {
+										} elseif (isset ($_REQUEST['pid'])) {
+											if ($_REQUEST['pid'] == 0) {
 												$parentname = $site_name;
 											} else {
 												$parentlookup = $_REQUEST['pid'];
 											}
-										} elseif(isset($_POST['parent'])) {
-											if($_POST['parent'] == 0) {
+										} elseif (isset($_POST['parent'])) {
+											if ($_POST['parent'] == 0) {
 												$parentname = $site_name;
 											} else {
 												$parentlookup = $_POST['parent'];
@@ -818,10 +818,10 @@ 
 											$parentname = $site_name;
 											$content['parent'] = 0;
 										}
-										if($parentlookup !== false && is_numeric($parentlookup)) {
+										if ($parentlookup !== false && is_numeric($parentlookup)) {
 											$rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
 											$parentname = $modx->db->getValue($rs);
-											if(!$parentname) {
+											if (!$parentname) {
 												$modx->webAlertAndQuit($_lang["error_no_parent"]);
 											}
 										}
@@ -863,7 +863,7 @@ 
 								}*/
 								?>
 
-								<?php if($content['type'] == 'document' || $modx->manager->action == '4') { ?>
+								<?php if ($content['type'] == 'document' || $modx->manager->action == '4') { ?>
 									<tr>
 										<td colspan="2">
 											<hr>
@@ -876,8 +876,8 @@ 
 														<?php
 														// invoke OnRichTextEditorRegister event
 														$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-														if(is_array($evtOut)) {
-															for($i = 0; $i < count($evtOut); $i++) {
+														if (is_array($evtOut)) {
+															for ($i = 0; $i < count($evtOut); $i++) {
 																$editor = $evtOut[$i];
 																echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
 															}
@@ -888,7 +888,7 @@ 
 											</div>
 											<div id="content_body">
 												<?php
-												if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
+												if (($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
 													$htmlContent = $content['content'];
 													?>
 													<div class="section-editor clearfix">
@@ -901,7 +901,7 @@ 
 													$richtexteditorIds[$modx->config['which_editor']][] = 'ta';
 													$richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
 												} else {
-													echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
+													echo "\t".'<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>'."\n";
 												}
 												?>
 											</div>
@@ -917,7 +917,7 @@ 
 
                             if (($content['type'] == 'document' || $modx->manager->action == '4') || ($content['type'] == 'reference' || $modx->manager->action == 72)) {
                                 $template = $default_template;
-                                $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int)$modx->config['group_tvs'];
+                                $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int) $modx->config['group_tvs'];
                                 if (isset ($_REQUEST['newtemplate'])) {
                                     $template = $_REQUEST['newtemplate'];
                                 } else {
@@ -945,10 +945,10 @@ 
                                 );
                                 $sort = 'tvtpl.rank,tv.rank, tv.id';
                                 if ($group_tvs) {
-                                    $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"' . $_lang['no_category'] . '") AS category, IFNULL(cat.rank,0) AS category_rank';
+                                    $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"'.$_lang['no_category'].'") AS category, IFNULL(cat.rank,0) AS category_rank';
                                     $from .= '
-                                    LEFT JOIN ' . $tbl_categories . ' AS cat ON cat.id=tv.category';
-                                    $sort = 'cat.rank,cat.id,' . $sort;
+                                    LEFT JOIN ' . $tbl_categories.' AS cat ON cat.id=tv.category';
+                                    $sort = 'cat.rank,cat.id,'.$sort;
                                 }
                                 $where = vsprintf("tvtpl.templateid='%s' AND (1='%s' OR ISNULL(tva.documentgroup) %s)", $vs);
                                 $rs = $modx->db->select($field, $from, $where, $sort);
@@ -957,37 +957,37 @@ 
                         <!-- Template Variables -->' . "\n";
                                     if (!$group_tvs) {
                                         $templateVariables .= '
-                                    <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'] . '</div>
+                                    <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'].'</div>
                                         <div class="sectionBody tmplvars">
                                             <table>';
                                     } else if ($group_tvs == 2) {
                                         $templateVariables .= '
                     <div class="tab-section">
-                        <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'] . '</div>
+                        <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'].'</div>
                         <div class="tab-pane" id="paneTemplateVariables">
                             <script type="text/javascript">
-                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
+                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');
                             </script>';
                                     } else if ($group_tvs == 3) {
                                         $templateVariables .= '
                         <div id="templateVariables" class="tab-page tmplvars">
-                            <h2 class="tab">' . $_lang['settings_templvars'] . '</h2>
+                            <h2 class="tab">' . $_lang['settings_templvars'].'</h2>
                             <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script>';
                                     } else if ($group_tvs == 4) {
                                         $templateVariables .= '
                     <div id="templateVariables" class="tab-page tmplvars">
-                        <h2 class="tab">' . $_lang['settings_templvars'] . '</h2>
+                        <h2 class="tab">' . $_lang['settings_templvars'].'</h2>
                         <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script>
                         
                         <div class="tab-pane" id="paneTemplateVariables">
                             <script type="text/javascript">
-                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
+                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');
                             </script>';
                                     }
 
                                     $tvsArray = $modx->db->makeArray($rs, 'name');
-                                    require_once(MODX_MANAGER_PATH . 'includes/tmplvars.inc.php');
-                                    require_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php');
+                                    require_once(MODX_MANAGER_PATH.'includes/tmplvars.inc.php');
+                                    require_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php');
                                     $i = 0;
                                     $tab = '';
                                     foreach ($tvsArray as $row) {
@@ -995,8 +995,8 @@ 
                                             if ($group_tvs == 1 || $group_tvs == 3) {
                                                 if ($i === 0) {
                                                     $templateVariables .= '
-                            <div class="tab-section" id="tabTV_' . $row['category_id'] . '">
-                                <div class="tab-header">' . $row['category'] . '</div>
+                            <div class="tab-section" id="tabTV_' . $row['category_id'].'">
+                                <div class="tab-header">' . $row['category'].'</div>
                                 <div class="tab-body tmplvars">
                                     <table>' . "\n";
                                                 } else {
@@ -1005,17 +1005,17 @@ 
                                 </div>
                             </div>
                             
-                            <div class="tab-section" id="tabTV_' . $row['category_id'] . '">
-                                <div class="tab-header">' . $row['category'] . '</div>
+                            <div class="tab-section" id="tabTV_' . $row['category_id'].'">
+                                <div class="tab-header">' . $row['category'].'</div>
                                 <div class="tab-body tmplvars">
                                     <table>';
                                                 }
                                             } else if ($group_tvs == 2 || $group_tvs == 4) {
                                                 if ($i === 0) {
                                                     $templateVariables .= '
-                            <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                <h2 class="tab">' . $row['category'] . '</h2>
-                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                            <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                <h2 class="tab">' . $row['category'].'</h2>
+                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                 
                                 <div class="tab-body tmplvars">
                                     <table>';
@@ -1025,9 +1025,9 @@ 
                                 </div>
                             </div>
                             
-                            <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                <h2 class="tab">' . $row['category'] . '</h2>
-                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                            <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                <h2 class="tab">' . $row['category'].'</h2>
+                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                 
                                 <div class="tab-body tmplvars">
                                     <table>';
@@ -1035,18 +1035,18 @@ 
                                             } else if ($group_tvs == 5) {
                                                 if ($i === 0) {
                                                     $templateVariables .= '
-                                <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                    <h2 class="tab">' . $row['category'] . '</h2>
-                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                                <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                    <h2 class="tab">' . $row['category'].'</h2>
+                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                     <table>';
                                                 } else {
                                                     $templateVariables .= '
                                     </table>
                                 </div>
                                 
-                                <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                    <h2 class="tab">' . $row['category'] . '</h2>
-                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                                <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                    <h2 class="tab">' . $row['category'].'</h2>
+                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                     
                                     <table>';
                                                 }
@@ -1064,8 +1064,8 @@ 
                                                 $editor = isset($tvOptions['editor']) ? $tvOptions['editor'] : $modx->config['which_editor'];
                                             };
                                             // Add richtext editor to the list
-                                            $richtexteditorIds[$editor][] = "tv" . $row['id'];
-                                            $richtexteditorOptions[$editor]["tv" . $row['id']] = $tvOptions;
+                                            $richtexteditorIds[$editor][] = "tv".$row['id'];
+                                            $richtexteditorOptions[$editor]["tv".$row['id']] = $tvOptions;
                                         }
                                         // splitter
                                         if ($group_tvs) {
@@ -1079,24 +1079,24 @@ 
                                         }
 
                                         // post back value
-                                        if (array_key_exists('tv' . $row['id'], $_POST)) {
-                                            if (is_array($_POST['tv' . $row['id']])) {
-                                                $tvPBV = implode('||', $_POST['tv' . $row['id']]);
+                                        if (array_key_exists('tv'.$row['id'], $_POST)) {
+                                            if (is_array($_POST['tv'.$row['id']])) {
+                                                $tvPBV = implode('||', $_POST['tv'.$row['id']]);
                                             } else {
-                                                $tvPBV = $_POST['tv' . $row['id']];
+                                                $tvPBV = $_POST['tv'.$row['id']];
                                             }
                                         } else {
                                             $tvPBV = $row['value'];
                                         }
 
-                                        $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">' . $row['description'] . '</span>' : '';
-                                        $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">(' . $_lang['tmplvars_inherited'] . ')</span>' : '';
-                                        $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*' . $row['name'] . '*]</small>' : '';
+                                        $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">'.$row['description'].'</span>' : '';
+                                        $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">('.$_lang['tmplvars_inherited'].')</span>' : '';
+                                        $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*'.$row['name'].'*]</small>' : '';
 
                                         $templateVariables .= '
                                         <tr>
-                                            <td><span class="warning">' . $row['caption'] . $tvName . '</span>' . $tvDescription . $tvInherited . '</td>
-                                            <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '') . '">' . renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray) . '</div></td>
+                                            <td><span class="warning">' . $row['caption'].$tvName.'</span>'.$tvDescription.$tvInherited.'</td>
+                                            <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '').'">'.renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray).'</div></td>
                                         </tr>';
 
                                         $tab = $row['category_id'];
@@ -1190,7 +1190,7 @@ 
 
 								<?php
 
-								if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
+								if ($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
 									?>
 									<tr>
 										<td>
@@ -1213,13 +1213,13 @@ 
 										<td>
 											<select name="contentType" class="inputBox" onchange="documentDirty=true;">
 												<?php
-												if(!$content['contentType']) {
+												if (!$content['contentType']) {
 													$content['contentType'] = 'text/html';
 												}
 												$custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
 												$ct = explode(",", $custom_contenttype);
-												for($i = 0; $i < count($ct); $i++) {
-													echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
+												for ($i = 0; $i < count($ct); $i++) {
+													echo "\t\t\t\t\t".'<option value="'.$ct[$i].'"'.($content['contentType'] == $ct[$i] ? ' selected="selected"' : '').'>'.$ct[$i]."</option>\n";
 												}
 												?>
 											</select>
@@ -1245,7 +1245,7 @@ 
 									</tr>
 									<?php
 								} else {
-									if($content['type'] != 'reference' && $modx->manager->action != '72') {
+									if ($content['type'] != 'reference' && $modx->manager->action != '72') {
 										// non-admin managers creating or editing a document resource
 										?>
 										<input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" />
@@ -1345,15 +1345,15 @@ 
 						<?php
 					/*******************************
 					 * Document Access Permissions */
-					if($use_udperms == 1) {
+					if ($use_udperms == 1) {
 						$groupsarray = array();
 						$sql = '';
 
 						$documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
-						if($documentId > 0) {
+						if ($documentId > 0) {
 							// Load up, the permissions from the parent (if new document) or existing document
 							$rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							while ($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'].','.$currentgroup['id'];
 
 							// Load up the current permissions and names
 							$vs = array(
@@ -1369,7 +1369,7 @@ 
 						}
 
 						// retain selected doc groups between post
-						if(isset($_POST['docgroups'])) {
+						if (isset($_POST['docgroups'])) {
 							$groupsarray = array_merge($groupsarray, $_POST['docgroups']);
 						}
 
@@ -1388,26 +1388,26 @@ 
 						$permissions_no = 0; // count permissions the current mgr user doesn't have
 
 						// Loop through the permissions list
-						while($row = $modx->db->getRow($rs)) {
+						while ($row = $modx->db->getRow($rs)) {
 
 							// Create an inputValue pair (group ID and group link (if it exists))
-							$inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
-							$inputId = 'group-' . $row['id'];
+							$inputValue = $row['id'].','.($row['link_id'] ? $row['link_id'] : 'new');
+							$inputId = 'group-'.$row['id'];
 
 							$checked = in_array($inputValue, $groupsarray);
-							if($checked) {
+							if ($checked) {
 								$notPublic = true;
 							} // Mark as private access (either web or manager)
 
 							// Skip the access permission if the user doesn't have access...
-							if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
+							if ((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
 								continue;
 							}
 
 							// Setup attributes for this Input box
 							$inputAttributes['id'] = $inputId;
 							$inputAttributes['value'] = $inputValue;
-							if($checked) {
+							if ($checked) {
 								$inputAttributes['checked'] = 'checked';
 							} else {
 								unset($inputAttributes['checked']);
@@ -1415,10 +1415,10 @@ 
 
 							// Create attribute string list
 							$inputString = array();
-							foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
+							foreach ($inputAttributes as $k => $v) $inputString[] = $k.'="'.$v.'"';
 
 							// Make the <input> HTML
-							$inputHTML = '<input ' . implode(' ', $inputString) . ' />';
+							$inputHTML = '<input '.implode(' ', $inputString).' />';
 
 							// does user have this permission?
 							$from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
@@ -1429,23 +1429,23 @@ 
 							$where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
 							$rsp = $modx->db->select('COUNT(mg.id)', $from, $where);
 							$count = $modx->db->getValue($rsp);
-							if($count > 0) {
+							if ($count > 0) {
 								++$permissions_yes;
 							} else {
 								++$permissions_no;
 							}
-							$permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
+							$permissions[] = "\t\t".'<li>'.$inputHTML.'<label for="'.$inputId.'">'.$row['name'].'</label></li>';
 						}
 						// if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
-						if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
+						if ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
 							$permissions = array();
 						}
 
 						// See if the Access Permissions section is worth displaying...
-						if(!empty($permissions)) {
+						if (!empty($permissions)) {
 							// Add the "All Document Groups" item if we have rights in both contexts
-							if($isManager && $isWeb) {
-								array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
+							if ($isManager && $isWeb) {
+								array_unshift($permissions, "\t\t".'<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"'.(!$notPublic ? ' checked="checked"' : '').' onclick="makePublic(true);" /><label for="groupall" class="warning">'.$_lang['all_doc_groups'].'</label></li>');
 							}
 							// Output the permissions list...
 							?>
@@ -1478,12 +1478,12 @@ 
 								</script>
 								<p><?= $_lang['access_permissions_docs_message'] ?></p>
 								<ul>
-									<?= implode("\n", $permissions) . "\n" ?>
+									<?= implode("\n", $permissions)."\n" ?>
 								</ul>
 							</div><!--div class="tab-page" id="tabAccess"-->
 							<?php
 						} // !empty($permissions)
-						elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
+						elseif ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
 							?>
 							<p><?= $_lang["access_permissions_docs_collision"] ?></p>
 							<?php
@@ -1503,7 +1503,7 @@ 
 						'template' => $content['template']
 					));
 
-					if(is_array($evtOut)) {
+					if (is_array($evtOut)) {
 						echo implode('', $evtOut);
 					}
 					?>
@@ -1516,52 +1516,52 @@ 
 		storeCurTemplate();
 	</script>
 <?php
-if(($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) {
-	if(is_array($richtexteditorIds)) {
-		foreach($richtexteditorIds as $editor => $elements) {
+if (($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) {
+	if (is_array($richtexteditorIds)) {
+		foreach ($richtexteditorIds as $editor => $elements) {
 			// invoke OnRichTextEditorInit event
 			$evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
 				'editor' => $editor,
 				'elements' => $elements,
 				'options' => $richtexteditorOptions[$editor]
 			));
-			if(is_array($evtOut)) {
+			if (is_array($evtOut)) {
 				echo implode('', $evtOut);
 			}
 		}
 	}
 }
 
-function getDefaultTemplate() {
+function getDefaultTemplate(){
 	global $modx;
 
-	switch($modx->config['auto_template_logic']) {
+	switch ($modx->config['auto_template_logic']) {
 		case 'sibling':
-			if(!isset($_GET['pid']) || empty($_GET['pid'])) {
+			if (!isset($_GET['pid']) || empty($_GET['pid'])) {
 				$site_start = $modx->config['site_start'];
 				$where = "sc.isfolder=0 AND sc.id!='{$site_start}'";
 				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+				if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
 					$default_template = $sibl[0]['template'];
 				}
 			} else {
 				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+				if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
 					$default_template = $sibl[0]['template'];
 				} else {
 					$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-					if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+					if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
 						$default_template = $sibl[0]['template'];
 					}
 				}
 			}
-			if(isset($default_template)) {
+			if (isset($default_template)) {
 				break;
 			} // If $default_template could not be determined, fall back / through to "parent"-mode
 		case 'parent':
-			if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
+			if (isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
 				$parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template');
-				if(isset($parent['template'])) {
+				if (isset($parent['template'])) {
 					$default_template = $parent['template'];
 				}
 			}
@@ -1570,7 +1570,7 @@ 
 		default: // default_template is already set
 			$default_template = $modx->config['default_template'];
 	}
-	if(!isset($default_template)) {
+	if (!isset($default_template)) {
 		$default_template = $modx->config['default_template'];
 	} // default_template is already set
 

manager/actions/logging.static.php

Spacing +27 added lines, -27 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.");

 }

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

@@ -65,7 +65,7 @@ 
                             $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username');

                             foreach ($logs_user as $row) {

                                 $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : '';

-                                echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n";

+                                echo "\t\t".'<option value="'.$row['internalKey'].'"'.$selectedtext.'>'.$row['username']."</option>\n";

                             }

                             ?>

                         </select>

@@ -86,7 +86,7 @@ 
                                     continue;

                                 }

                                 $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : '';

-                                echo "\t\t" . '<option value="' . $row['action'] . '"' . $selectedtext . '>' . $row['action'] . ' - ' . $action . "</option>\n";

+                                echo "\t\t".'<option value="'.$row['action'].'"'.$selectedtext.'>'.$row['action'].' - '.$action."</option>\n";

                             }

                             ?>

                         </select>

@@ -102,7 +102,7 @@ 
                             $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid');

                             foreach ($logs_items as $row) {

                                 $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : '';

-                                echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n";

+                                echo "\t\t".'<option value="'.$row['itemid'].'"'.$selectedtext.'>'.$row['itemid']."</option>\n";

                             }

                             ?>

                         </select>

@@ -118,7 +118,7 @@ 
                             $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname');

                             foreach ($logs_names as $row) {

                                 $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : '';

-                                echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n";

+                                echo "\t\t".'<option value="'.$row['itemname'].'"'.$selectedtext.'>'.$row['itemname']."</option>\n";

                             }

                             ?>

                         </select>

@@ -176,26 +176,26 @@ 
     // get the selections the user made.

     $sqladd = array();

     if ($_REQUEST['searchuser'] != 0) {

-        $sqladd[] = "internalKey='" . (int)$_REQUEST['searchuser'] . "'";

+        $sqladd[] = "internalKey='".(int) $_REQUEST['searchuser']."'";

     }

     if ($_REQUEST['action'] != 0) {

-        $sqladd[] = "action=" . (int)$_REQUEST['action'];

+        $sqladd[] = "action=".(int) $_REQUEST['action'];

     }

     if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {

-        $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'";

+        $sqladd[] = "itemid='".$_REQUEST['itemid']."'";

     }

     if ($_REQUEST['itemname'] != '0') {

-        $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'";

+        $sqladd[] = "itemname='".$modx->db->escape($_REQUEST['itemname'])."'";

     }

     if ($_REQUEST['message'] != "") {

-        $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'";

+        $sqladd[] = "message LIKE '%".$modx->db->escape($_REQUEST['message'])."%'";

     }

     // date stuff

     if ($_REQUEST['datefrom'] != "") {

-        $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']);

+        $sqladd[] = "timestamp>".$modx->toTimeStamp($_REQUEST['datefrom']);

     }

     if ($_REQUEST['dateto'] != "") {

-        $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']);

+        $sqladd[] = "timestamp<".$modx->toTimeStamp($_REQUEST['dateto']);

     }

 

     // If current position is not set, set it to zero

@@ -208,7 +208,7 @@ 
     // Number of result to display on the page, will be in the LIMIT of the sql query also

     $int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs;

 

-    $extargv = "&a=13&searchuser=" . $_REQUEST['searchuser'] . "&action=" . $_REQUEST['action'] . "&itemid=" . $_REQUEST['itemid'] . "&itemname=" . $_REQUEST['itemname'] . "&message=" . $_REQUEST['message'] . "&dateto=" . $_REQUEST['dateto'] . "&datefrom=" . $_REQUEST['datefrom'] . "&nrresults=" . $int_num_result . "&log_submit=" . $_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)

+    $extargv = "&a=13&searchuser=".$_REQUEST['searchuser']."&action=".$_REQUEST['action']."&itemid=".$_REQUEST['itemid']."&itemname=".$_REQUEST['itemname']."&message=".$_REQUEST['message']."&dateto=".$_REQUEST['dateto']."&datefrom=".$_REQUEST['datefrom']."&nrresults=".$int_num_result."&log_submit=".$_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)

 

     // build the sql

     $limit = $num_rows = $modx->db->getValue($modx->db->select('COUNT(*)', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : '')));

@@ -216,9 +216,9 @@ 
     $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");

 

 if ($limit < 1) {

-    echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>';

+    echo '<p>'.$_lang["mgrlog_emptysrch"].'</p>';

 } else {

-    echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>';

+    echo '<p>'.$_lang["mgrlog_sortinst"].'</p>';

 

     include_once "paginate.inc.php";

     // New instance of the Paging class, you can modify the color and the width of the html table

@@ -230,11 +230,11 @@ 
     $current_row = $int_cur_position / $int_num_result;

 

     // Display the result as you like...

-    print "<p>" . $_lang["paging_showing"] . " " . $array_paging['lower'];

-    print " " . $_lang["paging_to"] . " " . $array_paging['upper'];

-    print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")<br />";

-    $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " ");

-    $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " ");

+    print "<p>".$_lang["paging_showing"]." ".$array_paging['lower'];

+    print " ".$_lang["paging_to"]." ".$array_paging['upper'];

+    print " (".$array_paging['total']." ".$_lang["paging_total"].")<br />";

+    $paging = $array_paging['first_link'].$_lang["paging_first"].(isset($array_paging['first_link']) ? "</a> " : " ");

+    $paging .= $array_paging['previous_link'].$_lang["paging_prev"].(isset($array_paging['previous_link']) ? "</a> " : " ");

     $pagesfound = sizeof($array_row_paging);

     if ($pagesfound > 6) {

         $paging .= $array_row_paging[$current_row - 2]; // ."&nbsp;";

@@ -244,11 +244,11 @@ 
         $paging .= $array_row_paging[$current_row + 2]; // ."&nbsp;";

     } else {

         for ($i = 0; $i < $pagesfound; $i++) {

-            $paging .= $array_row_paging[$i] . "&nbsp;";

+            $paging .= $array_row_paging[$i]."&nbsp;";

         }

     }

-    $paging .= $array_paging['next_link'] . $_lang["paging_next"] . (isset($array_paging['next_link']) ? "</a> " : " ") . " ";

-    $paging .= $array_paging['last_link'] . $_lang["paging_last"] . (isset($array_paging['last_link']) ? "</a> " : " ") . " ";

+    $paging .= $array_paging['next_link'].$_lang["paging_next"].(isset($array_paging['next_link']) ? "</a> " : " ")." ";

+    $paging .= $array_paging['last_link'].$_lang["paging_last"].(isset($array_paging['last_link']) ? "</a> " : " ")." ";

     // The above exemple print somethings like:

     // Results 1 to 20 of 597  <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>>

     // Of course you can now play with array_row_paging in order to print

@@ -282,16 +282,16 @@ 
                     if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {

                         $item = '<div style="text-align:center;">-</div>';

                     } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {

-                        $item = '<a href="index.php?a=3&amp;id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>';

+                        $item = '<a href="index.php?a=3&amp;id='.$logentry['itemid'].'">'.$logentry['itemname'].'</a>';

                     } else {

                         $item = $logentry['itemname'];

                     }

                     //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true'

-                    $user_drill = 'index.php?a=13&searchuser=' . $logentry['internalKey'] . '&itemname=0&log_submit=true';

+                    $user_drill = 'index.php?a=13&searchuser='.$logentry['internalKey'].'&itemname=0&log_submit=true';

                     ?>

                     <tr>

-                        <td><?= '<a href="' . $user_drill . '">' . $logentry['username'] . '</a>' ?></td>

-                        <td class="text-nowrap"><?= '[' . $logentry['action'] . '] ' . $logentry['message'] ?></td>

+                        <td><?= '<a href="'.$user_drill.'">'.$logentry['username'].'</a>' ?></td>

+                        <td class="text-nowrap"><?= '['.$logentry['action'].'] '.$logentry['message'] ?></td>

                         <td class="text-xs-right"><?= $logentry['itemid'] ?></td>

                         <td><?= $item ?></td>

                         <td class="text-nowrap"><?= $modx->toDateFormat($logentry['timestamp'] + $server_offset_time) ?></td>

manager/actions/eventlog_details.dynamic.php

Spacing +13 added lines, -13 removed lines

@@ -1,17 +1,17 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('view_eventlog')) {
+if (!$modx->hasPermission('view_eventlog')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // get id
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
-$ds = $modx->db->select('el.*, IFNULL(wu.username,mu.username) as username', $modx->getFullTableName("event_log") . " el 
-		LEFT JOIN " . $modx->getFullTableName("manager_users") . " mu ON mu.id=el.user AND el.usertype=0
-		LEFT JOIN " . $modx->getFullTableName("web_users") . " wu ON wu.id=el.user AND el.usertype=1", "el.id='{$id}'");
+$ds = $modx->db->select('el.*, IFNULL(wu.username,mu.username) as username', $modx->getFullTableName("event_log")." el 
+		LEFT JOIN " . $modx->getFullTableName("manager_users")." mu ON mu.id=el.user AND el.usertype=0
+		LEFT JOIN " . $modx->getFullTableName("web_users")." wu ON wu.id=el.user AND el.usertype=1", "el.id='{$id}'");
 $content = $modx->db->getRow($ds);
 
 ?>
@@ -42,18 +42,18 @@ 
 		<div class="container container-body">
 			<?php
 			$date = $modx->toDateFormat($content["createdon"]);
-			if($content["type"] == 1) {
-				$icon = $_style['actions_info'] . ' text-info';
+			if ($content["type"] == 1) {
+				$icon = $_style['actions_info'].' text-info';
 				$msgtype = $_lang["information"];
-			} else if($content["type"] == 2) {
-				$icon = $_style['actions_triangle'] . ' text-warning';
+			} else if ($content["type"] == 2) {
+				$icon = $_style['actions_triangle'].' text-warning';
 				$msgtype = $_lang["warning"];
-			} else if($content["type"] == 3) {
-				$icon = $_style['actions_error'] . ' text-danger';
+			} else if ($content["type"] == 3) {
+				$icon = $_style['actions_error'].' text-danger';
 				$msgtype = $_lang["error"];
 			}
 			?>
-			<p><b><?= $content['source'] . " - " . $_lang['eventlog_viewer'] ?></b></p>
+			<p><b><?= $content['source']." - ".$_lang['eventlog_viewer'] ?></b></p>
 			<p>
 				<i class="<?= $icon ?>"></i> <?= $msgtype ?>
 			</p>

manager/actions/mutate_htmlsnippet.dynamic.php

Spacing +10 added lines, -10 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;
 
 // Get table names (alphabetical)
 $tbl_site_htmlsnippets = $modx->getFullTableName('site_htmlsnippets');
@@ -47,7 +47,7 @@ 
     $content['name'] = $_REQUEST['itemname'];
 } else {
     $_SESSION['itemname'] = $_lang["new_htmlsnippet"];
-    $content['category'] = (int)$_REQUEST['catid'];
+    $content['category'] = (int) $_REQUEST['catid'];
 }
 
 if ($modx->manager->hasFormValues()) {
@@ -65,7 +65,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 3;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 
 // Print RTE Javascript function
 ?>
@@ -136,7 +136,7 @@ 
         <input type="hidden" name="mode" value="<?= $modx->manager->action ?>" />
 
         <h1>
-            <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i>
+            <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i>
         </h1>
 
         <?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -160,7 +160,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_htmlsnippet'] . "\n" . $_lang['lock_htmlsnippet_msg'] ?>" tooltip>
+                                    <label class="custom-control" title="<?= $_lang['lock_htmlsnippet']."\n".$_lang['lock_htmlsnippet_msg'] ?>" tooltip>
                                         <input name="locked" type="checkbox" value="on"<?= ($content['locked'] == 1 || $content['locked'] == 'on' ? ' checked="checked"' : '') ?> />
                                         <i class="fa fa-lock"></i>
                                     </label>
@@ -184,9 +184,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 "\t\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] || (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";
+                                    echo "\t\t\t\t".'<option value="'.$v['id'].'"'.($content['category'] == $v['id'] || (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v['category'])."</option>\n";
                                 }
                                 ?>
                             </select>
@@ -200,7 +200,7 @@ 
                     </div>
                     <?php if ($_SESSION['mgrRole'] == 1): ?>
                         <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['disabled'] . "</span>" : $_lang['disabled']) ?></label>
+                            <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['disabled']."</span>" : $_lang['disabled']) ?></label>
                         </div>
                     <?php endif; ?>
                 </div>
@@ -216,7 +216,7 @@ 
                             $evtOut = $modx->invokeEvent('OnRichTextEditorRegister');
                             if (is_array($evtOut)) {
                                 foreach ($evtOut as $i => $editor) {
-                                    echo "\t" . '<option value="' . $editor . '"' . ($which_editor == $editor ? ' selected="selected"' : '') . '>' . $editor . "</option>\n";
+                                    echo "\t".'<option value="'.$editor.'"'.($which_editor == $editor ? ' selected="selected"' : '').'>'.$editor."</option>\n";
                                 }
                             }
                             ?>

manager/actions/move_document.dynamic.php

Spacing +5 added lines, -5 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.");
 }
 if (!$modx->hasPermission('save_document')) {
@@ -7,13 +7,13 @@ 
 }
 
 if (isset($_REQUEST['id'])) {
-    $id = (int)$_REQUEST['id'];
+    $id = (int) $_REQUEST['id'];
 } else {
     $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // check permissions on the document
-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 = $modx->getLoginUserID();
 $udperms->document = $id;
@@ -39,7 +39,7 @@ 
     },
     cancel: function() {
       documentDirty = false;
-        <?= ($id == 0 ? 'document.location.href="index.php?a=2";' : 'document.location.href="index.php?a=3&id=' . $id . '";') ?>
+        <?= ($id == 0 ? 'document.location.href="index.php?a=2";' : 'document.location.href="index.php?a=3&id='.$id.'";') ?>
     }
   };
 
@@ -80,7 +80,7 @@ 
 </script>
 
 <h1>
-    <i class="fa fa-arrows"></i><?= ($pagetitle ? $pagetitle . '<small>(' . $id . ')</small>' : $_lang['move_resource_title']) ?>
+    <i class="fa fa-arrows"></i><?= ($pagetitle ? $pagetitle.'<small>('.$id.')</small>' : $_lang['move_resource_title']) ?>
 </h1>
 
 <?= $_style['actionbuttons']['dynamic']['save'] ?>

manager/actions/mutate_user.dynamic.php

Spacing +58 added lines, -58 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($modx->manager->action) {

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

 	case 12:

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

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

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

 		}

 		break;

 	case 11:

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

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

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

 		}

 		break;

@@ -18,20 +18,20 @@ 
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

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

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

 

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

-$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");

-if($username = $modx->db->getValue($rs)) {

+$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='".$modx->getLoginUserID()."'");

+if ($username = $modx->db->getValue($rs)) {

 	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "user"));

 }

 // end check for lock

 

-if($modx->manager->action == '12') {

+if ($modx->manager->action == '12') {

 	// get user attribute

 	$rs = $modx->db->select('*', $modx->getFullTableName('user_attributes'), "internalKey = '{$user}'");

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

-	if(!$userdata) {

+	if (!$userdata) {

 		$modx->webAlertAndQuit("No user returned!");

 	}

 

@@ -39,10 +39,10 @@ 
 	// get user settings

 	$rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");

 	$usersettings = array();

-	while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];

+	while ($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];

 	// manually extract so that user display settings are not overwritten

-	foreach($usersettings as $k => $v) {

-		if($k != 'manager_language' && $k != 'manager_theme') {

+	foreach ($usersettings as $k => $v) {

+		if ($k != 'manager_language' && $k != 'manager_theme') {

 			${$k} = $v;

 		}

 	}

@@ -50,7 +50,7 @@ 
 	// get user name

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

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

-	if(!$usernamedata) {

+	if (!$usernamedata) {

 		$modx->webAlertAndQuit("No user returned while getting username!");

 	}

 	$_SESSION['itemname'] = $usernamedata['username'];

@@ -62,14 +62,14 @@ 
 }

 

 // avoid doubling htmlspecialchars (already encoded in DB)

-foreach($userdata as $key => $val) {

+foreach ($userdata as $key => $val) {

 	$userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);

 };

 $usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']);

 

 // restore saved form

 $formRestored = false;

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

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

 	$modx->manager->loadFormValues();

 	// restore post values

 	$userdata = array_merge($userdata, $_POST);

@@ -84,13 +84,13 @@ 
 // include the country list language file

 $_country_lang = array();

 include_once "lang/country/english_country.inc.php";

-if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {

-	include_once "lang/country/" . $manager_language . "_country.inc.php";

+if ($manager_language != "english" && file_exists($modx->config['site_manager_path']."includes/lang/country/".$manager_language."_country.inc.php")) {

+	include_once "lang/country/".$manager_language."_country.inc.php";

 }

 asort($_country_lang);

 

 $displayStyle = ($_SESSION['browser'] === 'modern') ? 'table-row' : 'block';

-if($which_browser == 'default') {

+if ($which_browser == 'default') {

 	$which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];

 }

 ?>

@@ -182,7 +182,7 @@ 
 			document.userform.save.click();

 		},

 		delete: function() {

-			<?php if($_GET['id'] == $modx->getLoginUserID()) { ?>

+			<?php if ($_GET['id'] == $modx->getLoginUserID()) { ?>

 			alert("<?php echo $_lang['alert_delete_self']; ?>");

 			<?php } else { ?>

 			if(confirm("<?php echo $_lang['confirm_delete_user']; ?>") === true) {

@@ -205,7 +205,7 @@ 
 	$evtOut = $modx->invokeEvent("OnUserFormPrerender", array(

 		"id" => $user

 	));

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode("", $evtOut);

 	}

 	?>

@@ -214,7 +214,7 @@ 
 	<input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" />

 

 	<h1>

-        <i class="fa fa fa-user"></i><?= ($usernamedata['username'] ? $usernamedata['username'] . '<small>(' . $usernamedata['id'] . ')</small>' : $_lang['user_title']) ?>

+        <i class="fa fa fa-user"></i><?= ($usernamedata['username'] ? $usernamedata['username'].'<small>('.$usernamedata['id'].')</small>' : $_lang['user_title']) ?>

     </h1>

 

 	<?php echo $_style['actionbuttons']['dynamic']['user'] ?>

@@ -232,13 +232,13 @@ 
 				<table border="0" cellspacing="0" cellpadding="3" class="table table--edit table--editUser">

 					<tr>

 						<td colspan="3"><span id="blocked" class="warning">

-							<?php if($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || $userdata['failedlogins'] > 3) { ?>

+							<?php if ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || $userdata['failedlogins'] > 3) { ?>

 								<?php echo $_lang['user_is_blocked']; ?>

 							<?php } ?>

 							</span>

 							<br /></td>

 					</tr>

-					<?php if(!empty($userdata['id'])) { ?>

+					<?php if (!empty($userdata['id'])) { ?>

 						<tr id="showname" style="display: <?php echo ($modx->manager->action == '12' && (!isset($usernamedata['oldusername']) || $usernamedata['oldusername'] == $usernamedata['username'])) ? $displayStyle : 'none'; ?> ">

 							<td colspan="3"><i class="<?php echo $_style["icons_user"] ?>"></i>&nbsp;<b><?php echo $modx->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?></b> - <span class="comment"><a href="javascript:;" onClick="changeName();return false;"><?php echo $_lang["change_name"]; ?></a></span>

 								<input type="hidden" name="oldusername" value="<?php echo $modx->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?>" />

@@ -251,7 +251,7 @@ 
 						<td><input type="text" name="newusername" class="inputBox" value="<?php echo $modx->htmlspecialchars($usernamedata['username']); ?>" onChange='documentDirty=true;' maxlength="100" /></td>

 					</tr>

 					<tr>

-						<th><?php echo $modx->manager->action == '11' ? $_lang['password'] . ":" : $_lang['change_password_new'] . ":"; ?></th>

+						<th><?php echo $modx->manager->action == '11' ? $_lang['password'].":" : $_lang['change_password_new'].":"; ?></th>

 						<td>&nbsp;</td>

 						<td><input name="newpasswordcheck" type="checkbox" onClick="changestate(document.userform.newpassword);changePasswordState(document.userform.newpassword);"<?php echo $modx->manager->action == "11" ? " checked disabled" : ""; ?>>

 							<input type="hidden" name="newpassword" value="<?php echo $modx->manager->action == "11" ? 1 : 0; ?>" onChange="documentDirty=true;" />

@@ -305,8 +305,8 @@ 
 							?>

 							<select name="role" class="inputBox" onChange='documentDirty=true;' style="width:300px">

 								<?php

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

-									if($modx->manager->action == '11') {

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

+									if ($modx->manager->action == '11') {

 										$selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';

 									} else {

 										$selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';

@@ -360,8 +360,8 @@ 
 								<?php $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $userdata['country']; ?>

 								<option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> >&nbsp;</option>

 								<?php

-								foreach($_country_lang as $key => $country) {

-									echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";

+								foreach ($_country_lang as $key => $country) {

+									echo "<option value=\"$key\"".(isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '').">$country</option>";

 								}

 								?>

 							</select></td>

@@ -387,7 +387,7 @@ 
 						<td>&nbsp;</td>

 						<td><textarea type="text" name="comment" class="inputBox" rows="5" onChange="documentDirty=true;"><?php echo $modx->htmlspecialchars($userdata['comment']); ?></textarea></td>

 					</tr>

-					<?php if($modx->manager->action == '12') { ?>

+					<?php if ($modx->manager->action == '12') { ?>

 						<tr>

 							<th><?php echo $_lang['user_logincount']; ?>:</th>

 							<td>&nbsp;</td>

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

 					<?php } ?>

 				</table>

-				<?php if($_GET['id'] == $modx->getLoginUserID()) { ?>

+				<?php if ($_GET['id'] == $modx->getLoginUserID()) { ?>

 					<p><?php echo $_lang['user_edit_self_msg']; ?></p>

 				<?php } ?>

 			</div>

@@ -441,8 +441,8 @@ 
 								<?php

 								$activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';

 								$dir = dir("includes/lang");

-								while($file = $dir->read()) {

-									if(strpos($file, ".inc.php") > 0) {

+								while ($file = $dir->read()) {

+									if (strpos($file, ".inc.php") > 0) {

 										$endpos = strpos($file, ".");

 										$languagename = substr($file, 0, $endpos);

 										$selectedtext = $languagename == $activelang ? "selected='selected'" : "";

@@ -529,17 +529,17 @@ 
 								<option value=""></option>

 								<?php

 								$dir = dir("media/style/");

-								while($file = $dir->read()) {

-									if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {

+								while ($file = $dir->read()) {

+									if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {

 										$themename = $file;

-										if($themename === 'common') {

+										if ($themename === 'common') {

 											continue;

 										}

-										$attr = 'value="' . $themename . '" ';

-										if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {

+										$attr = 'value="'.$themename.'" ';

+										if (isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {

 											$attr .= 'selected="selected" ';

 										}

-										echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";

+										echo "\t\t<option ".rtrim($attr).'>'.ucwords(str_replace("_", " ", $themename))."</option>\n";

 									}

 								}

 								$dir->close();

@@ -556,12 +556,12 @@ 
 						<td><select name="which_browser" class="inputBox" onChange="documentDirty=true;">

 								<?php

 								$selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : '';

-								echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";

-								foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {

+								echo '<option value="default"'.$selected.'>'.$_lang['option_default']."</option>\n";

+								foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {

 									$dir = str_replace('\\', '/', $dir);

 									$browser_name = substr($dir, strrpos($dir, '/') + 1);

 									$selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';

-									echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";

+									echo '<option value="'.$browser_name.'"'.$selected.'>'."{$browser_name}</option>\n";

 								}

 								?>

 							</select></td>

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

 					<tr>

 						<td>&nbsp;</td>

-						<td class='comment'><?php echo $_lang["uploadable_images_message"] . $_lang["user_upload_message"] ?></td>

+						<td class='comment'><?php echo $_lang["uploadable_images_message"].$_lang["user_upload_message"] ?></td>

 					</tr>

 					<tr>

 						<th><?php echo $_lang["uploadable_media_title"] ?></th>

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

 					<tr>

 						<td>&nbsp;</td>

-						<td class='comment'><?php echo $_lang["uploadable_media_message"] . $_lang["user_upload_message"] ?></td>

+						<td class='comment'><?php echo $_lang["uploadable_media_message"].$_lang["user_upload_message"] ?></td>

 					</tr>

 					<tr>

 						<th><?php echo $_lang["uploadable_flash_title"] ?></th>

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

 					<tr>

 						<td>&nbsp;</td>

-						<td class='comment'><?php echo $_lang["uploadable_flash_message"] . $_lang["user_upload_message"] ?></td>

+						<td class='comment'><?php echo $_lang["uploadable_flash_message"].$_lang["user_upload_message"] ?></td>

 					</tr>

 					<tr>

 						<th><?php echo $_lang["uploadable_files_title"] ?></th>

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

 					<tr>

 						<td>&nbsp;</td>

-						<td class='comment'><?php echo $_lang["uploadable_files_message"] . $_lang["user_upload_message"] ?></td>

+						<td class='comment'><?php echo $_lang["uploadable_files_message"].$_lang["user_upload_message"] ?></td>

 					</tr>

 					<tr class='row2'>

 						<th><?php echo $_lang["upload_maxsize_title"] ?></th>

@@ -643,11 +643,11 @@ 
 								$edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';

 								// invoke OnRichTextEditorRegister event

 								$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");

-								echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";

-								if(is_array($evtOut)) {

-									for($i = 0; $i < count($evtOut); $i++) {

+								echo "<option value='none'".($edt == 'none' ? " selected='selected'" : "").">".$_lang["none"]."</option>\n";

+								if (is_array($evtOut)) {

+									for ($i = 0; $i < count($evtOut); $i++) {

 										$editor = $evtOut[$i];

-										echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";

+										echo "<option value='$editor'".($edt == $editor ? " selected='selected'" : "").">$editor</option>\n";

 									}

 								}

 								?>

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

 				// invoke OnInterfaceSettingsRender event

 				$evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");

-				if(is_array($evtOut)) {

+				if (is_array($evtOut)) {

 					echo implode("", $evtOut);

 				}

 				?>

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

 						var w = screen.width * 0.7;

 						var h = screen.height * 0.7;

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

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

 					}

 

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

@@ -735,17 +735,17 @@ 
 					</tr>

 				</table>

 			</div>

-			<?php if($use_udperms == 1) {

+			<?php if ($use_udperms == 1) {

 

 			$groupsarray = array();

 

-			if($modx->manager->action == '12') { // only do this bit if the user is being edited

+			if ($modx->manager->action == '12') { // only do this bit if the user is being edited

 				$rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");

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

 			}

 			// retain selected doc groups between post

-			if(is_array($_POST['user_groups'])) {

-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;

+			if (is_array($_POST['user_groups'])) {

+				foreach ($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;

 			}

 			?>

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

@@ -754,8 +754,8 @@ 
 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>

 				<?php

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

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

-					echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />";

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

+					echo "<label><input type='checkbox' name='user_groups[]' value='".$row['id']."'".(in_array($row['id'], $groupsarray) ? " checked='checked'" : "")." />".$row['name']."</label><br />";

 				}

 				}

 				?>

@@ -768,7 +768,7 @@ 
 	$evtOut = $modx->invokeEvent("OnUserFormRender", array(

 		"id" => $user

 	));

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode("", $evtOut);

 	}

 	?>

manager/actions/mutate_web_user.dynamic.php

Spacing +32 added lines, -32 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($modx->manager->action) {

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

 	case 88:

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

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

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

 		}

 		break;

 	case 87:

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

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

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

 		}

 		break;

@@ -18,34 +18,34 @@ 
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

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

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

 

 

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

-$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=88 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");

-if($username = $modx->db->getValue($rs)) {

+$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=88 AND id='{$user}' AND internalKey!='".$modx->getLoginUserID()."'");

+if ($username = $modx->db->getValue($rs)) {

 	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "web user"));

 }

 // end check for lock

 

-if($modx->manager->action == '88') {

+if ($modx->manager->action == '88') {

 	// get user attributes

 	$rs = $modx->db->select('*', $modx->getFullTableName('web_user_attributes'), "internalKey = '{$user}'");

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

-	if(!$userdata) {

+	if (!$userdata) {

 		$modx->webAlertAndQuit("No user returned!");

 	}

 

 	// get user settings

 	$rs = $modx->db->select('*', $modx->getFullTableName('web_user_settings'), "webuser = '{$user}'");

 	$usersettings = array();

-	while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];

+	while ($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];

 	extract($usersettings, EXTR_OVERWRITE);

 

 	// get user name

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

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

-	if(!$usernamedata) {

+	if (!$usernamedata) {

 		$modx->webAlertAndQuit("No user returned while getting username!");

 	}

 	$_SESSION['itemname'] = $usernamedata['username'];

@@ -57,14 +57,14 @@ 
 }

 

 // avoid doubling htmlspecialchars (already encoded in DB)

-foreach($userdata as $key => $val) {

+foreach ($userdata as $key => $val) {

 	$userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);

 };

 $usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']);

 

 // restore saved form

 $formRestored = false;

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

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

 	$modx->manager->loadFormValues();

 	// restore post values

 	$userdata = array_merge($userdata, $_POST);

@@ -78,8 +78,8 @@ 
 

 // include the country list language file

 $_country_lang = array();

-if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {

-	include_once "lang/country/" . $manager_language . "_country.inc.php";

+if ($manager_language != "english" && file_exists($modx->config['site_manager_path']."includes/lang/country/".$manager_language."_country.inc.php")) {

+	include_once "lang/country/".$manager_language."_country.inc.php";

 } else {

 	include_once "lang/country/english_country.inc.php";

 }

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

 	// invoke OnWUsrFormPrerender event

 	$evtOut = $modx->invokeEvent("OnWUsrFormPrerender", array("id" => $user));

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode("", $evtOut);

 	}

 	?>

@@ -200,7 +200,7 @@ 
 	<input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" />

 

 	<h1>

-        <i class="fa fa fa-users"></i><?= ($usernamedata['username'] ? $usernamedata['username'] . '<small>(' . $usernamedata['id'] . ')</small>' : $_lang['web_user_title']) ?>

+        <i class="fa fa fa-users"></i><?= ($usernamedata['username'] ? $usernamedata['username'].'<small>('.$usernamedata['id'].')</small>' : $_lang['web_user_title']) ?>

     </h1>

 

 	<?php echo $_style['actionbuttons']['dynamic']['user'] ?>

@@ -218,13 +218,13 @@ 
 				<table border="0" cellspacing="0" cellpadding="3" class="table table--edit table--editUser">

 					<tr>

 						<td colspan="3"><span id="blocked" class="warning">

-							<?php if($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) { ?>

+							<?php if ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) { ?>

 								<b><?php echo $_lang['user_is_blocked']; ?></b>

 							<?php } ?>

 							</span>

 							<br /></td>

 					</tr>

-					<?php if(!empty($userdata['id'])) { ?>

+					<?php if (!empty($userdata['id'])) { ?>

 						<tr id="showname" style="display: <?php echo ($modx->manager->action == '88' && (!isset($usernamedata['oldusername']) || $usernamedata['oldusername'] == $usernamedata['username'])) ? $displayStyle : 'none'; ?> ">

 							<td colspan="3"><i class="<?php echo $_style["icons_user"] ?>"></i>&nbsp;<b><?php echo $modx->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?></b> - <span class="comment"><a href="javascript:;" onClick="changeName();return false;"><?php echo $_lang["change_name"]; ?></a></span>

 								<input type="hidden" name="oldusername" value="<?php echo $modx->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?>" />

@@ -237,7 +237,7 @@ 
 						<td><input type="text" name="newusername" class="inputBox" value="<?php echo $modx->htmlspecialchars(isset($_POST['newusername']) ? $_POST['newusername'] : $usernamedata['username']); ?>" onChange='documentDirty=true;' maxlength="100" /></td>

 					</tr>

 					<tr>

-						<th><?php echo $modx->manager->action == '87' ? $_lang['password'] . ":" : $_lang['change_password_new'] . ":"; ?></th>

+						<th><?php echo $modx->manager->action == '87' ? $_lang['password'].":" : $_lang['change_password_new'].":"; ?></th>

 						<td>&nbsp;</td>

 						<td><input name="newpasswordcheck" type="checkbox" onClick="changestate(document.userform.newpassword);changePasswordState(document.userform.newpassword);"<?php echo $modx->manager->action == "87" ? " checked disabled" : ""; ?>>

 							<input type="hidden" name="newpassword" value="<?php echo $modx->manager->action == "87" ? 1 : 0; ?>" onChange="documentDirty=true;" />

@@ -324,8 +324,8 @@ 
 								<?php $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $userdata['country']; ?>

 								<option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> >&nbsp;</option>

 								<?php

-								foreach($_country_lang as $key => $country) {

-									echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";

+								foreach ($_country_lang as $key => $country) {

+									echo "<option value=\"$key\"".(isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '').">$country</option>";

 								}

 								?>

 							</select></td>

@@ -351,7 +351,7 @@ 
 						<td>&nbsp;</td>

 						<td><textarea type="text" name="comment" class="inputBox" rows="5" onChange="documentDirty=true;"><?php echo $modx->htmlspecialchars(isset($_POST['comment']) ? $_POST['comment'] : $userdata['comment']); ?></textarea></td>

 					</tr>

-					<?php if($modx->manager->action == '88') { ?>

+					<?php if ($modx->manager->action == '88') { ?>

 						<tr>

 							<th><?php echo $_lang['user_logincount']; ?>:</th>

 							<td>&nbsp;</td>

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

 						var w = screen.width * 0.7;

 						var h = screen.height * 0.7;

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

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

 					}

 

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

@@ -491,22 +491,22 @@ 
 						<td class='comment'><?php echo $_lang["user_photo_message"] ?></td>

 					</tr>

 					<tr>

-						<td colspan="2" align="center"><img name="iphoto" src="<?php echo isset($_POST['photo']) ? (strpos($_POST['photo'], "http://") === false ? MODX_SITE_URL : "") . $_POST['photo'] : !empty($userdata['photo']) ? (strpos($userdata['photo'], "http://") === false ? MODX_SITE_URL : "") . $userdata['photo'] : $_style["tx"]; ?>" /></td>

+						<td colspan="2" align="center"><img name="iphoto" src="<?php echo isset($_POST['photo']) ? (strpos($_POST['photo'], "http://") === false ? MODX_SITE_URL : "").$_POST['photo'] : !empty($userdata['photo']) ? (strpos($userdata['photo'], "http://") === false ? MODX_SITE_URL : "").$userdata['photo'] : $_style["tx"]; ?>" /></td>

 					</tr>

 				</table>

 			</div>

 			<?php

-			if($use_udperms == 1) {

+			if ($use_udperms == 1) {

 

 			$groupsarray = array();

 

-			if($modx->manager->action == '88') { // only do this bit if the user is being edited

+			if ($modx->manager->action == '88') { // only do this bit if the user is being edited

 				$rs = $modx->db->select('webgroup', $modx->getFullTableName('web_groups'), "webuser='{$user}'");

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

 			}

 			// retain selected user groups between post

-			if(is_array($_POST['user_groups'])) {

-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;

+			if (is_array($_POST['user_groups'])) {

+				foreach ($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;

 			}

 			?>

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

@@ -515,8 +515,8 @@ 
 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>

 				<?php

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

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

-					echo '<label><input type="checkbox" name="user_groups[]" value="' . $row['id'] . '"' . (in_array($row['id'], $groupsarray) ? ' checked="checked"' : '') . ' />' . $row['name'] . '</label><br />';

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

+					echo '<label><input type="checkbox" name="user_groups[]" value="'.$row['id'].'"'.(in_array($row['id'], $groupsarray) ? ' checked="checked"' : '').' />'.$row['name'].'</label><br />';

 				}

 				}

 				?>

@@ -526,7 +526,7 @@ 
 			$evtOut = $modx->invokeEvent("OnWUsrFormRender", array(

 				"id" => $user

 			));

-			if(is_array($evtOut)) {

+			if (is_array($evtOut)) {

 				echo implode("", $evtOut);

 			}

 			?>