evolution-cms / evolution

install/actions/action_install.php

Spacing +2 added lines, -2 removed lines

@@ -43,10 +43,10 @@
 	var chk = document.install.rminstaller;
 	if(chk && chk.checked) {
 		// remove install folder and files
-		window.location.href = "../<?php echo MGR_DIR;?>/processors/remove_installer.processor.php?rminstall=1";
+		window.location.href = "../<?php echo MGR_DIR; ?>/processors/remove_installer.processor.php?rminstall=1";
 	}
 	else {
-		window.location.href = "../<?php echo MGR_DIR;?>/";
+		window.location.href = "../<?php echo MGR_DIR; ?>/";
 	}
 }
 /* ]]> */

install/connection.databasetest.php

Spacing +4 added lines, -4 removed lines

@@ -6,12 +6,12 @@ 
 $installMode = $_POST['installMode'];
 
 $self = 'install/connection.databasetest.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once("lang.php");
 
@@ -31,7 +31,7 @@ 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
-        if (! mysqli_query($conn, $query)){
+        if (!mysqli_query($conn, $query)) {
             $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
         }
         else {

Braces +6 added lines, -11 removed lines

@@ -18,8 +18,7 @@ 
 $output = $_lang["status_checking_database"];
 if (!$conn = mysqli_connect($host, $uid, $pwd)) {
     $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed'].'</span>';
-}
-else {
+} else {
     $database_name = mysqli_real_escape_string($conn, $_POST['database_name']);
     $database_name = str_replace("`", "", $database_name);
     $tableprefix = mysqli_real_escape_string($conn, $_POST['tableprefix']);
@@ -31,20 +30,16 @@ 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
-        if (! mysqli_query($conn, $query)){
+        if (! mysqli_query($conn, $query)) {
             $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
-        }
-        else {
+        } else {
             $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed_database_created'].'</span>';
         }
-    }
-    elseif (($installMode == 0) && (mysqli_query($conn, "SELECT COUNT(*) FROM {$database_name}.`{$tableprefix}site_content`"))) {
+    } elseif (($installMode == 0) && (mysqli_query($conn, "SELECT COUNT(*) FROM {$database_name}.`{$tableprefix}site_content`"))) {
         $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_table_prefix_already_in_use'].'</span>';
-    }
-    elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn, "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) {
+    } elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn, "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) {
         $output .= '<span id="database_fail" style="color:#FF0000;">'.sprintf($_lang['status_failed_database_collation_does_not_match'], $row[1]).'</span>';
-    }
-    else {
+    } else {
         $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed'].'</span>';
     }
 }

install/index.php

Spacing +13 added lines, -13 removed lines

@@ -9,7 +9,7 @@ 
 }
 
 $self = 'install/index.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 require_once("{$base_path}install/functions.php");
 
 // set error reporting
@@ -18,7 +18,7 @@ 
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
 	include_once("{$base_path}assets/cache/siteManager.php");
 }
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
 	define('MGR_DIR', 'manager');
 }
 
@@ -38,26 +38,26 @@ 
 $moduleSQLDataFile = "setup.data.sql";
 $moduleSQLResetFile = "setup.data.reset.sql";
 
-$moduleChunks = array (); // chunks - array : name, description, type - 0:file or 1:content, file or content
-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content
-$moduleSnippets = array (); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
-$modulePlugins = array (); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
-$moduleModules = array (); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
-$moduleTVs = array (); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
+$moduleChunks = array(); // chunks - array : name, description, type - 0:file or 1:content, file or content
+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content
+$moduleSnippets = array(); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
+$modulePlugins = array(); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
+$moduleModules = array(); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
+$moduleTVs = array(); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
 $moduleDependencies = array(); // module depedencies - array : module, table, column, type, name
 
-$errors= 0;
+$errors = 0;
 
 // get post back status
 $isPostBack = (count($_POST));
 
 $ph = ph();
-$ph = array_merge($ph,$_lang);
+$ph = array_merge($ph, $_lang);
 $ph['install_language'] = $install_language;
 
 ob_start();
-$action= isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
+$action = isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
 if (!@include_once("actions/action_{$action}.php")) {
     die ("Invalid install action attempted. [action={$action}]");
 }
@@ -65,5 +65,5 @@ 
 ob_end_clean();
 
 $tpl = file_get_contents("{$base_path}install/template.tpl");
-echo parse($tpl,$ph);
+echo parse($tpl, $ph);
 

manager/actions/mutate_content.dynamic.php

Braces +12 added lines, -5 removed lines

@@ -478,7 +478,8 @@ 
 			return s;
 		}
 
-		<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
+		<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') {
+// Web Link specific ?>
 		var lastImageCtrl;
 		var lastFileCtrl;
 
@@ -694,7 +695,8 @@ 
 									</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>
@@ -1356,7 +1358,9 @@ 
 						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(
@@ -1418,7 +1422,9 @@ 
 
 							// 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) . ' />';
@@ -1535,7 +1541,8 @@ 
 	}
 }
 
-function getDefaultTemplate() {
+function getDefaultTemplate()
+{
 	global $modx;
 
 	switch($modx->config['auto_template_logic']) {

Spacing +144 added lines, -144 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"]);
 			}
 		}
@@ -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,11 +131,11 @@ 
 }
 
 // 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']) {
