evolution-cms / evolution

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 [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";

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

 

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

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

-} else {

+} 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/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->getDatabase()->query($articul_query);
 		$articul_id_array = $modx->getDatabase()->makeArray($articul_result);
-		if(count($articul_id_array)>0){
+		if(count($articul_id_array)>0) {
 			$articul_id = '';
 			$i = 1;
 			foreach( $articul_id_array as $articul ) {
 				$articul_id.=$articul['contentid'];
-				if($i !== count($articul_id_array)){
+				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*/

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->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') {
@@ -767,13 +769,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->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/logging.static.php

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

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

 }

 

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

                             // get all users currently in the log

                             $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username');

-                            foreach ($logs_user as $row) {

+                            foreach ($logs_user as $row) {
                                 $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : '';

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

                             }

@@ -43,9 +43,9 @@ 
                             // get all available actions in the log

                             include_once "actionlist.inc.php";

                             $logs_actions = record_sort(array_unique_multi($logs, 'action'), 'action');

-                            foreach ($logs_actions as $row) {

+                            foreach ($logs_actions as $row) {
                                 $action = getAction($row['action']);

-                                if ($action == 'Idle') {

+                                if ($action == 'Idle') {
                                     continue;

                                 }

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

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

                             // get all itemid currently in logging

                             $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid');

-                            foreach ($logs_items as $row) {

+                            foreach ($logs_items as $row) {
                                 $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : '';

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

                             }

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

                             // get all itemname currently in logging

                             $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname');

-                            foreach ($logs_names as $row) {

+                            foreach ($logs_names as $row) {
                                 $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : '';

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

                             }

@@ -135,36 +135,36 @@ 
     <div class="container container-body">

 

 <?php

-if (isset($_REQUEST['log_submit'])) {

+if (isset($_REQUEST['log_submit'])) {
     // get the selections the user made.

     $sqladd = array();

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

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

     }

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

+    if ($_REQUEST['action'] != 0) {
         $sqladd[] = "action=" . (int)$_REQUEST['action'];

     }

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

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

     }

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

+    if ($_REQUEST['itemname'] != '0') {
         $sqladd[] = "itemname='" . $modx->getDatabase()->escape($_REQUEST['itemname']) . "'";

     }

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

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

     }

     // date stuff

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

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

     }

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

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

     }

 

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

-    if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {

+    if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
         $int_cur_position = 0;

-    } else {

+    } else {
         $int_cur_position = $_REQUEST['int_cur_position'];

     }

 

@@ -178,9 +178,9 @@ 
 

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

 

-if ($limit < 1) {

+if ($limit < 1) {
     echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>';

-} else {

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

 

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

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

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

     $pagesfound = sizeof($array_row_paging);

-    if ($pagesfound > 6) {

+    if ($pagesfound > 6) {
         $paging .= $array_row_paging[$current_row - 2]; // ."&nbsp;";

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

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

         $paging .= $array_row_paging[$current_row + 1]; // ."&nbsp;";

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

-    } else {

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

+    } else {
+        for ($i = 0; $i < $pagesfound; $i++) {
             $paging .= $array_row_paging[$i] . "&nbsp;";

         }

     }

@@ -242,12 +242,12 @@ 
                 // grab the entire log file...

                 $logentries = array();

                 $i = 0;

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

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

+                while ($logentry = $modx->getDatabase()->getRow($rs)) {
+                    if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {
                         $item = '<div style="text-align:center;">-</div>';

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

+                    } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {
                         $item = '<a href="index.php?a=3&amp;id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>';

-                    } else {

+                    } else {
                         $item = $logentry['itemname'];

                     }

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

@@ -284,6 +284,6 @@ 
     // @see index.php @ 915

     global $action;

     $action = 1;

-} else {

+} else {
     echo $_lang["mgrlog_noquery"];

 }

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', '[+prefix+]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/tab5_security_settings.inc.php

Braces +11 added lines, -5 removed lines

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

     $MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4

-    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {

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

-    } else {

+    } else {
         $valid_hostnames = $MODX_SITE_HOSTNAMES;

     }

 ?>

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

 <td>

 <?php

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

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

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

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

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

 <?php

 $gdAvailable = extension_loaded('gd');

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

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

   <tr>

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

@@ -226,7 +230,9 @@ 
         <?php

             // invoke OnMiscSettingsRender event

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

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

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

     </td>

   </tr>

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;

@@ -28,7 +28,7 @@ 
 include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";

 $cm = new 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));

@@ -107,21 +107,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->getFullTableName('site_modules') . ' AS sm

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

 				LEFT JOIN ' . $modx->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->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>";

         }

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

manager/actions/eventlog.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 /><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->getManagerApi()->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->getDatabase()->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/processors/execute_module.processor.php

Braces +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 }
 
 // check if user has access permission, except admins
-if($_SESSION['mgrRole']!=1){
+if($_SESSION['mgrRole']!=1) {
 	$rs = $modx->getDatabase()->select(
 		'sma.usergroup,mg.member',
 		$modx->getFullTableName("site_module_access")." sma