View GitHub Repository evolution

Schedule Inspection
Subscribe
Completed
Pull Request — develop (#709)
by Agel_Nash
06:07
created
Status
Category
Toggle Patches
manager/includes/header.inc.php 2 patches
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch 
@@ -20,28 +20,28 @@  discard block
 
 block discarded – undo
20 20 
 $body_class = '';
21 21 
 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');
22 22 
 if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
23 
-    $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];
23 
+    $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']];
24 24 
 } elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
25 
-    $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];
25 
+    $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']];
26 26 
 }
27 27
28 
-$css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;
28 
+$css = 'media/style/'.$modx->config['manager_theme'].'/style.css?v='.$lastInstallTime;
29 29
30 30 
 if ($modx->config['manager_theme'] == 'default') {
31 
-    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')
32 
-        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
31 
+    if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')
32 
+        && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {
33 33 
         $files = array(
34 
-            'bootstrap' => MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css',
35 
-            'font-awesome' => MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css',
36 
-            'fonts' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css',
37 
-            'forms' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css',
38 
-            'mainmenu' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css',
39 
-            'tree' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css',
40 
-            'custom' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css',
41 
-            'tabpane' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css',
42 
-            'contextmenu' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css',
43 
-            'index' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css',
44 
-            'main' => MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css'
34 
+            'bootstrap' => MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css',
35 
+            'font-awesome' => MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css',
36 
+            'fonts' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css',
37 
+            'forms' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css',
38 
+            'mainmenu' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css',
39 
+            'tree' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css',
40 
+            'custom' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css',
41 
+            'tabpane' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css',
42 
+            'contextmenu' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css',
43 
+            'index' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css',
44 
+            'main' => MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css'
45 45 
         );
46 46 
         $evtOut = $modx->invokeEvent('OnBeforeMinifyCss', array(
47 47 
             'files' => $files,

@@ -58,16 +58,16 @@  discard block
 
 block discarded – undo
58 58 
             default:
59 59 
                 $modx->webAlertAndQuit(sprintf($_lang['invalid_event_response'], 'OnBeforeMinifyManagerCss'));
60 60 
         }
61 
-        require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';
61 
+        require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';
62 62 
         $minifier = new Formatter\CSSMinify($files);
63 63 
         $css = $minifier->minify();
64 64 
         file_put_contents(
65 
-            MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css',
65 
+            MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css',
66 66 
             $css
67 67 
         );
68 68 
     }
69 
-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
70 
-        $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;
69 
+    if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
70 
+        $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;
71 71 
     }
72 72 
 }
73 73 
 

@@ -82,7 +82,7 @@  discard block
 
 block discarded – undo
82 82 
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
83 83 
     <link rel="stylesheet" type="text/css" href="<?= $css ?>"/>
84 84 
     <script type="text/javascript" src="media/script/tabpane.js"></script>
85 
-    <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>
85 
+    <?= sprintf('<script type="text/javascript" src="%s"></script>'."\n", $modx->config['mgr_jquery_path']) ?>
86 86 
     <?php if ($modx->config['show_picker'] != "0") { ?>
87 87 
         <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js"
88 88 
                 type="text/javascript"></script>

@@ -95,7 +95,7 @@  discard block
 
 block discarded – undo
95 95 
     <?php } ?>
96 96
97 97 
     <!-- OnManagerMainFrameHeaderHTMLBlock -->
98 
-    <?= $onManagerMainFrameHeaderHTMLBlock . "\n" ?>
98 
+    <?= $onManagerMainFrameHeaderHTMLBlock."\n" ?>
99 99
100 100 
     <script type="text/javascript">
101 101 
       if (!evo) {

@@ -125,7 +125,7 @@  discard block
 
 block discarded – undo
125 125 
     <script>
126 126 
         <?php
127 127 
         if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
128 
-            echo 'doRefresh(' . $_REQUEST['r'] . ");\n";
128 
+            echo 'doRefresh('.$_REQUEST['r'].");\n";
129 129 
         }
130 130 
         ?>
131 131 
     </script>
Please login to merge, or discard this patch.
Braces   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2 
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />
4 4 
     Please use the EVO Content Manager instead of accessing this file directly.");
5 5 
 }

@@ -10,26 +10,26 @@  discard block
 
 block discarded – undo
10 10 
 $modx_textdir = isset($modx_textdir) ? $modx_textdir : null;
11 11 
 $onManagerMainFrameHeaderHTMLBlock = is_array($evtOut) ? implode("\n", $evtOut) : '';
12 12 
 $textdir = $modx_textdir === 'rtl' ? 'rtl' : 'ltr';
13 
-if (!isset($modx->config['mgr_jquery_path'])) {
13 
+if (!isset($modx->config['mgr_jquery_path'])) {
14 14 
     $modx->config['mgr_jquery_path'] = 'media/script/jquery/jquery.min.js';
15 15 
 }
16 
-if (!isset($modx->config['mgr_date_picker_path'])) {
16 
+if (!isset($modx->config['mgr_date_picker_path'])) {
17 17 
     $modx->config['mgr_date_picker_path'] = 'media/script/air-datepicker/datepicker.inc.php';
18 18 
 }
19 19
20 20 
 $body_class = '';
21 21 
 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');
22 
-if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
22 
+if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
23 23 
     $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];
24 
-} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
24 
+} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
25 25 
     $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];
26 26 
 }
27 27
28 28 
 $css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;
29 29
30 
-if ($modx->config['manager_theme'] == 'default') {
30 
+if ($modx->config['manager_theme'] == 'default') {
31 31 
     if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')
32 
-        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
32 
+        && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
33 33 
         $files = array(
34 34 
             'bootstrap' => MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css',
35 35 
             'font-awesome' => MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css',

@@ -48,7 +48,7 @@  discard block
 
 block discarded – undo
48 48 
             'source' => 'manager',
49 49 
             'theme' => $modx->config['manager_theme']
50 50 
         ));
51 
-        switch (true) {
51 
+        switch (true) {
52 52 
             case empty($evtOut):
53 53 
             case is_array($evtOut) && count($evtOut) === 0:
54 54 
                 break;

@@ -66,7 +66,7 @@  discard block
 
 block discarded – undo
66 66 
             $css
67 67 
         );
68 68 
     }
69 
-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
69 
+    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
70 70 
         $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;
71 71 
     }
72 72 
 }

@@ -124,7 +124,7 @@  discard block
 
 block discarded – undo
124 124 
     <script src="media/script/main.js"></script>
125 125 
     <script>
126 126 
         <?php
127 
-        if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
127 
+        if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
128 128 
             echo 'doRefresh(' . $_REQUEST['r'] . ");\n";
129 129 
         }
130 130 
         ?>
Please login to merge, or discard this patch.