Completed
Pull Request — develop (#530)
by
unknown
05:43
created
manager/media/browser/mcpuk/lang/vi.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
 /** vi localization file for KCFinder
4
-  * Tran Van Quyet - HQV ltd
5
-  */
4
+ * Tran Van Quyet - HQV ltd
5
+ */
6 6
 
7 7
 $lang = array(
8 8
 
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/css.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 Base CSS definitions
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 Base CSS definitions
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
 require "core/autoload.php";
16 16
 $mtime = @filemtime(__FILE__);
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/js_localize.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 Load language labels into JavaScript
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 Load language labels into JavaScript
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
 require "core/autoload.php";
16 16
 $input = new input();
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/js/browser/joiner.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 Join all JavaScript files in current directory
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 Join all JavaScript files in current directory
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
 chdir(".."); // For compatibility
16 16
 chdir("..");
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/browser.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,14 +10,14 @@
 block discarded – undo
10 10
 			}
11 11
 		};
12 12
 <?php
13
-	if(isset($_GET['type']))     $type = htmlspecialchars(trim($_GET['type']), ENT_QUOTES);
14
-	elseif(isset($_GET['Type'])) $type = htmlspecialchars(trim($_GET['Type']), ENT_QUOTES);
13
+    if(isset($_GET['type']))     $type = htmlspecialchars(trim($_GET['type']), ENT_QUOTES);
14
+    elseif(isset($_GET['Type'])) $type = htmlspecialchars(trim($_GET['Type']), ENT_QUOTES);
15 15
     else                         $type = 'images';
16 16
     
17 17
     if($type==='image') $type = 'images';
18 18
     
19
-	$opener = (isset($_GET['editor'])) ? 'opener=' . htmlspecialchars(trim($_GET['editor']), ENT_QUOTES) : '';
20
-	$request_uri = "{$opener}&type={$type}";
19
+    $opener = (isset($_GET['editor'])) ? 'opener=' . htmlspecialchars(trim($_GET['editor']), ENT_QUOTES) : '';
20
+    $request_uri = "{$opener}&type={$type}";
21 21
 ?>
22 22
 		window.location.href = "browse.php?<?php echo $request_uri; ?>";