+	if ($modx->config['auto_menuindex']) {
 		$pid = intval($_REQUEST['pid']);
 		$rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
 		$content['menuindex'] = $modx->db->getValue($rs);
@@ -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/resources.static.php

Braces +6 added lines, -2 removed lines

@@ -28,7 +28,9 @@ 
 	'type7' => $_lang["lock_element_type_7"],
 	'type8' => $_lang["lock_element_type_8"]
 );
-foreach($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach($unlockTranslations as $key => $value) {
+    $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+}
 
 // Prepare lang-strings for mgrResAction()
 $mraTranslations = array(
@@ -44,7 +46,9 @@ 
 	'confirm_delete_plugin' => $_lang["confirm_delete_plugin"],
 	'confirm_delete_module' => $_lang["confirm_delete_module"],
 );
-foreach($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach($mraTranslations as $key => $value) {
+    $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+}
 ?>
 <script>var trans = <?php echo json_encode($unlockTranslations); ?>;</script>
 <script>var mraTrans = <?php echo json_encode($mraTranslations); ?>;</script>

Spacing +29 added lines, -29 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(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php')) {
-	include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php');
+if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/functions.inc.php')) {
+	include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/functions.inc.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'actions/resources/functions.inc.php');
+	include_once(MODX_MANAGER_PATH.'actions/resources/functions.inc.php');
 }
-if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php')) {
-	include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php');
+if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/mgrResources.class.php')) {
+	include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/mgrResources.class.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'actions/resources/mgrResources.class.php');
+	include_once(MODX_MANAGER_PATH.'actions/resources/mgrResources.class.php');
 }
 
 $resources = new mgrResources();
@@ -28,7 +28,7 @@ 
 	'type7' => $_lang["lock_element_type_7"],
 	'type8' => $_lang["lock_element_type_8"]
 );
-foreach($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach ($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
 
 // Prepare lang-strings for mgrResAction()
 $mraTranslations = array(
@@ -44,7 +44,7 @@ 
 	'confirm_delete_plugin' => $_lang["confirm_delete_plugin"],
 	'confirm_delete_module' => $_lang["confirm_delete_module"],
 );
-foreach($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach ($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
 ?>
 <script>var trans = <?php echo json_encode($unlockTranslations); ?>;</script>
 <script>var mraTrans = <?php echo json_encode($mraTranslations); ?>;</script>
@@ -65,45 +65,45 @@ 
 		</script>
 
 		<?php
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab1_templates.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab1_templates.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab1_templates.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab1_templates.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab2_templatevars.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab2_templatevars.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab2_templatevars.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab2_templatevars.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab3_chunks.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab3_chunks.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab3_chunks.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab3_chunks.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab4_snippets.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab4_snippets.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab4_snippets.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab4_snippets.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab5_plugins.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab5_plugins.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab5_plugins.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab5_plugins.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab6_categoryview.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab6_categoryview.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab6_categoryview.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab6_categoryview.inc.php');
 		}
 
 
-		if(is_numeric($_GET['tab'])) {
-			echo '<script type="text/javascript"> tpResources.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
+		if (is_numeric($_GET['tab'])) {
+			echo '<script type="text/javascript"> tpResources.setSelectedIndex( '.$_GET['tab'].' );</script>';
 		}
 		?>
 	</div>

manager/actions/mutate_settings/tab5_security_settings.inc.php

Spacing +41 added lines, -41 removed lines

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

     $MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4

-    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) $valid_hostnames = $_SERVER['HTTP_HOST'];

+    if (empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) $valid_hostnames = $_SERVER['HTTP_HOST'];

 ?>

 <!-- Interface & editor settings -->

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

@@ -11,10 +11,10 @@ 
 <tr>

 <th><?php echo $_lang['allow_eval_title']; ?><br><small>[(allow_eval)]</small></th>

 <td>

-<?php echo wrap_label($_lang['allow_eval_with_scan']         , form_radio('allow_eval','with_scan'));?><br />

-<?php echo wrap_label($_lang['allow_eval_with_scan_at_post'] , form_radio('allow_eval','with_scan_at_post'));?><br />

-<?php echo wrap_label($_lang['allow_eval_everytime_eval']    , form_radio('allow_eval','everytime_eval'));?><br />

-<?php echo wrap_label($_lang['allow_eval_dont_eval']         , form_radio('allow_eval','dont_eval'));?>

+<?php echo wrap_label($_lang['allow_eval_with_scan'], form_radio('allow_eval', 'with_scan')); ?><br />

+<?php echo wrap_label($_lang['allow_eval_with_scan_at_post'], form_radio('allow_eval', 'with_scan_at_post')); ?><br />

+<?php echo wrap_label($_lang['allow_eval_everytime_eval'], form_radio('allow_eval', 'everytime_eval')); ?><br />

+<?php echo wrap_label($_lang['allow_eval_dont_eval'], form_radio('allow_eval', 'dont_eval')); ?>

     <div class="comment">

         <?php echo $_lang['allow_eval_msg'] ?>

     </div>

@@ -39,7 +39,7 @@ 
 <tr>

     <th><?php echo $_lang['check_files_onlogin_title'] ?><br><small>[(check_files_onlogin)]</small></th>

     <td>

-      <textarea name="check_files_onlogin"><?php echo $check_files_onlogin;?></textarea><br />

+      <textarea name="check_files_onlogin"><?php echo $check_files_onlogin; ?></textarea><br />

         

 </td>

 </tr>

@@ -49,8 +49,8 @@ 
     <tr>

       <td nowrap class="warning"><?php echo $_lang['validate_referer_title'] ?><br><small>[(validate_referer)]</small></td>

       <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('validate_referer', 1));?><br />

-        <?php echo wrap_label($_lang['no'], form_radio('validate_referer', 0));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('validate_referer', 1)); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('validate_referer', 0)); ?>

       </td>

     </tr>

     <tr>

