Completed
Push — 2.x ( 05c5ea...2db271 )
by Naoki
06:56
created
php/elFinderVolumeDriver.class.php 1 patch
Spacing   +138 added lines, -139 removed lines patch added patch discarded remove patch
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 		'utf8fix'      => false,
300 300
 		 //                           й                 ё              Й               Ё              Ø         Å
301 301
 		'utf8patterns' => array("\u0438\u0306", "\u0435\u0308", "\u0418\u0306", "\u0415\u0308", "\u00d8A", "\u030a"),
302
-		'utf8replace'  => array("\u0439",        "\u0451",       "\u0419",       "\u0401",       "\u00d8", "\u00c5")
302
+		'utf8replace'  => array("\u0439", "\u0451", "\u0419", "\u0401", "\u00d8", "\u00c5")
303 303
 	);
304 304
 
305 305
 	/**
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
 	 **/
595 595
 	protected function configure() {
596 596
 		// set ARGS
597
-		$this->ARGS = $_SERVER['REQUEST_METHOD'] === 'POST'? $_POST : $_GET;
597
+		$this->ARGS = $_SERVER['REQUEST_METHOD'] === 'POST' ? $_POST : $_GET;
598 598
 		// set thumbnails path
599 599
 		$path = $this->options['tmbPath'];
600 600
 		if ($path) {
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
 		
626 626
 		// check 'statOwner' for command `chmod`
627 627
 		if (empty($this->options['statOwner'])) {
628
-			$this->disabled[] ='chmod';
628
+			$this->disabled[] = 'chmod';
629 629
 		}
630 630
 		
631 631
 		// check 'mimeMap'
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
749 749
 	 **/
750 750
 	public function mount(array $opts) {
751 751
 		if (!isset($opts['path']) || $opts['path'] === '') {
752
-			return $this->setError('Path undefined.');;
752
+			return $this->setError('Path undefined.'); ;
753 753
 		}
754 754
 		
755 755
 		$this->options = array_merge($this->options, $opts);
@@ -768,14 +768,14 @@  discard block
 block discarded – undo
768 768
 		$argInit = !empty($this->ARGS['init']);
769 769
 		
770 770
 		// session cache
771
-		if ($argInit || ! isset($_SESSION[elFinder::$sessionCacheKey][$this->id])) {
771
+		if ($argInit || !isset($_SESSION[elFinder::$sessionCacheKey][$this->id])) {
772 772
 			$_SESSION[elFinder::$sessionCacheKey][$this->id] = array();
773 773
 		}
774 774
 		$this->sessionCache = &$_SESSION[elFinder::$sessionCacheKey][$this->id];
775 775
 		
776 776
 		// default file attribute
777 777
 		$this->defaults = array(
778
-			'read'    => isset($this->options['defaults']['read'])  ? !!$this->options['defaults']['read']  : true,
778
+			'read'    => isset($this->options['defaults']['read']) ? !!$this->options['defaults']['read'] : true,
779 779
 			'write'   => isset($this->options['defaults']['write']) ? !!$this->options['defaults']['write'] : true,
780 780
 			'locked'  => isset($this->options['defaults']['locked']) ? !!$this->options['defaults']['locked'] : false,
781 781
 			'hidden'  => isset($this->options['defaults']['hidden']) ? !!$this->options['defaults']['hidden'] : false
@@ -802,8 +802,8 @@  discard block
 block discarded – undo
802 802
 			$this->access = $this->options['accessControl'];
803 803
 		}
804 804
 		
805
-		$this->today     = mktime(0,0,0, date('m'), date('d'), date('Y'));
806
-		$this->yesterday = $this->today-86400;
805
+		$this->today     = mktime(0, 0, 0, date('m'), date('d'), date('Y'));
806
+		$this->yesterday = $this->today - 86400;
807 807
 		
808 808
 		// debug($this->attributes);
809 809
 		if (!$this->init()) {
@@ -902,7 +902,7 @@  discard block
 block discarded – undo
902 902
 				foreach ($mimecf as $line_num => $line) {
903 903
 					if (!preg_match('/^\s*#/', $line)) {
904 904
 						$mime = preg_split('/\s+/', $line, -1, PREG_SPLIT_NO_EMPTY);
905
-						for ($i = 1, $size = count($mime); $i < $size ; $i++) {
905
+						for ($i = 1, $size = count($mime); $i < $size; $i++) {
906 906
 							if (!isset(self::$mimetypes[$mime[$i]])) {
907 907
 								self::$mimetypes[$mime[$i]] = $mime[0];
908 908
 							}
@@ -931,7 +931,7 @@  discard block
 block discarded – undo
931 931
 		
932 932
 		if ($root['read']) {
933 933
 			// check startPath - path to open by default instead of root
934
-			$startPath = $this->options['startPath']? $this->normpathCE($this->options['startPath']) : '';
934
+			$startPath = $this->options['startPath'] ? $this->normpathCE($this->options['startPath']) : '';
935 935
 			if ($startPath) {
936 936
 				$start = $this->stat($startPath);
937 937
 				if (!empty($start)
@@ -955,8 +955,8 @@  discard block
 block discarded – undo
955 955
 				'read'    => false
956 956
 			));
957 957
 		}
958
-		$this->treeDeep = $this->options['treeDeep'] > 0 ? (int)$this->options['treeDeep'] : 1;
959
-		$this->tmbSize  = $this->options['tmbSize'] > 0 ? (int)$this->options['tmbSize'] : 48;
958
+		$this->treeDeep = $this->options['treeDeep'] > 0 ? (int) $this->options['treeDeep'] : 1;
959
+		$this->tmbSize  = $this->options['tmbSize'] > 0 ? (int) $this->options['tmbSize'] : 48;
960 960
 		$this->URL      = $this->options['URL'];
961 961
 		if ($this->URL && preg_match("|[^/?&=]$|", $this->URL)) {
962 962
 			$this->URL .= '/';
@@ -1010,7 +1010,7 @@  discard block
 block discarded – undo
1010 1010
 		
1011 1011
 		// fix sync interval
1012 1012
 		if ($this->options['syncMinMs'] !== 0) {
1013
-			$this->options['syncMinMs'] = max($this->options[$this->options['syncChkAsTs']? 'tsPlSleep' : 'lsPlSleep'] * 1000, intval($this->options['syncMinMs']));
1013
+			$this->options['syncMinMs'] = max($this->options[$this->options['syncChkAsTs'] ? 'tsPlSleep' : 'lsPlSleep']*1000, intval($this->options['syncMinMs']));
1014 1014
 		}
1015 1015
 
1016 1016
 		return $this->mounted = true;
@@ -1114,7 +1114,7 @@  discard block
 block discarded – undo
1114 1114
 	public function options($hash) {
1115 1115
 		$create = $createext = array();
1116 1116
 		if (isset($this->archivers['create']) && is_array($this->archivers['create'])) {
1117
-			foreach($this->archivers['create'] as $m => $v) {
1117
+			foreach ($this->archivers['create'] as $m => $v) {
1118 1118
 				$create[] = $m;
1119 1119
 				$createext[$m] = $v['ext'];
1120 1120
 			}
@@ -1135,7 +1135,7 @@  discard block
 block discarded – undo
1135 1135
 				'extract'   => isset($this->archivers['extract']) && is_array($this->archivers['extract']) ? array_keys($this->archivers['extract']) : array(),
1136 1136
 				'createext' => $createext
1137 1137
 			),
1138
-			'uiCmdMap'        => (isset($this->options['uiCmdMap']) && is_array($this->options['uiCmdMap']))? $this->options['uiCmdMap'] : array(),
1138
+			'uiCmdMap'        => (isset($this->options['uiCmdMap']) && is_array($this->options['uiCmdMap'])) ? $this->options['uiCmdMap'] : array(),
1139 1139
 			'syncChkAsTs'     => intval($this->options['syncChkAsTs']),
1140 1140
 			'syncMinMs'       => intval($this->options['syncMinMs'])
1141 1141
 		);
@@ -1149,7 +1149,7 @@  discard block
 block discarded – undo
1149 1149
 	 * @author Naoki Sawada
1150 1150
 	 */
1151 1151
 	public function getOption($name) {
1152
-		return isset($this->options[$name])? $this->options[$name] : null;
1152
+		return isset($this->options[$name]) ? $this->options[$name] : null;
1153 1153
 	}
1154 1154
 	
1155 1155
 	/**
@@ -1161,7 +1161,7 @@  discard block
 block discarded – undo
1161 1161
 	 */
1162 1162
 	public function getOptionsPlugin($name = '') {
1163 1163
 		if ($name) {
1164
-			return isset($this->options['plugin'][$name])? $this->options['plugin'][$name] : array();
1164
+			return isset($this->options['plugin'][$name]) ? $this->options['plugin'][$name] : array();
1165 1165
 		} else {
1166 1166
 			return $this->options['plugin'];
1167 1167
 		}
@@ -1295,7 +1295,7 @@  discard block
 block discarded – undo
1295 1295
 		$file = $this->stat($path);
1296 1296
 		
1297 1297
 		if ($isRoot) {
1298
-			$file['uiCmdMap'] = (isset($this->options['uiCmdMap']) && is_array($this->options['uiCmdMap']))? $this->options['uiCmdMap'] : array();
1298
+			$file['uiCmdMap'] = (isset($this->options['uiCmdMap']) && is_array($this->options['uiCmdMap'])) ? $this->options['uiCmdMap'] : array();
1299 1299
 			$file['disabled'] = array_merge(array_unique($this->disabled)); // `array_merge` for type array of JSON
1300 1300
 		}
1301 1301
 		
@@ -1310,7 +1310,7 @@  discard block
 block discarded – undo
1310 1310
 	 * @return array|false
1311 1311
 	 * @author Dmitry (dio) Levashov
1312 1312
 	 **/
1313
-	public function dir($hash, $resolveLink=false) {
1313
+	public function dir($hash, $resolveLink = false) {
1314 1314
 		if (($dir = $this->file($hash)) == false) {
1315 1315
 			return $this->setError(elFinder::ERROR_DIR_NOT_FOUND);
1316 1316
 		}
@@ -1374,14 +1374,14 @@  discard block
 block discarded – undo
1374 1374
 	 * @return array|false
1375 1375
 	 * @author Dmitry (dio) Levashov
1376 1376
 	 **/
1377
-	public function tree($hash='', $deep=0, $exclude='') {
1377
+	public function tree($hash = '', $deep = 0, $exclude = '') {
1378 1378
 		$path = $hash ? $this->decode($hash) : $this->root;
1379 1379
 		
1380 1380
 		if (($dir = $this->stat($path)) == false || $dir['mime'] != 'directory') {
1381 1381
 			return false;
1382 1382
 		}
1383 1383
 		
1384
-		$dirs = $this->gettree($path, $deep > 0 ? $deep -1 : $this->treeDeep-1, $exclude ? $this->decode($exclude) : null);
1384
+		$dirs = $this->gettree($path, $deep > 0 ? $deep - 1 : $this->treeDeep - 1, $exclude ? $this->decode($exclude) : null);
1385 1385
 		array_unshift($dirs, $dir);
1386 1386
 		return $dirs;
1387 1387
 	}
@@ -1611,7 +1611,7 @@  discard block
 block discarded – undo
1611 1611
 	 * @return array|false
1612 1612
 	 * @author Dmitry (dio) Levashov
1613 1613
 	 **/
1614
-	public function duplicate($hash, $suffix='copy') {
1614
+	public function duplicate($hash, $suffix = 'copy') {
1615 1615
 		if ($this->commandDisabled('duplicate')) {
1616 1616
 			return $this->setError(elFinder::ERROR_COPY, '#'.$hash, elFinder::ERROR_PERM_DENIED);
1617 1617
 		}
@@ -1687,7 +1687,7 @@  discard block
 block discarded – undo
1687 1687
 		
1688 1688
 		if ($file) { // file exists
1689 1689
 			// check POST data `overwrite` for 3rd party uploader
1690
-			$overwrite = isset($_POST['overwrite'])? (bool)$_POST['overwrite'] : $this->options['uploadOverwrite'];
1690
+			$overwrite = isset($_POST['overwrite']) ? (bool) $_POST['overwrite'] : $this->options['uploadOverwrite'];
1691 1691
 			if ($overwrite) {
1692 1692
 				if (!$file['write']) {
1693 1693
 					return $this->setError(elFinder::ERROR_PERM_DENIED);
@@ -1758,7 +1758,7 @@  discard block
 block discarded – undo
1758 1758
 		if (($test = $volume->closest($src, $rmSrc ? 'locked' : 'read', $rmSrc))) {
1759 1759
 			return $rmSrc
1760 1760
 				? $this->setError($err, $errpath, elFinder::ERROR_LOCKED, $volume->path($test))
1761
-				: $this->setError($err, $errpath, !empty($file['thash'])? elFinder::ERROR_PERM_DENIED : elFinder::ERROR_MKOUTLINK);
1761
+				: $this->setError($err, $errpath, !empty($file['thash']) ? elFinder::ERROR_PERM_DENIED : elFinder::ERROR_MKOUTLINK);
1762 1762
 		}
1763 1763
 
1764 1764
 		$test = $this->joinPathCE($destination, $name);
@@ -1921,7 +1921,7 @@  discard block
 block discarded – undo
1921 1921
 			return $this->setError(elFinder::ERROR_PERM_DENIED);
1922 1922
 		}
1923 1923
 		$this->clearcache();
1924
-		$this->extractToNewdir = is_null($makedir)? 'auto' : (bool)$makedir;
1924
+		$this->extractToNewdir = is_null($makedir) ? 'auto' : (bool) $makedir;
1925 1925
 		
1926 1926
 		if ($path = $this->convEncOut($this->_extract($this->convEncIn($path), $archiver))) {
1927 1927
 			if (is_array($path)) {
@@ -1979,9 +1979,9 @@  discard block
 block discarded – undo
1979 1979
 		if ($name === '') {
1980 1980
 			$name = count($files) == 1 ? $files[0] : 'Archive';
1981 1981
 		} else {
1982
-			$name = str_replace(array('/', '\\'), '_', preg_replace('/\.' . preg_quote($archiver['ext'], '/') . '$/i', '', $name));
1982
+			$name = str_replace(array('/', '\\'), '_', preg_replace('/\.'.preg_quote($archiver['ext'], '/').'$/i', '', $name));
1983 1983
 		}
1984
-		$name .='.' . $archiver['ext'];
1984
+		$name .= '.'.$archiver['ext'];
1985 1985
 		$name = $this->uniqueName($dir, $name, '');
1986 1986
 		$this->clearcache();
1987 1987
 		return ($path = $this->convEncOut($this->_archive($this->convEncIn($dir), $this->convEncIn($files), $this->convEncIn($name), $archiver))) ? $this->stat($path) : false;
@@ -2020,7 +2020,7 @@  discard block
 block discarded – undo
2020 2020
 		
2021 2021
 		$path = $this->decode($hash);
2022 2022
 		
2023
-		$work_path = $this->getWorkFile($this->encoding? $this->convEncIn($path, true) : $path);
2023
+		$work_path = $this->getWorkFile($this->encoding ? $this->convEncIn($path, true) : $path);
2024 2024
 
2025 2025
 		if (!$work_path || !is_writable($work_path)) {
2026 2026
 			if ($work_path && $path !== $work_path && is_file($work_path)) {
@@ -2035,7 +2035,7 @@  discard block
 block discarded – undo
2035 2035
 			}
2036 2036
 		}
2037 2037
 
2038
-		switch($mode) {
2038
+		switch ($mode) {
2039 2039
 			
2040 2040
 			case 'propresize':
2041 2041
 				$result = $this->imgResize($work_path, $width, $height, true, true, null, $jpgQuality);
@@ -2131,7 +2131,7 @@  discard block
 block discarded – undo
2131 2131
 		}
2132 2132
 		return ($q === '' || $this->commandDisabled('search'))
2133 2133
 			? array()
2134
-			: $this->doSearch(is_null($dir)? $this->root : $dir, $q, $mimes);
2134
+			: $this->doSearch(is_null($dir) ? $this->root : $dir, $q, $mimes);
2135 2135
 	}
2136 2136
 	
2137 2137
 	/**
@@ -2203,9 +2203,9 @@  discard block
 block discarded – undo
2203 2203
 		$path = ltrim($path, $this->separator);
2204 2204
 		$dirs = explode($this->separator, $path);
2205 2205
 		array_pop($dirs);
2206
-		foreach($dirs as $dir) {
2206
+		foreach ($dirs as $dir) {
2207 2207
 			$targetPath = $this->joinPathCE($base, $dir);
2208
-			if (! $_realpath = $this->realpath($this->encode($targetPath))) {
2208
+			if (!$_realpath = $this->realpath($this->encode($targetPath))) {
2209 2209
 				if ($stat = $this->mkdir($targetHash, $dir)) {
2210 2210
 					$result['added'][] = $stat;
2211 2211
 					$targetHash = $stat['hash'];
@@ -2272,7 +2272,7 @@  discard block
 block discarded – undo
2272 2272
 	 * @author Naoki Sawada
2273 2273
 	 **/
2274 2274
 	protected function dirnameCE($path) {
2275
-		return (!$this->encoding)? $this->_dirname($path) :	$this->convEncOut($this->_dirname($this->convEncIn($path)));
2275
+		return (!$this->encoding) ? $this->_dirname($path) : $this->convEncOut($this->_dirname($this->convEncIn($path)));
2276 2276
 	}
2277 2277
 	
2278 2278
 	/**
@@ -2283,7 +2283,7 @@  discard block
 block discarded – undo
2283 2283
 	 * @author Naoki Sawada
2284 2284
 	 **/
2285 2285
 	protected function basenameCE($path) {
2286
-		return (!$this->encoding)? $this->_basename($path) : $this->convEncOut($this->_basename($this->convEncIn($path)));
2286
+		return (!$this->encoding) ? $this->_basename($path) : $this->convEncOut($this->_basename($this->convEncIn($path)));
2287 2287
 	}
2288 2288
 	
2289 2289
 	/**
@@ -2296,7 +2296,7 @@  discard block
 block discarded – undo
2296 2296
 	 * @author Naoki Sawada
2297 2297
 	 **/
2298 2298
 	protected function joinPathCE($dir, $name) {
2299
-		return (!$this->encoding)? $this->_joinPath($dir, $name) : $this->convEncOut($this->_joinPath($this->convEncIn($dir), $this->convEncIn($name)));
2299
+		return (!$this->encoding) ? $this->_joinPath($dir, $name) : $this->convEncOut($this->_joinPath($this->convEncIn($dir), $this->convEncIn($name)));
2300 2300
 	}
2301 2301
 	
2302 2302
 	/**
@@ -2307,7 +2307,7 @@  discard block
 block discarded – undo
2307 2307
 	 * @author Naoki Sawada
2308 2308
 	 **/
2309 2309
 	protected function normpathCE($path) {
2310
-		return (!$this->encoding)? $this->_normpath($path) : $this->convEncOut($this->_normpath($this->convEncIn($path)));
2310
+		return (!$this->encoding) ? $this->_normpath($path) : $this->convEncOut($this->_normpath($this->convEncIn($path)));
2311 2311
 	}
2312 2312
 	
2313 2313
 	/**
@@ -2318,7 +2318,7 @@  discard block
 block discarded – undo
2318 2318
 	 * @author Naoki Sawada
2319 2319
 	 **/
2320 2320
 	protected function relpathCE($path) {
2321
-		return (!$this->encoding)? $this->_relpath($path) : $this->convEncOut($this->_relpath($this->convEncIn($path)));
2321
+		return (!$this->encoding) ? $this->_relpath($path) : $this->convEncOut($this->_relpath($this->convEncIn($path)));
2322 2322
 	}
2323 2323
 	
2324 2324
 	/**
@@ -2329,7 +2329,7 @@  discard block
 block discarded – undo
2329 2329
 	 * @author Naoki Sawada
2330 2330
 	 **/
2331 2331
 	protected function abspathCE($path) {
2332
-		return (!$this->encoding)? $this->_abspath($path): $this->convEncOut($this->_abspath($this->convEncIn($path)));
2332
+		return (!$this->encoding) ? $this->_abspath($path) : $this->convEncOut($this->_abspath($this->convEncIn($path)));
2333 2333
 	}
2334 2334
 	
2335 2335
 	/**
@@ -2341,7 +2341,7 @@  discard block
 block discarded – undo
2341 2341
 	 * @author Naoki Sawada
2342 2342
 	 **/
2343 2343
 	protected function inpathCE($path, $parent) {
2344
-		return (!$this->encoding)? $this->_inpath($path, $parent) : $this->convEncOut($this->_inpath($this->convEncIn($path), $this->convEncIn($parent)));
2344
+		return (!$this->encoding) ? $this->_inpath($path, $parent) : $this->convEncOut($this->_inpath($this->convEncIn($path), $this->convEncIn($parent)));
2345 2345
 	}
2346 2346
 	
2347 2347
 	/**
@@ -2352,8 +2352,8 @@  discard block
 block discarded – undo
2352 2352
 	 * @return resource|false
2353 2353
 	 * @author Naoki Sawada
2354 2354
 	 **/
2355
-	protected function fopenCE($path, $mode='rb') {
2356
-		return (!$this->encoding)? $this->_fopen($path, $mode) : $this->convEncOut($this->_fopen($this->convEncIn($path), $mode));
2355
+	protected function fopenCE($path, $mode = 'rb') {
2356
+		return (!$this->encoding) ? $this->_fopen($path, $mode) : $this->convEncOut($this->_fopen($this->convEncIn($path), $mode));
2357 2357
 	}
2358 2358
 	
2359 2359
 	/**
@@ -2364,8 +2364,8 @@  discard block
 block discarded – undo
2364 2364
 	 * @return bool
2365 2365
 	 * @author Naoki Sawada
2366 2366
 	 **/
2367
-	protected function fcloseCE($fp, $path='') {
2368
-		return (!$this->encoding)? $this->_fclose($fp, $path) : $this->convEncOut($this->_fclose($fp, $this->convEncIn($path)));
2367
+	protected function fcloseCE($fp, $path = '') {
2368
+		return (!$this->encoding) ? $this->_fclose($fp, $path) : $this->convEncOut($this->_fclose($fp, $this->convEncIn($path)));
2369 2369
 	}
2370 2370
 	
2371 2371
 	/**
@@ -2380,7 +2380,7 @@  discard block
 block discarded – undo
2380 2380
 	 * @author Naoki Sawada
2381 2381
 	 **/
2382 2382
 	protected function saveCE($fp, $dir, $name, $stat) {
2383
-		return (!$this->encoding)? $this->_save($fp, $dir, $name, $stat) : $this->convEncOut($this->_save($fp, $this->convEncIn($dir), $this->convEncIn($name), $this->convEncIn($stat)));
2383
+		return (!$this->encoding) ? $this->_save($fp, $dir, $name, $stat) : $this->convEncOut($this->_save($fp, $this->convEncIn($dir), $this->convEncIn($name), $this->convEncIn($stat)));
2384 2384
 	}
2385 2385
 	
2386 2386
 	/**
@@ -2392,7 +2392,7 @@  discard block
 block discarded – undo
2392 2392
 	 **/
2393 2393
 	protected function subdirsCE($path) {
2394 2394
 		if (!isset($this->subdirsCache[$path])) {
2395
-			$this->subdirsCache[$path] = (!$this->encoding)? $this->_subdirs($path) : $this->convEncOut($this->_subdirs($this->convEncIn($path)));
2395
+			$this->subdirsCache[$path] = (!$this->encoding) ? $this->_subdirs($path) : $this->convEncOut($this->_subdirs($this->convEncIn($path)));
2396 2396
 		}
2397 2397
 		return $this->subdirsCache[$path];
2398 2398
 	}
@@ -2405,7 +2405,7 @@  discard block
 block discarded – undo
2405 2405
 	 * @author Naoki Sawada
2406 2406
 	 **/
2407 2407
 	protected function scandirCE($path) {
2408
-		return (!$this->encoding)? $this->_scandir($path) : $this->convEncOut($this->_scandir($this->convEncIn($path)));
2408
+		return (!$this->encoding) ? $this->_scandir($path) : $this->convEncOut($this->_scandir($this->convEncIn($path)));
2409 2409
 	}
2410 2410
 	
2411 2411
 	/**
@@ -2418,7 +2418,7 @@  discard block
 block discarded – undo
2418 2418
 	 * @author Naoki Sawada
2419 2419
 	 **/
2420 2420
 	protected function symlinkCE($source, $targetDir, $name) {
2421
-		return (!$this->encoding)? $this->_symlink($source, $targetDir, $name) : $this->convEncOut($this->_symlink($this->convEncIn($source), $this->convEncIn($targetDir), $this->convEncIn($name)));
2421
+		return (!$this->encoding) ? $this->_symlink($source, $targetDir, $name) : $this->convEncOut($this->_symlink($this->convEncIn($source), $this->convEncIn($targetDir), $this->convEncIn($name)));
2422 2422
 	}
2423 2423
 	
2424 2424
 	/***************** paths *******************/
@@ -2437,7 +2437,7 @@  discard block
 block discarded – undo
2437 2437
 			// cut ROOT from $path for security reason, even if hacker decodes the path he will not know the root
2438 2438
 			$p = $this->relpathCE($path);
2439 2439
 			// if reqesting root dir $path will be empty, then assign '/' as we cannot leave it blank for crypt
2440
-			if ($p === '')	{
2440
+			if ($p === '') {
2441 2441
 				$p = DIRECTORY_SEPARATOR;
2442 2442
 			}
2443 2443
 
@@ -2470,7 +2470,7 @@  discard block
 block discarded – undo
2470 2470
 			// TODO uncrypt hash and return path
2471 2471
 			$path = $this->uncrypt($h); 
2472 2472
 			// append ROOT to path after it was cut in encode
2473
-			return $this->abspathCE($path);//$this->root.($path == DIRECTORY_SEPARATOR ? '' : DIRECTORY_SEPARATOR.$path); 
2473
+			return $this->abspathCE($path); //$this->root.($path == DIRECTORY_SEPARATOR ? '' : DIRECTORY_SEPARATOR.$path); 
2474 2474
 		}
2475 2475
 	}
2476 2476
 	
@@ -2530,21 +2530,21 @@  discard block
 block discarded – undo
2530 2530
 	 * @author Dmitry (dio) Levashov
2531 2531
 	 **/
2532 2532
 	public function uniqueName($dir, $name, $suffix = ' copy', $checkNum = true, $start = 1) {
2533
-		$ext  = '';
2533
+		$ext = '';
2534 2534
 
2535 2535
 		if (preg_match('/\.((tar\.(gz|bz|bz2|z|lzo))|cpio\.gz|ps\.gz|xcf\.(gz|bz2)|[a-z0-9]{1,4})$/i', $name, $m)) {
2536 2536
 			$ext  = '.'.$m[1];
2537
-			$name = substr($name, 0,  strlen($name)-strlen($m[0]));
2537
+			$name = substr($name, 0, strlen($name) - strlen($m[0]));
2538 2538
 		} 
2539 2539
 		
2540 2540
 		if ($checkNum && preg_match('/('.preg_quote($suffix, '/').')(\d*)$/i', $name, $m)) {
2541
-			$i    = (int)$m[2];
2542
-			$name = substr($name, 0, strlen($name)-strlen($m[2]));
2541
+			$i    = (int) $m[2];
2542
+			$name = substr($name, 0, strlen($name) - strlen($m[2]));
2543 2543
 		} else {
2544 2544
 			$i     = $start;
2545 2545
 			$name .= $suffix;
2546 2546
 		}
2547
-		$max = $i+100000;
2547
+		$max = $i + 100000;
2548 2548
 
2549 2549
 		while ($i <= $max) {
2550 2550
 			$n = $name.($i > 0 ? $i : '').$ext;
@@ -2568,7 +2568,7 @@  discard block
 block discarded – undo
2568 2568
 	 * @author Naoki Sawada
2569 2569
 	 */
2570 2570
 	public function convEncIn($var = null, $restoreLocale = false, $unknown = '_') {
2571
-		return (!$this->encoding)? $var : $this->convEnc($var, 'UTF-8', $this->encoding, $this->options['locale'], $restoreLocale, $unknown);
2571
+		return (!$this->encoding) ? $var : $this->convEnc($var, 'UTF-8', $this->encoding, $this->options['locale'], $restoreLocale, $unknown);
2572 2572
 	}
2573 2573
 	
2574 2574
 	/**
@@ -2581,7 +2581,7 @@  discard block
 block discarded – undo
2581 2581
 	 * @author Naoki Sawada
2582 2582
 	 */
2583 2583
 	public function convEncOut($var = null, $restoreLocale = true, $unknown = '_') {
2584
-		return (!$this->encoding)? $var : $this->convEnc($var, $this->encoding, 'UTF-8', $this->options['locale'], $restoreLocale, $unknown);
2584
+		return (!$this->encoding) ? $var : $this->convEnc($var, $this->encoding, 'UTF-8', $this->options['locale'], $restoreLocale, $unknown);
2585 2585
 	}
2586 2586
 	
2587 2587
 	/**
@@ -2601,7 +2601,7 @@  discard block
 block discarded – undo
2601 2601
 			}
2602 2602
 			if (is_array($var)) {
2603 2603
 				$_ret = array();
2604
-				foreach($var as $_k => $_v) {
2604
+				foreach ($var as $_k => $_v) {
2605 2605
 					$_ret[$_k] = $this->convEnc($_v, $from, $to, '', false, $unknown = '_');
2606 2606
 				}
2607 2607
 				$var = $_ret;
@@ -2613,7 +2613,7 @@  discard block
 block discarded – undo
2613 2613
 						$_var = str_replace('?', $unknown, $_var);
2614 2614
 					}
2615 2615
 				}
2616
-				if  ($_var !== false) {
2616
+				if ($_var !== false) {
2617 2617
 					$var = $_var;
2618 2618
 				}
2619 2619
 			}
@@ -2640,7 +2640,7 @@  discard block
 block discarded – undo
2640 2640
 		
2641 2641
 		$key = '';
2642 2642
 		if ($path !== '') {
2643
-			$key = $this->id . '#' . $path;
2643
+			$key = $this->id.'#'.$path;
2644 2644
 			if (isset($cache[$key])) {
2645 2645
 				return $cache[$key];
2646 2646
 			}
@@ -2672,7 +2672,7 @@  discard block
 block discarded – undo
2672 2672
 		if ($work = $this->getTempFile()) {
2673 2673
 			if ($wfp = fopen($work, 'wb')) {
2674 2674
 				if ($fp = $this->_fopen($path)) {
2675
-					while(!feof($fp)) {
2675
+					while (!feof($fp)) {
2676 2676
 						fwrite($wfp, fread($fp, 8192));
2677 2677
 					}
2678 2678
 					$this->_fclose($fp, $path);
@@ -2716,7 +2716,7 @@  discard block
 block discarded – undo
2716 2716
 			@set_time_limit(30);
2717 2717
 			$stat = $this->stat($this->convEncOut($p));
2718 2718
 			$this->convEncIn();
2719
-			($stat['mime'] === 'directory')? $this->delTree($p) : $this->_unlink($p);
2719
+			($stat['mime'] === 'directory') ? $this->delTree($p) : $this->_unlink($p);
2720 2720
 		}
2721 2721
 		return $this->_rmdir($localpath);
2722 2722
 	}
@@ -2733,7 +2733,7 @@  discard block
 block discarded – undo
2733 2733
 	 * @return bool
2734 2734
 	 * @author Dmitry (dio) Levashov
2735 2735
 	 **/
2736
-	protected function attr($path, $name, $val=null, $isDir=null) {
2736
+	protected function attr($path, $name, $val = null, $isDir = null) {
2737 2737
 		if (!isset($this->defaults[$name])) {
2738 2738
 			return false;
2739 2739
 		}
@@ -2765,7 +2765,7 @@  discard block
 block discarded – undo
2765 2765
 			} 
2766 2766
 		}
2767 2767
 		
2768
-		return $perm === null ? (is_null($val)? $this->defaults[$name] : $val) : !!$perm;
2768
+		return $perm === null ? (is_null($val) ? $this->defaults[$name] : $val) : !!$perm;
2769 2769
 	}
2770 2770
 	
2771 2771
 	/**
@@ -2809,7 +2809,7 @@  discard block
 block discarded – undo
2809 2809
 	protected function allowPutMime($mime) {
2810 2810
 		// logic based on http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order
2811 2811
 		$allow  = $this->mimeAccepted($mime, $this->uploadAllow, null);
2812
-		$deny   = $this->mimeAccepted($mime, $this->uploadDeny,  null);
2812
+		$deny   = $this->mimeAccepted($mime, $this->uploadDeny, null);
2813 2813
 		$res = true; // default to allow
2814 2814
 		if (strtolower($this->uploadOrder[0]) == 'allow') { // array('allow', 'deny'), default is to 'deny'
2815 2815
 			$res = false; // default is deny
@@ -2843,7 +2843,7 @@  discard block
 block discarded – undo
2843 2843
 				$this->sessionCache['rootstat'] = array();
2844 2844
 			}
2845 2845
 			//if (empty($this->ARGS['reload']) || empty($this->ARGS['target']) || strpos($this->ARGS['target'], $this->id) !== 0) {
2846
-			if (! $this->isMyReload()) {
2846
+			if (!$this->isMyReload()) {
2847 2847
 				// need $path as key for netmount/netunmount
2848 2848
 				if (isset($this->sessionCache['rootstat'][$rootKey])) {
2849 2849
 					if ($ret = elFinder::sessionDataDecode($this->sessionCache['rootstat'][$rootKey], 'array')) {
@@ -2883,10 +2883,10 @@  discard block
 block discarded – undo
2883 2883
 			if ($this->rootName) {
2884 2884
 				$stat['name'] = $this->rootName;
2885 2885
 			}
2886
-			if (! empty($this->options['icon'])) {
2886
+			if (!empty($this->options['icon'])) {
2887 2887
 				$stat['icon'] = $this->options['icon'];
2888 2888
 			}
2889
-			if (! empty($this->options['rootCssClass'])) {
2889
+			if (!empty($this->options['rootCssClass'])) {
2890 2890
 				$stat['csscls'] = $this->options['rootCssClass'];
2891 2891
 			}
2892 2892
 		} else {
@@ -2934,7 +2934,7 @@  discard block
 block discarded – undo
2934 2934
 			// lock when parent directory is not writable
2935 2935
 			if (!isset($stat['locked'])) {
2936 2936
 				$parent = $this->dirnameCE($path);
2937
-				$pstat = isset($this->cache[$parent])? $this->cache[$parent] : array();
2937
+				$pstat = isset($this->cache[$parent]) ? $this->cache[$parent] : array();
2938 2938
 				if (isset($pstat['write']) && !$pstat['write']) {
2939 2939
 					$stat['locked'] = true;
2940 2940
 				}
@@ -2992,7 +2992,7 @@  discard block
 block discarded – undo
2992 2992
 			}
2993 2993
 			if (!isset($stat['url']) && $this->URL && $this->encoding) {
2994 2994
 				$_path = str_replace($this->separator, '/', substr($path, strlen($this->root) + 1));
2995
-				$stat['url'] = rtrim($this->URL, '/') . '/' . str_replace('%2F', '/', rawurlencode((substr(PHP_OS, 0, 3) === 'WIN')? $_path : $this->convEncIn($_path, true)));
2995
+				$stat['url'] = rtrim($this->URL, '/').'/'.str_replace('%2F', '/', rawurlencode((substr(PHP_OS, 0, 3) === 'WIN') ? $_path : $this->convEncIn($_path, true)));
2996 2996
 			}
2997 2997
 		} else {
2998 2998
 			if ($isDir) {
@@ -3115,7 +3115,7 @@  discard block
 block discarded – undo
3115 3115
 				foreach ($mimecf as $line_num => $line) {
3116 3116
 					if (!preg_match('/^\s*#/', $line)) {
3117 3117
 						$mime = preg_split('/\s+/', $line, -1, PREG_SPLIT_NO_EMPTY);
3118
-						for ($i = 1, $size = count($mime); $i < $size ; $i++) {
3118
+						for ($i = 1, $size = count($mime); $i < $size; $i++) {
3119 3119
 							if (!isset(elFinderVolumeDriver::$mimetypes[$mime[$i]])) {
3120 3120
 								elFinderVolumeDriver::$mimetypes[$mime[$i]] = $mime[0];
3121 3121
 							}
@@ -3221,10 +3221,10 @@  discard block
 block discarded – undo
3221 3221
 	}
3222 3222
 	
3223 3223
 	protected function isMyReload($target = '', $ARGtarget = '') {
3224
-		if (! empty($this->ARGS['reload'])) {
3224
+		if (!empty($this->ARGS['reload'])) {
3225 3225
 			if ($ARGtarget === '') {
3226
-				$ARGtarget = isset($this->ARGS['target'])? $this->ARGS['target']
3227
-					: ((isset($this->ARGS['targets']) && is_array($this->ARGS['targets']) && count($this->ARGS['targets']) === 1)?
3226
+				$ARGtarget = isset($this->ARGS['target']) ? $this->ARGS['target']
3227
+					: ((isset($this->ARGS['targets']) && is_array($this->ARGS['targets']) && count($this->ARGS['targets']) === 1) ?
3228 3228
 						$this->ARGS['targets'][0] : '');
3229 3229
 			}
3230 3230
 			if ($ARGtarget !== '') {
@@ -3273,7 +3273,7 @@  discard block
 block discarded – undo
3273 3273
 	 * @return array
3274 3274
 	 * @author Dmitry (dio) Levashov
3275 3275
 	 **/
3276
-	protected function gettree($path, $deep, $exclude='') {
3276
+	protected function gettree($path, $deep, $exclude = '') {
3277 3277
 		$dirs = array();
3278 3278
 		
3279 3279
 		!isset($this->dirsCache[$path]) && $this->cacheDir($path);
@@ -3284,7 +3284,7 @@  discard block
 block discarded – undo
3284 3284
 			if ($stat && empty($stat['hidden']) && $p != $exclude && $stat['mime'] == 'directory') {
3285 3285
 				$dirs[] = $stat;
3286 3286
 				if ($deep > 0 && !empty($stat['dirs'])) {
3287
-					$dirs = array_merge($dirs, $this->gettree($p, $deep-1));
3287
+					$dirs = array_merge($dirs, $this->gettree($p, $deep - 1));
3288 3288
 				}
3289 3289
 			}
3290 3290
 		}
@@ -3304,7 +3304,7 @@  discard block
 block discarded – undo
3304 3304
 	protected function doSearch($path, $q, $mimes) {
3305 3305
 		$result = array();
3306 3306
 
3307
-		foreach($this->scandirCE($path) as $p) {
3307
+		foreach ($this->scandirCE($path) as $p) {
3308 3308
 			@set_time_limit(30);
3309 3309
 			$stat = $this->stat($p);
3310 3310
 
@@ -3325,7 +3325,7 @@  discard block
 block discarded – undo
3325 3325
 					if ($this->encoding) {
3326 3326
 						$path = str_replace('%2F', '/', rawurlencode($this->convEncIn($path, true)));
3327 3327
 					}
3328
-					$stat['url'] = $this->URL . $path;
3328
+					$stat['url'] = $this->URL.$path;
3329 3329
 				}
3330 3330
 				
3331 3331
 				$result[] = $stat;
@@ -3359,7 +3359,7 @@  discard block
 block discarded – undo
3359 3359
 			if (!$this->inpathCE($target, $this->root)) {
3360 3360
 				return $this->setError(elFinder::ERROR_COPY, $this->path($srcStat['hash']), elFinder::ERROR_MKOUTLINK);
3361 3361
 			}
3362
-			$stat   = $this->stat($target);
3362
+			$stat = $this->stat($target);
3363 3363
 			$this->clearcache();
3364 3364
 			return $stat && $this->symlinkCE($target, $dst, $name)
3365 3365
 				? $this->joinPathCE($dst, $name)
@@ -3640,15 +3640,15 @@  discard block
 block discarded – undo
3640 3640
 		}
3641 3641
 
3642 3642
 		/* If image smaller or equal thumbnail size - just fitting to thumbnail square */
3643
-		if ($s[0] <= $tmbSize && $s[1]	<= $tmbSize) {
3644
-			$result = $this->imgSquareFit($tmb, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png' );
3643
+		if ($s[0] <= $tmbSize && $s[1] <= $tmbSize) {
3644
+			$result = $this->imgSquareFit($tmb, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png');
3645 3645
 		} else {
3646 3646
 		
3647 3647
 			if ($this->options['tmbCrop']) {
3648 3648
 		
3649 3649
 				$result = $tmb;
3650 3650
 				/* Resize and crop if image bigger than thumbnail */
3651
-				if (!(($s[0] > $tmbSize && $s[1] <= $tmbSize) || ($s[0] <= $tmbSize && $s[1] > $tmbSize) ) || ($s[0] > $tmbSize && $s[1] > $tmbSize)) {
3651
+				if (!(($s[0] > $tmbSize && $s[1] <= $tmbSize) || ($s[0] <= $tmbSize && $s[1] > $tmbSize)) || ($s[0] > $tmbSize && $s[1] > $tmbSize)) {
3652 3652
 					$result = $this->imgResize($tmb, $tmbSize, $tmbSize, true, false, 'png');
3653 3653
 				}
3654 3654
 		
@@ -3665,7 +3665,7 @@  discard block
 block discarded – undo
3665 3665
 			}
3666 3666
 		
3667 3667
 			if ($result) {
3668
-				$result = $this->imgSquareFit($result, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png' );
3668
+				$result = $this->imgSquareFit($result, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png');
3669 3669
 			}
3670 3670
 		}
3671 3671
 		
@@ -3711,18 +3711,18 @@  discard block
 block discarded – undo
3711 3711
 			/* Resizing by biggest side */
3712 3712
 			if ($resizeByBiggerSide) {
3713 3713
 				if ($orig_w > $orig_h) {
3714
-					$size_h = round($orig_h * $width / $orig_w);
3714
+					$size_h = round($orig_h*$width/$orig_w);
3715 3715
 					$size_w = $width;
3716 3716
 				} else {
3717
-					$size_w = round($orig_w * $height / $orig_h);
3717
+					$size_w = round($orig_w*$height/$orig_h);
3718 3718
 					$size_h = $height;
3719 3719
 				}
3720 3720
 			} else {
3721 3721
 				if ($orig_w > $orig_h) {
3722
-					$size_w = round($orig_w * $height / $orig_h);
3722
+					$size_w = round($orig_w*$height/$orig_h);
3723 3723
 					$size_h = $height;
3724 3724
 				} else {
3725
-					$size_h = round($orig_h * $width / $orig_w);
3725
+					$size_h = round($orig_h*$width/$orig_w);
3726 3726
 					$size_w = $width;
3727 3727
 				}
3728 3728
 			}
@@ -3740,7 +3740,7 @@  discard block
 block discarded – undo
3740 3740
 				// Imagick::FILTER_BOX faster than FILTER_LANCZOS so use for createTmb
3741 3741
 				// resize bench: http://app-mgng.rhcloud.com/9
3742 3742
 				// resize sample: http://www.dylanbeattie.net/magick/filters/result.html
3743
-				$filter = ($destformat === 'png' /* createTmb */)? Imagick::FILTER_BOX : Imagick::FILTER_LANCZOS;
3743
+				$filter = ($destformat === 'png' /* createTmb */) ? Imagick::FILTER_BOX : Imagick::FILTER_LANCZOS;
3744 3744
 				
3745 3745
 				$ani = ($img->getNumberImages() > 1);
3746 3746
 				if ($ani && is_null($destformat)) {
@@ -3765,11 +3765,11 @@  discard block
 block discarded – undo
3765 3765
 				break;
3766 3766
 
3767 3767
 			case 'gd':
3768
-				$img = $this->gdImageCreate($path,$s['mime']);
3768
+				$img = $this->gdImageCreate($path, $s['mime']);
3769 3769
 
3770
-				if ($img &&  false != ($tmp = imagecreatetruecolor($size_w, $size_h))) {
3770
+				if ($img && false != ($tmp = imagecreatetruecolor($size_w, $size_h))) {
3771 3771
 				
3772
-					$this->gdImageBackground($tmp,$this->options['tmbBgColor']);
3772
+					$this->gdImageBackground($tmp, $this->options['tmbBgColor']);
3773 3773
 					
3774 3774
 					if (!imagecopyresampled($tmp, $img, 0, 0, 0, 0, $size_w, $size_h, $s[0], $s[1])) {
3775 3775
 						return false;
@@ -3850,11 +3850,11 @@  discard block
 block discarded – undo
3850 3850
 				break;
3851 3851
 
3852 3852
 			case 'gd':
3853
-				$img = $this->gdImageCreate($path,$s['mime']);
3853
+				$img = $this->gdImageCreate($path, $s['mime']);
3854 3854
 
3855
-				if ($img &&  false != ($tmp = imagecreatetruecolor($width, $height))) {
3855
+				if ($img && false != ($tmp = imagecreatetruecolor($width, $height))) {
3856 3856
 					
3857
-					$this->gdImageBackground($tmp,$this->options['tmbBgColor']);
3857
+					$this->gdImageBackground($tmp, $this->options['tmbBgColor']);
3858 3858
 
3859 3859
 					$size_w = $width;
3860 3860
 					$size_h = $height;
@@ -3905,8 +3905,8 @@  discard block
 block discarded – undo
3905 3905
 		$result = false;
3906 3906
 
3907 3907
 		/* Coordinates for image over square aligning */
3908
-		$y = ceil(abs($height - $s[1]) / 2); 
3909
-		$x = ceil(abs($width - $s[0]) / 2);
3908
+		$y = ceil(abs($height - $s[1])/2); 
3909
+		$x = ceil(abs($width - $s[0])/2);
3910 3910
 
3911 3911
 		if (!$jpgQuality) {
3912 3912
 			$jpgQuality = $this->options['jpgQuality'];
@@ -3930,7 +3930,7 @@  discard block
 block discarded – undo
3930 3930
 						$gif->newImage($width, $height, new ImagickPixel($bgcolor));
3931 3931
 						$gif->setImageColorspace($img->getImageColorspace());
3932 3932
 						$gif->setImageFormat('gif');
3933
-						$gif->compositeImage( $img, imagick::COMPOSITE_OVER, $x, $y );
3933
+						$gif->compositeImage($img, imagick::COMPOSITE_OVER, $x, $y);
3934 3934
 						$gif->setImageDelay($img->getImageDelay());
3935 3935
 						$gif->setImageIterations($img->getImageIterations());
3936 3936
 						$img1->addImage($gif);
@@ -3945,7 +3945,7 @@  discard block
 block discarded – undo
3945 3945
 					$img1 = new Imagick();
3946 3946
 					$img1->newImage($width, $height, new ImagickPixel($bgcolor));
3947 3947
 					$img1->setImageColorspace($img->getImageColorspace());
3948
-					$img1->compositeImage( $img, imagick::COMPOSITE_OVER, $x, $y );
3948
+					$img1->compositeImage($img, imagick::COMPOSITE_OVER, $x, $y);
3949 3949
 					$result = $this->imagickImage($img, $path, $destformat, $jpgQuality);
3950 3950
 				}
3951 3951
 				
@@ -3956,11 +3956,11 @@  discard block
 block discarded – undo
3956 3956
 				break;
3957 3957
 
3958 3958
 			case 'gd':
3959
-				$img = $this->gdImageCreate($path,$s['mime']);
3959
+				$img = $this->gdImageCreate($path, $s['mime']);
3960 3960
 
3961
-				if ($img &&  false != ($tmp = imagecreatetruecolor($width, $height))) {
3961
+				if ($img && false != ($tmp = imagecreatetruecolor($width, $height))) {
3962 3962
 
3963
-					$this->gdImageBackground($tmp,$bgcolor);
3963
+					$this->gdImageBackground($tmp, $bgcolor);
3964 3964
 
3965 3965
 					if (!imagecopy($tmp, $img, $x, $y, 0, 0, $s[0], $s[1])) {
3966 3966
 						return false;
@@ -3992,15 +3992,15 @@  discard block
 block discarded – undo
3992 3992
 	 * @author Troex Nevelin
3993 3993
 	 **/
3994 3994
 	protected function imgRotate($path, $degree, $bgcolor = '#ffffff', $destformat = null, $jpgQuality = null) {
3995
-		if (($s = @getimagesize($path)) == false || $degree % 360 === 0) {
3995
+		if (($s = @getimagesize($path)) == false || $degree%360 === 0) {
3996 3996
 			return false;
3997 3997
 		}
3998 3998
 
3999 3999
 		$result = false;
4000 4000
 
4001 4001
 		// try lossless rotate
4002
-		if ($degree % 90 === 0 && in_array($s[2], array(IMAGETYPE_JPEG, IMAGETYPE_JPEG2000))) {
4003
-			$count = ($degree / 90) % 4;
4002
+		if ($degree%90 === 0 && in_array($s[2], array(IMAGETYPE_JPEG, IMAGETYPE_JPEG2000))) {
4003
+			$count = ($degree/90)%4;
4004 4004
 			$exiftran = array(
4005 4005
 				1 => '-9',
4006 4006
 				2 => '-1',
@@ -4016,7 +4016,7 @@  discard block
 block discarded – undo
4016 4016
 				'exiftran -i '.$exiftran[$count].' '.$path,
4017 4017
 				'jpegtran -rotate '.$jpegtran[$count].' -copy all -outfile '.$quotedPath.' '.$quotedPath
4018 4018
 			);
4019
-			foreach($cmds as $cmd) {
4019
+			foreach ($cmds as $cmd) {
4020 4020
 				if ($this->procExec($cmd) === 0) {
4021 4021
 					$result = true;
4022 4022
 					break;
@@ -4056,12 +4056,12 @@  discard block
 block discarded – undo
4056 4056
 				break;
4057 4057
 
4058 4058
 			case 'gd':
4059
-				$img = $this->gdImageCreate($path,$s['mime']);
4059
+				$img = $this->gdImageCreate($path, $s['mime']);
4060 4060
 
4061 4061
 				$degree = 360 - $degree;
4062 4062
 				list($r, $g, $b) = sscanf($bgcolor, "#%02x%02x%02x");
4063 4063
 				$bgcolor = imagecolorallocate($img, $r, $g, $b);
4064
-				$tmp = imageRotate($img, $degree, (int)$bgcolor);
4064
+				$tmp = imageRotate($img, $degree, (int) $bgcolor);
4065 4065
 
4066 4066
 				$result = $this->gdImage($tmp, $path, $destformat, $s['mime'], $jpgQuality);
4067 4067
 
@@ -4086,11 +4086,11 @@  discard block
 block discarded – undo
4086 4086
 	 * @return int     exit code
4087 4087
 	 * @author Alexey Sukhotin
4088 4088
 	 **/
4089
-	protected function procExec($command , array &$output = null, &$return_var = -1, array &$error_output = null) {
4089
+	protected function procExec($command, array &$output = null, &$return_var = -1, array &$error_output = null) {
4090 4090
 
4091 4091
 		$descriptorspec = array(
4092
-			0 => array("pipe", "r"),  // stdin
4093
-			1 => array("pipe", "w"),  // stdout
4092
+			0 => array("pipe", "r"), // stdin
4093
+			1 => array("pipe", "w"), // stdout
4094 4094
 			2 => array("pipe", "w")   // stderr
4095 4095
 		);
4096 4096
 
@@ -4147,8 +4147,8 @@  discard block
 block discarded – undo
4147 4147
 	 * @param string $mime
4148 4148
 	 * @return gd image resource identifier
4149 4149
 	 */
4150
-	protected function gdImageCreate($path,$mime){
4151
-		switch($mime){
4150
+	protected function gdImageCreate($path, $mime) {
4151
+		switch ($mime) {
4152 4152
 			case 'image/jpeg':
4153 4153
 			return imagecreatefromjpeg($path);
4154 4154
 
@@ -4173,7 +4173,7 @@  discard block
 block discarded – undo
4173 4173
 	 * @param string $mime The original image mime type
4174 4174
 	 * @param int    $jpgQuality  JEPG quality (1-100)
4175 4175
 	 */
4176
-	protected function gdImage($image, $filename, $destformat, $mime, $jpgQuality = null ){
4176
+	protected function gdImage($image, $filename, $destformat, $mime, $jpgQuality = null) {
4177 4177
 
4178 4178
 		if (!$jpgQuality) {
4179 4179
 			$jpgQuality = $this->options['jpgQuality'];
@@ -4197,7 +4197,7 @@  discard block
 block discarded – undo
4197 4197
 	 * @param string $destformat The Image type to use for $filename
4198 4198
 	 * @param int    $jpgQuality  JEPG quality (1-100)
4199 4199
 	 */
4200
-	protected function imagickImage($img, $filename, $destformat, $jpgQuality = null ){
4200
+	protected function imagickImage($img, $filename, $destformat, $jpgQuality = null) {
4201 4201
 
4202 4202
 		if (!$jpgQuality) {
4203 4203
 			$jpgQuality = $this->options['jpgQuality'];
@@ -4252,13 +4252,13 @@  discard block
 block discarded – undo
4252 4252
 	 * @param resource $image gd image resource
4253 4253
 	 * @param string $bgcolor background color in #rrggbb format
4254 4254
 	 */
4255
-	protected function gdImageBackground($image, $bgcolor){
4255
+	protected function gdImageBackground($image, $bgcolor) {
4256 4256
 
4257
-		if( $bgcolor == 'transparent' ){
4258
-			imagesavealpha($image,true);
4257
+		if ($bgcolor == 'transparent') {
4258
+			imagesavealpha($image, true);
4259 4259
 			$bgcolor1 = imagecolorallocatealpha($image, 255, 255, 255, 127);
4260 4260
 
4261
-		}else{
4261
+		} else {
4262 4262
 			list($r, $g, $b) = sscanf($bgcolor, "#%02x%02x%02x");
4263 4263
 			$bgcolor1 = imagecolorallocate($image, $r, $g, $b);
4264 4264
 		}
@@ -4296,13 +4296,13 @@  discard block
 block discarded – undo
4296 4296
 	* @return int|bool
4297 4297
 	* @author Alexey Sukhotin
4298 4298
 	**/
4299
-	protected function stripos($haystack , $needle , $offset = 0) {
4299
+	protected function stripos($haystack, $needle, $offset = 0) {
4300 4300
 		if (function_exists('mb_stripos')) {
4301
-			return mb_stripos($haystack , $needle , $offset, 'UTF-8');
4301
+			return mb_stripos($haystack, $needle, $offset, 'UTF-8');
4302 4302
 		} else if (function_exists('mb_strtolower') && function_exists('mb_strpos')) {
4303 4303
 			return mb_strpos(mb_strtolower($haystack, 'UTF-8'), mb_strtolower($needle, 'UTF-8'), $offset);
4304 4304
 		} 
4305
-		return stripos($haystack , $needle , $offset);
4305
+		return stripos($haystack, $needle, $offset);
4306 4306
 	}
4307 4307
 
4308 4308
 	/**
@@ -4352,22 +4352,22 @@  discard block
 block discarded – undo
4352 4352
 			unset($o);
4353 4353
 			$this->procExec('zip -v', $o, $c);
4354 4354
 			if ($c == 0) {
4355
-				$arcs['create']['application/zip']  = array('cmd' => 'zip', 'argc' => '-r9', 'ext' => 'zip');
4355
+				$arcs['create']['application/zip'] = array('cmd' => 'zip', 'argc' => '-r9', 'ext' => 'zip');
4356 4356
 			}
4357 4357
 			unset($o);
4358 4358
 			$this->procExec('unzip --help', $o, $c);
4359 4359
 			if ($c == 0) {
4360
-				$arcs['extract']['application/zip'] = array('cmd' => 'unzip', 'argc' => '',  'ext' => 'zip');
4360
+				$arcs['extract']['application/zip'] = array('cmd' => 'unzip', 'argc' => '', 'ext' => 'zip');
4361 4361
 			}
4362 4362
 			unset($o);
4363 4363
 			$this->procExec('rar --version', $o, $c);
4364 4364
 			if ($c == 0 || $c == 7) {
4365 4365
 				$arcs['create']['application/x-rar']  = array('cmd' => 'rar', 'argc' => 'a -inul', 'ext' => 'rar');
4366
-				$arcs['extract']['application/x-rar'] = array('cmd' => 'rar', 'argc' => 'x -y',    'ext' => 'rar');
4366
+				$arcs['extract']['application/x-rar'] = array('cmd' => 'rar', 'argc' => 'x -y', 'ext' => 'rar');
4367 4367
 			} else {
4368 4368
 				unset($o);
4369 4369
 				$test = $this->procExec('unrar', $o, $c);
4370
-				if ($c==0 || $c == 7) {
4370
+				if ($c == 0 || $c == 7) {
4371 4371
 					$arcs['extract']['application/x-rar'] = array('cmd' => 'unrar', 'argc' => 'x -y', 'ext' => 'rar');
4372 4372
 				}
4373 4373
 			}
@@ -4389,7 +4389,7 @@  discard block
 block discarded – undo
4389 4389
 				if (empty($arcs['extract']['application/x-tar'])) {
4390 4390
 					$arcs['extract']['application/x-tar'] = array('cmd' => '7za', 'argc' => 'x -ttar -y', 'ext' => 'tar');
4391 4391
 				}
4392
-			} else if (substr(PHP_OS,0,3) === 'WIN') {
4392
+			} else if (substr(PHP_OS, 0, 3) === 'WIN') {
4393 4393
 				// check `7z` for Windows server.
4394 4394
 				unset($o);
4395 4395
 				$this->procExec('7z', $o, $c);
@@ -4443,22 +4443,22 @@  discard block
 block discarded – undo
4443 4443
 
4444 4444
 		// normalize `/../`
4445 4445
 		$normreg = '#('.$sepquoted.')[^'.$sepquoted.']+'.$sepquoted.'\.\.'.$sepquoted.'#';
4446
-		while(preg_match($normreg, $path)) {
4446
+		while (preg_match($normreg, $path)) {
4447 4447
 			$path = preg_replace($normreg, '$1', $path);
4448 4448
 		}
4449 4449
 		
4450 4450
 		// 'Here'
4451
-		if ($path === '' || $path === '.' . $separator) return $base;
4451
+		if ($path === '' || $path === '.'.$separator) return $base;
4452 4452
 		
4453 4453
 		// Absolute path
4454 4454
 		if ($path[0] === $separator || strpos($path, $systemroot) === 0) {
4455 4455
 			return $path;
4456 4456
 		}
4457 4457
 		
4458
-		$preg_separator = '#' . $sepquoted . '#';
4458
+		$preg_separator = '#'.$sepquoted.'#';
4459 4459
 		
4460 4460
 		// Relative path from 'Here'
4461
-		if (substr($path, 0, 2) === '.' . $separator || $path[0] !== '.' || substr($path, 0, 3) !== '..' . $separator) {
4461
+		if (substr($path, 0, 2) === '.'.$separator || $path[0] !== '.' || substr($path, 0, 3) !== '..'.$separator) {
4462 4462
 			$arrn = preg_split($preg_separator, $path, -1, PREG_SPLIT_NO_EMPTY);
4463 4463
 			if ($arrn[0] !== '.') {
4464 4464
 				array_unshift($arrn, '.');
@@ -4472,12 +4472,11 @@  discard block
 block discarded – undo
4472 4472
 			$arrn = preg_split($preg_separator, $path, -1, PREG_SPLIT_NO_EMPTY);
4473 4473
 			$arrp = preg_split($preg_separator, $base, -1, PREG_SPLIT_NO_EMPTY);
4474 4474
 		
4475
-			while (! empty($arrn) && $arrn[0] === '..') {
4475
+			while (!empty($arrn) && $arrn[0] === '..') {
4476 4476
 				array_shift($arrn);
4477 4477
 				array_pop($arrp);
4478 4478
 			}
4479
-			$path = ! empty($arrp) ? $systemroot . join($separator, array_merge($arrp, $arrn)) :
4480
-				(! empty($arrn) ? $systemroot . join($separator, $arrn) : $systemroot);
4479
+			$path = !empty($arrp) ? $systemroot.join($separator, array_merge($arrp, $arrn)) : (!empty($arrn) ? $systemroot.join($separator, $arrn) : $systemroot);
4481 4480
 		}
4482 4481
 		
4483 4482
 		return $path;
@@ -4495,7 +4494,7 @@  discard block
 block discarded – undo
4495 4494
 			@chmod($dir, 0777);
4496 4495
 			foreach (array_diff(scandir($dir), array('.', '..')) as $file) {
4497 4496
 				@set_time_limit(30);
4498
-				$path = $dir . DIRECTORY_SEPARATOR . $file;
4497
+				$path = $dir.DIRECTORY_SEPARATOR.$file;
4499 4498
 				if (!is_link($dir) && is_dir($path)) {
4500 4499
 					$this->rmdirRecursive($path);
4501 4500
 				} else {
@@ -4582,22 +4581,22 @@  discard block
 block discarded – undo
4582 4581
 		try {
4583 4582
 			if ($start = is_string($zipPath)) {
4584 4583
 				$zip = new ZipArchive();
4585
-				if ($zip->open($dir . DIRECTORY_SEPARATOR . $zipPath, ZipArchive::CREATE) !== true) {
4584
+				if ($zip->open($dir.DIRECTORY_SEPARATOR.$zipPath, ZipArchive::CREATE) !== true) {
4586 4585
 					$zip = false;
4587 4586
 				}
4588 4587
 			} else {
4589 4588
 				$zip = $zipPath;
4590 4589
 			}
4591 4590
 			if ($zip) {
4592
-				foreach($files as $file) {
4593
-					$path = $dir . DIRECTORY_SEPARATOR . $file;
4591
+				foreach ($files as $file) {
4592
+					$path = $dir.DIRECTORY_SEPARATOR.$file;
4594 4593
 					if (is_dir($path)) {
4595 4594
 						$zip->addEmptyDir($file);
4596 4595
 						$_files = array();
4597 4596
 						if ($handle = opendir($path)) {
4598 4597
 							while (false !== ($entry = readdir($handle))) {
4599 4598
 								if ($entry !== "." && $entry !== "..") {
4600
-									$_files[] = $file . DIRECTORY_SEPARATOR . $entry;
4599
+									$_files[] = $file.DIRECTORY_SEPARATOR.$entry;
4601 4600
 								}
4602 4601
 							}
4603 4602
 							closedir($handle);
@@ -4782,7 +4781,7 @@  discard block
 block discarded – undo
4782 4781
 	 * @return resource|false
4783 4782
 	 * @author Dmitry (dio) Levashov
4784 4783
 	 **/
4785
-	abstract protected function _fopen($path, $mode="rb");
4784
+	abstract protected function _fopen($path, $mode = "rb");
4786 4785
 	
4787 4786
 	/**
4788 4787
 	 * Close opened file
@@ -4792,7 +4791,7 @@  discard block
 block discarded – undo
4792 4791
 	 * @return bool
4793 4792
 	 * @author Dmitry (dio) Levashov
4794 4793
 	 **/
4795
-	abstract protected function _fclose($fp, $path='');
4794
+	abstract protected function _fclose($fp, $path = '');
4796 4795
 	
4797 4796
 	/********************  file/dir manipulations *************************/
4798 4797
 	
Please login to merge, or discard this patch.