23 23
 	</script>
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lib/helper_dir.php 1 patch
Indentation   +29 added lines, -29 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 Directory 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 Directory 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 dir {
16 16
 
17
-  /** Checks if the given directory is really writable. The standard PHP
18
-    * function is_writable() does not work properly on Windows servers
19
-    * @param string $dir
20
-    * @return bool */
17
+    /** Checks if the given directory is really writable. The standard PHP
18
+     * function is_writable() does not work properly on Windows servers
19
+     * @param string $dir
20
+     * @return bool */
21 21
 
22 22
     static function isWritable($dir) {
23 23
         $dir = path::normalize($dir);
@@ -33,16 +33,16 @@  discard block
 block discarded – undo
33 33
         return true;
34 34
     }
35 35
 
36
-  /** Recursively delete the given directory. Returns TRUE on success.
37
-    * If $firstFailExit parameter is true (default), the method returns the
38
-    * path to the first failed file or directory which cannot be deleted.
39
-    * If $firstFailExit is false, the method returns an array with failed
40
-    * files and directories which cannot be deleted. The third parameter
41
-    * $failed is used for internal use only.
42
-    * @param string $dir
43
-    * @param bool $firstFailExit
44
-    * @param array $failed
45
-    * @return mixed */
36
+    /** Recursively delete the given directory. Returns TRUE on success.
37
+     * If $firstFailExit parameter is true (default), the method returns the
38
+     * path to the first failed file or directory which cannot be deleted.
39
+     * If $firstFailExit is false, the method returns an array with failed
40
+     * files and directories which cannot be deleted. The third parameter
41
+     * $failed is used for internal use only.
42
+     * @param string $dir
43
+     * @param bool $firstFailExit
44
+     * @param array $failed
45
+     * @return mixed */
46 46
 
47 47
     static function prune($dir, $firstFailExit=true, array $failed=null) {
48 48
         if ($failed === null) $failed = array();
@@ -81,11 +81,11 @@  discard block
 block discarded – undo
81 81
         return count($failed) ? $failed : true;
82 82
     }
83 83
 
84
-  /** Get the content of the given directory. Returns an array with filenames
85
-    * or FALSE on failure
86
-    * @param string $dir
87
-    * @param array $options
88
-    * @return mixed */
84
+    /** Get the content of the given directory. Returns an array with filenames
85
+     * or FALSE on failure
86
+     * @param string $dir
87
+     * @param array $options
88
+     * @return mixed */
89 89
 
90 90
     static function content($dir, array $options=null) {
91 91
 
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lib/class_image_imagick.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 ImageMagick 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 ImageMagick 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_imagick extends image {
16 16
 
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lib/class_input.php 1 patch
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -1,29 +1,29 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 /** This file is part of KCFinder project
4
-  *
5
-  *      @desc Input class for GET, POST and COOKIE requests
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 Input class for GET, POST and COOKIE requests
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 input {
16 16
 
17
-  /** Filtered $_GET array
18
-    * @var array */
17
+    /** Filtered $_GET array
18
+     * @var array */
19 19
     public $get;
20 20
 
21
-  /** Filtered $_POST array
22
-    * @var array */
21
+    /** Filtered $_POST array
22
+     * @var array */
23 23
     public $post;
24 24
 
25
-  /** Filtered $_COOKIE array
26
-    * @var array */
25
+    /** Filtered $_COOKIE array
26
+     * @var array */
27 27
     public $cookie;
28 28
 
29 29
     public function __construct() {
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
         $this->cookie = &$_COOKIE;
33 33
     }
34 34
 
35
-  /** Magic method to get non-public properties like public.
36
-    * @param string $property
37
-    * @return mixed */
35
+    /** Magic method to get non-public properties like public.
36
+     * @param string $property
37
+     * @return mixed */
38 38
 
39 39
     public function __get($property) {
40 40
         return property_exists($this, $property) ? $this->$property : null;
Please login to merge, or discard this patch.
manager/media/browser/mcpuk/lib/helper_path.php 1 patch
Indentation   +31 added lines, -31 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 Path 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 Path 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 path {
16 16
 
17
-  /** Get the absolute URL path of the given one. Returns FALSE if the URL
18
-    * is not valid or the current directory cannot be resolved (getcwd())
19
-    * @param string $path
20
-    * @return string */
17
+    /** Get the absolute URL path of the given one. Returns FALSE if the URL
18
+     * is not valid or the current directory cannot be resolved (getcwd())
19
+     * @param string $path
20
+     * @return string */
21 21
 
22 22
     static function rel2abs_url($path) {
23 23
         if (substr($path, 0, 1) == "/") return $path;
@@ -39,10 +39,10 @@  discard block
 block discarded – undo
39 39
         return $return;
40 40
     }
41 41
 
42
-  /** Resolve full filesystem path of given URL. Returns FALSE if the URL
43
-    * cannot be resolved
44
-    * @param string $url
45
-    * @return string */
42
+    /** Resolve full filesystem path of given URL. Returns FALSE if the URL
43
+     * cannot be resolved
44
+     * @param string $url
45
+     * @return string */
46 46
 
47 47
     static function url2fullPath($url) {
48 48
         $url = self::normalize($url);
@@ -84,13 +84,13 @@  discard block
 block discarded – undo
84 84
         }
85 85
     }
86 86
 
87
-  /** Normalize the given path. On Windows servers backslash will be replaced
88
-    * with slash. Remobes unnecessary doble slashes and double dots. Removes
89
-    * last slash if it exists. Examples:
90
-    * path::normalize("C:\\any\\path\\") returns "C:/any/path"
91
-    * path::normalize("/your/path/..//home/") returns "/your/home"
92
-    * @param string $path
93
-    * @return string */
87
+    /** Normalize the given path. On Windows servers backslash will be replaced
88
+     * with slash. Remobes unnecessary doble slashes and double dots. Removes
89
+     * last slash if it exists. Examples:
90
+     * path::normalize("C:\\any\\path\\") returns "C:/any/path"
91
+     * path::normalize("/your/path/..//home/") returns "/your/home"
92
+     * @param string $path
93
+     * @return string */
94 94
 
95 95
     static function normalize($path) {
96 96
         if (strtoupper(substr(PHP_OS, 0, 3)) == "WIN") {
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
         return $path;
115 115
     }
116 116
 
117
-  /** Encode URL Path
118
-    * @param string $path
119
-    * @return string */
117
+    /** Encode URL Path
118
+     * @param string $path
119
+     * @return string */
120 120
 
121 121
     static function urlPathEncode($path) {
122 122
         $path = self::normalize($path);
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
         return $encoded;
128 128
     }
129 129
 
130
-  /** Decode URL Path
131
-    * @param string $path
132
-    * @return string */
130
+    /** Decode URL Path
131
+     * @param string $path
132
+     * @return string */
133 133
 
134 134
     static function urlPathDecode($path) {
135 135
         $path = self::normalize($path);
Please login to merge, or discard this patch.