evolution-cms / evolution

manager/actions/messages.static.php

Spacing +15 added lines, -15 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.");
 }
 if (!$modx->hasPermission('messages')) {
@@ -17,7 +17,7 @@ 
         <div class="container container-body" id="lyr3">
             <b><?= $_lang['messages_read_message'] ?></b>
             <?php
-            $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "id='" . (int)$_REQUEST['id'] . "'");
+            $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "id='".(int) $_REQUEST['id']."'");
     $message = $modx->db->getRow($rs);
     if (!$message) {
         echo "Wrong number of messages returned!";
@@ -86,7 +86,7 @@ 
         <p><b><?= $_lang['messages_inbox'] ?></b></p>
         <?php
         // Get  number of rows
-        $rs = $modx->db->select('count(id)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "");
+        $rs = $modx->db->select('count(id)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()."");
         $num_rows = $modx->db->getValue($rs);
 
         // ==============================================================
@@ -99,7 +99,7 @@ 
         if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
             $int_cur_position = 0;
         } else {
-            $int_cur_position = (int)$_REQUEST['int_cur_position'];
+            $int_cur_position = (int) $_REQUEST['int_cur_position'];
         }
 
         // Number of result to display on the page, will be in the LIMIT of the sql query also
@@ -116,21 +116,21 @@ 
         $array_row_paging = $p->getPagingRowArray();
 
         // Display the result as you like...
-        $pager .= $_lang['showing'] . " " . $array_paging['lower'];
-        $pager .= " " . $_lang['to'] . " " . $array_paging['upper'];
-        $pager .= " (" . $array_paging['total'] . " " . $_lang['total'] . ")";
-        $pager .= "<br />" . $array_paging['previous_link'] . "&lt;&lt;" . (isset($array_paging['previous_link']) ? "</a> " : " ");
+        $pager .= $_lang['showing']." ".$array_paging['lower'];
+        $pager .= " ".$_lang['to']." ".$array_paging['upper'];
+        $pager .= " (".$array_paging['total']." ".$_lang['total'].")";
+        $pager .= "<br />".$array_paging['previous_link']."&lt;&lt;".(isset($array_paging['previous_link']) ? "</a> " : " ");
         for ($i = 0; $i < sizeof($array_row_paging); $i++) {
-            $pager .= $array_row_paging[$i] . "&nbsp;";
+            $pager .= $array_row_paging[$i]."&nbsp;";
         }
-        $pager .= $array_paging['next_link'] . "&gt;&gt;" . (isset($array_paging['next_link']) ? "</a>" : "");
+        $pager .= $array_paging['next_link']."&gt;&gt;".(isset($array_paging['next_link']) ? "</a>" : "");
 
         // The above exemple print somethings like:
         // Results 1 to 20 of 597  <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>>
         // Of course you can now play with array_row_paging in order to print
         // only the results you would like...
 
-        $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "", 'postdate DESC', "{$int_cur_position}, {$int_num_result}");
+        $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()."", 'postdate DESC', "{$int_cur_position}, {$int_num_result}");
         $limit = $modx->db->getRecordCount($rs);
         if ($limit < 1) {
             echo $_lang['messages_no_messages'];
@@ -186,7 +186,7 @@ 
         <p><b><?= $_lang['messages_compose'] ?></b></p>
         <?php
         if (($_REQUEST['m'] == 'rp' || $_REQUEST['m'] == 'f') && isset($_REQUEST['id'])) {
-            $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "id='" . $_REQUEST['id'] . "'");
+            $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "id='".$_REQUEST['id']."'");
             $message = $modx->db->getRow($rs);
             if (!$message) {
                 echo "Wrong number of messages returned!";
@@ -205,7 +205,7 @@ 
                     }
                     $subjecttext = $_REQUEST['m'] == 'rp' ? "Re: " : "Fwd: ";
                     $subjecttext .= $message['subject'];
