evolution-cms / evolution

manager/actions/mutate_password.dynamic.php

Indentation +2 added lines, -2 removed lines

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

 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.");

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

 }

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

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

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

 }

 ?>

 

Spacing +2 added lines, -2 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('change_password')) {

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

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

 }

 ?>

Braces +2 added lines, -2 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('change_password')) {

+if(!$modx->hasPermission('change_password')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 ?>

manager/actions/mutate_settings.dynamic.php

Braces +7 added lines, -7 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 />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']);

 }

 

@@ -10,7 +10,7 @@ 
 

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

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

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

+if($username = $modx->db->getValue($rs)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_settings_msg'], $username));

 }

 // end check for lock

@@ -20,7 +20,7 @@ 
 $settings = array();

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

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

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

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

 }

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

@@ -31,8 +31,8 @@ 
 // 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);

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

 	</script>

 <?php

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

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

 }

Indentation +18 added lines, -18 removed lines

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

 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.");

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

 }

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

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

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

 }

 

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

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

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

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

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

 }

 // end check for lock

 

@@ -19,7 +19,7 @@ 
 include_once(MODX_MANAGER_PATH . 'includes/default_config.php');

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

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

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

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

@@ -30,11 +30,11 @@ 
 $lang_keys = array();

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

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

-	}

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

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

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

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

+    }

 }

 $dir->close();

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

@@ -76,14 +76,14 @@ 
 				</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>

 	</form>

@@ -130,5 +130,5 @@ 
 	</script>

 <?php

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

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

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

 }

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->db->select('username', $modx->getFullTableName('active_users'), "action=17 AND internalKey!='" . $modx->getLoginUserID() . "'");

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

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

+if ($username = $modx->db->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->db->select('setting_name, setting_value', '[+prefix+]system_settings');

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

+while ($row = $modx->db->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/access_permissions.dynamic.php

Indentation +90 added lines, -90 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 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.");
+    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')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // Get table names (alphabetical)
@@ -18,24 +18,24 @@ 
 // find all document groups, for the select :)
 $rs = $modx->db->select('*', $tbl_documentgroup_names, '', 'name');
 if($modx->db->getRecordCount($rs) < 1) {
-	$docgroupselector = '[no groups to add]';
+    $docgroupselector = '[no groups to add]';
 } else {
-	$docgroupselector = '<select name="docgroup">' . "\n";
-	while($row = $modx->db->getRow($rs)) {
-		$docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
-	}
-	$docgroupselector .= "</select>\n";
+    $docgroupselector = '<select name="docgroup">' . "\n";
+    while($row = $modx->db->getRow($rs)) {
+        $docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+    }
+    $docgroupselector .= "</select>\n";
 }
 
 $rs = $modx->db->select('*', $tbl_membergroup_names, '', 'name');
 if($modx->db->getRecordCount($rs) < 1) {
-	$usrgroupselector = '[no user groups]';
+    $usrgroupselector = '[no user groups]';
 } else {
-	$usrgroupselector = '<select name="usergroup">' . "\n";
-	while($row = $modx->db->getRow($rs)) {
-		$usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
-	}
-	$usrgroupselector .= "</select>\n";
+    $usrgroupselector = '<select name="usergroup">' . "\n";
+    while($row = $modx->db->getRow($rs)) {
+        $usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+    }
+    $usrgroupselector .= "</select>\n";
 }
 
 ?>
@@ -96,24 +96,24 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->db->select('groupnames.*, users.id AS user_id, users.username user_name', $tbl_membergroup_names . ' AS groupnames
+            $rs = $modx->db->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->db->getRecordCount($rs) < 1) {
-				?>
+            if($modx->db->getRecordCount($rs) < 1) {
+                ?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
-			} else {
-			?>
+            } else {
+            ?>
 			<div class="form-group">
 				<?php
-				$pid = '';
-				while($row = $modx->db->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
-							echo '</div><div class="form-group">';
-						}
-						?>
+                $pid = '';
+                while($row = $modx->db->getRow($rs)) {
+                    if($pid != $row['id']) {
+                        if($pid != '') {
+                            echo '</div><div class="form-group">';
+                        }
+                        ?>
 						<form method="post" action="index.php" name="accesspermissions">
 							<input type="hidden" name="a" value="41" />
 							<input type="hidden" name="groupid" value="<?= $row['id'] ?>" />
@@ -128,21 +128,21 @@ 
 						</form>
 						<?= $_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
-						$pid = $row['id'];
-						continue;
-					}
-					?>
+                        $pid = $row['id'];
+                        continue;
+                    }
+                    ?>
 					<?= ($pid == $row['id'] ? ', ' : '') ?><a href="index.php?a=12&id=<?= $row['user_id'] ?>"><?= $row['user_name'] ?></a>
 					<?php
-					$pid = $row['id'];
-				}
-				}
-				?>
+                    $pid = $row['id'];
+                }
+                }
+                ?>
 			</div>
 		</div>
 	</div>
@@ -167,24 +167,24 @@ 
 				</form>
 			</div>
 			<?php
-			$rs = $modx->db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $tbl_documentgroup_names . ' AS dgnames
+            $rs = $modx->db->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->db->getRecordCount($rs) < 1) {
-				?>
+            if($modx->db->getRecordCount($rs) < 1) {
+                ?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
-			} else {
-			?>
+            } else {
+            ?>
 			<div class="form-group">
 				<?php
-				$pid = '';
-				while($row = $modx->db->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
-							echo '</div><div class="form-group">';
-						}
-						?>
+                $pid = '';
+                while($row = $modx->db->getRow($rs)) {
+                    if($pid != $row['id']) {
+                        if($pid != '') {
+                            echo '</div><div class="form-group">';
+                        }
+                        ?>
 						<form method="post" action="index.php" name="accesspermissions">
 							<input type="hidden" name="a" value="41" />
 							<input type="hidden" name="groupid" value="<?= $row['id'] ?>" />
@@ -199,21 +199,21 @@ 
 						</form>
 						<?= $_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
-						$pid = $row['id'];
-						continue;
-					}
-					?>
+                        $pid = $row['id'];
+                        continue;
+                    }
+                    ?>
 					<?= ($pid == $row['id'] ? ', ' : '') ?><a href="index.php?a=3&id=<?= $row['doc_id'] ?>" title="<?= $modx->htmlspecialchars($row['doc_title']) ?>"><?= $row['doc_id'] ?></a>
 					<?php
-					$pid = $row['id'];
-				}
-				}
-				?>
+                    $pid = $row['id'];
+                }
+                }
+                ?>
 			</div>
 		</div>
 	</div>
@@ -225,16 +225,16 @@ 
 		<div class="container container-body">
 			<p class="element-edit-message-tab alert alert-warning"><?= $_lang['access_permissions_links_tab'] ?></p>
 			<?php
