Studio-42 / elFinder

php/elFinder.class.php

Spacing +162 added lines, -162 removed lines

@@ -203,14 +203,14 @@ 
 	const ERROR_INV_PARAMS        = 'errCmdParams';
 	const ERROR_OPEN              = 'errOpen';
 	const ERROR_DIR_NOT_FOUND     = 'errFolderNotFound';
-	const ERROR_FILE_NOT_FOUND    = 'errFileNotFound';     // 'File not found.'
+	const ERROR_FILE_NOT_FOUND    = 'errFileNotFound'; // 'File not found.'
 	const ERROR_TRGDIR_NOT_FOUND  = 'errTrgFolderNotFound'; // 'Target folder "$1" not found.'
 	const ERROR_NOT_DIR           = 'errNotFolder';
 	const ERROR_NOT_FILE          = 'errNotFile';
 	const ERROR_PERM_DENIED       = 'errPerm';
-	const ERROR_LOCKED            = 'errLocked';        // '"$1" is locked and can not be renamed, moved or removed.'
-	const ERROR_EXISTS            = 'errExists';        // 'File named "$1" already exists.'
-	const ERROR_INVALID_NAME      = 'errInvName';       // 'Invalid file name.'
+	const ERROR_LOCKED            = 'errLocked'; // '"$1" is locked and can not be renamed, moved or removed.'
+	const ERROR_EXISTS            = 'errExists'; // 'File named "$1" already exists.'
+	const ERROR_INVALID_NAME      = 'errInvName'; // 'Invalid file name.'
 	const ERROR_MKDIR             = 'errMkdir';
 	const ERROR_MKFILE            = 'errMkfile';
 	const ERROR_RENAME            = 'errRename';
@@ -219,20 +219,20 @@ 
 	const ERROR_COPY_FROM         = 'errCopyFrom';
 	const ERROR_COPY_TO           = 'errCopyTo';
 	const ERROR_COPY_ITSELF       = 'errCopyInItself';
-	const ERROR_REPLACE           = 'errReplace';          // 'Unable to replace "$1".'
-	const ERROR_RM                = 'errRm';               // 'Unable to remove "$1".'
-	const ERROR_RM_SRC            = 'errRmSrc';            // 'Unable remove source file(s)'
-	const ERROR_MKOUTLINK         = 'errMkOutLink';        // 'Unable to create a link to outside the volume root.'
-	const ERROR_UPLOAD            = 'errUpload';           // 'Upload error.'
-	const ERROR_UPLOAD_FILE       = 'errUploadFile';       // 'Unable to upload "$1".'
-	const ERROR_UPLOAD_NO_FILES   = 'errUploadNoFiles';    // 'No files found for upload.'
-	const ERROR_UPLOAD_TOTAL_SIZE = 'errUploadTotalSize';  // 'Data exceeds the maximum allowed size.'
-	const ERROR_UPLOAD_FILE_SIZE  = 'errUploadFileSize';   // 'File exceeds maximum allowed size.'
-	const ERROR_UPLOAD_FILE_MIME  = 'errUploadMime';       // 'File type not allowed.'
-	const ERROR_UPLOAD_TRANSFER   = 'errUploadTransfer';   // '"$1" transfer error.'
-	const ERROR_UPLOAD_TEMP       = 'errUploadTemp';       // 'Unable to make temporary file for upload.'
+	const ERROR_REPLACE           = 'errReplace'; // 'Unable to replace "$1".'
+	const ERROR_RM                = 'errRm'; // 'Unable to remove "$1".'
+	const ERROR_RM_SRC            = 'errRmSrc'; // 'Unable remove source file(s)'
+	const ERROR_MKOUTLINK         = 'errMkOutLink'; // 'Unable to create a link to outside the volume root.'
+	const ERROR_UPLOAD            = 'errUpload'; // 'Upload error.'
+	const ERROR_UPLOAD_FILE       = 'errUploadFile'; // 'Unable to upload "$1".'
+	const ERROR_UPLOAD_NO_FILES   = 'errUploadNoFiles'; // 'No files found for upload.'
+	const ERROR_UPLOAD_TOTAL_SIZE = 'errUploadTotalSize'; // 'Data exceeds the maximum allowed size.'
+	const ERROR_UPLOAD_FILE_SIZE  = 'errUploadFileSize'; // 'File exceeds maximum allowed size.'
+	const ERROR_UPLOAD_FILE_MIME  = 'errUploadMime'; // 'File type not allowed.'
+	const ERROR_UPLOAD_TRANSFER   = 'errUploadTransfer'; // '"$1" transfer error.'
+	const ERROR_UPLOAD_TEMP       = 'errUploadTemp'; // 'Unable to make temporary file for upload.'
 	// const ERROR_ACCESS_DENIED     = 'errAccess';
-	const ERROR_NOT_REPLACE       = 'errNotReplace';       // Object "$1" already exists at this location and can not be replaced with object of another type.
+	const ERROR_NOT_REPLACE       = 'errNotReplace'; // Object "$1" already exists at this location and can not be replaced with object of another type.
 	const ERROR_SAVE              = 'errSave';
 	const ERROR_EXTRACT           = 'errExtract';
 	const ERROR_ARCHIVE           = 'errArchive';
@@ -247,14 +247,14 @@ 
 	const ERROR_NETMOUNT          = 'errNetMount';
 	const ERROR_NETUNMOUNT        = 'errNetUnMount';
 	const ERROR_NETMOUNT_NO_DRIVER = 'errNetMountNoDriver';
-	const ERROR_NETMOUNT_FAILED       = 'errNetMountFailed';
+	const ERROR_NETMOUNT_FAILED = 'errNetMountFailed';
 
-	const ERROR_SESSION_EXPIRES 	= 'errSessionExpires';
+	const ERROR_SESSION_EXPIRES = 'errSessionExpires';
 
 	const ERROR_CREATING_TEMP_DIR 	= 'errCreatingTempDir';
 	const ERROR_FTP_DOWNLOAD_FILE 	= 'errFtpDownloadFile';
-	const ERROR_FTP_UPLOAD_FILE 	= 'errFtpUploadFile';
-	const ERROR_FTP_MKDIR 		= 'errFtpMkdir';
+	const ERROR_FTP_UPLOAD_FILE = 'errFtpUploadFile';
+	const ERROR_FTP_MKDIR = 'errFtpMkdir';
 	const ERROR_ARCHIVE_EXEC 	= 'errArchiveExec';
 	const ERROR_EXTRACT_EXEC 	= 'errExtractExec';
 
@@ -281,17 +281,17 @@ 
 		
 		$this->time  = $this->utime();
 		$this->debug = (isset($opts['debug']) && $opts['debug'] ? true : false);
-		$this->sessionCloseEarlier = isset($opts['sessionCloseEarlier'])? (bool)$opts['sessionCloseEarlier'] : true;
+		$this->sessionCloseEarlier = isset($opts['sessionCloseEarlier']) ? (bool) $opts['sessionCloseEarlier'] : true;
 		$this->sessionUseCmds = array_flip($sessionUseCmds);
 		$this->timeout = (isset($opts['timeout']) ? $opts['timeout'] : 0);
 		$this->uploadTempPath = (isset($opts['uploadTempPath']) ? $opts['uploadTempPath'] : '');
-		$this->netVolumesSessionKey = !empty($opts['netVolumesSessionKey'])? $opts['netVolumesSessionKey'] : 'elFinderNetVolumes';
+		$this->netVolumesSessionKey = !empty($opts['netVolumesSessionKey']) ? $opts['netVolumesSessionKey'] : 'elFinderNetVolumes';
 		$this->callbackWindowURL = (isset($opts['callbackWindowURL']) ? $opts['callbackWindowURL'] : '');
 		self::$sessionCacheKey = !empty($opts['sessionCacheKey']) ? $opts['sessionCacheKey'] : 'elFinderCaches';
 		
 		// check session cache
 		$_optsMD5 = md5(json_encode($opts['roots']));