-                    $messagetext = "\n\n\n-----\n" . $_lang['messages_from'] . ": $sendername\n" . $_lang['messages_sent'] . ": " . $modx->toDateFormat($message['postdate'] + $server_offset_time) . "\n" . $_lang['messages_subject'] . ": " . $message['subject'] . "\n\n" . $message['message'];
+                    $messagetext = "\n\n\n-----\n".$_lang['messages_from'].": $sendername\n".$_lang['messages_sent'].": ".$modx->toDateFormat($message['postdate'] + $server_offset_time)."\n".$_lang['messages_subject'].": ".$message['subject']."\n\n".$message['message'];
                     if ($_REQUEST['m'] == 'rp') {
                         $recipientindex = $message['sender'];
                     }
@@ -292,9 +292,9 @@ 
 
 <?php
 // count messages again, as any action on the messages page may have altered the message count
-$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . " and messageread=0");
+$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()." and messageread=0");
 $_SESSION['nrnewmessages'] = $modx->db->getValue($rs);
-$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "");
+$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()."");
 $_SESSION['nrtotalmessages'] = $modx->db->getValue($rs);
 $messagesallowed = $modx->hasPermission('messages');
 ?>

manager/actions/mutate_password.dynamic.php

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

 }

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

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_templates.dynamic.php

Switch Indentation +11 added lines, -11 removed lines