@@ -85,25 +85,25 @@ 
   <tr>

 <th><?php echo $_lang['a17_error_reporting_title']; ?><br><small>[(error_reporting)]</small></th>

 <td>

-<?php echo wrap_label($_lang['a17_error_reporting_opt0'], form_radio('error_reporting','0'));?><br />

-<?php echo wrap_label($_lang['a17_error_reporting_opt1'], form_radio('error_reporting','1'));?><br />

-<?php echo wrap_label($_lang['a17_error_reporting_opt2'], form_radio('error_reporting','2'));?><br />

-<?php echo wrap_label($_lang['a17_error_reporting_opt99'],form_radio('error_reporting','99'));?>

+<?php echo wrap_label($_lang['a17_error_reporting_opt0'], form_radio('error_reporting', '0')); ?><br />

+<?php echo wrap_label($_lang['a17_error_reporting_opt1'], form_radio('error_reporting', '1')); ?><br />

+<?php echo wrap_label($_lang['a17_error_reporting_opt2'], form_radio('error_reporting', '2')); ?><br />

+<?php echo wrap_label($_lang['a17_error_reporting_opt99'], form_radio('error_reporting', '99')); ?>

 </td>

 </tr>

 <tr>

     <td width="200">&nbsp;</td>

-    <td class="comment"> <?php echo $_lang['a17_error_reporting_msg'];?></td>

+    <td class="comment"> <?php echo $_lang['a17_error_reporting_msg']; ?></td>

 </tr>

 <tr><td colspan="2"><div class="split"></div></td></tr>

 <tr>

 <th><?php echo $_lang['mutate_settings.dynamic.php6']; ?><br><small>[(send_errormail)]</small></th>

 <td>

-<?php echo wrap_label($_lang['mutate_settings.dynamic.php7'],form_radio('send_errormail','0'));?><br />

-<?php echo wrap_label('error',form_radio('send_errormail','3'));?><br />

-<?php echo wrap_label('error + warning',form_radio('send_errormail','2'));?><br />

-<?php echo wrap_label('error + warning + information',form_radio('send_errormail','1'));?><br />

-<?php echo parseText($_lang['mutate_settings.dynamic.php8'],array('emailsender'=>$modx->config['emailsender']));?></td>

+<?php echo wrap_label($_lang['mutate_settings.dynamic.php7'], form_radio('send_errormail', '0')); ?><br />

+<?php echo wrap_label('error', form_radio('send_errormail', '3')); ?><br />

+<?php echo wrap_label('error + warning', form_radio('send_errormail', '2')); ?><br />

+<?php echo wrap_label('error + warning + information', form_radio('send_errormail', '1')); ?><br />

+<?php echo parseText($_lang['mutate_settings.dynamic.php8'], array('emailsender'=>$modx->config['emailsender'])); ?></td>

 </tr>

    <tr>

     <td colspan="2"><div class="split"></div></td>

@@ -111,8 +111,8 @@ 
 <tr>

 <th><?php echo $_lang['enable_bindings_title'] ?><br><small>[(enable_bindings)]</small></th>

 <td>

-<?php echo wrap_label($_lang['yes'],form_radio('enable_bindings','1'));?><br />

-<?php echo wrap_label($_lang['no'], form_radio('enable_bindings','0'));?>

+<?php echo wrap_label($_lang['yes'], form_radio('enable_bindings', '1')); ?><br />

+<?php echo wrap_label($_lang['no'], form_radio('enable_bindings', '0')); ?>

 

 </td>

 </tr>

@@ -153,20 +153,20 @@ 
 <th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th>

 <td>

 <?php