-			// User/Document Group Links
-			$rs = $modx->db->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $tbl_membergroup_names . ' AS groupnames
+            // User/Document Group Links
+            $rs = $modx->db->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->db->getRecordCount($rs) < 1) {
-				?>
+            if($modx->db->getRecordCount($rs) < 1) {
+                ?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
-			} else {
-				?>
+            } else {
+                ?>
 				<div class="form-group">
 					<b><?= $_lang["access_permissions_group_link"] ?></b>
 					<form method="post" action="index.php" name="accesspermissions">
@@ -250,38 +250,38 @@ 
 				<hr>
 				<ul>
 					<?php
-					$pid = '';
-					while($row = $modx->db->getRow($rs)) {
-						if($row['id'] != $pid) {
-							if($pid != '') {
-								echo '</ul></li>';
-							} // close previous one
-							?>
+                    $pid = '';
+                    while($row = $modx->db->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>';
-								$pid = '';
-								continue;
-							} else {
-								echo '<ul>';
-							}
-						}
-						if(!$row['dg_id']) {
-							continue;
-						}
-						?>
+                            if(!$row['dg_id']) {
+                                echo '<i>' . $_lang['no_groups_found'] . '</i></li>';
+                                $pid = '';
+                                continue;
+                            } else {
+                                echo '<ul>';
+                            }
+                        }
+                        if(!$row['dg_id']) {
+                            continue;
+                        }
+                        ?>
 						<li><?= $row['dg_name'] ?>
 							<small><i>(<a class="text-danger" href="index.php?a=41&coupling=<?= $row['link_id'] ?>&operation=remove_document_group_from_user_group"><?= $_lang['remove'] ?></a>)</i></small>
 						</li>
 						<?php
-						$pid = $row['id'];
-					}
-					?>
+                        $pid = $row['id'];
+                    }
+                    ?>
 				</ul>
 				<?php
