Completed
Push — develop ( 8dee05 )
by Dmytro
20:08
created
manager/media/browser/mcpuk/tpl/tpl_browser.php 1 patch
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -4,8 +4,8 @@
 block discarded – undo
4 4
 <head>
5 5
     <title>KCFinder: /
6 6
         <?php echo $this->session['dir'] ?></title>
7
-    <?php INCLUDE "tpl/tpl_css.php" ?>
8
-    <?php INCLUDE "tpl/tpl_javascript.php" ?>
7
+    <?php include "tpl/tpl_css.php" ?>
8
+    <?php include "tpl/tpl_javascript.php" ?>
9 9
 </head>
10 10
 
11 11
 <body>
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lib/class_zipFolder.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
             ? $ignored
26 26
             : ($ignored ? array($ignored) : array());
27 27
 
28
-        if ($this->zip->open($file, ZIPARCHIVE::CREATE) !== TRUE)
28
+        if ($this->zip->open($file, ZIPARCHIVE::CREATE) !== true)
29 29
             throw new Exception("cannot open <$file>\n");
30 30
 
31 31
         $folder = rtrim($folder, '/');
Please login to merge, or discard this patch.
manager/includes/config_check.inc.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
 }
89 89
 </script>
90 90
 
91
-JS;
91
+js;
92 92
         $modx->regClientScript($script);
93 93
         }
94 94
     }
Please login to merge, or discard this patch.
install/cli-install.php 1 patch
Upper-Lower-Casing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 
317 317
 
318 318
 // make sure we can use the database