-		if (! isset($_SESSION[self::$sessionCacheKey]) || $_SESSION[self::$sessionCacheKey]['_optsMD5'] !== $_optsMD5) {
+		if (!isset($_SESSION[self::$sessionCacheKey]) || $_SESSION[self::$sessionCacheKey]['_optsMD5'] !== $_optsMD5) {
 			$_SESSION[self::$sessionCacheKey] = array(
 				'_optsMD5' => $_optsMD5
 			);
@@ -310,20 +310,20 @@ 
 			$_reqCmd = isset($_req['cmd']) ? $_req['cmd'] : '';
 			foreach ($opts['bind'] as $cmd => $handlers) {
 				$doRegist = (strpos($cmd, '*') !== false);
-				if (! $doRegist) {
+				if (!$doRegist) {
 					$_getcmd = create_function('$cmd', 'list($ret) = explode(\'.\', $cmd);return trim($ret);');
 					$doRegist = ($_reqCmd && in_array($_reqCmd, array_map($_getcmd, explode(' ', $cmd))));
 				}
 				if ($doRegist) {
-					if (! is_array($handlers) || is_object($handlers[0])) {
+					if (!is_array($handlers) || is_object($handlers[0])) {
 						$handlers = array($handlers);
 					}
-					foreach($handlers as $handler) {
+					foreach ($handlers as $handler) {
 						if ($handler) {
 							if (is_string($handler) && strpos($handler, '.')) {
 								list($_domain, $_name, $_method) = array_pad(explode('.', $handler), 3, '');
 								if (strcasecmp($_domain, 'plugin') === 0) {
-									if ($plugin = $this->getPluginInstance($_name, isset($opts['plugin'][$_name])? $opts['plugin'][$_name] : array())
+									if ($plugin = $this->getPluginInstance($_name, isset($opts['plugin'][$_name]) ? $opts['plugin'][$_name] : array())
 											and method_exists($plugin, $_method)) {
 										$this->bind($cmd, array($plugin, $_method));
 									}
@@ -410,13 +410,13 @@ 
 	public function bind($cmd, $handler) {
 		$allCmds = array_keys($this->commands);
 		$cmds = array();
-		foreach(explode(' ', $cmd) as $_cmd) {
+		foreach (explode(' ', $cmd) as $_cmd) {
 			if ($_cmd !== '') {
 				if ($all = strpos($_cmd, '*') !== false) {
 					list(, $sub) = array_pad(explode('.', $_cmd), 2, '');
 					if ($sub) {
 						$sub = str_replace('\'', '\\\'', $sub);
-						$addSub = create_function('$cmd', 'return $cmd . \'.\' . trim(\'' . $sub . '\');');
+						$addSub = create_function('$cmd', 'return $cmd . \'.\' . trim(\''.$sub.'\');');
 						$cmds = array_merge($cmds, array_map($addSub, $allCmds));
 					} else {
 						$cmds = array_merge($cmds, $allCmds);
@@ -496,16 +496,16 @@ 
 
 	private function session_expires() {
 		
-		if (!isset($_SESSION[self::$sessionCacheKey . ':LAST_ACTIVITY'])) {
-			$_SESSION[self::$sessionCacheKey . ':LAST_ACTIVITY'] = time();
+		if (!isset($_SESSION[self::$sessionCacheKey.':LAST_ACTIVITY'])) {
+			$_SESSION[self::$sessionCacheKey.':LAST_ACTIVITY'] = time();
 			return false;
 		}
 
-		if ( ($this->timeout > 0) && (time() - $_SESSION[self::$sessionCacheKey . ':LAST_ACTIVITY'] > $this->timeout) ) {
+		if (($this->timeout > 0) && (time() - $_SESSION[self::$sessionCacheKey.':LAST_ACTIVITY'] > $this->timeout)) {
 			return true;
 		}
 
-		$_SESSION[self::$sessionCacheKey . ':LAST_ACTIVITY'] = time();
+		$_SESSION[self::$sessionCacheKey.':LAST_ACTIVITY'] = time();
 		return false;	
 	}
 	
@@ -538,9 +538,9 @@ 
 		}
 
 		// call pre handlers for this command
-		$args['sessionCloseEarlier'] = isset($this->sessionUseCmds[$cmd])? false : $this->sessionCloseEarlier;
+		$args['sessionCloseEarlier'] = isset($this->sessionUseCmds[$cmd]) ? false : $this->sessionCloseEarlier;
 		if (!empty($this->listeners[$cmd.'.pre'])) {
-			$volume = isset($args['target'])? $this->volume($args['target']) : false;
+			$volume = isset($args['target']) ? $this->volume($args['target']) : false;
 			foreach ($this->listeners[$cmd.'.pre'] as $handler) {
 				call_user_func_array($handler, array($cmd, &$args, $this, $volume));
 			}
@@ -550,7 +550,7 @@ 
 		$this->sessionCloseEarlier && $args['sessionCloseEarlier'] && session_id() && session_write_close();
 		unset($this->sessionCloseEarlier);
 		
-		if (substr(PHP_OS,0,3) === 'WIN') {
+		if (substr(PHP_OS, 0, 3) === 'WIN') {
 			// set time out
 			if (($_max_execution_time = ini_get('max_execution_time')) && $_max_execution_time < 300) {
 				@set_time_limit(300);
@@ -569,7 +569,7 @@ 
 		// call handlers for this command
 		if (!empty($this->listeners[$cmd])) {
 			foreach ($this->listeners[$cmd] as $handler) {
-				if (call_user_func_array($handler,array($cmd,&$result,$args,$this))) {
+				if (call_user_func_array($handler, array($cmd, &$result, $args, $this))) {
 					// handler return true to force sync client after command completed
 					$result['sync'] = true;
 				}
@@ -628,7 +628,7 @@ 
 	 * @return string
 	 * @author Dmitry (dio) Levashov
 	 **/
-	public function realpath($hash)	{
+	public function realpath($hash) {
 		if (($volume = $this->volume($hash)) == false) {
 			return false;
 		}
@@ -684,11 +684,11 @@ 
 	 */
 	protected function getPluginInstance($name, $opts = array()) {
 		$key = strtolower($name);
-		if (! isset($this->plugins[$key])) {
-			$p_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR . $name . DIRECTORY_SEPARATOR . 'plugin.php';
+		if (!isset($this->plugins[$key])) {
+			$p_file = dirname(__FILE__).DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$name.DIRECTORY_SEPARATOR.'plugin.php';
 			if (is_file($p_file)) {
 				require_once $p_file;
-				$class = 'elFinderPlugin' . $name;
+				$class = 'elFinderPlugin'.$name;
 				$this->plugins[$key] = new $class($opts);
 			} else {
 				$this->plugins[$key] = false;
@@ -780,8 +780,8 @@ 
 		
 		$netVolumes = $this->getNetVolumes();
 		if ($volume->mount($options)) {
-			if (! $key = @ $volume->netMountKey) {
-				$key = md5($protocol . '-' . join('-', $options));
+			if (!$key = @ $volume->netMountKey) {
+				$key = md5($protocol.'-'.join('-', $options));
 			}
 			$options['driver'] = $driver;
 			$options['netkey'] = $key;
@@ -850,14 +850,14 @@ 
 		}
 		// long polling mode
 		if ($args['compare']) {
-			$sleep = max(1, (int)$volume->getOption('lsPlSleep'));
-			$limit = max(1, (int)$volume->getOption('plStandby') / $sleep) + 1;
+			$sleep = max(1, (int) $volume->getOption('lsPlSleep'));
+			$limit = max(1, (int) $volume->getOption('plStandby')/$sleep) + 1;
 			$timelimit = ini_get('max_execution_time');
 			$compare = $args['compare'];
 			do {
 				$timelimit && @ set_time_limit($timelimit + $sleep);
 				$_mtime = 0;
-				foreach($ls as $_f) {
+				foreach ($ls as $_f) {
 					$_mtime = max($_mtime, $_f['ts']);
 				}
 				$compare = strval(count($ls)).':'.strval($_mtime);
@@ -871,7 +871,7 @@ 
 						break;
 					}
 				}
-			} while($limit);
+			} while ($limit);
 			if ($ls === false) {
 				return array('error' => $this->error(self::ERROR_OPEN, $cwd['name'], $volume->error()));
 			}
@@ -1014,24 +1014,24 @@ 
 		}
 
 		// allow change MIME type by 'file.pre' callback functions
-		$mime = isset($args['mime'])? $args['mime'] : $file['mime'];
+		$mime = isset($args['mime']) ? $args['mime'] : $file['mime'];
 		if ($download) {
 			$disp = 'attachment';
 		} else {
 			$dispInlineRegex = $volume->getOption('dispInlineRegex');
 			$inlineRegex = false;
 			if ($dispInlineRegex) {
-				$inlineRegex = '#' . str_replace('#', '\\#', $dispInlineRegex) . '#';
+				$inlineRegex = '#'.str_replace('#', '\\#', $dispInlineRegex).'#';
 				try {
 					preg_match($inlineRegex, '');
-				} catch(Exception $e) {
+				} catch (Exception $e) {
 					$inlineRegex = false;
 				}
 			}
 			if (!$inlineRegex) {
 				$inlineRegex = '#^(?:(?:image|text)|application/x-shockwave-flash$)#';
 			}
-			$disp  = preg_match($inlineRegex, $mime)? 'inline' : 'attachment';
+			$disp = preg_match($inlineRegex, $mime) ? 'inline' : 'attachment';
 		}
 		
 		$filenameEncoded = rawurlencode($file['name']);
@@ -1140,7 +1140,7 @@ 
 		$name   = $args['name'];
 		
 		if (($volume = $this->volume($target)) == false
-		||  ($rm  = $volume->file($target)) == false) {
+		||  ($rm = $volume->file($target)) == false) {
 			return array('error' => $this->error(self::ERROR_RENAME, '#'.$target, self::ERROR_FILE_NOT_FOUND));
 		}
 		$rm['realpath'] = $volume->realpath($target);
@@ -1218,9 +1218,9 @@ 
 	* @retval false  error
 	* @author Naoki Sawada
 	**/
-	protected function get_remote_contents( &$url, $timeout = 30, $redirect_max = 5, $ua = 'Mozilla/5.0', $fp = null ) {
-		$method = (function_exists('curl_exec') && !ini_get('safe_mode'))? 'curl_get_contents' : 'fsock_get_contents'; 
-		return $this->$method( $url, $timeout, $redirect_max, $ua, $fp );
+	protected function get_remote_contents(&$url, $timeout = 30, $redirect_max = 5, $ua = 'Mozilla/5.0', $fp = null) {
+		$method = (function_exists('curl_exec') && !ini_get('safe_mode')) ? 'curl_get_contents' : 'fsock_get_contents'; 
+		return $this->$method($url, $timeout, $redirect_max, $ua, $fp);
 	}
 	
 	/**
@@ -1236,26 +1236,26 @@ 
 	 * @retval false  error
 	 * @author Naoki Sawada
 	 **/
-	 protected function curl_get_contents( &$url, $timeout, $redirect_max, $ua, $outfp ){
+	 protected function curl_get_contents(&$url, $timeout, $redirect_max, $ua, $outfp) {
 		$ch = curl_init();
-		curl_setopt( $ch, CURLOPT_URL, $url );
-		curl_setopt( $ch, CURLOPT_HEADER, false );
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_HEADER, false);
 		if ($outfp) {
-			curl_setopt( $ch, CURLOPT_FILE, $outfp );
+			curl_setopt($ch, CURLOPT_FILE, $outfp);
 		} else {
-			curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
-			curl_setopt( $ch, CURLOPT_BINARYTRANSFER, true );
-		}
-		curl_setopt( $ch, CURLOPT_LOW_SPEED_LIMIT, 1 );
-		curl_setopt( $ch, CURLOPT_LOW_SPEED_TIME, $timeout );
-		curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
-		curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, 1);
-		curl_setopt( $ch, CURLOPT_MAXREDIRS, $redirect_max);
-		curl_setopt( $ch, CURLOPT_USERAGENT, $ua);
-		$result = curl_exec( $ch );
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
+		}
+		curl_setopt($ch, CURLOPT_LOW_SPEED_LIMIT, 1);
+		curl_setopt($ch, CURLOPT_LOW_SPEED_TIME, $timeout);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+		curl_setopt($ch, CURLOPT_MAXREDIRS, $redirect_max);
+		curl_setopt($ch, CURLOPT_USERAGENT, $ua);
+		$result = curl_exec($ch);
 		$url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
-		curl_close( $ch );
-		return $outfp? $outfp : $result;
+		curl_close($ch);
+		return $outfp ? $outfp : $result;
 	}
 	
 	/**
@@ -1271,7 +1271,7 @@ 
 	 * @retval false  error
 	 * @author Naoki Sawada
 	 */
-	protected function fsock_get_contents( &$url, $timeout, $redirect_max, $ua, $outfp ) {
+	protected function fsock_get_contents(&$url, $timeout, $redirect_max, $ua, $outfp) {
 
 		$connect_timeout = 3;
 		$connect_try = 3;
@@ -1282,7 +1282,7 @@ 
 		$headers = '';
 		
 		$arr = parse_url($url);
-		if (!$arr){
+		if (!$arr) {
 			// Bad request
 			return false;
 		}
@@ -1290,7 +1290,7 @@ 
 		// query
 		$arr['query'] = isset($arr['query']) ? '?'.$arr['query'] : '';
 		// port
-		$arr['port'] = isset($arr['port']) ? $arr['port'] : (!empty($arr['https'])? 443 : 80);
+		$arr['port'] = isset($arr['port']) ? $arr['port'] : (!empty($arr['https']) ? 443 : 80);
 		
 		$url_base = $arr['scheme'].'://'.$arr['host'].':'.$arr['port'];
 		$url_path = isset($arr['path']) ? $arr['path'] : '/';
@@ -1299,21 +1299,21 @@ 
 		$query = $method.' '.$uri." HTTP/1.0\r\n";
 		$query .= "Host: ".$arr['host']."\r\n";
 		if (!empty($ua)) $query .= "User-Agent: ".$ua."\r\n";
-		if (!is_null($getSize)) $query .= 'Range: bytes=0-' . ($getSize - 1) . "\r\n";
+		if (!is_null($getSize)) $query .= 'Range: bytes=0-'.($getSize - 1)."\r\n";
 		
 		$query .= $headers;
 
 		$query .= "\r\n";
 
 		$fp = $connect_try_count = 0;
-		while( !$fp && $connect_try_count < $connect_try ) {
+		while (!$fp && $connect_try_count < $connect_try) {
 	
 			$errno = 0;
 			$errstr = "";
 			$fp = @ fsockopen(
 			$arr['https'].$arr['host'],
 			$arr['port'],
-			$errno,$errstr,$connect_timeout);
+			$errno, $errstr, $connect_timeout);
 			if ($fp) break;
 			$connect_try_count++;
 			if (connection_aborted()) {
@@ -1338,13 +1338,13 @@ 
 		
 		$_response = '';
 		$header = '';
-		while($_response !== "\r\n"){
+		while ($_response !== "\r\n") {
 			$_response = fgets($fp, $readsize);
 			$header .= $_response;
 		};
 		
-		$rccd = array_pad(explode(' ',$header,3), 3, ''); // array('HTTP/1.1','200','OK\r\n...')
-		$rc = (int)$rccd[1];
+		$rccd = array_pad(explode(' ', $header, 3), 3, ''); // array('HTTP/1.1','200','OK\r\n...')
+		$rc = (int) $rccd[1];
 		
 		// Redirect
 		switch ($rc) {
@@ -1353,19 +1353,19 @@ 
 			case 302: // Moved Temporarily
 			case 301: // Moved Permanently
 				$matches = array();
-				if (preg_match('/^Location: (.+?)(#.+)?$/im',$header,$matches) && --$redirect_max > 0) {
+				if (preg_match('/^Location: (.+?)(#.+)?$/im', $header, $matches) && --$redirect_max > 0) {
 					$url = trim($matches[1]);
-					$hash = isset($matches[2])? trim($matches[2]) : '';
-					if (!preg_match('/^https?:\//',$url)) { // no scheme
+					$hash = isset($matches[2]) ? trim($matches[2]) : '';
+					if (!preg_match('/^https?:\//', $url)) { // no scheme
 						if ($url{0} != '/') { // Relative path
 							// to Absolute path
-							$url = substr($url_path,0,strrpos($url_path,'/')).'/'.$url;
+							$url = substr($url_path, 0, strrpos($url_path, '/')).'/'.$url;
 						}
 						// add sheme,host
 						$url = $url_base.$url;
 					}
 					fclose($fp);
-					return $this->fsock_get_contents( $url, $timeout, $redirect_max, $ua, $outfp );
+					return $this->fsock_get_contents($url, $timeout, $redirect_max, $ua, $outfp);
 				}
 		}
 		
@@ -1374,7 +1374,7 @@ 
 			$outfp = fopen('php://temp', 'rwb');
 			$body = true;
 		}
-		while(fwrite($outfp, fread($fp, $readsize))) {
+		while (fwrite($outfp, fread($fp, $readsize))) {
 			if ($timeout) {
 				$_status = socket_get_status($fp);
 				if ($_status['timed_out']) {
@@ -1393,7 +1393,7 @@ 
 		
 		fclose($fp);
 		
-		return $outfp? $outfp : $body; // Data
+		return $outfp ? $outfp : $body; // Data
 	}
 	
 	/**
@@ -1404,13 +1404,13 @@ 
 	 * @return array
 	 * @author Naoki Sawada
 	 */
-	protected function parse_data_scheme( $str, $extTable ) {
+	protected function parse_data_scheme($str, $extTable) {
 		$data = $name = '';
 		if ($fp = fopen('data://'.substr($str, 5), 'rb')) {
 			if ($data = stream_get_contents($fp)) {
 				$meta = stream_get_meta_data($fp);
-				$ext = isset($extTable[$meta['mediatype']])? '.' . $extTable[$meta['mediatype']] : '';
-				$name = substr(md5($data), 0, 8) . $ext;
+				$ext = isset($extTable[$meta['mediatype']]) ? '.'.$extTable[$meta['mediatype']] : '';
+				$name = substr(md5($data), 0, 8).$ext;
 			}
 			fclose($fp);
 		}
@@ -1474,7 +1474,7 @@ 
 			}
 		}
 		
-		return ($mime && isset($extTable[$mime]))? ('.' . $extTable[$mime]) : '';
+		return ($mime && isset($extTable[$mime])) ? ('.'.$extTable[$mime]) : '';
 	}
 	
 	/**
@@ -1496,12 +1496,12 @@ 
 			$testDirs[] = sys_get_temp_dir();
 		}
 		$tempDir = '';
-		foreach($testDirs as $testDir) {
+		foreach ($testDirs as $testDir) {
 			if (!$testDir || !is_dir($testDir)) continue;
 			if (is_writable($testDir)) {
 				$tempDir = $testDir;
 				$gc = time() - 3600;
-				foreach(glob($tempDir . DIRECTORY_SEPARATOR .'ELF*') as $cf) {
+				foreach (glob($tempDir.DIRECTORY_SEPARATOR.'ELF*') as $cf) {
 					if (filemtime($cf) < $gc) {
 						@unlink($cf);
 					}
@@ -1521,7 +1521,7 @@ 
 	 **/
 	protected function chmod($args) {
 		$targets = $args['targets'];
-		$mode    = intval((string)$args['mode'], 8);
+		$mode    = intval((string) $args['mode'], 8);
 
 		if (!is_array($targets)) {
 			$targets = array($targets);
@@ -1536,10 +1536,10 @@ 
 
 		$files = array();
 		$errors = array();
-		foreach($targets as $target) {
+		foreach ($targets as $target) {
 			$file = $volume->chmod($target, $mode);
 			if ($file) {
-				$files = array_merge($files, is_array($file)? $file : array($file));
+				$files = array_merge($files, is_array($file) ? $file : array($file));
 			} else {
 				$errors = array_merge($errors, $volume->error());
 			}
@@ -1570,26 +1570,26 @@ 
 	private function checkChunkedFile($tmpname, $chunk, $cid, $tempDir, $volume = null) {
 		if (preg_match('/^(.+)(\.\d+_(\d+))\.part$/s', $chunk, $m)) {
 			$fname = $m[1];
-			$encname = md5($cid . '_' . $fname);
-			$base = $tempDir . DIRECTORY_SEPARATOR . 'ELF' . $encname;
+			$encname = md5($cid.'_'.$fname);
+			$base = $tempDir.DIRECTORY_SEPARATOR.'ELF'.$encname;
 			$clast = intval($m[3]);
 			if (is_null($tmpname)) {
 				ignore_user_abort(true);
 				sleep(10); // wait 10 sec
 				// chunked file upload fail
-				foreach(glob($base . '*') as $cf) {
+				foreach (glob($base.'*') as $cf) {
 					@unlink($cf);
 				}
 				ignore_user_abort(false);
 				return;
 			}
 			
-			$range = isset($_POST['range'])? trim($_POST['range']) : '';
+			$range = isset($_POST['range']) ? trim($_POST['range']) : '';
 			if ($range && preg_match('/^(\d+),(\d+),(\d+)$/', $range, $ranges)) {
 				$start = $ranges[1];
 				$len   = $ranges[2];
 				$size  = $ranges[3];
-				$tmp = $base . '.part';
+				$tmp = $base.'.part';
 				$csize = filesize($tmpname);
 				
 				$tmpExists = is_file($tmp);
@@ -1615,7 +1615,7 @@ 
 				} else {
 					// wait until makeing temp file (for anothor session)
 					$cnt = 1200; // Time limit 120 sec
-					while(!is_file($base) && --$cnt) {
+					while (!is_file($base) && --$cnt) {
 						usleep(100000); // wait 100ms
 					}
 					if (!$cnt) {
@@ -1650,13 +1650,13 @@ 
 				}
 			} else {
 				// old way
-				$part = $base . $m[2];
+				$part = $base.$m[2];
 				if (move_uploaded_file($tmpname, $part)) {
 					@chmod($part, 0600);
-					if ($clast < count(glob($base . '*'))) {
+					if ($clast < count(glob($base.'*'))) {
 						$parts = array();
 						for ($i = 0; $i <= $clast; $i++) {
-							$name = $base . '.' . $i . '_' . $clast;
+							$name = $base.'.'.$i.'_'.$clast;
 							if (is_readable($name)) {
 								$parts[] = $name;
 							} else {
@@ -1669,7 +1669,7 @@ 
 								touch($base);
 								if ($resfile = tempnam($tempDir, 'ELF')) {
 									$target = fopen($resfile, 'wb');
-									foreach($parts as $f) {
+									foreach ($parts as $f) {
 										$fp = fopen($f, 'rb');
 										while (!feof($fp)) {
 											fwrite($target, fread($fp, 8192));
@@ -1705,15 +1705,15 @@ 
 		$files  = isset($args['FILES']['upload']) && is_array($args['FILES']['upload']) ? $args['FILES']['upload'] : array();
 		$header = empty($args['html']) ? array() : array('header' => 'Content-Type: text/html; charset=utf-8');
 		$result = array_merge(array('added' => array()), $header);
-		$paths  = $args['upload_path']? $args['upload_path'] : array();
-		$chunk  = $args['chunk']? $args['chunk'] : '';
-		$cid    = $args['cid']? (int)$args['cid'] : '';
+		$paths  = $args['upload_path'] ? $args['upload_path'] : array();
+		$chunk  = $args['chunk'] ? $args['chunk'] : '';
+		$cid    = $args['cid'] ? (int) $args['cid'] : '';
 		
-		$renames= array();
+		$renames = array();
 		$suffix = '~';
 		if ($args['renames'] && is_array($args['renames'])) {
 			$renames = array_flip($args['renames']);
-			if (is_string($args['suffix']) && ! preg_match($ngReg, $args['suffix'])) {
+			if (is_string($args['suffix']) && !preg_match($ngReg, $args['suffix'])) {
 				$suffix = $args['suffix'];
 			}
 		}
@@ -1746,7 +1746,7 @@ 
 			if (!$args['upload'] && $args['name'] && is_array($args['name'])) {
 				$error = '';
 				$result['name'] = array();
-				foreach($args['name'] as $_i => $_name) {
+				foreach ($args['name'] as $_i => $_name) {
 					if (!$volume->isUploadableByName($_name)) {
 						$error = $this->error(self::ERROR_UPLOAD_FILE, $_name, self::ERROR_UPLOAD_FILE_MIME);
 						break;
@@ -1767,7 +1767,7 @@ 
 			}
 			if (isset($args['upload']) && is_array($args['upload']) && ($tempDir = $this->getTempDir($volume->getTempPath()))) {
 				$names = array();
-				foreach($args['upload'] as $i => $url) {
+				foreach ($args['upload'] as $i => $url) {
 					// check chunked file upload commit
 					if ($args['chunk']) {
 						if ($url === 'chunkfail' && $args['mimes'] === 'chunkfail') {
@@ -1777,7 +1777,7 @@ 
 							}
 							return $result;
 						} else {
-							$tmpfname = $tempDir . '/' . $args['chunk'];
+							$tmpfname = $tempDir.'/'.$args['chunk'];
 							$files['tmp_name'][$i] = $tmpfname;
 							$files['name'][$i] = $url;
 							$files['error'][$i] = 0;
@@ -1786,7 +1786,7 @@ 
 						}
 					}
 					
-					$tmpfname = $tempDir . DIRECTORY_SEPARATOR . 'ELF_FATCH_' . md5($url.microtime(true));
+					$tmpfname = $tempDir.DIRECTORY_SEPARATOR.'ELF_FATCH_'.md5($url.microtime(true));
 					
 					$_name = '';
 					// check is data:
@@ -1822,8 +1822,8 @@ 
 								list($_a, $_b) = array_pad(explode('.', $_name, 2), 2, '');
 								if ($_b === '') {
 									if ($_ext) {
-										rename($tmpfname, $tmpfname . $_ext);
-										$tmpfname = $tmpfname . $_ext;
+										rename($tmpfname, $tmpfname.$_ext);
+										$tmpfname = $tmpfname.$_ext;
 									}
 									$_b = $this->detectFileExtension($tmpfname);
 									$_name = $_a.$_b;
@@ -1858,7 +1858,7 @@ 
 			}
 			
 			$tmpname = $files['tmp_name'][$i];
-			$path = ($paths && !empty($paths[$i]))? $paths[$i] : '';
+			$path = ($paths && !empty($paths[$i])) ? $paths[$i] : '';
 			if ($name === 'blob') {
 				if ($chunk) {
 					if ($tempDir = $this->getTempDir($volume->getTempPath())) {
@@ -1868,7 +1868,7 @@ 
 								preg_match('/^(.+)(\.\d+_(\d+))\.part$/s', $chunk, $m);
 								$result['error'] = $this->error(self::ERROR_UPLOAD_FILE, $m[1], $tmpname);
 								$result['_chunkfailure'] = true;
-								$this->uploadDebug = 'Upload error: ' . $tmpname;
+								$this->uploadDebug = 'Upload error: '.$tmpname;
 							} else if ($name) {
 								$result['_chunkmerged'] = basename($tmpname);
 								$result['_name'] = $name;
@@ -1882,14 +1882,14 @@ 
 				} else {
 					// for form clipboard with Google Chrome
 					$type = $files['type'][$i];
-					$ext = isset($extTable[$type])? '.' . $extTable[$type] : '';
-					$name = substr(md5(basename($tmpname)), 0, 8) . $ext;
+					$ext = isset($extTable[$type]) ? '.'.$extTable[$type] : '';
+					$name = substr(md5(basename($tmpname)), 0, 8).$ext;
 				}
 			}
 			
 			// do hook function 'upload.presave'
-			if (! empty($this->listeners['upload.presave'])) {
-				foreach($this->listeners['upload.presave'] as $handler) {
+			if (!empty($this->listeners['upload.presave'])) {
+				foreach ($this->listeners['upload.presave'] as $handler) {
 					call_user_func_array($handler, array(&$path, &$name, $tmpname, $this, $volume));
 				}
 			}
@@ -1897,7 +1897,7 @@ 
 			if (($fp = fopen($tmpname, 'rb')) == false) {
 				$result['warning'] = $this->error(self::ERROR_UPLOAD_FILE, $name, self::ERROR_UPLOAD_TRANSFER);
 				$this->uploadDebug = 'Upload error: unable open tmp file';
-				if (! is_uploaded_file($tmpname)) {
+				if (!is_uploaded_file($tmpname)) {
 					if (@ unlink($tmpname)) unset($GLOBALS['elFinderTempFiles'][$tmpfname]);
 					continue;
 				}
@@ -1919,18 +1919,18 @@ 
 					}
 				}
 			}
-			if (! $_target || ($file = $volume->upload($fp, $_target, $name, $tmpname)) === false) {
+			if (!$_target || ($file = $volume->upload($fp, $_target, $name, $tmpname)) === false) {
 				$result['warning'] = $this->error(self::ERROR_UPLOAD_FILE, $name, $volume->error());
 				fclose($fp);
-				if (! is_uploaded_file($tmpname)) {
-					if (@ unlink($tmpname)) unset($GLOBALS['elFinderTempFiles'][$tmpname]);;
+				if (!is_uploaded_file($tmpname)) {
+					if (@ unlink($tmpname)) unset($GLOBALS['elFinderTempFiles'][$tmpname]); ;
 					continue;
 				}
 				break;
 			}
 			
 			is_resource($fp) && fclose($fp);
-			if (! is_uploaded_file($tmpname)){
+			if (!is_uploaded_file($tmpname)) {
 				clearstatcache();
 				if (!is_file($tmpname) || @ unlink($tmpname)) {
 					unset($GLOBALS['elFinderTempFiles'][$tmpname]);
@@ -1942,7 +1942,7 @@ 
 			}
 		}
 		if ($GLOBALS['elFinderTempFiles']) {
-			foreach(array_keys($GLOBALS['elFinderTempFiles']) as $_temp) {
+			foreach (array_keys($GLOBALS['elFinderTempFiles']) as $_temp) {
 				@ unlink($_temp);
 			}
 		}
@@ -1979,7 +1979,7 @@ 
 		$suffix = '~';
 		if (!empty($args['renames'])) {
 			$renames = array_flip($args['renames']);
-			if (is_string($args['suffix']) && ! preg_match('/[\/\\?*:|"<>]/', $args['suffix'])) {
+			if (is_string($args['suffix']) && !preg_match('/[\/\\?*:|"<>]/', $args['suffix'])) {
 				$suffix = $args['suffix'];
 			}
 		}
@@ -2037,9 +2037,9 @@ 
 		}
 		
 		if ($args['conv'] && function_exists('mb_detect_encoding') && function_exists('mb_convert_encoding')) {
-			$mime = isset($file['mime'])? $file['mime'] : '';
+			$mime = isset($file['mime']) ? $file['mime'] : '';
 			if ($mime && strtolower(substr($mime, 0, 4)) === 'text') {
-				if ($enc = mb_detect_encoding ( $content , mb_detect_order(), true)) {
+				if ($enc = mb_detect_encoding($content, mb_detect_order(), true)) {
 					if (strtolower($enc) !== 'utf-8') {
 						$content = mb_convert_encoding($content, 'UTF-8', $enc);
 					}
@@ -2051,7 +2051,7 @@ 
 
 		if ($json === false || strlen($json) < strlen($content)) {
 			if ($args['conv']) {
-				return array('error' => $this->error(self::ERROR_CONV_UTF8,self::ERROR_NOT_UTF8_CONTENT, $volume->path($target)));
+				return array('error' => $this->error(self::ERROR_CONV_UTF8, self::ERROR_NOT_UTF8_CONTENT, $volume->path($target)));
 			} else {
 				return array('doconv' => true);
 			}
@@ -2093,7 +2093,7 @@ 
 		$target = $args['target'];
 		$mimes  = !empty($args['mimes']) && is_array($args['mimes']) ? $args['mimes'] : array();
 		$error  = array(self::ERROR_EXTRACT, '#'.$target);
-		$makedir = isset($args['makedir'])? (bool)$args['makedir'] : null;
+		$makedir = isset($args['makedir']) ? (bool) $args['makedir'] : null;
 
 		if (($volume = $this->volume($target)) == false
 		|| ($file = $volume->file($target)) == false) {
@@ -2101,7 +2101,7 @@ 
 		}  
 
 		return ($file = $volume->extract($target, $makedir))
-			? array('added' => isset($file['read'])? array($file) : $file)
+			? array('added' => isset($file['read']) ? array($file) : $file)
 			: array('error' => $this->error(self::ERROR_EXTRACT, $volume->path($target), $volume->error()));
 	}
 	
@@ -2116,7 +2116,7 @@ 
 	protected function archive($args) {
 		$type    = $args['type'];
 		$targets = isset($args['targets']) && is_array($args['targets']) ? $args['targets'] : array();
-		$name    = isset($args['name'])? $args['name'] : '';
+		$name    = isset($args['name']) ? $args['name'] : '';
 	
 		if (($volume = $this->volume($targets[0])) == false) {
 			return $this->error(self::ERROR_ARCHIVE, self::ERROR_TRGDIR_NOT_FOUND);
@@ -2137,7 +2137,7 @@ 
 	protected function search($args) {
 		$q      = trim($args['q']);
 		$mimes  = !empty($args['mimes']) && is_array($args['mimes']) ? $args['mimes'] : array();
-		$target = !empty($args['target'])? $args['target'] : null;
+		$target = !empty($args['target']) ? $args['target'] : null;
 		$result = array();
 
 		if (!is_null($target)) {
@@ -2168,7 +2168,7 @@ 
 			$compare = intval($args['compare']);
 			$hash = $args['targets'][0];
 			if ($volume = $this->volume($hash)) {
-				$standby = (int)$volume->getOption('plStandby');
+				$standby = (int) $volume->getOption('plStandby');
 				$_compare = false;
 				if (($syncCheckFunc = $volume->getOption('syncCheckFunc')) && is_callable($syncCheckFunc)) {
 					$_compare = call_user_func_array($syncCheckFunc, array($volume->realpath($hash), $standby, $compare, $volume, $this));
@@ -2176,8 +2176,8 @@ 
 				if ($_compare !== false) {
 					$compare = $_compare;
 				} else {
-					$sleep = max(1, (int)$volume->getOption('tsPlSleep'));
-					$limit = max(1, $standby / $sleep) + 1;
+					$sleep = max(1, (int) $volume->getOption('tsPlSleep'));
+					$limit = max(1, $standby/$sleep) + 1;
 					$timelimit = ini_get('max_execution_time');
 					do {
 						$timelimit && @ set_time_limit($timelimit + $sleep);
@@ -2194,7 +2194,7 @@ 
 						if (--$limit) {
 							sleep($sleep);
 						}
-					} while($limit);
+					} while ($limit);
 				}
 			}
 		} else {
@@ -2242,12 +2242,12 @@ 
 		$target = $args['target'];
 		$width  = $args['width'];
 		$height = $args['height'];
-		$x      = (int)$args['x'];
-		$y      = (int)$args['y'];
+		$x      = (int) $args['x'];
+		$y      = (int) $args['y'];
 		$mode   = $args['mode'];
 		$bg     = null;
-		$degree = (int)$args['degree'];
-		$quality= (int)$args['quality'];
+		$degree = (int) $args['degree'];
+		$quality = (int) $args['quality'];
 		
 		if (($volume = $this->volume($target)) == false
 		|| ($file = $volume->file($target)) == false) {
@@ -2268,7 +2268,7 @@ 
 	**/
 	protected function url($args) {
 		$target = $args['target'];
-		$options = isset($args['options'])? $args['options'] : array();
+		$options = isset($args['options']) ? $args['options'] : array();
 		if (($volume = $this->volume($target)) != false) {
 			$url = $volume->getContentUrl($target, $options);
 			return $url ? array('url' => $url) : array();
@@ -2285,18 +2285,18 @@ 
 	 */
 	protected function callback($args) {
 		$checkReg = '/[^a-zA-Z0-9;._-]/';
-		$node = (isset($args['node']) && !preg_match($checkReg, $args['node']))? $args['node'] : '';
-		$json = (isset($args['json']) && @json_decode($args['json']))? $args['json'] : '{}';
-		$bind  = (isset($args['bind']) && !preg_match($checkReg, $args['bind']))? $args['bind'] : '';
+		$node = (isset($args['node']) && !preg_match($checkReg, $args['node'])) ? $args['node'] : '';
+		$json = (isset($args['json']) && @json_decode($args['json'])) ? $args['json'] : '{}';
+		$bind = (isset($args['bind']) && !preg_match($checkReg, $args['bind'])) ? $args['bind'] : '';
 		$done = (!empty($args['done']));
 		
-		while( ob_get_level() ) {
-			if (! ob_end_clean()) {
+		while (ob_get_level()) {
+			if (!ob_end_clean()) {
 				break;
 			}
 		}
 		
-		if ($done || ! $this->callbackWindowURL) {
+		if ($done || !$this->callbackWindowURL) {
 			$script = '';
 			if ($node) {
 				$script .= '
@@ -2338,13 +2338,13 @@ 
 			
 		} else {
 			$url = $this->callbackWindowURL;
-			$url .= ((strpos($url, '?') === false)? '?' : '&')
-				 . '&node=' . rawurlencode($node)
-				 . (($json !== '{}')? ('&json=' . rawurlencode($json)) : '')
-				 . ($bind? ('&bind=' .  rawurlencode($bind)) : '')
+			$url .= ((strpos($url, '?') === false) ? '?' : '&')
+				 . '&node='.rawurlencode($node)
+				 . (($json !== '{}') ? ('&json='.rawurlencode($json)) : '')
+				 . ($bind ? ('&bind='.rawurlencode($bind)) : '')
 				 . '&done=1';
 			
-			header('Location: ' . $url);
+			header('Location: '.$url);
 			
 		}
 		exit();
@@ -2414,7 +2414,7 @@ 
 	
 	protected function utime() {
 		$time = explode(" ", microtime());
-		return (double)$time[1] + (double)$time[0];
+		return (double) $time[1] + (double) $time[0];
 	}
 	
 	
@@ -2440,7 +2440,7 @@ 
 		$imgcnt = 0;
 		$fp = fopen($path, 'rb');
 		@fread($fp, 4);
-		$c = @fread($fp,1);
+		$c = @fread($fp, 1);
 		if (ord($c) != 0x39) {  // GIF89a
 			return false;
 		}
@@ -2448,13 +2448,13 @@ 
 		while (!feof($fp)) {
 			do {
 				$c = fread($fp, 1);
-			} while(ord($c) != 0x21 && !feof($fp));
+			} while (ord($c) != 0x21 && !feof($fp));
 	
 			if (feof($fp)) {
 				break;
 			}
 	
-			$c2 = fread($fp,2);
+			$c2 = fread($fp, 2);
 			if (bin2hex($c2) == "f904") {
 				$imgcnt++;
 			}

php/elFinderVolumeDriver.class.php

Spacing +138 added lines, -139 removed lines

@@ -299,7 +299,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")
 	);
 
 	/**
@@ -594,7 +594,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) {
@@ -625,7 +625,7 @@ 
 		
 		// check 'statOwner' for command `chmod`
 		if (empty($this->options['statOwner'])) {
-			$this->disabled[] ='chmod';
+			$this->disabled[] = 'chmod';
 		}
 		
 		// check 'mimeMap'
@@ -749,7 +749,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);
@@ -768,14 +768,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
@@ -802,8 +802,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()) {
@@ -902,7 +902,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];
 							}
@@ -931,7 +931,7 @@ 
 		
 		if ($root['read']) {
 			// check startPath - path to open by default instead of root
-			$startPath = $this->options['startPath']? $this->normpathCE($this->options['startPath']) : '';
+			$startPath = $this->options['startPath'] ? $this->normpathCE($this->options['startPath']) : '';
 			if ($startPath) {
 				$start = $this->stat($startPath);
 				if (!empty($start)
@@ -955,8 +955,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 .= '/';
@@ -1010,7 +1010,7 @@ 
 		
 		// fix sync interval
 		if ($this->options['syncMinMs'] !== 0) {
-			$this->options['syncMinMs'] = max($this->options[$this->options['syncChkAsTs']? 'tsPlSleep' : 'lsPlSleep'] * 1000, intval($this->options['syncMinMs']));
+			$this->options['syncMinMs'] = max($this->options[$this->options['syncChkAsTs'] ? 'tsPlSleep' : 'lsPlSleep']*1000, intval($this->options['syncMinMs']));
 		}
 
 		return $this->mounted = true;
@@ -1114,7 +1114,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'];
 			}
@@ -1135,7 +1135,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(),
 			'syncChkAsTs'     => intval($this->options['syncChkAsTs']),
 			'syncMinMs'       => intval($this->options['syncMinMs'])
 		);
@@ -1149,7 +1149,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;
 	}
 	
 	/**
@@ -1161,7 +1161,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'];
 		}
@@ -1295,7 +1295,7 @@ 
 		$file = $this->stat($path);
 		
 		if ($isRoot) {
-			$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
 		}
 		
@@ -1310,7 +1310,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);
 		}
@@ -1374,14 +1374,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;
 	}
@@ -1611,7 +1611,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);
 		}
@@ -1687,7 +1687,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);
@@ -1758,7 +1758,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);
@@ -1921,7 +1921,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)) {
@@ -1979,9 +1979,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;
@@ -2020,7 +2020,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)) {
@@ -2035,7 +2035,7 @@ 
 			}
 		}
 
-		switch($mode) {
+		switch ($mode) {
 			
 			case 'propresize':
 				$result = $this->imgResize($work_path, $width, $height, true, true, null, $jpgQuality);
@@ -2131,7 +2131,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);
 	}
 	
 	/**
@@ -2203,9 +2203,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'];
@@ -2272,7 +2272,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)));
 	}
 	
 	/**
@@ -2283,7 +2283,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)));
 	}
 	
 	/**
@@ -2296,7 +2296,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)));
 	}
 	
 	/**
@@ -2307,7 +2307,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)));
 	}
 	
 	/**
@@ -2318,7 +2318,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)));
 	}
 	
 	/**
@@ -2329,7 +2329,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)));
 	}
 	
 	/**
@@ -2341,7 +2341,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)));
 	}
 	
 	/**
@@ -2352,8 +2352,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));
 	}
 	
 	/**
@@ -2364,8 +2364,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)));
 	}
 	
 	/**
@@ -2380,7 +2380,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)));
 	}
 	
 	/**
@@ -2392,7 +2392,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];
 	}
@@ -2405,7 +2405,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)));
 	}
 	
 	/**
@@ -2418,7 +2418,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 *******************/
@@ -2437,7 +2437,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;
 			}
 
@@ -2470,7 +2470,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); 
 		}
 	}
 	
@@ -2530,21 +2530,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;
@@ -2568,7 +2568,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);
 	}
 	
 	/**
@@ -2581,7 +2581,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);
 	}
 	
 	/**
@@ -2601,7 +2601,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;
@@ -2613,7 +2613,7 @@ 
 						$_var = str_replace('?', $unknown, $_var);
 					}
 				}
-				if  ($_var !== false) {
+				if ($_var !== false) {
 					$var = $_var;
 				}
 			}
@@ -2640,7 +2640,7 @@ 
 		
 		$key = '';
 		if ($path !== '') {
-			$key = $this->id . '#' . $path;
+			$key = $this->id.'#'.$path;
 			if (isset($cache[$key])) {
 				return $cache[$key];
 			}
@@ -2672,7 +2672,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);
@@ -2716,7 +2716,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);
 	}
@@ -2733,7 +2733,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;
 		}
@@ -2765,7 +2765,7 @@ 
 			} 
 		}
 		
-		return $perm === null ? (is_null($val)? $this->defaults[$name] : $val) : !!$perm;
+		return $perm === null ? (is_null($val) ? $this->defaults[$name] : $val) : !!$perm;
 	}
 	
 	/**
@@ -2809,7 +2809,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
@@ -2843,7 +2843,7 @@ 
 				$this->sessionCache['rootstat'] = array();
 			}
 			//if (empty($this->ARGS['reload']) || empty($this->ARGS['target']) || strpos($this->ARGS['target'], $this->id) !== 0) {
-			if (! $this->isMyReload()) {
+			if (!$this->isMyReload()) {
 				// need $path as key for netmount/netunmount
 				if (isset($this->sessionCache['rootstat'][$rootKey])) {
 					if ($ret = elFinder::sessionDataDecode($this->sessionCache['rootstat'][$rootKey], 'array')) {
@@ -2883,10 +2883,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 {
@@ -2934,7 +2934,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;
 				}
@@ -2992,7 +2992,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) {
@@ -3115,7 +3115,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(elFinderVolumeDriver::$mimetypes[$mime[$i]])) {
 								elFinderVolumeDriver::$mimetypes[$mime[$i]] = $mime[0];
 							}
@@ -3221,10 +3221,10 @@ 
 	}
 	
 	protected function isMyReload($target = '', $ARGtarget = '') {
-		if (! empty($this->ARGS['reload'])) {
+		if (!empty($this->ARGS['reload'])) {
 			if ($ARGtarget === '') {
-				$ARGtarget = isset($this->ARGS['target'])? $this->ARGS['target']
-					: ((isset($this->ARGS['targets']) && is_array($this->ARGS['targets']) && count($this->ARGS['targets']) === 1)?
+				$ARGtarget = isset($this->ARGS['target']) ? $this->ARGS['target']
+					: ((isset($this->ARGS['targets']) && is_array($this->ARGS['targets']) && count($this->ARGS['targets']) === 1) ?
 						$this->ARGS['targets'][0] : '');
 			}
 			if ($ARGtarget !== '') {
@@ -3273,7 +3273,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);
@@ -3284,7 +3284,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));
 				}
 			}
 		}
@@ -3304,7 +3304,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);
 
@@ -3325,7 +3325,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;
@@ -3359,7 +3359,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)
@@ -3640,15 +3640,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');
 				}
 		
@@ -3665,7 +3665,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');
 			}
 		}
 		
@@ -3711,18 +3711,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;
 				}
 			}
@@ -3740,7 +3740,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)) {
@@ -3765,11 +3765,11 @@ 
 				break;
 
 			case 'gd':
-				$img = $this->gdImageCreate($path,$s['mime']);
+				$img = $this->gdImageCreate($path, $s['mime']);
 
-				if ($img &&  false != ($tmp = imagecreatetruecolor($size_w, $size_h))) {
+				if ($img && false != ($tmp = imagecreatetruecolor($size_w, $size_h))) {
 				
-					$this->gdImageBackground($tmp,$this->options['tmbBgColor']);
+					$this->gdImageBackground($tmp, $this->options['tmbBgColor']);
 					
 					if (!imagecopyresampled($tmp, $img, 0, 0, 0, 0, $size_w, $size_h, $s[0], $s[1])) {
 						return false;
@@ -3850,11 +3850,11 @@ 
 				break;
 
 			case 'gd':
-				$img = $this->gdImageCreate($path,$s['mime']);
+				$img = $this->gdImageCreate($path, $s['mime']);
 
-				if ($img &&  false != ($tmp = imagecreatetruecolor($width, $height))) {
+				if ($img && false != ($tmp = imagecreatetruecolor($width, $height))) {
 					
-					$this->gdImageBackground($tmp,$this->options['tmbBgColor']);
+					$this->gdImageBackground($tmp, $this->options['tmbBgColor']);
 
 					$size_w = $width;
 					$size_h = $height;
@@ -3905,8 +3905,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);
 
 		if (!$jpgQuality) {
 			$jpgQuality = $this->options['jpgQuality'];
@@ -3930,7 +3930,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);
@@ -3945,7 +3945,7 @@ 
 					$img1 = new Imagick();
 					$img1->newImage($width, $height, new ImagickPixel($bgcolor));
 					$img1->setImageColorspace($img->getImageColorspace());
-					$img1->compositeImage( $img, imagick::COMPOSITE_OVER, $x, $y );
+					$img1->compositeImage($img, imagick::COMPOSITE_OVER, $x, $y);
 					$result = $this->imagickImage($img, $path, $destformat, $jpgQuality);
 				}
 				
@@ -3956,11 +3956,11 @@ 
 				break;
 
 			case 'gd':
-				$img = $this->gdImageCreate($path,$s['mime']);
+				$img = $this->gdImageCreate($path, $s['mime']);
 
-				if ($img &&  false != ($tmp = imagecreatetruecolor($width, $height))) {
+				if ($img && false != ($tmp = imagecreatetruecolor($width, $height))) {
 
-					$this->gdImageBackground($tmp,$bgcolor);
+					$this->gdImageBackground($tmp, $bgcolor);
 
 					if (!imagecopy($tmp, $img, $x, $y, 0, 0, $s[0], $s[1])) {
 						return false;
@@ -3992,15 +3992,15 @@ 
 	 * @author Troex Nevelin
 	 **/
 	protected function imgRotate($path, $degree, $bgcolor = '#ffffff', $destformat = null, $jpgQuality = 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',
@@ -4016,7 +4016,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;
@@ -4056,12 +4056,12 @@ 
 				break;
 
 			case 'gd':
-				$img = $this->gdImageCreate($path,$s['mime']);
+				$img = $this->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 = $this->gdImage($tmp, $path, $destformat, $s['mime'], $jpgQuality);
 
@@ -4086,11 +4086,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
 		);
 
@@ -4147,8 +4147,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);
 
@@ -4173,7 +4173,7 @@ 
 	 * @param string $mime The original image mime type
 	 * @param int    $jpgQuality  JEPG quality (1-100)
 	 */
-	protected function gdImage($image, $filename, $destformat, $mime, $jpgQuality = null ){
+	protected function gdImage($image, $filename, $destformat, $mime, $jpgQuality = null) {
 
 		if (!$jpgQuality) {
 			$jpgQuality = $this->options['jpgQuality'];
@@ -4197,7 +4197,7 @@ 
 	 * @param string $destformat The Image type to use for $filename
 	 * @param int    $jpgQuality  JEPG quality (1-100)
 	 */
-	protected function imagickImage($img, $filename, $destformat, $jpgQuality = null ){
+	protected function imagickImage($img, $filename, $destformat, $jpgQuality = null) {
 
 		if (!$jpgQuality) {
 			$jpgQuality = $this->options['jpgQuality'];
@@ -4252,13 +4252,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);
 		}
@@ -4296,13 +4296,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);
 	}
 
 	/**
@@ -4352,22 +4352,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');
 				}
 			}
@@ -4389,7 +4389,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);
@@ -4443,22 +4443,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, '.');
@@ -4472,12 +4472,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;
@@ -4495,7 +4494,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 {
@@ -4582,22 +4581,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);
@@ -4782,7 +4781,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
@@ -4792,7 +4791,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	abstract protected function _fclose($fp, $path='');
+	abstract protected function _fclose($fp, $path = '');
 	
 	/********************  file/dir manipulations *************************/
 	

php/elFinderVolumeLocalFileSystem.class.php

Spacing +39 added lines, -39 removed lines

@@ -2,20 +2,20 @@ 
 
 // Implement similar functionality in PHP 5.2 or 5.3
 // http://php.net/manual/class.recursivecallbackfilteriterator.php#110974
-if (! class_exists('RecursiveCallbackFilterIterator', false)) {
+if (!class_exists('RecursiveCallbackFilterIterator', false)) {
 	class RecursiveCallbackFilterIterator extends RecursiveFilterIterator {
 	   
-	    public function __construct ( RecursiveIterator $iterator, $callback ) {
+	    public function __construct(RecursiveIterator $iterator, $callback) {
 	        $this->callback = $callback;
 	        parent::__construct($iterator);
 	    }
 	   
-	    public function accept () {
+	    public function accept() {
 	        $callback = $this->callback;
 	        return $callback(parent::current(), parent::key(), parent::getInnerIterator());
 	    }
 	   
-	    public function getChildren () {
+	    public function getChildren() {
 	        return new self($this->getInnerIterator()->getChildren(), $this->callback);
 	    }
 	}
@@ -60,11 +60,11 @@ 
 	 * @author Dmitry (dio) Levashov
 	 **/
 	public function __construct() {
-		$this->options['alias']    = '';              // alias to replace root dir name
-		$this->options['dirMode']  = 0755;            // new dirs mode
-		$this->options['fileMode'] = 0644;            // new files mode
-		$this->options['quarantine'] = '.quarantine';  // quarantine folder name - required to check archive (must be hidden)
-		$this->options['maxArcFilesSize'] = 0;        // max allowed archive files size (0 - no limit)
+		$this->options['alias']    = ''; // alias to replace root dir name
+		$this->options['dirMode']  = 0755; // new dirs mode
+		$this->options['fileMode'] = 0644; // new files mode
+		$this->options['quarantine'] = '.quarantine'; // quarantine folder name - required to check archive (must be hidden)
+		$this->options['maxArcFilesSize'] = 0; // max allowed archive files size (0 - no limit)
 		$this->options['rootCssClass'] = 'elfinder-navbar-root-local';
 	}
 	
@@ -81,7 +81,7 @@ 
 	protected function init() {
 		// Normalize directory separator for windows
 		if (DIRECTORY_SEPARATOR !== '/') {
-			foreach(array('path', 'tmbPath', 'tmpPath', 'quarantine') as $key) {
+			foreach (array('path', 'tmbPath', 'tmpPath', 'quarantine') as $key) {
 				if (!empty($this->options[$key])) {
 					$this->options[$key] = str_replace('/', DIRECTORY_SEPARATOR, $this->options[$key]);
 				}
@@ -145,7 +145,7 @@ 
 		// if no thumbnails url - try detect it
 		if ($root['read'] && !$this->tmbURL && $this->URL) {
 			if (strpos($this->tmbPath, $this->root) === 0) {
-				$this->tmbURL = $this->URL.str_replace(DIRECTORY_SEPARATOR, '/', substr($this->tmbPath, strlen($this->root)+1));
+				$this->tmbURL = $this->URL.str_replace(DIRECTORY_SEPARATOR, '/', substr($this->tmbPath, strlen($this->root) + 1));
 				if (preg_match("|[^/?&=]$|", $this->tmbURL)) {
 					$this->tmbURL .= '/';
 				}
@@ -203,11 +203,11 @@ 
 		if ($mtime != $compare) {
 			return $mtime;
 		}
-		$inotifywait = defined('ELFINER_INOTIFYWAIT_PATH')? ELFINER_INOTIFYWAIT_PATH : 'inotifywait';
+		$inotifywait = defined('ELFINER_INOTIFYWAIT_PATH') ? ELFINER_INOTIFYWAIT_PATH : 'inotifywait';
 		$path = escapeshellarg($path);
 		$standby = max(1, intval($standby));
 		$cmd = $inotifywait.' '.$path.' -t '.$standby.' -e moved_to,moved_from,move,create,delete,delete_self';
-		$this->procExec($cmd , $o, $r);
+		$this->procExec($cmd, $o, $r);
 		if ($r === 0) {
 			// changed
 			clearstatcache();
@@ -266,7 +266,7 @@ 
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _joinPath($dir, $name) {
-		return rtrim($dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $name;
+		return rtrim($dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$name;
 	}
 	
 	/**
@@ -318,7 +318,7 @@ 
 		$comps = $new_comps;
 		$path = implode('/', $comps);
 		if ($initial_slashes) {
-			$path = str_repeat('/', $initial_slashes) . $path;
+			$path = str_repeat('/', $initial_slashes).$path;
 		}
 		
 		if ($changeSep) {
@@ -389,7 +389,7 @@ 
 	 **/
 	protected function _inpath($path, $parent) {
 		$cwd = getcwd();
-		$real_path   = $this->getFullPath($path,   $cwd);
+		$real_path   = $this->getFullPath($path, $cwd);
 		$real_parent = $this->getFullPath($parent, $cwd);
 		if ($real_path && $real_parent) {
 			return $real_path === $real_parent || strpos($real_path, rtrim($real_parent, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR) === 0;
@@ -448,7 +448,7 @@ 
 					$stat = array();
 					return $stat;
 				} else {
-					$stat['mime']  = 'symlink-broken';
+					$stat['mime'] = 'symlink-broken';
 					$target = readlink($path);
 					$lstat = lstat($path);
 					$ostat = $this->getOwnerStat($lstat['uid'], $lstat['gid']);
@@ -464,7 +464,7 @@ 
 			$fstat = stat($path);
 			$uid = $fstat['uid'];
 			$gid = $fstat['gid'];
-			$stat['perm'] = substr((string)decoct($fstat['mode']), -4);
+			$stat['perm'] = substr((string) decoct($fstat['mode']), -4);
 			$stat = array_merge($stat, $this->getOwnerStat($uid, $gid));
 		}
 		
@@ -474,8 +474,8 @@ 
 			$stat['mime'] = $dir ? 'directory' : $this->mimetype($path);
 		}
 		//logical rights first
-		$stat['read'] = ($linkreadable || is_readable($path))? null : false;
-		$stat['write'] = is_writable($path)? null : false;
+		$stat['read'] = ($linkreadable || is_readable($path)) ? null : false;
+		$stat['write'] = is_writable($path) ? null : false;
 
 		if (is_null($stat['read'])) {
 			$stat['size'] = $dir ? 0 : $size;
@@ -547,7 +547,7 @@ 
 			$dirItr = new ParentIterator(
 				new RecursiveDirectoryIterator($path,
 					FilesystemIterator::SKIP_DOTS |
-					(defined('RecursiveDirectoryIterator::FOLLOW_SYMLINKS')?
+					(defined('RecursiveDirectoryIterator::FOLLOW_SYMLINKS') ?
 						RecursiveDirectoryIterator::FOLLOW_SYMLINKS : 0)
 				)
 			);
@@ -633,7 +633,7 @@ 
 							$br = true;
 						} else {
 							$_path = $fpath;
-							$stat['mime']  = 'symlink-broken';
+							$stat['mime'] = 'symlink-broken';
 							$target = readlink($_path);
 							$lstat = lstat($_path);
 							$ostat = $this->getOwnerStat($lstat['uid'], $lstat['gid']);
@@ -658,13 +658,13 @@ 
 					if ($statOwner && !$linkreadable) {
 						$uid = $file->getOwner();
 						$gid = $file->getGroup();
-						$stat['perm'] = substr((string)decoct($file->getPerms()), -4);
+						$stat['perm'] = substr((string) decoct($file->getPerms()), -4);
 						$stat = array_merge($stat, $this->getOwnerStat($uid, $gid));
 					}
 					
 					//logical rights first
-					$stat['read'] = ($linkreadable || $file->isReadable())? null : false;
-					$stat['write'] = $file->isWritable()? null : false;
+					$stat['read'] = ($linkreadable || $file->isReadable()) ? null : false;
+					$stat['write'] = $file->isWritable() ? null : false;
 					
 					if (is_null($stat['read'])) {
 						$stat['size'] = $dir ? 0 : $size;
@@ -680,7 +680,7 @@ 
 		
 		if ($cache) {
 			$cache = $this->convEncOut($cache, false);
-			foreach($cache as $d) {
+			foreach ($cache as $d) {
 				$this->updateCache($d[0], $d[1]);
 			}
 		}
@@ -696,7 +696,7 @@ 
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fopen($path, $mode='rb') {
+	protected function _fopen($path, $mode = 'rb') {
 		return @fopen($path, $mode);
 	}
 	
@@ -707,7 +707,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fclose($fp, $path='') {
+	protected function _fclose($fp, $path = '') {
 		return @fclose($fp);
 	}
 	
@@ -839,7 +839,7 @@ 
 		$path = $this->_joinPath($dir, $name);
 
 		$meta = stream_get_meta_data($fp);
-		$uri = isset($meta['uri'])? $meta['uri'] : '';
+		$uri = isset($meta['uri']) ? $meta['uri'] : '';
 		if ($uri && @is_file($uri)) {
 			fclose($fp);
 			$isCmdPaste = ($this->ARGS['cmd'] === 'paste');
@@ -903,7 +903,7 @@ 
 	 * @return bool
 	 **/
 	protected function _chmod($path, $mode) {
-		$modeOct = is_string($mode) ? octdec($mode) : octdec(sprintf("%04o",$mode));
+		$modeOct = is_string($mode) ? octdec($mode) : octdec(sprintf("%04o", $mode));
 		$ret = @chmod($path, $modeOct);
 		$ret && clearstatcache();
 		return  $ret;
@@ -1021,7 +1021,7 @@ 
 				$src = $dir;
 				$name = basename($path);
 				if (preg_match('/\.((tar\.(gz|bz|bz2|z|lzo))|cpio\.gz|ps\.gz|xcf\.(gz|bz2)|[a-z0-9]{1,4})$/i', $name, $m)) {
-					$name = substr($name, 0,  strlen($name)-strlen($m[0]));
+					$name = substr($name, 0, strlen($name) - strlen($m[0]));
 				}
 				$test = dirname($path).DIRECTORY_SEPARATOR.$name;
 				if (file_exists($test) || is_link($test)) {
@@ -1030,9 +1030,9 @@ 
 			}
 			
 			if ($name !== '') {
-				$result  = dirname($path).DIRECTORY_SEPARATOR.$name;
+				$result = dirname($path).DIRECTORY_SEPARATOR.$name;
 
-				if (! @rename($src, $result)) {
+				if (!@rename($src, $result)) {
 					$this->delTree($dir);
 					return false;
 				}
@@ -1040,7 +1040,7 @@ 
 				$dstDir = dirname($path);
 				$res = false;
 				$result = array();
-				foreach($ls as $name) {
+				foreach ($ls as $name) {
 					$target = $dstDir.DIRECTORY_SEPARATOR.$name;
 					if (is_dir($target)) {
 						$this->delTree($target);
@@ -1126,7 +1126,7 @@ 
 					new RecursiveDirectoryIterator($path,
 						FilesystemIterator::KEY_AS_PATHNAME |
 						FilesystemIterator::SKIP_DOTS |
-						(defined('RecursiveDirectoryIterator::FOLLOW_SYMLINKS')?
+						(defined('RecursiveDirectoryIterator::FOLLOW_SYMLINKS') ?
 							RecursiveDirectoryIterator::FOLLOW_SYMLINKS : 0)
 					),
 					array($this, 'localFileSystemSearchIteratorFilter')
@@ -1148,7 +1148,7 @@ 
 		$result = array();
 		
 		if ($match) {
-			foreach($match as $p) {
+			foreach ($match as $p) {
 				$stat = $this->stat($p);
 		
 				if (!$stat) { // invalid links
@@ -1165,7 +1165,7 @@ 
 					$stat['path'] = $this->path($stat['hash']);
 					if ($this->URL && !isset($stat['url'])) {
 						$path = str_replace(DIRECTORY_SEPARATOR, '/', substr($p, strlen($this->root) + 1));
-						$stat['url'] = $this->URL . $path;
+						$stat['url'] = $this->URL.$path;
 					}
 		
 					$result[] = $stat;
@@ -1180,9 +1180,9 @@ 
 
 	public function localFileSystemSearchIteratorFilter($file, $key, $iterator) {
 		if ($iterator->hasChildren()) {
-			return (bool)$this->attr($key, 'read', null, true);
+			return (bool) $this->attr($key, 'read', null, true);
 		}
-		return ($this->stripos($file->getFilename(), $this->doSearchCurrentQuery) === false)? false : true;
+		return ($this->stripos($file->getFilename(), $this->doSearchCurrentQuery) === false) ? false : true;
 	}
 	
 } // END class