-if(empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;

-$phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0:1;

-$phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0:1;

-$phm['e']['SHA512']     = $modx->manager->checkHashAlgorithm('SHA512') ? 0:1;

-$phm['e']['SHA256']     = $modx->manager->checkHashAlgorithm('SHA256') ? 0:1;

-$phm['e']['MD5']        = $modx->manager->checkHashAlgorithm('MD5') ? 0:1;

-$phm['e']['UNCRYPT']    = $modx->manager->checkHashAlgorithm('UNCRYPT') ? 0:1;

+if (empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;

+$phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0 : 1;

+$phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0 : 1;

+$phm['e']['SHA512']     = $modx->manager->checkHashAlgorithm('SHA512') ? 0 : 1;

+$phm['e']['SHA256']     = $modx->manager->checkHashAlgorithm('SHA256') ? 0 : 1;

+$phm['e']['MD5']        = $modx->manager->checkHashAlgorithm('MD5') ? 0 : 1;

+$phm['e']['UNCRYPT']    = $modx->manager->checkHashAlgorithm('UNCRYPT') ? 0 : 1;

 ?>

-<?php echo wrap_label('CRYPT_BLOWFISH_Y (salt &amp; stretch)',form_radio('pwd_hash_algo','BLOWFISH_Y', '', $phm['e']['BLOWFISH_Y']));?><br />

-<?php echo wrap_label('CRYPT_BLOWFISH_A (salt &amp; stretch)',form_radio('pwd_hash_algo','BLOWFISH_A', '', $phm['e']['BLOWFISH_A']));?><br />

-<?php echo wrap_label('CRYPT_SHA512 (salt &amp; stretch)'    ,form_radio('pwd_hash_algo','SHA512'    , '', $phm['e']['SHA512']));?><br />

-<?php echo wrap_label('CRYPT_SHA256 (salt &amp; stretch)'    ,form_radio('pwd_hash_algo','SHA256'    , '', $phm['e']['SHA256']));?><br />

-<?php echo wrap_label('CRYPT_MD5 (salt &amp; stretch)'       ,form_radio('pwd_hash_algo','MD5'       , '', $phm['e']['MD5']));?><br />

-<?php echo wrap_label('UNCRYPT(32 chars salt + SHA-1 hash)'  ,form_radio('pwd_hash_algo','UNCRYPT'  , '', $phm['e']['UNCRYPT']));?>

+<?php echo wrap_label('CRYPT_BLOWFISH_Y (salt &amp; stretch)', form_radio('pwd_hash_algo', 'BLOWFISH_Y', '', $phm['e']['BLOWFISH_Y'])); ?><br />

+<?php echo wrap_label('CRYPT_BLOWFISH_A (salt &amp; stretch)', form_radio('pwd_hash_algo', 'BLOWFISH_A', '', $phm['e']['BLOWFISH_A'])); ?><br />

+<?php echo wrap_label('CRYPT_SHA512 (salt &amp; stretch)', form_radio('pwd_hash_algo', 'SHA512', '', $phm['e']['SHA512'])); ?><br />

+<?php echo wrap_label('CRYPT_SHA256 (salt &amp; stretch)', form_radio('pwd_hash_algo', 'SHA256', '', $phm['e']['SHA256'])); ?><br />

+<?php echo wrap_label('CRYPT_MD5 (salt &amp; stretch)', form_radio('pwd_hash_algo', 'MD5', '', $phm['e']['MD5'])); ?><br />

+<?php echo wrap_label('UNCRYPT(32 chars salt + SHA-1 hash)', form_radio('pwd_hash_algo', 'UNCRYPT', '', $phm['e']['UNCRYPT'])); ?>

 </td>

 </tr>

 <tr>

@@ -182,13 +182,13 @@ 
   ?>

 <?php

 $gdAvailable = extension_loaded('gd');

-if(!$gdAvailable) $use_captcha = 0;

+if (!$gdAvailable) $use_captcha = 0;

 ?>

   <tr>

     <td nowrap class="warning"><?php echo $_lang['captcha_title'] ?><br><small>[(use_captcha)]</small></td>

-    <td> <label><input type="radio" id="captchaOn" name="use_captcha" value="1" <?php echo ($use_captcha==1) ? 'checked="checked"' : "" ; echo (!$gdAvailable)? ' readonly="readonly"' : ''; ?> />

+    <td> <label><input type="radio" id="captchaOn" name="use_captcha" value="1" <?php echo ($use_captcha == 1) ? 'checked="checked"' : ""; echo (!$gdAvailable) ? ' readonly="readonly"' : ''; ?> />

       <?php echo $_lang['yes']?></label><br />

-      <label><input type="radio" id="captchaOff" name="use_captcha" value="0" <?php echo ($use_captcha==0) ? 'checked="checked"' : "" ; echo (!$gdAvailable)? ' readonly="readonly"' : '';?> />

+      <label><input type="radio" id="captchaOff" name="use_captcha" value="0" <?php echo ($use_captcha == 0) ? 'checked="checked"' : ""; echo (!$gdAvailable) ? ' readonly="readonly"' : ''; ?> />

       <?php echo $_lang['no']?></label> </td>

   </tr>

   <tr>

@@ -198,23 +198,23 @@ 
   <tr>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>

+  <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['captcha_words_title'] ?><br><small>[(captcha_words)]</small>

       <br />

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

       <select name="reload_captcha_words" id="reload_captcha_words_select" onchange="confirmLangChange(this, 'captcha_words_default', 'captcha_words_input');">

-<?php echo get_lang_options('captcha_words_default');?>

+<?php echo get_lang_options('captcha_words_default'); ?>

       </select>

     </td>

     <td><input type="text" id="captcha_words_input" name="captcha_words" style="width:250px" value="<?php echo $captcha_words; ?>" />

-        <input type="hidden" name="captcha_words_default" id="captcha_words_default_hidden" value="<?php echo addslashes($_lang['captcha_words_default']);?>" />

+        <input type="hidden" name="captcha_words_default" id="captcha_words_default_hidden" value="<?php echo addslashes($_lang['captcha_words_default']); ?>" />

     </td>

   </tr>

-  <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>

+  <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['captcha_words_message'] ?></td>

   </tr>

-  <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>

+  <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

 </table>

Braces +10 added lines, -4 removed lines

@@ -1,7 +1,9 @@ 
 <?php

     $MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4

-    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) $valid_hostnames = $_SERVER['HTTP_HOST'];

-?>

+    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {
+        $valid_hostnames = $_SERVER['HTTP_HOST'];
+    }
+    ?>

 <!-- Interface & editor settings -->

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

 <h2 class="tab"><?php echo $_lang['settings_security'] ?></h2>

@@ -153,7 +155,9 @@ 
 <th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th>

 <td>

 <?php

-if(empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;

+if(empty($pwd_hash_algo)) {
+    $phm['sel']['UNCRYPT'] = 1;
+}
 $phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0:1;

 $phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0:1;

 $phm['e']['SHA512']     = $modx->manager->checkHashAlgorithm('SHA512') ? 0:1;

@@ -182,7 +186,9 @@ 
   ?>

 <?php

 $gdAvailable = extension_loaded('gd');

-if(!$gdAvailable) $use_captcha = 0;

+if(!$gdAvailable) {
+    $use_captcha = 0;
+}
 ?>

   <tr>

     <td nowrap class="warning"><?php echo $_lang['captcha_title'] ?><br><small>[(use_captcha)]</small></td>

manager/actions/mutate_settings/tab3_user_settings.inc.php

Spacing +19 added lines, -19 removed lines

@@ -6,8 +6,8 @@ 
   <tr>

     <td nowrap class="warning"><?php echo $_lang['udperms_title'] ?><br><small>[(use_udperms)]</small></td>

     <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('use_udperms', 1, 'id="udPermsOn"'));?><br />

-        <?php echo wrap_label($_lang['no'], form_radio('use_udperms', 0, 'id="udPermsOff"'));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('use_udperms', 1, 'id="udPermsOn"')); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('use_udperms', 0, 'id="udPermsOff"')); ?>

     </td>

   </tr>

   <tr>

