evolution-cms / evolution

manager/actions/help.static.php

Braces +6 added lines, -6 removed lines

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

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

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

 }

 $helpBasePath = "actions/help/";

@@ -16,9 +16,9 @@ 
 		</script>

 

 		<?php

-		if($handle = opendir('actions/help')) {

-			while(false !== ($file = readdir($handle))) {

-				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {

+		if($handle = opendir('actions/help')) {
+			while(false !== ($file = readdir($handle))) {
+				if($file != "." && $file != ".." && $file != ".svn" && $file != 'index.html' && !is_dir($helpBasePath . $file)) {
 					$help[] = $file;

 				}

 			}

@@ -27,12 +27,12 @@ 
 

 		natcasesort($help);

 

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

+		foreach($help as $k => $v) {
 

 			$helpname = substr($v, 0, strrpos($v, '.'));

 

 			$prefix = substr($helpname, 0, 2);

-			if(is_numeric($prefix)) {

+			if(is_numeric($prefix)) {
 				$helpname = substr($helpname, 2, strlen($helpname) - 1);

 			}

 

manager/actions/help/03Version_Notices.php

Braces +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
     foreach($notices as $v) {
         if ($v >= '1.3.0') {
             $cms = 'EVO';
-        }
-        else {
+        } else {
             $cms = 'MODX EVO';
         }
         echo '<div class="sectionHeader"> '.$cms.' '.$v.'</div><div class="sectionBody">';

manager/actions/help/04Changelog.php

Braces +4 added lines, -3 removed lines

@@ -8,7 +8,8 @@
 <div class="sectionBody">
 <?php
 	$changeLog = MODX_BASE_PATH . 'assets/docs/changelog.txt';
-	if(is_readable($changeLog))
-		echo str_replace("\n",'<br>',file_get_contents($changeLog));
-?>
+	if(is_readable($changeLog)) {
+			echo str_replace("\n",'<br>',file_get_contents($changeLog));
+	}
+	?>
 </div>

manager/actions/mutate_categories.dynamic.php

Braces +2 added lines, -4 removed lines

@@ -28,16 +28,14 @@
 $cm = new Module_Categories_Manager();
 
 // assign module_params to internal params
-foreach( $_module_params as $param => $value )
-{
+foreach( $_module_params as $param => $value ) {
 	$cm->set( $param, $value );
 }
 
 // catch the request actions
 include_once $cm->get('inc_dir') . 'request_trigger.inc.php';
 
-if( !$categories = $cm->getCategories() )
-{
+if( !$categories = $cm->getCategories() ) {
 	setcookie('webfxtab_manage-categories-pane', 0 );
 	$cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' );
 }

manager/actions/mutate_password.dynamic.php

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

 }

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*/

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

 			}

 			?>