evolution-cms / evolution

manager/media/calendar/datepicker.inc.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
         $modx = evolutionCMS();

         global $_lang;

 

-        $tpl = file_get_contents(dirname(__FILE__) . '/datepicker.tpl');

+        $tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');

         return $modx->parseText($tpl, $_lang, '[%', '%]');

     }

 }

Braces +6 added lines, -6 removed lines

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

 

-class DATEPICKER

-{

-    public function __construct()

-    {

+class DATEPICKER
+{
+    public function __construct()
+    {
     }

 

-    public function getDP()

-    {

+    public function getDP()
+    {
         $modx = evolutionCMS();

         global $_lang;

 

manager/actions/mutate_menuindex_sort.dynamic.php

Spacing +12 added lines, -12 removed lines

@@ -1,19 +1,19 @@ 
 <?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('edit_document') || !$modx->hasPermission('save_document')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : null;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : null;
 $reset = isset($_POST['reset']) && $_POST['reset'] == 'true' ? 1 : 0;
 $items = isset($_POST['list']) ? $_POST['list'] : '';
 $ressourcelist = '';
 $updateMsg = '';
 
 // 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;
@@ -24,7 +24,7 @@ 
 }
 
 if (isset($_POST['listSubmitted'])) {
-    $updateMsg .= '<div class="text-success" id="updated">' . $_lang['sort_updated'] . '</div>';
+    $updateMsg .= '<div class="text-success" id="updated">'.$_lang['sort_updated'].'</div>';
     if (strlen($items) > 0) {
         $items = explode(';', $items);
         foreach ($items as $key => $value) {
@@ -44,15 +44,15 @@ 
     $tblsc = $modx->getFullTableName('site_content');
     $tbldg = $modx->getFullTableName('document_groups');
 
-    $rs = $modx->db->select('pagetitle', $tblsc, 'id=' . $id . '');
+    $rs = $modx->db->select('pagetitle', $tblsc, 'id='.$id.'');
     $pagetitle = $modx->db->getValue($rs);
 
     $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
     $docgrp_cond = $docgrp ? "OR dg.document_group IN ({$docgrp})" : '';
-    $mgrRole = (isset($_SESSION['mgrRole']) && (string)$_SESSION['mgrRole'] === '1') ? '1' : '0';
-    $access = " AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+    $mgrRole = (isset($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole'] === '1') ? '1' : '0';
+    $access = " AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
 
-    $rs = $modx->db->select('sc.id, sc.pagetitle, sc.parent, sc.menuindex, sc.published, sc.hidemenu, sc.deleted, sc.isfolder', $tblsc . 'AS sc LEFT JOIN ' . $tbldg . ' dg ON dg.document=sc.id', 'sc.parent=' . $id . $access . ' GROUP BY sc.id', 'menuindex ASC');
+    $rs = $modx->db->select('sc.id, sc.pagetitle, sc.parent, sc.menuindex, sc.published, sc.hidemenu, sc.deleted, sc.isfolder', $tblsc.'AS sc LEFT JOIN '.$tbldg.' dg ON dg.document=sc.id', 'sc.parent='.$id.$access.' GROUP BY sc.id', 'menuindex ASC');
 
     if ($modx->db->getRecordCount($rs)) {
         $ressourcelist .= '<div class="clearfix"><ul id="sortlist" class="sortableList">';
@@ -61,12 +61,12 @@ 
             $classes .= ($row['hidemenu']) ? ' notInMenuNode ' : ' inMenuNode';
             $classes .= ($row['published']) ? ' publishedNode ' : ' unpublishedNode ';
             $classes = ($row['deleted']) ? ' deletedNode ' : $classes;
-            $icon = $row['isfolder'] ? '<i class="' . $_style['files_folder'] . '"></i> ' : ' <i class="' . $_style['files_page_html'] . '"></i> ';
-            $ressourcelist .= '<li id="item_' . $row['id'] . '" class="' . $classes . '">' . $icon . $row['pagetitle'] . ' <small>(' . $row['id'] . ')</small></li>';
+            $icon = $row['isfolder'] ? '<i class="'.$_style['files_folder'].'"></i> ' : ' <i class="'.$_style['files_page_html'].'"></i> ';
+            $ressourcelist .= '<li id="item_'.$row['id'].'" class="'.$classes.'">'.$icon.$row['pagetitle'].' <small>('.$row['id'].')</small></li>';
         }
         $ressourcelist .= '</ul></div>';
     } else {
-        $updateMsg = '<p class="text-danger">' . $_lang['sort_nochildren'] . '</p>';
+        $updateMsg = '<p class="text-danger">'.$_lang['sort_nochildren'].'</p>';
     }
 }
 
@@ -149,7 +149,7 @@ 
 </script>
 
 <h1>
-    <i class="fa fa-sort-numeric-asc"></i><?= ($pagetitle ? $pagetitle . '<small>(' . $id . ')</small>' : $_lang['sort_menuindex']) ?>
+    <i class="fa fa-sort-numeric-asc"></i><?= ($pagetitle ? $pagetitle.'<small>('.$id.')</small>' : $_lang['sort_menuindex']) ?>
 </h1>
 
 <?= $_style['actionbuttons']['dynamic']['save'] ?>

manager/actions/mutate_htmlsnippet.dynamic.php

Spacing +10 added lines, -10 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;
 
 // Get table names (alphabetical)
 $tbl_site_htmlsnippets = $modx->getFullTableName('site_htmlsnippets');
@@ -47,7 +47,7 @@ 
     $content['name'] = $_REQUEST['itemname'];
 } else {
     $_SESSION['itemname'] = $_lang["new_htmlsnippet"];
-    $content['category'] = (int)$_REQUEST['catid'];
+    $content['category'] = (int) $_REQUEST['catid'];
 }
 
 if ($modx->manager->hasFormValues()) {
@@ -65,7 +65,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 3;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 
 // Print RTE Javascript function
 ?>
@@ -136,7 +136,7 @@ 
         <input type="hidden" name="mode" value="<?= $modx->manager->action ?>" />
 
         <h1>
-            <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i>
+            <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i>
         </h1>
 
         <?= $_style['actionbuttons']['dynamic']['element'] ?>
@@ -160,7 +160,7 @@ 
                             <div class="form-control-name clearfix">
                                 <input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" />
                                 <?php if ($modx->hasPermission('save_role')): ?>
-                                    <label class="custom-control" title="<?= $_lang['lock_htmlsnippet'] . "\n" . $_lang['lock_htmlsnippet_msg'] ?>" tooltip>
+                                    <label class="custom-control" title="<?= $_lang['lock_htmlsnippet']."\n".$_lang['lock_htmlsnippet_msg'] ?>" tooltip>
                                         <input name="locked" type="checkbox" value="on"<?= ($content['locked'] == 1 || $content['locked'] == 'on' ? ' checked="checked"' : '') ?> />
                                         <i class="fa fa-lock"></i>
                                     </label>
@@ -184,9 +184,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 "\t\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] || (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n";
+                                    echo "\t\t\t\t".'<option value="'.$v['id'].'"'.($content['category'] == $v['id'] || (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v['category'])."</option>\n";
                                 }
                                 ?>
                             </select>
@@ -200,7 +200,7 @@ 
                     </div>
                     <?php if ($_SESSION['mgrRole'] == 1): ?>
                         <div class="form-row">
-                            <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['disabled'] . "</span>" : $_lang['disabled']) ?></label>
+                            <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['disabled']."</span>" : $_lang['disabled']) ?></label>
                         </div>
                     <?php endif; ?>
                 </div>
@@ -216,7 +216,7 @@ 
                             $evtOut = $modx->invokeEvent('OnRichTextEditorRegister');
                             if (is_array($evtOut)) {
                                 foreach ($evtOut as $i => $editor) {
-                                    echo "\t" . '<option value="' . $editor . '"' . ($which_editor == $editor ? ' selected="selected"' : '') . '>' . $editor . "</option>\n";
+                                    echo "\t".'<option value="'.$editor.'"'.($which_editor == $editor ? ' selected="selected"' : '').'>'.$editor."</option>\n";
                                 }
                             }
                             ?>

manager/actions/help.static.php

Spacing +7 added lines, -7 removed lines

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

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

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

     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 $helpBasePath = "actions/help/";

 ?>

 

 <h1>

-	<?php echo $_style['page_help'];  echo $_lang['help']; ?>

+	<?php echo $_style['page_help']; echo $_lang['help']; ?>

 </h1>

 

 <div class="sectionBody">

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

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

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

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

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

                     $help[] = $file;

                 }

             }

@@ -38,10 +38,10 @@ 
             $hnLower = strtolower($helpname);

             $helpname = isset($_lang[$hnLower]) ? $_lang[$hnLower] : str_replace('_', ' ', $helpname);

 

-            echo '<div class="tab-page" id="tab' . $k . 'Help">';

-            echo '<h2 class="tab">' . $helpname . '</h2>';

-            echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab' . $k . 'Help" ) );</script>';

-            include_once($helpBasePath . "{$v}");

+            echo '<div class="tab-page" id="tab'.$k.'Help">';

+            echo '<h2 class="tab">'.$helpname.'</h2>';

+            echo '<script type="text/javascript">tp.addTabPage( document.getElementById( "tab'.$k.'Help" ) );</script>';

+            include_once($helpBasePath."{$v}");

             echo '</div>';

         }

         ?>