@@ -17,16 +17,16 @@ 
   <tr>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="udPerms" <?php echo showHide($use_udperms==1);?>>

+  <tr class="udPerms" <?php echo showHide($use_udperms == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['udperms_allowroot_title'] ?><br><small>[(udperms_allowroot)]</small></td>

     <td>

-      <label><input type="radio" name="udperms_allowroot" value="1" <?php echo $udperms_allowroot=='1' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="udperms_allowroot" value="1" <?php echo $udperms_allowroot == '1' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['yes']?></label><br />

-      <label><input type="radio" name="udperms_allowroot" value="0" <?php echo $udperms_allowroot=='0' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="udperms_allowroot" value="0" <?php echo $udperms_allowroot == '0' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['no']?></label>

     </td>

   </tr>

-  <tr class="udPerms" <?php echo showHide($use_udperms==1);?>>

+  <tr class="udPerms" <?php echo showHide($use_udperms == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['udperms_allowroot_message'] ?></td>

   </tr>

@@ -39,10 +39,10 @@ 
   <tr>

     <td nowrap class="warning"><?php echo $_lang['email_method_title'] ?><br><small>[(email_method)]</small></td>

     <td>

-        <?php echo wrap_label($_lang['email_method_mail'],form_radio('email_method','mail','id="useMail"'));?><br />

-        <?php echo wrap_label($_lang['email_method_smtp'],form_radio('email_method','smtp','id="useSmtp"'));?>

-        <div class="smtpRow" <?php echo showHide($email_method=='smtp');?>>

-            <?php include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/snippet_smtp.inc.php'); ?>

+        <?php echo wrap_label($_lang['email_method_mail'], form_radio('email_method', 'mail', 'id="useMail"')); ?><br />

+        <?php echo wrap_label($_lang['email_method_smtp'], form_radio('email_method', 'smtp', 'id="useSmtp"')); ?>

+        <div class="smtpRow" <?php echo showHide($email_method == 'smtp'); ?>>

+            <?php include_once(MODX_MANAGER_PATH.'actions/mutate_settings/snippet_smtp.inc.php'); ?>

         </div>

     </td>

   </tr>

@@ -54,11 +54,11 @@ 
       <br />

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

       <select name="reload_emailsubject" id="reload_emailsubject_select" onchange="confirmLangChange(this, 'emailsubject_default', 'emailsubject_field');">

-<?php echo get_lang_options('emailsubject_default');?>

+<?php echo get_lang_options('emailsubject_default'); ?>

       </select>

     </td>

     <td ><input id="emailsubject_field" name="emailsubject" onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" value="<?php echo $emailsubject; ?>" />

-        <input type="hidden" name="emailsubject_default" id="emailsubject_default_hidden" value="<?php echo addslashes($_lang['emailsubject_default']);?>" />

+        <input type="hidden" name="emailsubject_default" id="emailsubject_default_hidden" value="<?php echo addslashes($_lang['emailsubject_default']); ?>" />

     </td>

   </tr>

   <tr>

@@ -73,11 +73,11 @@ 
       <br />

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

       <select name="reload_signupemail_message" id="reload_signupemail_message_select" onchange="confirmLangChange(this, 'system_email_signup', 'signupemail_message_textarea');">

-<?php echo get_lang_options('system_email_signup');?>

+<?php echo get_lang_options('system_email_signup'); ?>

       </select>

     </td>

     <td> <textarea id="signupemail_message_textarea" name="signupemail_message" style="width:100%; height: 120px;"><?php echo $signupemail_message; ?></textarea>

-        <input type="hidden" name="system_email_signup_default" id="system_email_signup_hidden" value="<?php echo addslashes($_lang['system_email_signup']);?>" />

+        <input type="hidden" name="system_email_signup_default" id="system_email_signup_hidden" value="<?php echo addslashes($_lang['system_email_signup']); ?>" />

     </td>

   </tr>

   <tr>

@@ -92,11 +92,11 @@ 
       <br />

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

       <select name="reload_websignupemail_message" id="reload_websignupemail_message_select" onchange="confirmLangChange(this, 'system_email_websignup', 'websignupemail_message_textarea');">

-<?php echo get_lang_options('system_email_websignup');?>

+<?php echo get_lang_options('system_email_websignup'); ?>

       </select>

     </td>

     <td> <textarea id="websignupemail_message_textarea" name="websignupemail_message" style="width:100%; height: 120px;"><?php echo $websignupemail_message; ?></textarea>

-        <input type="hidden" name="system_email_websignup_default" id="system_email_websignup_hidden" value="<?php echo addslashes($_lang['system_email_websignup']);?>" />

+        <input type="hidden" name="system_email_websignup_default" id="system_email_websignup_hidden" value="<?php echo addslashes($_lang['system_email_websignup']); ?>" />

     </td>

   </tr>

   <tr>

@@ -111,11 +111,11 @@ 
       <br />

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

       <select name="reload_system_email_webreminder_message" id="reload_system_email_webreminder_select" onchange="confirmLangChange(this, 'system_email_webreminder', 'system_email_webreminder_textarea');">

-<?php echo get_lang_options('system_email_webreminder');?>

+<?php echo get_lang_options('system_email_webreminder'); ?>

       </select>

     </td>

     <td> <textarea id="system_email_webreminder_textarea" name="webpwdreminder_message" style="width:100%; height: 120px;"><?php echo $webpwdreminder_message; ?></textarea>

-        <input type="hidden" name="system_email_webreminder_default" id="system_email_webreminder_hidden" value="<?php echo addslashes($_lang['system_email_webreminder']);?>" />

+        <input type="hidden" name="system_email_webreminder_default" id="system_email_webreminder_hidden" value="<?php echo addslashes($_lang['system_email_webreminder']); ?>" />

     </td>

   </tr>

   <tr>

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

             // invoke OnUserSettingsRender event

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

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if (is_array($evtOut)) echo implode("", $evtOut);

         ?>

     </td>

   </tr>

Braces +3 added lines, -1 removed lines

@@ -127,7 +127,9 @@
         <?php

             // invoke OnUserSettingsRender event

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

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if(is_array($evtOut)) {
+                echo implode("",$evtOut);
+            }
         ?>

     </td>

   </tr>

manager/actions/mutate_settings/tab7_filebrowser_settings.inc.php

Spacing +58 added lines, -58 removed lines

@@ -6,8 +6,8 @@ 
   <tr>

     <td nowrap class="warning"><?php echo $_lang['rb_title']?><br><small>[(use_browser)]</small></td>

     <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('use_browser', 1, 'id="rbRowOn"'));?><br />

-        <?php echo wrap_label($_lang['no'], form_radio('use_browser', 0, 'id="rbRowOff"'));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('use_browser', 1, 'id="rbRowOn"')); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('use_browser', 0, 'id="rbRowOff"')); ?>

     </td>

   </tr>

   <tr>