-			}
-			?>
+            }
+            ?>
 		</div>
 	</div>
 

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->db->select('*', $tbl_documentgroup_names, '', 'name');
-if($modx->db->getRecordCount($rs) < 1) {
+if ($modx->db->getRecordCount($rs) < 1) {
 	$docgroupselector = '[no groups to add]';
 } else {
-	$docgroupselector = '<select name="docgroup">' . "\n";
-	while($row = $modx->db->getRow($rs)) {
-		$docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+	$docgroupselector = '<select name="docgroup">'."\n";
+	while ($row = $modx->db->getRow($rs)) {
+		$docgroupselector .= "\t".'<option value="'.$row['id'].'">'.$row['name']."</option>\n";
 	}
 	$docgroupselector .= "</select>\n";
 }
 
 $rs = $modx->db->select('*', $tbl_membergroup_names, '', 'name');
-if($modx->db->getRecordCount($rs) < 1) {
+if ($modx->db->getRecordCount($rs) < 1) {
 	$usrgroupselector = '[no user groups]';
 } else {
-	$usrgroupselector = '<select name="usergroup">' . "\n";
-	while($row = $modx->db->getRow($rs)) {
-		$usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n";
+	$usrgroupselector = '<select name="usergroup">'."\n";
+	while ($row = $modx->db->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->db->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->db->getRecordCount($rs) < 1) {
+			$rs = $modx->db->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->db->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->db->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
+				while ($row = $modx->db->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->db->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->db->getRecordCount($rs) < 1) {
+			$rs = $modx->db->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->db->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->db->getRow($rs)) {
-					if($pid != $row['id']) {
-						if($pid != '') {
+				while ($row = $modx->db->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->db->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->db->getRecordCount($rs) < 1) {
+			$rs = $modx->db->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->db->getRecordCount($rs) < 1) {
 				?>
 				<div class="text-danger"><?= $_lang['no_groups_found'] ?></div>
 				<?php
@@ -251,23 +251,23 @@ 
 				<ul>
 					<?php
 					$pid = '';
-					while($row = $modx->db->getRow($rs)) {
-						if($row['id'] != $pid) {
-							if($pid != '') {
+					while ($row = $modx->db->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/search.static.php

Braces +3 added lines, -3 removed lines

@@ -118,18 +118,18 @@
 		$articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
 		$articul_result = $modx->db->query($articul_query);
 		$articul_id_array = $modx->db->makeArray($articul_result);
-		if(count($articul_id_array)>0){
+		if(count($articul_id_array)>0) {
 			$articul_id = '';
 			$i = 1;
 			foreach( $articul_id_array as $articul ) {
 				$articul_id.=$articul['contentid'];
-				if($i !== count($articul_id_array)){
+				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*/

Indentation +21 added lines, -21 removed lines

@@ -113,31 +113,31 @@
     // Handle Input "Search in main fields"
     if ($searchfields != '') {
 
-		/*start search by TV. Added Rising13*/
-		$tbl_site_tmplvar_contentvalues = $modx->getFullTableName('site_tmplvar_contentvalues');
-		$articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
-		$articul_result = $modx->db->query($articul_query);
-		$articul_id_array = $modx->db->makeArray($articul_result);
-		if(count($articul_id_array)>0){
-			$articul_id = '';
-			$i = 1;
-			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{
-			$articul_id_query = '';
-		}
-		/*end search by TV*/
+        /*start search by TV. Added Rising13*/
+        $tbl_site_tmplvar_contentvalues = $modx->getFullTableName('site_tmplvar_contentvalues');
+        $articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
+        $articul_result = $modx->db->query($articul_query);
+        $articul_id_array = $modx->db->makeArray($articul_result);
+        if(count($articul_id_array)>0){
+            $articul_id = '';
+            $i = 1;
+            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{
+            $articul_id_query = '';
+        }
+        /*end search by TV*/
 
         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}%'";
             }
         }

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->db->select('*', $modx->getFullTableName('site_templates'));
                         $option[] = '<option value="">No selected</option>';
-                        $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? (int)$_REQUEST['templateid'] : '';
+                        $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? (int) $_REQUEST['templateid'] : '';
                         $selected = $templateid === 0 ? ' selected="selected"' : '';
-                        $option[] = '<option value="0"' . $selected . '>(blank)</option>';
+                        $option[] = '<option value="0"'.$selected.'>(blank)</option>';
                         while ($row = $modx->db->getRow($rs)) {
                             $templatename = htmlspecialchars($row['templatename'], ENT_QUOTES, $modx->config['modx_charset']);
                             $selected = $row['id'] == $templateid ? ' selected="selected"' : '';
@@ -86,7 +86,7 @@ 
     $searchfields = htmlentities(trim($_POST['searchfields']), ENT_QUOTES, $modx_manager_charset);
     $searchlongtitle = $modx->db->escape(trim($_REQUEST['searchfields']));
     $search_alias = $modx->db->escape(trim($_REQUEST['searchfields']));
-    $templateid = isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '' ? (int)$_REQUEST['templateid'] : '';
+    $templateid = isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '' ? (int) $_REQUEST['templateid'] : '';
     $searchcontent = $modx->db->escape($_REQUEST['content']);
 
     $fields = 'DISTINCT sc.id, contenttype, pagetitle, longtitle, description, introtext, menutitle, deleted, published, isfolder, type';
@@ -100,12 +100,12 @@ 
         $friendly_url_suffix = $modx->config['friendly_url_suffix'];
         $base_url = $modx->config['base_url'];
         $site_url = $modx->config['site_url'];
-        $url = preg_replace('@' . $friendly_url_suffix . '$@', '', $url);
+        $url = preg_replace('@'.$friendly_url_suffix.'$@', '', $url);
         if ($url[0] === '/') {
-            $url = preg_replace('@^' . $base_url . '@', '', $url);
+            $url = preg_replace('@^'.$base_url.'@', '', $url);
         }
         if (substr($url, 0, 4) === 'http') {
-            $url = preg_replace('@^' . $site_url . '@', '', $url);
+            $url = preg_replace('@^'.$site_url.'@', '', $url);
         }
         $idFromAlias = $modx->getIdFromAlias($url);
     }
@@ -118,18 +118,18 @@ 
 		$articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
 		$articul_result = $modx->db->query($articul_query);
 		$articul_id_array = $modx->db->makeArray($articul_result);
-		if(count($articul_id_array)>0){
+		if (count($articul_id_array) > 0) {
 			$articul_id = '';
 			$i = 1;
-			foreach( $articul_id_array as $articul ) {
-				$articul_id.=$articul['contentid'];
-				if($i !== count($articul_id_array)){
-					$articul_id.=',';
+			foreach ($articul_id_array as $articul) {
+				$articul_id .= $articul['contentid'];
+				if ($i !== count($articul_id_array)) {
+					$articul_id .= ',';
 				}
 				$i++;
 			}
 		$articul_id_query = " OR sc.id IN ({$articul_id})";
-		}else{
+		} else {
 			$articul_id_query = '';
 		}
 		/*end search by TV*/
@@ -137,7 +137,7 @@ 
         if (ctype_digit($searchfields)) {
             $sqladd .= "sc.id='{$searchfields}'";
             if (strlen($searchfields) > 3) {
-				$sqladd .= $articul_id_query;//search by TV
+				$sqladd .= $articul_id_query; //search by TV
                 $sqladd .= " OR sc.pagetitle LIKE '%{$searchfields}%'";
             }
         }
@@ -157,7 +157,7 @@ 
             $sqladd .= " OR sc.introtext LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.menutitle LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.alias LIKE '%{$search_alias}%'";
-            $sqladd .= $articul_id_query;//search by TV
+            $sqladd .= $articul_id_query; //search by TV
             $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->db->select($fields, $tbl_site_content . ' AS sc LEFT JOIN ' . $tbldg . ' AS dg ON dg.document=sc.id', $where, 'sc.id');
+        $rs = $modx->db->select($fields, $tbl_site_content.' AS sc LEFT JOIN '.$tbldg.' AS dg ON dg.document=sc.id', $where, 'sc.id');
         $limit = $modx->db->getRecordCount($rs);
     } else {
         $limit = 0;
@@ -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->db->getRecordCount($rs);
                     if ($docscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-sitemap"></i> ' . $_lang["manage_documents"] . ' (' . $docscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-sitemap"></i> '.$_lang["manage_documents"].' ('.$docscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList('', !$row['published'], $row['deleted']) . '><a href="index.php?a=27&id=' . $row['id'] . '" id="content_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['pagetitle'] . ' <small>(' . $row['id'] . ')</small>', $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList('', !$row['published'], $row['deleted']).'><a href="index.php?a=27&id='.$row['id'].'" id="content_'.$row['id'].'" target="main">'.highlightingCoincidence($row['pagetitle'].' <small>('.$row['id'].')</small>', $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //templates
                 if ($modx->hasPermission('edit_template')) {
-                    $rs = $modx->db->select("id,templatename,locked", $modx->getFullTableName('site_templates'), "`id` like '%" . $searchfields . "%' 
-					OR `templatename` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `content` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,templatename,locked", $modx->getFullTableName('site_templates'), "`id` like '%".$searchfields."%' 
+					OR `templatename` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `content` like '%" . $searchfields."%'");
                     $templatecounts = $modx->db->getRecordCount($rs);
                     if ($templatecounts > 0) {
-                        $output .= '<li><b><i class="fa fa-newspaper-o"></i> ' . $_lang["manage_templates"] . ' (' . $templatecounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-newspaper-o"></i> '.$_lang["manage_templates"].' ('.$templatecounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=16&id=' . $row['id'] . '" id="templates_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=16&id='.$row['id'].'" id="templates_'.$row['id'].'" target="main">'.highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //tvs
                 if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
-                    $rs = $modx->db->select("id,name,locked", $modx->getFullTableName('site_tmplvars'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `type` like '%" . $searchfields . "%' 
-					OR `elements` like '%" . $searchfields . "%' 
-					OR `display` like '%" . $searchfields . "%' 
-					OR `display_params` like '%" . $searchfields . "%' 
-					OR `default_text` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked", $modx->getFullTableName('site_tmplvars'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `type` like '%" . $searchfields."%' 
+					OR `elements` like '%" . $searchfields."%' 
+					OR `display` like '%" . $searchfields."%' 
+					OR `display_params` like '%" . $searchfields."%' 
+					OR `default_text` like '%" . $searchfields."%'");
                     $tvscounts = $modx->db->getRecordCount($rs);
                     if ($tvscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-list-alt"></i> ' . $_lang["settings_templvars"] . ' (' . $tvscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-list-alt"></i> '.$_lang["settings_templvars"].' ('.$tvscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=301&id=' . $row['id'] . '" id="tmplvars_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=301&id='.$row['id'].'" id="tmplvars_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //Chunks
                 if ($modx->hasPermission('edit_chunk')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_htmlsnippets'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%'     
-					OR `snippet` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_htmlsnippets'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%'     
+					OR `snippet` like '%" . $searchfields."%'");
                     $chunkscounts = $modx->db->getRecordCount($rs);
                     if ($chunkscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-th-large"></i> ' . $_lang["manage_htmlsnippets"] . ' (' . $chunkscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-th-large"></i> '.$_lang["manage_htmlsnippets"].' ('.$chunkscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=78&id=' . $row['id'] . '" id="htmlsnippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=78&id='.$row['id'].'" id="htmlsnippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //Snippets
                 if ($modx->hasPermission('edit_snippet')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_snippets'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `snippet` like '%" . $searchfields . "%'  
-					OR `properties` like '%" . $searchfields . "%'      
-					OR `moduleguid` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_snippets'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `snippet` like '%" . $searchfields."%'  
+					OR `properties` like '%" . $searchfields."%'      
+					OR `moduleguid` like '%" . $searchfields."%'");
                     $snippetscounts = $modx->db->getRecordCount($rs);
                     if ($snippetscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-code"></i> ' . $_lang["manage_snippets"] . ' (' . $snippetscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-code"></i> '.$_lang["manage_snippets"].' ('.$snippetscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=22&id=' . $row['id'] . '" id="snippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=22&id='.$row['id'].'" id="snippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //plugins
                 if ($modx->hasPermission('edit_plugin')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_plugins'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `plugincode` like '%" . $searchfields . "%'  
-					OR `properties` like '%" . $searchfields . "%'      
-					OR `moduleguid` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_plugins'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `plugincode` like '%" . $searchfields."%'  
+					OR `properties` like '%" . $searchfields."%'      
+					OR `moduleguid` like '%" . $searchfields."%'");
                     $pluginscounts = $modx->db->getRecordCount($rs);
                     if ($pluginscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-plug"></i> ' . $_lang["manage_plugins"] . ' (' . $pluginscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-plug"></i> '.$_lang["manage_plugins"].' ('.$pluginscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=102&id=' . $row['id'] . '" id="plugins_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=102&id='.$row['id'].'" id="plugins_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //modules
                 if ($modx->hasPermission('edit_module')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_modules'), "`id` like '%" . $searchfields . "%' 
-                    OR `name` like '%" . $searchfields . "%' 
-                    OR `description` like '%" . $searchfields . "%' 
-                    OR `modulecode` like '%" . $searchfields . "%'  
-                    OR `properties` like '%" . $searchfields . "%'  
-                    OR `guid` like '%" . $searchfields . "%'      
-                    OR `resourcefile` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_modules'), "`id` like '%".$searchfields."%' 
+                    OR `name` like '%" . $searchfields."%' 
+                    OR `description` like '%" . $searchfields."%' 
+                    OR `modulecode` like '%" . $searchfields."%'  
+                    OR `properties` like '%" . $searchfields."%'  
+                    OR `guid` like '%" . $searchfields."%'      
+                    OR `resourcefile` like '%" . $searchfields."%'");
                     $modulescounts = $modx->db->getRecordCount($rs);
                     if ($modulescounts > 0) {
-                        $output .= '<li><b><i class="fa fa-cogs"></i> ' . $_lang["modules"] . ' (' . $modulescounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-cogs"></i> '.$_lang["modules"].' ('.$modulescounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=108&id=' . $row['id'] . '" id="modules_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=108&id='.$row['id'].'" id="modules_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
-                echo $output ? '<div class="ajaxSearchResults"><ul>' . $output . '</ul></div>' : '1';
+                echo $output ? '<div class="ajaxSearchResults"><ul>'.$output.'</ul></div>' : '1';
             }
 
             ?>

manager/actions/eventlog.dynamic.php

Indentation +34 added lines, -34 removed lines

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

 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.");

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

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

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

 }

 

 // Get table Names (alphabetical)

@@ -16,14 +16,14 @@ 
 

 // get and save search string

 if($_REQUEST['op'] == 'reset') {

-	$sqlQuery = $query = '';

-	$_PAGE['vs']['search'] = '';

+    $sqlQuery = $query = '';

+    $_PAGE['vs']['search'] = '';

 } else {

-	$sqlQuery = $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

-	if(!is_numeric($sqlQuery)) {

-		$sqlQuery = $modx->db->escape($query);

-	}

-	$_PAGE['vs']['search'] = $query;

+    $sqlQuery = $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

+    if(!is_numeric($sqlQuery)) {

+        $sqlQuery = $modx->db->escape($query);

+    }

+    $_PAGE['vs']['search'] = $query;

 }

 

 // get & save listmode

@@ -125,33 +125,33 @@ 
 			<div class="row">

 				<div class="table-responsive">

 					<?php

-					$ds = $modx->db->select("el.id, ELT(el.type , 'text-info {$_style['actions_info']}' , 'text-warning {$_style['actions_triangle']}' , 'text-danger {$_style['actions_error']}' ) as icon, el.createdon, el.source, el.eventid,IFNULL(wu.username,mu.username) as username", "{$tbl_event_log} AS el 

+                    $ds = $modx->db->select("el.id, ELT(el.type , 'text-info {$_style['actions_info']}' , 'text-warning {$_style['actions_triangle']}' , 'text-danger {$_style['actions_error']}' ) as icon, el.createdon, el.source, el.eventid,IFNULL(wu.username,mu.username) as username", "{$tbl_event_log} AS el 

 			LEFT JOIN {$tbl_manager_users} AS mu ON mu.id=el.user AND el.usertype=0

 			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "" . (is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '') . "(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");

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

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

-					$grd->pagerClass = '';

-					$grd->pageClass = 'page-item';

-					$grd->selPageClass = 'page-item active';

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

-					$grd->cssClass = "table data nowrap";

-					$grd->columnHeaderClass = "tableHeader";

-					$grd->itemClass = "tableItem";

-					$grd->altItemClass = "tableAltItem";

-					$grd->fields = "type,source,createdon,eventid,username";

-					$grd->columns = $_lang['type'] . " ," . $_lang['source'] . " ," . $_lang['date'] . " ," . $_lang['event_id'] . " ," . $_lang['sysinfo_userid'];

-					$grd->colWidths = "1%,,1%,1%,1%";

-					$grd->colAligns = "center,,,center,center";

-					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

-					if($listmode == '1') {

-						$grd->pageSize = 0;

-					}

-					if($_REQUEST['op'] == 'reset') {

-						$grd->pageNumber = 1;

-					}

-					// render grid

-					echo $grd->render();

-					?>

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

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

+                    $grd->pagerClass = '';

+                    $grd->pageClass = 'page-item';

+                    $grd->selPageClass = 'page-item active';

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

+                    $grd->cssClass = "table data nowrap";

+                    $grd->columnHeaderClass = "tableHeader";

+                    $grd->itemClass = "tableItem";

+                    $grd->altItemClass = "tableAltItem";

+                    $grd->fields = "type,source,createdon,eventid,username";

+                    $grd->columns = $_lang['type'] . " ," . $_lang['source'] . " ," . $_lang['date'] . " ," . $_lang['event_id'] . " ," . $_lang['sysinfo_userid'];

+                    $grd->colWidths = "1%,,1%,1%,1%";

+                    $grd->colAligns = "center,,,center,center";

+                    $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

+                    if($listmode == '1') {

+                        $grd->pageSize = 0;

+                    }

+                    if($_REQUEST['op'] == 'reset') {

+                        $grd->pageNumber = 1;

+                    }

+                    // render grid

+                    echo $grd->render();

+                    ?>

 				</div>

 			</div>

 		</div>

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

 }

 

@@ -15,12 +15,12 @@ 
 $modx->manager->initPageViewState();

 

 // get and save search string

-if($_REQUEST['op'] == 'reset') {

+if ($_REQUEST['op'] == 'reset') {

 	$sqlQuery = $query = '';

 	$_PAGE['vs']['search'] = '';

 } else {

 	$sqlQuery = $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

-	if(!is_numeric($sqlQuery)) {

+	if (!is_numeric($sqlQuery)) {

 		$sqlQuery = $modx->db->escape($query);

 	}

 	$_PAGE['vs']['search'] = $query;

@@ -31,7 +31,7 @@ 
 $_PAGE['vs']['lm'] = $listmode;

 

 // context menu

-include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";

+include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php";

 $cm = new ContextMenu("cntxm", 150);

 $cm->addItem($_lang['view_log'], "js:menuAction(1)", $_style['actions_preview']);

 $cm->addSeparator();

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

 					$ds = $modx->db->select("el.id, ELT(el.type , 'text-info {$_style['actions_info']}' , 'text-warning {$_style['actions_triangle']}' , 'text-danger {$_style['actions_error']}' ) as icon, el.createdon, el.source, el.eventid,IFNULL(wu.username,mu.username) as username", "{$tbl_event_log} AS el 

 			LEFT JOIN {$tbl_manager_users} AS mu ON mu.id=el.user AND el.usertype=0

-			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "" . (is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '') . "(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");

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

+			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "".(is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '')."(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");

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

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

 					$grd->pagerClass = '';

 					$grd->pageClass = 'page-item';

@@ -139,14 +139,14 @@ 
 					$grd->itemClass = "tableItem";

 					$grd->altItemClass = "tableAltItem";

 					$grd->fields = "type,source,createdon,eventid,username";

-					$grd->columns = $_lang['type'] . " ," . $_lang['source'] . " ," . $_lang['date'] . " ," . $_lang['event_id'] . " ," . $_lang['sysinfo_userid'];

+					$grd->columns = $_lang['type']." ,".$_lang['source']." ,".$_lang['date']." ,".$_lang['event_id']." ,".$_lang['sysinfo_userid'];

 					$grd->colWidths = "1%,,1%,1%,1%";

 					$grd->colAligns = "center,,,center,center";

-					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

-					if($listmode == '1') {

+					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='".$_lang['click_to_context']."'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='".$_lang['click_to_view_details']."'>[+source+]</a>||date: ".$modx->toDateFormat(null, 'formatOnly').' %I:%M %p';

+					if ($listmode == '1') {

 						$grd->pageSize = 0;

 					}

-					if($_REQUEST['op'] == 'reset') {

+					if ($_REQUEST['op'] == 'reset') {

 						$grd->pageNumber = 1;

 					}

 					// render grid

Braces +7 added lines, -7 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"]);

 }

 

@@ -15,12 +15,12 @@ 
 $modx->manager->initPageViewState();

 

 // get and save search string

-if($_REQUEST['op'] == 'reset') {

+if($_REQUEST['op'] == 'reset') {
 	$sqlQuery = $query = '';

 	$_PAGE['vs']['search'] = '';

-} else {

+} else {
 	$sqlQuery = $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search'];

-	if(!is_numeric($sqlQuery)) {

+	if(!is_numeric($sqlQuery)) {
 		$sqlQuery = $modx->db->escape($query);

 	}

 	$_PAGE['vs']['search'] = $query;

@@ -143,10 +143,10 @@ 
 					$grd->colWidths = "1%,,1%,1%,1%";

 					$grd->colAligns = "center,,,center,center";

 					$grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

-					if($listmode == '1') {

+					if($listmode == '1') {
 						$grd->pageSize = 0;

 					}

-					if($_REQUEST['op'] == 'reset') {

+					if($_REQUEST['op'] == 'reset') {
 						$grd->pageNumber = 1;

 					}

 					// render grid

manager/actions/mutate_web_user.dynamic.php

Braces +27 added lines, -22 removed lines

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

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

+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 

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

+switch($modx->manager->action) {
 	case 88:

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

+		if(!$modx->hasPermission('edit_web_user')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 		}

 		break;

 	case 87:

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

+		if(!$modx->hasPermission('new_web_user')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);

 		}

 		break;

@@ -23,33 +23,35 @@ 
 

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

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

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

+if($username = $modx->db->getValue($rs)) {
 	$modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "web user"));

 }

 // end check for lock

 

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

+if($modx->manager->action == '88') {
 	// get user attributes

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

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

-	if(!$userdata) {

+	if(!$userdata) {
 		$modx->webAlertAndQuit("No user returned!");

 	}

 

 	// get user settings

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

 	$usersettings = array();

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

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

 

 	// get user name

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

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

-	if(!$usernamedata) {

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

 	}

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

-} else {

+} else {
 	$userdata = array();

 	$usersettings = array();

 	$usernamedata = array();

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

 

 // avoid doubling htmlspecialchars (already encoded in DB)

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

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

 };

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

 

 // restore saved form

 $formRestored = false;

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

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

 	// restore post values

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

@@ -78,9 +80,9 @@ 
 

 // include the country list language file

 $_country_lang = array();

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

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

-} else {

+} else {
 	include_once "lang/country/english_country.inc.php";

 }

 asort($_country_lang);

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

 	// invoke OnWUsrFormPrerender event

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

-	if(is_array($evtOut)) {

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

 	}

 	?>

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

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

 								<?php

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

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

 								}

 								?>

@@ -496,17 +498,20 @@ 
 				</table>

 			</div>

 			<?php

-			if($use_udperms == 1) {

+			if($use_udperms == 1) {
 

 			$groupsarray = array();

 

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

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

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

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

 			}

 			// retain selected user groups between post

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

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

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

 			?>

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

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

 				<?php

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

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

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

 				}

 				}

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

 				"id" => $user

 			));

-			if(is_array($evtOut)) {

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

 			}

 			?>

Indentation +89 added lines, -89 removed lines

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

 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.");

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

 }

 

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

-	case 88:

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

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

-		}

-		break;

-	case 87:

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

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

-		}

-		break;

-	default:

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

+    case 88:

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

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

+        }

+        break;

+    case 87:

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

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

+        }

+        break;

+    default:

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

 }

 

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

@@ -24,64 +24,64 @@ 
 // check to see the snippet editor isn't locked

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

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

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

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

 }

 // end check for lock

 

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

-	// get user attributes

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

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

-	if(!$userdata) {

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

-	}

-

-	// get user settings

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

-	$usersettings = array();

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

-	extract($usersettings, EXTR_OVERWRITE);

-

-	// get user name

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

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

-	if(!$usernamedata) {

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

-	}

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

+    // get user attributes

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

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

+    if(!$userdata) {

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

+    }

+

+    // get user settings

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

+    $usersettings = array();

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

+    extract($usersettings, EXTR_OVERWRITE);

+

+    // get user name

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

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

+    if(!$usernamedata) {

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

+    }

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

 } else {

-	$userdata = array();

-	$usersettings = array();

-	$usernamedata = array();

-	$_SESSION['itemname'] = $_lang["new_web_user"];

+    $userdata = array();

+    $usersettings = array();

+    $usernamedata = array();

+    $_SESSION['itemname'] = $_lang["new_web_user"];

 }

 

 // avoid doubling htmlspecialchars (already encoded in DB)

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

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

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

 };

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

 

 // restore saved form

 $formRestored = false;

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

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

-	// restore post values

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

-	$userdata['dob'] = $modx->toTimeStamp($userdata['dob']);

-	$usernamedata['username'] = $userdata['newusername'];

-	$usernamedata['oldusername'] = $_POST['oldusername'];

-	$usersettings = array_merge($usersettings, $userdata);

-	$usersettings['allowed_days'] = is_array($_POST['allowed_days']) ? implode(",", $_POST['allowed_days']) : "";

-	extract($usersettings, EXTR_OVERWRITE);

+    $modx->manager->loadFormValues();

+    // restore post values

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

+    $userdata['dob'] = $modx->toTimeStamp($userdata['dob']);

+    $usernamedata['username'] = $userdata['newusername'];

+    $usernamedata['oldusername'] = $_POST['oldusername'];

+    $usersettings = array_merge($usersettings, $userdata);

+    $usersettings['allowed_days'] = is_array($_POST['allowed_days']) ? implode(",", $_POST['allowed_days']) : "";

+    extract($usersettings, EXTR_OVERWRITE);

 }

 

 // include the country list language file

 $_country_lang = array();

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

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

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

 } else {

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

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

 }

 asort($_country_lang);

 

@@ -189,12 +189,12 @@ 
 

 <form action="index.php?a=89" method="post" name="userform">

 	<?php

-	// invoke OnWUsrFormPrerender event

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

-	if(is_array($evtOut)) {

-		echo implode("", $evtOut);

-	}

-	?>

+    // invoke OnWUsrFormPrerender event

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

+    if(is_array($evtOut)) {

+        echo implode("", $evtOut);

+    }

+    ?>

 	<input type="hidden" name="mode" value="<?php echo $modx->manager->action; ?>" />

 	<input type="hidden" name="id" value="<?php echo $user ?>" />

 	<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" ?>" />

@@ -324,10 +324,10 @@ 
 								<?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>

 					</tr>

 					<tr>

@@ -387,8 +387,8 @@ 
 								<i onClick="document.userform.blockedafter.value=''; return true;" class="clearDate <?php echo $_style["actions_calendar_delete"] ?>" data-tooltip="<?php echo $_lang['remove_date']; ?>"></i></td>

 						</tr>

 						<?php

-					}

-					?>

+                    }

+                    ?>

 				</table>

 			</div>

 

@@ -496,40 +496,40 @@ 
 				</table>

 			</div>

 			<?php

-			if($use_udperms == 1) {

-

-			$groupsarray = array();

-

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

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

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

-			}

-			// retain selected user groups between post

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

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

-			}

-			?>

+            if($use_udperms == 1) {

+

+            $groupsarray = array();

+

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

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

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

+            }

+            // retain selected user groups between post

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

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

+            }

+            ?>

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

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

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

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

 				<?php

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

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

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

-				}

-				}

-				?>

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

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

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

+                }

+                }

+                ?>

 			</div>

 			<?php

-			// invoke OnWUsrFormRender event

-			$evtOut = $modx->invokeEvent("OnWUsrFormRender", array(

-				"id" => $user

-			));

-			if(is_array($evtOut)) {

-				echo implode("", $evtOut);

-			}

-			?>

+            // invoke OnWUsrFormRender event

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

+                "id" => $user

+            ));

+            if(is_array($evtOut)) {

+                echo implode("", $evtOut);

+            }

+            ?>

 		</div>

 	</div>

 	<input type="submit" name="save" style="display:none">

Switch Indentation +12 added lines, -12 removed lines

@@ -4,18 +4,18 @@
 }

 

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

-	case 88:

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

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

-		}

-		break;

-	case 87:

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

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

-		}

-		break;

-	default:

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

+	    case 88:

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

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

+		    }

+		    break;

+	    case 87:

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

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

+		    }

+		    break;

+	    default:

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

 }

 

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

Spacing +32 added lines, -32 removed lines

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

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

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

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

 }

 

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

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

 	case 88:

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

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

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

 		}

 		break;

 	case 87:

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

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

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

 		}

 		break;

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

 }

 

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

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

 

 

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

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

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

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

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

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

 }

 // end check for lock

 

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

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

 	// get user attributes

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

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

-	if(!$userdata) {

+	if (!$userdata) {

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

 	}

 

 	// get user settings

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

 	$usersettings = array();

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

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

 	extract($usersettings, EXTR_OVERWRITE);

 

 	// get user name

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

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

-	if(!$usernamedata) {

+	if (!$usernamedata) {

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

 	}

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

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

 

 // avoid doubling htmlspecialchars (already encoded in DB)

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

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

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

 };

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

 

 // restore saved form

 $formRestored = false;

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

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

 	$modx->manager->loadFormValues();

 	// restore post values

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

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

 // include the country list language file

 $_country_lang = array();

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

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

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

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

 } else {

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

 }

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

 	// invoke OnWUsrFormPrerender event

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

-	if(is_array($evtOut)) {

+	if (is_array($evtOut)) {

 		echo implode("", $evtOut);

 	}

 	?>

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

 

 	<h1>

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

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

     </h1>

 

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

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

 					<tr>

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

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

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

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

 							<?php } ?>

 							</span>

 							<br /></td>

 					</tr>

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

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

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

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

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

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

 					</tr>

 					<tr>

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

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

 						<td>&nbsp;</td>

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

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

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

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

 								<?php

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

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

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

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

 								}

 								?>

 							</select></td>

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

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

 					</tr>

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

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

 						<tr>

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

 							<td>&nbsp;</td>

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

 						var w = screen.width * 0.7;

 						var h = screen.height * 0.7;

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

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

 					}

 

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

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

 					</tr>

 					<tr>

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

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

 					</tr>

 				</table>

 			</div>

 			<?php

-			if($use_udperms == 1) {

+			if ($use_udperms == 1) {

 

 			$groupsarray = array();

 

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

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

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

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

 			}

 			// retain selected user groups between post

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

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

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

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

 			}

 			?>

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

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

 				<?php

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

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

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

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

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

 				}

 				}

 				?>

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

 				"id" => $user

 			));

-			if(is_array($evtOut)) {

+			if (is_array($evtOut)) {

 				echo implode("", $evtOut);

 			}

 			?>

manager/actions/category_mgr/inc/request_trigger.inc.php

Indentation +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 
             if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) )
             {
-               $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
+                $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
             }
 
             foreach( $cm->getCategories() as $category )
@@ -106,14 +106,14 @@ 
 
     if( empty( $category ) )
     {
-       $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
-       return;
+        $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
+        return;
     }
 
     if( $cm->isCategoryExists( $category ) )
     {
-       $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
-       return;
+        $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
+        return;
     }
 
     if( $cm->addCategory( $category, $rank ) !== 0 )

Spacing +49 added lines, -49 removed lines

@@ -2,16 +2,16 @@ 
 /**
  * Ajax Requests
  */
-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( isset( $_REQUEST[$cm->get('request_key')]['ajax'] ) )
+if (isset($_REQUEST[$cm->get('request_key')]['ajax']))
 {
     $_data  = $_REQUEST[$cm->get('request_key')];
     $output = '';
     $task   = $_data['task'];
-    switch( $task )
+    switch ($task)
     {
         /**
          * get categories
@@ -19,19 +19,19 @@ 
         case 'categorize_load_elements':
             $elements = $_data['elements'];
 
-            if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) )
+            if ($uncategorized_elements = $cm->getAssignedElements(0, $_data['elements']))
             {
                $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
             }
 
-            foreach( $cm->getCategories() as $category )
+            foreach ($cm->getCategories() as $category)
             {
-                $category['elements'] = $cm->getAssignedElements( $category['id'], $_data['elements'] );
+                $category['elements'] = $cm->getAssignedElements($category['id'], $_data['elements']);
                 $output .= $cm->renderView('chunks/categorize/category', $category);
             }
             break;
     }
-    exit( $output );
+    exit($output);
 }
 /**
  * Categorize elements
@@ -41,7 +41,7 @@ 
  * @see http://modxcms.com/forums/index.php/topic,40430.msg251476.html#msg251476
  *
  */
-if( isset( $_POST[$cm->get('request_key')]['categorize']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['categorize']['submit']))
 {
     $_data = $_POST[$cm->get('request_key')]['categorize'];
     $_changes = 0;
@@ -54,15 +54,15 @@ 
         'categorize'
     );
 
-    if( !isset( $_data['elements'] ) )
+    if (!isset($_data['elements']))
     {
-        $cm->addMessage( $cm->txt('cm_unknown_error'), 'categorize' );
+        $cm->addMessage($cm->txt('cm_unknown_error'), 'categorize');
         return;
     }
 
-    foreach( $_data['elements'] as $element_id => $data )
+    foreach ($_data['elements'] as $element_id => $data)
     {
-        if( $cm->updateElement( $_data['elementsgroup'], $element_id, $data['category_id'] ) )
+        if ($cm->updateElement($_data['elementsgroup'], $element_id, $data['category_id']))
         {
             $cm->addMessage(
                 sprintf(
@@ -78,9 +78,9 @@ 
         }
     }
 
-    if( $_changes === 0 )
+    if ($_changes === 0)
     {
-        $cm->addMessage( $cm->txt('cm_no_categorization'), 'categorize' );
+        $cm->addMessage($cm->txt('cm_no_categorization'), 'categorize');
         return;
     }
     else
@@ -98,29 +98,29 @@ 
 /**
  * Add a new category
  */
-if( isset( $_POST[$cm->get('request_key')]['add']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['add']['submit']))
 {
     $_data    = $_POST[$cm->get('request_key')]['add']['data'];
-    $category = trim( html_entity_decode($_data['name']) );
+    $category = trim(html_entity_decode($_data['name']));
     $rank     = (int) $_data['rank'];
 
-    if( empty( $category ) )
+    if (empty($category))
     {
-       $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
+       $cm->addMessage($cm->txt('cm_enter_name_for_category'), 'add');
        return;
     }
 
-    if( $cm->isCategoryExists( $category ) )
+    if ($cm->isCategoryExists($category))
     {
-       $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
+       $cm->addMessage(sprintf($cm->txt('cm_category_x_exists'), $category), 'add');
        return;
     }
 
-    if( $cm->addCategory( $category, $rank ) !== 0 )
+    if ($cm->addCategory($category, $rank) !== 0)
     {
         $cm->addMessage(
             sprintf(
-                $cm->txt( 'cm_category_x_saved_at_position_y' ),
+                $cm->txt('cm_category_x_saved_at_position_y'),
                 $category,
                 $rank
             ),
@@ -129,26 +129,26 @@ 
     }
     else
     {
-        $cm->addMessage( $cm->txt('cm_unknown_error'), 'add' );
+        $cm->addMessage($cm->txt('cm_unknown_error'), 'add');
     }
 }
 
 /**
  * Sort categories
  */
-if( isset( $_POST[$cm->get('request_key')]['sort']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['sort']['submit']))
 {
     $categories = $_POST[$cm->get('request_key')]['sort']['data'];
     $_changes   = 0;
 
-    foreach( $categories as $category_id => $_data  )
+    foreach ($categories as $category_id => $_data)
     {
         $data = array(
-            'category' => urldecode( $_data['category'] ),
+            'category' => urldecode($_data['category']),
             'rank'     => $_data['rank']
         );
 
-        if( $cm->updateCategory( $category_id, $data ) )
+        if ($cm->updateCategory($category_id, $data))
         {
             $cm->addMessage(
                 sprintf(
@@ -162,9 +162,9 @@ 
         }
     }
 
-    if( $_changes === 0 )
+    if ($_changes === 0)
     {
-        $cm->addMessage( $cm->txt( 'cm_no_changes' ), 'sort');
+        $cm->addMessage($cm->txt('cm_no_changes'), 'sort');
     }
     else
     {
@@ -181,21 +181,21 @@ 
 /**
  * Edit categories
  */
-if( isset( $_POST[$cm->get('request_key')]['edit']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['edit']['submit']))
 {
     $categories = $_POST[$cm->get('request_key')]['edit']['data'];
     $_changes   = 0;
 
-    foreach( $categories as $category_id => $_data  )
+    foreach ($categories as $category_id => $_data)
     {
-        if( isset( $_data['delete'] ) )
+        if (isset($_data['delete']))
         {
-            if( $cm->deleteCategory( $category_id ) )
+            if ($cm->deleteCategory($category_id))
             {
                 $cm->addMessage(
                     sprintf(
                         $cm->txt('cm_category_x_deleted'),
-                        urldecode( $_data['origin'] )
+                        urldecode($_data['origin'])
                     ),
                     'edit'
                 );
@@ -205,16 +205,16 @@ 
         }
 
         $data = array(
-            'category' => trim( html_entity_decode( $_data['category'] ) ),
+            'category' => trim(html_entity_decode($_data['category'])),
             'rank'     => $_data['rank']
         );
 
-        if( $cm->updateCategory( $category_id, $data ) )
+        if ($cm->updateCategory($category_id, $data))
         {
             $cm->addMessage(
                 sprintf(
                     $cm->txt('cm_category_x_renamed_to_y'),
-                    urldecode( $_data['origin'] ),
+                    urldecode($_data['origin']),
                     $data['category']
                 ),
                 'edit'
@@ -223,26 +223,26 @@ 
         }
     }
 
-    if( $_changes === 0 )
+    if ($_changes === 0)
     {
-        $cm->addMessage( $cm->txt( 'cm_no_changes' ), 'edit');
+        $cm->addMessage($cm->txt('cm_no_changes'), 'edit');
     }
 }
 
 /**
  * Delete singel category by $_GET
  */
-if( isset( $_GET[$cm->get('request_key')]['delete'] )
-    && !empty( $_GET[$cm->get('request_key')]['delete'] ) )
+if (isset($_GET[$cm->get('request_key')]['delete'])
+    && !empty($_GET[$cm->get('request_key')]['delete']))
 {
-    $category_id = (int)$_GET[$cm->get('request_key')]['delete'];
+    $category_id = (int) $_GET[$cm->get('request_key')]['delete'];
 
-    if( $cm->deleteCategory( $category_id ) )
+    if ($cm->deleteCategory($category_id))
     {
         $cm->addMessage(
             sprintf(
                 $cm->txt('cm_category_x_deleted'),
-                urldecode( $_GET[$cm->get('request_key')]['category'] )
+                urldecode($_GET[$cm->get('request_key')]['category'])
             ),
             'edit'
         );
@@ -251,15 +251,15 @@ 
 /**
  * Translate phrases
  */
-if( isset( $_POST[$cm->get('request_key')]['translate']['submit'] ) )
+if (isset($_POST[$cm->get('request_key')]['translate']['submit']))
 {
     $translations = $_POST[$cm->get('request_key')]['translate']['data'];
 
-    foreach( $translations as $native_phrase => $translation )
+    foreach ($translations as $native_phrase => $translation)
     {
-        $native_phrase = urldecode( $native_phrase );
+        $native_phrase = urldecode($native_phrase);
 
-        if( empty( $translation ) )
+        if (empty($translation))
         {
             $translation = $native_phrase;
 
@@ -272,7 +272,7 @@ 
             );
         }
 
-        $cm->c('Translator')->addTranslation( $native_phrase, $translation, 'phrase' );
+        $cm->c('Translator')->addTranslation($native_phrase, $translation, 'phrase');
 
         $cm->addMessage(
             sprintf(

Braces +31 added lines, -65 removed lines

@@ -6,26 +6,22 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-if( isset( $_REQUEST[$cm->get('request_key')]['ajax'] ) )
-{
+if( isset( $_REQUEST[$cm->get('request_key')]['ajax'] ) ) {
     $_data  = $_REQUEST[$cm->get('request_key')];
     $output = '';
     $task   = $_data['task'];
-    switch( $task )
-    {
+    switch( $task ) {
         /**
          * get categories
          */
         case 'categorize_load_elements':
             $elements = $_data['elements'];
 
-            if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) )
-            {
+            if( $uncategorized_elements = $cm->getAssignedElements( 0, $_data['elements'] ) ) {
                $output .= $cm->renderView('chunks/categorize/uncategorized_elements', $uncategorized_elements);
             }
 
-            foreach( $cm->getCategories() as $category )
-            {
+            foreach( $cm->getCategories() as $category ) {
                 $category['elements'] = $cm->getAssignedElements( $category['id'], $_data['elements'] );
                 $output .= $cm->renderView('chunks/categorize/category', $category);
             }
@@ -41,8 +37,7 @@ 
  * @see http://modxcms.com/forums/index.php/topic,40430.msg251476.html#msg251476
  *
  */
-if( isset( $_POST[$cm->get('request_key')]['categorize']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['categorize']['submit'] ) ) {
     $_data = $_POST[$cm->get('request_key')]['categorize'];
     $_changes = 0;
 
@@ -54,16 +49,13 @@ 
         'categorize'
     );
 
-    if( !isset( $_data['elements'] ) )
-    {
+    if( !isset( $_data['elements'] ) ) {
         $cm->addMessage( $cm->txt('cm_unknown_error'), 'categorize' );
         return;
     }
 
-    foreach( $_data['elements'] as $element_id => $data )
-    {
-        if( $cm->updateElement( $_data['elementsgroup'], $element_id, $data['category_id'] ) )
-        {
+    foreach( $_data['elements'] as $element_id => $data ) {
+        if( $cm->updateElement( $_data['elementsgroup'], $element_id, $data['category_id'] ) ) {
             $cm->addMessage(
                 sprintf(
                     $cm->txt('cm_x_assigned_to_category_y'),
@@ -78,13 +70,10 @@ 
         }
     }
 
-    if( $_changes === 0 )
-    {
+    if( $_changes === 0 ) {
         $cm->addMessage( $cm->txt('cm_no_categorization'), 'categorize' );
         return;
-    }
-    else
-    {
+    } else {
         $cm->addMessage(
             sprintf(
                 $cm->txt('cm_x_changes_made'),
@@ -98,26 +87,22 @@ 
 /**
  * Add a new category
  */
-if( isset( $_POST[$cm->get('request_key')]['add']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['add']['submit'] ) ) {
     $_data    = $_POST[$cm->get('request_key')]['add']['data'];
     $category = trim( html_entity_decode($_data['name']) );
     $rank     = (int) $_data['rank'];
 
-    if( empty( $category ) )
-    {
+    if( empty( $category ) ) {
        $cm->addMessage( $cm->txt('cm_enter_name_for_category'), 'add' );
        return;
     }
 
-    if( $cm->isCategoryExists( $category ) )
-    {
+    if( $cm->isCategoryExists( $category ) ) {
        $cm->addMessage( sprintf( $cm->txt('cm_category_x_exists'), $category ), 'add' );
        return;
     }
 
-    if( $cm->addCategory( $category, $rank ) !== 0 )
-    {
+    if( $cm->addCategory( $category, $rank ) !== 0 ) {
         $cm->addMessage(
             sprintf(
                 $cm->txt( 'cm_category_x_saved_at_position_y' ),
@@ -126,9 +111,7 @@ 
             ),
             'add'
         );
-    }
-    else
-    {
+    } else {
         $cm->addMessage( $cm->txt('cm_unknown_error'), 'add' );
     }
 }
@@ -136,20 +119,17 @@ 
 /**
  * Sort categories
  */
-if( isset( $_POST[$cm->get('request_key')]['sort']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['sort']['submit'] ) ) {
     $categories = $_POST[$cm->get('request_key')]['sort']['data'];
     $_changes   = 0;
 
-    foreach( $categories as $category_id => $_data  )
-    {
+    foreach( $categories as $category_id => $_data  ) {
         $data = array(
             'category' => urldecode( $_data['category'] ),
             'rank'     => $_data['rank']
         );
 
-        if( $cm->updateCategory( $category_id, $data ) )
-        {
+        if( $cm->updateCategory( $category_id, $data ) ) {
             $cm->addMessage(
                 sprintf(
                     $cm->txt('cm_category_x_moved_to_position_y'),
@@ -162,12 +142,9 @@ 
         }
     }
 
-    if( $_changes === 0 )
-    {
+    if( $_changes === 0 ) {
         $cm->addMessage( $cm->txt( 'cm_no_changes' ), 'sort');
-    }
-    else
-    {
+    } else {
         $cm->addMessage(
             sprintf(
                 $cm->txt('cm_x_changes_made'),
@@ -181,17 +158,13 @@ 
 /**
  * Edit categories
  */
-if( isset( $_POST[$cm->get('request_key')]['edit']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['edit']['submit'] ) ) {
     $categories = $_POST[$cm->get('request_key')]['edit']['data'];
     $_changes   = 0;
 
-    foreach( $categories as $category_id => $_data  )
-    {
-        if( isset( $_data['delete'] ) )
-        {
-            if( $cm->deleteCategory( $category_id ) )
-            {
+    foreach( $categories as $category_id => $_data  ) {
+        if( isset( $_data['delete'] ) ) {
+            if( $cm->deleteCategory( $category_id ) ) {
                 $cm->addMessage(
                     sprintf(
                         $cm->txt('cm_category_x_deleted'),
@@ -209,8 +182,7 @@ 
             'rank'     => $_data['rank']
         );
 
-        if( $cm->updateCategory( $category_id, $data ) )
-        {
+        if( $cm->updateCategory( $category_id, $data ) ) {
             $cm->addMessage(
                 sprintf(
                     $cm->txt('cm_category_x_renamed_to_y'),
@@ -223,8 +195,7 @@ 
         }
     }
 
-    if( $_changes === 0 )
-    {
+    if( $_changes === 0 ) {
         $cm->addMessage( $cm->txt( 'cm_no_changes' ), 'edit');
     }
 }
@@ -233,12 +204,10 @@ 
  * Delete singel category by $_GET
  */
 if( isset( $_GET[$cm->get('request_key')]['delete'] )
-    && !empty( $_GET[$cm->get('request_key')]['delete'] ) )
-{
+    && !empty( $_GET[$cm->get('request_key')]['delete'] ) ) {
     $category_id = (int)$_GET[$cm->get('request_key')]['delete'];
 
-    if( $cm->deleteCategory( $category_id ) )
-    {
+    if( $cm->deleteCategory( $category_id ) ) {
         $cm->addMessage(
             sprintf(
                 $cm->txt('cm_category_x_deleted'),
@@ -251,16 +220,13 @@ 
 /**
  * Translate phrases
  */
-if( isset( $_POST[$cm->get('request_key')]['translate']['submit'] ) )
-{
+if( isset( $_POST[$cm->get('request_key')]['translate']['submit'] ) ) {
     $translations = $_POST[$cm->get('request_key')]['translate']['data'];
 
-    foreach( $translations as $native_phrase => $translation )
-    {
+    foreach( $translations as $native_phrase => $translation ) {
         $native_phrase = urldecode( $native_phrase );
 
-        if( empty( $translation ) )
-        {
+        if( empty( $translation ) ) {
             $translation = $native_phrase;
 
             $cm->addMessage(

manager/actions/eventlog_details.dynamic.php

Indentation +14 added lines, -14 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 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.");
+    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')) {
-	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 // get id
@@ -41,18 +41,18 @@ 
 	<div class="tab-page">
 		<div class="container container-body">
 			<?php
-			$date = $modx->toDateFormat($content["createdon"]);
-			if($content["type"] == 1) {
-				$icon = $_style['actions_info'] . ' text-info';
-				$msgtype = $_lang["information"];
-			} 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';
-				$msgtype = $_lang["error"];
-			}
-			?>
+            $date = $modx->toDateFormat($content["createdon"]);
+            if($content["type"] == 1) {
+                $icon = $_style['actions_info'] . ' text-info';
+                $msgtype = $_lang["information"];
+            } 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';
+                $msgtype = $_lang["error"];
+            }
+            ?>
 			<p><b><?= $content['source'] . " - " . $_lang['eventlog_viewer'] ?></b></p>
 			<p>
 				<i class="<?= $icon ?>"></i> <?= $msgtype ?>

Spacing +13 added lines, -13 removed lines

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

manager/includes/footer.inc.php

Indentation +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 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.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 global $SystemAlertMsgQueque;
 // display system alert window if messages are available
 if(count($SystemAlertMsgQueque) > 0) {
-	include "sysalert.display.inc.php";
+    include "sysalert.display.inc.php";
 }
 ?>
 <script type='text/javascript'>
@@ -19,17 +19,17 @@ 
 </script>
 <?php
 if(in_array($modx->manager->action, array(
-	85,
-	27,
-	4,
-	72,
-	13,
-	11,
-	12,
-	87,
-	88
+    85,
+    27,
+    4,
+    72,
+    13,
+    11,
+    12,
+    87,
+    88
 ))) {
-	echo $modx->manager->loadDatePicker($modx->config['mgr_date_picker_path']);
+    echo $modx->manager->loadDatePicker($modx->config['mgr_date_picker_path']);
 }
 ?>
 </body>

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@ 
 <?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.");
 }
 global $SystemAlertMsgQueque;
 // display system alert window if messages are available
-if(count($SystemAlertMsgQueque) > 0) {
+if (count($SystemAlertMsgQueque) > 0) {
 	include "sysalert.display.inc.php";
 }
 ?>
@@ -18,7 +18,7 @@ 
 	});
 </script>
 <?php
-if(in_array($modx->manager->action, array(
+if (in_array($modx->manager->action, array(
 	85,
 	27,
 	4,