Completed
Push — develop ( cb7ecf...5e631f )
by Dmytro
17s
created
manager/actions/mutate_settings/tab5_security_settings.inc.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -177,9 +177,9 @@
 block discarded – undo
177 177
     <td colspan="2"><div class="split"></div></td>
178 178
   </tr>
179 179
   <?php
180
-      // Check for GD before allowing captcha to be enabled
181
-      $gdAvailable = extension_loaded('gd');
182
-  ?>
180
+        // Check for GD before allowing captcha to be enabled
181
+        $gdAvailable = extension_loaded('gd');
182
+    ?>
183 183
 <?php
184 184
 $gdAvailable = extension_loaded('gd');
185 185
 if(!$gdAvailable) $use_captcha = 0;
Please login to merge, or discard this patch.
manager/processors/logout.processor.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -7,10 +7,10 @@  discard block
 block discarded – undo
7 7
 
8 8
 // invoke OnBeforeManagerLogout event
9 9
 $modx->invokeEvent("OnBeforeManagerLogout",
10
-						array(
11
-							"userid"		=> $internalKey,
12
-							"username"		=> $username
13
-						));
10
+                        array(
11
+                            "userid"		=> $internalKey,
12
+                            "username"		=> $username
13
+                        ));
14 14
 
15 15
 //// Unset all of the session variables.
16 16
 //$_SESSION = array();
@@ -33,10 +33,10 @@  discard block
 block discarded – undo
33 33
 
34 34
 // invoke OnManagerLogout event
35 35
 $modx->invokeEvent("OnManagerLogout",
36
-						array(
37
-							"userid"		=> $internalKey,
38
-							"username"		=> $username
39
-						));
36
+                        array(
37
+                            "userid"		=> $internalKey,
38
+                            "username"		=> $username
39
+                        ));
40 40
 
41 41
 // show login screen
42 42
 header('Location: ' . MODX_MANAGER_URL);
Please login to merge, or discard this patch.
manager/frames/1.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -236,9 +236,9 @@
 block discarded – undo
236 236
         lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . "\n" ?>
237 237
       };
238 238
       <?php
239
-      $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));
240
-      echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";
241
-      ?>
239
+        $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));
240
+        echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";
241
+        ?>
242 242
     </script>
243 243
     <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/modx.min.js?v=<?= $lastInstallTime ?>"></script>