@@ -18,7 +18,7 @@ 
     <td colspan="2"><div class="split"></div></td>

   </tr>

   

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['which_browser_default_title']?><br><small>[(which_browser)]</small></td>

     <td>

         <select name="which_browser" size="1" class="inputBox" onchange="documentDirty=true;">

@@ -27,206 +27,206 @@ 
                 $dir = str_replace('\\', '/', $dir);

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

                 $selected = $browser_name == $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>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['which_browser_default_msg']?></td>

   </tr>

   <tr>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['rb_webuser_title']?><br><small>[(rb_webuser)]</small></td>

     <td>

-      <label><input type="radio" name="rb_webuser" value="1" <?php echo $rb_webuser=='1' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="rb_webuser" value="1" <?php echo $rb_webuser == '1' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['yes']?></label><br />

-      <label><input type="radio" name="rb_webuser" value="0" <?php echo $rb_webuser=='0' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="rb_webuser" value="0" <?php echo $rb_webuser == '0' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['no']?></label>

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['rb_webuser_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['rb_base_dir_title']?><br><small>[(rb_base_dir)]</small></td>

     <td>

         <?php echo $_lang['default']; ?> <span id="default_rb_base_dir">[(base_path)]assets/</span><br />

         <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="rb_base_dir" id="rb_base_dir" value="<?php echo $rb_base_dir; ?>" /> <input type="button" onclick="reset_path('rb_base_dir');" value="<?php echo $_lang['reset']; ?>" name="reset_rb_base_dir">

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['rb_base_dir_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['rb_base_url_title']?><br><small>[(rb_base_url)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="rb_base_url" value="<?php echo $rb_base_url; ?>" />

       </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['rb_base_url_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

       <td nowrap class="warning"><?php echo $_lang['clean_uploaded_filename']?><br><small>[(clean_uploaded_filename)]</small></td>

       <td>

-        <label><input type="radio" name="clean_uploaded_filename" value="1" <?php echo $clean_uploaded_filename=='1' ? 'checked="checked"' : "" ; ?> />

+        <label><input type="radio" name="clean_uploaded_filename" value="1" <?php echo $clean_uploaded_filename == '1' ? 'checked="checked"' : ""; ?> />

         <?php echo $_lang['yes']?></label><br />

-        <label><input type="radio" name="clean_uploaded_filename" value="0" <?php echo $clean_uploaded_filename=='0' ? 'checked="checked"' : "" ; ?> />

+        <label><input type="radio" name="clean_uploaded_filename" value="0" <?php echo $clean_uploaded_filename == '0' ? 'checked="checked"' : ""; ?> />

         <?php echo $_lang['no']?></label>

       </td>

   </tr>

-    <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+    <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

       <td width="200">&nbsp;</td>

-      <td class="comment"><?php echo $_lang['clean_uploaded_filename_message'];?></td>

+      <td class="comment"><?php echo $_lang['clean_uploaded_filename_message']; ?></td>

     </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

   <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['settings_strip_image_paths_title']?><br><small>[(strip_image_paths)]</small></td>

     <td>

-      <label><input type="radio" name="strip_image_paths" value="1" <?php echo $strip_image_paths=='1' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="strip_image_paths" value="1" <?php echo $strip_image_paths == '1' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['yes']?></label><br />

-      <label><input type="radio" name="strip_image_paths" value="0" <?php echo $strip_image_paths=='0' ? 'checked="checked"' : "" ; ?> />

+      <label><input type="radio" name="strip_image_paths" value="0" <?php echo $strip_image_paths == '0' ? 'checked="checked"' : ""; ?> />

       <?php echo $_lang['no']?></label>

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['settings_strip_image_paths_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['maxImageWidth']?><br><small>[(maxImageWidth)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="maxImageWidth" value="<?php echo $maxImageWidth; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['maxImageWidth_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['maxImageHeight']?><br><small>[(maxImageHeight)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="maxImageHeight" value="<?php echo $maxImageHeight; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['maxImageHeight_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['thumbWidth']?><br><small>[(thumbWidth)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="thumbWidth" value="<?php echo $thumbWidth; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['thumbWidth_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['thumbHeight']?><br><small>[(thumbHeight)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="thumbHeight" value="<?php echo $thumbHeight; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['thumbHeight_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['thumbsDir']?><br><small>[(thumbsDir)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="thumbsDir" value="<?php echo $thumbsDir; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['thumbsDir_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['jpegQuality']?><br><small>[(jpegQuality)]</small></td>

     <td>

       <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="jpegQuality" value="<?php echo $jpegQuality; ?>" />

     </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['jpegQuality_message']?></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

        <td nowrap class="warning"><?php echo $_lang['denyZipDownload'] ?><br><small>[(denyZipDownload)]</small></td>

         <td>

-          <label><input type="radio" name="denyZipDownload" value="0" <?php echo $denyZipDownload=='0' ? 'checked="checked"' : ""; ?> />

+          <label><input type="radio" name="denyZipDownload" value="0" <?php echo $denyZipDownload == '0' ? 'checked="checked"' : ""; ?> />

           <?php echo $_lang['no']?></label><br />

-          <label><input type="radio" name="denyZipDownload" value="1" <?php echo $denyZipDownload=='1' ? 'checked="checked"' : ""; ?> />

+          <label><input type="radio" name="denyZipDownload" value="1" <?php echo $denyZipDownload == '1' ? 'checked="checked"' : ""; ?> />

           <?php echo $_lang['yes']?></label>

         </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

         <td nowrap class="warning"><?php echo $_lang['denyExtensionRename'] ?><br><small>[(denyExtensionRename)]</small></td>

         <td>

-           <label><input type="radio" name="denyExtensionRename" value="0" <?php echo $denyExtensionRename=='0' ? 'checked="checked"' : ""; ?> />

+           <label><input type="radio" name="denyExtensionRename" value="0" <?php echo $denyExtensionRename == '0' ? 'checked="checked"' : ""; ?> />

            <?php echo $_lang['no']?></label><br />

-           <label><input type="radio" name="denyExtensionRename" value="1" <?php echo $denyExtensionRename=='1' ? 'checked="checked"' : ""; ?> />

+           <label><input type="radio" name="denyExtensionRename" value="1" <?php echo $denyExtensionRename == '1' ? 'checked="checked"' : ""; ?> />

            <?php echo $_lang['yes']?></label>

         </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

        <td nowrap class="warning"><?php echo $_lang['showHiddenFiles'] ?><br><small>[(showHiddenFiles)]</small></td>

        <td>

-         <label><input type="radio" name="showHiddenFiles" value="0" <?php echo $showHiddenFiles=='0' ? 'checked="checked"' : ""; ?> />

+         <label><input type="radio" name="showHiddenFiles" value="0" <?php echo $showHiddenFiles == '0' ? 'checked="checked"' : ""; ?> />

          <?php echo $_lang['no']?></label><br />

-         <label><input type="radio" name="showHiddenFiles" value="1" <?php echo $showHiddenFiles=='1' ? 'checked="checked"' : ""; ?> />

+         <label><input type="radio" name="showHiddenFiles" value="1" <?php echo $showHiddenFiles == '1' ? 'checked="checked"' : ""; ?> />

          <?php echo $_lang['yes']?></label>

         </td>

   </tr>

-  <tr class="rbRow" <?php echo showHide($use_browser==1);?>>

+  <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

   

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

             // invoke OnMiscSettingsRender event

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

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if (is_array($evtOut)) echo implode("", $evtOut);

         ?>

     </td>

   </tr>

Braces +4 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
     <td>

         <select name="which_browser" size="1" class="inputBox" onchange="documentDirty=true;">

             <?php

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

+            foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
                 $dir = str_replace('\\', '/', $dir);

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

                 $selected = $browser_name == $which_browser ? ' selected="selected"' : '';

@@ -235,7 +235,9 @@ 
         <?php

             // invoke OnMiscSettingsRender event

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

-            if(is_array($evtOut)) echo implode("",$evtOut);

+            if(is_array($evtOut)) {
+                echo implode("",$evtOut);
+            }
         ?>

     </td>

   </tr>

manager/actions/mutate_settings/tab4_manager_settings.inc.php

Spacing +7 added lines, -7 removed lines

@@ -56,7 +56,7 @@ 
                             }

                             $themename = $file;

                             $selectedtext = $themename == $manager_theme ? "selected='selected'" : "";

-                            echo "<option value='$themename' $selectedtext>" . ucwords(str_replace("_", " ", $themename)) . "</option>";

+                            echo "<option value='$themename' $selectedtext>".ucwords(str_replace("_", " ", $themename))."</option>";

                         }

                     }

                     $dir->close();

@@ -206,7 +206,7 @@ 
             <td>

                 <select name="group_tvs" size="1" class="form-control">

                     <?php

-                    $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>' . "\n";

+                    $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>'."\n";

                     $option = explode(',', $_lang['settings_group_tv_options']);

                     $output = array();

                     foreach ($option as $k => $v) {

@@ -279,7 +279,7 @@ 
             <td>

                 <select name="resource_tree_node_name" size="1" class="inputBox">

                     <?php

-                    $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>' . "\n";

+                    $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>'."\n";

                     $option = array('pagetitle', 'longtitle', 'menutitle', 'alias', 'createdon', 'editedon', 'publishedon');

                     $output = array();

                     foreach ($option as $v) {

@@ -365,8 +365,8 @@ 
                     $str = '';

                     foreach ($datetime_format_list as $value) {

                         $selectedtext = ($datetime_format == $value) ? ' selected' : '';

-                        $str .= '<option value="' . $value . '"' . $selectedtext . '>';

-                        $str .= $value . '</option>' . PHP_EOL;

+                        $str .= '<option value="'.$value.'"'.$selectedtext.'>';

+                        $str .= $value.'</option>'.PHP_EOL;

                     }

                     echo $str;

                     ?>

@@ -476,10 +476,10 @@ 
                 <select name="which_editor" onChange="documentDirty=true;">

                     <?php

                     // invoke OnRichTextEditorRegister event

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

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

                     if (is_array($evtOut)) {

                         foreach ($evtOut as $editor) {

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

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

                         }

                     }

                     ?>

Braces +10 added lines, -10 removed lines

@@ -49,9 +49,9 @@ 
                 <select name="manager_theme" size="1" class="inputBox" onChange="documentDirty=true; document.forms['settings'].theme_refresher.value = Date.parse(new Date());">

                     <?php

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

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

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

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

+                    while ($file = $dir->read()) {
+                        if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
+                            if ($file === 'common') {
                                 continue;

                             }

                             $themename = $file;

@@ -209,7 +209,7 @@ 
                     $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>' . "\n";

                     $option = explode(',', $_lang['settings_group_tv_options']);

                     $output = array();

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

+                    foreach ($option as $k => $v) {
                         $selected = ($k == $group_tvs) ? 'selected' : '';

                         $s = array('[+value+]', '[+selected+]', '[+title+]');

                         $r = array($k, $selected, $v);

@@ -282,7 +282,7 @@ 
                     $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>' . "\n";

                     $option = array('pagetitle', 'longtitle', 'menutitle', 'alias', 'createdon', 'editedon', 'publishedon');

                     $output = array();

-                    foreach ($option as $v) {

+                    foreach ($option as $v) {
                         $selected = ($v == $resource_tree_node_name) ? 'selected' : '';

                         $s = array('[+value+]', '[+selected+]');

                         $r = array($v, $selected);

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

                     $datetime_format_list = array('dd-mm-YYYY', 'mm/dd/YYYY', 'YYYY/mm/dd');

                     $str = '';

-                    foreach ($datetime_format_list as $value) {

+                    foreach ($datetime_format_list as $value) {
                         $selectedtext = ($datetime_format == $value) ? ' selected' : '';

                         $str .= '<option value="' . $value . '"' . $selectedtext . '>';

                         $str .= $value . '</option>' . PHP_EOL;

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

         // invoke OnRichTextEditorRegister event

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

-        if (!is_array($evtOut)) {

+        if (!is_array($evtOut)) {
             $evtOut = array();

             $use_editor = 0;

         }

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

                     // invoke OnRichTextEditorRegister event

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

-                    if (is_array($evtOut)) {

-                        foreach ($evtOut as $editor) {

+                    if (is_array($evtOut)) {
+                        foreach ($evtOut as $editor) {
                             echo "<option value='$editor'" . ($which_editor == $editor ? " selected='selected'" : "") . ">$editor</option>\n";

                         }

                     }

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

                 // invoke OnInterfaceSettingsRender event

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

-                if (is_array($evtOut)) {

+                if (is_array($evtOut)) {
                     echo implode("", $evtOut);

                 }

                 ?>