evolution-cms / evolution

manager/actions/mutate_module.dynamic.php

Spacing +34 added lines, -34 removed lines

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

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

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

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

 }

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

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

 	case 107:

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

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

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

 		}

 		break;

 	case 108:

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

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

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

 		}

 		break;

 	default:

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

 }

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

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

 // Get table names (alphabetical)

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

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

@@ -31,7 +31,7 @@ 
 

 

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

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

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

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

 }

 // end check for lock

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

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

 

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

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

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

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

-	if(!$content) {

+	if (!$content) {

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

 	}

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

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

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

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

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

 	}

 } else {

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

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

 }

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

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

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

 }

 

 // Add lock-element JS-Script

 $lockElementId = $id;

 $lockElementType = 6;

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

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

 ?>

 <script type="text/javascript">

 	function loadDependencies() {

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

 		var w = screen.width * 0.7;

 		var h = screen.height * 0.7;

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

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

 	}

 

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

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

 	// invoke OnModFormPrerender event

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

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode('', $evtOut);

 	}

 

@@ -442,7 +442,7 @@ 
 	<input type="hidden" name="mode" value="<?= $modx->getManagerApi()->action ?>">

 

 	<h1>

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

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

 	</h1>

 

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

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

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

 								<input name="name" type="text" maxlength="100" value="<?= $modx->getPhpCompat()->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />

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

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

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

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

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

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

 									</label>

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

 								<option>&nbsp;</option>

 								<?php

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

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

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

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

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

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

 								}

 								?>

 							</select>

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

 					<div class="form-row">

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

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

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

 					</div>

 					<div class="form-row">

 						<label for="parse_docblock">

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

 			<!-- HTML text editor end -->

 		</div>

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

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

 			<!-- Dependencies -->

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

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

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

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

 

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

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

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

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

 					$grd->cssClass = 'grid';

 					$grd->columnHeaderClass = 'gridHeader';

 					$grd->itemClass = 'gridItem';

 					$grd->altItemClass = 'gridAltItem';

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

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

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

 					echo $grd->render();

 					?>

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

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

 			<div class="container container-body">

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

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

 					<?php

 					// fetch user access permissions for the module

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

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

 

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

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

 						?>

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

@@ -671,22 +671,22 @@ 
 					}

 					$chk = '';

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

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

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

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

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

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

-							if($checked) {

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

+							if ($checked) {

 								$notPublic = true;

 							}

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

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

 						} else {

-							if($checked) {

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

+							if ($checked) {

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

 							}

 						}

 					}

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

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

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

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

 					}

 					echo $chks;

 					?>

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

 		// invoke OnModFormRender event

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

-		if(is_array($evtOut)) {

+		if (is_array($evtOut)) {

 			echo implode('', $evtOut);

 		}

 		?>

manager/actions/mutate_settings.dynamic.php

Spacing +20 added lines, -20 removed lines

@@ -1,14 +1,14 @@ 
 <?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 />Please use the EVO Content Manager instead of accessing this file directly.");

 }

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

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

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

 }

 

 // check to see the edit settings page isn't locked

-$rs = $modx->getDatabase()->select('username', $modx->getFullTableName('active_users'), "action=17 AND internalKey!='" . $modx->getLoginUserID() . "'");

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

+$rs = $modx->getDatabase()->select('username', $modx->getFullTableName('active_users'), "action=17 AND internalKey!='".$modx->getLoginUserID()."'");

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

 	$modx->webAlertAndQuit(sprintf($_lang['lock_settings_msg'], $username));

 }

 // end check for lock

@@ -16,21 +16,21 @@ 
 // reload system settings from the database.

 // this will prevent user-defined settings from being saved as system setting

 $settings = array();

-include_once(MODX_MANAGER_PATH . 'includes/default_config.php');

+include_once(MODX_MANAGER_PATH.'includes/default_config.php');

 $rs = $modx->getDatabase()->select('setting_name, setting_value', '[+prefix+]system_settings');

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

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

 	$settings[$row['setting_name']] = $row['setting_value'];

 }

-$settings['filemanager_path'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['filemanager_path']);

-$settings['rb_base_dir'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['rb_base_dir']);

+$settings['filemanager_path'] = preg_replace('@^'.preg_quote(MODX_BASE_PATH).'@', '[(base_path)]', $settings['filemanager_path']);

+$settings['rb_base_dir'] = preg_replace('@^'.preg_quote(MODX_BASE_PATH).'@', '[(base_path)]', $settings['rb_base_dir']);

 

 extract($settings, EXTR_OVERWRITE);

 

 // load languages and keys

 $lang_keys = array();

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

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

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

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

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

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

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

 		$lang_keys[$languagename] = get_lang_keys($file);

@@ -67,7 +67,7 @@ 
 			<input type="hidden" name="site_id" value="<?php echo $site_id; ?>" />

 			<input type="hidden" name="settings_version" value="<?php echo $modx->getVersionData('version'); ?>" />

 			<!-- this field is used to check site settings have been entered/ updated after install or upgrade -->