244 244
     <?php if ($modx->config['show_picker'] != "0") { ?>
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/core/types/type_img.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 /** This file is part of KCFinder project
4
-  *
5
-  *      @desc Image detection class
6
-  *   @package KCFinder
7
-  *   @version 2.54
8
-  *    @author Pavel Tzonkov <[email protected]>
9
-  * @copyright 2010-2014 KCFinder Project
10
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12
-  *      @link http://kcfinder.sunhater.com
13
-  */
4
+ *
5
+ *      @desc Image detection class
6
+ *   @package KCFinder
7
+ *   @version 2.54
8
+ *    @author Pavel Tzonkov <[email protected]>
9
+ * @copyright 2010-2014 KCFinder Project
10
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12
+ *      @link http://kcfinder.sunhater.com
13
+ */
14 14
 
15 15
 class type_img {
16 16
 
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/core/types/type_mime.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 /** This file is part of KCFinder project
4
-  *
5
-  *      @desc MIME type detection class
6
-  *   @package KCFinder
7
-  *   @version 2.54
8
-  *    @author Pavel Tzonkov <[email protected]>
9
-  * @copyright 2010-2014 KCFinder Project
10
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12
-  *      @link http://kcfinder.sunhater.com
13
-  */
4
+ *
5
+ *      @desc MIME type detection class
6
+ *   @package KCFinder
7
+ *   @version 2.54
8
+ *    @author Pavel Tzonkov <[email protected]>
9
+ * @copyright 2010-2014 KCFinder Project
10
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12
+ *      @link http://kcfinder.sunhater.com
13
+ */
14 14
 
15 15
 class type_mime {
16 16
 
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/core/autoload.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1,24 +1,24 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 /** This file is part of KCFinder project
4
-  *
5
-  *      @desc This file is included first, before each other
6
-  *   @package KCFinder
7
-  *   @version 2.54
8
-  *    @author Pavel Tzonkov <[email protected]>
9
-  * @copyright 2010-2014 KCFinder Project
10
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12
-  *      @link http://kcfinder.sunhater.com
13
-  *
14
-  * This file is the place you can put any code (at the end of the file),
15
-  * which will be executed before any other. Suitable for:
16
-  *     1. Set PHP ini settings using ini_set()
17
-  *     2. Custom session save handler with session_set_save_handler()
18
-  *     3. Any custom integration code. If you use any global variables
19
-  *        here, they can be accessed in config.php via $GLOBALS array.
20
-  *        It's recommended to use constants instead.
21
-  */
4
+ *
5
+ *      @desc This file is included first, before each other
6
+ *   @package KCFinder
7
+ *   @version 2.54
8
+ *    @author Pavel Tzonkov <[email protected]>
9
+ * @copyright 2010-2014 KCFinder Project
10
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12
+ *      @link http://kcfinder.sunhater.com
13
+ *
14
+ * This file is the place you can put any code (at the end of the file),
15
+ * which will be executed before any other. Suitable for:
16
+ *     1. Set PHP ini settings using ini_set()
17
+ *     2. Custom session save handler with session_set_save_handler()
18
+ *     3. Any custom integration code. If you use any global variables
19
+ *        here, they can be accessed in config.php via $GLOBALS array.
20
+ *        It's recommended to use constants instead.
21
+ */
22 22
 include_once(dirname(__FILE__)."/../../../../../assets/cache/siteManager.php");
23 23
 require_once('../../../includes/protect.inc.php');
24 24
 include_once('../../../includes/config.inc.php');
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/core/browser.php 1 patch
Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 /** This file is part of KCFinder project
4
-  *
5
-  *      @desc Browser actions class
6
-  *   @package KCFinder
7
-  *   @version 2.54
8
-  *    @author Pavel Tzonkov <[email protected]>
9
-  * @copyright 2010-2014 KCFinder Project
10
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12
-  *      @link http://kcfinder.sunhater.com
13
-  */
4
+ *
5
+ *      @desc Browser actions class
6
+ *   @package KCFinder
7
+ *   @version 2.54
8
+ *    @author Pavel Tzonkov <[email protected]>
9
+ * @copyright 2010-2014 KCFinder Project
10
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
11
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
12
+ *      @link http://kcfinder.sunhater.com
13
+ */
14 14
 
15 15
 class browser extends uploader {
16 16
     protected $action;
@@ -709,54 +709,54 @@  discard block
 block discarded – undo
709 709
         die;
710 710
     }
711 711
 
712
-	protected function getFiles($dir) {
713
-		$thumbDir = "{$this->config['uploadDir']}/{$this->config['thumbsDir']}/$dir";
714
-		$dir = "{$this->config['uploadDir']}/$dir";
715
-		$return = array();
716
-		$files = dir::content($dir, array('types' => "file"));
717
-		if ($files === false)
718
-			return $return;
719
-
720
-		foreach ($files as $file) {
721
-			$ext = file::getExtension($file);
722
-			$smallThumb = false;
723
-			if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg' )) ) {
724
-				$size = @getimagesize($file);
725
-				if (is_array($size) && count($size)) {
726
-					$thumb_file = "$thumbDir/" . basename($file);
727
-					if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file))
728
-						$this->makeThumb($file);
729
-					$smallThumb =
730
-						($size[0] <= $this->config['thumbWidth']) &&
731
-						($size[1] <= $this->config['thumbHeight']) &&
732
-						in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_PNG, IMAGETYPE_JPEG));
733
-				}
734
-			}
735
-			$stat = stat($file);
736
-			if ($stat === false) continue;
737
-			$name = basename($file);
738
-			$types = $this->config['types'];
739
-			$types = explode(' ',$types['images'].' '.$types['image']);
740
-			if (substr($name,0,1) == '.' && !$this->config['showHiddenFiles']) continue;
741
-			if ($this->type == 'images' && !in_array(strtolower($ext),$types)) continue;
742
-			$bigIcon = file_exists("themes/{$this->config['theme']}/img/files/big/$ext.png");
743
-			$smallIcon = file_exists("themes/{$this->config['theme']}/img/files/small/$ext.png");
744
-			$thumb = file_exists("$thumbDir/$name");
745
-			$return[] = array(
746
-				'name' => stripcslashes($name),
747
-				'size' => $stat['size'],
748
-				'mtime' => $stat['mtime'],
749
-				'date' => @strftime($this->dateTimeSmall, $stat['mtime']),
750
-				'readable' => is_readable($file),
751
-				'writable' => file::isWritable($file),
752
-				'bigIcon' => $bigIcon,
753
-				'smallIcon' => $smallIcon,
754
-				'thumb' => $thumb,
755
-				'smallThumb' => $smallThumb
756
-			);
757
-		}
758
-		return $return;
759
-	}
712
+    protected function getFiles($dir) {
713
+        $thumbDir = "{$this->config['uploadDir']}/{$this->config['thumbsDir']}/$dir";
714
+        $dir = "{$this->config['uploadDir']}/$dir";
715
+        $return = array();
716
+        $files = dir::content($dir, array('types' => "file"));
717
+        if ($files === false)
718
+            return $return;
719
+
720
+        foreach ($files as $file) {
721
+            $ext = file::getExtension($file);
722
+            $smallThumb = false;
723
+            if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg' )) ) {
724
+                $size = @getimagesize($file);
725
+                if (is_array($size) && count($size)) {
726
+                    $thumb_file = "$thumbDir/" . basename($file);
727
+                    if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file))
728
+                        $this->makeThumb($file);
729
+                    $smallThumb =
730
+                        ($size[0] <= $this->config['thumbWidth']) &&
731
+                        ($size[1] <= $this->config['thumbHeight']) &&
732
+                        in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_PNG, IMAGETYPE_JPEG));
733
+                }
734
+            }
735
+            $stat = stat($file);
736
+            if ($stat === false) continue;
737
+            $name = basename($file);
738
+            $types = $this->config['types'];
739
+            $types = explode(' ',$types['images'].' '.$types['image']);
740
+            if (substr($name,0,1) == '.' && !$this->config['showHiddenFiles']) continue;
741
+            if ($this->type == 'images' && !in_array(strtolower($ext),$types)) continue;
742
+            $bigIcon = file_exists("themes/{$this->config['theme']}/img/files/big/$ext.png");
743
+            $smallIcon = file_exists("themes/{$this->config['theme']}/img/files/small/$ext.png");
744
+            $thumb = file_exists("$thumbDir/$name");
745
+            $return[] = array(
746
+                'name' => stripcslashes($name),
747
+                'size' => $stat['size'],
748
+                'mtime' => $stat['mtime'],
749
+                'date' => @strftime($this->dateTimeSmall, $stat['mtime']),
750
+                'readable' => is_readable($file),
751
+                'writable' => file::isWritable($file),
752
+                'bigIcon' => $bigIcon,
753
+                'smallIcon' => $smallIcon,
754
+                'thumb' => $thumb,
755
+                'smallThumb' => $smallThumb
756
+            );
757
+        }
758
+        return $return;
759
+    }
760 760
 
761 761
     protected function getTree($dir, $index=0) {
762 762
         $path = explode("/", $dir);
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lang/pt-br.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 /** Portugues Brasil localization file for KCFinder
4
-  * author: Alexandre Benegas Ferreira
5
-  * country: Brasil
6
-  * company website: www.hostcataratas.com.br
7
-  * e-mail: [email protected]
8
-  */
4
+ * author: Alexandre Benegas Ferreira
5
+ * country: Brasil
6
+ * company website: www.hostcataratas.com.br
7
+ * e-mail: [email protected]
8
+ */
9 9
 
10 10
 $lang = array(
11 11
 
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lang/de.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 /** German localization file for KCFinder
4
-  * author: Tim Wahrendorff <[email protected]>
5
-  */
4
+ * author: Tim Wahrendorff <[email protected]>
5
+ */
6 6
 
7 7
 $lang = array(
8 8
 
Please login to merge, or discard this patch.