Completed
Push — 2.x ( 5243ac...ccb6e2 )
by Naoki
03:52
created
php/chars-test.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@
 block discarded – undo
24 24
 
25 25
 //                     й                 ё              Й               Ё              Ø         Å
26 26
 $patterns = array("\u0438\u0306", "\u0435\u0308", "\u0418\u0306", "\u0415\u0308", "\u00d8A", "\u030a");
27
-$replace  = array("\u0439",        "\u0451",       "\u0419",       "\u0401",       "\u00d8", "\u00c5");
27
+$replace  = array("\u0439", "\u0451", "\u0419", "\u0401", "\u00d8", "\u00c5");
28 28
 
29 29
 
30
-foreach(scandir($path) as $f) {
30
+foreach (scandir($path) as $f) {
31 31
 	if ($f != '.' && $f != '..' && substr($f, 0, 1) != '.') {
32 32
 		
33 33
 		// echo mb_detect_encoding($f);
Please login to merge, or discard this patch.
php/elFinderConnector.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 * @return void
35 35
 	 * @author Dmitry (dio) Levashov
36 36
 	 **/
37
-	public function __construct($elFinder, $debug=false) {
37
+	public function __construct($elFinder, $debug = false) {
38 38
 		
39 39
 		$this->elFinder = $elFinder;
40 40
 		if ($debug) {
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 		if ($isPost && !$src && $rawPostData = @file_get_contents('php://input')) {
55 55
 			// for support IE XDomainRequest()
56 56
 			$parts = explode('&', $rawPostData);
57
-			foreach($parts as $part) {
57
+			foreach ($parts as $part) {
58 58
 				list($key, $value) = array_pad(explode('=', $part), 2, '');
59 59
 				$key = rawurldecode($key);
60 60
 				if (substr($key, -2) === '[]') {
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 	 **/
122 122
 	protected function output(array $data) {
123 123
 		// clear output buffer
124
-		while(@ob_get_level()){ @ob_end_clean(); }
124
+		while (@ob_get_level()) { @ob_end_clean(); }
125 125
 		
126 126
 		$header = isset($data['header']) ? $data['header'] : $this->header;
127 127
 		unset($data['header']);
@@ -162,14 +162,14 @@  discard block
 block discarded – undo
162 162
 							$psize = $end - $start + 1;
163 163
 							
164 164
 							header('HTTP/1.1 206 Partial Content');
165
-							header('Content-Length: ' . $psize);
166
-							header('Content-Range: bytes ' . $start . '-' . $end . '/' . $size);
165
+							header('Content-Length: '.$psize);
166
+							header('Content-Range: bytes '.$start.'-'.$end.'/'.$size);
167 167
 							
168 168
 							fseek($fp, $start);
169 169
 						}
170 170
 					}
171 171
 				}
172
-				if (is_null($psize)){
172
+				if (is_null($psize)) {
173 173
 					rewind($fp);
174 174
 				}
175 175
 			} else {
Please login to merge, or discard this patch.
php/elFinderVolumeMySQL.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
 		$dirs = array();
312 312
 		if ($path != $this->root) {
313 313
 			$inpath = array(intval($path));
314
-			while($inpath) {
314
+			while ($inpath) {
315 315
 				$in = '('.join(',', $inpath).')';
316 316
 				$inpath = array();
317 317
 				$sql = 'SELECT f.id FROM %s AS f WHERE f.parent_id IN '.$in.' AND `mime` = \'directory\'';
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 		
331 331
 		if ($mimes) {
332 332
 			$whrs = array();
333
-			foreach($mimes as $mime) {
333
+			foreach ($mimes as $mime) {
334 334
 				if (strpos($mime, '/') === false) {
335 335
 					$whrs[] = sprintf('f.mime LIKE "%s/%%"', $this->db->real_escape_string($mime));
336 336
 				} else {
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 			$whr = sprintf('f.name RLIKE "%s"', $this->db->real_escape_string($q));
343 343
 		}
344 344
 		if ($dirs) {
345
-			$whr = '(' . $whr . ') AND (`parent_id` IN (' . join(',', $dirs) . '))';
345
+			$whr = '('.$whr.') AND (`parent_id` IN ('.join(',', $dirs).'))';
346 346
 		}
347 347
 		
348 348
 		$sql = 'SELECT f.id, f.parent_id, f.name, f.size, f.mtime AS ts, f.mime, f.read, f.write, f.locked, f.hidden, f.width, f.height, 0 AS dirs 
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
 	 * @return resource|false
588 588
 	 * @author Dmitry (dio) Levashov
589 589
 	 **/
590
-	protected function _fopen($path, $mode='rb') {
590
+	protected function _fopen($path, $mode = 'rb') {
591 591
 		$fp = $this->tmbPath
592 592
 			? @fopen($this->getTempFile($path), 'w+')
593 593
 			: @tmpfile();
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
 	 * @return bool
615 615
 	 * @author Dmitry (dio) Levashov
616 616
 	 **/
617
-	protected function _fclose($fp, $path='') {
617
+	protected function _fclose($fp, $path = '') {
618 618
 		@fclose($fp);
619 619
 		if ($path) {
620 620
 			@unlink($this->getTempFile($path));
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 		$this->clearcache();
747 747
 		
748 748
 		$mime = $stat['mime'];
749
-		$w = !empty($stat['width'])  ? $stat['width']  : 0;
749
+		$w = !empty($stat['width']) ? $stat['width'] : 0;
750 750
 		$h = !empty($stat['height']) ? $stat['height'] : 0;
751 751
 		
752 752
 		$id = $this->_joinPath($dir, $name);
Please login to merge, or discard this patch.
php/elFinderVolumeS3.class.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
 	 **/
62 62
 	protected function _dirname($path) {
63 63
 	
64
-		$newpath =  preg_replace("/\/$/", "", $path);
65
-		$dn = substr($path, 0, strrpos($newpath, '/')) ;
64
+		$newpath = preg_replace("/\/$/", "", $path);
65
+		$dn = substr($path, 0, strrpos($newpath, '/'));
66 66
 		
67 67
 		if (substr($dn, 0, 1) != '/') {
68 68
 		 $dn = "/$dn";
@@ -105,9 +105,9 @@  discard block
 block discarded – undo
105 105
 	 * @author Troex Nevelin
106 106
 	 **/
107 107
 	protected function _normpath($path) {
108
-		$tmp =  preg_replace("/^\//", "", $path);
109
-		$tmp =  preg_replace("/\/\//", "/", $tmp);
110
-		$tmp =  preg_replace("/\/$/", "", $tmp);
108
+		$tmp = preg_replace("/^\//", "", $path);
109
+		$tmp = preg_replace("/\/\//", "/", $tmp);
110
+		$tmp = preg_replace("/\/$/", "", $tmp);
111 111
 		return $tmp;
112 112
 	}
113 113
 
@@ -128,9 +128,9 @@  discard block
 block discarded – undo
128 128
 			$newpath = "/$newpath";
129 129
 		}
130 130
 		
131
-		$newpath =  preg_replace("/\/$/", "", $newpath);
131
+		$newpath = preg_replace("/\/$/", "", $newpath);
132 132
 	
133
-		$ret = ($newpath == $this->root) ? '' : substr($newpath, strlen($this->root)+1);
133
+		$ret = ($newpath == $this->root) ? '' : substr($newpath, strlen($this->root) + 1);
134 134
 		
135 135
 		return $ret;
136 136
 	}
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 		$np = $this->_normpath($path);
232 232
 		
233 233
 		try {
234
-			$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $np , 'GetMetadata' => true, 'InlineData' => false, 'GetData' => false));
234
+			$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $np, 'GetMetadata' => true, 'InlineData' => false, 'GetData' => false));
235 235
 		} catch (Exception $e) {
236 236
 		
237 237
 		}
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 		if (!isset($obj) || ($obj->GetObjectResponse->Status->Code != 200)) {
240 240
 			$np .= '/';
241 241
 			try {
242
-				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $np , 'GetMetadata' => true, 'InlineData' => false, 'GetData' => false));
242
+				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $np, 'GetMetadata' => true, 'InlineData' => false, 'GetData' => false));
243 243
 			} catch (Exception $e) {
244 244
 		
245 245
 			}
@@ -341,14 +341,14 @@  discard block
 block discarded – undo
341 341
 	 **/
342 342
 	protected function _scandir($path) {
343 343
 		
344
-		$s3path = preg_replace("/^\//", "", $path) . '/';
344
+		$s3path = preg_replace("/^\//", "", $path).'/';
345 345
 		
346 346
 		$files = $this->s3->ListBucket(array('Bucket' => $this->options['bucket'], 'delimiter' => '/', 'Prefix' => $s3path))->ListBucketResponse->Contents;
347 347
 	
348 348
 		$finalfiles = array();
349 349
 		
350 350
 		foreach ($files as $file) {
351
-			if (preg_match("|^" . $s3path . "[^/]*/?$|", $file->Key)) {
351
+			if (preg_match("|^".$s3path."[^/]*/?$|", $file->Key)) {
352 352
 				$fname = preg_replace("/\/$/", "", $file->Key);
353 353
 				$fname = $file->Key;
354 354
 				
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
 	 * @author Dmitry (dio) Levashov,
374 374
 	 * @author Alexey Sukhotin
375 375
 	 **/
376
-	protected function _fopen($path, $mode="rb") {
376
+	protected function _fopen($path, $mode = "rb") {
377 377
 	
378 378
 		$tn = $this->getTempFile($path);
379 379
 	
@@ -385,8 +385,8 @@  discard block
 block discarded – undo
385 385
 		if ($fp) {
386 386
 
387 387
 			try {
388
-				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $this->_normpath($path) , 'GetMetadata' => true, 'InlineData' => true, 'GetData' => true));
389
-			}	catch (Exception $e) {
388
+				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $this->_normpath($path), 'GetMetadata' => true, 'InlineData' => true, 'GetData' => true));
389
+			} catch (Exception $e) {
390 390
 		
391 391
 			}
392 392
 				
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 	 * @return bool
411 411
 	 * @author Dmitry (dio) Levashov
412 412
 	 **/
413
-	protected function _fclose($fp, $path='') {
413
+	protected function _fclose($fp, $path = '') {
414 414
 		@fclose($fp);
415 415
 		if ($path) {
416 416
 			@unlink($this->getTempFile($path));
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
 		$newkey = "$newkey/$name/";
436 436
 
437 437
 		try {
438
-			$obj = $this->s3->PutObjectInline(array('Bucket' => $this->options['bucket'], 'Key' => $newkey , 'ContentLength' => 0, 'Data' => ''));
438
+			$obj = $this->s3->PutObjectInline(array('Bucket' => $this->options['bucket'], 'Key' => $newkey, 'ContentLength' => 0, 'Data' => ''));
439 439
 		} catch (Exception $e) {
440 440
 		
441 441
 		}
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
462 462
 		$newkey = "$newkey/$name";
463 463
 
464 464
 		try {
465
-			$obj = $this->s3->PutObjectInline(array('Bucket' => $this->options['bucket'], 'Key' => $newkey , 'ContentLength' => 0, 'Data' => '', 'Metadata' => array(array('Name' => 'Content-Type', 'Value' => 'text/plain'))));
465
+			$obj = $this->s3->PutObjectInline(array('Bucket' => $this->options['bucket'], 'Key' => $newkey, 'ContentLength' => 0, 'Data' => '', 'Metadata' => array(array('Name' => 'Content-Type', 'Value' => 'text/plain'))));
466 466
 		} catch (Exception $e) {
467 467
 		
468 468
 		}
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
 	 * @author Dmitry (dio) Levashov
564 564
 	 **/
565 565
 	protected function _rmdir($path) {
566
-		return $this->_unlink($path . '/');
566
+		return $this->_unlink($path.'/');
567 567
 	}
568 568
 
569 569
 	/**
@@ -682,7 +682,7 @@  discard block
 block discarded – undo
682 682
 		/* Getting list of S3 web service functions which requires signing */
683 683
 		$funcs = $this->__getFunctions();
684 684
 		
685
-		$funcnames  = array();
685
+		$funcnames = array();
686 686
 		
687 687
 		foreach ($funcs as $func) {
688 688
 			preg_match("/\S+\s+([^\)]+)\(/", $func, $m);
@@ -723,7 +723,7 @@  discard block
 block discarded – undo
723 723
 			'Timestamp' => gmdate('Y-m-d\TH:i:s.000\Z'),
724 724
 		);
725 725
 
726
-		$sign_str = 'AmazonS3' . $operation . $params['Timestamp'];
726
+		$sign_str = 'AmazonS3'.$operation.$params['Timestamp'];
727 727
 		
728 728
 		$params['Signature'] = base64_encode(hash_hmac('sha1', $sign_str, $this->secretkey, TRUE));
729 729
 		
Please login to merge, or discard this patch.
php/plugins/Watermark/plugin.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
 
58 58
 	public function __construct($opts) {
59 59
 		$defaults = array(
60
-			'enable'         => true,       // For control by volume driver
60
+			'enable'         => true, // For control by volume driver
61 61
 			'source'         => 'logo.png', // Path to Water mark image
62
-			'marginRight'    => 5,          // Margin right pixel
63
-			'marginBottom'   => 5,          // Margin bottom pixel
64
-			'quality'        => 95,         // JPEG image save quality
65
-			'transparency'   => 70,         // Water mark image transparency ( other than PNG )
66
-			'targetType'     => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP, // Target image formats ( bit-field )
62
+			'marginRight'    => 5, // Margin right pixel
63
+			'marginBottom'   => 5, // Margin bottom pixel
64
+			'quality'        => 95, // JPEG image save quality
65
+			'transparency'   => 70, // Water mark image transparency ( other than PNG )
66
+			'targetType'     => IMG_GIF | IMG_JPG | IMG_PNG | IMG_WBMP, // Target image formats ( bit-field )
67 67
 			'targetMinPixel' => 200         // Target image minimum pixel size
68 68
 		);
69 69
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 			$opts = array_merge($this->opts, $volOpts);
80 80
 		}
81 81
 		
82
-		if (! $opts['enable']) {
82
+		if (!$opts['enable']) {
83 83
 			return false;
84 84
 		}
85 85
 		
@@ -94,12 +94,12 @@  discard block
 block discarded – undo
94 94
 		}
95 95
 		
96 96
 		// check water mark image
97
-		if (! file_exists($opts['source'])) {
98
-			$opts['source'] = dirname(__FILE__) . "/" . $opts['source'];
97
+		if (!file_exists($opts['source'])) {
98
+			$opts['source'] = dirname(__FILE__)."/".$opts['source'];
99 99
 		}
100 100
 		if (is_readable($opts['source'])) {
101 101
 			$watermarkImgInfo = @getimagesize($opts['source']);
102
-			if (! $watermarkImgInfo) {
102
+			if (!$watermarkImgInfo) {
103 103
 				return false;
104 104
 			}
105 105
 		} else {
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 			IMAGETYPE_PNG => IMG_PNG,
120 120
 			IMAGETYPE_WBMP => IMG_WBMP,
121 121
 		);
122
-		if (! ($opts['targetType'] & $imgTypes[$srcImgInfo[2]])) {
122
+		if (!($opts['targetType'] & $imgTypes[$srcImgInfo[2]])) {
123 123
 			return false;
124 124
 		}
125 125
 		
@@ -192,14 +192,14 @@  discard block
 block discarded – undo
192 192
 				break;
193 193
 			case 'image/jpeg':
194 194
 				if (@imagetypes() & IMG_JPG) {
195
-					$oWatermarkImg = @imagecreatefromjpeg($watermark) ;
195
+					$oWatermarkImg = @imagecreatefromjpeg($watermark);
196 196
 				} else {
197 197
 					$ermsg = 'JPEG images are not supported';
198 198
 				}
199 199
 				break;
200 200
 			case 'image/png':
201 201
 				if (@imagetypes() & IMG_PNG) {
202
-					$oWatermarkImg = @imagecreatefrompng($watermark) ;
202
+					$oWatermarkImg = @imagecreatefrompng($watermark);
203 203
 				} else {
204 204
 					$ermsg = 'PNG images are not supported';
205 205
 				}
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 				break;
218 218
 		}
219 219
 		
220
-		if (! $ermsg) {
220
+		if (!$ermsg) {
221 221
 			switch ($srcImgInfo['mime']) {
222 222
 				case 'image/gif':
223 223
 					if (@imagetypes() & IMG_GIF) {
@@ -228,14 +228,14 @@  discard block
 block discarded – undo
228 228
 					break;
229 229
 				case 'image/jpeg':
230 230
 					if (@imagetypes() & IMG_JPG) {
231
-						$oSrcImg = @imagecreatefromjpeg($src) ;
231
+						$oSrcImg = @imagecreatefromjpeg($src);
232 232
 					} else {
233 233
 						$ermsg = 'JPEG images are not supported';
234 234
 					}
235 235
 					break;
236 236
 				case 'image/png':
237 237
 					if (@imagetypes() & IMG_PNG) {
238
-						$oSrcImg = @imagecreatefrompng($src) ;
238
+						$oSrcImg = @imagecreatefrompng($src);
239 239
 					} else {
240 240
 						$ermsg = 'PNG images are not supported';
241 241
 					}
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 		if ($srcImgInfo['mime'] === 'image/png') {
262 262
 			if (function_exists('imagecolorallocatealpha')) {
263 263
 				$bg = imagecolorallocatealpha($oSrcImg, 255, 255, 255, 127);
264
-				imagefill($oSrcImg, 0, 0 , $bg);
264
+				imagefill($oSrcImg, 0, 0, $bg);
265 265
 			}
266 266
 		}
267 267
 		
Please login to merge, or discard this patch.
php/plugins/Sanitizer/plugin.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 	
50 50
 	public function __construct($opts) {
51 51
 		$defaults = array(
52
-			'enable'   => true,  // For control by volume driver
53
-			'targets'  => array('\\','/',':','*','?','"','<','>','|'), // target chars
52
+			'enable'   => true, // For control by volume driver
53
+			'targets'  => array('\\', '/', ':', '*', '?', '"', '<', '>', '|'), // target chars
54 54
 			'replace'  => '_'    // replace to this
55 55
 		);
56 56
 	
@@ -59,13 +59,13 @@  discard block
 block discarded – undo
59 59
 	
60 60
 	public function cmdPreprocess($cmd, &$args, $elfinder, $volume) {
61 61
 		$opts = $this->getOpts($volume);
62
-		if (! $opts['enable']) {
62
+		if (!$opts['enable']) {
63 63
 			return false;
64 64
 		}
65 65
 	
66 66
 		if (isset($args['name'])) {
67 67
 			if (is_array($args['name'])) {
68
-				foreach($args['name'] as $i => $name) {
68
+				foreach ($args['name'] as $i => $name) {
69 69
 					$args['name'][$i] = $this->sanitizeFileName($name, $opts);
70 70
 				}
71 71
 			} else {
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
 	public function onUpLoadPreSave(&$path, &$name, $src, $elfinder, $volume) {
79 79
 		$opts = $this->getOpts($volume);
80
-		if (! $opts['enable']) {
80
+		if (!$opts['enable']) {
81 81
 			return false;
82 82
 		}
83 83
 	
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 	}
101 101
 	
102 102
 	private function sanitizeFileName($filename, $opts, $allows = array()) {
103
-		$targets = $allows? array_diff($opts['targets'], $allows) : $opts['targets'];
103
+		$targets = $allows ? array_diff($opts['targets'], $allows) : $opts['targets'];
104 104
 		return str_replace($targets, $opts['replace'], $filename);
105 105
   	}
106 106
 }
Please login to merge, or discard this patch.
php/plugins/Normalizer/plugin.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -58,9 +58,9 @@  discard block
 block discarded – undo
58 58
 	
59 59
 	public function __construct($opts) {
60 60
 		$defaults = array(
61
-			'enable'    => true,  // For control by volume driver
62
-			'nfc'       => true,  // Canonical Decomposition followed by Canonical Composition
63
-			'nfkc'      => true,  // Compatibility Decomposition followed by Canonical
61
+			'enable'    => true, // For control by volume driver
62
+			'nfc'       => true, // Canonical Decomposition followed by Canonical Composition
63
+			'nfkc'      => true, // Compatibility Decomposition followed by Canonical
64 64
 			'lowercase' => false, // Make chars lowercase
65 65
 			'convmap'   => array()// Convert map ('FROM' => 'TO') array
66 66
 		);
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
 	
71 71
 	public function cmdPreprocess($cmd, &$args, $elfinder, $volume) {
72 72
 		$opts = $this->getOpts($volume);
73
-		if (! $opts['enable']) {
73
+		if (!$opts['enable']) {
74 74
 			return false;
75 75
 		}
76 76
 		
77 77
 		if (isset($args['name'])) {
78 78
 			if (is_array($args['name'])) {
79
-				foreach($args['name'] as $i => $name) {
79
+				foreach ($args['name'] as $i => $name) {
80 80
 					$args['name'][$i] = $this->normalize($name, $opts);
81 81
 				}
82 82
 			} else {
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	
89 89
 	public function onUpLoadPreSave(&$path, &$name, $src, $elfinder, $volume) {
90 90
 		$opts = $this->getOpts($volume);
91
-		if (! $opts['enable']) {
91
+		if (!$opts['enable']) {
92 92
 			return false;
93 93
 		}
94 94
 		
@@ -113,12 +113,12 @@  discard block
 block discarded – undo
113 113
 	private function normalize($str, $opts) {
114 114
 		if ($opts['nfc'] || $opts['nfkc']) {
115 115
 			if (class_exists('Normalizer', false)) {
116
-				if ($opts['nfc'] && ! Normalizer::isNormalized($str, Normalizer::FORM_C))
116
+				if ($opts['nfc'] && !Normalizer::isNormalized($str, Normalizer::FORM_C))
117 117
 					$str = Normalizer::normalize($str, Normalizer::FORM_C);
118
-				if ($opts['nfkc'] && ! Normalizer::isNormalized($str, Normalizer::FORM_KC))
118
+				if ($opts['nfkc'] && !Normalizer::isNormalized($str, Normalizer::FORM_KC))
119 119
 					$str = Normalizer::normalize($str, Normalizer::FORM_KC);
120 120
 			} else {
121
-				if (! class_exists('I18N_UnicodeNormalizer', false)) {
121
+				if (!class_exists('I18N_UnicodeNormalizer', false)) {
122 122
 					@ include_once 'I18N/UnicodeNormalizer.php';
123 123
 				}
124 124
 				if (class_exists('I18N_UnicodeNormalizer', false)) {
Please login to merge, or discard this patch.
php/plugins/AutoResize/plugin.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
 
53 53
 	public function __construct($opts) {
54 54
 		$defaults = array(
55
-			'enable'         => true,       // For control by volume driver
56
-			'maxWidth'       => 1024,       // Path to Water mark image
57
-			'maxHeight'      => 1024,       // Margin right pixel
58
-			'quality'        => 95,         // JPEG image save quality
59
-			'preserveExif'   => false,      // Preserve EXIF data (Imagick only)
60
-			'targetType'     => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP // Target image formats ( bit-field )
55
+			'enable'         => true, // For control by volume driver
56
+			'maxWidth'       => 1024, // Path to Water mark image
57
+			'maxHeight'      => 1024, // Margin right pixel
58
+			'quality'        => 95, // JPEG image save quality
59
+			'preserveExif'   => false, // Preserve EXIF data (Imagick only)
60
+			'targetType'     => IMG_GIF | IMG_JPG | IMG_PNG | IMG_WBMP // Target image formats ( bit-field )
61 61
 		);
62 62
 
63 63
 		$this->opts = array_merge($defaults, $opts);
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 			$opts = array_merge($this->opts, $volOpts);
72 72
 		}
73 73
 		
74
-		if (! $opts['enable']) {
74
+		if (!$opts['enable']) {
75 75
 			return false;
76 76
 		}
77 77
 		
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 				IMAGETYPE_PNG => IMG_PNG,
88 88
 				IMAGETYPE_WBMP => IMG_WBMP,
89 89
 		);
90
-		if (! ($opts['targetType'] & $imgTypes[$srcImgInfo[2]])) {
90
+		if (!($opts['targetType'] & $imgTypes[$srcImgInfo[2]])) {
91 91
 			return false;
92 92
 		}
93 93
 		
@@ -99,9 +99,9 @@  discard block
 block discarded – undo
99 99
 	}
100 100
 	
101 101
 	private function resize($src, $srcImgInfo, $maxWidth, $maxHeight, $quality, $preserveExif) {
102
-		$zoom = min(($maxWidth/$srcImgInfo[0]),($maxHeight/$srcImgInfo[1]));
103
-		$width = round($srcImgInfo[0] * $zoom);
104
-		$height = round($srcImgInfo[1] * $zoom);
102
+		$zoom = min(($maxWidth/$srcImgInfo[0]), ($maxHeight/$srcImgInfo[1]));
103
+		$width = round($srcImgInfo[0]*$zoom);
104
+		$height = round($srcImgInfo[1]*$zoom);
105 105
 		
106 106
 		if (class_exists('Imagick', false)) {
107 107
 			return $this->resize_imagick($src, $width, $height, $quality, $preserveExif);
@@ -121,14 +121,14 @@  discard block
 block discarded – undo
121 121
 				break;
122 122
 			case 'image/jpeg':
123 123
 				if (@imagetypes() & IMG_JPG) {
124
-					$oSrcImg = @imagecreatefromjpeg($src) ;
124
+					$oSrcImg = @imagecreatefromjpeg($src);
125 125
 				} else {
126 126
 					$ermsg = 'JPEG images are not supported';
127 127
 				}
128 128
 				break;
129 129
 			case 'image/png':
130 130
 				if (@imagetypes() & IMG_PNG) {
131
-					$oSrcImg = @imagecreatefrompng($src) ;
131
+					$oSrcImg = @imagecreatefrompng($src);
132 132
 				} else {
133 133
 					$ermsg = 'PNG images are not supported';
134 134
 				}
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 				break;
147 147
 		}
148 148
 		
149
-		if ($oSrcImg &&  false != ($tmp = imagecreatetruecolor($width, $height))) {
149
+		if ($oSrcImg && false != ($tmp = imagecreatetruecolor($width, $height))) {
150 150
 			
151 151
 			if (!imagecopyresampled($tmp, $oSrcImg, 0, 0, 0, 0, $width, $height, $srcImgInfo[0], $srcImgInfo[1])) {
152 152
 				return false;
Please login to merge, or discard this patch.
php/elFinder.class.php 1 patch
Spacing   +162 added lines, -162 removed lines patch added patch discarded remove patch
@@ -203,14 +203,14 @@  discard block
 block discarded – undo
203 203
 	const ERROR_INV_PARAMS        = 'errCmdParams';
204 204
 	const ERROR_OPEN              = 'errOpen';
205 205
 	const ERROR_DIR_NOT_FOUND     = 'errFolderNotFound';
206
-	const ERROR_FILE_NOT_FOUND    = 'errFileNotFound';     // 'File not found.'
206
+	const ERROR_FILE_NOT_FOUND    = 'errFileNotFound'; // 'File not found.'
207 207
 	const ERROR_TRGDIR_NOT_FOUND  = 'errTrgFolderNotFound'; // 'Target folder "$1" not found.'
208 208
 	const ERROR_NOT_DIR           = 'errNotFolder';
209 209
 	const ERROR_NOT_FILE          = 'errNotFile';
210 210
 	const ERROR_PERM_DENIED       = 'errPerm';
211
-	const ERROR_LOCKED            = 'errLocked';        // '"$1" is locked and can not be renamed, moved or removed.'
212
-	const ERROR_EXISTS            = 'errExists';        // 'File named "$1" already exists.'
213
-	const ERROR_INVALID_NAME      = 'errInvName';       // 'Invalid file name.'
211
+	const ERROR_LOCKED            = 'errLocked'; // '"$1" is locked and can not be renamed, moved or removed.'
212
+	const ERROR_EXISTS            = 'errExists'; // 'File named "$1" already exists.'
213
+	const ERROR_INVALID_NAME      = 'errInvName'; // 'Invalid file name.'
214 214
 	const ERROR_MKDIR             = 'errMkdir';
215 215
 	const ERROR_MKFILE            = 'errMkfile';
216 216
 	const ERROR_RENAME            = 'errRename';
@@ -219,20 +219,20 @@  discard block
 block discarded – undo
219 219
 	const ERROR_COPY_FROM         = 'errCopyFrom';
220 220
 	const ERROR_COPY_TO           = 'errCopyTo';
221 221
 	const ERROR_COPY_ITSELF       = 'errCopyInItself';
222
-	const ERROR_REPLACE           = 'errReplace';          // 'Unable to replace "$1".'
223
-	const ERROR_RM                = 'errRm';               // 'Unable to remove "$1".'
224
-	const ERROR_RM_SRC            = 'errRmSrc';            // 'Unable remove source file(s)'
225
-	const ERROR_MKOUTLINK         = 'errMkOutLink';        // 'Unable to create a link to outside the volume root.'
226
-	const ERROR_UPLOAD            = 'errUpload';           // 'Upload error.'
227
-	const ERROR_UPLOAD_FILE       = 'errUploadFile';       // 'Unable to upload "$1".'
228
-	const ERROR_UPLOAD_NO_FILES   = 'errUploadNoFiles';    // 'No files found for upload.'
229
-	const ERROR_UPLOAD_TOTAL_SIZE = 'errUploadTotalSize';  // 'Data exceeds the maximum allowed size.'
230
-	const ERROR_UPLOAD_FILE_SIZE  = 'errUploadFileSize';   // 'File exceeds maximum allowed size.'
231
-	const ERROR_UPLOAD_FILE_MIME  = 'errUploadMime';       // 'File type not allowed.'
232
-	const ERROR_UPLOAD_TRANSFER   = 'errUploadTransfer';   // '"$1" transfer error.'
233
-	const ERROR_UPLOAD_TEMP       = 'errUploadTemp';       // 'Unable to make temporary file for upload.'
222
+	const ERROR_REPLACE           = 'errReplace'; // 'Unable to replace "$1".'
223
+	const ERROR_RM                = 'errRm'; // 'Unable to remove "$1".'
224
+	const ERROR_RM_SRC            = 'errRmSrc'; // 'Unable remove source file(s)'
225
+	const ERROR_MKOUTLINK         = 'errMkOutLink'; // 'Unable to create a link to outside the volume root.'
226
+	const ERROR_UPLOAD            = 'errUpload'; // 'Upload error.'
227
+	const ERROR_UPLOAD_FILE       = 'errUploadFile'; // 'Unable to upload "$1".'
228
+	const ERROR_UPLOAD_NO_FILES   = 'errUploadNoFiles'; // 'No files found for upload.'
229
+	const ERROR_UPLOAD_TOTAL_SIZE = 'errUploadTotalSize'; // 'Data exceeds the maximum allowed size.'
230
+	const ERROR_UPLOAD_FILE_SIZE  = 'errUploadFileSize'; // 'File exceeds maximum allowed size.'
231
+	const ERROR_UPLOAD_FILE_MIME  = 'errUploadMime'; // 'File type not allowed.'
232
+	const ERROR_UPLOAD_TRANSFER   = 'errUploadTransfer'; // '"$1" transfer error.'
233
+	const ERROR_UPLOAD_TEMP       = 'errUploadTemp'; // 'Unable to make temporary file for upload.'
234 234
 	// const ERROR_ACCESS_DENIED     = 'errAccess';
235
-	const ERROR_NOT_REPLACE       = 'errNotReplace';       // Object "$1" already exists at this location and can not be replaced with object of another type.
235
+	const ERROR_NOT_REPLACE       = 'errNotReplace'; // Object "$1" already exists at this location and can not be replaced with object of another type.
236 236
 	const ERROR_SAVE              = 'errSave';
237 237
 	const ERROR_EXTRACT           = 'errExtract';
238 238
 	const ERROR_ARCHIVE           = 'errArchive';
@@ -247,14 +247,14 @@  discard block
 block discarded – undo
247 247
 	const ERROR_NETMOUNT          = 'errNetMount';
248 248
 	const ERROR_NETUNMOUNT        = 'errNetUnMount';
249 249
 	const ERROR_NETMOUNT_NO_DRIVER = 'errNetMountNoDriver';
250
-	const ERROR_NETMOUNT_FAILED       = 'errNetMountFailed';
250
+	const ERROR_NETMOUNT_FAILED = 'errNetMountFailed';
251 251
 
252
-	const ERROR_SESSION_EXPIRES 	= 'errSessionExpires';
252
+	const ERROR_SESSION_EXPIRES = 'errSessionExpires';
253 253
 
254 254
 	const ERROR_CREATING_TEMP_DIR 	= 'errCreatingTempDir';
255 255
 	const ERROR_FTP_DOWNLOAD_FILE 	= 'errFtpDownloadFile';
256
-	const ERROR_FTP_UPLOAD_FILE 	= 'errFtpUploadFile';
257
-	const ERROR_FTP_MKDIR 		= 'errFtpMkdir';
256
+	const ERROR_FTP_UPLOAD_FILE = 'errFtpUploadFile';
257
+	const ERROR_FTP_MKDIR = 'errFtpMkdir';
258 258
 	const ERROR_ARCHIVE_EXEC 	= 'errArchiveExec';
259 259
 	const ERROR_EXTRACT_EXEC 	= 'errExtractExec';
260 260
 
@@ -281,17 +281,17 @@  discard block
 block discarded – undo
281 281
 		
282 282
 		$this->time  = $this->utime();
283 283
 		$this->debug = (isset($opts['debug']) && $opts['debug'] ? true : false);
284
-		$this->sessionCloseEarlier = isset($opts['sessionCloseEarlier'])? (bool)$opts['sessionCloseEarlier'] : true;
284
+		$this->sessionCloseEarlier = isset($opts['sessionCloseEarlier']) ? (bool) $opts['sessionCloseEarlier'] : true;
285 285
 		$this->sessionUseCmds = array_flip($sessionUseCmds);
286 286
 		$this->timeout = (isset($opts['timeout']) ? $opts['timeout'] : 0);
287 287
 		$this->uploadTempPath = (isset($opts['uploadTempPath']) ? $opts['uploadTempPath'] : '');
288
-		$this->netVolumesSessionKey = !empty($opts['netVolumesSessionKey'])? $opts['netVolumesSessionKey'] : 'elFinderNetVolumes';
288
+		$this->netVolumesSessionKey = !empty($opts['netVolumesSessionKey']) ? $opts['netVolumesSessionKey'] : 'elFinderNetVolumes';
289 289
 		$this->callbackWindowURL = (isset($opts['callbackWindowURL']) ? $opts['callbackWindowURL'] : '');
290 290
 		self::$sessionCacheKey = !empty($opts['sessionCacheKey']) ? $opts['sessionCacheKey'] : 'elFinderCaches';
291 291
 		
292 292
 		// check session cache
293 293
 		$_optsMD5 = md5(json_encode($opts['roots']));
294
-		if (! isset($_SESSION[self::$sessionCacheKey]) || $_SESSION[self::$sessionCacheKey]['_optsMD5'] !== $_optsMD5) {
294
+		if (!isset($_SESSION[self::$sessionCacheKey]) || $_SESSION[self::$sessionCacheKey]['_optsMD5'] !== $_optsMD5) {
295 295
 			$_SESSION[self::$sessionCacheKey] = array(
296 296
 				'_optsMD5' => $_optsMD5
297 297
 			);
@@ -310,20 +310,20 @@  discard block
 block discarded – undo
310 310
 			$_reqCmd = isset($_req['cmd']) ? $_req['cmd'] : '';
311 311
 			foreach ($opts['bind'] as $cmd => $handlers) {
312 312
 				$doRegist = (strpos($cmd, '*') !== false);
313
-				if (! $doRegist) {
313
+				if (!$doRegist) {
314 314
 					$_getcmd = create_function('$cmd', 'list($ret) = explode(\'.\', $cmd);return trim($ret);');
315 315
 					$doRegist = ($_reqCmd && in_array($_reqCmd, array_map($_getcmd, explode(' ', $cmd))));
316 316
 				}
317 317
 				if ($doRegist) {
318
-					if (! is_array($handlers) || is_object($handlers[0])) {
318
+					if (!is_array($handlers) || is_object($handlers[0])) {
319 319
 						$handlers = array($handlers);
320 320
 					}
321
-					foreach($handlers as $handler) {
321
+					foreach ($handlers as $handler) {
322 322
 						if ($handler) {
323 323
 							if (is_string($handler) && strpos($handler, '.')) {
324 324
 								list($_domain, $_name, $_method) = array_pad(explode('.', $handler), 3, '');
325 325
 								if (strcasecmp($_domain, 'plugin') === 0) {
326
-									if ($plugin = $this->getPluginInstance($_name, isset($opts['plugin'][$_name])? $opts['plugin'][$_name] : array())
326
+									if ($plugin = $this->getPluginInstance($_name, isset($opts['plugin'][$_name]) ? $opts['plugin'][$_name] : array())
327 327
 											and method_exists($plugin, $_method)) {
328 328
 										$this->bind($cmd, array($plugin, $_method));
329 329
 									}
@@ -410,13 +410,13 @@  discard block
 block discarded – undo
410 410
 	public function bind($cmd, $handler) {
411 411
 		$allCmds = array_keys($this->commands);
412 412
 		$cmds = array();
413
-		foreach(explode(' ', $cmd) as $_cmd) {
413
+		foreach (explode(' ', $cmd) as $_cmd) {
414 414
 			if ($_cmd !== '') {
415 415
 				if ($all = strpos($_cmd, '*') !== false) {
416 416
 					list(, $sub) = array_pad(explode('.', $_cmd), 2, '');
417 417
 					if ($sub) {
418 418
 						$sub = str_replace('\'', '\\\'', $sub);
419
-						$addSub = create_function('$cmd', 'return $cmd . \'.\' . trim(\'' . $sub . '\');');
419
+						$addSub = create_function('$cmd', 'return $cmd . \'.\' . trim(\''.$sub.'\');');
420 420
 						$cmds = array_merge($cmds, array_map($addSub, $allCmds));
421 421
 					} else {
422 422
 						$cmds = array_merge($cmds, $allCmds);
@@ -496,16 +496,16 @@  discard block
 block discarded – undo
496 496
 
497 497
 	private function session_expires() {
498 498
 		
499
-		if (!isset($_SESSION[self::$sessionCacheKey . ':LAST_ACTIVITY'])) {
500
-			$_SESSION[self::$sessionCacheKey . ':LAST_ACTIVITY'] = time();
499
+		if (!isset($_SESSION[self::$sessionCacheKey.':LAST_ACTIVITY'])) {
500
+			$_SESSION[self::$sessionCacheKey.':LAST_ACTIVITY'] = time();
501 501
 			return false;
502 502
 		}
503 503
 
504
-		if ( ($this->timeout > 0) && (time() - $_SESSION[self::$sessionCacheKey . ':LAST_ACTIVITY'] > $this->timeout) ) {
504
+		if (($this->timeout > 0) && (time() - $_SESSION[self::$sessionCacheKey.':LAST_ACTIVITY'] > $this->timeout)) {
505 505
 			return true;
506 506
 		}
507 507
 
508
-		$_SESSION[self::$sessionCacheKey . ':LAST_ACTIVITY'] = time();
508
+		$_SESSION[self::$sessionCacheKey.':LAST_ACTIVITY'] = time();
509 509
 		return false;	
510 510
 	}
511 511
 	
@@ -538,9 +538,9 @@  discard block
 block discarded – undo
538 538
 		}
539 539
 
540 540
 		// call pre handlers for this command
541
-		$args['sessionCloseEarlier'] = isset($this->sessionUseCmds[$cmd])? false : $this->sessionCloseEarlier;
541
+		$args['sessionCloseEarlier'] = isset($this->sessionUseCmds[$cmd]) ? false : $this->sessionCloseEarlier;
542 542
 		if (!empty($this->listeners[$cmd.'.pre'])) {
543
-			$volume = isset($args['target'])? $this->volume($args['target']) : false;
543
+			$volume = isset($args['target']) ? $this->volume($args['target']) : false;
544 544
 			foreach ($this->listeners[$cmd.'.pre'] as $handler) {
545 545
 				call_user_func_array($handler, array($cmd, &$args, $this, $volume));
546 546
 			}
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
 		$this->sessionCloseEarlier && $args['sessionCloseEarlier'] && session_id() && session_write_close();
551 551
 		unset($this->sessionCloseEarlier);
552 552
 		
553
-		if (substr(PHP_OS,0,3) === 'WIN') {
553
+		if (substr(PHP_OS, 0, 3) === 'WIN') {
554 554
 			// set time out
555 555
 			if (($_max_execution_time = ini_get('max_execution_time')) && $_max_execution_time < 300) {
556 556
 				@set_time_limit(300);
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
 		// call handlers for this command
570 570
 		if (!empty($this->listeners[$cmd])) {
571 571
 			foreach ($this->listeners[$cmd] as $handler) {
572
-				if (call_user_func_array($handler,array($cmd,&$result,$args,$this))) {
572
+				if (call_user_func_array($handler, array($cmd, &$result, $args, $this))) {
573 573
 					// handler return true to force sync client after command completed
574 574
 					$result['sync'] = true;
575 575
 				}
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
 	 * @return string
629 629
 	 * @author Dmitry (dio) Levashov
630 630
 	 **/
631
-	public function realpath($hash)	{
631
+	public function realpath($hash) {
632 632
 		if (($volume = $this->volume($hash)) == false) {
633 633
 			return false;
634 634
 		}
@@ -684,11 +684,11 @@  discard block
 block discarded – undo
684 684
 	 */
685 685
 	protected function getPluginInstance($name, $opts = array()) {
686 686
 		$key = strtolower($name);
687
-		if (! isset($this->plugins[$key])) {
688
-			$p_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR . $name . DIRECTORY_SEPARATOR . 'plugin.php';
687
+		if (!isset($this->plugins[$key])) {
688
+			$p_file = dirname(__FILE__).DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$name.DIRECTORY_SEPARATOR.'plugin.php';
689 689
 			if (is_file($p_file)) {
690 690
 				require_once $p_file;
691
-				$class = 'elFinderPlugin' . $name;
691
+				$class = 'elFinderPlugin'.$name;
692 692
 				$this->plugins[$key] = new $class($opts);
693 693
 			} else {
694 694
 				$this->plugins[$key] = false;
@@ -780,8 +780,8 @@  discard block
 block discarded – undo
780 780
 		
781 781
 		$netVolumes = $this->getNetVolumes();
782 782
 		if ($volume->mount($options)) {
783
-			if (! $key = @ $volume->netMountKey) {
784
-				$key = md5($protocol . '-' . join('-', $options));
783
+			if (!$key = @ $volume->netMountKey) {
784
+				$key = md5($protocol.'-'.join('-', $options));
785 785
 			}
786 786
 			$options['driver'] = $driver;
787 787
 			$options['netkey'] = $key;
@@ -850,14 +850,14 @@  discard block
 block discarded – undo
850 850
 		}
851 851
 		// long polling mode
852 852
 		if ($args['compare']) {
853
-			$sleep = max(1, (int)$volume->getOption('lsPlSleep'));
854
-			$limit = max(1, (int)$volume->getOption('plStandby') / $sleep);
853
+			$sleep = max(1, (int) $volume->getOption('lsPlSleep'));
854
+			$limit = max(1, (int) $volume->getOption('plStandby')/$sleep);
855 855
 			$timelimit = ini_get('max_execution_time');
856 856
 			$compare = $args['compare'];
857 857
 			do {
858 858
 				$timelimit && @ set_time_limit($timelimit + $sleep);
859 859
 				$_mtime = 0;
860
-				foreach($ls as $_f) {
860
+				foreach ($ls as $_f) {
861 861
 					$_mtime = max($_mtime, $_f['ts']);
862 862
 				}
863 863
 				$compare = strval(count($ls)).':'.strval($_mtime);
@@ -871,7 +871,7 @@  discard block
 block discarded – undo
871 871
 						break;
872 872
 					}
873 873
 				}
874
-			} while($limit);
874
+			} while ($limit);
875 875
 			if ($ls === false) {
876 876
 				return array('error' => $this->error(self::ERROR_OPEN, $cwd['name'], $volume->error()));
877 877
 			}
@@ -1014,24 +1014,24 @@  discard block
 block discarded – undo
1014 1014
 		}
1015 1015
 
1016 1016
 		// allow change MIME type by 'file.pre' callback functions
1017
-		$mime = isset($args['mime'])? $args['mime'] : $file['mime'];
1017
+		$mime = isset($args['mime']) ? $args['mime'] : $file['mime'];
1018 1018
 		if ($download) {
1019 1019
 			$disp = 'attachment';
1020 1020
 		} else {
1021 1021
 			$dispInlineRegex = $volume->getOption('dispInlineRegex');
1022 1022
 			$inlineRegex = false;
1023 1023
 			if ($dispInlineRegex) {
1024
-				$inlineRegex = '#' . str_replace('#', '\\#', $dispInlineRegex) . '#';
1024
+				$inlineRegex = '#'.str_replace('#', '\\#', $dispInlineRegex).'#';
1025 1025
 				try {
1026 1026
 					preg_match($inlineRegex, '');
1027
-				} catch(Exception $e) {
1027
+				} catch (Exception $e) {
1028 1028
 					$inlineRegex = false;
1029 1029
 				}
1030 1030
 			}
1031 1031
 			if (!$inlineRegex) {
1032 1032
 				$inlineRegex = '#^(?:(?:image|text)|application/x-shockwave-flash$)#';
1033 1033
 			}
1034
-			$disp  = preg_match($inlineRegex, $mime)? 'inline' : 'attachment';
1034
+			$disp = preg_match($inlineRegex, $mime) ? 'inline' : 'attachment';
1035 1035
 		}
1036 1036
 		
1037 1037
 		$filenameEncoded = rawurlencode($file['name']);
@@ -1140,7 +1140,7 @@  discard block
 block discarded – undo
1140 1140
 		$name   = $args['name'];
1141 1141
 		
1142 1142
 		if (($volume = $this->volume($target)) == false
1143
-		||  ($rm  = $volume->file($target)) == false) {
1143
+		||  ($rm = $volume->file($target)) == false) {
1144 1144
 			return array('error' => $this->error(self::ERROR_RENAME, '#'.$target, self::ERROR_FILE_NOT_FOUND));
1145 1145
 		}
1146 1146
 		$rm['realpath'] = $volume->realpath($target);
@@ -1218,9 +1218,9 @@  discard block
 block discarded – undo
1218 1218
 	* @retval false  error
1219 1219
 	* @author Naoki Sawada
1220 1220
 	**/
1221
-	protected function get_remote_contents( &$url, $timeout = 30, $redirect_max = 5, $ua = 'Mozilla/5.0', $fp = null ) {
1222
-		$method = (function_exists('curl_exec') && !ini_get('safe_mode'))? 'curl_get_contents' : 'fsock_get_contents'; 
1223
-		return $this->$method( $url, $timeout, $redirect_max, $ua, $fp );
1221
+	protected function get_remote_contents(&$url, $timeout = 30, $redirect_max = 5, $ua = 'Mozilla/5.0', $fp = null) {
1222
+		$method = (function_exists('curl_exec') && !ini_get('safe_mode')) ? 'curl_get_contents' : 'fsock_get_contents'; 
1223
+		return $this->$method($url, $timeout, $redirect_max, $ua, $fp);
1224 1224
 	}
1225 1225
 	
1226 1226
 	/**
@@ -1236,26 +1236,26 @@  discard block
 block discarded – undo
1236 1236
 	 * @retval false  error
1237 1237
 	 * @author Naoki Sawada
1238 1238
 	 **/
1239
-	 protected function curl_get_contents( &$url, $timeout, $redirect_max, $ua, $outfp ){
1239
+	 protected function curl_get_contents(&$url, $timeout, $redirect_max, $ua, $outfp) {
1240 1240
 		$ch = curl_init();
1241
-		curl_setopt( $ch, CURLOPT_URL, $url );
1242
-		curl_setopt( $ch, CURLOPT_HEADER, false );
1241
+		curl_setopt($ch, CURLOPT_URL, $url);
1242
+		curl_setopt($ch, CURLOPT_HEADER, false);
1243 1243
 		if ($outfp) {
1244
-			curl_setopt( $ch, CURLOPT_FILE, $outfp );
1244
+			curl_setopt($ch, CURLOPT_FILE, $outfp);
1245 1245
 		} else {
1246
-			curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
1247
-			curl_setopt( $ch, CURLOPT_BINARYTRANSFER, true );
1248
-		}
1249
-		curl_setopt( $ch, CURLOPT_LOW_SPEED_LIMIT, 1 );
1250
-		curl_setopt( $ch, CURLOPT_LOW_SPEED_TIME, $timeout );
1251
-		curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
1252
-		curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, 1);
1253
-		curl_setopt( $ch, CURLOPT_MAXREDIRS, $redirect_max);
1254
-		curl_setopt( $ch, CURLOPT_USERAGENT, $ua);
1255
-		$result = curl_exec( $ch );
1246
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
1247
+			curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
1248
+		}
1249
+		curl_setopt($ch, CURLOPT_LOW_SPEED_LIMIT, 1);
1250
+		curl_setopt($ch, CURLOPT_LOW_SPEED_TIME, $timeout);
1251
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
1252
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
1253
+		curl_setopt($ch, CURLOPT_MAXREDIRS, $redirect_max);
1254
+		curl_setopt($ch, CURLOPT_USERAGENT, $ua);
1255
+		$result = curl_exec($ch);
1256 1256
 		$url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
1257
-		curl_close( $ch );
1258
-		return $outfp? $outfp : $result;
1257
+		curl_close($ch);
1258
+		return $outfp ? $outfp : $result;
1259 1259
 	}
1260 1260
 	
1261 1261
 	/**
@@ -1271,7 +1271,7 @@  discard block
 block discarded – undo
1271 1271
 	 * @retval false  error
1272 1272
 	 * @author Naoki Sawada
1273 1273
 	 */
1274
-	protected function fsock_get_contents( &$url, $timeout, $redirect_max, $ua, $outfp ) {
1274
+	protected function fsock_get_contents(&$url, $timeout, $redirect_max, $ua, $outfp) {
1275 1275
 
1276 1276
 		$connect_timeout = 3;
1277 1277
 		$connect_try = 3;
@@ -1282,7 +1282,7 @@  discard block
 block discarded – undo
1282 1282
 		$headers = '';
1283 1283
 		
1284 1284
 		$arr = parse_url($url);
1285
-		if (!$arr){
1285
+		if (!$arr) {
1286 1286
 			// Bad request
1287 1287
 			return false;
1288 1288
 		}
@@ -1290,7 +1290,7 @@  discard block
 block discarded – undo
1290 1290
 		// query
1291 1291
 		$arr['query'] = isset($arr['query']) ? '?'.$arr['query'] : '';
1292 1292
 		// port
1293
-		$arr['port'] = isset($arr['port']) ? $arr['port'] : (!empty($arr['https'])? 443 : 80);
1293
+		$arr['port'] = isset($arr['port']) ? $arr['port'] : (!empty($arr['https']) ? 443 : 80);
1294 1294
 		
1295 1295
 		$url_base = $arr['scheme'].'://'.$arr['host'].':'.$arr['port'];
1296 1296
 		$url_path = isset($arr['path']) ? $arr['path'] : '/';
@@ -1299,21 +1299,21 @@  discard block
 block discarded – undo
1299 1299
 		$query = $method.' '.$uri." HTTP/1.0\r\n";
1300 1300
 		$query .= "Host: ".$arr['host']."\r\n";
1301 1301
 		if (!empty($ua)) $query .= "User-Agent: ".$ua."\r\n";
1302
-		if (!is_null($getSize)) $query .= 'Range: bytes=0-' . ($getSize - 1) . "\r\n";
1302
+		if (!is_null($getSize)) $query .= 'Range: bytes=0-'.($getSize - 1)."\r\n";
1303 1303
 		
1304 1304
 		$query .= $headers;
1305 1305
 
1306 1306
 		$query .= "\r\n";
1307 1307
 
1308 1308
 		$fp = $connect_try_count = 0;
1309
-		while( !$fp && $connect_try_count < $connect_try ) {
1309
+		while (!$fp && $connect_try_count < $connect_try) {
1310 1310
 	
1311 1311
 			$errno = 0;
1312 1312
 			$errstr = "";
1313 1313
 			$fp = @ fsockopen(
1314 1314
 			$arr['https'].$arr['host'],
1315 1315
 			$arr['port'],
1316
-			$errno,$errstr,$connect_timeout);
1316
+			$errno, $errstr, $connect_timeout);
1317 1317
 			if ($fp) break;
1318 1318
 			$connect_try_count++;
1319 1319
 			if (connection_aborted()) {
@@ -1338,13 +1338,13 @@  discard block
 block discarded – undo
1338 1338
 		
1339 1339
 		$_response = '';
1340 1340
 		$header = '';
1341
-		while($_response !== "\r\n"){
1341
+		while ($_response !== "\r\n") {
1342 1342
 			$_response = fgets($fp, $readsize);
1343 1343
 			$header .= $_response;
1344 1344
 		};
1345 1345
 		
1346
-		$rccd = array_pad(explode(' ',$header,3), 3, ''); // array('HTTP/1.1','200','OK\r\n...')
1347
-		$rc = (int)$rccd[1];
1346
+		$rccd = array_pad(explode(' ', $header, 3), 3, ''); // array('HTTP/1.1','200','OK\r\n...')
1347
+		$rc = (int) $rccd[1];
1348 1348
 		
1349 1349
 		// Redirect
1350 1350
 		switch ($rc) {
@@ -1353,19 +1353,19 @@  discard block
 block discarded – undo
1353 1353
 			case 302: // Moved Temporarily
1354 1354
 			case 301: // Moved Permanently
1355 1355
 				$matches = array();
1356
-				if (preg_match('/^Location: (.+?)(#.+)?$/im',$header,$matches) && --$redirect_max > 0) {
1356
+				if (preg_match('/^Location: (.+?)(#.+)?$/im', $header, $matches) && --$redirect_max > 0) {
1357 1357
 					$url = trim($matches[1]);
1358
-					$hash = isset($matches[2])? trim($matches[2]) : '';
1359
-					if (!preg_match('/^https?:\//',$url)) { // no scheme
1358
+					$hash = isset($matches[2]) ? trim($matches[2]) : '';
1359
+					if (!preg_match('/^https?:\//', $url)) { // no scheme
1360 1360
 						if ($url{0} != '/') { // Relative path
1361 1361
 							// to Absolute path
1362
-							$url = substr($url_path,0,strrpos($url_path,'/')).'/'.$url;
1362
+							$url = substr($url_path, 0, strrpos($url_path, '/')).'/'.$url;
1363 1363
 						}
1364 1364
 						// add sheme,host
1365 1365
 						$url = $url_base.$url;
1366 1366
 					}
1367 1367
 					fclose($fp);
1368
-					return $this->fsock_get_contents( $url, $timeout, $redirect_max, $ua, $outfp );
1368
+					return $this->fsock_get_contents($url, $timeout, $redirect_max, $ua, $outfp);
1369 1369
 				}
1370 1370
 		}
1371 1371
 		
@@ -1374,7 +1374,7 @@  discard block
 block discarded – undo
1374 1374
 			$outfp = fopen('php://temp', 'rwb');
1375 1375
 			$body = true;
1376 1376
 		}
1377
-		while(fwrite($outfp, fread($fp, $readsize))) {
1377
+		while (fwrite($outfp, fread($fp, $readsize))) {
1378 1378
 			if ($timeout) {
1379 1379
 				$_status = socket_get_status($fp);
1380 1380
 				if ($_status['timed_out']) {
@@ -1393,7 +1393,7 @@  discard block
 block discarded – undo
1393 1393
 		
1394 1394
 		fclose($fp);
1395 1395
 		
1396
-		return $outfp? $outfp : $body; // Data
1396
+		return $outfp ? $outfp : $body; // Data
1397 1397
 	}
1398 1398
 	
1399 1399
 	/**
@@ -1404,13 +1404,13 @@  discard block
 block discarded – undo
1404 1404
 	 * @return array
1405 1405
 	 * @author Naoki Sawada
1406 1406
 	 */
1407
-	protected function parse_data_scheme( $str, $extTable ) {
1407
+	protected function parse_data_scheme($str, $extTable) {
1408 1408
 		$data = $name = '';
1409 1409
 		if ($fp = fopen('data://'.substr($str, 5), 'rb')) {
1410 1410
 			if ($data = stream_get_contents($fp)) {
1411 1411
 				$meta = stream_get_meta_data($fp);
1412
-				$ext = isset($extTable[$meta['mediatype']])? '.' . $extTable[$meta['mediatype']] : '';
1413
-				$name = substr(md5($data), 0, 8) . $ext;
1412
+				$ext = isset($extTable[$meta['mediatype']]) ? '.'.$extTable[$meta['mediatype']] : '';
1413
+				$name = substr(md5($data), 0, 8).$ext;
1414 1414
 			}
1415 1415
 			fclose($fp);
1416 1416
 		}
@@ -1474,7 +1474,7 @@  discard block
 block discarded – undo
1474 1474
 			}
1475 1475
 		}
1476 1476
 		
1477
-		return ($mime && isset($extTable[$mime]))? ('.' . $extTable[$mime]) : '';
1477
+		return ($mime && isset($extTable[$mime])) ? ('.'.$extTable[$mime]) : '';
1478 1478
 	}
1479 1479
 	
1480 1480
 	/**
@@ -1496,12 +1496,12 @@  discard block
 block discarded – undo
1496 1496
 			$testDirs[] = sys_get_temp_dir();
1497 1497
 		}
1498 1498
 		$tempDir = '';
1499
-		foreach($testDirs as $testDir) {
1499
+		foreach ($testDirs as $testDir) {
1500 1500
 			if (!$testDir || !is_dir($testDir)) continue;
1501 1501
 			if (is_writable($testDir)) {
1502 1502
 				$tempDir = $testDir;
1503 1503
 				$gc = time() - 3600;
1504
-				foreach(glob($tempDir . DIRECTORY_SEPARATOR .'ELF*') as $cf) {
1504
+				foreach (glob($tempDir.DIRECTORY_SEPARATOR.'ELF*') as $cf) {
1505 1505
 					if (filemtime($cf) < $gc) {
1506 1506
 						@unlink($cf);
1507 1507
 					}
@@ -1521,7 +1521,7 @@  discard block
 block discarded – undo
1521 1521
 	 **/
1522 1522
 	protected function chmod($args) {
1523 1523
 		$targets = $args['targets'];
1524
-		$mode    = intval((string)$args['mode'], 8);
1524
+		$mode    = intval((string) $args['mode'], 8);
1525 1525
 
1526 1526
 		if (!is_array($targets)) {
1527 1527
 			$targets = array($targets);
@@ -1536,10 +1536,10 @@  discard block
 block discarded – undo
1536 1536
 
1537 1537
 		$files = array();
1538 1538
 		$errors = array();
1539
-		foreach($targets as $target) {
1539
+		foreach ($targets as $target) {
1540 1540
 			$file = $volume->chmod($target, $mode);
1541 1541
 			if ($file) {
1542
-				$files = array_merge($files, is_array($file)? $file : array($file));
1542
+				$files = array_merge($files, is_array($file) ? $file : array($file));
1543 1543
 			} else {
1544 1544
 				$errors = array_merge($errors, $volume->error());
1545 1545
 			}
@@ -1570,26 +1570,26 @@  discard block
 block discarded – undo
1570 1570
 	private function checkChunkedFile($tmpname, $chunk, $cid, $tempDir, $volume = null) {
1571 1571
 		if (preg_match('/^(.+)(\.\d+_(\d+))\.part$/s', $chunk, $m)) {
1572 1572
 			$fname = $m[1];
1573
-			$encname = md5($cid . '_' . $fname);
1574
-			$base = $tempDir . DIRECTORY_SEPARATOR . 'ELF' . $encname;
1573
+			$encname = md5($cid.'_'.$fname);
1574
+			$base = $tempDir.DIRECTORY_SEPARATOR.'ELF'.$encname;
1575 1575
 			$clast = intval($m[3]);
1576 1576
 			if (is_null($tmpname)) {
1577 1577
 				ignore_user_abort(true);
1578 1578
 				sleep(10); // wait 10 sec
1579 1579
 				// chunked file upload fail
1580
-				foreach(glob($base . '*') as $cf) {
1580
+				foreach (glob($base.'*') as $cf) {
1581 1581
 					@unlink($cf);
1582 1582
 				}
1583 1583
 				ignore_user_abort(false);
1584 1584
 				return;
1585 1585
 			}
1586 1586
 			
1587
-			$range = isset($_POST['range'])? trim($_POST['range']) : '';
1587
+			$range = isset($_POST['range']) ? trim($_POST['range']) : '';
1588 1588
 			if ($range && preg_match('/^(\d+),(\d+),(\d+)$/', $range, $ranges)) {
1589 1589
 				$start = $ranges[1];
1590 1590
 				$len   = $ranges[2];
1591 1591
 				$size  = $ranges[3];
1592
-				$tmp = $base . '.part';
1592
+				$tmp = $base.'.part';
1593 1593
 				$csize = filesize($tmpname);
1594 1594
 				
1595 1595
 				$tmpExists = is_file($tmp);
@@ -1615,7 +1615,7 @@  discard block
 block discarded – undo
1615 1615
 				} else {
1616 1616
 					// wait until makeing temp file (for anothor session)
1617 1617
 					$cnt = 1200; // Time limit 120 sec
1618
-					while(!is_file($base) && --$cnt) {
1618
+					while (!is_file($base) && --$cnt) {
1619 1619
 						usleep(100000); // wait 100ms
1620 1620
 					}
1621 1621
 					if (!$cnt) {
@@ -1650,13 +1650,13 @@  discard block
 block discarded – undo
1650 1650
 				}
1651 1651
 			} else {
1652 1652
 				// old way
1653
-				$part = $base . $m[2];
1653
+				$part = $base.$m[2];
1654 1654
 				if (move_uploaded_file($tmpname, $part)) {
1655 1655
 					@chmod($part, 0600);
1656
-					if ($clast < count(glob($base . '*'))) {
1656
+					if ($clast < count(glob($base.'*'))) {
1657 1657
 						$parts = array();
1658 1658
 						for ($i = 0; $i <= $clast; $i++) {
1659
-							$name = $base . '.' . $i . '_' . $clast;
1659
+							$name = $base.'.'.$i.'_'.$clast;
1660 1660
 							if (is_readable($name)) {
1661 1661
 								$parts[] = $name;
1662 1662
 							} else {
@@ -1669,7 +1669,7 @@  discard block
 block discarded – undo
1669 1669
 								touch($base);
1670 1670
 								if ($resfile = tempnam($tempDir, 'ELF')) {
1671 1671
 									$target = fopen($resfile, 'wb');
1672
-									foreach($parts as $f) {
1672
+									foreach ($parts as $f) {
1673 1673
 										$fp = fopen($f, 'rb');
1674 1674
 										while (!feof($fp)) {
1675 1675
 											fwrite($target, fread($fp, 8192));
@@ -1705,15 +1705,15 @@  discard block
 block discarded – undo
1705 1705
 		$files  = isset($args['FILES']['upload']) && is_array($args['FILES']['upload']) ? $args['FILES']['upload'] : array();
1706 1706
 		$header = empty($args['html']) ? array() : array('header' => 'Content-Type: text/html; charset=utf-8');
1707 1707
 		$result = array_merge(array('added' => array()), $header);
1708
-		$paths  = $args['upload_path']? $args['upload_path'] : array();
1709
-		$chunk  = $args['chunk']? $args['chunk'] : '';
1710
-		$cid    = $args['cid']? (int)$args['cid'] : '';
1708
+		$paths  = $args['upload_path'] ? $args['upload_path'] : array();
1709
+		$chunk  = $args['chunk'] ? $args['chunk'] : '';
1710
+		$cid    = $args['cid'] ? (int) $args['cid'] : '';
1711 1711
 		
1712
-		$renames= array();
1712
+		$renames = array();
1713 1713
 		$suffix = '~';
1714 1714
 		if ($args['renames'] && is_array($args['renames'])) {
1715 1715
 			$renames = array_flip($args['renames']);
1716
-			if (is_string($args['suffix']) && ! preg_match($ngReg, $args['suffix'])) {
1716
+			if (is_string($args['suffix']) && !preg_match($ngReg, $args['suffix'])) {
1717 1717
 				$suffix = $args['suffix'];
1718 1718
 			}
1719 1719
 		}
@@ -1746,7 +1746,7 @@  discard block
 block discarded – undo
1746 1746
 			if (!$args['upload'] && $args['name'] && is_array($args['name'])) {
1747 1747
 				$error = '';
1748 1748
 				$result['name'] = array();
1749
-				foreach($args['name'] as $_i => $_name) {
1749
+				foreach ($args['name'] as $_i => $_name) {
1750 1750
 					if (!$volume->isUploadableByName($_name)) {
1751 1751
 						$error = $this->error(self::ERROR_UPLOAD_FILE, $_name, self::ERROR_UPLOAD_FILE_MIME);
1752 1752
 						break;
@@ -1767,7 +1767,7 @@  discard block
 block discarded – undo
1767 1767
 			}
1768 1768
 			if (isset($args['upload']) && is_array($args['upload']) && ($tempDir = $this->getTempDir($volume->getTempPath()))) {
1769 1769
 				$names = array();
1770
-				foreach($args['upload'] as $i => $url) {
1770
+				foreach ($args['upload'] as $i => $url) {
1771 1771
 					// check chunked file upload commit
1772 1772
 					if ($args['chunk']) {
1773 1773
 						if ($url === 'chunkfail' && $args['mimes'] === 'chunkfail') {
@@ -1777,7 +1777,7 @@  discard block
 block discarded – undo
1777 1777
 							}
1778 1778
 							return $result;
1779 1779
 						} else {
1780
-							$tmpfname = $tempDir . '/' . $args['chunk'];
1780
+							$tmpfname = $tempDir.'/'.$args['chunk'];
1781 1781
 							$files['tmp_name'][$i] = $tmpfname;
1782 1782
 							$files['name'][$i] = $url;
1783 1783
 							$files['error'][$i] = 0;
@@ -1786,7 +1786,7 @@  discard block
 block discarded – undo
1786 1786
 						}
1787 1787
 					}
1788 1788
 					
1789
-					$tmpfname = $tempDir . DIRECTORY_SEPARATOR . 'ELF_FATCH_' . md5($url.microtime(true));
1789
+					$tmpfname = $tempDir.DIRECTORY_SEPARATOR.'ELF_FATCH_'.md5($url.microtime(true));
1790 1790
 					
1791 1791
 					$_name = '';
1792 1792
 					// check is data:
@@ -1822,8 +1822,8 @@  discard block
 block discarded – undo
1822 1822
 								list($_a, $_b) = array_pad(explode('.', $_name, 2), 2, '');
1823 1823
 								if ($_b === '') {
1824 1824
 									if ($_ext) {
1825
-										rename($tmpfname, $tmpfname . $_ext);
1826
-										$tmpfname = $tmpfname . $_ext;
1825
+										rename($tmpfname, $tmpfname.$_ext);
1826
+										$tmpfname = $tmpfname.$_ext;
1827 1827
 									}
1828 1828
 									$_b = $this->detectFileExtension($tmpfname);
1829 1829
 									$_name = $_a.$_b;
@@ -1858,7 +1858,7 @@  discard block
 block discarded – undo
1858 1858
 			}
1859 1859
 			
1860 1860
 			$tmpname = $files['tmp_name'][$i];
1861
-			$path = ($paths && !empty($paths[$i]))? $paths[$i] : '';
1861
+			$path = ($paths && !empty($paths[$i])) ? $paths[$i] : '';
1862 1862
 			if ($name === 'blob') {
1863 1863
 				if ($chunk) {
1864 1864
 					if ($tempDir = $this->getTempDir($volume->getTempPath())) {
@@ -1868,7 +1868,7 @@  discard block
 block discarded – undo
1868 1868
 								preg_match('/^(.+)(\.\d+_(\d+))\.part$/s', $chunk, $m);
1869 1869
 								$result['error'] = $this->error(self::ERROR_UPLOAD_FILE, $m[1], $tmpname);
1870 1870
 								$result['_chunkfailure'] = true;
1871
-								$this->uploadDebug = 'Upload error: ' . $tmpname;
1871
+								$this->uploadDebug = 'Upload error: '.$tmpname;
1872 1872
 							} else if ($name) {
1873 1873
 								$result['_chunkmerged'] = basename($tmpname);
1874 1874
 								$result['_name'] = $name;
@@ -1882,14 +1882,14 @@  discard block
 block discarded – undo
1882 1882
 				} else {
1883 1883
 					// for form clipboard with Google Chrome
1884 1884
 					$type = $files['type'][$i];
1885
-					$ext = isset($extTable[$type])? '.' . $extTable[$type] : '';
1886
-					$name = substr(md5(basename($tmpname)), 0, 8) . $ext;
1885
+					$ext = isset($extTable[$type]) ? '.'.$extTable[$type] : '';
1886
+					$name = substr(md5(basename($tmpname)), 0, 8).$ext;
1887 1887
 				}
1888 1888
 			}
1889 1889
 			
1890 1890
 			// do hook function 'upload.presave'
1891
-			if (! empty($this->listeners['upload.presave'])) {
1892
-				foreach($this->listeners['upload.presave'] as $handler) {
1891
+			if (!empty($this->listeners['upload.presave'])) {
1892
+				foreach ($this->listeners['upload.presave'] as $handler) {
1893 1893
 					call_user_func_array($handler, array(&$path, &$name, $tmpname, $this, $volume));
1894 1894
 				}
1895 1895
 			}
@@ -1897,7 +1897,7 @@  discard block
 block discarded – undo
1897 1897
 			if (($fp = fopen($tmpname, 'rb')) == false) {
1898 1898
 				$result['warning'] = $this->error(self::ERROR_UPLOAD_FILE, $name, self::ERROR_UPLOAD_TRANSFER);
1899 1899
 				$this->uploadDebug = 'Upload error: unable open tmp file';
1900
-				if (! is_uploaded_file($tmpname)) {
1900
+				if (!is_uploaded_file($tmpname)) {
1901 1901
 					if (@ unlink($tmpname)) unset($GLOBALS['elFinderTempFiles'][$tmpfname]);
1902 1902
 					continue;
1903 1903
 				}
@@ -1919,18 +1919,18 @@  discard block
 block discarded – undo
1919 1919
 					}
1920 1920
 				}
1921 1921
 			}
1922
-			if (! $_target || ($file = $volume->upload($fp, $_target, $name, $tmpname)) === false) {
1922
+			if (!$_target || ($file = $volume->upload($fp, $_target, $name, $tmpname)) === false) {
1923 1923
 				$result['warning'] = $this->error(self::ERROR_UPLOAD_FILE, $name, $volume->error());
1924 1924
 				fclose($fp);
1925
-				if (! is_uploaded_file($tmpname)) {
1926
-					if (@ unlink($tmpname)) unset($GLOBALS['elFinderTempFiles'][$tmpname]);;
1925
+				if (!is_uploaded_file($tmpname)) {
1926
+					if (@ unlink($tmpname)) unset($GLOBALS['elFinderTempFiles'][$tmpname]); ;
1927 1927
 					continue;
1928 1928
 				}
1929 1929
 				break;
1930 1930
 			}
1931 1931
 			
1932 1932
 			is_resource($fp) && fclose($fp);
1933
-			if (! is_uploaded_file($tmpname)){
1933
+			if (!is_uploaded_file($tmpname)) {
1934 1934
 				clearstatcache();
1935 1935
 				if (!is_file($tmpname) || @ unlink($tmpname)) {
1936 1936
 					unset($GLOBALS['elFinderTempFiles'][$tmpname]);
@@ -1942,7 +1942,7 @@  discard block
 block discarded – undo
1942 1942
 			}
1943 1943
 		}
1944 1944
 		if ($GLOBALS['elFinderTempFiles']) {
1945
-			foreach(array_keys($GLOBALS['elFinderTempFiles']) as $_temp) {
1945
+			foreach (array_keys($GLOBALS['elFinderTempFiles']) as $_temp) {
1946 1946
 				@ unlink($_temp);
1947 1947
 			}
1948 1948
 		}
@@ -1979,7 +1979,7 @@  discard block
 block discarded – undo
1979 1979
 		$suffix = '~';
1980 1980
 		if (!empty($args['renames'])) {
1981 1981
 			$renames = array_flip($args['renames']);
1982
-			if (is_string($args['suffix']) && ! preg_match('/[\/\\?*:|"<>]/', $args['suffix'])) {
1982
+			if (is_string($args['suffix']) && !preg_match('/[\/\\?*:|"<>]/', $args['suffix'])) {
1983 1983
 				$suffix = $args['suffix'];
1984 1984
 			}
1985 1985
 		}
@@ -2037,9 +2037,9 @@  discard block
 block discarded – undo
2037 2037
 		}
2038 2038
 		
2039 2039
 		if ($args['conv'] && function_exists('mb_detect_encoding') && function_exists('mb_convert_encoding')) {
2040
-			$mime = isset($file['mime'])? $file['mime'] : '';
2040
+			$mime = isset($file['mime']) ? $file['mime'] : '';
2041 2041
 			if ($mime && strtolower(substr($mime, 0, 4)) === 'text') {
2042
-				if ($enc = mb_detect_encoding ( $content , mb_detect_order(), true)) {
2042
+				if ($enc = mb_detect_encoding($content, mb_detect_order(), true)) {
2043 2043
 					if (strtolower($enc) !== 'utf-8') {
2044 2044
 						$content = mb_convert_encoding($content, 'UTF-8', $enc);
2045 2045
 					}
@@ -2051,7 +2051,7 @@  discard block
 block discarded – undo
2051 2051
 
2052 2052
 		if ($json === false || strlen($json) < strlen($content)) {
2053 2053
 			if ($args['conv']) {
2054
-				return array('error' => $this->error(self::ERROR_CONV_UTF8,self::ERROR_NOT_UTF8_CONTENT, $volume->path($target)));
2054
+				return array('error' => $this->error(self::ERROR_CONV_UTF8, self::ERROR_NOT_UTF8_CONTENT, $volume->path($target)));
2055 2055
 			} else {
2056 2056
 				return array('doconv' => true);
2057 2057
 			}
@@ -2093,7 +2093,7 @@  discard block
 block discarded – undo
2093 2093
 		$target = $args['target'];
2094 2094
 		$mimes  = !empty($args['mimes']) && is_array($args['mimes']) ? $args['mimes'] : array();
2095 2095
 		$error  = array(self::ERROR_EXTRACT, '#'.$target);
2096
-		$makedir = isset($args['makedir'])? (bool)$args['makedir'] : null;
2096
+		$makedir = isset($args['makedir']) ? (bool) $args['makedir'] : null;
2097 2097
 
2098 2098
 		if (($volume = $this->volume($target)) == false
2099 2099
 		|| ($file = $volume->file($target)) == false) {
@@ -2101,7 +2101,7 @@  discard block
 block discarded – undo
2101 2101
 		}  
2102 2102
 
2103 2103
 		return ($file = $volume->extract($target, $makedir))
2104
-			? array('added' => isset($file['read'])? array($file) : $file)
2104
+			? array('added' => isset($file['read']) ? array($file) : $file)
2105 2105
 			: array('error' => $this->error(self::ERROR_EXTRACT, $volume->path($target), $volume->error()));
2106 2106
 	}
2107 2107
 	
@@ -2116,7 +2116,7 @@  discard block
 block discarded – undo
2116 2116
 	protected function archive($args) {
2117 2117
 		$type    = $args['type'];
2118 2118
 		$targets = isset($args['targets']) && is_array($args['targets']) ? $args['targets'] : array();
2119
-		$name    = isset($args['name'])? $args['name'] : '';
2119
+		$name    = isset($args['name']) ? $args['name'] : '';
2120 2120
 	
2121 2121
 		if (($volume = $this->volume($targets[0])) == false) {
2122 2122
 			return $this->error(self::ERROR_ARCHIVE, self::ERROR_TRGDIR_NOT_FOUND);
@@ -2137,7 +2137,7 @@  discard block
 block discarded – undo
2137 2137
 	protected function search($args) {
2138 2138
 		$q      = trim($args['q']);
2139 2139
 		$mimes  = !empty($args['mimes']) && is_array($args['mimes']) ? $args['mimes'] : array();
2140
-		$target = !empty($args['target'])? $args['target'] : null;
2140
+		$target = !empty($args['target']) ? $args['target'] : null;
2141 2141
 		$result = array();
2142 2142
 
2143 2143
 		if (!is_null($target)) {
@@ -2168,7 +2168,7 @@  discard block
 block discarded – undo
2168 2168
 			$compare = intval($args['compare']);
2169 2169
 			$hash = $args['targets'][0];
2170 2170
 			if ($volume = $this->volume($hash)) {
2171
-				$standby = (int)$volume->getOption('plStandby');
2171
+				$standby = (int) $volume->getOption('plStandby');
2172 2172
 				$_compare = false;
2173 2173
 				if (($syncCheckFunc = $volume->getOption('syncCheckFunc')) && is_callable($syncCheckFunc)) {
2174 2174
 					$_compare = call_user_func_array($syncCheckFunc, array($volume->realpath($hash), $standby, $compare, $volume, $this));
@@ -2176,8 +2176,8 @@  discard block
 block discarded – undo
2176 2176
 				if ($_compare !== false) {
2177 2177
 					$compare = $_compare;
2178 2178
 				} else {
2179
-					$sleep = max(1, (int)$volume->getOption('tsPlSleep'));
2180
-					$limit = max(1, $standby / $sleep) + 1;
2179
+					$sleep = max(1, (int) $volume->getOption('tsPlSleep'));
2180
+					$limit = max(1, $standby/$sleep) + 1;
2181 2181
 					$timelimit = ini_get('max_execution_time');
2182 2182
 					do {
2183 2183
 						$timelimit && @ set_time_limit($timelimit + $sleep);
@@ -2194,7 +2194,7 @@  discard block
 block discarded – undo
2194 2194
 						if (--$limit) {
2195 2195
 							sleep($sleep);
2196 2196
 						}
2197
-					} while($limit);
2197
+					} while ($limit);
2198 2198
 				}
2199 2199
 			}
2200 2200
 		} else {
@@ -2242,12 +2242,12 @@  discard block
 block discarded – undo
2242 2242
 		$target = $args['target'];
2243 2243
 		$width  = $args['width'];
2244 2244
 		$height = $args['height'];
2245
-		$x      = (int)$args['x'];
2246
-		$y      = (int)$args['y'];
2245
+		$x      = (int) $args['x'];
2246
+		$y      = (int) $args['y'];
2247 2247
 		$mode   = $args['mode'];
2248 2248
 		$bg     = null;
2249
-		$degree = (int)$args['degree'];
2250
-		$quality= (int)$args['quality'];
2249
+		$degree = (int) $args['degree'];
2250
+		$quality = (int) $args['quality'];
2251 2251
 		
2252 2252
 		if (($volume = $this->volume($target)) == false
2253 2253
 		|| ($file = $volume->file($target)) == false) {
@@ -2268,7 +2268,7 @@  discard block
 block discarded – undo
2268 2268
 	**/
2269 2269
 	protected function url($args) {
2270 2270
 		$target = $args['target'];
2271
-		$options = isset($args['options'])? $args['options'] : array();
2271
+		$options = isset($args['options']) ? $args['options'] : array();
2272 2272
 		if (($volume = $this->volume($target)) != false) {
2273 2273
 			$url = $volume->getContentUrl($target, $options);
2274 2274
 			return $url ? array('url' => $url) : array();
@@ -2285,18 +2285,18 @@  discard block
 block discarded – undo
2285 2285
 	 */
2286 2286
 	protected function callback($args) {
2287 2287
 		$checkReg = '/[^a-zA-Z0-9;._-]/';
2288
-		$node = (isset($args['node']) && !preg_match($checkReg, $args['node']))? $args['node'] : '';
2289
-		$json = (isset($args['json']) && @json_decode($args['json']))? $args['json'] : '{}';
2290
-		$bind  = (isset($args['bind']) && !preg_match($checkReg, $args['bind']))? $args['bind'] : '';
2288
+		$node = (isset($args['node']) && !preg_match($checkReg, $args['node'])) ? $args['node'] : '';
2289
+		$json = (isset($args['json']) && @json_decode($args['json'])) ? $args['json'] : '{}';
2290
+		$bind = (isset($args['bind']) && !preg_match($checkReg, $args['bind'])) ? $args['bind'] : '';
2291 2291
 		$done = (!empty($args['done']));
2292 2292
 		
2293
-		while( ob_get_level() ) {
2294
-			if (! ob_end_clean()) {
2293
+		while (ob_get_level()) {
2294
+			if (!ob_end_clean()) {
2295 2295
 				break;
2296 2296
 			}
2297 2297
 		}
2298 2298
 		
2299
-		if ($done || ! $this->callbackWindowURL) {
2299
+		if ($done || !$this->callbackWindowURL) {
2300 2300
 			$script = '';
2301 2301
 			if ($node) {
2302 2302
 				$script .= '
@@ -2338,13 +2338,13 @@  discard block
 block discarded – undo
2338 2338
 			
2339 2339
 		} else {
2340 2340
 			$url = $this->callbackWindowURL;
2341
-			$url .= ((strpos($url, '?') === false)? '?' : '&')
2342
-				 . '&node=' . rawurlencode($node)
2343
-				 . (($json !== '{}')? ('&json=' . rawurlencode($json)) : '')
2344
-				 . ($bind? ('&bind=' .  rawurlencode($bind)) : '')
2341
+			$url .= ((strpos($url, '?') === false) ? '?' : '&')
2342
+				 . '&node='.rawurlencode($node)
2343
+				 . (($json !== '{}') ? ('&json='.rawurlencode($json)) : '')
2344
+				 . ($bind ? ('&bind='.rawurlencode($bind)) : '')
2345 2345
 				 . '&done=1';
2346 2346
 			
2347
-			header('Location: ' . $url);
2347
+			header('Location: '.$url);
2348 2348
 			
2349 2349
 		}
2350 2350
 		exit();
@@ -2414,7 +2414,7 @@  discard block
 block discarded – undo
2414 2414
 	
2415 2415
 	protected function utime() {
2416 2416
 		$time = explode(" ", microtime());
2417
-		return (double)$time[1] + (double)$time[0];
2417
+		return (double) $time[1] + (double) $time[0];
2418 2418
 	}
2419 2419
 	
2420 2420
 	
@@ -2440,7 +2440,7 @@  discard block
 block discarded – undo
2440 2440
 		$imgcnt = 0;
2441 2441
 		$fp = fopen($path, 'rb');
2442 2442
 		@fread($fp, 4);
2443
-		$c = @fread($fp,1);
2443
+		$c = @fread($fp, 1);
2444 2444
 		if (ord($c) != 0x39) {  // GIF89a
2445 2445
 			return false;
2446 2446
 		}
@@ -2448,13 +2448,13 @@  discard block
 block discarded – undo
2448 2448
 		while (!feof($fp)) {
2449 2449
 			do {
2450 2450
 				$c = fread($fp, 1);
2451
-			} while(ord($c) != 0x21 && !feof($fp));
2451
+			} while (ord($c) != 0x21 && !feof($fp));
2452 2452
 	
2453 2453
 			if (feof($fp)) {
2454 2454
 				break;
2455 2455
 			}
2456 2456
 	
2457
-			$c2 = fread($fp,2);
2457
+			$c2 = fread($fp, 2);
2458 2458
 			if (bin2hex($c2) == "f904") {
2459 2459
 				$imgcnt++;
2460 2460
 			}
Please login to merge, or discard this patch.