Completed
Push — develop ( 351294...7e4f1d )
by Dmytro
10:56 queued 05:03
created
manager/includes/sysalert.display.inc.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -8,23 +8,23 @@
 block discarded – undo
8 8
      *
9 9
      */
10 10
 
11
-    require_once(dirname(__FILE__) . '/protect.inc.php');
11
+    require_once(dirname(__FILE__).'/protect.inc.php');
12 12
 
13 13
     $sysMsgs = "";
14 14
     $limit = count($SystemAlertMsgQueque);
15
-    for ($i=0;$i<$limit;$i++) {
16
-        $sysMsgs .= $SystemAlertMsgQueque[$i] . "<hr sys/>";
15
+    for ($i = 0; $i < $limit; $i++) {
16
+        $sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
17 17
     }
18 18
     // reset message queque
19 19
     unset($_SESSION['SystemAlertMsgQueque']);
20 20
     $_SESSION['SystemAlertMsgQueque'] = array();
21 21
     $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
22 22
 
23
-    if ($sysMsgs!="") {
23
+    if ($sysMsgs != "") {
24 24
         ?>
25 25
 
26 26
 <?php // fetch the styles
27
-    echo '<link rel="stylesheet" type="text/css" href="' . MODX_MANAGER_URL . 'media/style/' . $manager_theme . '/style.css' . '" />'; ?>
27
+    echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />'; ?>
28 28
 <script type="text/javascript">
29 29
 // <![CDATA[
30 30
 window.addEvent('domready', function() {
Please login to merge, or discard this patch.
manager/includes/template.parser.class.inc.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -21,13 +21,13 @@  discard block
 block discarded – undo
21 21
 
22 22
         $output = '';
23 23
         $action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');
24
-        $tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';
24
+        $tab = isset($config['tab']) ? ' AND tab IN('.$config['tab'].')' : '';
25 25
 
26 26
         if ($action) {
27 27
             $sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name
28
-			FROM ' . $modx->getFullTableName('system_templates') . ' AS t1
29
-			INNER JOIN ' . $modx->getFullTableName('categories') . ' AS t2 ON t2.id=t1.category
30
-			WHERE t1.action IN(' . $action . ') ' . $tab . '
28
+			FROM ' . $modx->getFullTableName('system_templates').' AS t1
29
+			INNER JOIN ' . $modx->getFullTableName('categories').' AS t2 ON t2.id=t1.category
30
+			WHERE t1.action IN(' . $action.') '.$tab.'
31 31
 			ORDER BY t1.tab ASC, t1.rank ASC');
32 32
 
33 33
             if ($modx->db->getRecordCount($sql)) {
@@ -43,17 +43,17 @@  discard block
 block discarded – undo
43 43
                 if (!empty($config['toArray'])) {
44 44
                     $output = $tabs;
45 45
                 } else {
46
-                    $output .= '<div class="tab-pane" id="pane_' . $action . '">';
46
+                    $output .= '<div class="tab-pane" id="pane_'.$action.'">';
47 47
                     $output .= '
48 48
 					<script type="text/javascript">
49
-						var pane_' . $action . ' = new WebFXTabPane(document.getElementById("pane_' . $action . '"), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
49
+						var pane_' . $action.' = new WebFXTabPane(document.getElementById("pane_'.$action.'"), '.($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');
50 50
 					</script>';
51 51
 
52 52
                     foreach ($tabs as $idTab => $tab) {
53
-                        $output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';
53
+                        $output .= '<div class="tab-page" id="tab_'.$action.'_'.$idTab.'">';
54 54
                         $output .= '
55
-						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']) . '</h2>
56
-						<script type="text/javascript">pane_' . $action . '.addTabPage(document.getElementById("tab_' . $action . '_' . $idTab . '"));</script>';
55
+						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']).'</h2>
56
+						<script type="text/javascript">pane_' . $action.'.addTabPage(document.getElementById("tab_'.$action.'_'.$idTab.'"));</script>';
57 57
                         unset($tab['category_name']);
58 58
                         foreach ($tab as $item) {
59 59
                             $output .= $item;
@@ -120,16 +120,16 @@  discard block
 block discarded – undo
120 120
                 $output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';
121 121
                 if ($data['name'] == 'country' && isset($_country_lang)) {
122 122
                     $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];
123
-                    $output .= '<option value=""' . (!isset($chosenCountry) ? ' selected' : '') . '>&nbsp;</option>';
123
+                    $output .= '<option value=""'.(!isset($chosenCountry) ? ' selected' : '').'>&nbsp;</option>';
124 124
                     foreach ($_country_lang as $key => $value) {
125
-                        $output .= '<option value="' . $key . '"' . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . '>' . $value . '</option>';
125
+                        $output .= '<option value="'.$key.'"'.(isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '').'>'.$value.'</option>';
126 126
                     }
127 127
                 } else {
128 128
                     if ($data['elements']) {
129 129
                         $elements = explode('||', $data['elements']);
130 130
                         foreach ($elements as $key => $value) {
131 131
                             $value = explode('==', $value);
132
-                            $output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';
132
+                            $output .= '<option value="'.$value[1].'">'.(isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]).'</option>';
133 133
                         }
134 134
                     }
135 135
                 }
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
                     $elements = explode('||', $data['elements']);
148 148
                     foreach ($elements as $key => $value) {
149 149
                         $value = explode('==', $value);
150
-                        $output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);
150
+                        $output .= '<br /><input type="checkbox" name="'.$value[0].'" class="form-control" id="'.$value[0].'" value="'.$value[1].'" onChange="documentDirty=true;"[+readonly+] /> '.(isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);
151 151
                     }
152 152
                 }
153 153
                 $output .= $data['content'];
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
                     $elements = explode('||', $data['elements']);
164 164
                     foreach ($elements as $key => $value) {
165 165
                         $value = explode('==', $value);
166
-                        $output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);
166
+                        $output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_'.$key.'" value="'.$value[1].'" onChange="documentDirty=true;"[+readonly+] /> '.(isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);
167 167
                     }
168 168
                 }
169 169
                 $output .= $data['content'];
Please login to merge, or discard this patch.
Braces   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -7,55 +7,55 @@  discard block
 block discarded – undo
7 7
  *
8 8
  */
9 9
 
10
-class TemplateParser
11
-{
10
+class TemplateParser
11
+{
12 12
 
13 13
     /**
14 14
      * @param array $config [action, tabs, toArray]
15 15
      * @param array $data
16 16
      * @return string
17 17
      */
18
-    public function output($config = array(), $data = array())
19
-    {
18
+    public function output($config = array(), $data = array())
19
+    {
20 20
         $modx = evolutionCMS();
21 21
 
22 22
         $output = '';
23 23
         $action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');
24 24
         $tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';
25 25
 
26
-        if ($action) {
26
+        if ($action) {
27 27
             $sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name
28 28
 			FROM ' . $modx->getFullTableName('system_templates') . ' AS t1
29 29
 			INNER JOIN ' . $modx->getFullTableName('categories') . ' AS t2 ON t2.id=t1.category
30 30
 			WHERE t1.action IN(' . $action . ') ' . $tab . '
31 31
 			ORDER BY t1.tab ASC, t1.rank ASC');
32 32
 
33
-            if ($modx->db->getRecordCount($sql)) {
33
+            if ($modx->db->getRecordCount($sql)) {
34 34
                 $tabs = array();
35
-                while ($row = $modx->db->getRow($sql)) {
36
-                    if (!$row['value'] && !empty($data[$row['name']])) {
35
+                while ($row = $modx->db->getRow($sql)) {
36
+                    if (!$row['value'] && !empty($data[$row['name']])) {
37 37
                         $row['value'] = $data[$row['name']];
38 38
                     }
39 39
                     $tabs[$row['tab']]['category_name'] = $row['category_name'];
40 40
                     $tabs[$row['tab']][$row['name']] = TemplateParser::render($row);
41 41
                 }
42 42
 
43
-                if (!empty($config['toArray'])) {
43
+                if (!empty($config['toArray'])) {
44 44
                     $output = $tabs;
45
-                } else {
45
+                } else {
46 46
                     $output .= '<div class="tab-pane" id="pane_' . $action . '">';
47 47
                     $output .= '
48 48
 					<script type="text/javascript">
49 49
 						var pane_' . $action . ' = new WebFXTabPane(document.getElementById("pane_' . $action . '"), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
50 50
 					</script>';
51 51
 
52
-                    foreach ($tabs as $idTab => $tab) {
52
+                    foreach ($tabs as $idTab => $tab) {
53 53
                         $output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';
54 54
                         $output .= '
55 55
 						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']) . '</h2>
56 56
 						<script type="text/javascript">pane_' . $action . '.addTabPage(document.getElementById("tab_' . $action . '_' . $idTab . '"));</script>';
57 57
                         unset($tab['category_name']);
58
-                        foreach ($tab as $item) {
58
+                        foreach ($tab as $item) {
59 59
                             $output .= $item;
60 60
                         }
61 61
                         $output .= '</div>';
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
      * @param array $data
73 73
      * @return string
74 74
      */
75
-    private function render($data)
76
-    {
75
+    private function render($data)
76
+    {
77 77
         $modx = evolutionCMS();
78 78
         global $_lang, $_country_lang;
79 79
 
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
         $output = '';
85 85
         $output .= '<div class="form-group row">';
86 86
 
87
-        switch ($data['type']) {
87
+        switch ($data['type']) {
88 88
 
89 89
             case 'text':
90 90
                 $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>
@@ -118,16 +118,16 @@  discard block
 block discarded – undo
118 118
                 $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';
119 119
                 $output .= '<div class="col-sm-7">';
120 120
                 $output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';
121
-                if ($data['name'] == 'country' && isset($_country_lang)) {
121
+                if ($data['name'] == 'country' && isset($_country_lang)) {
122 122
                     $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];
123 123
                     $output .= '<option value=""' . (!isset($chosenCountry) ? ' selected' : '') . '>&nbsp;</option>';
124
-                    foreach ($_country_lang as $key => $value) {
124
+                    foreach ($_country_lang as $key => $value) {
125 125
                         $output .= '<option value="' . $key . '"' . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . '>' . $value . '</option>';
126 126
                     }
127
-                } else {
128
-                    if ($data['elements']) {
127
+                } else {
128
+                    if ($data['elements']) {
129 129
                         $elements = explode('||', $data['elements']);
130
-                        foreach ($elements as $key => $value) {
130
+                        foreach ($elements as $key => $value) {
131 131
                             $value = explode('==', $value);
132 132
                             $output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';
133 133
                         }
@@ -143,9 +143,9 @@  discard block
 block discarded – undo
143 143
                 $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';
144 144
                 $output .= '<div class="col-sm-7">';
145 145
                 $output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';
146
-                if ($data['elements']) {
146
+                if ($data['elements']) {
147 147
                     $elements = explode('||', $data['elements']);
148
-                    foreach ($elements as $key => $value) {
148
+                    foreach ($elements as $key => $value) {
149 149
                         $value = explode('==', $value);
150 150
                         $output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);
151 151
                     }
@@ -159,9 +159,9 @@  discard block
 block discarded – undo
159 159
                 $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';
160 160
                 $output .= '<div class="col-sm-7">';
161 161
                 $output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';
162
-                if ($data['elements']) {
162
+                if ($data['elements']) {
163 163
                     $elements = explode('||', $data['elements']);
164
-                    foreach ($elements as $key => $value) {
164
+                    foreach ($elements as $key => $value) {
165 165
                         $value = explode('==', $value);
166 166
                         $output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);
167 167
                     }
Please login to merge, or discard this patch.
manager/includes/active_user_locks.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 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 />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5 5
 
6
-$lockElementId = (int)$lockElementId;
6
+$lockElementId = (int) $lockElementId;
7 7
 
8 8
 if ($lockElementId > 0) {
9 9
     ?>
Please login to merge, or discard this patch.
manager/includes/charsets.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 $_['macintosh']         = 'Western European (Mac) - macintosh';
66 66
 $_['Windows-1252']      = 'Western European (Windows) - Windows-1252';
67 67
 
68
-if ($modx_charset     == 'euc-jp') {
68
+if ($modx_charset == 'euc-jp') {
69 69
     $_['euc-jp']      = 'Japanese (EUC) - euc-jp';
70 70
 } elseif ($modx_charset == 'shift_jis') {
71 71
     $_['shift_jis']   = 'Japanese (Shift-JIS) - shift_jis';
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 $tpl = '<option value="%s" %s>%s</option>';
101 101
 $options = array();
102 102
 foreach ($_ as $value=>$label) {
103
-    $selected = $value===$modx_charset ? 'selected' : '';
103
+    $selected = $value === $modx_charset ? 'selected' : '';
104 104
     $options[] = sprintf($tpl, $value, $selected, $label);
105 105
 }
106 106
 echo implode("\n", $options);
Please login to merge, or discard this patch.
manager/includes/config_check.inc.php 3 patches
Switch Indentation   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -166,82 +166,82 @@
 block discarded – undo
166 166
 
167 167
     for ($i=0;$i<count($warnings);$i++) {
168 168
         switch ($warnings[$i][0]) {
169
-        case $_lang['configcheck_configinc']:
170
-            $warnings[$i][1] = $_lang['configcheck_configinc_msg'];
171
-            if (!$_SESSION["mgrConfigCheck"]) {
172
-                $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_configinc']);
173
-            }
174
-            break;
175
-        case $_lang['configcheck_installer']:
176
-            $warnings[$i][1] = $_lang['configcheck_installer_msg'];
177
-            if (!$_SESSION["mgrConfigCheck"]) {
178
-                $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_installer']);
179
-            }
180
-            break;
181
-        case $_lang['configcheck_cache']:
182
-            $warnings[$i][1] = $_lang['configcheck_cache_msg'];
183
-            if (!$_SESSION["mgrConfigCheck"]) {
184
-                $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_cache']);
185
-            }
186
-            break;
187
-        case $_lang['configcheck_images']:
188
-            $warnings[$i][1] = $_lang['configcheck_images_msg'];
189
-            if (!$_SESSION["mgrConfigCheck"]) {
190
-                $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_images']);
191
-            }
192
-            break;
193
-        case $_lang['configcheck_sysfiles_mod']:
194
-            $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
195
-            $warnings[$i][2] = '<ul><li>' . implode('</li><li>', $sysfiles_check) . '</li></ul>';
196
-            if ($modx->hasPermission('settings')) {
197
-                $warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
198
-            }
199
-            if (!$_SESSION["mgrConfigCheck"]) {
200
-                $modx->logEvent(0, 3, $warnings[$i][1] . " " . implode(', ', $sysfiles_check), $_lang['configcheck_sysfiles_mod']);
201
-            }
202
-            break;
203
-        case $_lang['configcheck_lang_difference']:
204
-            $warnings[$i][1] = $_lang['configcheck_lang_difference_msg'];
205
-            break;
206
-        case $_lang['configcheck_php_gdzip']:
207
-            $warnings[$i][1] = $_lang['configcheck_php_gdzip_msg'];
208
-            break;
209
-        case $_lang['configcheck_unauthorizedpage_unpublished']:
210
-            $warnings[$i][1] = $_lang['configcheck_unauthorizedpage_unpublished_msg'];
211
-            break;
212
-        case $_lang['configcheck_errorpage_unpublished']:
213
-            $warnings[$i][1] = $_lang['configcheck_errorpage_unpublished_msg'];
214
-            break;
215
-        case $_lang['configcheck_unauthorizedpage_unavailable']:
216
-            $warnings[$i][1] = $_lang['configcheck_unauthorizedpage_unavailable_msg'];
217
-            break;
218
-        case $_lang['configcheck_errorpage_unavailable']:
219
-            $warnings[$i][1] = $_lang['configcheck_errorpage_unavailable_msg'];
220
-            break;
221
-        case $_lang['configcheck_validate_referer']:
222
-            $msg = $_lang['configcheck_validate_referer_msg'];
223
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
224
-            $warnings[$i][1] = "<span id=\"validate_referer_warning_wrapper\">{$msg}</span>\n";
225
-            break;
226
-        case $_lang['configcheck_templateswitcher_present']:
227
-            $msg = $_lang["configcheck_templateswitcher_present_msg"];
228
-            if (isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
229
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_disable"];
230
-            }
231
-            if (isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
232
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_delete"];
233
-            }
234
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
235
-            $warnings[$i][1] = "<span id=\"templateswitcher_present_warning_wrapper\">{$msg}</span>\n";
236
-            break;
237
-        case $_lang['configcheck_rb_base_dir']:
238
-            $warnings[$i][1] = $_lang['configcheck_rb_base_dir_msg'];
239
-            break;
240
-        case $_lang['configcheck_filemanager_path']:
241
-            $warnings[$i][1] = $_lang['configcheck_filemanager_path_msg'];
242
-            break;
243
-        default:
244
-            $warnings[$i][1] = $_lang['configcheck_default_msg'];
169
+            case $_lang['configcheck_configinc']:
170
+                $warnings[$i][1] = $_lang['configcheck_configinc_msg'];
171
+                if (!$_SESSION["mgrConfigCheck"]) {
172
+                    $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_configinc']);
173
+                }
174
+                break;
175
+            case $_lang['configcheck_installer']:
176
+                $warnings[$i][1] = $_lang['configcheck_installer_msg'];
177
+                if (!$_SESSION["mgrConfigCheck"]) {
178
+                    $modx->logEvent(0, 3, $warnings[$i][1], $_lang['configcheck_installer']);
179
+                }
180
+                break;
181
+            case $_lang['configcheck_cache']:
182
+                $warnings[$i][1] = $_lang['configcheck_cache_msg'];
183
+                if (!$_SESSION["mgrConfigCheck"]) {
184
+                    $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_cache']);
185
+                }
186
+                break;
187
+            case $_lang['configcheck_images']:
188
+                $warnings[$i][1] = $_lang['configcheck_images_msg'];
189
+                if (!$_SESSION["mgrConfigCheck"]) {
190
+                    $modx->logEvent(0, 2, $warnings[$i][1], $_lang['configcheck_images']);
191
+                }
192
+                break;
193
+            case $_lang['configcheck_sysfiles_mod']:
194
+                $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
195
+                $warnings[$i][2] = '<ul><li>' . implode('</li><li>', $sysfiles_check) . '</li></ul>';
196
+                if ($modx->hasPermission('settings')) {
197
+                    $warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
198
+                }
199
+                if (!$_SESSION["mgrConfigCheck"]) {
200
+                    $modx->logEvent(0, 3, $warnings[$i][1] . " " . implode(', ', $sysfiles_check), $_lang['configcheck_sysfiles_mod']);
201
+                }
202
+                break;
203
+            case $_lang['configcheck_lang_difference']:
204
+                $warnings[$i][1] = $_lang['configcheck_lang_difference_msg'];
205
+                break;
206
+            case $_lang['configcheck_php_gdzip']:
207
+                $warnings[$i][1] = $_lang['configcheck_php_gdzip_msg'];
208
+                break;
209
+            case $_lang['configcheck_unauthorizedpage_unpublished']:
210
+                $warnings[$i][1] = $_lang['configcheck_unauthorizedpage_unpublished_msg'];
211
+                break;
212
+            case $_lang['configcheck_errorpage_unpublished']:
213
+                $warnings[$i][1] = $_lang['configcheck_errorpage_unpublished_msg'];
214
+                break;
215
+            case $_lang['configcheck_unauthorizedpage_unavailable']:
216
+                $warnings[$i][1] = $_lang['configcheck_unauthorizedpage_unavailable_msg'];
217
+                break;
218
+            case $_lang['configcheck_errorpage_unavailable']:
219
+                $warnings[$i][1] = $_lang['configcheck_errorpage_unavailable_msg'];
220
+                break;
221
+            case $_lang['configcheck_validate_referer']:
222
+                $msg = $_lang['configcheck_validate_referer_msg'];
223
+                $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
224
+                $warnings[$i][1] = "<span id=\"validate_referer_warning_wrapper\">{$msg}</span>\n";
225
+                break;
226
+            case $_lang['configcheck_templateswitcher_present']:
227
+                $msg = $_lang["configcheck_templateswitcher_present_msg"];
228
+                if (isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
229
+                    $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_disable"];
230
+                }
231
+                if (isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
232
+                    $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_delete"];
233
+                }
234
+                $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
235
+                $warnings[$i][1] = "<span id=\"templateswitcher_present_warning_wrapper\">{$msg}</span>\n";
236
+                break;
237
+            case $_lang['configcheck_rb_base_dir']:
238
+                $warnings[$i][1] = $_lang['configcheck_rb_base_dir_msg'];
239
+                break;
240
+            case $_lang['configcheck_filemanager_path']:
241
+                $warnings[$i][1] = $_lang['configcheck_filemanager_path_msg'];
242
+                break;
243
+            default:
244
+                $warnings[$i][1] = $_lang['configcheck_default_msg'];
245 245
     }
246 246
 
247 247
         $admin_warning = $_SESSION['mgrRole']!=1 ? $_lang['configcheck_admin'] : "" ;
Please login to merge, or discard this patch.
Spacing   +28 added lines, -28 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 />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5 5
 
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 $warningspresent = 0;
20 20
 
21 21
 $sysfiles_check = $modx->manager->checkSystemChecksum();
22
-if ($sysfiles_check!=='0') {
22
+if ($sysfiles_check !== '0') {
23 23
     $warningspresent = 1;
24 24
     $warnings[] = array($_lang['configcheck_sysfiles_mod']);
25 25
 }
@@ -123,34 +123,34 @@  discard block
 block discarded – undo
123 123
     function checkSiteCache()
124 124
     {
125 125
         $modx = evolutionCMS();
126
-        $checked= true;
127
-        if (file_exists($modx->config['base_path'] . 'assets/cache/siteCache.idx.php')) {
128
-            $checked= @include_once($modx->config['base_path'] . 'assets/cache/siteCache.idx.php');
126
+        $checked = true;
127
+        if (file_exists($modx->config['base_path'].'assets/cache/siteCache.idx.php')) {
128
+            $checked = @include_once($modx->config['base_path'].'assets/cache/siteCache.idx.php');
129 129
         }
130 130
         return $checked;
131 131
     }
132 132
 }
133 133
 
134
-if (!is_writable(MODX_BASE_PATH . "assets/cache/")) {
134
+if (!is_writable(MODX_BASE_PATH."assets/cache/")) {
135 135
     $warningspresent = 1;
136 136
     $warnings[] = array($_lang['configcheck_cache']);
137 137
 }
138 138
 
139 139
 if (!checkSiteCache()) {
140 140
     $warningspresent = 1;
141
-    $warnings[]= array($lang['configcheck_sitecache_integrity']);
141
+    $warnings[] = array($lang['configcheck_sitecache_integrity']);
142 142
 }
143 143
 
144
-if (!is_writable(MODX_BASE_PATH . "assets/images/")) {
144
+if (!is_writable(MODX_BASE_PATH."assets/images/")) {
145 145
     $warningspresent = 1;
146 146
     $warnings[] = array($_lang['configcheck_images']);
147 147
 }
148 148
 
149
-if (strpos($modx->config['rb_base_dir'], MODX_BASE_PATH)!==0) {
149
+if (strpos($modx->config['rb_base_dir'], MODX_BASE_PATH) !== 0) {
150 150
     $warningspresent = 1;
151 151
     $warnings[] = array($_lang['configcheck_rb_base_dir']);
152 152
 }
153
-if (strpos($modx->config['filemanager_path'], MODX_BASE_PATH)!==0) {
153
+if (strpos($modx->config['filemanager_path'], MODX_BASE_PATH) !== 0) {
154 154
     $warningspresent = 1;
155 155
     $warnings[] = array($_lang['configcheck_filemanager_path']);
156 156
 }
@@ -158,13 +158,13 @@  discard block
 block discarded – undo
158 158
 // clear file info cache
159 159
 clearstatcache();
160 160
 
161
-if ($warningspresent==1) {
161
+if ($warningspresent == 1) {
162 162
     if (!isset($modx->config['send_errormail'])) {
163
-        $modx->config['send_errormail']='3';
163
+        $modx->config['send_errormail'] = '3';
164 164
     }
165
-    $config_check_results = "<h3>" . $_lang['configcheck_notok'] . "</h3>";
165
+    $config_check_results = "<h3>".$_lang['configcheck_notok']."</h3>";
166 166
 
167
-    for ($i=0;$i<count($warnings);$i++) {
167
+    for ($i = 0; $i < count($warnings); $i++) {
168 168
         switch ($warnings[$i][0]) {
169 169
         case $_lang['configcheck_configinc']:
170 170
             $warnings[$i][1] = $_lang['configcheck_configinc_msg'];
@@ -192,12 +192,12 @@  discard block
 block discarded – undo
192 192
             break;
193 193
         case $_lang['configcheck_sysfiles_mod']:
194 194
             $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
195
-            $warnings[$i][2] = '<ul><li>' . implode('</li><li>', $sysfiles_check) . '</li></ul>';
195
+            $warnings[$i][2] = '<ul><li>'.implode('</li><li>', $sysfiles_check).'</li></ul>';
196 196
             if ($modx->hasPermission('settings')) {
197
-                $warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
197
+                $warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\''.$_lang["reset_sysfiles_checksum_alert"].'\')">'.$_lang["reset_sysfiles_checksum_button"].'</a></li></ul>';
198 198
             }
199 199
             if (!$_SESSION["mgrConfigCheck"]) {
200
-                $modx->logEvent(0, 3, $warnings[$i][1] . " " . implode(', ', $sysfiles_check), $_lang['configcheck_sysfiles_mod']);
200
+                $modx->logEvent(0, 3, $warnings[$i][1]." ".implode(', ', $sysfiles_check), $_lang['configcheck_sysfiles_mod']);
201 201
             }
202 202
             break;
203 203
         case $_lang['configcheck_lang_difference']:
@@ -220,18 +220,18 @@  discard block
 block discarded – undo
220 220
             break;
221 221
         case $_lang['configcheck_validate_referer']:
222 222
             $msg = $_lang['configcheck_validate_referer_msg'];
223
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
223
+            $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'validate_referer');
224 224
             $warnings[$i][1] = "<span id=\"validate_referer_warning_wrapper\">{$msg}</span>\n";
225 225
             break;
226 226
         case $_lang['configcheck_templateswitcher_present']:
227 227
             $msg = $_lang["configcheck_templateswitcher_present_msg"];
228 228
             if (isset($_SESSION['mgrPermissions']['save_plugin']) && $_SESSION['mgrPermissions']['save_plugin'] == '1') {
229
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_disable"];
229
+                $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_disable"];
230 230
             }
231 231
             if (isset($_SESSION['mgrPermissions']['delete_plugin']) && $_SESSION['mgrPermissions']['delete_plugin'] == '1') {
232
-                $msg .= '<br />' . $_lang["configcheck_templateswitcher_present_delete"];
232
+                $msg .= '<br />'.$_lang["configcheck_templateswitcher_present_delete"];
233 233
             }
234
-            $msg .= '<br />' . sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
234
+            $msg .= '<br />'.sprintf($_lang["configcheck_hide_warning"], 'templateswitcher_present');
235 235
             $warnings[$i][1] = "<span id=\"templateswitcher_present_warning_wrapper\">{$msg}</span>\n";
236 236
             break;
237 237
         case $_lang['configcheck_rb_base_dir']:
@@ -244,20 +244,20 @@  discard block
 block discarded – undo
244 244
             $warnings[$i][1] = $_lang['configcheck_default_msg'];
245 245
     }
246 246
 
247
-        $admin_warning = $_SESSION['mgrRole']!=1 ? $_lang['configcheck_admin'] : "" ;
247
+        $admin_warning = $_SESSION['mgrRole'] != 1 ? $_lang['configcheck_admin'] : "";
248 248
         $config_check_results .= "
249 249
             <fieldset>
250
-            <p><strong>" . $_lang['configcheck_warning'] . "</strong> '" . $warnings[$i][0] . "'</p>
251
-            <p style=\"padding-left:1em\"><em>" . $_lang['configcheck_what'] . "</em><br />
252
-            " . $warnings[$i][1] . " " . $admin_warning . "</p>
253
-            " . (isset($warnings[$i][2]) ? '<div style="padding-left:1em">' . $warnings[$i][2] . '</div>' : '') . "
250
+            <p><strong>" . $_lang['configcheck_warning']."</strong> '".$warnings[$i][0]."'</p>
251
+            <p style=\"padding-left:1em\"><em>" . $_lang['configcheck_what']."</em><br />
252
+            " . $warnings[$i][1]." ".$admin_warning."</p>
253
+            " . (isset($warnings[$i][2]) ? '<div style="padding-left:1em">'.$warnings[$i][2].'</div>' : '')."
254 254
             </fieldset>
255 255
 ";
256
-        if ($i!=count($warnings)-1) {
256
+        if ($i != count($warnings) - 1) {
257 257
             $config_check_results .= "<br />";
258 258
         }
259 259
     }
260
-    $_SESSION["mgrConfigCheck"]=true;
260
+    $_SESSION["mgrConfigCheck"] = true;
261 261
 } else {
262 262
     $config_check_results = $_lang['configcheck_ok'];
263 263
 }
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 }
91 91
 </script>
92 92
 
93
-JS;
93
+js;
94 94
             $modx->regClientScript($script);
95 95
         }
96 96
     }
Please login to merge, or discard this patch.
manager/includes/extenders/modifiers/mdf_summary.inc.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -2,23 +2,23 @@  discard block
 block discarded – undo
2 2
 if (strpos($opt, ',')) {
3 3
     list($limit, $delim) = explode(',', $opt);
4 4
 } elseif (preg_match('/^[1-9][0-9]*$/', $opt)) {
5
-    $limit=$opt;
6
-    $delim='';
5
+    $limit = $opt;
6
+    $delim = '';
7 7
 } else {
8
-    $limit=124;
9
-    $delim='';
8
+    $limit = 124;
9
+    $delim = '';
10 10
 }
11 11
 
12
-if ($delim==='') {
13
-    $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
12
+if ($delim === '') {
13
+    $delim = $modx->config['manager_language'] === 'japanese-utf8' ? '。' : '.';
14 14
 }
15
-$limit = (int)$limit;
15
+$limit = (int) $limit;
16 16
 
17 17
 $content = $modx->filter->parseDocumentSource($value);
18 18
 
19 19
 $content = strip_tags($content);
20 20
 
21
-$content = str_replace(array("\r\n","\r","\n","\t",'&nbsp;'), ' ', $content);
21
+$content = str_replace(array("\r\n", "\r", "\n", "\t", '&nbsp;'), ' ', $content);
22 22
 if (preg_match('/\s+/', $content)) {
23 23
     $content = preg_replace('/\s+/', ' ', $content);
24 24
 }
@@ -26,30 +26,30 @@  discard block
 block discarded – undo
26 26
 
27 27
 $pos = $modx->filter->strpos($content, $delim);
28 28
 
29
-if ($pos!==false && $pos<$limit) {
29
+if ($pos !== false && $pos < $limit) {
30 30
     $_ = explode($delim, $content);
31 31
     $text = '';
32 32
     foreach ($_ as $v) {
33
-        if ($limit <= $modx->filter->strlen($text . $v . $delim)) {
33
+        if ($limit <= $modx->filter->strlen($text.$v.$delim)) {
34 34
             break;
35 35
         }
36
-        $text .= $v . $delim;
36
+        $text .= $v.$delim;
37 37
     }
38 38
     if ($text) {
39 39
         $content = $text;
40 40
     }
41 41
 }
42 42
 
43
-if ($limit<$modx->filter->strlen($content) && strpos($content, ' ')!==false) {
43
+if ($limit < $modx->filter->strlen($content) && strpos($content, ' ') !== false) {
44 44
     $_ = explode(' ', $content);
45 45
     $text = '';
46 46
     foreach ($_ as $v) {
47
-        if ($limit <= $modx->filter->strlen($text . $v . ' ')) {
47
+        if ($limit <= $modx->filter->strlen($text.$v.' ')) {
48 48
             break;
49 49
         }
50
-        $text .= $v . ' ';
50
+        $text .= $v.' ';
51 51
     }
52
-    if ($text!=='') {
52
+    if ($text !== '') {
53 53
         $content = $text;
54 54
     }
55 55
 }
@@ -57,8 +57,8 @@  discard block
 block discarded – undo
57 57
 if ($limit < $modx->filter->strlen($content)) {
58 58
     $content = $modx->filter->substr($content, 0, $limit);
59 59
 }
60
-if ($modx->filter->substr($content, -1)==$delim) {
61
-    $content = rtrim($content, $delim) . $delim;
60
+if ($modx->filter->substr($content, -1) == $delim) {
61
+    $content = rtrim($content, $delim).$delim;
62 62
 }
63 63
 
64 64
 return $content;
Please login to merge, or discard this patch.
manager/includes/extenders/modifiers/mdf_getimage.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 $pattern = '/<img[\s\n]+.*src=[\s\n]*"([^"]+\.(jpg|jpeg|png|gif))"[^>]+>/i';
3 3
 preg_match_all($pattern, $value, $images);
4
-if ($opt==='') {
4
+if ($opt === '') {
5 5
     if ($images[1][0]) {
6 6
         return $images[1][0];
7 7
     } else {
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
     }
10 10
 } else {
11 11
     foreach ($images[0] as $i=>$image) {
12
-        if (strpos($image, $opt)!==false) {
12
+        if (strpos($image, $opt) !== false) {
13 13
             return $images[1][$i];
14 14
         }
15 15
     }
Please login to merge, or discard this patch.
manager/includes/extenders/modifiers/mdf_addbreak.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 $text = $modx->filter->parseDocumentSource($value);
3
-$text = str_replace(array("\r\n","\r"), "\n", $text);
3
+$text = str_replace(array("\r\n", "\r"), "\n", $text);
4 4
 
5 5
 $blockElms  = 'br,table,tbody,tr,td,th,thead,tfoot,caption,colgroup,div';
6 6
 $blockElms .= ',dl,dd,dt,ul,ol,li,pre,select,option,form,map,area,blockquote';
@@ -11,11 +11,11 @@  discard block
 block discarded – undo
11 11
 $c = count($lines);
12 12
 foreach ($lines as $i=>$line) {
13 13
     $line = rtrim($line);
14
-    if ($i===$c-1) {
14
+    if ($i === $c - 1) {
15 15
         break;
16 16
     }
17 17
     foreach ($blockElms as $block) {
18
-        if (preg_match("@</?{$block}" . '[^>]*>$@', $line)) {
18
+        if (preg_match("@</?{$block}".'[^>]*>$@', $line)) {
19 19
             continue 2;
20 20
         }
21 21
     }
Please login to merge, or discard this patch.
manager/includes/extenders/modifiers/mdf_memberof.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 $userID = abs($modx->getLoginUserID('web'));
3
-$modx->qs_hash = md5($modx->qs_hash . "^{$userID}^");
3
+$modx->qs_hash = md5($modx->qs_hash."^{$userID}^");
4 4
 
5 5
 $groupNames = ($this->strlen($opt) > 0) ? explode(',', $opt) : array();
6 6
 
Please login to merge, or discard this patch.