Completed
Push — develop ( 5edac5...ddb47a )
by Serg
05:44
created
install/setup.info.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
                 $params['modx_category'],
37 37
                 $params['lock_template'],
38 38
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false,
39
-                isset($params['save_sql_id_as']) ? $params['save_sql_id_as'] : NULL // Nessecary to fix template-ID for demo-site
39
+                isset($params['save_sql_id_as']) ? $params['save_sql_id_as'] : null // Nessecary to fix template-ID for demo-site
40 40
             );
41 41
         }
42 42
     }
Please login to merge, or discard this patch.
install/instprocessor.php 1 patch
Upper-Lower-Casing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 }
239 239
 
240 240
 // write $somecontent to our opened file.
241
-if (@ fwrite($handle, $configString) === FALSE) {
241
+if (@ fwrite($handle, $configString) === false) {
242 242
     $configFileFailed = true;
243 243
 }
244 244
 @ fclose($handle);
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
                 $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name'");
327 327
 
328 328
                 if (mysqli_num_rows($rs)) {
329
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
329
+                    if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
330 330
                         $errors += 1;
331 331
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
332 332
                         return;
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
             if (mysqli_num_rows($rs)) {
383 383
                 $insert = true;
384 384
                 while($row = mysqli_fetch_assoc($rs)) {
385
-                    if (!mysqli_query($sqlParser->conn, "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']};")) {
385
+                    if (!mysqli_query($sqlParser->conn, "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']};")) {
386 386
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
387 387
                         return;
388 388
                     }
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
                 }
459 459
                 $update = $count_original_name > 0 && $overwrite == 'true';
460 460
                 if ($update) {
461
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
461
+                    if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
462 462
                         $errors += 1;
463 463
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
464 464
                         return;
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
                 if (mysqli_num_rows($rs)) {
509 509
                     $row = mysqli_fetch_assoc($rs);
510 510
                     $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
511
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
511
+                    if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
512 512
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
513 513
                         return;
514 514
                     }
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
552 552
 
553 553
                 // disable legacy versions based on legacy_names provided
554 554
                 if(!empty($leg_names)) {
555
-                    $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
555
+                    $update_query = "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
556 556
                     $rs = mysqli_query($sqlParser->conn, $update_query);
557 557
                 }
558 558
 
@@ -568,13 +568,13 @@  discard block
 block discarded – undo
568 568
                     while($row = mysqli_fetch_assoc($rs)) {
569 569
                         $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
570 570
                         if($row['description'] == $desc){
571
-                            if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
571
+                            if (! mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
572 572
                                 echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
573 573
                                 return;
574 574
                             }
575 575
                             $insert = false;
576 576
                         } else {
577
-                            if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
577
+                            if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
578 578
                                 echo "<p>".mysqli_error($sqlParser->conn)."</p>";
579 579
                                 return;
580 580
                             }
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
                 if (mysqli_num_rows($rs)) {
640 640
                     $row = mysqli_fetch_assoc($rs);
641 641
                     $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
642
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
642
+                    if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
643 643
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
644 644
                         return;
645 645
                     }
Please login to merge, or discard this patch.
manager/actions/files.dynamic.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -801,7 +801,7 @@
 block discarded – undo
801 801
                 $complete_name = $path . str_replace('\\', '/', $zip_entry_name);
802 802
                 if (!file_exists($complete_path)) {
803 803
                     $tmp = '';
804
-                    foreach (explode('/', $complete_path) AS $k) {
804
+                    foreach (explode('/', $complete_path) as $k) {
805 805
                         $tmp .= $k . '/';
806 806
                         if (!is_dir($tmp)) {
807 807
                             mkdir($tmp, 0777);
Please login to merge, or discard this patch.
manager/processors/save_settings.processor.php 1 patch
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 		}
22 22
 		elseif(is_writable($htaccess))
23 23
 		{
24
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
24
+			$_ = preg_replace('@RewriteBase.+@',"rewritebase {$dir}", $_);
25 25
 			if(!@file_put_contents($htaccess,$_))
26 26
 			{
27 27
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 		elseif($modx->config['base_url']!=='/')
38 38
 		{
39 39
 			$_ = file_get_contents($htaccess);
40
-			$_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_);
40
+			$_ = preg_replace('@RewriteBase.+@',"rewritebase {$dir}", $_);
41 41
 			if(!@file_put_contents($htaccess,$_))
42 42
 			{
43 43
 				$warnings[] = $_lang["settings_friendlyurls_alert2"];
Please login to merge, or discard this patch.
manager/processors/login.processor.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -239,7 +239,7 @@
 block discarded – undo
239 239
 	if(version_compare(PHP_VERSION, '5.2', '<')) {
240 240
 		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, '; HttpOnly', $secure);
241 241
 	} else {
242
-		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, NULL, $secure, true);
242
+		setcookie('modx_remember_manager', $_SESSION['mgrShortname'], time() + 60 * 60 * 24 * 365, MODX_BASE_URL, null, $secure, true);
243 243
 	}
244 244
 } else {
245 245
 	$_SESSION['modx.mgr.session.cookie.lifetime'] = 0;
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/core/browser.php 1 patch
Upper-Lower-Casing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
 
538 538
         $zip = new ZipArchive();
539 539
         $res = $zip->open($file, ZipArchive::CREATE);
540
-        if ($res === TRUE) {
540
+        if ($res === true) {
541 541
             foreach ($zipFiles as $cfile)
542 542
                 $zip->addFile($cfile, basename($cfile));
543 543
             $zip->close();
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
579 579
 
580 580
         $zip = new ZipArchive();
581 581
         $res = $zip->open($file, ZipArchive::CREATE);
582
-        if ($res === TRUE) {
582
+        if ($res === true) {
583 583
             foreach ($zipFiles as $cfile)
584 584
                 $zip->addFile($cfile, basename($cfile));
585 585
             $zip->close();
@@ -642,7 +642,7 @@  discard block
 block discarded – undo
642 642
         // Socket extension
643 643
         ) {} elseif (function_exists('socket_create')) {
644 644
             $cmd =
645
-                "GET $path " . strtoupper($protocol) . "/1.1\r\n" .
645
+                "get $path " . strtoupper($protocol) . "/1.1\r\n" .
646 646
                 "Host: $host\r\n" .
647 647
                 "Connection: Close\r\n\r\n";
648 648
 
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->db->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
@@ -4,12 +4,12 @@  discard block
 block discarded – undo
4 4
 <script src="js/helper.js" type="text/javascript"></script>
5 5
 <script src="js/browser/joiner.php" type="text/javascript"></script>
6 6
 <script src="js_localize.php?lng=<?php echo $this->lang ?>" type="text/javascript"></script>
7
-<?php IF (isset($this->opener['TinyMCE']) && $this->opener['TinyMCE']): ?>
7
+<?php if (isset($this->opener['TinyMCE']) && $this->opener['TinyMCE']): ?>
8 8
 <script src="<?php echo $this->config['_tinyMCEPath'] ?>/tiny_mce_popup.js" type="text/javascript"></script>
9
-<?php ENDIF ?>
10
-<?php IF (file_exists("themes/{$this->config['theme']}/init.js")): ?>
9
+<?php endif ?>
10
+<?php if (file_exists("themes/{$this->config['theme']}/init.js")): ?>
11 11
 <script src="themes/<?php echo $this->config['theme'] ?>/init.js" type="text/javascript"></script>
12
-<?php ENDIF ?>
12
+<?php endif ?>
13 13
 <script type="text/javascript">
14 14
 browser.version = "<?php echo self::VERSION ?>";
15 15
 browser.support.chromeFrame = <?php echo (strpos(strtolower($_SERVER['HTTP_USER_AGENT']), " chromeframe") !== false) ? "true" : "false" ?>;
@@ -23,19 +23,19 @@  discard block
 block discarded – undo
23 23
 browser.siteURL = "<?php echo text::jsValue($this->config['siteURL']) ?>";
24 24
 browser.assetsURL = "<?php echo text::jsValue($this->config['assetsURL']) ?>";
25 25
 browser.thumbsURL = browser.assetsURL + "/<?php echo text::jsValue($this->config['thumbsDir']) ?>";
26
-<?php IF (isset($this->get['opener']) && strlen($this->get['opener'])): ?>
26
+<?php if (isset($this->get['opener']) && strlen($this->get['opener'])): ?>
27 27
 browser.opener.name = "<?php echo text::jsValue($this->get['opener']) ?>";
28
-<?php ENDIF ?>
29
-<?php IF (isset($this->opener['CKEditor']['funcNum']) && preg_match('/^\d+$/', $this->opener['CKEditor']['funcNum'])): ?>
28
+<?php endif ?>
29
+<?php if (isset($this->opener['CKEditor']['funcNum']) && preg_match('/^\d+$/', $this->opener['CKEditor']['funcNum'])): ?>
30 30
 browser.opener.CKEditor = {};
31 31
 browser.opener.CKEditor.funcNum = <?php echo $this->opener['CKEditor']['funcNum'] ?>;
32
-<?php ENDIF ?>
33
-<?php IF (isset($this->opener['TinyMCE']) && $this->opener['TinyMCE']): ?>
32
+<?php endif ?>
33
+<?php if (isset($this->opener['TinyMCE']) && $this->opener['TinyMCE']): ?>
34 34
 browser.opener.TinyMCE = true;
35
-<?php ENDIF ?>
36
-<?php IF (isset($this->get['opener']) && ($this->get['opener'] == "tinymce4") && isset($this->get['field'])): ?>
35
+<?php endif ?>
36
+<?php if (isset($this->get['opener']) && ($this->get['opener'] == "tinymce4") && isset($this->get['field'])): ?>
37 37
 browser.opener.TinyMCE4 = "<?= text::jsValue($this->get['field']) ?>";
38
-<?php ENDIF ?>
38
+<?php endif ?>
39 39
 browser.cms = "<?php echo text::jsValue($this->cms) ?>";
40 40
 _.kuki.domain = "<?php echo text::jsValue($this->config['cookieDomain']) ?>";
41 41
 _.kuki.path = "<?php echo text::jsValue($this->config['cookiePath']) ?>";
Please login to merge, or discard this patch.
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.