Completed
Push — develop ( 663a1f...4a4b5c )
by Agel_Nash
15s
created
manager/media/browser/mcpuk/lib/helper_text.php 1 patch
Braces   +15 added lines, -8 removed lines patch added patch discarded remove patch
@@ -12,13 +12,15 @@  discard block
 block discarded – undo
12 12
   *      @link http://kcfinder.sunhater.com
13 13
   */
14 14
 
15
-class text {
15
+class text
16
+{
16 17
 
17 18
   /** Replace repeated white spaces to single space
18 19
     * @param string $string
19 20
     * @return string */
20 21
 
21
-    static function clearWhitespaces($string) {
22
+    static function clearWhitespaces($string)
23
+    {
22 24
         return trim(preg_replace('/\s+/s', " ", $string));
23 25
     }
24 26
 
@@ -26,7 +28,8 @@  discard block
 block discarded – undo
26 28
     * @param string $string
27 29
     * @return string */
28 30
 
29
-    static function htmlValue($string) {
31
+    static function htmlValue($string)
32
+    {
30 33
         return
31 34
             str_replace('"', """,
32 35
             str_replace("'", ''',
@@ -39,7 +42,8 @@  discard block
 block discarded – undo
39 42
     * @param string $string
40 43
     * @return string */
41 44
 
42
-    static function jsValue($string) {
45
+    static function jsValue($string)
46
+    {
43 47
         return
44 48
             preg_replace('/\r?\n/', "\\n",
45 49
             str_replace('"', "\\\"",
@@ -52,10 +56,12 @@  discard block
 block discarded – undo
52 56
     * @param string $string
53 57
     * @param bool $cdata */
54 58
 
55
-    static function xmlData($string, $cdata=false) {
59
+    static function xmlData($string, $cdata=false)
60
+    {
56 61
         $string = str_replace("]]>", "]]]]><![CDATA[>", $string);
57
-        if (!$cdata)
58
-            $string = "<![CDATA[$string]]>";
62
+        if (!$cdata) {
63
+                    $string = "<![CDATA[$string]]>";
64
+        }
59 65
         return $string;
60 66
     }
61 67
 
@@ -63,7 +69,8 @@  discard block
 block discarded – undo
63 69
     * @param string $code
64 70
     * @return string */
65 71
 
66
-    static function compressCSS($code) {
72
+    static function compressCSS($code)
73
+    {
67 74
         $code = self::clearWhitespaces($code);
68 75
         $code = preg_replace('/ ?\{ ?/', "{", $code);
69 76
         $code = preg_replace('/ ?\} ?/', "}", $code);
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lib/class_zipFolder.php 1 patch
Braces   +17 added lines, -11 removed lines patch added patch discarded remove patch
@@ -13,20 +13,23 @@  discard block
 block discarded – undo
13 13
   *      @link http://kcfinder.sunhater.com
14 14
   */
15 15
 
16
-class zipFolder {
16
+class zipFolder
17
+{
17 18
     protected $zip;
18 19
     protected $root;
19 20
     protected $ignored;
20 21
 
21
-    function __construct($file, $folder, $ignored=null) {
22
+    function __construct($file, $folder, $ignored=null)
23
+    {
22 24
         $this->zip = new ZipArchive();
23 25
 
24 26
         $this->ignored = is_array($ignored)
25 27
             ? $ignored
26 28
             : ($ignored ? array($ignored) : array());
27 29
 
28
-        if ($this->zip->open($file, ZIPARCHIVE::CREATE) !== TRUE)
29
-            throw new Exception("cannot open <$file>\n");
30
+        if ($this->zip->open($file, ZIPARCHIVE::CREATE) !== TRUE) {
31
+                    throw new Exception("cannot open <$file>\n");
32
+        }
30 33
 
31 34
         $folder = rtrim($folder, '/');
32 35
 
@@ -39,19 +42,22 @@  discard block
 block discarded – undo
39 42
         $this->zip->close();
40 43
     }
41 44
 
42
-    function zip($folder, $parent=null) {
45
+    function zip($folder, $parent=null)
46
+    {
43 47
         $full_path = "{$this->root}$parent$folder";
44 48
         $zip_path = "$parent$folder";
45 49
         $this->zip->addEmptyDir($zip_path);
46 50
         $dir = new DirectoryIterator($full_path);
47
-        foreach ($dir as $file)
48
-            if (!$file->isDot()) {
51
+        foreach ($dir as $file) {
52
+                    if (!$file->isDot()) {
49 53
                 $filename = $file->getFilename();
54
+        }
50 55
                 if (!in_array($filename, $this->ignored)) {
51
-                    if ($file->isDir())
52
-                        $this->zip($filename, "$zip_path/");
53
-                    else
54
-                        $this->zip->addFile("$full_path/$filename", "$zip_path/$filename");
56
+                    if ($file->isDir()) {
57
+                                            $this->zip($filename, "$zip_path/");
58
+                    } else {
59
+                                            $this->zip->addFile("$full_path/$filename", "$zip_path/$filename");
60
+                    }
55 61
                 }
56 62
             }
57 63
     }
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/browse.php 1 patch
Braces   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,14 +14,19 @@
 block discarded – undo
14 14
 
15 15
 require "core/autoload.php"; // Init MODX
16 16
 
17
-function returnNoPermissionsMessage($role) {
17
+function returnNoPermissionsMessage($role)
18
+{
18 19
 	global $_lang;
19 20
 	echo sprintf($_lang['files_management_no_permission'], $role);
20 21
 	exit;
21 22
 }
22 23
 
23
-if( $_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');
24
-if( $_GET['type'] == 'files'  && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_files'))  returnNoPermissionsMessage('assets_files');
24
+if( $_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) {
25
+    returnNoPermissionsMessage('assets_images');
26
+}
27
+if( $_GET['type'] == 'files'  && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_files')) {
28
+    returnNoPermissionsMessage('assets_files');
29
+}
25 30
 
26 31
 $browser = new browser($modx);
27 32
 $browser->action();
Please login to merge, or discard this patch.
manager/media/script/air-datepicker/datepicker.inc.php 1 patch
Braces   +22 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,24 +1,37 @@
 block discarded – undo
1 1
 <?php
2
-class DATEPICKER {
3
-    function __construct() {
2
+class DATEPICKER
3
+{
4
+    function __construct()
5
+    {
4 6
     }
5
-    function getDP() {
7
+    function getDP()
8
+    {
6 9
         global $modx;
7 10
         
8 11
         $load_script = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
9
-        if(!isset($modx->config['lang_code'])) $modx->config['lang_code'] = $this->getLangCode();
12
+        if(!isset($modx->config['lang_code'])) {
13
+            $modx->config['lang_code'] = $this->getLangCode();
14
+        }
10 15
 		$modx->config['datetime_format_lc'] = isset($modx->config['datetime_format']) ? strtolower($modx->config['datetime_format']) : 'dd-mm-yyyy';
11 16
         return $modx->mergeSettingsContent($load_script);
12 17
     }
13
-    function getLangCode() {
18
+    function getLangCode()
19
+    {
14 20
         global $modx, $modx_lang_attribute;
15 21
         
16
-        if(!$modx_lang_attribute) return 'en';
22
+        if(!$modx_lang_attribute) {
23
+            return 'en';
24
+        }
17 25
         
18 26
         $lc = $modx_lang_attribute;
19
-        if($lc=='uk') return 'ru';
27
+        if($lc=='uk') {
28
+            return 'ru';
29
+        }
20 30
         $dp_path = str_replace('\\','/',dirname(__FILE__));
21
-        if(is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) return $modx_lang_attribute;
22
-        else                                               return 'en';
31
+        if(is_file("{$dp_path}/i18n/datepicker.{$lc}.js")) {
32
+            return $modx_lang_attribute;
33
+        } else {
34
+            return 'en';
35
+        }
23 36
     }
24 37
 }
Please login to merge, or discard this patch.
manager/media/style/default/welcome.php 1 patch
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -3,9 +3,11 @@
 block discarded – undo
3 3
 
4 4
 $modx->addSnippet('hasPermission','return $modx->hasPermission($key);');
5 5
 
6
-if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags'))
7
-    $hasAnyPermission = 1;
8
-else $hasAnyPermission = 0;
6
+if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
7
+    $hasAnyPermission = 1;
8
+} else {
9
+    $hasAnyPermission = 0;
10
+}
9 11
 $modx->addSnippet('hasAnyPermission','global $hasAnyPermission; return $hasAnyPermission;');
10 12
 $modx->addSnippet('getLoginUserName','return $modx->getLoginUserName();');
11 13
 $code = 'global $_lang;return $_SESSION["nrtotalmessages"] ? sprintf($_lang["welcome_messages"], $_SESSION["nrtotalmessages"], \'<span style="color:red;">\' . $_SESSION["nrnewmessages"] . "</span>") : $_lang["messages_no_messages"];';
Please login to merge, or discard this patch.
manager/media/style/default/ajax.php 1 patch
Braces   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -7,11 +7,11 @@  discard block
 block discarded – undo
7 7
 
8 8
 $modx->db->connect();
9 9
 
10
-if (empty ($modx->config)) {
10
+if (empty ($modx->config)) {
11 11
     $modx->getSettings();
12 12
 }
13 13
 
14
-if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {
14
+if (!isset($_SESSION['mgrValidated']) || !isset($_SERVER['HTTP_X_REQUESTED_WITH']) || (strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest') || ($_SERVER['REQUEST_METHOD'] != 'POST')) {
15 15
     $modx->sendErrorPage();
16 16
 }
17 17
 
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 $_lang = array();
22 22
 include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php';
23
-if ($modx->config['manager_language'] != 'english') {
23
+if ($modx->config['manager_language'] != 'english') {
24 24
     include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php';
25 25
 }
26 26
 include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php';
@@ -33,12 +33,12 @@  discard block
 block discarded – undo
33 33
 // set limit sql query
34 34
 $limit = !empty($modx->config['number_of_results']) ? (int) $modx->config['number_of_results'] : 100;
35 35
 
36
-if (isset($action)) {
37
-    switch ($action) {
36
+if (isset($action)) {
37
+    switch ($action) {
38 38
 
39 39
         case '1': {
40 40
 
41
-            switch ($frame) {
41
+            switch ($frame) {
42 42
                 case 'nodes':
43 43
                     include_once MODX_MANAGER_PATH . '/frames/nodes.php';
44 44
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 
53 53
             $elements = isset($_REQUEST['elements']) && is_scalar($_REQUEST['elements']) ? htmlentities($_REQUEST['elements']) : '';
54 54
 
55
-            if ($elements) {
55
+            if ($elements) {
56 56
                 $output = '';
57 57
                 $items = '';
58 58
                 $sql = '';
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
                 $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->db->escape($filter) . '%"' : '';
62 62
                 $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;
63 63
 
64
-                switch ($elements) {
64
+                switch ($elements) {
65 65
                     case 'element_templates':
66 66
                         $a = 16;
67 67
                         $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->db->escape($filter) . '%"' : '';
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
                         ORDER BY t1.templatename ASC
72 72
                         ' . $sqlLimit);
73 73
 
74
-                        if ($modx->hasPermission('new_template')) {
74
+                        if ($modx->hasPermission('new_template')) {
75 75
                             $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>';
76 76
                         }
77 77
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
                         ORDER BY t1.name ASC
88 88
                         ' . $sqlLimit);
89 89
 
90
-                        if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
90
+                        if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
91 91
                             $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>';
92 92
                         }
93 93
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
                         ORDER BY t1.name ASC
102 102
                         ' . $sqlLimit);
103 103
 
104
-                        if ($modx->hasPermission('new_chunk')) {
104
+                        if ($modx->hasPermission('new_chunk')) {
105 105
                             $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>';
106 106
                         }
107 107
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
                         ORDER BY t1.name ASC
116 116
                         ' . $sqlLimit);
117 117
 
118
-                        if ($modx->hasPermission('new_snippet')) {
118
+                        if ($modx->hasPermission('new_snippet')) {
119 119
                             $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>';
120 120
                         }
121 121
 
@@ -129,19 +129,19 @@  discard block
 block discarded – undo
129 129
                         ORDER BY t1.name ASC
130 130
                         ' . $sqlLimit);
131 131
 
132
-                        if ($modx->hasPermission('new_plugin')) {
132
+                        if ($modx->hasPermission('new_plugin')) {
133 133
                             $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>';
134 134
                         }
135 135
 
136 136
                         break;
137 137
                 }
138 138
 
139
-                if ($count = $modx->db->getRecordCount($sql)) {
140
-                    if ($count == $limit) {
139
+                if ($count = $modx->db->getRecordCount($sql)) {
140
+                    if ($count == $limit) {
141 141
                         $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';
142 142
                     }
143
-                    while ($row = $modx->db->getRow($sql)) {
144
-                        if (($row['disabled'] || $row['locked']) && $role != 1) {
143
+                    while ($row = $modx->db->getRow($sql)) {
144
+                        if (($row['disabled'] || $row['locked']) && $role != 1) {
145 145
                             continue;
146 146
                         }
147 147
 
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
149 149
                     }
150 150
                 }
151 151
 
152
-                if (isset($_REQUEST['filter'])) {
152
+                if (isset($_REQUEST['filter'])) {
153 153
                     $output = $items;
154
-                } else {
154
+                } else {
155 155
                     $output .= $items;
156 156
                 }
157 157
 
@@ -176,22 +176,22 @@  discard block
 block discarded – undo
176 176
 				ORDER BY t1.username ASC
177 177
 				' . $sqlLimit);
178 178
 
179
-            if ($modx->hasPermission('new_user')) {
179
+            if ($modx->hasPermission('new_user')) {
180 180
                 $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>';
181 181
             }
182 182
 
183
-            if ($count = $modx->db->getRecordCount($sql)) {
184
-                if ($count == $limit) {
183
+            if ($count = $modx->db->getRecordCount($sql)) {
184
+                if ($count == $limit) {
185 185
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';
186 186
                 }
187
-                while ($row = $modx->db->getRow($sql)) {
187
+                while ($row = $modx->db->getRow($sql)) {
188 188
                     $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
189 189
                 }
190 190
             }
191 191
 
192
-            if (isset($_REQUEST['filter'])) {
192
+            if (isset($_REQUEST['filter'])) {
193 193
                 $output = $items;
194
-            } else {
194
+            } else {
195 195
                 $output .= $items;
196 196
             }
197 197
 
@@ -215,22 +215,22 @@  discard block
 block discarded – undo
215 215
 				ORDER BY t1.username ASC
216 216
 				' . $sqlLimit);
217 217
 
218
-            if ($modx->hasPermission('new_web_user')) {
218
+            if ($modx->hasPermission('new_web_user')) {
219 219
                 $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>';
220 220
             }
221 221
 
222
-            if ($count = $modx->db->getRecordCount($sql)) {
223
-                if ($count == $limit) {
222
+            if ($count = $modx->db->getRecordCount($sql)) {
223
+                if ($count == $limit) {
224 224
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';
225 225
                 }
226
-                while ($row = $modx->db->getRow($sql)) {
226
+                while ($row = $modx->db->getRow($sql)) {
227 227
                     $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
228 228
                 }
229 229
             }
230 230
 
231
-            if (isset($_REQUEST['filter'])) {
231
+            if (isset($_REQUEST['filter'])) {
232 232
                 $output = $items;
233
-            } else {
233
+            } else {
234 234
                 $output .= $items;
235 235
             }
236 236
 
@@ -244,8 +244,8 @@  discard block
 block discarded – undo
244 244
             $type = isset($_REQUEST['type']) && is_scalar($_REQUEST['type']) ? $modx->db->escape($_REQUEST['type']) : false;
245 245
             $contextmenu = '';
246 246
 
247
-            if ($role && $name && $type) {
248
-                switch ($type) {
247
+            if ($role && $name && $type) {
248
+                switch ($type) {
249 249
                     case 'Snippet':
250 250
                     case 'SnippetNoCache': {
251 251
 
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 						WHERE name="' . $name . '"
255 255
 						LIMIT 1');
256 256
 
257
-                        if ($modx->db->getRecordCount($sql)) {
257
+                        if ($modx->db->getRecordCount($sql)) {
258 258
                             $row = $modx->db->getRow($sql);
259 259
                             $contextmenu = array(
260 260
                                 'header' => array(
@@ -265,13 +265,13 @@  discard block
 block discarded – undo
265 265
                                     'url' => "index.php?a=22&id=" . $row['id']
266 266
                                 )
267 267
                             );
268
-                            if (!empty($row['description'])) {
268
+                            if (!empty($row['description'])) {
269 269
                                 $contextmenu['seperator'] = '';
270 270
                                 $contextmenu['description'] = array(
271 271
                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
272 272
                                 );
273 273
                             }
274
-                        } else {
274
+                        } else {
275 275
                             $contextmenu = array(
276 276
                                 'header' => array(
277 277
                                     'innerHTML' => '<i class="fa fa-code"></i> ' . $name
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 						WHERE name="' . $name . '"
293 293
 						LIMIT 1');
294 294
 
295
-                        if ($modx->db->getRecordCount($sql)) {
295
+                        if ($modx->db->getRecordCount($sql)) {
296 296
                             $row = $modx->db->getRow($sql);
297 297
                             $contextmenu = array(
298 298
                                 'header' => array(
@@ -303,13 +303,13 @@  discard block
 block discarded – undo
303 303
                                     'url' => "index.php?a=78&id=" . $row['id']
304 304
                                 )
305 305
                             );
306
-                            if (!empty($row['description'])) {
306
+                            if (!empty($row['description'])) {
307 307
                                 $contextmenu['seperator'] = '';
308 308
                                 $contextmenu['description'] = array(
309 309
                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
310 310
                                 );
311 311
                             }
312
-                        } else {
312
+                        } else {
313 313
                             $contextmenu = array(
314 314
                                 'header' => array(
315 315
                                     'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 						WHERE name="' . $name . '"
330 330
 						LIMIT 1');
331 331
 
332
-                        if ($modx->db->getRecordCount($sql)) {
332
+                        if ($modx->db->getRecordCount($sql)) {
333 333
                             $row = $modx->db->getRow($sql);
334 334
                             $contextmenu = array(
335 335
                                 'header' => array(
@@ -340,20 +340,20 @@  discard block
 block discarded – undo
340 340
                                     'url' => "index.php?a=78&id=" . $row['id']
341 341
                                 )
342 342
                             );
343
-                            if (!empty($row['description'])) {
343
+                            if (!empty($row['description'])) {
344 344
                                 $contextmenu['seperator'] = '';
345 345
                                 $contextmenu['description'] = array(
346 346
                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
347 347
                                 );
348 348
                             }
349
-                        } else {
349
+                        } else {
350 350
 
351 351
                             $sql = $modx->db->query('SELECT *
352 352
 							FROM ' . $modx->getFullTableName('site_snippets') . '
353 353
 							WHERE name="' . $name . '"
354 354
 							LIMIT 1');
355 355
 
356
-                            if ($modx->db->getRecordCount($sql)) {
356
+                            if ($modx->db->getRecordCount($sql)) {
357 357
                                 $row = $modx->db->getRow($sql);
358 358
                                 $contextmenu = array(
359 359
                                     'header' => array(
@@ -364,13 +364,13 @@  discard block
 block discarded – undo
364 364
                                         'url' => "index.php?a=22&id=" . $row['id']
365 365
                                     )
366 366
                                 );
367
-                                if (!empty($row['description'])) {
367
+                                if (!empty($row['description'])) {
368 368
                                     $contextmenu['seperator'] = '';
369 369
                                     $contextmenu['description'] = array(
370 370
                                         'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
371 371
                                     );
372 372
                                 }
373
-                            } else {
373
+                            } else {
374 374
                                 $contextmenu = array(
375 375
                                     'header' => array(
376 376
                                         'innerHTML' => '<i class="fa fa-code"></i> ' . $name
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
                             'alias_visible'
433 433
                         );
434 434
 
435
-                        if (in_array($name, $default_field)) {
435
+                        if (in_array($name, $default_field)) {
436 436
                             return;
437 437
                         }
438 438
 
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
 						WHERE name="' . $name . '"
442 442
 						LIMIT 1');
443 443
 
444
-                        if ($modx->db->getRecordCount($sql)) {
444
+                        if ($modx->db->getRecordCount($sql)) {
445 445
                             $row = $modx->db->getRow($sql);
446 446
                             $contextmenu = array(
447 447
                                 'header' => array(
@@ -452,13 +452,13 @@  discard block
 block discarded – undo
452 452
                                     'url' => "index.php?a=301&id=" . $row['id']
453 453
                                 )
454 454
                             );
455
-                            if (!empty($row['description'])) {
455
+                            if (!empty($row['description'])) {
456 456
                                 $contextmenu['seperator'] = '';
457 457
                                 $contextmenu['description'] = array(
458 458
                                     'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
459 459
                                 );
460 460
                             }
461
-                        } else {
461
+                        } else {
462 462
                             $contextmenu = array(
463 463
                                 'header' => array(
464 464
                                     'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name
@@ -483,13 +483,13 @@  discard block
 block discarded – undo
483 483
         case 'movedocument' : {
484 484
             $json = array();
485 485
 
486
-            if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
486
+            if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
487 487
                 $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';
488 488
                 $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0;
489 489
                 $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0;
490 490
 
491 491
                 // set parent
492
-                if ($id && $parent >= 0) {
492
+                if ($id && $parent >= 0) {
493 493
 
494 494
                     // find older parent
495 495
                     $parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));
@@ -500,31 +500,31 @@  discard block
 block discarded – undo
500 500
                         'new_parent'  => $parent,
501 501
                     ]);
502 502
 
503
-                    if (is_array($eventOut) && count($eventOut) > 0) {
503
+                    if (is_array($eventOut) && count($eventOut) > 0) {
504 504
                         $eventParent = array_pop($eventOut);
505 505
 
506
-                        if ($eventParent == $parentOld) {
506
+                        if ($eventParent == $parentOld) {
507 507
                             $json['errors'] = $_lang['error_movedocument2'];
508
-                        } else {
508
+                        } else {
509 509
                             $parent = $eventParent;
510 510
                         }
511 511
                     }
512 512
 
513
-                    if (empty($json['errors'])) {
513
+                    if (empty($json['errors'])) {
514 514
                         // check privileges user for move docs
515
-                        if (!empty($modx->config['tree_show_protected']) && $role != 1) {
515
+                        if (!empty($modx->config['tree_show_protected']) && $role != 1) {
516 516
                             $sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');
517
-                            if ($modx->db->getRecordCount($sql)) {
517
+                            if ($modx->db->getRecordCount($sql)) {
518 518
                                 $document_groups = array();
519
-                                while ($row = $modx->db->getRow($sql)) {
519
+                                while ($row = $modx->db->getRow($sql)) {
520 520
                                     $document_groups[$row['document']]['groups'][] = $row['document_group'];
521 521
                                 }
522
-                                foreach ($document_groups as $key => $value) {
523
-                                    if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {
522
+                                foreach ($document_groups as $key => $value) {
523
+                                    if (($key == $parent || $key == $parentOld || $key == $id) && !in_array($role, $value['groups'])) {
524 524
                                         $json['errors'] = $_lang["error_no_privileges"];
525 525
                                     }
526 526
                                 }
527
-                                if ($json['errors']) {
527
+                                if ($json['errors']) {
528 528
                                     header('content-type: application/json');
529 529
                                     echo json_encode($json, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE);
530 530
                                     break;
@@ -532,9 +532,9 @@  discard block
 block discarded – undo
532 532
                             }
533 533
                         }
534 534
 
535
-                        if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {
535
+                        if ($parent == 0 && $parent != $parentOld && !$modx->config['udperms_allowroot'] && $role != 1) {
536 536
                             $json['errors'] = $_lang["error_no_privileges"];
537
-                        } else {
537
+                        } else {
538 538
                             // set new parent
539 539
                             $modx->db->update(array(
540 540
                                 'parent' => $parent
@@ -544,13 +544,13 @@  discard block
 block discarded – undo
544 544
                                 'isfolder' => 1
545 545
                             ), $modx->getFullTableName('site_content'), 'id=' . $parent);
546 546
 
547
-                            if ($parent != $parentOld) {
547
+                            if ($parent != $parentOld) {
548 548
                                 // check children docs and set parent isfolder
549
-                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
549
+                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
550 550
                                     $modx->db->update(array(
551 551
                                         'isfolder' => 1
552 552
                                     ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
553
-                                } else {
553
+                                } else {
554 554
                                     $modx->db->update(array(
555 555
                                         'isfolder' => 0
556 556
                                     ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
@@ -558,16 +558,16 @@  discard block
 block discarded – undo
558 558
                             }
559 559
 
560 560
                             // set menuindex
561
-                            if (!empty($menuindex)) {
561
+                            if (!empty($menuindex)) {
562 562
                                 $menuindex = explode(',', $menuindex);
563
-                                foreach ($menuindex as $key => $value) {
563
+                                foreach ($menuindex as $key => $value) {
564 564
                                     $modx->db->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);
565 565
                                 }
566
-                            } else {
566
+                            } else {
567 567
                                 // TODO: max(*) menuindex
568 568
                             }
569 569
 
570
-                            if (!$json['errors']) {
570
+                            if (!$json['errors']) {
571 571
                                 $json['success'] = $_lang["actioncomplete"];
572 572
 
573 573
                                 $modx->invokeEvent('onAfterMoveDocument', [
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
579 579
                         }
580 580
                     }
581 581
                 }
582
-            } else {
582
+            } else {
583 583
                 $json['errors'] = $_lang["error_no_privileges"];
584 584
             }
585 585
 
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
 
596 596
             $output = !!$modx->elementIsLocked($type, $id, true);
597 597
 
598
-            if (!$output) {
598
+            if (!$output) {
599 599
                 $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
600 600
                 $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';
601 601
                 $sql = '
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
                     LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id
605 605
                     WHERE sc.id=' . $id . ' GROUP BY sc.id';
606 606
                 $sql = $modx->db->query($sql);
607
-                if ($modx->db->getRecordCount($sql)) {
607
+                if ($modx->db->getRecordCount($sql)) {
608 608
                     $row = $modx->db->getRow($sql);
609 609
                     $output = !!$row['locked'];
610 610
                 }
Please login to merge, or discard this patch.
manager/media/style/default/style.php 1 patch
Braces   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -10,12 +10,12 @@  discard block
 block discarded – undo
10 10
  */
11 11
 $style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/';
12 12
 $modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php';
13
-if(!$modx->config['lang_code']) {
13
+if(!$modx->config['lang_code']) {
14 14
 	global $modx_lang_attribute;
15 15
 	$modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;
16 16
 }
17 17
 
18
-if($_GET['a'] == 2) {
18
+if($_GET['a'] == 2) {
19 19
 	include_once('welcome.php');
20 20
 }
21 21
 
@@ -262,68 +262,68 @@  discard block
 block discarded – undo
262 262
 
263 263
 // actions buttons templates
264 264
 $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : '';
265
-if (!empty($modx->config['global_tabs']) && !isset($_SESSION['stay'])) {
265
+if (!empty($modx->config['global_tabs']) && !isset($_SESSION['stay'])) {
266 266
     $_REQUEST['stay'] = 2;
267 267
 }
268
-if (isset($_REQUEST['stay'])) {
268
+if (isset($_REQUEST['stay'])) {
269 269
     $_SESSION['stay'] = $_REQUEST['stay'];
270
-} else if (isset($_SESSION['stay'])) {
270
+} else if (isset($_SESSION['stay'])) {
271 271
     $_REQUEST['stay'] = $_SESSION['stay'];
272 272
 }
273 273
 $stay = isset($_REQUEST['stay']) ? $_REQUEST['stay'] : '';
274 274
 $addnew = 0;
275 275
 $run = 0;
276
-switch($action) {
276
+switch($action) {
277 277
 	case '3':
278 278
 	case '4':
279 279
 	case '27':
280 280
 	case '72':
281
-		if($modx->hasPermission('new_document')) {
281
+		if($modx->hasPermission('new_document')) {
282 282
 			$addnew = 1;
283 283
 		}
284 284
 		break;
285 285
 	case '16':
286 286
 	case '19':
287
-		if($modx->hasPermission('new_template')) {
287
+		if($modx->hasPermission('new_template')) {
288 288
 			$addnew = 1;
289 289
 		}
290 290
 		break;
291 291
 	case '300':
292 292
 	case '301':
293
-		if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
293
+		if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
294 294
 			$addnew = 1;
295 295
 		}
296 296
 		break;
297 297
 	case '77':
298 298
 	case '78':
299
-		if($modx->hasPermission('new_chunk')) {
299
+		if($modx->hasPermission('new_chunk')) {
300 300
 			$addnew = 1;
301 301
 		}
302 302
 		break;
303 303
 	case '22':
304 304
 	case '23':
305
-		if($modx->hasPermission('new_snippet')) {
305
+		if($modx->hasPermission('new_snippet')) {
306 306
 			$addnew = 1;
307 307
 		}
308 308
 		break;
309 309
 	case '101':
310 310
 	case '102':
311
-		if($modx->hasPermission('new_plugin')) {
311
+		if($modx->hasPermission('new_plugin')) {
312 312
 			$addnew = 1;
313 313
 		}
314 314
 		break;
315 315
 	case '106':
316 316
 	case '107':
317 317
 	case '108':
318
-		if($modx->hasPermission('new_module')) {
318
+		if($modx->hasPermission('new_module')) {
319 319
 			$addnew = 1;
320 320
 		}
321
-		if($modx->hasPermission('exec_module')) {
321
+		if($modx->hasPermission('exec_module')) {
322 322
 			$run = 1;
323 323
 		}
324 324
 		break;
325 325
 	case '88':
326
-		if($modx->hasPermission('new_web_user')) {
326
+		if($modx->hasPermission('new_web_user')) {
327 327
 			$addnew = 1;
328 328
 		}
329 329
 		break;
Please login to merge, or discard this patch.
manager/media/style/common/moo-datepicker/datepicker.inc.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,11 @@
 block discarded – undo
1 1
 <?php
2
-class DATEPICKER {
3
-    function __construct() {
2
+class DATEPICKER
3
+{
4
+    function __construct()
5
+    {
4 6
     }
5
-    function getDP() {
7
+    function getDP()
8
+    {
6 9
         global $modx,$_lang;
7 10
         
8 11
         $tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
Please login to merge, or discard this patch.
manager/media/rss/rss_utils.inc 1 patch
Braces   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -22,7 +22,8 @@  discard block
 block discarded – undo
22 22
     NOTE: http://www.w3.org/TR/NOTE-datetime
23 23
 \*======================================================================*/
24 24
 
25
-function parse_w3cdtf ( $date_str ) {
25
+function parse_w3cdtf ( $date_str )
26
+{
26 27
     
27 28
     # regex to match wc3dtf
28 29
     $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
@@ -37,8 +38,7 @@  discard block
 block discarded – undo
37 38
         $offset = 0;
38 39
         if ( $match[10] == 'Z' ) {
39 40
             # zulu time, aka GMT
40
-        }
41
-        else {
41
+        } else {
42 42
             list( $tz_mod, $tz_hour, $tz_min ) =
43 43
                 array( $match[8], $match[9], $match[10]);
44 44
             
@@ -58,8 +58,7 @@  discard block
 block discarded – undo
58 58
         }
59 59
         $epoch = $epoch + $offset;
60 60
         return $epoch;
61
-    }
62
-    else {
61
+    } else {
63 62
         return -1;
64 63
     }
65 64
 }
Please login to merge, or discard this patch.