@@ -4,18 +4,18 @@
 }
 
 switch ($modx->manager->action) {
-    case 16:
-        if (!$modx->hasPermission('edit_template')) {
-            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    case 19:
-        if (!$modx->hasPermission('new_template')) {
+        case 16:
+            if (!$modx->hasPermission('edit_template')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        case 19:
+            if (!$modx->hasPermission('new_template')) {
+                $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+            }
+            break;
+        default:
             $modx->webAlertAndQuit($_lang["error_no_privileges"]);
-        }
-        break;
-    default:
-        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

Spacing +17 added lines, -17 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.");
 }
 
@@ -18,7 +18,7 @@ 
         $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 $tbl_site_templates = $modx->getFullTableName('site_templates');
 
@@ -45,7 +45,7 @@ 
     }
 } else {
     $_SESSION['itemname'] = $_lang["new_template"];
-    $content['category'] = (int)$_REQUEST['catid'];
+    $content['category'] = (int) $_REQUEST['catid'];
 }
 
 if ($modx->manager->hasFormValues()) {
@@ -58,7 +58,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 1;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 ?>
 <script type="text/javascript">
 
@@ -109,7 +109,7 @@ 
 	<input type="hidden" name="mode" value="<?= $modx->manager->action ?>">
 
 	<h1>
-		<i class="fa fa-newspaper-o"></i><?= ($content['templatename'] ? $content['templatename'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_template']) ?><i class="fa fa-question-circle help"></i>
+		<i class="fa fa-newspaper-o"></i><?= ($content['templatename'] ? $content['templatename'].'<small>('.$content['id'].')</small>' : $_lang['new_template']) ?><i class="fa fa-question-circle help"></i>
 	</h1>
 
 	<?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -133,14 +133,14 @@ 
 						<label class="col-md-3 col-lg-2">
 							<?= $_lang['template_name'] ?>
 							<?php if ($id == $modx->config['default_template']) {
-        echo '<small class="form-text text-danger">' . mb_strtolower(rtrim($_lang['defaulttemplate_title'], ':'), $modx_manager_charset) . '</small>';
+        echo '<small class="form-text text-danger">'.mb_strtolower(rtrim($_lang['defaulttemplate_title'], ':'), $modx_manager_charset).'</small>';
     } ?>
 						</label>
 						<div class="col-md-9 col-lg-10">
 							<div class="form-control-name clearfix">
 								<input name="templatename" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['templatename']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;">
 								<?php if ($modx->hasPermission('save_role')): ?>
-									<label class="custom-control" title="<?= $_lang['lock_template'] . "\n" . $_lang['lock_template_msg'] ?>" tooltip>
+									<label class="custom-control" title="<?= $_lang['lock_template']."\n".$_lang['lock_template_msg'] ?>" tooltip>
 										<input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> />
 										<i class="fa fa-lock"></i>
 									</label>
@@ -162,9 +162,9 @@ 
 							<select name="categoryid" class="form-control" onchange="documentDirty=true;">
 								<option>&nbsp;</option>
 								<?php
-                                include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php');
+                                include_once(MODX_MANAGER_PATH.'includes/categories.inc.php');
                                 foreach (getCategories() as $n => $v) {
-                                    echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>";
+                                    echo "<option value='".$v['id']."'".($content["category"] == $v["id"] ? " selected='selected'" : "").">".$modx->htmlspecialchars($v["category"])."</option>";
                                 }
                                 ?>
 							</select>
@@ -206,7 +206,7 @@ 
                 while ($row = $modx->db->getRow($rs)) {
                     $selectedTvs[$row['tvid']] = $row;
                 }
-                $selectedTvs = array_reverse($selectedTvs, true);       // reverse ORDERBY DESC
+                $selectedTvs = array_reverse($selectedTvs, true); // reverse ORDERBY DESC
             }
 
             $unselectedTvs = array();
@@ -239,7 +239,7 @@ 
 			<div class="container container-body">
 				<?php
                 if ($total > 0) {
-                    echo '<p>' . $_lang['template_tv_msg'] . '</p>';
+                    echo '<p>'.$_lang['template_tv_msg'].'</p>';
                 }
                 if ($modx->hasPermission('save_template') && $total > 1 && $id) {
                     echo sprintf('<div class="form-group"><a class="btn btn-primary" href="index.php?a=117&amp;id=%s">%s</a></div>', $id, $_lang['template_tv_edit']);
@@ -250,8 +250,8 @@ 
                 if ($total > 0) {
                     $tvList .= '<ul>';
                     foreach ($selectedTvs as $row) {
-                        $desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>(' . $row['tvdescription'] . ')</small>' : '';
-                        $locked = $row['tvlocked'] ? ' <em>(' . $_lang['locked'] . ')</em>' : "";
+                        $desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>('.$row['tvdescription'].')</small>' : '';
+                        $locked = $row['tvlocked'] ? ' <em>('.$_lang['locked'].')</em>' : "";
                         $tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" checked="checked" onchange="documentDirty=true;jQuery(\'#tvsDirty\').val(\'1\');"> %s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>', $row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->manager->action, $id, $_lang['edit']);
                     }
                     $tvList .= '</ul>';
@@ -261,7 +261,7 @@ 
                 echo $tvList;
 
                 // Unselected TVs
-                $tvList = '<hr/><p>' . $_lang['template_notassigned_tv'] . '</p><ul>';
+                $tvList = '<hr/><p>'.$_lang['template_notassigned_tv'].'</p><ul>';
                 $preCat = '';
                 $insideUl = 0;
                 while ($row = array_shift($unselectedTvs)) {
@@ -271,12 +271,12 @@ 
                     $row['category'] = stripslashes($row['category']); //pixelchutes
                     if ($preCat !== $row['category']) {
                         $tvList .= $insideUl ? '</ul>' : '';
-                        $tvList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>';
+                        $tvList .= '<li><strong>'.$row['category'].($row['catid'] != '' ? ' <small>('.$row['catid'].')</small>' : '').'</strong><ul>';
                         $insideUl = 1;
                     }
 
-                    $desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>(' . $row['tvdescription'] . ')</small>' : '';
-                    $locked = $row['tvlocked'] ? ' <em>(' . $_lang['locked'] . ')</em>' : "";
+                    $desc = !empty($row['tvdescription']) ? '&nbsp;&nbsp;<small>('.$row['tvdescription'].')</small>' : '';
+                    $locked = $row['tvlocked'] ? ' <em>('.$_lang['locked'].')</em>' : "";
                     $tvList .= sprintf('<li><label><input name="assignedTv[]" value="%s" type="checkbox" onchange="documentDirty=true;jQuery(\'#tvsDirty\').val(\'1\');"> %s <small>(%s)</small> - %s%s</label>%s <a href="index.php?id=%s&a=301&or=%s&oid=%s">%s</a></li>', $row['tvid'], $row['tvname'], $row['tvid'], $row['tvcaption'], $desc, $locked, $row['tvid'], $modx->manager->action, $id, $_lang['edit']);
                     $tvList .= '</li>';
 

manager/actions/mutate_module_resources.dynamic.php

Spacing +12 added lines, -12 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.");
 }
 
@@ -7,7 +7,7 @@ 
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // Get table names (alphabetical)
 $tbl_active_users = $modx->getFullTableName('active_users');
@@ -24,7 +24,7 @@ 
 $modx->manager->initPageViewState();
 
 // check to see the  editor isn't locked
-$rs = $modx->db->select('username', $tbl_active_users, "action=108 AND id='{$id}' AND internalKey!='" . $modx->getLoginUserID() . "'");
+$rs = $modx->db->select('username', $tbl_active_users, "action=108 AND id='{$id}' AND internalKey!='".$modx->getLoginUserID()."'");
 if ($username = $modx->db->getValue($rs)) {
     $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $username, 'module'));
 }
@@ -57,7 +57,7 @@ 
             if ($rt == 'tv') {
                 $type = 60;
             }
-            $modx->db->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (" . implode(',', $opids) . ") AND type='{$type}'");
+            $modx->db->delete($tbl_site_module_depobj, "module='{$id}' AND resource IN (".implode(',', $opids).") AND type='{$type}'");
             foreach ($opids as $opid) {
                 $modx->db->insert(array(
                     'module' => $id,
@@ -72,7 +72,7 @@ 
         $opids = array_filter(array_map('intval', $_REQUEST['depid']));
 
         // get resources that needs to be removed
-        $ds = $modx->db->select('*', $tbl_site_module_depobj, "id IN (" . implode(",", $opids) . ")");
+        $ds = $modx->db->select('*', $tbl_site_module_depobj, "id IN (".implode(",", $opids).")");
         // loop through resources and look for plugins and snippets
         $plids = array();
         $snid = array();
@@ -90,15 +90,15 @@ 
         // reset moduleguid for deleted resources
         if (($cp = count($plids)) || ($cs = count($snids))) {
             if ($cp) {
-                $modx->db->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $plids) . ") AND moduleguid='{$guid}'");
+                $modx->db->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (".implode(',', $plids).") AND moduleguid='{$guid}'");
             }
             if ($cs) {
-                $modx->db->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (" . implode(',', $snids) . ") AND moduleguid='{$guid}'");
+                $modx->db->update(array('moduleguid' => ''), $tbl_site_plugins, "id IN (".implode(',', $snids).") AND moduleguid='{$guid}'");
             }
             // reset cache
             $modx->clearCache('full');
         }
-        $modx->db->delete($tbl_site_module_depobj, "id IN (" . implode(',', $opids) . ")");
+        $modx->db->delete($tbl_site_module_depobj, "id IN (".implode(',', $opids).")");
         break;
 }
 
@@ -188,13 +188,13 @@ 
 	<input type="hidden" name="id" value="<?php echo $content['id']; ?>" />
 
 	<h1>
-		<i class="fa fa-cogs"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['module_resource_title']) ?>
+		<i class="fa fa-cogs"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['module_resource_title']) ?>
 	</h1>
 
 	<?php echo $_style['actionbuttons']['dynamic']['close'] ?>
 
 	<div class="section">