Braces +6 added lines, -6 removed lines

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

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

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

 }

 $helpBasePath = "actions/help/";

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

 

 		<?php

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

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

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

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

                 }

             }

@@ -27,11 +27,11 @@ 
 

         natcasesort($help);

 

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

+        foreach ($help as $k => $v) {
             $helpname = substr($v, 0, strrpos($v, '.'));

 

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

-            if (is_numeric($prefix)) {

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

             }

 

manager/actions/mutate_tv_rank.dynamic.php

Spacing +4 added lines, -4 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_template')) {
@@ -15,7 +15,7 @@ 
 $updateMsg = '';
 
 if (isset($_POST['listSubmitted'])) {
-    $updateMsg .= '<span class="text-success" id="updated">' . $_lang['sort_updated'] . '</span>';
+    $updateMsg .= '<span class="text-success" id="updated">'.$_lang['sort_updated'].'</span>';
     foreach ($_POST as $listName => $listValue) {
         if ($listName == 'listSubmitted' || $listName == 'reset') {
             continue;
@@ -40,11 +40,11 @@ 
     $sortableList = '<div class="clearfix"><ul id="sortlist" class="sortableList">';
     while ($row = $modx->db->getRow($rs)) {
         $caption = $row['caption'] != '' ? $row['caption'] : $row['name'];
-        $sortableList .= '<li id="item_' . $row['id'] . '"><i class="fa fa-list-alt"></i> ' . $caption . ' <small class="protectedNode" style="float:right">[*' . $row['name'] . '*]</small></li>';
+        $sortableList .= '<li id="item_'.$row['id'].'"><i class="fa fa-list-alt"></i> '.$caption.' <small class="protectedNode" style="float:right">[*'.$row['name'].'*]</small></li>';
     }
     $sortableList .= '</ul></div>';
 } else {
-    $updateMsg = '<p class="text-danger">' . $_lang['tmplvars_novars'] . '</p>';
+    $updateMsg = '<p class="text-danger">'.$_lang['tmplvars_novars'].'</p>';
 }
 ?>
 

manager/actions/resources.static.php

Spacing +26 added lines, -26 removed lines

@@ -1,17 +1,17 @@ 
 <?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 (file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php')) {
-    include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php');
+if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/functions.inc.php')) {
+    include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/functions.inc.php');
 } else {
-    include_once(MODX_MANAGER_PATH . 'actions/resources/functions.inc.php');
+    include_once(MODX_MANAGER_PATH.'actions/resources/functions.inc.php');
 }
-if (file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php')) {
-    include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php');
+if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/mgrResources.class.php')) {
+    include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/mgrResources.class.php');
 } else {
-    include_once(MODX_MANAGER_PATH . 'actions/resources/mgrResources.class.php');
+    include_once(MODX_MANAGER_PATH.'actions/resources/mgrResources.class.php');
 }
 
 $resources = new mgrResources();
@@ -69,45 +69,45 @@ 
 		</script>
 
 		<?php
-        if (file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php')) {
-            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php');
+        if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab1_templates.inc.php')) {
+            include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab1_templates.inc.php');
         } else {
-            include_once(MODX_MANAGER_PATH . '/actions/resources/tab1_templates.inc.php');
+            include_once(MODX_MANAGER_PATH.'/actions/resources/tab1_templates.inc.php');
         }
 
-        if (file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php')) {
-            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php');
+        if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab2_templatevars.inc.php')) {
+            include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab2_templatevars.inc.php');
         } else {
-            include_once(MODX_MANAGER_PATH . '/actions/resources/tab2_templatevars.inc.php');
+            include_once(MODX_MANAGER_PATH.'/actions/resources/tab2_templatevars.inc.php');
         }
 
-        if (file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php')) {
-            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php');
+        if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab3_chunks.inc.php')) {
+            include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab3_chunks.inc.php');
         } else {
-            include_once(MODX_MANAGER_PATH . '/actions/resources/tab3_chunks.inc.php');
+            include_once(MODX_MANAGER_PATH.'/actions/resources/tab3_chunks.inc.php');
         }
 
-        if (file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php')) {
-            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php');
+        if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab4_snippets.inc.php')) {
+            include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab4_snippets.inc.php');
         } else {
-            include_once(MODX_MANAGER_PATH . '/actions/resources/tab4_snippets.inc.php');
+            include_once(MODX_MANAGER_PATH.'/actions/resources/tab4_snippets.inc.php');
         }
 
-        if (file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php')) {
-            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php');
+        if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab5_plugins.inc.php')) {
+            include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab5_plugins.inc.php');
         } else {
-            include_once(MODX_MANAGER_PATH . '/actions/resources/tab5_plugins.inc.php');
+            include_once(MODX_MANAGER_PATH.'/actions/resources/tab5_plugins.inc.php');
         }
 
-        if (file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php')) {
-            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php');
+        if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab6_categoryview.inc.php')) {
+            include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab6_categoryview.inc.php');
         } else {
-            include_once(MODX_MANAGER_PATH . '/actions/resources/tab6_categoryview.inc.php');
+            include_once(MODX_MANAGER_PATH.'/actions/resources/tab6_categoryview.inc.php');
         }
 
 
         if (is_numeric($_GET['tab'])) {
-            echo '<script type="text/javascript"> tpResources.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
+            echo '<script type="text/javascript"> tpResources.setSelectedIndex( '.$_GET['tab'].' );</script>';
         }
         ?>
 	</div>

manager/actions/eventlog.dynamic.php

Spacing +6 added lines, -6 removed lines

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

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

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

     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

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

@@ -31,7 +31,7 @@ 
 $_PAGE['vs']['lm'] = $listmode;

 

 // context menu

-include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php";

+include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php";

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

 $cm->addItem($_lang['view_log'], "js:menuAction(1)", $_style['actions_preview']);

 $cm->addSeparator();

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

                     $ds = $modx->db->select("el.id, ELT(el.type , 'text-info {$_style['actions_info']}' , 'text-warning {$_style['actions_triangle']}' , 'text-danger {$_style['actions_error']}' ) as icon, el.createdon, el.source, el.eventid,IFNULL(wu.username,mu.username) as username", "{$tbl_event_log} AS el 

 			LEFT JOIN {$tbl_manager_users} AS mu ON mu.id=el.user AND el.usertype=0

-			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "" . (is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '') . "(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");

-                    include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";

+			LEFT JOIN {$tbl_web_users} AS wu ON wu.id=el.user AND el.usertype=1", ($sqlQuery ? "".(is_numeric($sqlQuery) ? "(eventid='{$sqlQuery}') OR " : '')."(source LIKE '%{$sqlQuery}%') OR (description LIKE '%{$sqlQuery}%')" : ""), "createdon DESC");

+                    include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";

                     $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items

                     $grd->pagerClass = '';

                     $grd->pageClass = 'page-item';

@@ -139,10 +139,10 @@ 
                     $grd->itemClass = "tableItem";

                     $grd->altItemClass = "tableAltItem";

                     $grd->fields = "type,source,createdon,eventid,username";

-                    $grd->columns = $_lang['type'] . " ," . $_lang['source'] . " ," . $_lang['date'] . " ," . $_lang['event_id'] . " ," . $_lang['sysinfo_userid'];

+                    $grd->columns = $_lang['type']." ,".$_lang['source']." ,".$_lang['date']." ,".$_lang['event_id']." ,".$_lang['sysinfo_userid'];

                     $grd->colWidths = "1%,,1%,1%,1%";

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

-                    $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

+                    $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='".$_lang['click_to_context']."'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='".$_lang['click_to_view_details']."'>[+source+]</a>||date: ".$modx->toDateFormat(null, 'formatOnly').' %I:%M %p';

                     if ($listmode == '1') {

                         $grd->pageSize = 0;

                     }

Braces +7 added lines, -7 removed lines

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

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

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

 }

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

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

 }

 

@@ -15,12 +15,12 @@ 
 $modx->manager->initPageViewState();

 

 // get and save search string

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

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

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

-} else {

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

-    if (!is_numeric($sqlQuery)) {

+    if (!is_numeric($sqlQuery)) {
         $sqlQuery = $modx->db->escape($query);

     }

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

@@ -143,10 +143,10 @@ 
                     $grd->colWidths = "1%,,1%,1%,1%";

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

                     $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang['click_to_context'] . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . $_lang['click_to_view_details'] . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';

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

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

                     }

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

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

                     }

                     // render grid

