Studio-42 / elFinder

php/elFinder.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -1344,7 +1344,7 @@
 	 * 
 	 * @param  string $str
 	 * @param  array  $extTable
-	 * @return array
+	 * @return string[]
 	 * @author Naoki Sawada
 	 */
 	protected function parse_data_scheme( $str, $extTable ) {

Indentation +18 added lines, -18 removed lines

@@ -1149,18 +1149,18 @@ 
 	}
 
 	/**
-	* Get remote contents
-	*
-	* @param  string   $url     target url
-	* @param  int      $timeout timeout (sec)
-	* @param  int      $redirect_max redirect max count
-	* @param  string   $ua
-	* @param  resource $fp
-	* @return string or bool(false)
-	* @retval string contents
-	* @retval false  error
-	* @author Naoki Sawada
-	**/
+	 * Get remote contents
+	 *
+	 * @param  string   $url     target url
+	 * @param  int      $timeout timeout (sec)
+	 * @param  int      $redirect_max redirect max count
+	 * @param  string   $ua
+	 * @param  resource $fp
+	 * @return string or bool(false)
+	 * @retval string contents
+	 * @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 );
@@ -2090,12 +2090,12 @@ 
 	}
 	
 	/**
-	* Return content URL
-	*
-	* @param  array  $args  command arguments
-	* @return array
-	* @author Naoki Sawada
-	**/
+	 * Return content URL
+	 *
+	 * @param  array  $args  command arguments
+	 * @return array
+	 * @author Naoki Sawada
+	 **/
 	protected function url($args) {
 		$target = $args['target'];
 		$options = isset($args['options'])? $args['options'] : array();

Braces +19 added lines, -6 removed lines

@@ -1241,8 +1241,12 @@ 
 		
 		$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 (!empty($ua)) {
+			$query .= "User-Agent: ".$ua."\r\n";
+		}
+		if (!is_null($getSize)) {
+			$query .= 'Range: bytes=0-' . ($getSize - 1) . "\r\n";
+		}
 		
 		$query .= $headers;
 
@@ -1257,7 +1261,9 @@ 
 			$arr['https'].$arr['host'],
 			$arr['port'],
 			$errno,$errstr,$connect_timeout);
-			if ($fp) break;
+			if ($fp) {
+				break;
+			}
 			$connect_try_count++;
 			if (connection_aborted()) {
 				exit();
@@ -1574,7 +1580,9 @@ 
 		$tempDir = '';
 		$test = DIRECTORY_SEPARATOR . microtime(true);
 		foreach($testDirs as $testDir) {
-			if (!$testDir || !is_dir($testDir)) continue;
+			if (!$testDir || !is_dir($testDir)) {
+				continue;
+			}
 			$testFile = $testDir.$test;
 			if (touch($testFile)) {
 				unlink($testFile);
@@ -1810,7 +1818,9 @@ 
 				$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 (@ unlink($tmpname)) unset($GLOBALS['elFinderTempFiles'][$tmpfname]);
+					if (@ unlink($tmpname)) {
+						unset($GLOBALS['elFinderTempFiles'][$tmpfname]);
+					}
 					continue;
 				}
 				break;
@@ -1824,7 +1834,10 @@ 
 				$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 (@ unlink($tmpname)) {
+						unset($GLOBALS['elFinderTempFiles'][$tmpname]);
+					}
+					;
 					continue;
 				}
 				break;

Spacing +152 added lines, -152 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));
 			}
@@ -562,7 +562,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;
 				}
@@ -621,7 +621,7 @@ 
 	 * @return string
 	 * @author Dmitry (dio) Levashov
 	 **/
-	public function realpath($hash)	{
+	public function realpath($hash) {
 		if (($volume = $this->volume($hash)) == false) {
 			return false;
 		}
@@ -677,11 +677,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;
@@ -773,8 +773,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;
@@ -979,10 +979,10 @@ 
 			$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;
 				}
 			}
@@ -990,7 +990,7 @@ 
 				$inlineRegex = '#^(?:(?:image|text)|application/x-shockwave-flash$)#';
 			}
 			$mime = $file['mime'];
-			$disp  = preg_match($inlineRegex, $mime)? 'inline' : 'attachment';
+			$disp = preg_match($inlineRegex, $mime) ? 'inline' : 'attachment';
 		}
 		
 		$filenameEncoded = rawurlencode($file['name']);
@@ -1099,7 +1099,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);
@@ -1177,9 +1177,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);
 	}
 	
 	/**
@@ -1195,26 +1195,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;
 	}
 	
 	/**
@@ -1230,7 +1230,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;
@@ -1241,7 +1241,7 @@ 
 		$headers = '';
 		
 		$arr = parse_url($url);
-		if (!$arr){
+		if (!$arr) {
 			// Bad request
 			return false;
 		}
@@ -1249,7 +1249,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'] : '/';
@@ -1258,21 +1258,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()) {
@@ -1297,13 +1297,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) {
@@ -1312,19 +1312,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);
 				}
 		}
 		
@@ -1333,7 +1333,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']) {
@@ -1352,7 +1352,7 @@ 
 		
 		fclose($fp);
 		
-		return $outfp? $outfp : $body; // Data
+		return $outfp ? $outfp : $body; // Data
 	}
 	
 	/**
@@ -1363,13 +1363,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);
 		}
@@ -1433,7 +1433,7 @@ 
 			}
 		}
 		
-		return ($mime && isset($extTable[$mime]))? ('.' . $extTable[$mime]) : '';
+		return ($mime && isset($extTable[$mime])) ? ('.'.$extTable[$mime]) : '';
 	}
 	
 	/**
@@ -1449,26 +1449,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);
@@ -1493,7 +1493,7 @@ 
 				} else {
 					// wait until makeing temp file (for anothor session)
 					$cnt = 100; // Time limit 10 sec
-					while(!is_file($base) && --$cnt) {
+					while (!is_file($base) && --$cnt) {
 						usleep(100000); // wait 100ms
 					}
 					if (!$cnt) {
@@ -1528,13 +1528,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 {
@@ -1547,7 +1547,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));
@@ -1588,15 +1588,15 @@ 
 			$testDirs[] = rtrim(realpath($volumeTempPath), DIRECTORY_SEPARATOR);
 		}
 		$tempDir = '';
-		$test = DIRECTORY_SEPARATOR . microtime(true);
-		foreach($testDirs as $testDir) {
+		$test = DIRECTORY_SEPARATOR.microtime(true);
+		foreach ($testDirs as $testDir) {
 			if (!$testDir || !is_dir($testDir)) continue;
 			$testFile = $testDir.$test;
 			if (touch($testFile)) {
 				unlink($testFile);
 				$tempDir = $testDir;
 				$gc = time() - 3600;
-				foreach(glob($tempDir . '/ELF*') as $cf) {
+				foreach (glob($tempDir.'/ELF*') as $cf) {
 					if (filemtime($cf) < $gc) {
 						@unlink($cf);
 					}
@@ -1616,7 +1616,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);
@@ -1631,10 +1631,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());
 			}
@@ -1666,15 +1666,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'];
 			}
 		}
@@ -1706,7 +1706,7 @@ 
 		if (empty($files)) {
 			if (!$args['upload'] && $args['name'] && is_array($args['name'])) {
 				$result['name'] = array();
-				foreach($args['name'] as $_i => $_name) {
+				foreach ($args['name'] as $_i => $_name) {
 					$result['name'][$_i] = preg_replace($ngReg, '_', $_name);
 				}
 				$result = array_merge_recursive($result, $this->ls($args));
@@ -1719,7 +1719,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') {
@@ -1729,7 +1729,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;
@@ -1738,7 +1738,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:
@@ -1774,8 +1774,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;
@@ -1810,7 +1810,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())) {
@@ -1820,7 +1820,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;
@@ -1834,14 +1834,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));
 				}
 			}
@@ -1849,7 +1849,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;
 				}
@@ -1871,18 +1871,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]);
@@ -1894,7 +1894,7 @@ 
 			}
 		}
 		if ($GLOBALS['elFinderTempFiles']) {
-			foreach(array_keys($GLOBALS['elFinderTempFiles']) as $_temp) {
+			foreach (array_keys($GLOBALS['elFinderTempFiles']) as $_temp) {
 				@ unlink($_temp);
 			}
 		}
@@ -1931,7 +1931,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'];
 			}
 		}
@@ -1989,9 +1989,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);
 					}
@@ -2003,7 +2003,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);
 			}
@@ -2045,7 +2045,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) {
@@ -2053,7 +2053,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()));
 	}
 	
@@ -2068,7 +2068,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);
@@ -2089,7 +2089,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)) {
@@ -2153,11 +2153,11 @@ 
 		$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'];
+		$degree = (int) $args['degree'];
 		
 		if (($volume = $this->volume($target)) == false
 		|| ($file = $volume->file($target)) == false) {
@@ -2178,7 +2178,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();
@@ -2195,18 +2195,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 .= '
@@ -2248,13 +2248,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();
@@ -2324,7 +2324,7 @@ 
 	
 	protected function utime() {
 		$time = explode(" ", microtime());
-		return (double)$time[1] + (double)$time[0];
+		return (double) $time[1] + (double) $time[0];
 	}
 	
 	
@@ -2350,7 +2350,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;
 		}
@@ -2358,13 +2358,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

Doc Comments +17 added lines, -21 removed lines

@@ -1176,7 +1176,6 @@ 
 	 * Return file info or false on error
 	 *
 	 * @param  string   $hash      file hash
-	 * @param  bool     $realpath  add realpath field to file info
 	 * @return array|false
 	 * @author Dmitry (dio) Levashov
 	 **/
@@ -1197,7 +1196,6 @@ 
 	 * Return folder info
 	 *
 	 * @param  string   $hash  folder hash
-	 * @param  bool     $hidden  return hidden file info
 	 * @return array|false
 	 * @author Dmitry (dio) Levashov
 	 **/
@@ -1530,7 +1528,6 @@ 
 	 *
 	 * @param  Resource $fp      file pointer
 	 * @param  string   $dst     destination folder hash
-	 * @param  string   $src     file name
 	 * @param  string   $tmpname file tmp name - required to detect mime type
 	 * @return array|false
 	 * @author Dmitry (dio) Levashov
@@ -1616,7 +1613,6 @@ 
 	 * Paste files
 	 *
 	 * @param  Object  $volume  source volume
-	 * @param  string  $source  file hash
 	 * @param  string  $dst     destination dir hash
 	 * @param  bool    $rmSrc   remove source after copy?
 	 * @return array|false
@@ -2235,7 +2231,6 @@ 
 	 * Open file and return file pointer (with convert encording)
 	 *
 	 * @param  string  $path  file path
-	 * @param  bool    $write open file for writing
 	 * @return resource|false
 	 * @author Naoki Sawada
 	 **/
@@ -2366,7 +2361,8 @@ 
 	 * Not implemented
 	 *
 	 * @param  string  path