-		<div class="sectionHeader"><?php echo $content["name"] . " - " . $_lang['module_resource_title']; ?></div>
+		<div class="sectionHeader"><?php echo $content["name"]." - ".$_lang['module_resource_title']; ?></div>
 		<div class="sectionBody">
 			<p><?php echo $_lang['module_resource_msg']; ?></p>
 			<br />
@@ -218,14 +218,14 @@ 
 					LEFT JOIN {$tbl_site_snippets} AS ss ON ss.id = smd.resource AND smd.type = '40'
 					LEFT JOIN {$tbl_site_templates} AS st ON st.id = smd.resource AND smd.type = '50'
 					LEFT JOIN {$tbl_site_tmplvars} AS sv ON sv.id = smd.resource AND smd.type = '60'", "smd.module={$id}", "smd.type,name");
-                        include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+                        include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
                         $grd = new DataGrid('', $ds, 0); // set page size to 0 t show all items
                         $grd->noRecordMsg = $_lang["no_records_found"];
                         $grd->cssClass = "grid";
                         $grd->columnHeaderClass = "gridHeader";
                         $grd->itemClass = "gridItem";
                         $grd->altItemClass = "gridAltItem";
-                        $grd->columns = $_lang["element_name"] . " ," . $_lang["type"];
+                        $grd->columns = $_lang["element_name"]." ,".$_lang["type"];
                         $grd->colTypes = "template:<input type='checkbox' name='depid[]' value='[+id+]'> [+value+]";
                         $grd->fields = "name,type";
                         echo $grd->render();

