evolution-cms / evolution

manager/actions/mutate_settings.dynamic.php

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

@@ -69,7 +69,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

@@ -133,6 +133,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/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_web_user.dynamic.php

Braces +26 added lines, -25 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,23 +23,23 @@ 
 

 // 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)) {

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

     }

     extract($usersettings, EXTR_OVERWRITE);

@@ -47,11 +47,11 @@ 
     // 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();

@@ -59,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);

@@ -80,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);

@@ -193,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);

     }

     ?>

@@ -220,7 +220,7 @@ 
 				<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

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

@@ -330,7 +330,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>";

                                 }

                                 ?>

@@ -357,7 +357,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>

@@ -503,16 +503,17 @@ 
 				</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) {

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

                     }

                 } ?>

@@ -522,7 +523,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 />';

                 }

             }

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

                 "id" => $user

             ));

-            if (is_array($evtOut)) {

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

             }

             ?>

manager/actions/logging.static.php

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

 }

 

@@ -11,17 +11,17 @@ 
  * @param string $checkKey

  * @return array

  */

-function array_unique_multi($array, $checkKey)

-{

+function array_unique_multi($array, $checkKey)
+{
     // Use the builtin if we're not a multi-dimensional array

-    if (!is_array(current($array)) || empty($checkKey)) {

+    if (!is_array(current($array)) || empty($checkKey)) {
         return array_unique($array);

     }

 

     $ret = array();

     $checkValues = array(); // contains the unique key Values

-    foreach ($array as $key => $current) {

-        if (in_array($current[$checkKey], $checkValues)) {

+    foreach ($array as $key => $current) {
+        if (in_array($current[$checkKey], $checkValues)) {
             continue;

         } // duplicate

 

@@ -36,17 +36,17 @@ 
  * @param string $key

  * @return array

  */

-function record_sort($array, $key)

-{

+function record_sort($array, $key)
+{
     $hash = array();

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

+    foreach ($array as $k => $v) {
         $hash[$k] = $v[$key];

     }

 

     natsort($hash);

 

     $records = array();

-    foreach ($hash as $k => $row) {

+    foreach ($hash as $k => $row) {
         $records[$k] = $array[$k];

     }

 

@@ -73,7 +73,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";

                             }

@@ -90,9 +90,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"' : '';

@@ -110,7 +110,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";

                             }

@@ -126,7 +126,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";

                             }

@@ -182,36 +182,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->db->escape($_REQUEST['itemname']) . "'";

                                 }

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

+                                if ($_REQUEST['message'] != "") {
                                     $sqladd[] = "message LIKE '%" . $modx->db->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'];

                                 }

 

@@ -225,9 +225,9 @@ 
 

                                 $rs = $modx->db->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>';

 

                                     include_once "paginate.inc.php";

@@ -246,14 +246,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;";

                                         }

                                     }

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

                 $logentries = array();

                                     $i = 0;

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

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

+                                    while ($logentry = $modx->db->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'

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

     global $action;

                                 $action = 1;

-                            } else {

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

                             }

manager/actions/mutate_module.dynamic.php

Braces +22 added lines, -22 removed lines

@@ -1,15 +1,15 @@ 
 <?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 107:

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

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

         }

         break;

     case 108:

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

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

         }

         break;

@@ -33,8 +33,8 @@ 
  *

  * @return string

  */

-function createGUID()

-{

+function createGUID()
+{
     srand((double) microtime() * 1000000);

     $r = rand();

     $u = uniqid(getmypid() . $r . (double) microtime() * 1000000, 1);

@@ -43,7 +43,7 @@ 
 }

 

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

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

+if ($lockedEl = $modx->elementIsLocked(6, $id)) {
     $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['module']));

 }

 // end check for lock

@@ -51,22 +51,22 @@ 
 // Lock snippet for other users to edit

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

 

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

+if (isset($_GET['id'])) {
     $rs = $modx->db->select('*', $tbl_site_modules, "id='{$id}'");

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

-    if (!$content) {

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

     }

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

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

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

+    if ($content['locked'] == 1 && $_SESSION['mgrRole'] != 1) {
         $modx->webAlertAndQuit($_lang["error_no_privileges"]);

     }

-} else {

+} else {
     $_SESSION['itemname'] = $_lang["new_module"];

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

 }

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

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

 }

 

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

     // invoke OnModFormPrerender event

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

-    if (is_array($evtOut)) {

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

     }

 

@@ -503,7 +503,7 @@ 
 								<option>&nbsp;</option>

 								<?php

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

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

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

                                 }

                                 ?>

@@ -655,7 +655,7 @@ 
                     $rs = $modx->db->select('usergroup', $tbl_site_module_access, "module='{$id}'");

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

 

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

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

 						<!-- User Group Access Permissions -->

 						<script type="text/javascript">

@@ -683,21 +683,21 @@ 
                     }

                     $chk = '';

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

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

+                    while ($row = $modx->db->getRow($rs)) {
                         $groupsarray = is_numeric($id) && $id > 0 ? $groupsarray : array();

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

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

-                            if ($checked) {

+                        if ($modx->hasPermission('access_permissions')) {
+                            if ($checked) {
                                 $notPublic = true;

                             }

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

-                        } else {

-                            if ($checked) {

+                        } else {
+                            if ($checked) {
                                 $chks = '<input type="hidden" name="usrgroups[]"  value="' . $row['id'] . '" />' . "\n" . $chks;

                             }

                         }

                     }

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

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

                     }

                     echo $chks;

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

         // invoke OnModFormRender event

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

-        if (is_array($evtOut)) {

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

         }

         ?>

manager/actions/mutate_settings/tab6_filemanager_settings.inc.php

Braces +1 added lines, -1 removed lines

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

             // invoke OnMiscSettingsRender event

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

-            if (is_array($evtOut)) {

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

             }

         ?>

manager/actions/mutate_settings/tab5_security_settings.inc.php

Braces +5 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,7 @@ 
 <th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th>

 <td>

 <?php

-if (empty($pwd_hash_algo)) {

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

 }

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

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

 <?php

 $gdAvailable = extension_loaded('gd');

-if (!$gdAvailable) {

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

 }

 ?>

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

             // invoke OnMiscSettingsRender event

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

-            if (is_array($evtOut)) {

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

             }

         ?>

manager/actions/mutate_settings/tab3_user_settings.inc.php

Braces +1 added lines, -1 removed lines

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

             // invoke OnUserSettingsRender event

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

-            if (is_array($evtOut)) {

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

             }

         ?>

manager/actions/mutate_settings/tab7_filebrowser_settings.inc.php

Braces +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
     <td>

         <select name="which_browser" size="1" class="inputBox" onchange="documentDirty=true;">

             <?php

-            foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {

+            foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
                 $dir = str_replace('\\', '/', $dir);

                 $browser_name = substr($dir, strrpos($dir, '/') + 1);

                 $selected = $browser_name == $which_browser ? ' selected="selected"' : '';

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

             // invoke OnMiscSettingsRender event

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

-            if (is_array($evtOut)) {

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

             }

         ?>