319
-if ($installMode > 0 && !mysqli_query($conn, "USE {$dbase}")) {
319
+if ($installMode > 0 && !mysqli_query($conn, "use {$dbase}")) {
320 320
     $errors++;
321 321
     echo $_lang['database_use_failed'] . PHP_EOL;
322 322
 }
@@ -1117,7 +1117,7 @@  discard block
 block discarded – undo
1117 1117
 
1118 1118
                 if (mysqli_num_rows($rs)) {
1119 1119
                     if (!mysqli_query($sqlParser->conn,
1120
-                        "UPDATE $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
1120
+                        "update $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
1121 1121
                         $errors += 1;
1122 1122
                         echo mysqli_error($sqlParser->conn) . PHP_EOL;
1123 1123
 
@@ -1181,7 +1181,7 @@  discard block
 block discarded – undo
1181 1181
                 $insert = true;
1182 1182
                 while ($row = mysqli_fetch_assoc($rs)) {
1183 1183
                     if (!mysqli_query($sqlParser->conn,
1184
-                        "UPDATE $dbase.`" . $table_prefix . "site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) {
1184
+                        "update $dbase.`" . $table_prefix . "site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) {
1185 1185
                         echo mysqli_error($sqlParser->conn) . PHP_EOL;
1186 1186
 
1187 1187
                         return;
@@ -1266,7 +1266,7 @@  discard block
 block discarded – undo
1266 1266
                 $update = $count_original_name > 0 && $overwrite == 'true';
1267 1267
                 if ($update) {
1268 1268
                     if (!mysqli_query($sqlParser->conn,
1269
-                        "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
1269
+                        "update $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
1270 1270
                         $errors += 1;
1271 1271
                         echo mysqli_error($sqlParser->conn) . PHP_EOL;
1272 1272
 
@@ -1322,7 +1322,7 @@  discard block
 block discarded – undo
1322 1322
                     $row = mysqli_fetch_assoc($rs);
1323 1323
                     $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
1324 1324
                     if (!mysqli_query($sqlParser->conn,
1325
-                        "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
1325
+                        "update $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
1326 1326
                         echo mysqli_error($sqlParser->conn) . PHP_EOL;
1327 1327
 
1328 1328
                         return;
@@ -1373,7 +1373,7 @@  discard block
 block discarded – undo
1373 1373
 
1374 1374
                 // disable legacy versions based on legacy_names provided
1375 1375
                 if (!empty($leg_names)) {
1376
-                    $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
1376
+                    $update_query = "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
1377 1377
                     $rs = mysqli_query($sqlParser->conn, $update_query);
1378 1378
                 }
1379 1379
 
@@ -1391,7 +1391,7 @@  discard block
 block discarded – undo
1391 1391
                         $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
1392 1392
                         if ($row['description'] == $desc) {
1393 1393
                             if (!mysqli_query($sqlParser->conn,
1394
-                                "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
1394
+                                "update $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
1395 1395
                                 echo mysqli_error($sqlParser->conn) . PHP_EOL;
1396 1396
 
1397 1397
                                 return;
@@ -1399,7 +1399,7 @@  discard block
 block discarded – undo
1399 1399
                             $insert = false;
1400 1400
                         } else {
1401 1401
                             if (!mysqli_query($sqlParser->conn,
1402
-                                "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
1402
+                                "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
1403 1403
                                 echo mysqli_error($sqlParser->conn) . PHP_EOL;
1404 1404
 
1405 1405
                                 return;
@@ -1478,7 +1478,7 @@  discard block
 block discarded – undo
1478 1478
                     $row = mysqli_fetch_assoc($rs);
1479 1479
                     $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
1480 1480
                     if (!mysqli_query($sqlParser->conn,
1481
-                        "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
1481
+                        "update $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
1482 1482
                         echo mysqli_error($sqlParser->conn) . PHP_EOL;
1483 1483
 
1484 1484
                         return;
Please login to merge, or discard this patch.
install/src/controllers/summary.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -207,7 +207,7 @@
 block discarded – undo
207 207
 
208 208
 
209 209
 // make sure we can use the database
210
-if ($installMode > 0 && !mysqli_query($conn, "USE {$dbase}")) {
210
+if ($installMode > 0 && !mysqli_query($conn, "use {$dbase}")) {
211 211
     $errors++;
212 212
     echo '<span class="notok">'.$_lang['database_use_failed'].'</span><p />'.$_lang["database_use_failed_note"].'</p>';
213 213
 }
Please login to merge, or discard this patch.
manager/includes/template.parser.class.inc.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
  * @todo could be unnecessary
9 9
  *
10 10
  */
11
-Class TemplateParser extends EvolutionCMS\Legacy\TemplateParser
11
+class TemplateParser extends EvolutionCMS\Legacy\TemplateParser
12 12
 {
13 13
 }
14 14
 
Please login to merge, or discard this patch.
install/src/controllers/install.php 1 patch
Upper-Lower-Casing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 
295 295
                     if (mysqli_num_rows($rs)) {
296 296
                         $installDataLevel['templates'][$moduleTemplate[0]]['type'] = 'update';
297
-                        $query = "UPDATE $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;";
297
+                        $query = "update $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;";
298 298
                         if (!mysqli_query($sqlParser->conn, $query)) {
299 299
                             $errors += 1;
300 300
                             $installDataLevel['templates'][$moduleTemplate[0]]['error'] = array(
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
                 if (mysqli_num_rows($rs)) {
386 386
                     $installDataLevel['tvs'][$moduleTV[0]]['type'] = 'update';
387 387
                     while ($row = mysqli_fetch_assoc($rs)) {
388
-                        $query = "UPDATE $dbase.`" . $table_prefix . "site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};";
388
+                        $query = "update $dbase.`" . $table_prefix . "site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};";
389 389
                         if (!mysqli_query($sqlParser->conn, $query)) {
390 390
                             $installDataLevel['tvs'][$moduleTV[0]]['error'] = array(
391 391
                                 'type' => 'sql',
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
                     if ($update) {
497 497
                         $installDataLevel['chunks'][$moduleChunk[0]]['type'] = 'update';
498 498
                         if (!mysqli_query($sqlParser->conn,
499
-                            "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
499
+                            "update $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
500 500
                             $errors += 1;
501 501
                             $installDataLevel['chunks'][$moduleChunk[0]]['error'] = array(
502 502
                                 'type' => 'sql',
@@ -581,7 +581,7 @@  discard block
 block discarded – undo
581 581
                         $row = mysqli_fetch_assoc($rs);
582 582
                         $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
583 583
                         if (!mysqli_query($sqlParser->conn,
584
-                            "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
584
+                            "update $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
585 585
                             $installDataLevel['modules'][$moduleModule[0]]['error'] = array(
586 586
                                 'type' => 'sql',
587 587
                                 'content' => mysqli_error($sqlParser->conn)
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
660 660
 
661 661
                     // disable legacy versions based on legacy_names provided
662 662
                     if (!empty($leg_names)) {
663
-                        $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
663
+                        $update_query = "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
664 664
                         $rs = mysqli_query($sqlParser->conn, $update_query);
665 665
                     }
666 666
 
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
678 678
                         while ($row = mysqli_fetch_assoc($rs)) {
679 679
                             $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
680 680
                             if ($row['description'] == $desc) {
681
-                                $query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};";
681
+                                $query = "update $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};";
682 682
                                 if (!mysqli_query($sqlParser->conn, $query)) {
683 683
                                     $installDataLevel['plugins'][$modulePlugin[0]]['error'] = array(
684 684
                                         'type' => 'sql',
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
689 689
                                 }
690 690
                                 $insert = false;
691 691
                             } else {
692
-                                $query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};";
692
+                                $query = "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};";
693 693
                                 if (!mysqli_query($sqlParser->conn, $query)) {
694 694
                                     $installDataLevel['plugins'][$modulePlugin[0]]['error'] = array(
695 695
                                         'type' => 'sql',
@@ -792,7 +792,7 @@  discard block
 block discarded – undo
792 792
                         $row = mysqli_fetch_assoc($rs);
793 793
                         $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
794 794
                         if (!mysqli_query($sqlParser->conn,
795
-                            "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
795
+                            "update $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
796 796
                             $installDataLevel['snippets'][$moduleSnippet[0]]['error'] = array(
797 797
                                 'type' => 'sql',
798 798
                                 'content' => mysqli_error($sqlParser->conn)
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/core/uploader.php 1 patch
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -376,10 +376,10 @@
 block discarded – undo
376 376
 			if ($properties = $modx->getDatabase()->getValue($res)) {
377 377
 				$properties = $modx->parseProperties($properties, 'TransAlias', 'plugin');
378 378
 			} else {
379
-				$properties = NULL;
379
+				$properties = null;
380 380
 			}
381 381
 		} else {
382
-			$properties = NULL;
382
+			$properties = null;
383 383
 		}
384 384
 		return $properties;
385 385
 	}
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/tpl/tpl_javascript.php 1 patch
Upper-Lower-Casing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -7,12 +7,12 @@  discard block
 block discarded – undo
7 7
 <script src="js/FileAPI/FileAPI.exif.js" type="text/javascript"></script>
8 8
 <script src="js/browser/joiner.php" type="text/javascript"></script>
9 9
 <script src="js_localize.php?lng=<?php echo $this->lang ?>" type="text/javascript"></script>
10
-<?php IF (isset($this->opener['TinyMCE']) && $this->opener['TinyMCE']): ?>
10
+<?php if (isset($this->opener['TinyMCE']) && $this->opener['TinyMCE']): ?>
11 11
 <script src="<?php echo $this->config['_tinyMCEPath'] ?>/tiny_mce_popup.js" type="text/javascript"></script>
12
-<?php ENDIF ?>
13
-<?php IF (file_exists("themes/{$this->config['theme']}/init.js")): ?>
12
+<?php endif ?>
13
+<?php if (file_exists("themes/{$this->config['theme']}/init.js")): ?>
14 14
 <script src="themes/<?php echo $this->config['theme'] ?>/init.js" type="text/javascript"></script>
15
-<?php ENDIF ?>
15
+<?php endif ?>
16 16
 <script type="text/javascript">
17 17
 browser.version = "<?php echo self::VERSION ?>";
18 18
 browser.support.chromeFrame = <?php echo (strpos(strtolower($_SERVER['HTTP_USER_AGENT']), " chromeframe") !== false) ? "true" : "false" ?>;
@@ -29,19 +29,19 @@  discard block
 block discarded – undo
29 29
 browser.allowedExts = /<?php echo str_replace(' ', '|', strtolower(text::clearWhitespaces($this->types[$this->type]))) ?>$/;
30 30
 browser.deniedExts = /<?php echo str_replace(' ', '|', strtolower(text::clearWhitespaces($this->config['deniedExts']))) ?>$/;
31 31
 browser.maxFileSize = <?php echo text::jsValue($this->config['maxfilesize']) ?>;
32
-<?php IF (isset($this->get['opener']) && strlen($this->get['opener'])): ?>
32
+<?php if (isset($this->get['opener']) && strlen($this->get['opener'])): ?>
33 33
 browser.opener.name = "<?php echo text::jsValue($this->get['opener']) ?>";
34
-<?php ENDIF ?>
35
-<?php IF (isset($this->opener['CKEditor']['funcNum']) && preg_match('/^\d+$/', $this->opener['CKEditor']['funcNum'])): ?>
34
+<?php endif ?>
35
+<?php if (isset($this->opener['CKEditor']['funcNum']) && preg_match('/^\d+$/', $this->opener['CKEditor']['funcNum'])): ?>
36 36
 browser.opener.CKEditor = {};
37 37
 browser.opener.CKEditor.funcNum = <?php echo $this->opener['CKEditor']['funcNum'] ?>;
38
-<?php ENDIF ?>
39
-<?php IF (isset($this->opener['TinyMCE']) && $this->opener['TinyMCE']): ?>
38
+<?php endif ?>
39
+<?php if (isset($this->opener['TinyMCE']) && $this->opener['TinyMCE']): ?>
40 40
 browser.opener.TinyMCE = true;
41
-<?php ENDIF ?>
42
-<?php IF (isset($this->get['opener']) && ($this->get['opener'] == "tinymce4") && isset($this->get['field'])): ?>
41
+<?php endif ?>
42
+<?php if (isset($this->get['opener']) && ($this->get['opener'] == "tinymce4") && isset($this->get['field'])): ?>
43 43
 browser.opener.TinyMCE4 = "<?= text::jsValue($this->get['field']) ?>";
44
-<?php ENDIF ?>
44
+<?php endif ?>
45 45
 browser.cms = "<?php echo text::jsValue($this->cms) ?>";
46 46
 _.kuki.domain = "<?php echo text::jsValue($this->config['cookieDomain']) ?>";
47 47
 _.kuki.path = "<?php echo text::jsValue($this->config['cookiePath']) ?>";
Please login to merge, or discard this patch.