manager/actions/refresh_site.dynamic.php

Spacing +3 added lines, -3 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.");
 }
 
@@ -30,10 +30,10 @@ 
 <div class="tab-page">
 	<div class="container container-body">
 		<?php if ($num_rows_pub) {
-    printf('<p>' . $_lang["refresh_published"] . '</p>', $num_rows_pub);
+    printf('<p>'.$_lang["refresh_published"].'</p>', $num_rows_pub);
 } ?>
 		<?php if ($num_rows_unpub) {
-    printf('<p>' . $_lang["refresh_unpublished"] . '</p>', $num_rows_unpub);
+    printf('<p>'.$_lang["refresh_unpublished"].'</p>', $num_rows_unpub);
 } ?>
 		<?php
         $modx->clearCache('full', true);

manager/actions/move_document.dynamic.php

Spacing +5 added lines, -5 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.");
 }
 if (!$modx->hasPermission('save_document')) {
@@ -7,13 +7,13 @@ 
 }
 
 if (isset($_REQUEST['id'])) {
-    $id = (int)$_REQUEST['id'];
+    $id = (int) $_REQUEST['id'];
 } else {
     $modx->webAlertAndQuit($_lang["error_no_id"]);
 }
 
 // check permissions on the document
-include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
 $udperms = new udperms();
 $udperms->user = $modx->getLoginUserID();
 $udperms->document = $id;
@@ -39,7 +39,7 @@ 
     },
     cancel: function() {
       documentDirty = false;
-        <?= ($id == 0 ? 'document.location.href="index.php?a=2";' : 'document.location.href="index.php?a=3&id=' . $id . '";') ?>
+        <?= ($id == 0 ? 'document.location.href="index.php?a=2";' : 'document.location.href="index.php?a=3&id='.$id.'";') ?>
     }
   };
 
@@ -80,7 +80,7 @@ 
 </script>
 
 <h1>
-    <i class="fa fa-arrows"></i><?= ($pagetitle ? $pagetitle . '<small>(' . $id . ')</small>' : $_lang['move_resource_title']) ?>
+    <i class="fa fa-arrows"></i><?= ($pagetitle ? $pagetitle.'<small>('.$id.')</small>' : $_lang['move_resource_title']) ?>
 </h1>
 
 <?= $_style['actionbuttons']['dynamic']['save'] ?>

manager/actions/eventlog_details.dynamic.php

