evolution-cms / evolution

manager/processors/duplicate_snippet.processor.php

Braces +5 added lines, -2 removed lines

@@ -14,8 +14,11 @@
 // count duplicates
 $name = $modx->getDatabase()->getValue($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_snippets'), "id='{$id}'"));
 $count = $modx->getDatabase()->getRecordCount($modx->getDatabase()->select('name', $modx->getDatabase()->getFullTableName('site_snippets'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate Snippet
 $newid = $modx->getDatabase()->insert(

manager/frames/mainmenu.php

Braces +35 added lines, -33 removed lines

@@ -32,7 +32,7 @@ 
 	'active'

 );

 

-if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {

+if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
 	$sitemenu['elements'] = array(

 		'elements',

 		'main',

@@ -48,7 +48,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('exec_module')) {
 	$sitemenu['modules'] = array(

 		'modules',

 		'main',

@@ -64,7 +64,7 @@ 
 	);

 }

 

-if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {

+if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
 	$sitemenu['users'] = array(

 		'users',

 		'main',

@@ -80,7 +80,7 @@ 
 	);

 }

 

-if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {

+if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
 	$sitemenu['tools'] = array(

 		'tools',

 		'main',

@@ -97,7 +97,7 @@ 
 }

 

 $tab = 0;

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

+if($modx->hasPermission('edit_template')) {
 	$sitemenu['element_templates'] = array(

 		'element_templates',

 		'elements',

@@ -112,7 +112,7 @@ 
 		'dropdown-toggle'

 	);

 }

-if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

+if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_tplvars'] = array(

 		'element_tplvars',

 		'elements',

@@ -127,7 +127,7 @@ 
 		'dropdown-toggle'

 	);

 }

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

+if($modx->hasPermission('edit_chunk')) {
 	$sitemenu['element_htmlsnippets'] = array(

 		'element_htmlsnippets',

 		'elements',

@@ -142,7 +142,7 @@ 
 		'dropdown-toggle'

 	);

 }

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

+if($modx->hasPermission('edit_snippet')) {
 	$sitemenu['element_snippets'] = array(

 		'element_snippets',

 		'elements',

@@ -157,7 +157,7 @@ 
 		'dropdown-toggle'

 	);

 }

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

+if($modx->hasPermission('edit_plugin')) {
 	$sitemenu['element_plugins'] = array(

 		'element_plugins',

 		'elements',

@@ -174,7 +174,7 @@ 
 }

 //$sitemenu['element_categories']     = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');

 

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

+if($modx->hasPermission('file_manager')) {
 	$sitemenu['manage_files'] = array(

 		'manage_files',

 		'elements',

@@ -189,7 +189,7 @@ 
 		''

 	);

 }

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

+if($modx->hasPermission('category_manager')) {
 	$sitemenu['manage_categories'] = array(

 		'manage_categories',

 		'elements',

@@ -206,7 +206,7 @@ 
 }

 

 // Modules Menu Items

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

+if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
 	$sitemenu['new_module'] = array(

 		'new_module',

 		'modules',

@@ -222,19 +222,19 @@ 
 	);

 }

 

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

-	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+if($modx->hasPermission('exec_module')) {
+	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
 		$rs = $modx->getDatabase()->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member

 				FROM ' . $modx->getDatabase()->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getDatabase()->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getDatabase()->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

-	} else {

+	} else {
 		$rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('site_modules'), 'disabled != 1', 'name');

 	}

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

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

+	if($modx->getDatabase()->getRecordCount($rs)) {
+	    while ($row = $modx->getDatabase()->getRow($rs)) {
             $sitemenu['module' . $row['id']] = array(

                 'module' . $row['id'],

                 'modules',

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

 // security menu items (users)

 

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

+if($modx->hasPermission('edit_user')) {
 	$sitemenu['user_management_title'] = array(

 		'user_management_title',

 		'users',

@@ -270,7 +270,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('edit_web_user')) {
 	$sitemenu['web_user_management_title'] = array(

 		'web_user_management_title',

 		'users',

@@ -286,7 +286,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('edit_role')) {
 	$sitemenu['role_management_title'] = array(

 		'role_management_title',

 		'users',

@@ -302,7 +302,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('access_permissions')) {
 	$sitemenu['manager_permissions'] = array(

 		'manager_permissions',

 		'users',

@@ -318,7 +318,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('web_access_permissions')) {
 	$sitemenu['web_permissions'] = array(

 		'web_permissions',

 		'users',

@@ -374,7 +374,7 @@ 
 	''

 );

 

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

+if($modx->hasPermission('bk_manager')) {
 	$sitemenu['bk_manager'] = array(

 		'bk_manager',

 		'tools',

@@ -390,7 +390,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('remove_locks')) {
 	$sitemenu['remove_locks'] = array(

 		'remove_locks',

 		'tools',

@@ -406,7 +406,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('import_static')) {
 	$sitemenu['import_site'] = array(

 		'import_site',

 		'tools',

@@ -422,7 +422,7 @@ 
 	);

 }

 

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

+if($modx->hasPermission('export_static')) {
 	$sitemenu['export_site'] = array(

 		'export_site',

 		'tools',

@@ -439,19 +439,21 @@ 
 }

 

 $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));

-if(is_array($menu)) {

+if(is_array($menu)) {
 	$newmenu = array();

-	foreach($menu as $item){

-		if(is_array(unserialize($item))){

+	foreach($menu as $item) {
+		if(is_array(unserialize($item))) {
 			$newmenu = array_merge($newmenu, unserialize($item));

 		}

 	}

-	if(count($newmenu)> 0) $sitemenu = $newmenu;

-}

+	if(count($newmenu)> 0) {
+	    $sitemenu = $newmenu;
+	}
+	}

 

-if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {

+if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
 	include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php');

-} else {

+} else {
 	include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php');

 }

 $menu = new EVOmenu();

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->getManagerApi()->action) {

+switch($modx->getManagerApi()->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->getDatabase()->select('username', $modx->getDatabase()->getFullTableName('active_users'), "action=88 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");

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

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

 }

 // end check for lock

 

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

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

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

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

-	if(!$userdata) {

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

 	}

 

 	// get user settings

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

 	$usersettings = array();

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

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

 

 	// get user name

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

 	$usernamedata = $modx->getDatabase()->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->getManagerApi()->hasFormValues()) {

+if($modx->getManagerApi()->hasFormValues()) {
 	$modx->getManagerApi()->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->getManagerApi()->action == '88') { // only do this bit if the user is being edited

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

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

 				$groupsarray = $modx->getDatabase()->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->getDatabase()->select('name, id', $modx->getDatabase()->getFullTableName('webgroup_names'), '', 'name');

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

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

 				}

 				}

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

 				"id" => $user

 			));

-			if(is_array($evtOut)) {

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

 			}

 			?>

manager/actions/welcome.static.php

Braces +48 added lines, -46 removed lines

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

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

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

 }

 

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

 

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

+if($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
 	// seems to be a new install - send the user to the configuration page

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

 }

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

 

 // setup message info

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

+if($modx->hasPermission('messages')) {
 	include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

 	$_SESSION['nrtotalmessages'] = $nrtotalmessages;

 	$_SESSION['nrnewmessages'] = $nrnewmessages;

@@ -33,46 +33,46 @@ 
 

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

 // setup icons

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

+if($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
 	$icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

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

 }

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

+if($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
 	$icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

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

 }

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

+if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
 	$icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

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

 }

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

+if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
 	$icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

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

 }

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

+if($modx->hasPermission('bk_manager')) {
 	$icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

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

 }

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

+if($modx->hasPermission('help')) {
 	$icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

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

 }

 

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

+if($modx->hasPermission('new_document')) {
 	$icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';

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

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

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

 }

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

+if($modx->hasPermission('assets_images')) {
 	$icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';

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

 }

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

+if($modx->hasPermission('assets_files')) {
 	$icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';

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

 }

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

+if($modx->hasPermission('change_password')) {
 	$icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';

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

 }

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

 

 // do some config checks

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

+if(($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
 	include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

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

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

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

-	} else {

+	} else {
 		$ph['config_display'] = 'none';

 	}

-} else {

+} else {
 	$ph['config_display'] = 'none';

 }

 

 // Check logout-reminder

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

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

+if(isset($_SESSION['show_logout_reminder'])) {
+	switch($_SESSION['show_logout_reminder']['type']) {
 		case 'logout_reminder':

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

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

@@ -102,7 +102,7 @@ 
 	}

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

 	unset($_SESSION['show_logout_reminder']);

-} else {

+} else {
 	$ph['show_logout_reminder'] = 'none';

 }

 

@@ -163,9 +163,9 @@ 
 $from[] = " us LEFT JOIN " . $modx->getDatabase()->getFullTableName('active_users') . " au ON au.sid=us.sid WHERE au.action <> '8'";

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

 

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

+if($modx->getDatabase()->getRecordCount($rs) < 1) {
 	$html = '<p>[%no_active_users_found%]</p>';

-} else {

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

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

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

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

 	$userCount = array();

 	// Create userlist with session-count first before output

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

+	while($activeusers = $modx->getDatabase()->getRow($rs)) {
 		$userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

 

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

@@ -209,7 +209,7 @@ 
 			$currentaction

 		);

 	}

-	foreach($userList as $params) {

+	foreach($userList as $params) {
 		$params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

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

 	}

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

 // invoke event OnManagerWelcomePrerender

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

-if(is_array($evtOut)) {

+if(is_array($evtOut)) {
 	$output = implode('', $evtOut);

 	$ph['OnManagerWelcomePrerender'] = $output;

 }

@@ -359,7 +359,7 @@ 
 	'body' => '<div class="widget-stage">[+RecentInfo+]</div>',

 	'hide'=>'0'

 );

-if ($modx->config['rss_url_news']) {

+if ($modx->config['rss_url_news']) {
     $widgets['news'] = array(

         'menuindex' => '40',

         'id' => 'news',

@@ -370,7 +370,7 @@ 
         'hide'=>'0'

     );

 }

-if ($modx->config['rss_url_security']) {

+if ($modx->config['rss_url_security']) {
     $widgets['security'] = array(

         'menuindex' => '50',

         'id' => 'security',

@@ -384,29 +384,29 @@ 
 

 // invoke OnManagerWelcomeHome event

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

-if(is_array($sitewidgets)) {

+if(is_array($sitewidgets)) {
 	$newwidgets = array();

-    foreach($sitewidgets as $widget){

+    foreach($sitewidgets as $widget) {
         $newwidgets = array_merge($newwidgets, unserialize($widget));

     }

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

 }

 

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

+usort($widgets, function ($a, $b){
 	return $a['menuindex'] - $b['menuindex'];

 });

 

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

 $output = '';

-foreach($widgets as $widget) {

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

+foreach($widgets as $widget) {
+	if ($widget['hide'] != '1') {
 		$output .= $modx->parseText($tpl, $widget);

 	}

 }

 $ph['widgets'] = $output;

 

 // load template

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

+if(!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
 	$modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

 }

 

@@ -414,26 +414,28 @@ 
 $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);

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

 

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

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

+if(substr($target, 0, 1) === '@') {
+	if(substr($target, 0, 6) === '@CHUNK') {
 		$content = $modx->getChunk(trim(substr($target, 7)));

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

+	} elseif(substr($target, 0, 5) === '@FILE') {
 		$content = file_get_contents(trim(substr($target, 6)));

-	} else {

+	} else {
 		$content = '';

 	}

-} else {

+} else {
 	$chunk = $modx->getChunk($target);

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

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

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

+	} elseif(is_file(MODX_BASE_PATH . $target)) {
 		$content = file_get_contents(MODX_BASE_PATH . $target);

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

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

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

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

 	{

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

-	} else {

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

 	}

 }

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

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

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

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

+if(strpos($content, '[+') !== false) {
 	$modx->toPlaceholders($ph);

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

 }

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

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

 

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

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

 }

 

manager/actions/mutate_settings/tab1_site_settings.inc.php

Braces +16 added lines, -13 removed lines

@@ -82,23 +82,23 @@ 
         <?php

 

         $currentCategory = '';

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

+                        while ($row = $modx->getDatabase()->getRow($rs)) {
             $thisCategory = $row['category'];

-            if($thisCategory == null) {

+            if($thisCategory == null) {
                 $thisCategory = $_lang['no_category'];

             }

-            if($thisCategory != $currentCategory) {

-                if($closeOptGroup) {

+            if($thisCategory != $currentCategory) {
+                if($closeOptGroup) {
                     echo "\t\t\t\t\t</optgroup>\n";

                 }

                 echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";

                 $closeOptGroup = true;

-            } else {

+            } else {
                 $closeOptGroup = false;

             }

 

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

-            if ($selectedtext) {

+            if ($selectedtext) {
                 $oldTmpId = $row['id'];

                 $oldTmpName = $row['templatename'];

             }

@@ -106,7 +106,7 @@ 
             echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n";

             $currentCategory = $thisCategory;

         }

-        if($thisCategory != '') {

+        if($thisCategory != '') {
             echo "\t\t\t\t\t</optgroup>\n";

         }

 ?>

@@ -138,11 +138,12 @@ 
               $modx->getDatabase()->select('id', $modx->getDatabase()->getFullTableName('site_plugins'),

               "plugincode LIKE '%phx.parser.class.inc.php%OnParseDocument();%' AND disabled != 1")

             );

-            if($count) {

+            if($count) {
                 $disabledFilters = 1;

                 echo '<b>'.$_lang['enable_filter_phx_warning'].'</b><br/>';

-            }

-            else $disabledFilters = false;

+            } else {
+                $disabledFilters = false;
+            }
         ?>

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

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

@@ -204,7 +205,7 @@ 
     <select name="lst_custom_contenttype" style="width:200px;height:100px;" size="5">

     <?php

         $ct = explode(",",$custom_contenttype);

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

+        for($i=0;$i<count($ct);$i++) {
             echo "<option value=\"".$ct[$i]."\">".$ct[$i]."</option>";

         }

     ?>

@@ -259,7 +260,7 @@ 
       <th><?php echo $_lang['serveroffset_title'] ?><br><small>[(server_offset_time)]</small></th>

       <td> <select name="server_offset_time" size="1" class="inputBox">

           <?php

-      for($i=-24; $i<25; $i++) {

+      for($i=-24; $i<25; $i++) {
           $seconds = $i*60*60;

           $selectedtext = $seconds==$server_offset_time ? "selected='selected'" : "" ;

       ?>

@@ -301,7 +302,9 @@ 
         <?php

             // invoke OnSiteSettingsRender event

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

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

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

     </td>

   </tr>

manager/actions/mutate_settings.dynamic.php

Braces +7 added lines, -7 removed lines

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

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

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

 }

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

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

 }

 

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

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

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

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

 }

 // end check for lock

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

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

 $rs = $modx->getDatabase()->select('setting_name, setting_value', $modx->getDatabase()->getFullTableName('system_settings'));

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

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

 }

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

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

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

 	</script>

 <?php

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

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

 }

manager/actions/site_schedule.static.php

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

 }

 ?>

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

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

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

-			if($limit < 1) {

+			if($limit < 1) {
 				?>

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

 				<?php

-			} else {

+			} else {
 				?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-1">

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

 						<tbody>

 						<?php

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

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

 							<tr>

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

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

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

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

-			if($limit < 1) {

+			if($limit < 1) {
 				?>

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

 				<?php

-			} else {

+			} else {
 				?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-2">

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

 						<tbody>

 						<?php

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

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

 							<tr>

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

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

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

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

-			if($limit < 1) {

+			if($limit < 1) {
 				?>

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

 				<?php

-			} else {

+			} else {
 				?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-3">

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

 						<tbody>

 						<?php

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

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

 							<tr>

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

manager/actions/mutate_user.dynamic.php

Braces +8 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
 	// get user settings
 	$rs = $modx->getDatabase()->select('*', $modx->getDatabase()->getFullTableName('user_settings'), "user = '{$user}'");
 	$usersettings = array();
-	while($row = $modx->getDatabase()->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value'];
+	while($row = $modx->getDatabase()->getRow($rs)) {
+	    $usersettings[$row['setting_name']] = $row['setting_value'];
+	}
 	// manually extract so that user display settings are not overwritten
 	foreach($usersettings as $k => $v) {
 		if($k != 'manager_language' && $k != 'manager_theme') {
@@ -771,13 +773,16 @@ 
 
 			$groupsarray = array();
 
-			if($modx->getManagerApi()->action == '12') { // only do this bit if the user is being edited
+			if($modx->getManagerApi()->action == '12') {
+// only do this bit if the user is being edited
 				$rs = $modx->getDatabase()->select('user_group', $modx->getDatabase()->getFullTableName('member_groups'), "member='{$user}'");
 				$groupsarray = $modx->getDatabase()->getColumn('user_group', $rs);
 			}
 			// retain selected doc groups between post
 			if(is_array($_POST['user_groups'])) {
-				foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v;
+				foreach($_POST['user_groups'] as $n => $v) {
+				    $groupsarray[] = $v;
+				}
 			}
 			?>
 			<div class="tab-page" id="tabAccess">

manager/actions/modules.static.php

Braces +12 added lines, -12 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('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {

+if (!($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('exec_module'))) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

@@ -10,10 +10,10 @@ 
 $modx->getManagerApi()->initPageViewState();

 

 // get and save search string

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

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

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

-} else {

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

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

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

@@ -27,7 +27,7 @@ 
 // context menu

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

 $cm->addItem($_lang["run_module"], "js:menuAction(1)", $_style['actions_run'], (!$modx->hasPermission('exec_module') ? 1 : 0));

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

+if ($modx->hasPermission('edit_module') || $modx->hasPermission('new_module') || $modx->hasPermission('delete_module')) {
     $cm->addSeparator();

 }

 $cm->addItem($_lang["edit"], "js:menuAction(2)", $_style['actions_edit'], (!$modx->hasPermission('edit_module') ? 1 : 0));

@@ -106,21 +106,21 @@ 
 <div class="tab-page">

     <div class="table-responsive">

         <?php

-        if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {

+        if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
             $rs = $modx->getDatabase()->query('SELECT DISTINCT sm.id, sm.name, sm.description, mg.member, IF(disabled,"' . $_lang['yes'] . '","-") as disabled, IF(sm.icon<>"",sm.icon,"' . $_style['icons_modules'] . '") as icon

 				FROM ' . $modx->getDatabase()->getFullTableName('site_modules') . ' AS sm

 				LEFT JOIN ' . $modx->getDatabase()->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id

 				LEFT JOIN ' . $modx->getDatabase()->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group

                 WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1

                 ORDER BY sm.name');

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

+            if ($modx->hasPermission('edit_module')) {
                 $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

-            } else if ($modx->hasPermission('exec_module')) {

+            } else if ($modx->hasPermission('exec_module')) {
                 $title = "<a href='index.php?a=112&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

-            } else {

+            } else {
                 $title = '[+value+]';

             }

-        } else {

+        } else {
             $rs = $modx->getDatabase()->select("id, name, description, IF(locked,'{$_lang['yes']}','-') as locked, IF(disabled,'{$_lang['yes']}','-') as disabled, IF(icon<>'',icon,'{$_style['icons_module']}') as icon", $modx->getDatabase()->getFullTableName("site_modules"), (!empty($sqlQuery) ? "(name LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "name");

             $title = "<a href='index.php?a=108&id=[+id+]' title='" . $_lang["module_edit_click_title"] . "'>[+value+]</a>";

         }

@@ -135,10 +135,10 @@ 
         $grd->colWidths = "34,,,60,60";

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

         $grd->colTypes = "template:<a class='tableRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='[+value+]'></i></a>||template:" . $title;

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

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

         }

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

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

         }

         // render grid