Completed
Pull Request — develop (#731)
by Serg
05:54
created
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/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.
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.
manager/includes/controls/phpmailer/POP3.php 1 patch
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -288,11 +288,11 @@
 block discarded – undo
288 288
         }
289 289
 
290 290
         // Send the Username
291
-        $this->sendString("USER $username" . static::LE);
291
+        $this->sendString("user $username" . static::LE);
292 292
         $pop3_response = $this->getResponse();
293 293
         if ($this->checkResponse($pop3_response)) {
294 294
             // Send the Password
295
-            $this->sendString("PASS $password" . static::LE);
295
+            $this->sendString("pass $password" . static::LE);
296 296
             $pop3_response = $this->getResponse();
297 297
             if ($this->checkResponse($pop3_response)) {
298 298
                 return true;
Please login to merge, or discard this patch.
manager/includes/controls/phpmailer/SMTP.php 1 patch
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -888,7 +888,7 @@  discard block
 block discarded – undo
888 888
     protected function sendCommand($command, $commandstring, $expect)
889 889
     {
890 890
         if (!$this->connected()) {
891
-            $this->setError("Called $command without being connected");
891
+            $this->setError("called $command without being connected");
892 892
 
893 893
             return false;
894 894
         }
@@ -970,7 +970,7 @@  discard block
 block discarded – undo
970 970
      */
971 971
     public function verify($name)
972 972
     {
973
-        return $this->sendCommand('VRFY', "VRFY $name", [250, 251]);
973
+        return $this->sendCommand('VRFY', "vrfy $name", [250, 251]);
974 974
     }
975 975
 
976 976
     /**
Please login to merge, or discard this patch.