Spacing +9 added lines, -9 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.");
 }
 if (!$modx->hasPermission('view_eventlog')) {
@@ -7,11 +7,11 @@ 
 }
 
 // get id
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
-$ds = $modx->db->select('el.*, IFNULL(wu.username,mu.username) as username', $modx->getFullTableName("event_log") . " el 
-		LEFT JOIN " . $modx->getFullTableName("manager_users") . " mu ON mu.id=el.user AND el.usertype=0
-		LEFT JOIN " . $modx->getFullTableName("web_users") . " wu ON wu.id=el.user AND el.usertype=1", "el.id='{$id}'");
+$ds = $modx->db->select('el.*, IFNULL(wu.username,mu.username) as username', $modx->getFullTableName("event_log")." el 
+		LEFT JOIN " . $modx->getFullTableName("manager_users")." mu ON mu.id=el.user AND el.usertype=0
+		LEFT JOIN " . $modx->getFullTableName("web_users")." wu ON wu.id=el.user AND el.usertype=1", "el.id='{$id}'");
 $content = $modx->db->getRow($ds);
 
 ?>
@@ -43,17 +43,17 @@ 
 			<?php
             $date = $modx->toDateFormat($content["createdon"]);
             if ($content["type"] == 1) {
-                $icon = $_style['actions_info'] . ' text-info';
+                $icon = $_style['actions_info'].' text-info';
                 $msgtype = $_lang["information"];
             } elseif ($content["type"] == 2) {
-                $icon = $_style['actions_triangle'] . ' text-warning';
+                $icon = $_style['actions_triangle'].' text-warning';
                 $msgtype = $_lang["warning"];
             } elseif ($content["type"] == 3) {
-                $icon = $_style['actions_error'] . ' text-danger';
+                $icon = $_style['actions_error'].' text-danger';
                 $msgtype = $_lang["error"];
             }
             ?>
-			<p><b><?= $content['source'] . " - " . $_lang['eventlog_viewer'] ?></b></p>
+			<p><b><?= $content['source']." - ".$_lang['eventlog_viewer'] ?></b></p>
 			<p>
 				<i class="<?= $icon ?>"></i> <?= $msgtype ?>
 			</p>

manager/actions/mutate_web_user.dynamic.php

Switch Indentation +11 added lines, -11 removed lines

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

 

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

-    case 88:

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

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

-        }

-        break;

-    case 87:

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

+        case 88:

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

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

+            }

+            break;

+        case 87:

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

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

+            }

+            break;

+        default:

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

-        }

-        break;

-    default:

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

 }

 

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

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

 }

 

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

 }

 

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

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

 

 

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

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

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

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

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

 }

@@ -80,8 +80,8 @@ 
 

 // include the country list language file

 $_country_lang = array();

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

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

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

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

 } else {

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

 }

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

 

 	<h1>

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

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

     </h1>

 

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

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

 					</tr>

 					<tr>

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

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

 						<td>&nbsp;</td>

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

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

@@ -331,7 +331,7 @@ 
 								<option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> >&nbsp;</option>

 								<?php

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

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

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

                                 }

                                 ?>

 							</select></td>

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

 						var w = screen.width * 0.7;

 						var h = screen.height * 0.7;

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

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

 					}

 

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

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

 					</tr>

 					<tr>

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

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

 					</tr>

 				</table>

 			</div>

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

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

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

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

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

                 }

             }

                 ?>

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

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

 }

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

@@ -75,7 +75,7 @@ 
                             $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username');

                             foreach ($logs_user as $row) {

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

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

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

                             }

                             ?>

                         </select>

@@ -96,7 +96,7 @@ 
                                     continue;

                                 }

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

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

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

                             }

                             ?>

                         </select>

@@ -112,7 +112,7 @@ 
                             $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid');

                             foreach ($logs_items as $row) {

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

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

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

                             }

                             ?>

                         </select>

@@ -128,7 +128,7 @@ 
                             $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname');

                             foreach ($logs_names as $row) {

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

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

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

                             }

                             ?>

                         </select>

@@ -186,26 +186,26 @@ 
                                 // get the selections the user made.

                                 $sqladd = array();

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

-                                    $sqladd[] = "internalKey='" . (int)$_REQUEST['searchuser'] . "'";

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

                                 }

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

-                                    $sqladd[] = "action=" . (int)$_REQUEST['action'];

+                                    $sqladd[] = "action=".(int) $_REQUEST['action'];

                                 }

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

-                                    $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'";

+                                    $sqladd[] = "itemid='".$_REQUEST['itemid']."'";

                                 }

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

-                                    $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'";

+                                    $sqladd[] = "itemname='".$modx->db->escape($_REQUEST['itemname'])."'";

                                 }

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

-                                    $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'";

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

                                 }

                                 // date stuff

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

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

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

                                 }

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

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

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

                                 }

 

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