manager/actions/phpinfo.static.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.");
 }
 ?>

manager/actions/mutate_settings.dynamic.php

Spacing +14 added lines, -14 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 />Please use the EVO Content Manager instead of accessing this file directly.");

 }

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

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

 }

 

-include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/functions.inc.php');

+include_once(MODX_MANAGER_PATH.'actions/mutate_settings/functions.inc.php');

 

 // 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() . "'");

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

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

     $modx->webAlertAndQuit(sprintf($_lang['lock_settings_msg'], $username));

 }

@@ -18,13 +18,13 @@ 
 // reload system settings from the database.

 // this will prevent user-defined settings from being saved as system setting

 $settings = array();

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

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

     $settings[$row['setting_name']] = $row['setting_value'];

 }

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

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

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

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

 

 extract($settings, EXTR_OVERWRITE);

 

@@ -80,13 +80,13 @@ 
 				</script>

 

 				<?php

-                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab1_site_settings.inc.php');

-                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab2_furl_settings.inc.php');

-                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab3_user_settings.inc.php');

-                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab4_manager_settings.inc.php');

-                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab5_security_settings.inc.php');

-                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab6_filemanager_settings.inc.php');

-                include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab7_filebrowser_settings.inc.php');

+                include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab1_site_settings.inc.php');

+                include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab2_furl_settings.inc.php');

+                include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab3_user_settings.inc.php');

+                include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab4_manager_settings.inc.php');

+                include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab5_security_settings.inc.php');

+                include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab6_filemanager_settings.inc.php');

+                include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab7_filebrowser_settings.inc.php');

                 ?>

 			</div>

 		</div>

@@ -134,5 +134,5 @@ 
 	</script>

 <?php

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

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

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

                 }

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

                 }