-	 * @return mixed
+	 * @param string $path
+	 * @return string
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function crypt($path) {
@@ -2378,7 +2374,8 @@ 
 	 * Not implemented
 	 *
 	 * @param  mixed  hash
-	 * @return mixed
+	 * @param string $hash
+	 * @return string
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function uncrypt($hash) {
@@ -2408,7 +2405,6 @@ 
 	/**
 	 * Return new unique name based on file name and suffix
 	 *
-	 * @param  string  $path    file path
 	 * @param  string  $suffix  suffix append to name
 	 * @return string
 	 * @author Dmitry (dio) Levashov
@@ -2476,6 +2472,7 @@ 
 	 * @param  string $to      to character encoding
 	 * @param  string $locale  local locale
 	 * @param  string $unknown replaces character for unknown
+	 * @param boolean $restoreLocale
 	 * @return mixed
 	 */
 	protected function convEnc($var, $from, $to, $locale, $restoreLocale, $unknown = '_') {
@@ -2657,6 +2654,7 @@ 
 	 *
 	 * @param string $dir  parent dir path
 	 * @param string $name new file name
+	 * @param boolean $isDir
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
@@ -3186,7 +3184,7 @@ 
 	 * @param  string  $src   source path
 	 * @param  string  $dst   destination dir path
 	 * @param  string  $name  new file name (optionaly)
-	 * @return string|false
+	 * @return boolean|string
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function copy($src, $dst, $name) {
@@ -3239,7 +3237,7 @@ 
 	 * @param  string  $src   source path
 	 * @param  string  $dst   destination dir path
 	 * @param  string  $name  new file name 
-	 * @return string|false
+	 * @return string|boolean
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function move($src, $dst, $name) {
@@ -3265,7 +3263,7 @@ 
 	 * @param  string  $src          source file hash
 	 * @param  string  $destination  destination dir path
 	 * @param  string  $name         file name
-	 * @return string|false
+	 * @return boolean|string
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function copyFrom($volume, $src, $destination, $name) {
@@ -3409,7 +3407,7 @@ 
 	 * @param  string  $path  thumnbnail path 
 	 * @param  array   $stat  file stat
 	 * @param  bool    $checkTmbPath
-	 * @return string|bool
+	 * @return boolean
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function canCreateTmb($path, $stat, $checkTmbPath = true) {
@@ -3426,7 +3424,7 @@ 
 	 *
 	 * @param  string  $path  thumnbnail path 
 	 * @param  array   $stat  file stat
-	 * @return string|bool
+	 * @return boolean
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function canResize($path, $stat) {
@@ -3437,7 +3435,6 @@ 
 	 * Create thumnbnail and return it's URL on success
 	 *
 	 * @param  string  $path  file path
-	 * @param  string  $mime  file mime type
 	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
@@ -3897,7 +3894,7 @@ 
 	 *
 	 * @param  string  $command       command line
 	 * @param  array   $output        stdout strings
-	 * @param  array   $return_var    process exit code
+	 * @param  integer   $return_var    process exit code
 	 * @param  array   $error_output  stderr strings
 	 * @return int     exit code
 	 * @author Alexey Sukhotin
@@ -4048,7 +4045,7 @@ 
 	* @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
+	* @return integer
 	* @author Alexey Sukhotin
 	**/
 	protected function stripos($haystack , $needle , $offset = 0) {
@@ -4273,7 +4270,7 @@ 
 	 * @param  array   $files  files names list
 	 * @param  string  $name   archive name
 	 * @param  array   $arc    archiver options
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov, 
 	 * @author Alexey Sukhotin
 	 * @author Naoki Sawada
@@ -4330,7 +4327,7 @@ 
 	 * @param  string        $dir      target dir
 	 * @param  array         $files    files names list
 	 * @param  string|object $zipPath  Zip archive name
-	 * @return void
+	 * @return boolean
 	 * @author Naoki Sawada
 	 */
 	protected static function zipArchiveZip($dir, $files, $zipPath) {
@@ -4533,7 +4530,6 @@ 
 	 * Open file and return file pointer
 	 *
 	 * @param  string  $path  file path
-	 * @param  bool    $write open file for writing
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
@@ -4586,7 +4582,7 @@ 
 	 * Copy file into another file (only inside one volume)
 	 *
 	 * @param  string  $source  source file path
-	 * @param  string  $target  target dir path
+	 * @param  string  $targetDir  target dir path
 	 * @param  string  $name    file name
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
@@ -4598,7 +4594,7 @@ 
 	 * Return new file path or false.
 	 *
 	 * @param  string  $source  source file path
-	 * @param  string  $target  target dir path
+	 * @param  string  $targetDir  target dir path
 	 * @param  string  $name    file name
 	 * @return string|bool
 	 * @author Dmitry (dio) Levashov

Indentation +24 added lines, -24 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * Base class for elFinder volume.
- * Provide 2 layers:
- *  1. Public API (commands)
- *  2. abstract fs API
- *
- * All abstract methods begin with "_"
- *
- * @author Dmitry (dio) Levashov
- * @author Troex Nevelin
- * @author Alexey Sukhotin
- **/
+	 * Base class for elFinder volume.
+	 * Provide 2 layers:
+	 *  1. Public API (commands)
+	 *  2. abstract fs API
+	 *
+	 * All abstract methods begin with "_"
+	 *
+	 * @author Dmitry (dio) Levashov
+	 * @author Troex Nevelin
+	 * @author Alexey Sukhotin
+	 **/
 abstract class elFinderVolumeDriver {
 	
 	/**
@@ -192,11 +192,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
@@ -4043,14 +4043,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);

Braces +10 added lines, -4 removed lines

@@ -859,7 +859,9 @@ 
 
 		// This get's triggered if $this->root == '/' and alias is empty.
 		// Maybe modify _basename instead?
-		if ($this->rootName === '') $this->rootName = $this->separator;
+		if ($this->rootName === '') {
+			$this->rootName = $this->separator;
+		}
 
 		$root = $this->stat($this->root);
 		
@@ -2938,7 +2940,9 @@ 
 		if ($this->mimeDetect == 'finfo') {
 			if ($type = @finfo_file($this->finfo, $path)) {
 				if ($ext && preg_match('~^application/(?:octet-stream|(?:x-)?zip)~', $type)) {
-					if (isset(elFinderVolumeDriver::$mimetypes[$ext])) $type = elFinderVolumeDriver::$mimetypes[$ext];
+					if (isset(elFinderVolumeDriver::$mimetypes[$ext])) {
+						$type = elFinderVolumeDriver::$mimetypes[$ext];
+					}
 				} else if ($ext === 'js' && preg_match('~^text/~', $type)) {
 					$type = 'text/javascript';
 				}
@@ -4013,7 +4017,7 @@ 
 			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);
 		}
@@ -4203,7 +4207,9 @@ 
 		}
 		
 		// 'Here'
-		if ($path === '' || $path === '.' . $separator) return $base;
+		if ($path === '' || $path === '.' . $separator) {
+			return $base;
+		}
 		
 		// Absolute path
 		if ($path[0] === $separator || strpos($path, $systemroot) === 0) {

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")
 	);
 
 	/**
@@ -570,7 +570,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) {
@@ -601,7 +601,7 @@ 
 		
 		// check 'statOwner' for command `chmod`
 		if (empty($this->options['statOwner'])) {
-			$this->disabled[] ='chmod';
+			$this->disabled[] = 'chmod';
 		}
 		
 		// check 'mimeMap'
@@ -706,7 +706,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);
@@ -725,14 +725,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
@@ -759,8 +759,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()) {
@@ -859,7 +859,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];
 							}
@@ -911,8 +911,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 .= '/';
@@ -1053,7 +1053,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'];
 			}
@@ -1073,7 +1073,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()
 		);
 	}
 	
@@ -1085,7 +1085,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;
 	}
 	
 	/**
@@ -1097,7 +1097,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'];
 		}
@@ -1227,7 +1227,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
 		}
 		
@@ -1242,7 +1242,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);
 		}
@@ -1306,14 +1306,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;
 	}
@@ -1543,7 +1543,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);
 		}
@@ -1619,7 +1619,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);
@@ -1690,7 +1690,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);
@@ -1853,7 +1853,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)) {
@@ -1911,9 +1911,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;
@@ -1949,7 +1949,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)) {
@@ -1964,7 +1964,7 @@ 
 			}
 		}
 
-		switch($mode) {
+		switch ($mode) {
 			
 			case 'propresize':
 				$result = $this->imgResize($work_path, $width, $height, true, true);
@@ -2060,7 +2060,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);
 	}
 	
 	/**
@@ -2129,9 +2129,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'];
@@ -2198,7 +2198,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)));
 	}
 	
 	/**
@@ -2209,7 +2209,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)));
 	}
 	
 	/**
@@ -2222,7 +2222,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)));
 	}
 	
 	/**
@@ -2233,7 +2233,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)));
 	}
 	
 	/**
@@ -2244,7 +2244,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)));
 	}
 	
 	/**
@@ -2255,7 +2255,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)));
 	}
 	
 	/**
@@ -2267,7 +2267,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)));
 	}
 	
 	/**
@@ -2278,8 +2278,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));
 	}
 	
 	/**
@@ -2290,8 +2290,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)));
 	}
 	
 	/**
@@ -2306,7 +2306,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)));
 	}
 	
 	/**
@@ -2318,7 +2318,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];
 	}
@@ -2331,7 +2331,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)));
 	}
 	
 	/**
@@ -2344,7 +2344,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 *******************/
@@ -2363,7 +2363,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;
 			}
 
@@ -2396,7 +2396,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); 
 		}
 	}
 	
@@ -2453,21 +2453,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;
@@ -2491,7 +2491,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);
 	}
 	
 	/**
@@ -2504,7 +2504,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);
 	}
 	
 	/**
@@ -2524,7 +2524,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;
@@ -2536,7 +2536,7 @@ 
 						$_var = str_replace('?', $unknown, $_var);
 					}
 				}
-				if  ($_var !== false) {
+				if ($_var !== false) {
 					$var = $_var;
 				}
 			}
@@ -2563,7 +2563,7 @@ 
 		
 		$key = '';
 		if ($path !== '') {
-			$key = $this->id . '#' . $path;
+			$key = $this->id.'#'.$path;
 			if (isset($cache[$key])) {
 				return $cache[$key];
 			}
@@ -2595,7 +2595,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);
@@ -2639,7 +2639,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);
 	}
@@ -2656,7 +2656,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;
 		}
@@ -2688,7 +2688,7 @@ 
 			} 
 		}
 		
-		return $perm === null ? (is_null($val)? $this->defaults[$name] : $val) : !!$perm;
+		return $perm === null ? (is_null($val) ? $this->defaults[$name] : $val) : !!$perm;
 	}
 	
 	/**
@@ -2732,7 +2732,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
@@ -2803,10 +2803,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 {
@@ -2850,7 +2850,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;
 				}
@@ -2908,7 +2908,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($this->convEncIn($_path, true)));
+				$stat['url'] = rtrim($this->URL, '/').'/'.str_replace('%2F', '/', rawurlencode($this->convEncIn($_path, true)));
 			}
 		} else {
 			if ($isDir) {
@@ -3151,7 +3151,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);
@@ -3162,7 +3162,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));
 				}
 			}
 		}
@@ -3182,7 +3182,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);
 
@@ -3203,7 +3203,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;
@@ -3237,7 +3237,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)
@@ -3518,15 +3518,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');
 				}
 		
@@ -3543,7 +3543,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');
 			}
 		}
 		
@@ -3584,18 +3584,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;
 				}
 			}
@@ -3613,7 +3613,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)) {
@@ -3638,11 +3638,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;
@@ -3718,11 +3718,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;
@@ -3772,8 +3772,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':
@@ -3793,7 +3793,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);
@@ -3809,7 +3809,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);
 				}
 				
@@ -3820,11 +3820,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;
@@ -3855,15 +3855,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',
@@ -3879,7 +3879,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;
@@ -3915,12 +3915,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']);
 
@@ -3945,11 +3945,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
 		);
 
@@ -4006,8 +4006,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);
 
@@ -4031,7 +4031,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);
@@ -4050,13 +4050,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);
 		}
@@ -4094,13 +4094,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);
+			return mb_stripos($haystack, $needle, $offset);
 		} else if (function_exists('mb_strtolower') && function_exists('mb_strpos')) {
 			return mb_strpos(mb_strtolower($haystack), mb_strtolower($needle), $offset);
 		} 
-		return stripos($haystack , $needle , $offset);
+		return stripos($haystack, $needle, $offset);
 	}
 
 	/**
@@ -4150,22 +4150,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');
 				}
 			}
@@ -4187,7 +4187,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);
@@ -4241,22 +4241,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, '.');
@@ -4270,12 +4270,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;
@@ -4293,7 +4292,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 {
@@ -4380,22 +4379,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);
@@ -4580,7 +4579,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
@@ -4590,7 +4589,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	abstract protected function _fclose($fp, $path='');
+	abstract protected function _fclose($fp, $path = '');
 	
 	/********************  file/dir manipulations *************************/
 	

php/elFinderVolumeDropbox.class.php

Doc Comments +5 added lines, -12 removed lines

@@ -234,7 +234,6 @@ 
 	 * process of on netunmount
 	 * Drop table `dropbox` & rm thumbs
 	 * 
-	 * @param array $options
 	 * @return boolean
 	 */
 	public function netunmount($netVolumes, $key) {
@@ -431,7 +430,7 @@ 
 	/**
 	 * Check DB for delta cache
 	 * 
-	 * @return void
+	 * @return boolean
 	 */
 	private function checkDB() {
 		$res = $this->query('SELECT * FROM sqlite_master WHERE type=\'table\' AND name=\''.$this->DB_TableName.'\'');
@@ -685,7 +684,7 @@ 
 	* @param  string  $src   source path
 	* @param  string  $dst   destination dir path
 	* @param  string  $name  new file name (optionaly)
-	* @return string|false
+	* @return string|boolean
 	* @author Dmitry (dio) Levashov
 	* @author Naoki Sawada
 	**/
@@ -739,10 +738,6 @@ 
 	* Create thumnbnail and return it's URL on success
 	*
 	* @param  string  $path  file path
-	* @param  string  $mime  file mime type
-	* @return string|false
-	* @author Dmitry (dio) Levashov
-	* @author Naoki Sawada
 	**/
 	protected function createTmb($path, $stat) {
 		if (!$stat || !$this->canCreateTmb($path, $stat)) {
@@ -1099,7 +1094,6 @@ 
 	 * Open file and return file pointer
 	 *
 	 * @param  string  $path  file path
-	 * @param  bool    $write open file for writing
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
@@ -1141,7 +1135,7 @@ 
 	 * Close opened file
 	 *
 	 * @param  resource  $fp  file pointer
-	 * @return bool
+	 * @return boolean|null
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _fclose($fp, $path='') {
@@ -1225,7 +1219,7 @@ 
 	 * Return new file path or false.
 	 *
 	 * @param  string  $source  source file path
-	 * @param  string  $target  target dir path
+	 * @param  string  $targetDir  target dir path
 	 * @param  string  $name    file name
 	 * @return string|bool
 	 * @author Dmitry (dio) Levashov
@@ -1274,7 +1268,6 @@ 
 	 * Return new file path or false on error.
 	 *
 	 * @param  resource  $fp   file pointer
-	 * @param  string    $dir  target dir path
 	 * @param  string    $name file name
 	 * @param  array     $stat file stat (required by some virtual fs)
 	 * @return bool|string
@@ -1320,7 +1313,7 @@ 
 	 *
 	 * @param  string  $path     file path
 	 * @param  string  $content  new file content
-	 * @return bool
+	 * @return boolean|string
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _filePutContents($path, $content) {

Indentation +49 added lines, -49 removed lines

@@ -192,7 +192,7 @@ 
 						$options['url'] = $this->getConnectorUrl();
 					}
 					$callback  = $options['url']
-					           . '?cmd=netmount&protocol=dropbox&host=dropbox.com&user=init&pass=return&node='.$options['id'].$cdata;
+							   . '?cmd=netmount&protocol=dropbox&host=dropbox.com&user=init&pass=return&node='.$options['id'].$cdata;
 					
 					try {
 						$tokens = $this->oauth->getRequestToken();
@@ -265,9 +265,9 @@ 
 	 */
 	private function getConnectorUrl() {
 		$url  = ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')? 'https://' : 'http://')
-		       . $_SERVER['SERVER_NAME']                                              // host
-		      . ($_SERVER['SERVER_PORT'] == 80 ? '' : ':' . $_SERVER['SERVER_PORT'])  // port
-		       . $_SERVER['REQUEST_URI'];                                             // path & query
+			   . $_SERVER['SERVER_NAME']                                              // host
+			  . ($_SERVER['SERVER_PORT'] == 80 ? '' : ':' . $_SERVER['SERVER_PORT'])  // port
+			   . $_SERVER['REQUEST_URI'];                                             // path & query
 		list($url) = explode('?', $url);
 		return $url;
 	}
@@ -605,7 +605,7 @@ 
 		$stat['mime']  = $raw['is_dir']? 'directory' : $raw['mime_type'];
 		$stat['size']  = $stat['mime'] == 'directory' ? 0 : $raw['bytes'];
 		$stat['ts']    = isset($raw['client_mtime'])? strtotime($raw['client_mtime']) :
-		                (isset($raw['modified'])? strtotime($raw['modified']) : $_SERVER['REQUEST_TIME']);
+						(isset($raw['modified'])? strtotime($raw['modified']) : $_SERVER['REQUEST_TIME']);
 		$stat['dirs'] = 0;
 		if ($raw['is_dir']) {
 			$stat['dirs'] = (int)(bool)$this->query('select path from '.$this->DB_TableName.' where isdir=1 and path='.$this->DB->quote(strtolower($raw['path'])));
@@ -648,14 +648,14 @@ 
 	}
 
 	/**
-	* Recursive files search
-	*
-	* @param  string  $path   dir path
-	* @param  string  $q      search string
-	* @param  array   $mimes
-	* @return array
-	* @author Naoki Sawada
-	**/
+	 * Recursive files search
+	 *
+	 * @param  string  $path   dir path
+	 * @param  string  $q      search string
+	 * @param  array   $mimes
+	 * @return array
+	 * @author Naoki Sawada
+	 **/
 	protected function doSearch($path, $q, $mimes) {
 		$result = array();
 		$sth = $this->DB->prepare('select dat from '.$this->DB_TableName.' WHERE path LIKE ? AND fname LIKE ?');
@@ -679,16 +679,16 @@ 
 	}
 	
 	/**
-	* Copy file/recursive copy dir only in current volume.
-	* Return new file path or false.
-	*
-	* @param  string  $src   source path
-	* @param  string  $dst   destination dir path
-	* @param  string  $name  new file name (optionaly)
-	* @return string|false
-	* @author Dmitry (dio) Levashov
-	* @author Naoki Sawada
-	**/
+	 * Copy file/recursive copy dir only in current volume.
+	 * Return new file path or false.
+	 *
+	 * @param  string  $src   source path
+	 * @param  string  $dst   destination dir path
+	 * @param  string  $name  new file name (optionaly)
+	 * @return string|false
+	 * @author Dmitry (dio) Levashov
+	 * @author Naoki Sawada
+	 **/
 	protected function copy($src, $dst, $name) {
 
 		$this->clearcache();
@@ -699,14 +699,14 @@ 
 	}
 	
 	/**
-	* Remove file/ recursive remove dir
-	*
-	* @param  string  $path   file path
-	* @param  bool    $force  try to remove even if file locked
-	* @return bool
-	* @author Dmitry (dio) Levashov
-	* @author Naoki Sawada
-	**/
+	 * Remove file/ recursive remove dir
+	 *
+	 * @param  string  $path   file path
+	 * @param  bool    $force  try to remove even if file locked
+	 * @return bool
+	 * @author Dmitry (dio) Levashov
+	 * @author Naoki Sawada
+	 **/
 	protected function remove($path, $force = false, $recursive = false) {
 		$stat = $this->stat($path);
 		$stat['realpath'] = $path;
@@ -736,14 +736,14 @@ 
 	}
 	
 	/**
-	* Create thumnbnail and return it's URL on success
-	*
-	* @param  string  $path  file path
-	* @param  string  $mime  file mime type
-	* @return string|false
-	* @author Dmitry (dio) Levashov
-	* @author Naoki Sawada
-	**/
+	 * Create thumnbnail and return it's URL on success
+	 *
+	 * @param  string  $path  file path
+	 * @param  string  $mime  file mime type
+	 * @return string|false
+	 * @author Dmitry (dio) Levashov
+	 * @author Naoki Sawada
+	 **/
 	protected function createTmb($path, $stat) {
 		if (!$stat || !$this->canCreateTmb($path, $stat)) {
 			return false;
@@ -828,13 +828,13 @@ 
 	}
 	
 	/**
-	* Return content URL
-	*
-	* @param string  $hash  file hash
-	* @param array $options options
-	* @return array
-	* @author Naoki Sawada
-	**/
+	 * Return content URL
+	 *
+	 * @param string  $hash  file hash
+	 * @param array $options options
+	 * @return array
+	 * @author Naoki Sawada
+	 **/
 	public function getContentUrl($hash, $options = array()) {
 		if (($file = $this->file($hash)) == false || !$file['url'] || $file['url'] == 1) {
 			$path = $this->decode($hash);
@@ -897,9 +897,9 @@ 
 			try {
 				$request2 = new HTTP_Request2();
 				$request2->setConfig(array(
-                    'ssl_verify_peer' => false,
-                    'ssl_verify_host' => false
-                ));
+					'ssl_verify_peer' => false,
+					'ssl_verify_host' => false
+				));
 				$request2->setUrl($url);
 				$request2->setMethod(HTTP_Request2::METHOD_HEAD);
 				$result = $request2->send();

Braces +24 added lines, -8 removed lines

@@ -132,8 +132,12 @@ 
 	 * @author Naoki Sawada
 	 **/
 	public function netmountPrepare($options) {
-		if (empty($options['consumerKey']) && defined('ELFINDER_DROPBOX_CONSUMERKEY')) $options['consumerKey'] = ELFINDER_DROPBOX_CONSUMERKEY;
-		if (empty($options['consumerSecret']) && defined('ELFINDER_DROPBOX_CONSUMERSECRET')) $options['consumerSecret'] = ELFINDER_DROPBOX_CONSUMERSECRET;
+		if (empty($options['consumerKey']) && defined('ELFINDER_DROPBOX_CONSUMERKEY')) {
+			$options['consumerKey'] = ELFINDER_DROPBOX_CONSUMERKEY;
+		}
+		if (empty($options['consumerSecret']) && defined('ELFINDER_DROPBOX_CONSUMERSECRET')) {
+			$options['consumerSecret'] = ELFINDER_DROPBOX_CONSUMERSECRET;
+		}
 		
 		if ($options['user'] === 'init') {
 
@@ -616,8 +620,12 @@ 
 		} else {
 			$stat['url'] = '1';
 		}
-		if (isset($raw['width'])) $stat['width'] = $raw['width'];
-		if (isset($raw['height'])) $stat['height'] = $raw['height'];
+		if (isset($raw['width'])) {
+			$stat['width'] = $raw['width'];
+		}
+		if (isset($raw['height'])) {
+			$stat['height'] = $raw['height'];
+		}
 		
 		return $stat;
 	}
@@ -1061,7 +1069,9 @@ 
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _dimensions($path, $mime) {
-		if (strpos($mime, 'image') !== 0) return '';
+		if (strpos($mime, 'image') !== 0) {
+			return '';
+		}
 		$cache = $this->getDBdat($path);
 		if (isset($cache['width']) && isset($cache['height'])) {
 			return $cache['width'].'x'.$cache['height'];
@@ -1281,7 +1291,9 @@ 
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _save($fp, $path, $name, $stat) {
-		if ($name) $path .= '/'.$name;
+		if ($name) {
+			$path .= '/'.$name;
+		}
 		$path = $this->_normpath($path);
 		try {
 			$this->dropbox->putFile($path, $fp);
@@ -1291,8 +1303,12 @@ 
 		$this->deltaCheck();
 		if (is_array($stat)) {
 			$raw = $this->getDBdat($path);
-			if (isset($stat['width'])) $raw['width'] = $stat['width'];
-			if (isset($stat['height'])) $raw['height'] = $stat['height'];
+			if (isset($stat['width'])) {
+				$raw['width'] = $stat['width'];
+			}
+			if (isset($stat['height'])) {
+				$raw['height'] = $stat['height'];
+			}
 			$this->updateDBdat($path, $raw);
 		}
 		return $path;

Spacing +63 added lines, -64 removed lines

@@ -137,7 +137,7 @@ 
 		
 		if ($options['user'] === 'init') {
 
-			if (! $this->dropbox_phpFound || empty($options['consumerKey']) || empty($options['consumerSecret']) || !class_exists('PDO')) {
+			if (!$this->dropbox_phpFound || empty($options['consumerKey']) || empty($options['consumerSecret']) || !class_exists('PDO')) {
 				return array('exit' => true, 'body' => '{msg:errNetMountNoDriver}');
 			}
 			
@@ -147,7 +147,7 @@ 
 				if (class_exists('OAuth')) {
 					$this->oauth = new Dropbox_OAuth_PHP($options['consumerKey'], $options['consumerSecret']);
 				} else {
-					if (! class_exists('HTTP_OAuth_Consumer')) {
+					if (!class_exists('HTTP_OAuth_Consumer')) {
 						// We're going to try to load in manually
 						include 'HTTP/OAuth/Consumer.php';
 					}
@@ -157,7 +157,7 @@ 
 				}
 			}
 			
-			if (! $this->oauth) {
+			if (!$this->oauth) {
 				return array('exit' => true, 'body' => '{msg:errNetMountNoDriver}');
 			}
 
@@ -178,25 +178,25 @@ 
 						unset($_SESSION['elFinderDropboxTokens']);
 					}
 				}
-				if (! $html) {
+				if (!$html) {
 					// get customdata
 					$cdata = '';
 					$innerKeys = array('cmd', 'host', 'options', 'pass', 'protocol', 'user');
-					$this->ARGS = $_SERVER['REQUEST_METHOD'] === 'POST'? $_POST : $_GET;
-					foreach($this->ARGS as $k => $v) {
-						if (! in_array($k, $innerKeys)) {
-							$cdata .= '&' . $k . '=' . rawurlencode($v);
+					$this->ARGS = $_SERVER['REQUEST_METHOD'] === 'POST' ? $_POST : $_GET;
+					foreach ($this->ARGS as $k => $v) {
+						if (!in_array($k, $innerKeys)) {
+							$cdata .= '&'.$k.'='.rawurlencode($v);
 						}
 					}
-					if (strpos($options['url'], 'http') !== 0 ) {
+					if (strpos($options['url'], 'http') !== 0) {
 						$options['url'] = $this->getConnectorUrl();
 					}
-					$callback  = $options['url']
+					$callback = $options['url']
 					           . '?cmd=netmount&protocol=dropbox&host=dropbox.com&user=init&pass=return&node='.$options['id'].$cdata;
 					
 					try {
 						$tokens = $this->oauth->getRequestToken();
-						$url= $this->oauth->getAuthorizeUrl(rawurlencode($callback));
+						$url = $this->oauth->getAuthorizeUrl(rawurlencode($callback));
 					} catch (Dropbox_Exception $e) {
 						return array('exit' => true, 'body' => '{msg:errAccess}');
 					}
@@ -243,14 +243,14 @@ 
 		if (isset($netVolumes[$key])) {
 			$dropboxUid = $netVolumes[$key]['dropboxUid'];
 		}
-		foreach($netVolumes as $volume) {
+		foreach ($netVolumes as $volume) {
 			if (@$volume['host'] === 'dropbox' && @$volume['dropboxUid'] === $dropboxUid) {
 				$count++;
 			}
 		}
 		if ($count === 1) {
 			$this->DB->exec('drop table '.$this->DB_TableName);
-			foreach(glob(rtrim($this->options['tmbPath'], '\\/').DIRECTORY_SEPARATOR.$this->tmbPrefix.'*.png') as $tmb) {
+			foreach (glob(rtrim($this->options['tmbPath'], '\\/').DIRECTORY_SEPARATOR.$this->tmbPrefix.'*.png') as $tmb) {
 				unlink($tmb);
 			}
 		}
@@ -264,10 +264,10 @@ 
 	 * @author Naoki Sawada
 	 */
 	private function getConnectorUrl() {
-		$url  = ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')? 'https://' : 'http://')
+		$url = ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') ? 'https://' : 'http://')
 		       . $_SERVER['SERVER_NAME']                                              // host
-		      . ($_SERVER['SERVER_PORT'] == 80 ? '' : ':' . $_SERVER['SERVER_PORT'])  // port
-		       . $_SERVER['REQUEST_URI'];                                             // path & query
+		      . ($_SERVER['SERVER_PORT'] == 80 ? '' : ':'.$_SERVER['SERVER_PORT'])  // port
+		       . $_SERVER['REQUEST_URI']; // path & query
 		list($url) = explode('?', $url);
 		return $url;
 	}
@@ -303,14 +303,14 @@ 
 		// make net mount key
 		$this->netMountKey = md5(join('-', array('dropbox', $this->options['path'])));
 
-		if (! $this->oauth) {
+		if (!$this->oauth) {
 			if (defined('ELFINDER_DROPBOX_USE_CURL_PUT')) {
 				$this->oauth = new Dropbox_OAuth_Curl($this->options['consumerKey'], $this->options['consumerSecret']);
 			} else {
 				if (class_exists('OAuth')) {
 					$this->oauth = new Dropbox_OAuth_PHP($this->options['consumerKey'], $this->options['consumerSecret']);
 				} else {
-					if (! class_exists('HTTP_OAuth_Consumer')) {
+					if (!class_exists('HTTP_OAuth_Consumer')) {
 						// We're going to try to load in manually
 						include 'HTTP/OAuth/Consumer.php';
 					}
@@ -321,7 +321,7 @@ 
 			}
 		}
 		
-		if (! $this->oauth) {
+		if (!$this->oauth) {
 			return $this->setError('OAuth extension not loaded.');
 		}
 
@@ -329,7 +329,7 @@ 
 		$this->root = $this->options['path'] = $this->_normpath($this->options['path']);
 
 		if (empty($this->options['alias'])) {
-			$this->options['alias'] = ($this->options['path'] === '/')? 'Dropbox.com'  : 'Dropbox'.$this->options['path'];
+			$this->options['alias'] = ($this->options['path'] === '/') ? 'Dropbox.com' : 'Dropbox'.$this->options['path'];
 		}
 
 		$this->rootName = $this->options['alias'];
@@ -385,7 +385,7 @@ 
 		}
 		
 		// setup PDO
-		if (! $this->options['PDO_DSN']) {
+		if (!$this->options['PDO_DSN']) {
 			$this->options['PDO_DSN'] = 'sqlite:'.$this->metaCache.DIRECTORY_SEPARATOR.'.elFinder_dropbox_db_'.md5($this->dropboxUid.$this->options['consumerSecret']);
 		}
 		// DataBase table name
@@ -393,7 +393,7 @@ 
 		// DataBase check or make table
 		try {
 			$this->DB = new PDO($this->options['PDO_DSN'], $this->options['PDO_User'], $this->options['PDO_Pass'], $this->options['PDO_Options']);
-			if (! $this->checkDB()) {
+			if (!$this->checkDB()) {
 				return $this->setError('Can not make DB table');
 			}
 		} catch (PDOException $e) {
@@ -444,7 +444,7 @@ 
 				$res = false;
 			}
 		}
-		if (! $res) {
+		if (!$res) {
 			try {
 				$this->DB->exec('CREATE TABLE '.$this->DB_TableName.'(path text, fname text, dat blob, isdir integer);');
 				$this->DB->exec('CREATE UNIQUE INDEX nameidx ON '.$this->DB_TableName.'(path, fname)');
@@ -494,7 +494,7 @@ 
 	 */
 	private function updateDBdat($path, $dat) {
 		return $this->query('update '.$this->DB_TableName.' set dat='.$this->DB->quote(serialize($dat))
-				. ', isdir=' . ($dat['is_dir']? 1 : 0)
+				. ', isdir='.($dat['is_dir'] ? 1 : 0)
 				. ' where path='.$this->DB->quote(strtolower(dirname($path))).' and fname='.$this->DB->quote(strtolower(basename($path))));
 	}
 	/*********************************************************************/
@@ -519,7 +519,7 @@ 
 	 */
 	protected function deltaCheck($refresh = true) {
 		$chk = false;
-		if (! $refresh && $chk = $this->query('select dat from '.$this->DB_TableName.' where path=\'\' and fname=\'\' limit 1')) {
+		if (!$refresh && $chk = $this->query('select dat from '.$this->DB_TableName.' where path=\'\' and fname=\'\' limit 1')) {
 			$chk = unserialize($chk[0]);
 		}
 		if ($chk && ($chk['mtime'] + $this->options['metaCacheTime']) > $_SERVER['REQUEST_TIME']) {
@@ -541,7 +541,7 @@ 
 			do {
 				@ ini_set('max_execution_time', 120);
 				$_info = $this->dropbox->delta($cursor);
-				if (! empty($_info['reset'])) {
+				if (!empty($_info['reset'])) {
 					$this->DB->exec('TRUNCATE table '.$this->DB_TableName);
 					$this->DB->exec('insert into '.$this->DB_TableName.' values(\'\', \'\', \''.serialize(array('cursor' => '', 'mtime' => 0)).'\', 0);');
 					$this->DB->exec('insert into '.$this->DB_TableName.' values(\'/\', \'\', \''.serialize(array(
@@ -554,7 +554,7 @@ 
 				}
 				$cursor = $_info['cursor'];
 				
-				foreach($_info['entries'] as $entry) {
+				foreach ($_info['entries'] as $entry) {
 					$key = strtolower($entry[0]);
 					$pkey = strtolower(dirname($key));
 					
@@ -564,27 +564,27 @@ 
 					
 					if (empty($entry[1])) {
 						$this->DB->exec('delete from '.$this->DB_TableName.' '.$where);
-						! $delete && $delete = true;
+						!$delete && $delete = true;
 						continue;
 					}
 
 					$sql = 'select path from '.$this->DB_TableName.' '.$where.' limit 1';
-					if (! $reset && $this->query($sql)) {
-						$this->DB->exec('update '.$this->DB_TableName.' set dat='.$this->DB->quote(serialize($entry[1])).', isdir='.($entry[1]['is_dir']? 1 : 0).' ' .$where);
+					if (!$reset && $this->query($sql)) {
+						$this->DB->exec('update '.$this->DB_TableName.' set dat='.$this->DB->quote(serialize($entry[1])).', isdir='.($entry[1]['is_dir'] ? 1 : 0).' '.$where);
 					} else {
-						$this->DB->exec('insert into '.$this->DB_TableName.' values ('.$path.', '.$fname.', '.$this->DB->quote(serialize($entry[1])).', '.(int)$entry[1]['is_dir'].')');
+						$this->DB->exec('insert into '.$this->DB_TableName.' values ('.$path.', '.$fname.', '.$this->DB->quote(serialize($entry[1])).', '.(int) $entry[1]['is_dir'].')');
 					}
 				}
-			} while (! empty($_info['has_more']));
+			} while (!empty($_info['has_more']));
 			$this->DB->exec('update '.$this->DB_TableName.' set dat='.$this->DB->quote(serialize(array('cursor'=>$cursor, 'mtime'=>$_SERVER['REQUEST_TIME']))).' where path=\'\' and fname=\'\'');
-			if (! $this->DB->commit()) {
+			if (!$this->DB->commit()) {
 				$e = $this->DB->errorInfo();
 				return $e[2];
 			}
 			if ($delete) {
 				$this->DB->exec('vacuum');
 			}
-		} catch(Dropbox_Exception $e) {
+		} catch (Dropbox_Exception $e) {
 			return $e->getMessage();
 		}
 		return true;
@@ -600,15 +600,14 @@ 
 	protected function parseRaw($raw) {
 		$stat = array();
 
-		$stat['rev']   = isset($raw['rev'])? $raw['rev'] : 'root';
+		$stat['rev']   = isset($raw['rev']) ? $raw['rev'] : 'root';
 		$stat['name']  = basename($raw['path']);
-		$stat['mime']  = $raw['is_dir']? 'directory' : $raw['mime_type'];
+		$stat['mime']  = $raw['is_dir'] ? 'directory' : $raw['mime_type'];
 		$stat['size']  = $stat['mime'] == 'directory' ? 0 : $raw['bytes'];
-		$stat['ts']    = isset($raw['client_mtime'])? strtotime($raw['client_mtime']) :
-		                (isset($raw['modified'])? strtotime($raw['modified']) : $_SERVER['REQUEST_TIME']);
+		$stat['ts']    = isset($raw['client_mtime']) ? strtotime($raw['client_mtime']) : (isset($raw['modified']) ? strtotime($raw['modified']) : $_SERVER['REQUEST_TIME']);
 		$stat['dirs'] = 0;
 		if ($raw['is_dir']) {
-			$stat['dirs'] = (int)(bool)$this->query('select path from '.$this->DB_TableName.' where isdir=1 and path='.$this->DB->quote(strtolower($raw['path'])));
+			$stat['dirs'] = (int) (bool) $this->query('select path from '.$this->DB_TableName.' where isdir=1 and path='.$this->DB->quote(strtolower($raw['path'])));
 		}
 		
 		if (!empty($raw['url'])) {
@@ -634,7 +633,7 @@ 
 		$res = $this->query('select dat from '.$this->DB_TableName.' where path='.$this->DB->quote(strtolower($path)));
 		
 		if ($res) {
-			foreach($res as $raw) {
+			foreach ($res as $raw) {
 				$raw = unserialize($raw);
 				if ($stat = $this->parseRaw($raw)) {
 					$stat = $this->updateCache($raw['path'], $stat);
@@ -659,10 +658,10 @@ 
 	protected function doSearch($path, $q, $mimes) {
 		$result = array();
 		$sth = $this->DB->prepare('select dat from '.$this->DB_TableName.' WHERE path LIKE ? AND fname LIKE ?');
-		$sth->execute(array('%'.(($path === '/')? '' : strtolower($path)), '%'.strtolower($q).'%'));
+		$sth->execute(array('%'.(($path === '/') ? '' : strtolower($path)), '%'.strtolower($q).'%'));
 		$res = $sth->fetchAll(PDO::FETCH_COLUMN);
 		if ($res) {
-			foreach($res as $raw) {
+			foreach ($res as $raw) {
 				$raw = unserialize($raw);
 				if ($stat = $this->parseRaw($raw)) {
 					if (!isset($this->cache[$raw['path']])) {
@@ -753,10 +752,10 @@ 
 		$tmb  = $this->tmbPath.DIRECTORY_SEPARATOR.$name;
 	
 		// copy image into tmbPath so some drivers does not store files on local fs
-		if (! $data = $this->getThumbnail($path, $this->options['getTmbSize'])) {
+		if (!$data = $this->getThumbnail($path, $this->options['getTmbSize'])) {
 			return false;
 		}
-		if (! file_put_contents($tmb, $data)) {
+		if (!file_put_contents($tmb, $data)) {
 			return false;
 		}
 	
@@ -769,15 +768,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']) {
 	
 				/* 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');
 				}
 	
@@ -791,7 +790,7 @@ 
 				$result = $this->imgResize($tmb, $tmbSize, $tmbSize, true, true, 'png');
 			}
 		
-			$result = $this->imgSquareFit($tmb, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png' );
+			$result = $this->imgSquareFit($tmb, $tmbSize, $tmbSize, 'center', 'middle', $this->options['tmbBgColor'], 'png');
 		}
 		
 		if (!$result) {
@@ -848,7 +847,7 @@ 
 					}
 				}
 			}
-			if (! $url) {
+			if (!$url) {
 				try {
 					$res = $this->dropbox->share($path, null, false);
 					$url = $res['url'];
@@ -860,7 +859,7 @@ 
 					}
 					list($url) = explode('?', $url);
 					$url = str_replace('www.dropbox.com', $this->dropbox_dlhost, $url);
-					if (! isset($cache['share']) || $cache['share'] !== $url) {
+					if (!isset($cache['share']) || $cache['share'] !== $url) {
 						$cache['share'] = $url;
 						$this->updateDBdat($path, $cache);
 					}
@@ -884,12 +883,12 @@ 
 		if (function_exists('curl_exec')) {
 
 			$c = curl_init();
-			curl_setopt( $c, CURLOPT_RETURNTRANSFER, true );
-			curl_setopt( $c, CURLOPT_CUSTOMREQUEST, 'HEAD' );
-			curl_setopt( $c, CURLOPT_HEADER, 1 );
-			curl_setopt( $c, CURLOPT_NOBODY, true );
-			curl_setopt( $c, CURLOPT_URL, $url );
-			$res = curl_exec( $c );
+			curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($c, CURLOPT_CUSTOMREQUEST, 'HEAD');
+			curl_setopt($c, CURLOPT_HEADER, 1);
+			curl_setopt($c, CURLOPT_NOBODY, true);
+			curl_setopt($c, CURLOPT_URL, $url);
+			$res = curl_exec($c);
 			
 		} else {
 			
@@ -905,13 +904,13 @@ 
 				$result = $request2->send();
 				$res = array();
 				$res[] = 'HTTP/'.$result->getVersion().' '.$result->getStatus().' '.$result->getReasonPhrase();
-				foreach($result->getHeader() as $key => $val) {
-					$res[] = $key . ': ' . $val;
+				foreach ($result->getHeader() as $key => $val) {
+					$res[] = $key.': '.$val;
 				}
 				$res = join("\r\n", $res);
-			} catch( HTTP_Request2_Exception $e ){
+			} catch (HTTP_Request2_Exception $e) {
 				$res = '';
-			} catch (Exception $e){
+			} catch (Exception $e) {
 				$res = '';
 			}
 		
@@ -964,7 +963,7 @@ 
 	 **/
 	protected function _normpath($path) {
 		$path = str_replace(DIRECTORY_SEPARATOR, '/', $path);
-		$path = '/' . ltrim($path, '/');
+		$path = '/'.ltrim($path, '/');
 		return $path;
 	}
 
@@ -1103,7 +1102,7 @@ 
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fopen($path, $mode='rb') {
+	protected function _fopen($path, $mode = 'rb') {
 
 		if (($mode == 'rb' || $mode == 'r')) {
 			try {
@@ -1113,7 +1112,7 @@ 
  				fputs($fp, "GET {$url['path']} HTTP/1.0\r\n");
  				fputs($fp, "Host: {$url['host']}\r\n");
  				fputs($fp, "\r\n");
- 				while(trim(fgets($fp)) !== ''){};
+ 				while (trim(fgets($fp)) !== '') {};
  				return $fp;
 			} catch (Dropbox_Exception $e) {
 				return false;
@@ -1144,7 +1143,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fclose($fp, $path='') {
+	protected function _fclose($fp, $path = '') {
 		@fclose($fp);
 		if ($path) {
 			@unlink($this->getTempFile($path));

php/elFinderVolumeFTP.class.php

Doc Comments +12 added lines, -12 removed lines

@@ -477,7 +477,7 @@ 
 	 * Return ftp transfer mode for file
 	 *
 	 * @param  string  $path  file path
-	 * @return string
+	 * @return integer
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function ftpMode($path) {
@@ -841,7 +841,6 @@ 
 	 * Open file and return file pointer
 	 *
 	 * @param  string  $path  file path
-	 * @param  bool    $write open file for writing
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
@@ -866,7 +865,7 @@ 
 	 * Close opened file
 	 *
 	 * @param  resource  $fp  file pointer
-	 * @return bool
+	 * @return boolean|null
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _fclose($fp, $path='') {
@@ -883,7 +882,7 @@ 
 	 *
 	 * @param  string  $path  parent dir path
 	 * @param string  $name  new directory name
-	 * @return string|bool
+	 * @return false|string
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _mkdir($path, $name) {
@@ -901,7 +900,7 @@ 
 	 *
 	 * @param  string  $path  parent dir path
 	 * @param string  $name  new file name
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _mkfile($path, $name) {
@@ -933,7 +932,7 @@ 
 	 * @param  string  $source     source file path
 	 * @param  string  $targetDir  target directory path
 	 * @param  string  $name       new file name
-	 * @return bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _copy($source, $targetDir, $name) {
@@ -958,9 +957,9 @@ 
 	 * Return new file path or false.
 	 *
 	 * @param  string  $source  source file path
-	 * @param  string  $target  target dir path
+	 * @param  string  $targetDir  target dir path
 	 * @param  string  $name    file name
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _move($source, $targetDir, $name) {
@@ -998,7 +997,7 @@ 
 	 * @param  string    $dir  target dir path
 	 * @param  string    $name file name
 	 * @param  array     $stat file stat (required by some virtual fs)
-	 * @return bool|string
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _save($fp, $dir, $name, $stat) {
@@ -1231,7 +1230,7 @@ 
 	 * @param  array   $files  files names list
 	 * @param  string  $name   archive name
 	 * @param  array   $arc    archiver options
-	 * @return string|bool
+	 * @return false|string
 	 * @author Dmitry (dio) Levashov,
 	 * @author Alexey Sukhotin
 	 **/
@@ -1350,9 +1349,9 @@ 
 	 * Downloads specified files from remote directory
 	 * if there is a directory among files it is downloaded recursively (omitting symbolic links).
 	 * 
-	 * @param $remote_directory string remote FTP path to a source directory to download from.
+	 * @param string $remote_directory string remote FTP path to a source directory to download from.
 	 * @param array $files list of files to download from remote directory.
-	 * @param $dest_local_directory string destination folder to store downloaded files.
+	 * @param string $dest_local_directory string destination folder to store downloaded files.
 	 * @return bool true on success and false on failure.
 	 */
 	private function ftp_download_files($remote_directory, array $files, $dest_local_directory)
@@ -1423,6 +1422,7 @@ 
 	 * Returns array of strings containing all files and folders in the specified local directory.
 	 * @param $dir
 	 * @param string $prefix
+	 * @param boolean $omitSymlinks
 	 * @internal param string $path path to directory to scan.
 	 * @return array array of files and folders names relative to the $path
 	 * or an empty array if the directory $path is empty,

Spacing +52 added lines, -52 removed lines

@@ -103,7 +103,7 @@ 
 		);
 		$this->options = array_merge($this->options, $opts); 
 		$this->options['mimeDetect'] = 'internal';
-		$this->options['maxArcFilesSize'] = 0;     // max allowed archive files size (0 - no limit)
+		$this->options['maxArcFilesSize'] = 0; // max allowed archive files size (0 - no limit)
 	}
 	
 	/**
@@ -163,7 +163,7 @@ 
 		$scheme = parse_url($this->options['host'], PHP_URL_SCHEME);
 
 		if ($scheme) {
-			$this->options['host'] = substr($this->options['host'], strlen($scheme)+3);
+			$this->options['host'] = substr($this->options['host'], strlen($scheme) + 3);
 		}
 
 		// normalize root path
@@ -235,11 +235,11 @@ 
 		if ($this->encoding) {
 			@ftp_exec($this->connect, 'OPTS UTF8 OFF');
 		} else {
-			@ftp_exec($this->connect, 'OPTS UTF8 ON' );
+			@ftp_exec($this->connect, 'OPTS UTF8 ON');
 		}
 		
 		// switch off extended passive mode - may be usefull for some servers
-		@ftp_exec($this->connect, 'epsv4 off' );
+		@ftp_exec($this->connect, 'epsv4 off');
 		// enter passive mode if required
 		ftp_pasv($this->connect, $this->options['mode'] == 'passive');
 
@@ -307,7 +307,7 @@ 
 		$name = $info[8];
 		
 		if (preg_match('|(.+)\-\>(.+)|', $name, $m)) {
-			$name   = trim($m[1]);
+			$name = trim($m[1]);
 			// check recursive processing
 			if ($this->cacheDirTarget && $this->_joinPath($base, $name) !== $this->cacheDirTarget) {
 				return array();
@@ -343,7 +343,7 @@ 
 			$stat['owner'] = $info[2];
 			$stat['group'] = $info[3];
 			$stat['perm']  = substr($info[0], 1);
-			$stat['isowner'] = $stat['owner']? ($stat['owner'] == $this->options['user']) : $this->options['owner'];
+			$stat['isowner'] = $stat['owner'] ? ($stat['owner'] == $this->options['user']) : $this->options['owner'];
 		}
 		
 		$perm = $this->parsePermissions($info[0], $stat['owner']);
@@ -375,7 +375,7 @@ 
 			$info[4] = 0;
 			$info[0] = 'drwxr-xr-x';
 		} else {
-			$info[4] = (int)$size;
+			$info[4] = (int) $size;
 			$info[0] = '-rw-r--r--';
 		}
 		return $info;
@@ -391,7 +391,7 @@ 
 	protected function parsePermissions($perm, $user = '') {
 		$res   = array();
 		$parts = array();
-		$owner = $user? ($user == $this->options['user']) : $this->options['owner'];
+		$owner = $user ? ($user == $this->options['user']) : $this->options['owner'];
 		for ($i = 0, $l = strlen($perm); $i < $l; $i++) {
 			$parts[] = substr($perm, $i, 1);
 		}
@@ -422,10 +422,10 @@ 
 			}
 		}
 		$list = $this->convEncOut($list);
-		$prefix = ($path === $this->separator)? $this->separator : $path . $this->separator;
+		$prefix = ($path === $this->separator) ? $this->separator : $path.$this->separator;
 		$targets = array();
-		foreach($list as $stat) {
-			$p = $prefix . $stat['name'];
+		foreach ($list as $stat) {
+			$p = $prefix.$stat['name'];
 			if (isset($stat['target'])) {
 				// stat later
 				$targets[$stat['name']] = $stat['target'];
@@ -437,10 +437,10 @@ 
 			}
 		}
 		// stat link targets
-		foreach($targets as $name => $target) {
+		foreach ($targets as $name => $target) {
 			$stat = array();
 			$stat['name'] = $name;
-			$p = $prefix . $name;
+			$p = $prefix.$name;
 			$cacheDirTarget = $this->cacheDirTarget;
 			$this->cacheDirTarget = $this->convEncIn($target, true);
 			if ($tstat = $this->stat($target)) {
@@ -449,12 +449,12 @@ 
 				$stat['thash'] = $tstat['hash'];
 				$stat['mime']  = $tstat['mime'];
 				$stat['read']  = $tstat['read'];
-				$stat['write']  = $tstat['write'];
+				$stat['write'] = $tstat['write'];
 				
-				if (isset($tstat['ts']))      { $stat['ts']      = $tstat['ts']; }
-				if (isset($tstat['owner']))   { $stat['owner']   = $tstat['owner']; }
-				if (isset($tstat['group']))   { $stat['group']   = $tstat['group']; }
- 				if (isset($tstat['perm']))    { $stat['perm']    = $tstat['perm']; }
+				if (isset($tstat['ts'])) { $stat['ts']      = $tstat['ts']; }
+				if (isset($tstat['owner'])) { $stat['owner']   = $tstat['owner']; }
+				if (isset($tstat['group'])) { $stat['group']   = $tstat['group']; }
+ 				if (isset($tstat['perm'])) { $stat['perm']    = $tstat['perm']; }
  				if (isset($tstat['isowner'])) { $stat['isowner'] = $tstat['isowner']; }
 			} else {
 				
@@ -567,7 +567,7 @@ 
 		$comps = $new_comps;
 		$path = implode($this->separator, $comps);
 		if ($initial_slashes) {
-			$path = str_repeat($this->separator, $initial_slashes) . $path;
+			$path = str_repeat($this->separator, $initial_slashes).$path;
 		}
 		
 		return $path ? $path : '.';
@@ -633,7 +633,7 @@ 
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _inpath($path, $parent) {
-		return $path == $parent || strpos($path, $parent. $this->separator) === 0;
+		return $path == $parent || strpos($path, $parent.$this->separator) === 0;
 	}
 	
 	/***************** file stat ********************/
@@ -672,9 +672,9 @@ 
 				);
 			}
 			$this->cacheDir($this->convEncOut($this->_dirname($path)));
-			return $this->convEncIn(isset($this->cache[$outPath])? $this->cache[$outPath] : array());
+			return $this->convEncIn(isset($this->cache[$outPath]) ? $this->cache[$outPath] : array());
 		}
-		$raw = ftp_raw($this->connect, 'MLST ' . $path);
+		$raw = ftp_raw($this->connect, 'MLST '.$path);
 		if (is_array($raw) && count($raw) > 1 && substr(trim($raw[0]), 0, 1) == 2) {
 			$parts = explode(';', trim($raw[1]));
 			array_pop($parts);
@@ -704,8 +704,8 @@ 
 
 					case 'perm':
 						$val = strtolower($val);
-						$stat['read']  = (int)preg_match('/e|l|r/', $val);
-						$stat['write'] = (int)preg_match('/w|m|c/', $val);
+						$stat['read']  = (int) preg_match('/e|l|r/', $val);
+						$stat['write'] = (int) preg_match('/w|m|c/', $val);
 						if (!preg_match('/f|d/', $val)) {
 							$stat['locked'] = 1;
 						}
@@ -790,7 +790,7 @@ 
 			if (!$this->ftpOsUnix) {
 				$info = $this->normalizeRawWindows($str);
 			}
-			$name = isset($info[8])? trim($info[8]) : '';
+			$name = isset($info[8]) ? trim($info[8]) : '';
 			if ($name && $name !== '.' && $name !== '..' && substr(strtolower($info[0]), 0, 1) === 'd') {
 				return true;
 			}
@@ -845,7 +845,7 @@ 
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fopen($path, $mode='rb') {
+	protected function _fopen($path, $mode = 'rb') {
 		
 		if ($this->tmp) {
 			$local = $this->getTempFile($path);
@@ -869,7 +869,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fclose($fp, $path='') {
+	protected function _fclose($fp, $path = '') {
 		@fclose($fp);
 		if ($path) {
 			@unlink($this->getTempFile($path));
@@ -1044,7 +1044,7 @@ 
 			if (@file_put_contents($local, $content, LOCK_EX) !== false
 			&& ($fp = @fopen($local, 'rb'))) {
 				clearstatcache();
-				$res  = ftp_fput($this->connect, $path, $fp, $this->ftpMode($path));
+				$res = ftp_fput($this->connect, $path, $fp, $this->ftpMode($path));
 				@fclose($fp);
 			}
 			file_exists($local) && @unlink($local);
@@ -1069,7 +1069,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));
 		return @ftp_chmod($this->connect, $modeOct, $path);
 	}
 
@@ -1122,7 +1122,7 @@ 
 		}
 
 		$basename = $this->_basename($path);
-		$localPath = $dir . DIRECTORY_SEPARATOR . $basename;
+		$localPath = $dir.DIRECTORY_SEPARATOR.$basename;
 
 		if (!ftp_get($this->connect, $localPath, $path, FTP_BINARY)) {
 			//cleanup
@@ -1159,7 +1159,7 @@ 
 		
 		// archive contains one item - extract in archive dir
 		$name = '';
-		$src = $dir . DIRECTORY_SEPARATOR . $filesToProcess[0];
+		$src = $dir.DIRECTORY_SEPARATOR.$filesToProcess[0];
 		if (($extractTo === 'auto' || !$extractTo) && count($filesToProcess) === 1 && is_file($src)) {
 			$name = $filesToProcess[0];
 		} else if ($extractTo === 'auto' || $extractTo) {
@@ -1168,7 +1168,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 = $this->_joinPath(dirname($path), $name);
 			if ($this->stat($test)) {
@@ -1179,7 +1179,7 @@ 
 		if ($name !== '' && is_file($src)) {
 			$result = $this->_joinPath(dirname($path), $name);
 
-			if (! ftp_put($this->connect, $result, $src, FTP_BINARY)) {
+			if (!ftp_put($this->connect, $result, $src, FTP_BINARY)) {
 				$this->rmdirRecursive($dir);
 				return false;
 			}
@@ -1193,19 +1193,19 @@ 
 				}
 				$result[] = $dstDir;
 			}
-			foreach($filesToProcess as $name) {
+			foreach ($filesToProcess as $name) {
 				$name = rtrim($name, DIRECTORY_SEPARATOR);
-				$src = $dir . DIRECTORY_SEPARATOR . $name;
+				$src = $dir.DIRECTORY_SEPARATOR.$name;
 				if (is_dir($src)) {
 					$p = dirname($name);
 					$name = basename($name);
-					if (! $target = $this->_mkdir($this->_joinPath($dstDir, $p), $name)) {
+					if (!$target = $this->_mkdir($this->_joinPath($dstDir, $p), $name)) {
 						$this->rmdirRecursive($dir);
 						return false;
 					}
 				} else {
 					$target = $this->_joinPath($dstDir, $name);
-					if (! ftp_put($this->connect, $target, $src, FTP_BINARY)) {
+					if (!ftp_put($this->connect, $target, $src, FTP_BINARY)) {
 						$this->rmdirRecursive($dir);
 						return false;
 					}
@@ -1221,7 +1221,7 @@ 
 		is_dir($dir) && $this->rmdirRecursive($dir);
 		
 		$this->clearcache();
-		return $result? $result : false;
+		return $result ? $result : false;
 	}
 
 	/**
@@ -1261,7 +1261,7 @@ 
 		}
 
 		//cleanup
-		if(!$this->rmdirRecursive($tmpDir)) {
+		if (!$this->rmdirRecursive($tmpDir)) {
 			return false;
 		}
 
@@ -1365,7 +1365,7 @@ 
 		$remoteDirLen = strlen($remote_directory);
 		foreach ($contents as $item) {
 			$relative_path = substr($item['path'], $remoteDirLen);
-			$local_path = $dest_local_directory . DIRECTORY_SEPARATOR . $relative_path;
+			$local_path = $dest_local_directory.DIRECTORY_SEPARATOR.$relative_path;
 			switch ($item['type']) {
 				case 'd':
 					$success = mkdir($local_path);
@@ -1396,8 +1396,8 @@ 
 		} else {
 			$success = true;
 			foreach (array_reverse(elFinderVolumeFTP::listFilesInDirectory($dirPath, false)) as $path) {
-				$path = $dirPath . DIRECTORY_SEPARATOR . $path;
-				if(is_link($path)) {
+				$path = $dirPath.DIRECTORY_SEPARATOR.$path;
+				if (is_link($path)) {
 					unlink($path);
 				} else if (is_dir($path)) {
 					$success = rmdir($path);
@@ -1408,11 +1408,11 @@ 
 					break;
 				}
 			}
-			if($success) {
+			if ($success) {
 				$success = rmdir($dirPath);
 			}
 		}
-		if(!$success) {
+		if (!$success) {
 			$this->setError(elFinder::ERROR_RM, $dirPath);
 			return false;
 		}
@@ -1434,25 +1434,25 @@ 
 		if (!is_dir($dir)) {
 			return false;
 		}
-		$excludes = array(".","..");
+		$excludes = array(".", "..");
 		$result = array();
 		$files = scandir($dir);
-		if(!$files) {
+		if (!$files) {
 			return array();
 		}
-		foreach($files as $file) {
-			if(!in_array($file, $excludes)) {
+		foreach ($files as $file) {
+			if (!in_array($file, $excludes)) {
 				$path = $dir.DIRECTORY_SEPARATOR.$file;
-				if(is_link($path)) {
-					if($omitSymlinks) {
+				if (is_link($path)) {
+					if ($omitSymlinks) {
 						continue;
 					} else {
 						$result[] = $prefix.$file;
 					}
-				} else if(is_dir($path)) {
+				} else if (is_dir($path)) {
 					$result[] = $prefix.$file.DIRECTORY_SEPARATOR;
 					$subs = elFinderVolumeFTP::listFilesInDirectory($path, $omitSymlinks, $prefix.$file.DIRECTORY_SEPARATOR);
-					if($subs) {
+					if ($subs) {
 						$result = array_merge($result, $subs);
 					}
 					

php/elFinderVolumeLocalFileSystem.class.php

Doc Comments +7 added lines, -8 removed lines

@@ -593,7 +593,6 @@ 
 	 * Open file and return file pointer
 	 *
 	 * @param  string  $path  file path
-	 * @param  bool    $write open file for writing
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
@@ -619,7 +618,7 @@ 
 	 *
 	 * @param  string  $path  parent dir path
 	 * @param string  $name  new directory name
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _mkdir($path, $name) {
@@ -639,7 +638,7 @@ 
 	 *
 	 * @param  string  $path  parent dir path
 	 * @param string  $name  new file name
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _mkfile($path, $name) {
@@ -687,9 +686,9 @@ 
 	 * Return new file path or false.
 	 *
 	 * @param  string  $source  source file path
-	 * @param  string  $target  target dir path
+	 * @param  string  $targetDir  target dir path
 	 * @param  string  $name    file name
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _move($source, $targetDir, $name) {
@@ -733,7 +732,7 @@ 
 	 * @param  string    $dir  target dir path
 	 * @param  string    $name file name
 	 * @param  array     $stat file stat (required by some virtual fs)
-	 * @return bool|string
+	 * @return false|string
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _save($fp, $dir, $name, $stat) {
@@ -761,7 +760,7 @@ 
 	 * Get file contents
 	 *
 	 * @param  string  $path  file path
-	 * @return string|false
+	 * @return string
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _getContents($path) {
@@ -965,7 +964,7 @@ 
 	 * @param  array   $files  files names list
 	 * @param  string  $name   archive name
 	 * @param  array   $arc    archiver options
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov, 
 	 * @author Alexey Sukhotin
 	 **/

Spacing +33 added lines, -33 removed lines

@@ -32,11 +32,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';
 	}
 	
@@ -53,7 +53,7 @@ 
 	protected function init() {
 		// Normalize directory separator for windows
 		if (DIRECTORY_SEPARATOR !== '/') {
-			foreach(array('path', 'tmpPath', 'quarantine') as $key) {
+			foreach (array('path', 'tmpPath', 'quarantine') as $key) {
 				if ($this->options[$key]) {
 					$this->options[$key] = str_replace('/', DIRECTORY_SEPARATOR, $this->options[$key]);
 				}
@@ -99,7 +99,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 .= '/';
 				}
@@ -175,7 +175,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;
 	}
 	
 	/**
@@ -227,7 +227,7 @@ 
 		$comps = $new_comps;
 		$path = implode('/', $comps);
 		if ($initial_slashes) {
-			$path = str_repeat('/', $initial_slashes) . $path;
+			$path = str_repeat('/', $initial_slashes).$path;
 		}
 		
 		if ($changeSep) {
@@ -298,7 +298,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;
@@ -357,7 +357,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']);
@@ -373,7 +373,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));
 		}
 		
@@ -383,8 +383,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;
@@ -453,7 +453,7 @@ 
 	protected function _subdirs($path) {
 
 		if (is_dir($path)) {
-			return (bool)glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*', GLOB_ONLYDIR);
+			return (bool) glob(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*', GLOB_ONLYDIR);
 		}
 		return false;
 	}
@@ -534,7 +534,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']);
@@ -559,13 +559,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;
@@ -581,7 +581,7 @@ 
 		
 		if ($cache) {
 			$cache = $this->convEncOut($cache, false);
-			foreach($cache as $d) {
+			foreach ($cache as $d) {
 				$this->updateCache($d[0], $d[1]);
 			}
 		}
@@ -597,7 +597,7 @@ 
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fopen($path, $mode='rb') {
+	protected function _fopen($path, $mode = 'rb') {
 		return @fopen($path, $mode);
 	}
 	
@@ -608,7 +608,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fclose($fp, $path='') {
+	protected function _fclose($fp, $path = '') {
 		return @fclose($fp);
 	}
 	
@@ -740,7 +740,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);
 			if (!@rename($uri, $path) && !@copy($uri, $path)) {
@@ -800,7 +800,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;
@@ -918,7 +918,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)) {
@@ -927,9 +927,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;
 				}
@@ -937,7 +937,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);
@@ -1013,14 +1013,14 @@ 
 		$result = array();
 	
 		$path = $this->convEncIn($path);
-		$dirs = glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*', GLOB_ONLYDIR);
-		$match = glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*'.$q.'*', GLOB_NOSORT);
+		$dirs = glob(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*', GLOB_ONLYDIR);
+		$match = glob(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*'.$q.'*', GLOB_NOSORT);
 		if ($dirs) {
 			$dirs = $this->convEncOut($dirs, false);
 		} 
 		$match = $this->convEncOut($match);
 		if ($match) {
-			foreach($match as $p) {
+			foreach ($match as $p) {
 				$stat = $this->stat($p);
 		
 				if (!$stat) { // invalid links
@@ -1040,7 +1040,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;
@@ -1048,7 +1048,7 @@ 
 			}
 		}
 		if ($dirs) {
-			foreach($dirs as $dir) {
+			foreach ($dirs as $dir) {
 				$stat = $this->stat($dir);
 				if ($stat['read'] && !isset($stat['alias'])) {
 					@set_time_limit(30);

php/elFinderVolumeMySQL.class.php

Doc Comments +7 added lines, -7 removed lines

@@ -611,7 +611,7 @@ 
 	 * Close opened file
 	 *
 	 * @param  resource  $fp  file pointer
-	 * @return bool
+	 * @return boolean|null
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _fclose($fp, $path='') {
@@ -628,7 +628,7 @@ 
 	 *
 	 * @param  string  $path  parent dir path
 	 * @param string  $name  new directory name
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _mkdir($path, $name) {
@@ -640,7 +640,7 @@ 
 	 *
 	 * @param  string  $path  parent dir path
 	 * @param string  $name  new file name
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _mkfile($path, $name) {
@@ -684,9 +684,9 @@ 
 	 * Return new file path or false.
 	 *
 	 * @param  string  $source  source file path
-	 * @param  string  $target  target dir path
+	 * @param  string  $targetDir  target dir path
 	 * @param  string  $name    file name
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _move($source, $targetDir, $name) {
@@ -869,7 +869,7 @@ 
 	 *
 	 * @param  string  $path  archive path
 	 * @param  array   $arc   archiver command and arguments (same as in $this->archivers)
-	 * @return true
+	 * @return boolean
 	 * @author Dmitry (dio) Levashov, 
 	 * @author Alexey Sukhotin
 	 **/
@@ -884,7 +884,7 @@ 
 	 * @param  array   $files  files names list
 	 * @param  string  $name   archive name
 	 * @param  array   $arc    archiver options
-	 * @return string|bool
+	 * @return boolean
 	 * @author Dmitry (dio) Levashov, 
 	 * @author Alexey Sukhotin
 	 **/

Spacing +6 added lines, -6 removed lines

@@ -311,7 +311,7 @@ 
 		$dirs = array();
 		if ($path != $this->root) {
 			$inpath = array(intval($path));
-			while($inpath) {
+			while ($inpath) {
 				$in = '('.join(',', $inpath).')';
 				$inpath = array();
 				$sql = 'SELECT f.id FROM %s AS f WHERE f.parent_id IN '.$in.' AND `mime` = \'directory\'';
@@ -330,7 +330,7 @@ 
 		
 		if ($mimes) {
 			$whrs = array();
-			foreach($mimes as $mime) {
+			foreach ($mimes as $mime) {
 				if (strpos($mime, '/') === false) {
 					$whrs[] = sprintf('f.mime LIKE "%s/%%"', $this->db->real_escape_string($mime));
 				} else {
@@ -342,7 +342,7 @@ 
 			$whr = sprintf('f.name RLIKE "%s"', $this->db->real_escape_string($q));
 		}
 		if ($dirs) {
-			$whr = '(' . $whr . ') AND (`parent_id` IN (' . join(',', $dirs) . '))';
+			$whr = '('.$whr.') AND (`parent_id` IN ('.join(',', $dirs).'))';
 		}
 		
 		$sql = 'SELECT f.id, f.parent_id, f.name, f.size, f.mtime AS ts, f.mime, f.read, f.write, f.locked, f.hidden, f.width, f.height, 0 AS dirs 
@@ -587,7 +587,7 @@ 
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fopen($path, $mode='rb') {
+	protected function _fopen($path, $mode = 'rb') {
 		$fp = $this->tmbPath
 			? @fopen($this->getTempFile($path), 'w+')
 			: @tmpfile();
@@ -614,7 +614,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fclose($fp, $path='') {
+	protected function _fclose($fp, $path = '') {
 		@fclose($fp);
 		if ($path) {
 			@unlink($this->getTempFile($path));
@@ -746,7 +746,7 @@ 
 		$this->clearcache();
 		
 		$mime = $stat['mime'];
-		$w = !empty($stat['width'])  ? $stat['width']  : 0;
+		$w = !empty($stat['width']) ? $stat['width'] : 0;
 		$h = !empty($stat['height']) ? $stat['height'] : 0;
 		
 		$id = $this->_joinPath($dir, $name);

php/elFinderVolumeS3.class.php

Doc Comments +7 added lines, -8 removed lines

@@ -368,7 +368,6 @@ 
 	 * Open file and return file pointer

 	 *

 	 * @param  string  $path  file path

-	 * @param  bool    $write open file for writing

 	 * @return resource|false

 	 * @author Dmitry (dio) Levashov,

 	 * @author Alexey Sukhotin

@@ -407,7 +406,7 @@ 
 	 * 

 	 * @param  resource  $fp    file pointer

 	 * @param  string    $path  file path

-	 * @return bool

+	 * @return boolean|null

 	 * @author Dmitry (dio) Levashov

 	 **/

 	protected function _fclose($fp, $path='') {

@@ -492,7 +491,7 @@ 
 	 * Copy file into another file (only inside one volume)

 	 *

 	 * @param  string  $source  source file path

-	 * @param  string  $target  target dir path

+	 * @param  string  $targetDir  target dir path

 	 * @param  string  $name    file name

 	 * @return bool

 	 * @author Dmitry (dio) Levashov

@@ -506,9 +505,9 @@ 
 	 * Return new file path or false.

 	 *

 	 * @param  string  $source  source file path

-	 * @param  string  $target  target dir path

+	 * @param  string  $targetDir  target dir path

 	 * @param  string  $name    file name

-	 * @return string|bool

+	 * @return boolean

 	 * @author Dmitry (dio) Levashov

 	 **/

 	protected function _move($source, $targetDir, $name) {

@@ -573,7 +572,7 @@ 
 	 * @param  resource  $fp   file pointer

 	 * @param  string    $dir  target dir path

 	 * @param  string    $name file name

-	 * @return bool|string

+	 * @return boolean

 	 * @author Dmitry (dio) Levashov

 	 **/

 	protected function _save($fp, $dir, $name, $mime, $stat) {

@@ -584,7 +583,7 @@ 
 	 * Get file contents

 	 *

 	 * @param  string  $path  file path

-	 * @return string|false

+	 * @return boolean

 	 * @author Dmitry (dio) Levashov

 	 **/

 	protected function _getContents($path) {

@@ -623,7 +622,7 @@ 
 	 * @param  array   $files  files names list

 	 * @param  string  $name   archive name

 	 * @param  array   $arc    archiver options

-	 * @return string|bool

+	 * @return boolean

 	 * @author Dmitry (dio) Levashov, 

 	 * @author Alexey Sukhotin

 	 **/

Spacing +20 added lines, -20 removed lines

@@ -61,8 +61,8 @@ 
 	 **/

 	protected function _dirname($path) {

 	

-		$newpath =  preg_replace("/\/$/", "", $path);

-		$dn = substr($path, 0, strrpos($newpath, '/')) ;

+		$newpath = preg_replace("/\/$/", "", $path);

+		$dn = substr($path, 0, strrpos($newpath, '/'));

 		

 		if (substr($dn, 0, 1) != '/') {

 		 $dn = "/$dn";

@@ -105,9 +105,9 @@ 
 	 * @author Troex Nevelin

 	 **/

 	protected function _normpath($path) {

-		$tmp =  preg_replace("/^\//", "", $path);

-		$tmp =  preg_replace("/\/\//", "/", $tmp);

-		$tmp =  preg_replace("/\/$/", "", $tmp);

+		$tmp = preg_replace("/^\//", "", $path);

+		$tmp = preg_replace("/\/\//", "/", $tmp);

+		$tmp = preg_replace("/\/$/", "", $tmp);

 		return $tmp;

 	}

 

@@ -128,9 +128,9 @@ 
 			$newpath = "/$newpath";

 		}

 		

-		$newpath =  preg_replace("/\/$/", "", $newpath);

+		$newpath = preg_replace("/\/$/", "", $newpath);

 	

-		$ret = ($newpath == $this->root) ? '' : substr($newpath, strlen($this->root)+1);

+		$ret = ($newpath == $this->root) ? '' : substr($newpath, strlen($this->root) + 1);

 		

 		return $ret;

 	}

@@ -231,7 +231,7 @@ 
 		$np = $this->_normpath($path);

 		

 		try {

-			$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $np , 'GetMetadata' => true, 'InlineData' => false, 'GetData' => false));

+			$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $np, 'GetMetadata' => true, 'InlineData' => false, 'GetData' => false));

 		} catch (Exception $e) {

 		

 		}

@@ -239,7 +239,7 @@ 
 		if (!isset($obj) || ($obj->GetObjectResponse->Status->Code != 200)) {

 			$np .= '/';

 			try {

-				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $np , 'GetMetadata' => true, 'InlineData' => false, 'GetData' => false));

+				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $np, 'GetMetadata' => true, 'InlineData' => false, 'GetData' => false));

 			} catch (Exception $e) {

 		

 			}

@@ -341,14 +341,14 @@ 
 	 **/

 	protected function _scandir($path) {

 		

-		$s3path = preg_replace("/^\//", "", $path) . '/';

+		$s3path = preg_replace("/^\//", "", $path).'/';

 		

 		$files = $this->s3->ListBucket(array('Bucket' => $this->options['bucket'], 'delimiter' => '/', 'Prefix' => $s3path))->ListBucketResponse->Contents;

 	

 		$finalfiles = array();

 		

 		foreach ($files as $file) {

-			if (preg_match("|^" . $s3path . "[^/]*/?$|", $file->Key)) {

+			if (preg_match("|^".$s3path."[^/]*/?$|", $file->Key)) {

 				$fname = preg_replace("/\/$/", "", $file->Key);

 				$fname = $file->Key;

 				

@@ -373,7 +373,7 @@ 
 	 * @author Dmitry (dio) Levashov,

 	 * @author Alexey Sukhotin

 	 **/

-	protected function _fopen($path, $mode="rb") {

+	protected function _fopen($path, $mode = "rb") {

 	

 		$tn = $this->getTempFile($path);

 	

@@ -385,8 +385,8 @@ 
 		if ($fp) {

 

 			try {

-				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $this->_normpath($path) , 'GetMetadata' => true, 'InlineData' => true, 'GetData' => true));

-			}	catch (Exception $e) {

+				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $this->_normpath($path), 'GetMetadata' => true, 'InlineData' => true, 'GetData' => true));

+			} catch (Exception $e) {

 		

 			}

 				

@@ -410,7 +410,7 @@ 
 	 * @return bool

 	 * @author Dmitry (dio) Levashov

 	 **/

-	protected function _fclose($fp, $path='') {

+	protected function _fclose($fp, $path = '') {

 		@fclose($fp);

 		if ($path) {

 			@unlink($this->getTempFile($path));

@@ -435,7 +435,7 @@ 
 		$newkey = "$newkey/$name/";

 

 		try {

-			$obj = $this->s3->PutObjectInline(array('Bucket' => $this->options['bucket'], 'Key' => $newkey , 'ContentLength' => 0, 'Data' => ''));

+			$obj = $this->s3->PutObjectInline(array('Bucket' => $this->options['bucket'], 'Key' => $newkey, 'ContentLength' => 0, 'Data' => ''));

 		} catch (Exception $e) {

 		

 		}

@@ -462,7 +462,7 @@ 
 		$newkey = "$newkey/$name";

 

 		try {

-			$obj = $this->s3->PutObjectInline(array('Bucket' => $this->options['bucket'], 'Key' => $newkey , 'ContentLength' => 0, 'Data' => '', 'Metadata' => array(array('Name' => 'Content-Type', 'Value' => 'text/plain'))));

+			$obj = $this->s3->PutObjectInline(array('Bucket' => $this->options['bucket'], 'Key' => $newkey, 'ContentLength' => 0, 'Data' => '', 'Metadata' => array(array('Name' => 'Content-Type', 'Value' => 'text/plain'))));

 		} catch (Exception $e) {

 		

 		}

@@ -563,7 +563,7 @@ 
 	 * @author Dmitry (dio) Levashov

 	 **/

 	protected function _rmdir($path) {

-		return $this->_unlink($path . '/');

+		return $this->_unlink($path.'/');

 	}

 

 	/**

@@ -682,7 +682,7 @@ 
 		/* Getting list of S3 web service functions which requires signing */

 		$funcs = $this->__getFunctions();

 		

-		$funcnames  = array();

+		$funcnames = array();

 		

 		foreach ($funcs as $func) {

 			preg_match("/\S+\s+([^\)]+)\(/", $func, $m);

@@ -723,7 +723,7 @@ 
 			'Timestamp' => gmdate('Y-m-d\TH:i:s.000\Z'),

 		);

 

-		$sign_str = 'AmazonS3' . $operation . $params['Timestamp'];

+		$sign_str = 'AmazonS3'.$operation.$params['Timestamp'];

 		

 		$params['Signature'] = base64_encode(hash_hmac('sha1', $sign_str, $this->secretkey, TRUE));

 		

Braces +1 added lines, -1 removed lines

@@ -386,7 +386,7 @@
 

 			try {

 				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $this->_normpath($path) , 'GetMetadata' => true, 'InlineData' => true, 'GetData' => true));

-			}	catch (Exception $e) {

+			} catch (Exception $e) {

 		

 			}

 				

php/plugins/AutoResize/plugin.php

Doc Comments +8 added lines

@@ -107,6 +107,10 @@ 
 		}
 	}
 	
+	/**
+	 * @param double $width
+	 * @param double $height
+	 */
 	private function resize_gd($src, $width, $height, $quality, $srcImgInfo) {
 		switch ($srcImgInfo['mime']) {
 			case 'image/gif':
@@ -177,6 +181,10 @@ 
 		return false;
 	}
 	
+	/**
+	 * @param double $width
+	 * @param double $height
+	 */
 	private function resize_imagick($src, $width, $height, $quality) {
 		try {
 			$img = new imagick($src);

Spacing +13 added lines, -13 removed lines

@@ -50,11 +50,11 @@ 
 
 	public function __construct($opts) {
 		$defaults = array(
-			'enable'         => true,       // For control by volume driver
-			'maxWidth'       => 1024,       // Path to Water mark image
-			'maxHeight'      => 1024,       // Margin right pixel
-			'quality'        => 95,         // JPEG image save quality
-			'targetType'     => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP // Target image formats ( bit-field )
+			'enable'         => true, // For control by volume driver
+			'maxWidth'       => 1024, // Path to Water mark image
+			'maxHeight'      => 1024, // Margin right pixel
+			'quality'        => 95, // JPEG image save quality
+			'targetType'     => IMG_GIF | IMG_JPG | IMG_PNG | IMG_WBMP // Target image formats ( bit-field )
 		);
 
 		$this->opts = array_merge($defaults, $opts);
@@ -68,7 +68,7 @@ 
 			$opts = array_merge($this->opts, $volOpts);
 		}
 		
-		if (! $opts['enable']) {
+		if (!$opts['enable']) {
 			return false;
 		}
 		
@@ -84,7 +84,7 @@ 
 				IMAGETYPE_PNG => IMG_PNG,
 				IMAGETYPE_WBMP => IMG_WBMP,
 		);
-		if (! ($opts['targetType'] & $imgTypes[$srcImgInfo[2]])) {
+		if (!($opts['targetType'] & $imgTypes[$srcImgInfo[2]])) {
 			return false;
 		}
 		
@@ -96,9 +96,9 @@ 
 	}
 	
 	private function resize($src, $srcImgInfo, $maxWidth, $maxHeight, $quality) {
-		$zoom = min(($maxWidth/$srcImgInfo[0]),($maxHeight/$srcImgInfo[1]));
-		$width = round($srcImgInfo[0] * $zoom);
-		$height = round($srcImgInfo[1] * $zoom);
+		$zoom = min(($maxWidth/$srcImgInfo[0]), ($maxHeight/$srcImgInfo[1]));
+		$width = round($srcImgInfo[0]*$zoom);
+		$height = round($srcImgInfo[1]*$zoom);
 		
 		if (class_exists('Imagick')) {
 			return $this->resize_imagick($src, $width, $height, $quality);
@@ -118,14 +118,14 @@ 
 				break;
 			case 'image/jpeg':
 				if (@imagetypes() & IMG_JPG) {
-					$oSrcImg = @imagecreatefromjpeg($src) ;
+					$oSrcImg = @imagecreatefromjpeg($src);
 				} else {
 					$ermsg = 'JPEG images are not supported';
 				}
 				break;
 			case 'image/png':
 				if (@imagetypes() & IMG_PNG) {
-					$oSrcImg = @imagecreatefrompng($src) ;
+					$oSrcImg = @imagecreatefrompng($src);
 				} else {
 					$ermsg = 'PNG images are not supported';
 				}
@@ -143,7 +143,7 @@ 
 				break;
 		}
 		
-		if ($oSrcImg &&  false != ($tmp = imagecreatetruecolor($width, $height))) {
+		if ($oSrcImg && false != ($tmp = imagecreatetruecolor($width, $height))) {
 			
 			if (!imagecopyresampled($tmp, $oSrcImg, 0, 0, 0, 0, $width, $height, $srcImgInfo[0], $srcImgInfo[1])) {
 				return false;

Indentation +44 added lines, -44 removed lines

@@ -1,49 +1,49 @@
 <?php
 /**
- * elFinder Plugin AutoResize
- *
- * Auto resize on file upload.
- *
- * ex. binding, configure on connector options
- *	$opts = array(
- *		'bind' => array(
- *			'upload.presave' => array(
- *				'Plugin.AutoResize.onUpLoadPreSave'
- *			)
- *		),
- *		// global configure (optional)
- *		'plugin' => array(
- *			'PluginAutoResize' => array(
- *				'enable'         => true,       // For control by volume driver
- *				'maxWidth'       => 1024,       // Path to Water mark image
- *				'maxHeight'      => 1024,       // Margin right pixel
- *				'quality'        => 95,         // JPEG image save quality
- *				'targetType'     => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP // Target image formats ( bit-field )
- *			)
- *		),
- *		// each volume configure (optional)
- *		'roots' => array(
- *			array(
- *				'driver' => 'LocalFileSystem',
- *				'path'   => '/path/to/files/',
- *				'URL'    => 'http://localhost/to/files/'
- *				'plugin' => array(
- *					'PluginAutoResize' => array(
- *						'enable'         => true,       // For control by volume driver
- *						'maxWidth'       => 1024,       // Path to Water mark image
- *						'maxHeight'      => 1024,       // Margin right pixel
- *						'quality'        => 95,         // JPEG image save quality
- *						'targetType'     => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP // Target image formats ( bit-field )
- *					)
- *				)
- *			)
- *		)
- *	);
- *
- * @package elfinder
- * @author Naoki Sawada
- * @license New BSD
- */
+	 * elFinder Plugin AutoResize
+	 *
+	 * Auto resize on file upload.
+	 *
+	 * ex. binding, configure on connector options
+	 *	$opts = array(
+	 *		'bind' => array(
+	 *			'upload.presave' => array(
+	 *				'Plugin.AutoResize.onUpLoadPreSave'
+	 *			)
+	 *		),
+	 *		// global configure (optional)
+	 *		'plugin' => array(
+	 *			'PluginAutoResize' => array(
+	 *				'enable'         => true,       // For control by volume driver
+	 *				'maxWidth'       => 1024,       // Path to Water mark image
+	 *				'maxHeight'      => 1024,       // Margin right pixel
+	 *				'quality'        => 95,         // JPEG image save quality
+	 *				'targetType'     => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP // Target image formats ( bit-field )
+	 *			)
+	 *		),
+	 *		// each volume configure (optional)
+	 *		'roots' => array(
+	 *			array(
+	 *				'driver' => 'LocalFileSystem',
+	 *				'path'   => '/path/to/files/',
+	 *				'URL'    => 'http://localhost/to/files/'
+	 *				'plugin' => array(
+	 *					'PluginAutoResize' => array(
+	 *						'enable'         => true,       // For control by volume driver
+	 *						'maxWidth'       => 1024,       // Path to Water mark image
+	 *						'maxHeight'      => 1024,       // Margin right pixel
+	 *						'quality'        => 95,         // JPEG image save quality
+	 *						'targetType'     => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP // Target image formats ( bit-field )
+	 *					)
+	 *				)
+	 *			)
+	 *		)
+	 *	);
+	 *
+	 * @package elfinder
+	 * @author Naoki Sawada
+	 * @license New BSD
+	 */
 class elFinderPluginAutoResize {
 
 	private $opts = array();

php/chars-test.php

Spacing +2 added lines, -2 removed lines

@@ -24,10 +24,10 @@
 
 //                     й                 ё              Й               Ё              Ø         Å
 $patterns = array("\u0438\u0306", "\u0435\u0308", "\u0418\u0306", "\u0415\u0308", "\u00d8A", "\u030a");
-$replace  = array("\u0439",        "\u0451",       "\u0419",       "\u0401",       "\u00d8", "\u00c5");
+$replace  = array("\u0439", "\u0451", "\u0419", "\u0401", "\u00d8", "\u00c5");
 
 
-foreach(scandir($path) as $f) {
+foreach (scandir($path) as $f) {
 	if ($f != '.' && $f != '..' && substr($f, 0, 1) != '.') {
 		
 		// echo mb_detect_encoding($f);