Studio-42 / elFinder

php/elFinderVolumeDriver.class.php

Indentation +13 added lines, -13 removed lines

@@ -200,11 +200,11 @@ 
 		'mimefile'        => '',
 		// mime type normalize map : Array '[ext]:[detected mime type]' => '[normalized mime]'
 		'mimeMap'         => array(
-		                     'md:application/x-genesis-rom' => 'text/x-markdown',
-		                     'md:text/plain'                => 'text/x-markdown',
-		                     'markdown:text/plain'          => 'text/x-markdown',
-		                     'css:text/x-asm'               => 'text/css'
-		                    ),
+							 'md:application/x-genesis-rom' => 'text/x-markdown',
+							 'md:text/plain'                => 'text/x-markdown',
+							 'markdown:text/plain'          => 'text/x-markdown',
+							 'css:text/x-asm'               => 'text/css'
+							),
 		// directory for thumbnails
 		'tmbPath'         => '.tmb',
 		// mode to create thumbnails dir
@@ -4070,14 +4070,14 @@ 
 	// }
 
 	/**
-	* Find position of first occurrence of string in a string with multibyte support
-	*
-	* @param  string  $haystack  The string being checked.
-	* @param  string  $needle    The string to find in haystack.
-	* @param  int     $offset    The search offset. If it is not specified, 0 is used.
-	* @return int|bool
-	* @author Alexey Sukhotin
-	**/
+	 * Find position of first occurrence of string in a string with multibyte support
+	 *
+	 * @param  string  $haystack  The string being checked.
+	 * @param  string  $needle    The string to find in haystack.
+	 * @param  int     $offset    The search offset. If it is not specified, 0 is used.
+	 * @return int|bool
+	 * @author Alexey Sukhotin
+	 **/
 	protected function stripos($haystack , $needle , $offset = 0) {
 		if (function_exists('mb_stripos')) {
 			return mb_stripos($haystack , $needle , $offset);

Spacing +130 added lines, -131 removed lines

@@ -278,7 +278,7 @@ 
 		'utf8fix'      => false,
 		 //                           й                 ё              Й               Ё              Ø         Å
 		'utf8patterns' => array("\u0438\u0306", "\u0435\u0308", "\u0418\u0306", "\u0415\u0308", "\u00d8A", "\u030a"),
-		'utf8replace'  => array("\u0439",        "\u0451",       "\u0419",       "\u0401",       "\u00d8", "\u00c5")
+		'utf8replace'  => array("\u0439", "\u0451", "\u0419", "\u0401", "\u00d8", "\u00c5")
 	);
 
 	/**
@@ -573,7 +573,7 @@ 
 	 **/
 	protected function configure() {
 		// set ARGS
-		$this->ARGS = $_SERVER['REQUEST_METHOD'] === 'POST'? $_POST : $_GET;
+		$this->ARGS = $_SERVER['REQUEST_METHOD'] === 'POST' ? $_POST : $_GET;
 		// set thumbnails path
 		$path = $this->options['tmbPath'];
 		if ($path) {
@@ -604,7 +604,7 @@ 
 		
 		// check 'statOwner' for command `chmod`
 		if (empty($this->options['statOwner'])) {
-			$this->disabled[] ='chmod';
+			$this->disabled[] = 'chmod';
 		}
 		
 		// check 'mimeMap'
@@ -710,7 +710,7 @@ 
 	 **/
 	public function mount(array $opts) {
 		if (!isset($opts['path']) || $opts['path'] === '') {
-			return $this->setError('Path undefined.');;
+			return $this->setError('Path undefined.'); ;
 		}
 		
 		$this->options = array_merge($this->options, $opts);
@@ -729,14 +729,14 @@ 
 		$argInit = !empty($this->ARGS['init']);
 		
 		// session cache
-		if ($argInit || ! isset($_SESSION[elFinder::$sessionCacheKey][$this->id])) {
+		if ($argInit || !isset($_SESSION[elFinder::$sessionCacheKey][$this->id])) {
 			$_SESSION[elFinder::$sessionCacheKey][$this->id] = array();
 		}
 		$this->sessionCache = &$_SESSION[elFinder::$sessionCacheKey][$this->id];
 		
 		// default file attribute
 		$this->defaults = array(
-			'read'    => isset($this->options['defaults']['read'])  ? !!$this->options['defaults']['read']  : true,
+			'read'    => isset($this->options['defaults']['read']) ? !!$this->options['defaults']['read'] : true,
 			'write'   => isset($this->options['defaults']['write']) ? !!$this->options['defaults']['write'] : true,
 			'locked'  => isset($this->options['defaults']['locked']) ? !!$this->options['defaults']['locked'] : false,
 			'hidden'  => isset($this->options['defaults']['hidden']) ? !!$this->options['defaults']['hidden'] : false
@@ -763,8 +763,8 @@ 
 			$this->access = $this->options['accessControl'];
 		}
 		
-		$this->today     = mktime(0,0,0, date('m'), date('d'), date('Y'));
-		$this->yesterday = $this->today-86400;
+		$this->today     = mktime(0, 0, 0, date('m'), date('d'), date('Y'));
+		$this->yesterday = $this->today - 86400;
 		
 		// debug($this->attributes);
 		if (!$this->init()) {
@@ -863,7 +863,7 @@ 
 				foreach ($mimecf as $line_num => $line) {
 					if (!preg_match('/^\s*#/', $line)) {
 						$mime = preg_split('/\s+/', $line, -1, PREG_SPLIT_NO_EMPTY);
-						for ($i = 1, $size = count($mime); $i < $size ; $i++) {
+						for ($i = 1, $size = count($mime); $i < $size; $i++) {
 							if (!isset(self::$mimetypes[$mime[$i]])) {
 								self::$mimetypes[$mime[$i]] = $mime[0];
 							}
@@ -915,8 +915,8 @@ 
 				'read'    => false
 			));
 		}
-		$this->treeDeep = $this->options['treeDeep'] > 0 ? (int)$this->options['treeDeep'] : 1;
-		$this->tmbSize  = $this->options['tmbSize'] > 0 ? (int)$this->options['tmbSize'] : 48;
+		$this->treeDeep = $this->options['treeDeep'] > 0 ? (int) $this->options['treeDeep'] : 1;
+		$this->tmbSize  = $this->options['tmbSize'] > 0 ? (int) $this->options['tmbSize'] : 48;
 		$this->URL      = $this->options['URL'];
 		if ($this->URL && preg_match("|[^/?&=]$|", $this->URL)) {
 			$this->URL .= '/';
@@ -1057,7 +1057,7 @@ 
 	public function options($hash) {
 		$create = $createext = array();
 		if (isset($this->archivers['create']) && is_array($this->archivers['create'])) {
-			foreach($this->archivers['create'] as $m => $v) {
+			foreach ($this->archivers['create'] as $m => $v) {
 				$create[] = $m;
 				$createext[$m] = $v['ext'];
 			}
@@ -1077,7 +1077,7 @@ 
 				'extract'   => isset($this->archivers['extract']) && is_array($this->archivers['extract']) ? array_keys($this->archivers['extract']) : array(),
 				'createext' => $createext
 			),
-			'uiCmdMap'        => (isset($this->options['uiCmdMap']) && is_array($this->options['uiCmdMap']))? $this->options['uiCmdMap'] : array()
+			'uiCmdMap'        => (isset($this->options['uiCmdMap']) && is_array($this->options['uiCmdMap'])) ? $this->options['uiCmdMap'] : array()
 		);
 	}
 	
@@ -1089,7 +1089,7 @@ 
 	 * @author Naoki Sawada
 	 */
 	public function getOption($name) {
-		return isset($this->options[$name])? $this->options[$name] : null;
+		return isset($this->options[$name]) ? $this->options[$name] : null;
 	}
 	
 	/**
@@ -1101,7 +1101,7 @@ 
 	 */
 	public function getOptionsPlugin($name = '') {
 		if ($name) {
-			return isset($this->options['plugin'][$name])? $this->options['plugin'][$name] : array();
+			return isset($this->options['plugin'][$name]) ? $this->options['plugin'][$name] : array();
 		} else {
 			return $this->options['plugin'];
 		}
@@ -1231,7 +1231,7 @@ 
 		$file = $this->stat($path);
 		
 		if ($hash === $this->root()) {
-			$file['uiCmdMap'] = (isset($this->options['uiCmdMap']) && is_array($this->options['uiCmdMap']))? $this->options['uiCmdMap'] : array();
+			$file['uiCmdMap'] = (isset($this->options['uiCmdMap']) && is_array($this->options['uiCmdMap'])) ? $this->options['uiCmdMap'] : array();
 			$file['disabled'] = array_merge(array_unique($this->disabled)); // `array_merge` for type array of JSON
 		}
 		
@@ -1246,7 +1246,7 @@ 
 	 * @return array|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	public function dir($hash, $resolveLink=false) {
+	public function dir($hash, $resolveLink = false) {
 		if (($dir = $this->file($hash)) == false) {
 			return $this->setError(elFinder::ERROR_DIR_NOT_FOUND);
 		}
@@ -1310,14 +1310,14 @@ 
 	 * @return array|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	public function tree($hash='', $deep=0, $exclude='') {
+	public function tree($hash = '', $deep = 0, $exclude = '') {
 		$path = $hash ? $this->decode($hash) : $this->root;
 		
 		if (($dir = $this->stat($path)) == false || $dir['mime'] != 'directory') {
 			return false;
 		}
 		
-		$dirs = $this->gettree($path, $deep > 0 ? $deep -1 : $this->treeDeep-1, $exclude ? $this->decode($exclude) : null);
+		$dirs = $this->gettree($path, $deep > 0 ? $deep - 1 : $this->treeDeep - 1, $exclude ? $this->decode($exclude) : null);
 		array_unshift($dirs, $dir);
 		return $dirs;
 	}
@@ -1547,7 +1547,7 @@ 
 	 * @return array|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	public function duplicate($hash, $suffix='copy') {
+	public function duplicate($hash, $suffix = 'copy') {
 		if ($this->commandDisabled('duplicate')) {
 			return $this->setError(elFinder::ERROR_COPY, '#'.$hash, elFinder::ERROR_PERM_DENIED);
 		}
@@ -1623,7 +1623,7 @@ 
 		
 		if ($file) { // file exists
 			// check POST data `overwrite` for 3rd party uploader
-			$overwrite = isset($_POST['overwrite'])? (bool)$_POST['overwrite'] : $this->options['uploadOverwrite'];
+			$overwrite = isset($_POST['overwrite']) ? (bool) $_POST['overwrite'] : $this->options['uploadOverwrite'];
 			if ($overwrite) {
 				if (!$file['write']) {
 					return $this->setError(elFinder::ERROR_PERM_DENIED);
@@ -1694,7 +1694,7 @@ 
 		if (($test = $volume->closest($src, $rmSrc ? 'locked' : 'read', $rmSrc))) {
 			return $rmSrc
 				? $this->setError($err, $errpath, elFinder::ERROR_LOCKED, $volume->path($test))
-				: $this->setError($err, $errpath, !empty($file['thash'])? elFinder::ERROR_PERM_DENIED : elFinder::ERROR_MKOUTLINK);
+				: $this->setError($err, $errpath, !empty($file['thash']) ? elFinder::ERROR_PERM_DENIED : elFinder::ERROR_MKOUTLINK);
 		}
 
 		$test = $this->joinPathCE($destination, $name);
@@ -1857,7 +1857,7 @@ 
 			return $this->setError(elFinder::ERROR_PERM_DENIED);
 		}
 		$this->clearcache();
-		$this->extractToNewdir = is_null($makedir)? 'auto' : (bool)$makedir;
+		$this->extractToNewdir = is_null($makedir) ? 'auto' : (bool) $makedir;
 		
 		if ($path = $this->convEncOut($this->_extract($this->convEncIn($path), $archiver))) {
 			if (is_array($path)) {
@@ -1915,9 +1915,9 @@ 
 		if ($name === '') {
 			$name = count($files) == 1 ? $files[0] : 'Archive';
 		} else {
-			$name = str_replace(array('/', '\\'), '_', preg_replace('/\.' . preg_quote($archiver['ext'], '/') . '$/i', '', $name));
+			$name = str_replace(array('/', '\\'), '_', preg_replace('/\.'.preg_quote($archiver['ext'], '/').'$/i', '', $name));
 		}
-		$name .='.' . $archiver['ext'];
+		$name .= '.'.$archiver['ext'];
 		$name = $this->uniqueName($dir, $name, '');
 		$this->clearcache();
 		return ($path = $this->convEncOut($this->_archive($this->convEncIn($dir), $this->convEncIn($files), $this->convEncIn($name), $archiver))) ? $this->stat($path) : false;
@@ -1953,7 +1953,7 @@ 
 		
 		$path = $this->decode($hash);
 		
-		$work_path = $this->getWorkFile($this->encoding? $this->convEncIn($path, true) : $path);
+		$work_path = $this->getWorkFile($this->encoding ? $this->convEncIn($path, true) : $path);
 
 		if (!$work_path || !is_writable($work_path)) {
 			if ($work_path && $path !== $work_path && is_file($work_path)) {
@@ -1968,7 +1968,7 @@ 
 			}
 		}
 
-		switch($mode) {
+		switch ($mode) {
 			
 			case 'propresize':
 				$result = $this->imgResize($work_path, $width, $height, true, true);
@@ -2064,7 +2064,7 @@ 
 		}
 		return ($q === '' || $this->commandDisabled('search'))
 			? array()
-			: $this->doSearch(is_null($dir)? $this->root : $dir, $q, $mimes);
+			: $this->doSearch(is_null($dir) ? $this->root : $dir, $q, $mimes);
 	}
 	
 	/**
@@ -2133,9 +2133,9 @@ 
 		$path = ltrim($path, $this->separator);
 		$dirs = explode($this->separator, $path);
 		array_pop($dirs);
-		foreach($dirs as $dir) {
+		foreach ($dirs as $dir) {
 			$targetPath = $this->joinPathCE($base, $dir);
-			if (! $_realpath = $this->realpath($this->encode($targetPath))) {
+			if (!$_realpath = $this->realpath($this->encode($targetPath))) {
 				if ($stat = $this->mkdir($targetHash, $dir)) {
 					$result['added'][] = $stat;
 					$targetHash = $stat['hash'];
@@ -2202,7 +2202,7 @@ 
 	 * @author Naoki Sawada
 	 **/
 	protected function dirnameCE($path) {
-		return (!$this->encoding)? $this->_dirname($path) :	$this->convEncOut($this->_dirname($this->convEncIn($path)));
+		return (!$this->encoding) ? $this->_dirname($path) : $this->convEncOut($this->_dirname($this->convEncIn($path)));
 	}
 	
 	/**
@@ -2213,7 +2213,7 @@ 
 	 * @author Naoki Sawada
 	 **/
 	protected function basenameCE($path) {
-		return (!$this->encoding)? $this->_basename($path) : $this->convEncOut($this->_basename($this->convEncIn($path)));
+		return (!$this->encoding) ? $this->_basename($path) : $this->convEncOut($this->_basename($this->convEncIn($path)));
 	}
 	
 	/**
@@ -2226,7 +2226,7 @@ 
 	 * @author Naoki Sawada
 	 **/
 	protected function joinPathCE($dir, $name) {
-		return (!$this->encoding)? $this->_joinPath($dir, $name) : $this->convEncOut($this->_joinPath($this->convEncIn($dir), $this->convEncIn($name)));
+		return (!$this->encoding) ? $this->_joinPath($dir, $name) : $this->convEncOut($this->_joinPath($this->convEncIn($dir), $this->convEncIn($name)));
 	}
 	
 	/**
@@ -2237,7 +2237,7 @@ 
 	 * @author Naoki Sawada
 	 **/
 	protected function normpathCE($path) {
-		return (!$this->encoding)? $this->_normpath($path) : $this->convEncOut($this->_normpath($this->convEncIn($path)));
+		return (!$this->encoding) ? $this->_normpath($path) : $this->convEncOut($this->_normpath($this->convEncIn($path)));
 	}
 	
 	/**
@@ -2248,7 +2248,7 @@ 
 	 * @author Naoki Sawada
 	 **/
 	protected function relpathCE($path) {
-		return (!$this->encoding)? $this->_relpath($path) : $this->convEncOut($this->_relpath($this->convEncIn($path)));
+		return (!$this->encoding) ? $this->_relpath($path) : $this->convEncOut($this->_relpath($this->convEncIn($path)));
 	}
 	
 	/**
@@ -2259,7 +2259,7 @@ 
 	 * @author Naoki Sawada
 	 **/
 	protected function abspathCE($path) {
-		return (!$this->encoding)? $this->_abspath($path): $this->convEncOut($this->_abspath($this->convEncIn($path)));
+		return (!$this->encoding) ? $this->_abspath($path) : $this->convEncOut($this->_abspath($this->convEncIn($path)));
 	}
 	
 	/**
@@ -2271,7 +2271,7 @@ 
 	 * @author Naoki Sawada
 	 **/
 	protected function inpathCE($path, $parent) {
-		return (!$this->encoding)? $this->_inpath($path, $parent) : $this->convEncOut($this->_inpath($this->convEncIn($path), $this->convEncIn($parent)));
+		return (!$this->encoding) ? $this->_inpath($path, $parent) : $this->convEncOut($this->_inpath($this->convEncIn($path), $this->convEncIn($parent)));
 	}
 	
 	/**
@@ -2282,8 +2282,8 @@ 
 	 * @return resource|false
 	 * @author Naoki Sawada
 	 **/
-	protected function fopenCE($path, $mode='rb') {
-		return (!$this->encoding)? $this->_fopen($path, $mode) : $this->convEncOut($this->_fopen($this->convEncIn($path), $mode));
+	protected function fopenCE($path, $mode = 'rb') {
+		return (!$this->encoding) ? $this->_fopen($path, $mode) : $this->convEncOut($this->_fopen($this->convEncIn($path), $mode));
 	}
 	
 	/**
@@ -2294,8 +2294,8 @@ 
 	 * @return bool
 	 * @author Naoki Sawada
 	 **/
-	protected function fcloseCE($fp, $path='') {
-		return (!$this->encoding)? $this->_fclose($fp, $path) : $this->convEncOut($this->_fclose($fp, $this->convEncIn($path)));
+	protected function fcloseCE($fp, $path = '') {
+		return (!$this->encoding) ? $this->_fclose($fp, $path) : $this->convEncOut($this->_fclose($fp, $this->convEncIn($path)));
 	}
 	
 	/**
@@ -2310,7 +2310,7 @@ 
 	 * @author Naoki Sawada
 	 **/
 	protected function saveCE($fp, $dir, $name, $stat) {
-		return (!$this->encoding)? $this->_save($fp, $dir, $name, $stat) : $this->convEncOut($this->_save($fp, $this->convEncIn($dir), $this->convEncIn($name), $this->convEncIn($stat)));
+		return (!$this->encoding) ? $this->_save($fp, $dir, $name, $stat) : $this->convEncOut($this->_save($fp, $this->convEncIn($dir), $this->convEncIn($name), $this->convEncIn($stat)));
 	}
 	
 	/**
@@ -2322,7 +2322,7 @@ 
 	 **/
 	protected function subdirsCE($path) {
 		if (!isset($this->subdirsCache[$path])) {
-			$this->subdirsCache[$path] = (!$this->encoding)? $this->_subdirs($path) : $this->convEncOut($this->_subdirs($this->convEncIn($path)));
+			$this->subdirsCache[$path] = (!$this->encoding) ? $this->_subdirs($path) : $this->convEncOut($this->_subdirs($this->convEncIn($path)));
 		}
 		return $this->subdirsCache[$path];
 	}
@@ -2335,7 +2335,7 @@ 
 	 * @author Naoki Sawada
 	 **/
 	protected function scandirCE($path) {
-		return (!$this->encoding)? $this->_scandir($path) : $this->convEncOut($this->_scandir($this->convEncIn($path)));
+		return (!$this->encoding) ? $this->_scandir($path) : $this->convEncOut($this->_scandir($this->convEncIn($path)));
 	}
 	
 	/**
@@ -2348,7 +2348,7 @@ 
 	 * @author Naoki Sawada
 	 **/
 	protected function symlinkCE($source, $targetDir, $name) {
-		return (!$this->encoding)? $this->_symlink($source, $targetDir, $name) : $this->convEncOut($this->_symlink($this->convEncIn($source), $this->convEncIn($targetDir), $this->convEncIn($name)));
+		return (!$this->encoding) ? $this->_symlink($source, $targetDir, $name) : $this->convEncOut($this->_symlink($this->convEncIn($source), $this->convEncIn($targetDir), $this->convEncIn($name)));
 	}
 	
 	/***************** paths *******************/
@@ -2367,7 +2367,7 @@ 
 			// cut ROOT from $path for security reason, even if hacker decodes the path he will not know the root
 			$p = $this->relpathCE($path);
 			// if reqesting root dir $path will be empty, then assign '/' as we cannot leave it blank for crypt
-			if ($p === '')	{
+			if ($p === '') {
 				$p = DIRECTORY_SEPARATOR;
 			}
 
@@ -2400,7 +2400,7 @@ 
 			// TODO uncrypt hash and return path
 			$path = $this->uncrypt($h); 
 			// append ROOT to path after it was cut in encode
-			return $this->abspathCE($path);//$this->root.($path == DIRECTORY_SEPARATOR ? '' : DIRECTORY_SEPARATOR.$path); 
+			return $this->abspathCE($path); //$this->root.($path == DIRECTORY_SEPARATOR ? '' : DIRECTORY_SEPARATOR.$path); 
 		}
 	}
 	
@@ -2457,21 +2457,21 @@ 
 	 * @author Dmitry (dio) Levashov
 	 **/
 	public function uniqueName($dir, $name, $suffix = ' copy', $checkNum = true, $start = 1) {
-		$ext  = '';
+		$ext = '';
 
 		if (preg_match('/\.((tar\.(gz|bz|bz2|z|lzo))|cpio\.gz|ps\.gz|xcf\.(gz|bz2)|[a-z0-9]{1,4})$/i', $name, $m)) {
 			$ext  = '.'.$m[1];
-			$name = substr($name, 0,  strlen($name)-strlen($m[0]));
+			$name = substr($name, 0, strlen($name) - strlen($m[0]));
 		} 
 		
 		if ($checkNum && preg_match('/('.preg_quote($suffix, '/').')(\d*)$/i', $name, $m)) {
-			$i    = (int)$m[2];
-			$name = substr($name, 0, strlen($name)-strlen($m[2]));
+			$i    = (int) $m[2];
+			$name = substr($name, 0, strlen($name) - strlen($m[2]));
 		} else {
 			$i     = $start;
 			$name .= $suffix;
 		}
-		$max = $i+100000;
+		$max = $i + 100000;
 
 		while ($i <= $max) {
 			$n = $name.($i > 0 ? $i : '').$ext;
@@ -2495,7 +2495,7 @@ 
 	 * @author Naoki Sawada
 	 */
 	public function convEncIn($var = null, $restoreLocale = false, $unknown = '_') {
-		return (!$this->encoding)? $var : $this->convEnc($var, 'UTF-8', $this->encoding, $this->options['locale'], $restoreLocale, $unknown);
+		return (!$this->encoding) ? $var : $this->convEnc($var, 'UTF-8', $this->encoding, $this->options['locale'], $restoreLocale, $unknown);
 	}
 	
 	/**
@@ -2508,7 +2508,7 @@ 
 	 * @author Naoki Sawada
 	 */
 	public function convEncOut($var = null, $restoreLocale = true, $unknown = '_') {
-		return (!$this->encoding)? $var : $this->convEnc($var, $this->encoding, 'UTF-8', $this->options['locale'], $restoreLocale, $unknown);
+		return (!$this->encoding) ? $var : $this->convEnc($var, $this->encoding, 'UTF-8', $this->options['locale'], $restoreLocale, $unknown);
 	}
 	
 	/**
@@ -2528,7 +2528,7 @@ 
 			}
 			if (is_array($var)) {
 				$_ret = array();
-				foreach($var as $_k => $_v) {
+				foreach ($var as $_k => $_v) {
 					$_ret[$_k] = $this->convEnc($_v, $from, $to, '', false, $unknown = '_');
 				}
 				$var = $_ret;
@@ -2540,7 +2540,7 @@ 
 						$_var = str_replace('?', $unknown, $_var);
 					}
 				}
-				if  ($_var !== false) {
+				if ($_var !== false) {
 					$var = $_var;
 				}
 			}
@@ -2567,7 +2567,7 @@ 
 		
 		$key = '';
 		if ($path !== '') {
-			$key = $this->id . '#' . $path;
+			$key = $this->id.'#'.$path;
 			if (isset($cache[$key])) {
 				return $cache[$key];
 			}
@@ -2599,7 +2599,7 @@ 
 		if ($work = $this->getTempFile()) {
 			if ($wfp = fopen($work, 'wb')) {
 				if ($fp = $this->_fopen($path)) {
-					while(!feof($fp)) {
+					while (!feof($fp)) {
 						fwrite($wfp, fread($fp, 8192));
 					}
 					$this->_fclose($fp, $path);
@@ -2643,7 +2643,7 @@ 
 			@set_time_limit(30);
 			$stat = $this->stat($this->convEncOut($p));
 			$this->convEncIn();
-			($stat['mime'] === 'directory')? $this->delTree($p) : $this->_unlink($p);
+			($stat['mime'] === 'directory') ? $this->delTree($p) : $this->_unlink($p);
 		}
 		return $this->_rmdir($localpath);
 	}
@@ -2660,7 +2660,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function attr($path, $name, $val=null, $isDir=null) {
+	protected function attr($path, $name, $val = null, $isDir = null) {
 		if (!isset($this->defaults[$name])) {
 			return false;
 		}
@@ -2692,7 +2692,7 @@ 
 			} 
 		}
 		
-		return $perm === null ? (is_null($val)? $this->defaults[$name] : $val) : !!$perm;
+		return $perm === null ? (is_null($val) ? $this->defaults[$name] : $val) : !!$perm;
 	}
 	
 	/**
@@ -2736,7 +2736,7 @@ 
 	protected function allowPutMime($mime) {
 		// logic based on http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order
 		$allow  = $this->mimeAccepted($mime, $this->uploadAllow, null);
-		$deny   = $this->mimeAccepted($mime, $this->uploadDeny,  null);
+		$deny   = $this->mimeAccepted($mime, $this->uploadDeny, null);
 		$res = true; // default to allow
 		if (strtolower($this->uploadOrder[0]) == 'allow') { // array('allow', 'deny'), default is to 'deny'
 			$res = false; // default is deny
@@ -2809,10 +2809,10 @@ 
 			if ($this->rootName) {
 				$stat['name'] = $this->rootName;
 			}
-			if (! empty($this->options['icon'])) {
+			if (!empty($this->options['icon'])) {
 				$stat['icon'] = $this->options['icon'];
 			}
-			if (! empty($this->options['rootCssClass'])) {
+			if (!empty($this->options['rootCssClass'])) {
 				$stat['csscls'] = $this->options['rootCssClass'];
 			}
 		} else {
@@ -2860,7 +2860,7 @@ 
 			// lock when parent directory is not writable
 			if (!isset($stat['locked'])) {
 				$parent = $this->dirnameCE($path);
-				$pstat = isset($this->cache[$parent])? $this->cache[$parent] : array();
+				$pstat = isset($this->cache[$parent]) ? $this->cache[$parent] : array();
 				if (isset($pstat['write']) && !$pstat['write']) {
 					$stat['locked'] = true;
 				}
@@ -2918,7 +2918,7 @@ 
 			}
 			if (!isset($stat['url']) && $this->URL && $this->encoding) {
 				$_path = str_replace($this->separator, '/', substr($path, strlen($this->root) + 1));
-				$stat['url'] = rtrim($this->URL, '/') . '/' . str_replace('%2F', '/', rawurlencode((substr(PHP_OS, 0, 3) === 'WIN')? $_path : $this->convEncIn($_path, true)));
+				$stat['url'] = rtrim($this->URL, '/').'/'.str_replace('%2F', '/', rawurlencode((substr(PHP_OS, 0, 3) === 'WIN') ? $_path : $this->convEncIn($_path, true)));
 			}
 		} else {
 			if ($isDir) {
@@ -3162,7 +3162,7 @@ 
 	 * @return array
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function gettree($path, $deep, $exclude='') {
+	protected function gettree($path, $deep, $exclude = '') {
 		$dirs = array();
 		
 		!isset($this->dirsCache[$path]) && $this->cacheDir($path);
@@ -3173,7 +3173,7 @@ 
 			if ($stat && empty($stat['hidden']) && $p != $exclude && $stat['mime'] == 'directory') {
 				$dirs[] = $stat;
 				if ($deep > 0 && !empty($stat['dirs'])) {
-					$dirs = array_merge($dirs, $this->gettree($p, $deep-1));
+					$dirs = array_merge($dirs, $this->gettree($p, $deep - 1));
 				}
 			}
 		}
@@ -3193,7 +3193,7 @@ 
 	protected function doSearch($path, $q, $mimes) {
 		$result = array();
 
-		foreach($this->scandirCE($path) as $p) {
+		foreach ($this->scandirCE($path) as $p) {
 			@set_time_limit(30);
 			$stat = $this->stat($p);
 
@@ -3214,7 +3214,7 @@ 
 					if ($this->encoding) {
 						$path = str_replace('%2F', '/', rawurlencode($this->convEncIn($path, true)));
 					}
-					$stat['url'] = $this->URL . $path;
+					$stat['url'] = $this->URL.$path;
 				}
 				
 				$result[] = $stat;
@@ -3248,7 +3248,7 @@ 
 			if (!$this->inpathCE($target, $this->root)) {
 				return $this->setError(elFinder::ERROR_COPY, $this->path($srcStat['hash']), elFinder::ERROR_MKOUTLINK);
 			}
-			$stat   = $this->stat($target);
+			$stat = $this->stat($target);
 			$this->clearcache();
 			return $stat && $this->symlinkCE($target, $dst, $name)
 				? $this->joinPathCE($dst, $name)
@@ -3529,15 +3529,15 @@ 
 		}
 
 		/* If image smaller or equal thumbnail size - just fitting to thumbnail square */
-		if ($s[0] <= $tmbSize && $s[1]	<= $tmbSize) {
-			$result = $this->imgSquareFit($tmb, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png' );
+		if ($s[0] <= $tmbSize && $s[1] <= $tmbSize) {
+			$result = $this->imgSquareFit($tmb, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png');
 		} else {
 		
 			if ($this->options['tmbCrop']) {
 		
 				$result = $tmb;
 				/* Resize and crop if image bigger than thumbnail */
-				if (!(($s[0] > $tmbSize && $s[1] <= $tmbSize) || ($s[0] <= $tmbSize && $s[1] > $tmbSize) ) || ($s[0] > $tmbSize && $s[1] > $tmbSize)) {
+				if (!(($s[0] > $tmbSize && $s[1] <= $tmbSize) || ($s[0] <= $tmbSize && $s[1] > $tmbSize)) || ($s[0] > $tmbSize && $s[1] > $tmbSize)) {
 					$result = $this->imgResize($tmb, $tmbSize, $tmbSize, true, false, 'png');
 				}
 		
@@ -3554,7 +3554,7 @@ 
 			}
 		
 			if ($result) {
-				$result = $this->imgSquareFit($result, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png' );
+				$result = $this->imgSquareFit($result, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png');
 			}
 		}
 		
@@ -3595,18 +3595,18 @@ 
 			/* Resizing by biggest side */
 			if ($resizeByBiggerSide) {
 				if ($orig_w > $orig_h) {
-					$size_h = round($orig_h * $width / $orig_w);
+					$size_h = round($orig_h*$width/$orig_w);
 					$size_w = $width;
 				} else {
-					$size_w = round($orig_w * $height / $orig_h);
+					$size_w = round($orig_w*$height/$orig_h);
 					$size_h = $height;
 				}
 			} else {
 				if ($orig_w > $orig_h) {
-					$size_w = round($orig_w * $height / $orig_h);
+					$size_w = round($orig_w*$height/$orig_h);
 					$size_h = $height;
 				} else {
-					$size_h = round($orig_h * $width / $orig_w);
+					$size_h = round($orig_h*$width/$orig_w);
 					$size_w = $width;
 				}
 			}
@@ -3624,7 +3624,7 @@ 
 				// Imagick::FILTER_BOX faster than FILTER_LANCZOS so use for createTmb
 				// resize bench: http://app-mgng.rhcloud.com/9
 				// resize sample: http://www.dylanbeattie.net/magick/filters/result.html
-				$filter = ($destformat === 'png' /* createTmb */)? Imagick::FILTER_BOX : Imagick::FILTER_LANCZOS;
+				$filter = ($destformat === 'png' /* createTmb */) ? Imagick::FILTER_BOX : Imagick::FILTER_LANCZOS;
 				
 				$ani = ($img->getNumberImages() > 1);
 				if ($ani && is_null($destformat)) {
@@ -3649,11 +3649,11 @@ 
 				break;
 
 			case 'gd':
-				$img = self::gdImageCreate($path,$s['mime']);
+				$img = self::gdImageCreate($path, $s['mime']);
 
-				if ($img &&  false != ($tmp = imagecreatetruecolor($size_w, $size_h))) {
+				if ($img && false != ($tmp = imagecreatetruecolor($size_w, $size_h))) {
 				
-					self::gdImageBackground($tmp,$this->options['tmbBgColor']);
+					self::gdImageBackground($tmp, $this->options['tmbBgColor']);
 					
 					if (!imagecopyresampled($tmp, $img, 0, 0, 0, 0, $size_w, $size_h, $s[0], $s[1])) {
 						return false;
@@ -3729,11 +3729,11 @@ 
 				break;
 
 			case 'gd':
-				$img = self::gdImageCreate($path,$s['mime']);
+				$img = self::gdImageCreate($path, $s['mime']);
 
-				if ($img &&  false != ($tmp = imagecreatetruecolor($width, $height))) {
+				if ($img && false != ($tmp = imagecreatetruecolor($width, $height))) {
 					
-					self::gdImageBackground($tmp,$this->options['tmbBgColor']);
+					self::gdImageBackground($tmp, $this->options['tmbBgColor']);
 
 					$size_w = $width;
 					$size_h = $height;
@@ -3783,8 +3783,8 @@ 
 		$result = false;
 
 		/* Coordinates for image over square aligning */
-		$y = ceil(abs($height - $s[1]) / 2); 
-		$x = ceil(abs($width - $s[0]) / 2);
+		$y = ceil(abs($height - $s[1])/2); 
+		$x = ceil(abs($width - $s[0])/2);
 
 		switch ($this->imgLib) {
 			case 'imagick':
@@ -3804,7 +3804,7 @@ 
 						$gif->newImage($width, $height, new ImagickPixel($bgcolor));
 						$gif->setImageColorspace($img->getImageColorspace());
 						$gif->setImageFormat('gif');
-						$gif->compositeImage( $img, imagick::COMPOSITE_OVER, $x, $y );
+						$gif->compositeImage($img, imagick::COMPOSITE_OVER, $x, $y);
 						$gif->setImageDelay($img->getImageDelay());
 						$gif->setImageIterations($img->getImageIterations());
 						$img1->addImage($gif);
@@ -3820,7 +3820,7 @@ 
 					$img1->newImage($width, $height, new ImagickPixel($bgcolor));
 					$img1->setImageColorspace($img->getImageColorspace());
 					$img1->setImageFormat($destformat != null ? $destformat : $img->getFormat());
-					$img1->compositeImage( $img, imagick::COMPOSITE_OVER, $x, $y );
+					$img1->compositeImage($img, imagick::COMPOSITE_OVER, $x, $y);
 					$result = $img1->writeImage($path);
 				}
 				
@@ -3831,11 +3831,11 @@ 
 				break;
 
 			case 'gd':
-				$img = self::gdImageCreate($path,$s['mime']);
+				$img = self::gdImageCreate($path, $s['mime']);
 
-				if ($img &&  false != ($tmp = imagecreatetruecolor($width, $height))) {
+				if ($img && false != ($tmp = imagecreatetruecolor($width, $height))) {
 
-					self::gdImageBackground($tmp,$bgcolor);
+					self::gdImageBackground($tmp, $bgcolor);
 
 					if (!imagecopy($tmp, $img, $x, $y, 0, 0, $s[0], $s[1])) {
 						return false;
@@ -3866,15 +3866,15 @@ 
 	 * @author Troex Nevelin
 	 **/
 	protected function imgRotate($path, $degree, $bgcolor = '#ffffff', $destformat = null) {
-		if (($s = @getimagesize($path)) == false || $degree % 360 === 0) {
+		if (($s = @getimagesize($path)) == false || $degree%360 === 0) {
 			return false;
 		}
 
 		$result = false;
 
 		// try lossless rotate
-		if ($degree % 90 === 0 && in_array($s[2], array(IMAGETYPE_JPEG, IMAGETYPE_JPEG2000))) {
-			$count = ($degree / 90) % 4;
+		if ($degree%90 === 0 && in_array($s[2], array(IMAGETYPE_JPEG, IMAGETYPE_JPEG2000))) {
+			$count = ($degree/90)%4;
 			$exiftran = array(
 				1 => '-9',
 				2 => '-1',
@@ -3890,7 +3890,7 @@ 
 				'exiftran -i '.$exiftran[$count].' '.$path,
 				'jpegtran -rotate '.$jpegtran[$count].' -copy all -outfile '.$quotedPath.' '.$quotedPath
 			);
-			foreach($cmds as $cmd) {
+			foreach ($cmds as $cmd) {
 				if ($this->procExec($cmd) === 0) {
 					$result = true;
 					break;
@@ -3926,12 +3926,12 @@ 
 				break;
 
 			case 'gd':
-				$img = self::gdImageCreate($path,$s['mime']);
+				$img = self::gdImageCreate($path, $s['mime']);
 
 				$degree = 360 - $degree;
 				list($r, $g, $b) = sscanf($bgcolor, "#%02x%02x%02x");
 				$bgcolor = imagecolorallocate($img, $r, $g, $b);
-				$tmp = imageRotate($img, $degree, (int)$bgcolor);
+				$tmp = imageRotate($img, $degree, (int) $bgcolor);
 
 				$result = self::gdImage($tmp, $path, $destformat, $s['mime']);
 
@@ -3956,11 +3956,11 @@ 
 	 * @return int     exit code
 	 * @author Alexey Sukhotin
 	 **/
-	protected function procExec($command , array &$output = null, &$return_var = -1, array &$error_output = null) {
+	protected function procExec($command, array &$output = null, &$return_var = -1, array &$error_output = null) {
 
 		$descriptorspec = array(
-			0 => array("pipe", "r"),  // stdin
-			1 => array("pipe", "w"),  // stdout
+			0 => array("pipe", "r"), // stdin
+			1 => array("pipe", "w"), // stdout
 			2 => array("pipe", "w")   // stderr
 		);
 
@@ -4017,8 +4017,8 @@ 
 	 * @param string $mime
 	 * @return gd image resource identifier
 	 */
-	protected function gdImageCreate($path,$mime){
-		switch($mime){
+	protected function gdImageCreate($path, $mime) {
+		switch ($mime) {
 			case 'image/jpeg':
 			return imagecreatefromjpeg($path);
 
@@ -4042,7 +4042,7 @@ 
 	 * @param string $destformat The Image type to use for $filename
 	 * @param string $mime The original image mime type
 	 */
-	protected function gdImage($image, $filename, $destformat, $mime ){
+	protected function gdImage($image, $filename, $destformat, $mime) {
 
 		if ($destformat == 'jpg' || ($destformat == null && $mime == 'image/jpeg')) {
 			return imagejpeg($image, $filename, 100);
@@ -4061,13 +4061,13 @@ 
 	 * @param resource $image gd image resource
 	 * @param string $bgcolor background color in #rrggbb format
 	 */
-	protected function gdImageBackground($image, $bgcolor){
+	protected function gdImageBackground($image, $bgcolor) {
 
-		if( $bgcolor == 'transparent' ){
-			imagesavealpha($image,true);
+		if ($bgcolor == 'transparent') {
+			imagesavealpha($image, true);
 			$bgcolor1 = imagecolorallocatealpha($image, 255, 255, 255, 127);
 
-		}else{
+		} else {
 			list($r, $g, $b) = sscanf($bgcolor, "#%02x%02x%02x");
 			$bgcolor1 = imagecolorallocate($image, $r, $g, $b);
 		}
@@ -4105,13 +4105,13 @@ 
 	* @return int|bool
 	* @author Alexey Sukhotin
 	**/
-	protected function stripos($haystack , $needle , $offset = 0) {
+	protected function stripos($haystack, $needle, $offset = 0) {
 		if (function_exists('mb_stripos')) {
-			return mb_stripos($haystack , $needle , $offset, 'UTF-8');
+			return mb_stripos($haystack, $needle, $offset, 'UTF-8');
 		} else if (function_exists('mb_strtolower') && function_exists('mb_strpos')) {
 			return mb_strpos(mb_strtolower($haystack, 'UTF-8'), mb_strtolower($needle, 'UTF-8'), $offset);
 		} 
-		return stripos($haystack , $needle , $offset);
+		return stripos($haystack, $needle, $offset);
 	}
 
 	/**
@@ -4161,22 +4161,22 @@ 
 			unset($o);
 			$this->procExec('zip -v', $o, $c);
 			if ($c == 0) {
-				$arcs['create']['application/zip']  = array('cmd' => 'zip', 'argc' => '-r9', 'ext' => 'zip');
+				$arcs['create']['application/zip'] = array('cmd' => 'zip', 'argc' => '-r9', 'ext' => 'zip');
 			}
 			unset($o);
 			$this->procExec('unzip --help', $o, $c);
 			if ($c == 0) {
-				$arcs['extract']['application/zip'] = array('cmd' => 'unzip', 'argc' => '',  'ext' => 'zip');
+				$arcs['extract']['application/zip'] = array('cmd' => 'unzip', 'argc' => '', 'ext' => 'zip');
 			}
 			unset($o);
 			$this->procExec('rar --version', $o, $c);
 			if ($c == 0 || $c == 7) {
 				$arcs['create']['application/x-rar']  = array('cmd' => 'rar', 'argc' => 'a -inul', 'ext' => 'rar');
-				$arcs['extract']['application/x-rar'] = array('cmd' => 'rar', 'argc' => 'x -y',    'ext' => 'rar');
+				$arcs['extract']['application/x-rar'] = array('cmd' => 'rar', 'argc' => 'x -y', 'ext' => 'rar');
 			} else {
 				unset($o);
 				$test = $this->procExec('unrar', $o, $c);
-				if ($c==0 || $c == 7) {
+				if ($c == 0 || $c == 7) {
 					$arcs['extract']['application/x-rar'] = array('cmd' => 'unrar', 'argc' => 'x -y', 'ext' => 'rar');
 				}
 			}
@@ -4198,7 +4198,7 @@ 
 				if (empty($arcs['extract']['application/x-tar'])) {
 					$arcs['extract']['application/x-tar'] = array('cmd' => '7za', 'argc' => 'x -ttar -y', 'ext' => 'tar');
 				}
-			} else if (substr(PHP_OS,0,3) === 'WIN') {
+			} else if (substr(PHP_OS, 0, 3) === 'WIN') {
 				// check `7z` for Windows server.
 				unset($o);
 				$this->procExec('7z', $o, $c);
@@ -4252,22 +4252,22 @@ 
 
 		// normalize `/../`
 		$normreg = '#('.$sepquoted.')[^'.$sepquoted.']+'.$sepquoted.'\.\.'.$sepquoted.'#';
-		while(preg_match($normreg, $path)) {
+		while (preg_match($normreg, $path)) {
 			$path = preg_replace($normreg, '$1', $path);
 		}
 		
 		// 'Here'
-		if ($path === '' || $path === '.' . $separator) return $base;
+		if ($path === '' || $path === '.'.$separator) return $base;
 		
 		// Absolute path
 		if ($path[0] === $separator || strpos($path, $systemroot) === 0) {
 			return $path;
 		}
 		
-		$preg_separator = '#' . $sepquoted . '#';
+		$preg_separator = '#'.$sepquoted.'#';
 		
 		// Relative path from 'Here'
-		if (substr($path, 0, 2) === '.' . $separator || $path[0] !== '.' || substr($path, 0, 3) !== '..' . $separator) {
+		if (substr($path, 0, 2) === '.'.$separator || $path[0] !== '.' || substr($path, 0, 3) !== '..'.$separator) {
 			$arrn = preg_split($preg_separator, $path, -1, PREG_SPLIT_NO_EMPTY);
 			if ($arrn[0] !== '.') {
 				array_unshift($arrn, '.');
@@ -4281,12 +4281,11 @@ 
 			$arrn = preg_split($preg_separator, $path, -1, PREG_SPLIT_NO_EMPTY);
 			$arrp = preg_split($preg_separator, $base, -1, PREG_SPLIT_NO_EMPTY);
 		
-			while (! empty($arrn) && $arrn[0] === '..') {
+			while (!empty($arrn) && $arrn[0] === '..') {
 				array_shift($arrn);
 				array_pop($arrp);
 			}
-			$path = ! empty($arrp) ? $systemroot . join($separator, array_merge($arrp, $arrn)) :
-				(! empty($arrn) ? $systemroot . join($separator, $arrn) : $systemroot);
+			$path = !empty($arrp) ? $systemroot.join($separator, array_merge($arrp, $arrn)) : (!empty($arrn) ? $systemroot.join($separator, $arrn) : $systemroot);
 		}
 		
 		return $path;
@@ -4304,7 +4303,7 @@ 
 			@chmod($dir, 0777);
 			foreach (array_diff(scandir($dir), array('.', '..')) as $file) {
 				@set_time_limit(30);
-				$path = $dir . DIRECTORY_SEPARATOR . $file;
+				$path = $dir.DIRECTORY_SEPARATOR.$file;
 				if (!is_link($dir) && is_dir($path)) {
 					$this->rmdirRecursive($path);
 				} else {
@@ -4391,22 +4390,22 @@ 
 		try {
 			if ($start = is_string($zipPath)) {
 				$zip = new ZipArchive();
-				if ($zip->open($dir . DIRECTORY_SEPARATOR . $zipPath, ZipArchive::CREATE) !== true) {
+				if ($zip->open($dir.DIRECTORY_SEPARATOR.$zipPath, ZipArchive::CREATE) !== true) {
 					$zip = false;
 				}
 			} else {
 				$zip = $zipPath;
 			}
 			if ($zip) {
-				foreach($files as $file) {
-					$path = $dir . DIRECTORY_SEPARATOR . $file;
+				foreach ($files as $file) {
+					$path = $dir.DIRECTORY_SEPARATOR.$file;
 					if (is_dir($path)) {
 						$zip->addEmptyDir($file);
 						$_files = array();
 						if ($handle = opendir($path)) {
 							while (false !== ($entry = readdir($handle))) {
 								if ($entry !== "." && $entry !== "..") {
-									$_files[] = $file . DIRECTORY_SEPARATOR . $entry;
+									$_files[] = $file.DIRECTORY_SEPARATOR.$entry;
 								}
 							}
 							closedir($handle);
@@ -4591,7 +4590,7 @@ 
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	abstract protected function _fopen($path, $mode="rb");
+	abstract protected function _fopen($path, $mode = "rb");
 	
 	/**
 	 * Close opened file
@@ -4601,7 +4600,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	abstract protected function _fclose($fp, $path='');
+	abstract protected function _fclose($fp, $path = '');
 	
 	/********************  file/dir manipulations *************************/