Completed
Push — develop ( d568f8...c061fc )
by Agel_Nash
06:25
created
manager/frames/1.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -246,18 +246,18 @@
 block discarded – undo
246 246
         lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . "\n" ?>
247 247
       };
248 248
       <?php
249
-      $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));
250
-      echo(empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";
251
-      ?>
249
+        $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));
250
+        echo(empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";
251
+        ?>
252 252
     </script>
253 253
     <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/modx.min.js?v=<?= $lastInstallTime ?>"></script>
254 254
     <?php if ($modx->config['show_picker'] != "0") {
255
-          ?>
255
+            ?>
256 256
         <script src="media/script/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
257 257
         <script src="media/script/spectrum/spectrum.evo.min.js" type="text/javascript"></script>
258 258
         <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js" type="text/javascript"></script>
259 259
     <?php
260
-      } ?>
260
+        } ?>
261 261
     <?php
262 262
     // invoke OnManagerTopPrerender event
263 263
     $evtOut = $modx->invokeEvent('OnManagerTopPrerender', $_REQUEST);
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/uploader.php 1 patch
Indentation   +36 added lines, -36 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 Uploader 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 Uploader 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 uploader
16 16
 {
@@ -19,92 +19,92 @@  discard block
 block discarded – undo
19 19
     const VERSION = "2.54";
20 20
 
21 21
     /** Config session-overrided settings
22
-      * @var array */
22
+     * @var array */
23 23
     protected $config = array();
24 24
 
25 25
     /** Default image driver
26
-      * @var string */
26
+     * @var string */
27 27
     protected $imageDriver = "gd";
28 28
 
29 29
     /** Opener applocation properties
30
-      *   $opener['name']                 Got from $_GET['opener'];
31
-      *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
32
-      *   $opener['TinyMCE']              Boolean
33
-      * @var array */
30
+     *   $opener['name']                 Got from $_GET['opener'];
31
+     *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
32
+     *   $opener['TinyMCE']              Boolean
33
+     * @var array */
34 34
     protected $opener = array();
35 35
 
36 36
     /** Got from $_GET['type'] or first one $config['types'] array key, if inexistant
37
-      * @var string */
37
+     * @var string */
38 38
     protected $type;
39 39
 
40 40
     /** Helper property. Local filesystem path to the Type Directory
41
-      * Equivalent: $config['uploadDir'] . "/" . $type
42
-      * @var string */
41
+     * Equivalent: $config['uploadDir'] . "/" . $type
42
+     * @var string */
43 43
     protected $typeDir;
44 44
 
45 45
     /** Helper property. Web URL to the Type Directory
46
-      * Equivalent: $config['uploadURL'] . "/" . $type
47
-      * @var string */
46
+     * Equivalent: $config['uploadURL'] . "/" . $type
47
+     * @var string */
48 48
     protected $typeURL;
49 49
 
50 50
     /** Linked to $config['types']
51
-      * @var array */
51
+     * @var array */
52 52
     protected $types = array();
53 53
 
54 54
     /** Settings which can override default settings if exists as keys in $config['types'][$type] array
55
-      * @var array */
55
+     * @var array */
56 56
     protected $typeSettings = array('disabled', 'theme', 'dirPerms', 'filePerms', 'denyZipDownload', 'maxImageWidth', 'maxImageHeight', 'thumbWidth', 'thumbHeight', 'jpegQuality', 'access', 'filenameChangeChars', 'dirnameChangeChars', 'denyExtensionRename', 'deniedExts', 'watermark');
57 57
 
58 58
     /** Got from language file
59
-      * @var string */
59
+     * @var string */
60 60
     protected $charset;
61 61
 
62 62
     /** The language got from $_GET['lng'] or $_GET['lang'] or... Please see next property
63
-      * @var string */
63
+     * @var string */
64 64
     protected $lang = 'en';
65 65
 
66 66
     /** Possible language $_GET keys
67
-      * @var array */
67
+     * @var array */
68 68
     protected $langInputNames = array('lang', 'langCode', 'lng', 'language', 'lang_code');
69 69
 
70 70
     /** Uploaded file(s) info. Linked to first $_FILES element
71
-      * @var array */
71
+     * @var array */
72 72
     protected $file;
73 73
 
74 74
     /** Next three properties are got from the current language file
75
-      * @var string */
75
+     * @var string */
76 76
     protected $dateTimeFull;   // Currently not used
77 77
     protected $dateTimeMid;    // Currently not used
78 78
     protected $dateTimeSmall;
79 79
 
80 80
     /** Contain Specified language labels
81
-      * @var array */
81
+     * @var array */
82 82
     protected $labels = array();
83 83
 
84 84
     /** Contain unprocessed $_GET array. Please use this instead of $_GET
85
-      * @var array */
85
+     * @var array */
86 86
     protected $get;
87 87
 
88 88
     /** Contain unprocessed $_POST array. Please use this instead of $_POST
89
-      * @var array */
89
+     * @var array */
90 90
     protected $post;
91 91
 
92 92
     /** Contain unprocessed $_COOKIE array. Please use this instead of $_COOKIE
93
-      * @var array */
93
+     * @var array */
94 94
     protected $cookie;
95 95
 
96 96
     /** Session array. Please use this property instead of $_SESSION
97
-      * @var array */
97
+     * @var array */
98 98
     protected $session;
99 99
 
100 100
     /** CMS integration attribute (got from $_GET['cms'])
101
-      * @var string */
101
+     * @var string */
102 102
     protected $cms = "";
103 103
 
104 104
     protected $modx = null;
105 105
     /** Magic method which allows read-only access to protected or private class properties
106
-      * @param string $property
107
-      * @return mixed */
106
+     * @param string $property
107
+     * @return mixed */
108 108
     public function __get($property)
109 109
     {
110 110
         return property_exists($this, $property) ? $this->$property : null;
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/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/browser.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 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
 {
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lib/class_image_gd.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 GD image driver 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 GD image driver 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 image_gd extends image
16 16
 {
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lib/helper_httpCache.php 1 patch
Indentation   +27 added lines, -27 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 HTTP cache helper 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 HTTP cache helper 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 httpCache
16 16
 {
@@ -18,13 +18,13 @@  discard block
 block discarded – undo
18 18
     const DEFAULT_EXPIRE = 604800; // in seconds
19 19
 
20 20
     /** Cache a file. The $type parameter might define the MIME type of the file
21
-      * or path to magic file to autodetect the MIME type. If you skip $type
22
-      * parameter the method will try with the default magic file. Autodetection
23
-      * of MIME type requires Fileinfo PHP extension used in file::getMimeType()
24
-      * @param string $file
25
-      * @param string $type
26
-      * @param integer $expire
27
-      * @param array $headers */
21
+     * or path to magic file to autodetect the MIME type. If you skip $type
22
+     * parameter the method will try with the default magic file. Autodetection
23
+     * of MIME type requires Fileinfo PHP extension used in file::getMimeType()
24
+     * @param string $file
25
+     * @param string $type
26
+     * @param integer $expire
27
+     * @param array $headers */
28 28
 
29 29
     public static function file($file, $type=null, $expire=null, array $headers=null)
30 30
     {
@@ -46,12 +46,12 @@  discard block
 block discarded – undo
46 46
     }
47 47
 
48 48
     /** Cache the given $content with $mtime modification time.
49
-      * @param binary $content
50
-      * @param integer $mtime
51
-      * @param string $type
52
-      * @param integer $expire
53
-      * @param array $headers
54
-      * @param bool $checkMTime */
49
+     * @param binary $content
50
+     * @param integer $mtime
51
+     * @param string $type
52
+     * @param integer $expire
53
+     * @param array $headers
54
+     * @param bool $checkMTime */
55 55
 
56 56
     public static function content($content, $mtime, $type=null, $expire=null, array $headers=null, $checkMTime=true)
57 57
     {
@@ -80,10 +80,10 @@  discard block
 block discarded – undo
80 80
     }
81 81
 
82 82
     /** Check if given modification time is newer than client-side one. If not,
83
-      * the method will tell the client to get the content from its own cache.
84
-      * Afterwards the script process will be terminated. This feature requires
85
-      * the PHP to be configured as Apache module.
86
-      * @param integer $mtime */
83
+     * the method will tell the client to get the content from its own cache.
84
+     * Afterwards the script process will be terminated. This feature requires
85
+     * the PHP to be configured as Apache module.
86
+     * @param integer $mtime */
87 87
 
88 88
     public static function checkMTime($mtime, $sendHeaders=null)
89 89
     {
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lib/helper_text.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -1,23 +1,23 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 /** This file is part of KCFinder project
4
-  *
5
-  *      @desc Text processing helper 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 Text processing helper 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 text
16 16
 {
17 17
 
18
-  /** Replace repeated white spaces to single space
19
-    * @param string $string
20
-    * @return string */
18
+    /** Replace repeated white spaces to single space
19
+     * @param string $string
20
+     * @return string */
21 21
 
22 22
     public static function clearWhitespaces($string)
23 23
     {
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
     }
26 26
 
27 27
     /** Normalize the string for HTML attribute value
28
-      * @param string $string
29
-      * @return string */
28
+     * @param string $string
29
+     * @return string */
30 30
 
31 31
     public static function htmlValue($string)
32 32
     {
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
     }
40 40
 
41 41
     /** Normalize the string for JavaScript string value
42
-      * @param string $string
43
-      * @return string */
42
+     * @param string $string
43
+     * @return string */
44 44
 
45 45
     public static function jsValue($string)
46 46
     {
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
     }
54 54
 
55 55
     /** Normalize the string for XML tag content data
56
-      * @param string $string
57
-      * @param bool $cdata */
56
+     * @param string $string
57
+     * @param bool $cdata */
58 58
 
59 59
     public static function xmlData($string, $cdata=false)
60 60
     {
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
     }
67 67
 
68 68
     /** Returns compressed content of given CSS code
69
-      * @param string $code
70
-      * @return string */
69
+     * @param string $code
70
+     * @return string */
71 71
 
72 72
     public static function compressCSS($code)
73 73
     {
Please login to merge, or discard this patch.