@@ -218,7 +218,7 @@ 
                                 // Number of result to display on the page, will be in the LIMIT of the sql query also

                                 $int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs;

 

-                                $extargv = "&a=13&searchuser=" . $_REQUEST['searchuser'] . "&action=" . $_REQUEST['action'] . "&itemid=" . $_REQUEST['itemid'] . "&itemname=" . $_REQUEST['itemname'] . "&message=" . $_REQUEST['message'] . "&dateto=" . $_REQUEST['dateto'] . "&datefrom=" . $_REQUEST['datefrom'] . "&nrresults=" . $int_num_result . "&log_submit=" . $_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)

+                                $extargv = "&a=13&searchuser=".$_REQUEST['searchuser']."&action=".$_REQUEST['action']."&itemid=".$_REQUEST['itemid']."&itemname=".$_REQUEST['itemname']."&message=".$_REQUEST['message']."&dateto=".$_REQUEST['dateto']."&datefrom=".$_REQUEST['datefrom']."&nrresults=".$int_num_result."&log_submit=".$_REQUEST['log_submit']; // extra argv here (could be anything depending on your page)

 

                                 // build the sql

                                 $limit = $num_rows = $modx->db->getValue($modx->db->select('COUNT(*)', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : '')));

@@ -226,9 +226,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) {

-                                    echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>';

+                                    echo '<p>'.$_lang["mgrlog_emptysrch"].'</p>';

                                 } else {

-                                    echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>';

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

 

                                     include_once "paginate.inc.php";

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

@@ -240,11 +240,11 @@ 
                                     $current_row = $int_cur_position / $int_num_result;

 

                                     // Display the result as you like...

-                                    print "<p>" . $_lang["paging_showing"] . " " . $array_paging['lower'];

-                                    print " " . $_lang["paging_to"] . " " . $array_paging['upper'];

-                                    print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")<br />";

-                                    $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> " : " ");

+                                    print "<p>".$_lang["paging_showing"]." ".$array_paging['lower'];

+                                    print " ".$_lang["paging_to"]." ".$array_paging['upper'];

+                                    print " (".$array_paging['total']." ".$_lang["paging_total"].")<br />";

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

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

@@ -254,11 +254,11 @@ 
         $paging .= $array_row_paging[$current_row + 2]; // ."&nbsp;";

                                     } else {

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

-                                            $paging .= $array_row_paging[$i] . "&nbsp;";

+                                            $paging .= $array_row_paging[$i]."&nbsp;";

                                         }

                                     }

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

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

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

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

                                     // The above exemple print somethings like:

     // Results 1 to 20 of 597  <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>>

     // Of course you can now play with array_row_paging in order to print

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

                                             $item = '<div style="text-align:center;">-</div>';

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

-                                            $item = '<a href="index.php?a=3&amp;id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>';

+                                            $item = '<a href="index.php?a=3&amp;id='.$logentry['itemid'].'">'.$logentry['itemname'].'</a>';

                                         } else {

                                             $item = $logentry['itemname'];

                                         }

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

-                                        $user_drill = 'index.php?a=13&searchuser=' . $logentry['internalKey'] . '&itemname=0&log_submit=true'; ?>

+                                        $user_drill = 'index.php?a=13&searchuser='.$logentry['internalKey'].'&itemname=0&log_submit=true'; ?>

                     <tr>

-                        <td><?= '<a href="' . $user_drill . '">' . $logentry['username'] . '</a>' ?></td>

-                        <td class="text-nowrap"><?= '[' . $logentry['action'] . '] ' . $logentry['message'] ?></td>

+                        <td><?= '<a href="'.$user_drill.'">'.$logentry['username'].'</a>' ?></td>

+                        <td class="text-nowrap"><?= '['.$logentry['action'].'] '.$logentry['message'] ?></td>

                         <td class="text-xs-right"><?= $logentry['itemid'] ?></td>

                         <td><?= $item ?></td>

                         <td class="text-nowrap"><?= $modx->toDateFormat($logentry['timestamp'] + $server_offset_time) ?></td>

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"];

                             }