-			<?php if(!isset($settings_version) || $settings_version != $modx->getVersionData('version')) { ?>

+			<?php if (!isset($settings_version) || $settings_version != $modx->getVersionData('version')) { ?>

 				<div class='sectionBody'><p class='element-edit-message-tab alert alert-warning'><?php echo $_lang['settings_after_install']; ?></p></div>

 			<?php } ?>

 			<div class="tab-pane" id="settingsPane">

@@ -76,13 +76,13 @@ 
 				</script>

 

 				<?php

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab1_site_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab2_furl_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab3_user_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab4_manager_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab5_security_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab6_filemanager_settings.inc.php');

-				include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab7_filebrowser_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab1_site_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab2_furl_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab3_user_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab4_manager_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab5_security_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab6_filemanager_settings.inc.php');

+				include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab7_filebrowser_settings.inc.php');

 				?>

 			</div>

 		</div>

@@ -129,6 +129,6 @@ 
 		});

 	</script>

 <?php

-if(is_numeric($_GET['tab'])) {

-	echo '<script type="text/javascript">tpSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';

+if (is_numeric($_GET['tab'])) {

+	echo '<script type="text/javascript">tpSettings.setSelectedIndex( '.$_GET['tab'].' );</script>';

 }

manager/actions/eventlog_details.dynamic.php

Spacing +13 added lines, -13 removed lines

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

manager/actions/access_permissions.dynamic.php

Spacing +37 added lines, -37 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
-if(!$modx->hasPermission('access_permissions')) {
+if (!$modx->hasPermission('access_permissions')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -17,23 +17,23 @@ 
 
 // find all document groups, for the select :)
 $rs = $modx->getDatabase()->select('*', $tbl_documentgroup_names, '', 'name');
-if($modx->getDatabase()->getRecordCount($rs) < 1) {
+if ($modx->getDatabase()->getRecordCount($rs) < 1) {
 	$docgroupselector = '[no groups to add]';
 } else {
-	$docgroupselector = '<select name="docgroup">' . "\n";
-	while($row = $modx->getDatabase()->getRow($rs)) {
-		$docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+	$docgroupselector = '<select name="docgroup">'."\n";
+	while ($row = $modx->getDatabase()->getRow($rs)) {
+		$docgroupselector .= "\t".'<option value="'.$row['id'].'">'.$row['name']."</option>\n";
 	}
 	$docgroupselector .= "</select>\n";
 }
 
 $rs = $modx->getDatabase()->select('*', $tbl_membergroup_names, '', 'name');
-if($modx->getDatabase()->getRecordCount($rs) < 1) {
+if ($modx->getDatabase()->getRecordCount($rs) < 1) {
 	$usrgroupselector = '[no user groups]';
 } else {
-	$usrgroupselector = '<select name="usergroup">' . "\n";
-	while($row = $modx->getDatabase()->getRow($rs)) {
-		$usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+	$usrgroupselector = '<select name="usergroup">'."\n";
+	while ($row = $modx->getDatabase()->getRow($rs)) {
+		$usrgroupselector .= "\t".'<option value="'.$row['id'].'">'.$row['name']."</option>\n";
 	}
 	$usrgroupselector .= "</select>\n";
 }
@@ -69,7 +69,7 @@ 
 	<div class="alert alert-info"><?= $_lang['access_permissions_introtext'] ?></div>
 </div>
 
-<div class="container"><?= ($use_udperms != 1 ? '<div class="alert alert-danger">' . $_lang['access_permissions_off'] . '</div>' : '') ?></div>
+<div class="container"><?= ($use_udperms != 1 ? '<div class="alert alert-danger">'.$_lang['access_permissions_off'].'</div>' : '') ?></div>
 
 <div class="tab-pane" id="uapPane">
 	<script type="text/javascript">
@@ -96,10 +96,10 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->getDatabase()->select('groupnames.*, users.id AS user_id, users.username user_name', $tbl_membergroup_names . ' AS groupnames
-			LEFT JOIN ' . $tbl_member_groups . ' AS groups ON groups.user_group = groupnames.id
-			LEFT JOIN ' . $tbl_manager_users . ' AS users ON users.id = groups.member', '', 'groupnames.name, user_name');
-			if($modx->getDatabase()->getRecordCount($rs) < 1) {
+			$rs = $modx->getDatabase()->select('groupnames.*, users.id AS user_id, users.username user_name', $tbl_membergroup_names.' AS groupnames
+			LEFT JOIN ' . $tbl_member_groups.' AS groups ON groups.user_group = groupnames.id
+			LEFT JOIN ' . $tbl_manager_users.' AS users ON users.id = groups.member', '', 'groupnames.name, user_name');
+			if ($modx->getDatabase()->getRecordCount($rs) < 1) {
 				?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
@@ -108,9 +108,9 @@ 
 			<div class="form-group">
 				<?php
 				$pid = '';
-				while($row = $modx->getDatabase()->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
+				while ($row = $modx->getDatabase()->getRow($rs)) {
+					if ($pid != $row['id']) {
+						if ($pid != '') {
 							echo '</div><div class="form-group">';
 						}
 						?>
@@ -129,7 +129,7 @@ 
 						<?= $_lang['access_permissions_users_in_group'] ?>
 						<?php
 					}
-					if(!$row['user_id']) {
+					if (!$row['user_id']) {
 						?>
 						<i><?= $_lang['access_permissions_no_users_in_group'] ?></i>
 						<?php
@@ -167,10 +167,10 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->getDatabase()->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $tbl_documentgroup_names . ' AS dgnames
-			LEFT JOIN ' . $tbl_document_groups . ' AS dg ON dg.document_group = dgnames.id
-			LEFT JOIN ' . $tbl_site_content . ' AS sc ON sc.id = dg.document', '', 'dgnames.name, sc.id');
-			if($modx->getDatabase()->getRecordCount($rs) < 1) {
+			$rs = $modx->getDatabase()->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $tbl_documentgroup_names.' AS dgnames
+			LEFT JOIN ' . $tbl_document_groups.' AS dg ON dg.document_group = dgnames.id
+			LEFT JOIN ' . $tbl_site_content.' AS sc ON sc.id = dg.document', '', 'dgnames.name, sc.id');
+			if ($modx->getDatabase()->getRecordCount($rs) < 1) {
 				?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
@@ -179,9 +179,9 @@ 
 			<div class="form-group">
 				<?php
 				$pid = '';
-				while($row = $modx->getDatabase()->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
+				while ($row = $modx->getDatabase()->getRow($rs)) {
+					if ($pid != $row['id']) {
+						if ($pid != '') {
 							echo '</div><div class="form-group">';
 						}
 						?>
@@ -200,7 +200,7 @@ 
 						<?= $_lang['access_permissions_resources_in_group'] ?>
 						<?php
 					}
-					if(!$row['doc_id']) {
+					if (!$row['doc_id']) {
 						?>
 						<i><?= $_lang['access_permissions_no_resources_in_group'] ?></i>
 						<?php
@@ -226,10 +226,10 @@ 
 			<p class="element-edit-message-tab alert alert-warning"><?= $_lang['access_permissions_links_tab'] ?></p>
 			<?php
 			// User/Document Group Links
-			$rs = $modx->getDatabase()->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $tbl_membergroup_names . ' AS groupnames
-			LEFT JOIN ' . $tbl_membergroup_access . ' AS groupacc ON groupacc.membergroup = groupnames.id
-			LEFT JOIN ' . $tbl_documentgroup_names . ' AS dgnames ON dgnames.id = groupacc.documentgroup', '', 'name, dg_name');
-			if($modx->getDatabase()->getRecordCount($rs) < 1) {
+			$rs = $modx->getDatabase()->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $tbl_membergroup_names.' AS groupnames
+			LEFT JOIN ' . $tbl_membergroup_access.' AS groupacc ON groupacc.membergroup = groupnames.id
+			LEFT JOIN ' . $tbl_documentgroup_names.' AS dgnames ON dgnames.id = groupacc.documentgroup', '', 'name, dg_name');
+			if ($modx->getDatabase()->getRecordCount($rs) < 1) {
 				?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
@@ -251,23 +251,23 @@ 
 				<ul>
 					<?php
 					$pid = '';
-					while($row = $modx->getDatabase()->getRow($rs)) {
-						if($row['id'] != $pid) {
-							if($pid != '') {
+					while ($row = $modx->getDatabase()->getRow($rs)) {
+						if ($row['id'] != $pid) {
+							if ($pid != '') {
 								echo '</ul></li>';
 							} // close previous one
 							?>
 							<li><b><?= $row['name'] ?></b></li>
 							<?php
-							if(!$row['dg_id']) {
-								echo '<i>' . $_lang['no_groups_found'] . '</i></li>';
+							if (!$row['dg_id']) {
+								echo '<i>'.$_lang['no_groups_found'].'</i></li>';
 								$pid = '';
 								continue;
 							} else {
 								echo '<ul>';
 							}
 						}
-						if(!$row['dg_id']) {
+						if (!$row['dg_id']) {
 							continue;
 						}
 						?>

manager/actions/mutate_plugin_priority.dynamic.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('save_plugin')) {
@@ -11,7 +11,7 @@ 
 $updateMsg = '';
 
 if (isset($_POST['listSubmitted'])) {
-    $updateMsg .= '<span class="text-success" id="updated">' . $_lang['sort_updated'] . '</span>';
+    $updateMsg .= '<span class="text-success" id="updated">'.$_lang['sort_updated'].'</span>';
     $tbl = $modx->getFullTableName('site_plugin_events');
 
     foreach ($_POST as $listName => $listValue) {
@@ -34,9 +34,9 @@ 
     $modx->clearCache('full');
 }
 
-$rs = $modx->getDatabase()->select("sysevt.name as evtname, sysevt.id as evtid, pe.pluginid, plugs.name, pe.priority, plugs.disabled", $modx->getFullTableName('system_eventnames') . " sysevt
-		INNER JOIN " . $modx->getFullTableName('site_plugin_events') . " pe ON pe.evtid = sysevt.id
-		INNER JOIN " . $modx->getFullTableName('site_plugins') . " plugs ON plugs.id = pe.pluginid", '', 'sysevt.name,pe.priority');
+$rs = $modx->getDatabase()->select("sysevt.name as evtname, sysevt.id as evtid, pe.pluginid, plugs.name, pe.priority, plugs.disabled", $modx->getFullTableName('system_eventnames')." sysevt
+		INNER JOIN " . $modx->getFullTableName('site_plugin_events')." pe ON pe.evtid = sysevt.id
+		INNER JOIN " . $modx->getFullTableName('site_plugins')." plugs ON plugs.id = pe.pluginid", '', 'sysevt.name,pe.priority');
 
 $insideUl = 0;
 $preEvt = '';
@@ -47,17 +47,17 @@ 
     if ($preEvt !== $plugins['evtid']) {
         $sortables[] = $plugins['evtid'];
         $sortableList .= $insideUl ? '</ul></div>' : '';
-        $sortableList .= '<div class="form-group clearfix"><strong>' . $plugins['evtname'] . '</strong><ul id="' . $plugins['evtid'] . '" class="sortableList">';
+        $sortableList .= '<div class="form-group clearfix"><strong>'.$plugins['evtname'].'</strong><ul id="'.$plugins['evtid'].'" class="sortableList">';
         $insideUl = 1;
     }
-    $sortableList .= '<li id="item_' . $plugins['pluginid'] . '"' . ($plugins['disabled'] ? ' class="disabledPlugin"' : '') . '><i class="fa fa-plug"></i> ' . $plugins['name'] . ($plugins['disabled'] ? ' (hide)' : '') . '</li>';
+    $sortableList .= '<li id="item_'.$plugins['pluginid'].'"'.($plugins['disabled'] ? ' class="disabledPlugin"' : '').'><i class="fa fa-plug"></i> '.$plugins['name'].($plugins['disabled'] ? ' (hide)' : '').'</li>';
     $preEvt = $plugins['evtid'];
 }
 if ($insideUl) {
     $sortableList .= '</ul></div>';
 }
 
-require_once(MODX_MANAGER_PATH . 'includes/header.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/header.inc.php');
 ?>
 
 <script type="text/javascript">

manager/actions/site_schedule.static.php

Spacing +10 added lines, -10 removed lines

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

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

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

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

 }

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

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

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

 }

 ?>

@@ -17,9 +17,9 @@ 
 		<div class="form-group" id="lyr1">

 			<b><?= $_lang["publish_events"] ?></b>

 			<?php

-			$rs = $modx->getDatabase()->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC');

+			$rs = $modx->getDatabase()->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > ".time()."", 'pub_date ASC');

 			$limit = $modx->getDatabase()->getRecordCount($rs);

-			if($limit < 1) {

+			if ($limit < 1) {

 				?>

 				<p><?= $_lang["no_docs_pending_publishing"] ?></p>

 				<?php

@@ -36,7 +36,7 @@ 
 						</thead>

 						<tbody>

 						<?php

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

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

 							?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

@@ -56,9 +56,9 @@ 
 		<div class="form-group" id="lyr2">

 			<b><?= $_lang["unpublish_events"] ?></b>

 			<?php

-			$rs = $modx->getDatabase()->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC');

+			$rs = $modx->getDatabase()->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > ".time()."", 'unpub_date ASC');

 			$limit = $modx->getDatabase()->getRecordCount($rs);

-			if($limit < 1) {

+			if ($limit < 1) {

 				?>

 				<p><?= $_lang["no_docs_pending_unpublishing"] ?></p>

 				<?php

@@ -75,7 +75,7 @@ 
 						</thead>

 						<tbody>

 						<?php

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

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

 							?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

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

 			$rs = $modx->getDatabase()->select('id, pagetitle, pub_date, unpub_date', $modx->getFullTableName('site_content'), "pub_date > 0 OR unpub_date > 0", "pub_date DESC");

 			$limit = $modx->getDatabase()->getRecordCount($rs);

-			if($limit < 1) {

+			if ($limit < 1) {

 				?>

 				<p><?= $_lang["no_docs_pending_pubunpub"] ?></p>

 				<?php

@@ -115,7 +115,7 @@ 
 						</thead>

 						<tbody>

 						<?php

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

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

 							?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

manager/actions/welcome.static.php

Spacing +61 added lines, -61 removed lines

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

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

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

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

 }

 

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

 

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

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

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

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

 }

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

 

 // setup message info

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

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

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

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

 	$_SESSION['nrtotalmessages'] = $nrtotalmessages;

 	$_SESSION['nrnewmessages'] = $nrnewmessages;

 

 	$msg = array();

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

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

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

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

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

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

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

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

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

@@ -33,56 +33,56 @@ 
 

 $iconTpl = $modx->getChunk('manager#welcome\WrapIcon');

 // setup icons

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

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

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

-	$ph['SecurityIcon'] = sprintf($iconTpl,$icon, 75);

+	$ph['SecurityIcon'] = sprintf($iconTpl, $icon, 75);

 }

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

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

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

-	$ph['WebUserIcon'] = sprintf($iconTpl,$icon, 99);

+	$ph['WebUserIcon'] = sprintf($iconTpl, $icon, 99);

 }

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

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

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

-	$ph['ModulesIcon'] = sprintf($iconTpl,$icon, 106);

+	$ph['ModulesIcon'] = sprintf($iconTpl, $icon, 106);

 }

-if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

+if ($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {

 	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

-	$ph['ResourcesIcon'] = sprintf($iconTpl,$icon, 76);

+	$ph['ResourcesIcon'] = sprintf($iconTpl, $icon, 76);

 }

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

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

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

-	$ph['BackupIcon'] = sprintf($iconTpl,$icon, 93);

+	$ph['BackupIcon'] = sprintf($iconTpl, $icon, 93);

 }

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

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

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

-	$ph['HelpIcon'] = sprintf($iconTpl,$icon, 9);

+	$ph['HelpIcon'] = sprintf($iconTpl, $icon, 9);

 }

 

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

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

 	$icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';

-	$ph['ResourceIcon'] = sprintf($iconTpl,$icon, 4);

+	$ph['ResourceIcon'] = sprintf($iconTpl, $icon, 4);

 	$icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';

-	$ph['WeblinkIcon'] = sprintf($iconTpl,$icon, 72);

+	$ph['WeblinkIcon'] = sprintf($iconTpl, $icon, 72);

 }

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

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

 	$icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';

-	$ph['ImagesIcon'] = sprintf($iconTpl,$icon, 72);

+	$ph['ImagesIcon'] = sprintf($iconTpl, $icon, 72);

 }

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

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

 	$icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';

-	$ph['FilesIcon'] = sprintf($iconTpl,$icon, 72);

+	$ph['FilesIcon'] = sprintf($iconTpl, $icon, 72);

 }

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

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

 	$icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';

-	$ph['PasswordIcon'] = sprintf($iconTpl,$icon, 28);

+	$ph['PasswordIcon'] = sprintf($iconTpl, $icon, 28);

 }

 $icon = '<i class="[&icons_logout_large&]"></i>[%logout%]';

-$ph['LogoutIcon'] = sprintf($iconTpl,$icon, 8);

+$ph['LogoutIcon'] = sprintf($iconTpl, $icon, 8);

 

 // do some config checks

-if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

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

-	if($config_check_results != $_lang['configcheck_ok']) {

+if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

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

+	if ($config_check_results != $_lang['configcheck_ok']) {

 		$ph['config_check_results'] = $config_check_results;

 		$ph['config_display'] = 'block';

 	} else {

@@ -93,8 +93,8 @@ 
 }

 

 // Check logout-reminder

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

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

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

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

 		case 'logout_reminder':

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

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

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

 </table>';

 

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

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

 

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

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

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

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

 

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

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

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

 } else {

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

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

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

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

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

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

 	$userCount = array();

 	// Create userlist with session-count first before output

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

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

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

 

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

@@ -209,9 +209,9 @@ 
 			$currentaction

 		);

 	}

-	foreach($userList as $params) {

+	foreach ($userList as $params) {

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

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

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

 	}

 

 	$html .= '

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

 

 // include rss feeds for important forum topics

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

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

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

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

 

@@ -254,7 +254,7 @@ 
 

 // invoke event OnManagerWelcomePrerender

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

-if(is_array($evtOut)) {

+if (is_array($evtOut)) {

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

 	$ph['OnManagerWelcomePrerender'] = $output;

 }

@@ -384,57 +384,57 @@ 
 

 // invoke OnManagerWelcomeHome event

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

-if(is_array($sitewidgets)) {

+if (is_array($sitewidgets)) {

 	$newwidgets = array();

-    foreach($sitewidgets as $widget){

+    foreach ($sitewidgets as $widget) {

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

     }

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

 }

 

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

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

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

 });

 

 $tpl = $modx->getChunk('manager#welcome\Widget');

 $output = '';

-foreach($widgets as $widget) {

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

+foreach ($widgets as $widget) {

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

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

 	}

 }

 $ph['widgets'] = $output;

 

 // load template

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

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

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

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

 }

 

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

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

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

 

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

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

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

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

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

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

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

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

 	} else {

 		$content = '';

 	}

 } else {

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

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

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

 		$content = $chunk;

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

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

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

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

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

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

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

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

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

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

 	{

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

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

 	} else {

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

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

 	}

 }

 

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

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

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

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

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

 	$modx->toPlaceholders($ph);

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

 }

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

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

 

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

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

 	$content .= $js;

 }

 

manager/actions/search.static.php

Spacing +73 added lines, -73 removed lines

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

manager/actions/mutate_user.dynamic.php

Spacing +59 added lines, -59 removed lines

@@ -1,16 +1,16 @@ 
 <?php
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-switch($modx->getManagerApi()->action) {
+switch ($modx->getManagerApi()->action) {
 	case 12:
-		if(!$modx->hasPermission('edit_user')) {
+		if (!$modx->hasPermission('edit_user')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
 	case 11:
-		if(!$modx->hasPermission('new_user')) {
+		if (!$modx->hasPermission('new_user')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
@@ -18,24 +18,24 @@ 
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$user = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // check to see the snippet editor isn't locked
-$rs = $modx->getDatabase()->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");
-if($username = $modx->getDatabase()->getValue($rs)) {
+$rs = $modx->getDatabase()->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='".$modx->getLoginUserID()."'");
+if ($username = $modx->getDatabase()->getValue($rs)) {
 	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "user"));
 }
 // end check for lock
 
-if($modx->getManagerApi()->action == '12') {
+if ($modx->getManagerApi()->action == '12') {
 	// get user attribute
 	$rs = $modx->getDatabase()->select('*', $modx->getFullTableName('user_attributes'), "internalKey = '{$user}'");
 	$userdata = $modx->getDatabase()->getRow($rs);
-	if(!$userdata) {
+	if (!$userdata) {
 		$modx->webAlertAndQuit("No user returned!");
 	}
 
-    if($_SESSION['mgrRole'] != 1 && $userdata['role'] == 1) {
+    if ($_SESSION['mgrRole'] != 1 && $userdata['role'] == 1) {
         $modx->webAlertAndQuit('Illegal attempt to create/modify administrator by non-administrator!');
     }
 
@@ -43,10 +43,10 @@ 
 	// get user settings
 	$rs = $modx->getDatabase()->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");
 	$usersettings = array();
-	while($row = $modx->getDatabase()->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
+	while ($row = $modx->getDatabase()->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
 	// manually extract so that user display settings are not overwritten
-	foreach($usersettings as $k => $v) {
-		if($k != 'manager_language' && $k != 'manager_theme') {
+	foreach ($usersettings as $k => $v) {
+		if ($k != 'manager_language' && $k != 'manager_theme') {
 			${$k} = $v;
 		}
 	}
@@ -54,7 +54,7 @@ 
 	// get user name
 	$rs = $modx->getDatabase()->select('*', $modx->getFullTableName('manager_users'), "id = '{$user}'");
 	$usernamedata = $modx->getDatabase()->getRow($rs);
-	if(!$usernamedata) {
+	if (!$usernamedata) {
 		$modx->webAlertAndQuit("No user returned while getting username!");
 	}
 	$_SESSION['itemname'] = $usernamedata['username'];
@@ -66,14 +66,14 @@ 
 }
 
 // avoid doubling htmlspecialchars (already encoded in DB)
-foreach($userdata as $key => $val) {
+foreach ($userdata as $key => $val) {
 	$userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']);
 };
 $usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']);
 
 // restore saved form
 $formRestored = false;
-if($modx->getManagerApi()->hasFormValues()) {
+if ($modx->getManagerApi()->hasFormValues()) {
 	$modx->getManagerApi()->loadFormValues();
 	// restore post values
 	$userdata = array_merge($userdata, $_POST);
@@ -88,13 +88,13 @@ 
 // include the country list language file
 $_country_lang = array();
 include_once "lang/country/english_country.inc.php";
-if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {
-	include_once "lang/country/" . $manager_language . "_country.inc.php";
+if ($manager_language != "english" && file_exists($modx->config['site_manager_path']."includes/lang/country/".$manager_language."_country.inc.php")) {
+	include_once "lang/country/".$manager_language."_country.inc.php";
 }
 asort($_country_lang);
 
 $displayStyle = ($_SESSION['browser'] === 'modern') ? 'table-row' : 'block';
-if($which_browser == 'default') {
+if ($which_browser == 'default') {
 	$which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser'];
 }
 ?>
@@ -186,7 +186,7 @@ 
 			document.userform.save.click();
 		},
 		delete: function() {
-			<?php if($_GET['id'] == $modx->getLoginUserID()) { ?>
+			<?php if ($_GET['id'] == $modx->getLoginUserID()) { ?>
 			alert("<?php echo $_lang['alert_delete_self']; ?>");
 			<?php } else { ?>
 			if(confirm("<?php echo $_lang['confirm_delete_user']; ?>") === true) {
@@ -209,7 +209,7 @@ 
 	$evtOut = $modx->invokeEvent("OnUserFormPrerender", array(
 		"id" => $user
 	));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>
@@ -218,7 +218,7 @@ 
 	<input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" />
 
 	<h1>
-        <i class="fa fa fa-user"></i><?= ($usernamedata['username'] ? $usernamedata['username'] . '<small>(' . $usernamedata['id'] . ')</small>' : $_lang['user_title']) ?>
+        <i class="fa fa fa-user"></i><?= ($usernamedata['username'] ? $usernamedata['username'].'<small>('.$usernamedata['id'].')</small>' : $_lang['user_title']) ?>
     </h1>
 
 	<?php echo $_style['actionbuttons']['dynamic']['user'] ?>
@@ -236,13 +236,13 @@ 
 				<table border="0" cellspacing="0" cellpadding="3" class="table table--edit table--editUser">
 					<tr>
 						<td colspan="3"><span id="blocked" class="warning">
-							<?php if($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || $userdata['failedlogins'] > 3) { ?>
+							<?php if ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || $userdata['failedlogins'] > 3) { ?>
 								<?php echo $_lang['user_is_blocked']; ?>
 							<?php } ?>
 							</span>
 							<br /></td>
 					</tr>
-					<?php if(!empty($userdata['id'])) { ?>
+					<?php if (!empty($userdata['id'])) { ?>
 						<tr id="showname" style="display: <?php echo ($modx->getManagerApi()->action == '12' && (!isset($usernamedata['oldusername']) || $usernamedata['oldusername'] == $usernamedata['username'])) ? $displayStyle : 'none'; ?> ">
 							<td colspan="3"><i class="<?php echo $_style["icons_user"] ?>"></i>&nbsp;<b><?php echo $modx->getPhpCompat()->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?></b> - <span class="comment"><a href="javascript:;" onClick="changeName();return false;"><?php echo $_lang["change_name"]; ?></a></span>
 								<input type="hidden" name="oldusername" value="<?php echo $modx->getPhpCompat()->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?>" />
@@ -255,7 +255,7 @@ 
 						<td><input type="text" name="newusername" class="inputBox" value="<?php echo $modx->getPhpCompat()->htmlspecialchars($usernamedata['username']); ?>" onChange='documentDirty=true;' maxlength="100" /></td>
 					</tr>
 					<tr>
-						<th><?php echo $modx->getManagerApi()->action == '11' ? $_lang['password'] . ":" : $_lang['change_password_new'] . ":"; ?></th>
+						<th><?php echo $modx->getManagerApi()->action == '11' ? $_lang['password'].":" : $_lang['change_password_new'].":"; ?></th>
 						<td>&nbsp;</td>
 						<td><input name="newpasswordcheck" type="checkbox" onClick="changestate(document.userform.newpassword);changePasswordState(document.userform.newpassword);"<?php echo $modx->getManagerApi()->action == "11" ? " checked disabled" : ""; ?>>
 							<input type="hidden" name="newpassword" value="<?php echo $modx->getManagerApi()->action == "11" ? 1 : 0; ?>" onChange="documentDirty=true;" />
@@ -309,8 +309,8 @@ 
 							?>
 							<select name="role" class="inputBox" onChange='documentDirty=true;' style="width:300px">
 								<?php
-								while($row = $modx->getDatabase()->getRow($rs)) {
-									if($modx->getManagerApi()->action == '11') {
+								while ($row = $modx->getDatabase()->getRow($rs)) {
+									if ($modx->getManagerApi()->action == '11') {
 										$selectedtext = $row['id'] == '1' ? ' selected="selected"' : '';
 									} else {
 										$selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : '';
@@ -364,8 +364,8 @@ 
 								<?php $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $userdata['country']; ?>
 								<option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> >&nbsp;</option>
 								<?php
-								foreach($_country_lang as $key => $country) {
-									echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>";
+								foreach ($_country_lang as $key => $country) {
+									echo "<option value=\"$key\"".(isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '').">$country</option>";
 								}
 								?>
 							</select></td>
@@ -391,7 +391,7 @@ 
 						<td>&nbsp;</td>
 						<td><textarea type="text" name="comment" class="inputBox" rows="5" onChange="documentDirty=true;"><?php echo $modx->getPhpCompat()->htmlspecialchars($userdata['comment']); ?></textarea></td>
 					</tr>
-					<?php if($modx->getManagerApi()->action == '12') { ?>
+					<?php if ($modx->getManagerApi()->action == '12') { ?>
 						<tr>
 							<th><?php echo $_lang['user_logincount']; ?>:</th>
 							<td>&nbsp;</td>
@@ -428,7 +428,7 @@ 
 						</tr>
 					<?php } ?>
 				</table>
-				<?php if($_GET['id'] == $modx->getLoginUserID()) { ?>
+				<?php if ($_GET['id'] == $modx->getLoginUserID()) { ?>
 					<p><?php echo $_lang['user_edit_self_msg']; ?></p>
 				<?php } ?>
 			</div>
@@ -445,8 +445,8 @@ 
 								<?php
 								$activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : '';
 								$dir = dir("includes/lang");
-								while($file = $dir->read()) {
-									if(strpos($file, ".inc.php") > 0) {
+								while ($file = $dir->read()) {
+									if (strpos($file, ".inc.php") > 0) {
 										$endpos = strpos($file, ".");
 										$languagename = substr($file, 0, $endpos);
 										$selectedtext = $languagename == $activelang ? "selected='selected'" : "";
@@ -533,17 +533,17 @@ 
 								<option value=""></option>
 								<?php
 								$dir = dir("media/style/");
-								while($file = $dir->read()) {
-									if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
+								while ($file = $dir->read()) {
+									if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
 										$themename = $file;
-										if($themename === 'common') {
+										if ($themename === 'common') {
 											continue;
 										}
-										$attr = 'value="' . $themename . '" ';
-										if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
+										$attr = 'value="'.$themename.'" ';
+										if (isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
 											$attr .= 'selected="selected" ';
 										}
-										echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";
+										echo "\t\t<option ".rtrim($attr).'>'.ucwords(str_replace("_", " ", $themename))."</option>\n";
 									}
 								}
 								$dir->close();
@@ -584,12 +584,12 @@ 
 						<td><select name="which_browser" class="inputBox" onChange="documentDirty=true;">
 								<?php
 								$selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : '';
-								echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n";
-								foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
+								echo '<option value="default"'.$selected.'>'.$_lang['option_default']."</option>\n";
+								foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
 									$dir = str_replace('\\', '/', $dir);
 									$browser_name = substr($dir, strrpos($dir, '/') + 1);
 									$selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : '';
-									echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";
+									echo '<option value="'.$browser_name.'"'.$selected.'>'."{$browser_name}</option>\n";
 								}
 								?>
 							</select></td>
@@ -616,7 +616,7 @@ 
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td class='comment'><?php echo $_lang["uploadable_images_message"] . $_lang["user_upload_message"] ?></td>
+						<td class='comment'><?php echo $_lang["uploadable_images_message"].$_lang["user_upload_message"] ?></td>
 					</tr>
 					<tr>
 						<th><?php echo $_lang["uploadable_media_title"] ?></th>
@@ -628,7 +628,7 @@ 
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td class='comment'><?php echo $_lang["uploadable_media_message"] . $_lang["user_upload_message"] ?></td>
+						<td class='comment'><?php echo $_lang["uploadable_media_message"].$_lang["user_upload_message"] ?></td>
 					</tr>
 					<tr>
 						<th><?php echo $_lang["uploadable_flash_title"] ?></th>
@@ -640,7 +640,7 @@ 
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td class='comment'><?php echo $_lang["uploadable_flash_message"] . $_lang["user_upload_message"] ?></td>
+						<td class='comment'><?php echo $_lang["uploadable_flash_message"].$_lang["user_upload_message"] ?></td>
 					</tr>
 					<tr>
 						<th><?php echo $_lang["uploadable_files_title"] ?></th>
@@ -652,7 +652,7 @@ 
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td class='comment'><?php echo $_lang["uploadable_files_message"] . $_lang["user_upload_message"] ?></td>
+						<td class='comment'><?php echo $_lang["uploadable_files_message"].$_lang["user_upload_message"] ?></td>
 					</tr>
 					<tr class='row2'>
 						<th><?php echo $_lang["upload_maxsize_title"] ?></th>
@@ -671,11 +671,11 @@ 
 								$edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : '';
 								// invoke OnRichTextEditorRegister event
 								$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-								echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n";
-								if(is_array($evtOut)) {
-									for($i = 0; $i < count($evtOut); $i++) {
+								echo "<option value='none'".($edt == 'none' ? " selected='selected'" : "").">".$_lang["none"]."</option>\n";
+								if (is_array($evtOut)) {
+									for ($i = 0; $i < count($evtOut); $i++) {
 										$editor = $evtOut[$i];
-										echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n";
+										echo "<option value='$editor'".($edt == $editor ? " selected='selected'" : "").">$editor</option>\n";
 									}
 								}
 								?>
@@ -713,7 +713,7 @@ 
 				<?php
 				// invoke OnInterfaceSettingsRender event
 				$evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");
-				if(is_array($evtOut)) {
+				if (is_array($evtOut)) {
 					echo implode("", $evtOut);
 				}
 				?>
@@ -740,7 +740,7 @@ 
 					function BrowseServer() {
 						var w = screen.width * 0.7;
 						var h = screen.height * 0.7;
-						OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);
+						OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);
 					}
 
 					function SetUrl(url, width, height, alt) {
@@ -763,17 +763,17 @@ 
 					</tr>
 				</table>
 			</div>
-			<?php if($use_udperms == 1) {
+			<?php if ($use_udperms == 1) {
 
 			$groupsarray = array();
 
-			if($modx->getManagerApi()->action == '12') { // only do this bit if the user is being edited
+			if ($modx->getManagerApi()->action == '12') { // only do this bit if the user is being edited
 				$rs = $modx->getDatabase()->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");
 				$groupsarray = $modx->getDatabase()->getColumn('user_group', $rs);
 			}
 			// retain selected doc groups between post
-			if(is_array($_POST['user_groups'])) {
-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
+			if (is_array($_POST['user_groups'])) {
+				foreach ($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
 			}
 			?>
 			<div class="tab-page" id="tabAccess">
@@ -782,8 +782,8 @@ 
 				<p><?php echo $_lang['access_permissions_user_message'] ?></p>
 				<?php
 				$rs = $modx->getDatabase()->select('name, id', $modx->getFullTableName('membergroup_names'), '', 'name');
-				while($row = $modx->getDatabase()->getRow($rs)) {
-					echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />";
+				while ($row = $modx->getDatabase()->getRow($rs)) {
+					echo "<label><input type='checkbox' name='user_groups[]' value='".$row['id']."'".(in_array($row['id'], $groupsarray) ? " checked='checked'" : "")." />".$row['name']."</label><br />";
 				}
 				}
 				?>
@@ -796,7 +796,7 @@ 
 	$evtOut = $modx->invokeEvent("OnUserFormRender", array(
 		"id" => $user
 	));
-	if(is_array($evtOut)) {
+	if (is_array($evtOut)) {
 		echo implode("", $evtOut);
 	}
 	?>