EGroupware / egroupware

api/src/Vfs/StreamWrapper.php

Indentation +3 added lines, -3 removed lines

@@ -405,10 +405,10 @@ 
  	 * Important: PHP 5.0 introduced a bug that wasn't fixed until 5.1: the return value has to be the oposite!
  	 *
  	 * if(version_compare(PHP_VERSION,'5.0','>=') && version_compare(PHP_VERSION,'5.1','<'))
-  	 * {
+ 	 * {
  	 * 		$eof = !$eof;
  	 * }
-  	 *
+ 	 *
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
  	 */
 	function stream_eof ( )
@@ -916,7 +916,7 @@ 
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,'$url'): ".function_backtrace(1));
 
 		while (($rel_path = Vfs::basename($url).($rel_path ? '/'.$rel_path : '')) &&
-		       ($url = Vfs::dirname($url)))
+			   ($url = Vfs::dirname($url)))
 		{
 			if (($stat = $this->url_stat($url, 0, false, false)))
 			{

Spacing +132 added lines, -133 removed lines

@@ -157,14 +157,14 @@ 
 	 * @param array|boolean &$stat=null on return: stat of existing file or false for non-existing files
 	 * @return string|boolean false if the url cant be resolved, should not happen if fstab has a root entry
 	 */
-	function resolve_url_symlinks($_path,$file_exists=true,$resolve_last_symlink=true,&$stat=null)
+	function resolve_url_symlinks($_path, $file_exists = true, $resolve_last_symlink = true, &$stat = null)
 	{
 		$path = self::get_path($_path);
 
-		if (!($stat = $this->url_stat($path,$resolve_last_symlink?0:STREAM_URL_STAT_LINK)) && !$file_exists)
+		if (!($stat = $this->url_stat($path, $resolve_last_symlink ? 0 : STREAM_URL_STAT_LINK)) && !$file_exists)
 		{
 			$url = null;
-			$stat = self::check_symlink_components($path,0,$url);
+			$stat = self::check_symlink_components($path, 0, $url);
 			if (self::LOG_LEVEL > 1) $log = " (check_symlink_components('$path',0,'$url') = $stat)";
 		}
 		else
@@ -172,9 +172,9 @@ 
 			$url = $stat['url'];
 		}
 		// if the url resolves to a symlink to the vfs, resolve this vfs:// url direct
-		if ($url && Vfs::parse_url($url,PHP_URL_SCHEME) == self::SCHEME)
+		if ($url && Vfs::parse_url($url, PHP_URL_SCHEME) == self::SCHEME)
 		{
-			$url = self::resolve_url(Vfs::parse_url($url,PHP_URL_PATH));
+			$url = self::resolve_url(Vfs::parse_url($url, PHP_URL_PATH));
 		}
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,file_exists=$file_exists,resolve_last_symlink=$resolve_last_symlink) = '$url'$log");
 		return $url;
@@ -197,7 +197,7 @@ 
 	 * @param boolean $fix_url_query =false true append relativ path to url query parameter, default not
 	 * @return string|boolean false if the url cant be resolved, should not happen if fstab has a root entry
 	 */
-	static function resolve_url($_path,$do_symlink=true,$use_symlinkcache=true,$replace_user_pass_host=true,$fix_url_query=false)
+	static function resolve_url($_path, $do_symlink = true, $use_symlinkcache = true, $replace_user_pass_host = true, $fix_url_query = false)
 	{
 		$path = self::get_path($_path);
 
@@ -210,52 +210,52 @@ 
 		// check if we can already resolve path (or a part of it) with a known symlinks
 		if ($use_symlinkcache)
 		{
-			$path = self::symlinkCache_resolve($path,$do_symlink);
+			$path = self::symlinkCache_resolve($path, $do_symlink);
 		}
 		// setting default user, passwd and domain, if it's not contained int the url
-		static $defaults=null;
+		static $defaults = null;
 		if (is_null($defaults))
 		{
 			$defaults = array(
 				'user' => $GLOBALS['egw_info']['user']['account_lid'],
 				'pass' => urlencode($GLOBALS['egw_info']['user']['passwd']),
 				'host' => $GLOBALS['egw_info']['user']['domain'],
-				'home' => str_replace(array('\\\\','\\'),array('','/'),$GLOBALS['egw_info']['user']['homedirectory']),
+				'home' => str_replace(array('\\\\', '\\'), array('', '/'), $GLOBALS['egw_info']['user']['homedirectory']),
 			);
 		}
-		$parts = array_merge(Vfs::parse_url($path),$defaults);
-		if (!$parts['host']) $parts['host'] = 'default';	// otherwise we get an invalid url (scheme:///path/to/something)!
+		$parts = array_merge(Vfs::parse_url($path), $defaults);
+		if (!$parts['host']) $parts['host'] = 'default'; // otherwise we get an invalid url (scheme:///path/to/something)!
 
 		if (!empty($parts['scheme']) && $parts['scheme'] != self::SCHEME)
 		{
 			if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = '$path' (path is already an url)");
-			return $path;	// path is already a non-vfs url --> nothing to do
+			return $path; // path is already a non-vfs url --> nothing to do
 		}
 		if (empty($parts['path'])) $parts['path'] = '/';
 
-		foreach(array_reverse(self::$fstab) as $mounted => $url)
+		foreach (array_reverse(self::$fstab) as $mounted => $url)
 		{
-			if ($mounted == '/' || $mounted == $parts['path'] || $mounted.'/' == substr($parts['path'],0,strlen($mounted)+1))
+			if ($mounted == '/' || $mounted == $parts['path'] || $mounted.'/' == substr($parts['path'], 0, strlen($mounted) + 1))
 			{
-				$scheme = Vfs::parse_url($url,PHP_URL_SCHEME);
-				if (is_null(self::$wrappers) || !in_array($scheme,self::$wrappers))
+				$scheme = Vfs::parse_url($url, PHP_URL_SCHEME);
+				if (is_null(self::$wrappers) || !in_array($scheme, self::$wrappers))
 				{
 					self::load_wrapper($scheme);
 				}
-				if (($relative = substr($parts['path'],strlen($mounted))))
+				if (($relative = substr($parts['path'], strlen($mounted))))
 				{
-					$url = Vfs::concat($url,$relative);
+					$url = Vfs::concat($url, $relative);
 				}
 				// if url contains url parameter, eg. from filesystem streamwrapper, we need to append relative path here too
 				$matches = null;
 				if ($fix_url_query && preg_match('|([?&]url=)([^&]+)|', $url, $matches))
 				{
-					$url = str_replace($matches[0], $matches[1].Vfs::concat($matches[2], substr($parts['path'],strlen($mounted))), $url);
+					$url = str_replace($matches[0], $matches[1].Vfs::concat($matches[2], substr($parts['path'], strlen($mounted))), $url);
 				}
 
 				if ($replace_user_pass_host)
 				{
-					$url = str_replace(array('$user','$pass','$host','$home'),array($parts['user'],$parts['pass'],$parts['host'],$parts['home']),$url);
+					$url = str_replace(array('$user', '$pass', '$host', '$home'), array($parts['user'], $parts['pass'], $parts['host'], $parts['home']), $url);
 				}
 				if ($parts['query']) $url .= '?'.$parts['query'];
 				if ($parts['fragment']) $url .= '#'.$parts['fragment'];
@@ -268,7 +268,7 @@ 
 			}
 		}
 		if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path') can't resolve path!\n");
-		trigger_error(__METHOD__."($path) can't resolve path!\n",E_USER_WARNING);
+		trigger_error(__METHOD__."($path) can't resolve path!\n", E_USER_WARNING);
 		return false;
 	}
 
@@ -280,10 +280,10 @@ 
 	 */
 	static function mount_url($fullurl)
 	{
-		foreach(array_reverse(self::$fstab) as $url)
+		foreach (array_reverse(self::$fstab) as $url)
 		{
-			list($url_no_query) = explode('?',$url);
-			if (substr($fullurl,0,1+strlen($url_no_query)) === $url_no_query.'/')
+			list($url_no_query) = explode('?', $url);
+			if (substr($fullurl, 0, 1 + strlen($url_no_query)) === $url_no_query.'/')
 			{
 				return $url;
 			}
@@ -303,13 +303,13 @@ 
 	 * @param string $opened_path full path of the file/resource, if the open was successfull and STREAM_USE_PATH was set
 	 * @return boolean true if the ressource was opened successful, otherwise false
 	 */
-	function stream_open ( $path, $mode, $options, &$opened_path )
+	function stream_open($path, $mode, $options, &$opened_path)
 	{
-		unset($options,$opened_path);	// not used but required by function signature
+		unset($options, $opened_path); // not used but required by function signature
 		$this->opened_stream = null;
 
 		$stat = null;
-		if (!($url = $this->resolve_url_symlinks($path,$mode[0]=='r',true,$stat)))
+		if (!($url = $this->resolve_url_symlinks($path, $mode[0] == 'r', true, $stat)))
 		{
 			return false;
 		}
@@ -345,7 +345,7 @@ 
 	 *
 	 * VFS calls either "vfs_read", "vfs_added" or "vfs_modified" hook
 	 */
-	function stream_close ( )
+	function stream_close( )
 	{
 		$ret = fclose($this->opened_stream);
 		// clear PHP's stat cache, it contains wrong size of just closed file,
@@ -355,12 +355,11 @@ 
 		if (!class_exists('setup_process', false))
 		{
 			Api\Hooks::process(array(
-				'location' => str_replace('b','',$this->opened_stream_mode) == 'r' ? 'vfs_read' :
-					($this->opened_stream_is_new ? 'vfs_added' : 'vfs_modified'),
+				'location' => str_replace('b', '', $this->opened_stream_mode) == 'r' ? 'vfs_read' : ($this->opened_stream_is_new ? 'vfs_added' : 'vfs_modified'),
 				'path' => $this->opened_stream_path,
 				'mode' => $this->opened_stream_mode,
 				'url'  => $this->opened_stream_url,
-			),'',true);
+			), '', true);
 		}
 		$this->opened_stream = $this->opened_stream_mode = $this->opened_stream_path = $this->opened_stream_url = $this->opened_stream_is_new = null;
 
@@ -378,9 +377,9 @@ 
 	 * @param int $count
 	 * @return string/false up to count bytes read or false on EOF
 	 */
-	function stream_read ( $count )
+	function stream_read($count)
 	{
-		return fread($this->opened_stream,$count);
+		return fread($this->opened_stream, $count);
 	}
 
 	/**
@@ -394,9 +393,9 @@ 
 	 * @param string $data
 	 * @return integer
 	 */
-	function stream_write ( $data )
+	function stream_write($data)
 	{
-		return fwrite($this->opened_stream,$data);
+		return fwrite($this->opened_stream, $data);
 	}
 
  	/**
@@ -411,7 +410,7 @@ 
   	 *
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
  	 */
-	function stream_eof ( )
+	function stream_eof( )
 	{
 		return feof($this->opened_stream);
 	}
@@ -421,7 +420,7 @@ 
 	 *
 	 * @return integer current read/write position of the stream
 	 */
- 	function stream_tell ( )
+ 	function stream_tell( )
  	{
  		return ftell($this->opened_stream);
  	}
@@ -438,9 +437,9 @@ 
  	 * 							SEEK_END - 2 - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
  	 * @return boolean TRUE if the position was updated, FALSE otherwise.
  	 */
-	function stream_seek ( $offset, $whence )
+	function stream_seek($offset, $whence)
 	{
-		return !fseek($this->opened_stream,$offset,$whence);	// fseek returns 0 on success and -1 on failure
+		return !fseek($this->opened_stream, $offset, $whence); // fseek returns 0 on success and -1 on failure
 	}
 
 	/**
@@ -450,7 +449,7 @@ 
 	 *
 	 * @return booelan TRUE if the cached data was successfully stored (or if there was no data to store), or FALSE if the data could not be stored.
 	 */
-	function stream_flush ( )
+	function stream_flush( )
 	{
 		return fflush($this->opened_stream);
 	}
@@ -469,7 +468,7 @@ 
 	 *
 	 * @return array containing the same values as appropriate for the stream.
 	 */
-	function stream_stat ( )
+	function stream_stat( )
 	{
 		return fstat($this->opened_stream);
 	}
@@ -498,10 +497,10 @@ 
 		}
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path', $option, ".array2string($value).") url=$url");
 
-		switch($option)
+		switch ($option)
 		{
 			case STREAM_META_TOUCH:
-				return touch($url, $value[0]);	// atime is not supported
+				return touch($url, $value[0]); // atime is not supported
 
 			case STREAM_META_ACCESS:
 				return chmod($url, $value);
@@ -532,9 +531,9 @@ 
 	 * @param string $path
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	function unlink ( $path )
+	function unlink($path)
 	{
-		if (!($url = $this->resolve_url_symlinks($path,true,false)))	// true,false file need to exist, but do not resolve last component
+		if (!($url = $this->resolve_url_symlinks($path, true, false)))	// true,false file need to exist, but do not resolve last component
 		{
 			return false;
 		}
@@ -555,7 +554,7 @@ 
 				'path' => $path[0] == '/' ? $path : Vfs::parse_url($path, PHP_URL_PATH),
 				'url'  => $url,
 				'stat' => $stat,
-			),'',true);
+			), '', true);
 		}
 		return $ok;
 	}
@@ -573,14 +572,14 @@ 
 	 * @return boolean TRUE on success or FALSE on failure
 	 * @throws Exception\ProtectedDirectory if trying to delete a protected directory, see Vfs::isProtected()
 	 */
-	function rename ( $path_from, $path_to )
+	function rename($path_from, $path_to)
 	{
 		if (Vfs::isProtectedDir($path_from))
 		{
 			throw new Exception\ProtectedDirectory("Renaming protected directory '$path_from' rejected!");
 		}
-		if (!($url_from = $this->resolve_url_symlinks($path_from,true,false)) ||
-			!($url_to = $this->resolve_url_symlinks($path_to,false)))
+		if (!($url_from = $this->resolve_url_symlinks($path_from, true, false)) ||
+			!($url_to = $this->resolve_url_symlinks($path_to, false)))
 		{
 			return false;
 		}
@@ -590,14 +589,14 @@ 
 			return false;
 		}
 		// if file is moved from one filesystem / wrapper to an other --> copy it (rename fails cross wrappers)
-		if (Vfs::parse_url($url_from,PHP_URL_SCHEME) == Vfs::parse_url($url_to,PHP_URL_SCHEME))
+		if (Vfs::parse_url($url_from, PHP_URL_SCHEME) == Vfs::parse_url($url_to, PHP_URL_SCHEME))
 		{
 			self::symlinkCache_remove($path_from);
-			$ret = rename($url_from,$url_to);
+			$ret = rename($url_from, $url_to);
 		}
-		elseif (($from = fopen($url_from,'r')) && ($to = fopen($url_to,'w')))
+		elseif (($from = fopen($url_from, 'r')) && ($to = fopen($url_to, 'w')))
 		{
-			$ret = stream_copy_to_stream($from,$to) !== false;
+			$ret = stream_copy_to_stream($from, $to) !== false;
 			fclose($from);
 			fclose($to);
 			if ($ret) $this->unlink($path_from);
@@ -619,7 +618,7 @@ 
 				'to' => $path_to[0] == '/' ? $path_to : Vfs::parse_url($path_to, PHP_URL_PATH),
 				'url_from' => $url_from,
 				'url_to' => $url_to,
-			),'',true);
+			), '', true);
 		}
 		return $ret;
 	}
@@ -635,9 +634,9 @@ 
 	 * @param int $options Posible values include STREAM_REPORT_ERRORS and STREAM_MKDIR_RECURSIVE
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	function mkdir ( $path, $mode, $options )
+	function mkdir($path, $mode, $options)
 	{
-		if (!($url = $this->resolve_url_symlinks($path,false)))	// false = directory does not need to exists
+		if (!($url = $this->resolve_url_symlinks($path, false)))	// false = directory does not need to exists
 		{
 			return false;
 		}
@@ -647,7 +646,7 @@ 
 			return false;
 		}
 		// check if recursive option is set and needed
-		if (($options & STREAM_MKDIR_RECURSIVE) &&
+		if (($options&STREAM_MKDIR_RECURSIVE) &&
 			($parent_url = Vfs::dirname($url)) &&
 			!($this->url_stat($parent_url, STREAM_URL_STAT_QUIET)) &&
 			Vfs::parse_url($parent_url, PHP_URL_PATH) !== '/')
@@ -657,7 +656,7 @@ 
 		// unset it now, as it was handled above
 		$options &= ~STREAM_MKDIR_RECURSIVE;
 
-		$ret = mkdir($url,$mode,$options);
+		$ret = mkdir($url, $mode, $options);
 
 		// call "vfs_mkdir" hook
 		if ($ret && !class_exists('setup_process', false))
@@ -666,7 +665,7 @@ 
 				'location' => 'vfs_mkdir',
 				'path' => $path[0] == '/' ? $path : Vfs::parse_url($path, PHP_URL_PATH),
 				'url' => $url,
-			),'',true);
+			), '', true);
 		}
 		return $ret;
 	}
@@ -682,13 +681,13 @@ 
 	 * @return boolean TRUE on success or FALSE on failure.
 	 * @throws Exception\ProtectedDirectory if trying to delete a protected directory, see Vfs::isProtected()
 	 */
-	function rmdir ( $path, $options )
+	function rmdir($path, $options)
 	{
 		if (Vfs::isProtectedDir($path))
 		{
 			throw new Exception\ProtectedDirectory("Deleting protected directory '$path' rejected!");
 		}
-		unset($options);	// not uses but required by function signature
+		unset($options); // not uses but required by function signature
 		if (!($url = $this->resolve_url_symlinks($path)))
 		{
 			return false;
@@ -710,7 +709,7 @@ 
 				'path' => $path[0] == '/' ? $path : Vfs::parse_url($path, PHP_URL_PATH),
 				'url' => $url,
 				'stat' => $stat,
-			),'',true);
+			), '', true);
 		}
 		return $ok;
 	}
@@ -721,7 +720,7 @@ 
 	 * @param string $path URL that was passed to opendir() and that this object is expected to explore.
 	 * @return booelan
 	 */
-	function dir_opendir ( $path, $options )
+	function dir_opendir($path, $options)
 	{
 		$this->opened_dir = $this->extra_dirs = null;
 		$this->dir_url_params = array();
@@ -738,15 +737,15 @@ 
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__."( $path,$options) opendir($this->opened_dir_url) failed!");
 			return false;
 		}
-		$this->opened_dir_writable = Vfs::check_access($this->opened_dir_url,Vfs::WRITABLE);
+		$this->opened_dir_writable = Vfs::check_access($this->opened_dir_url, Vfs::WRITABLE);
 		// check our fstab if we need to add some of the mountpoints
-		$basepath = Vfs::parse_url($path,PHP_URL_PATH);
-		foreach(array_keys(self::$fstab) as $mounted)
+		$basepath = Vfs::parse_url($path, PHP_URL_PATH);
+		foreach (array_keys(self::$fstab) as $mounted)
 		{
 			if (((Vfs::dirname($mounted) == $basepath || Vfs::dirname($mounted).'/' == $basepath) && $mounted != '/') &&
 				// only return children readable by the user, if dir is not writable
 				(!self::HIDE_UNREADABLES || $this->opened_dir_writable ||
-					Vfs::check_access($mounted,Vfs::READABLE)))
+					Vfs::check_access($mounted, Vfs::READABLE)))
 			{
 				$this->extra_dirs[] = basename($mounted);
 			}
@@ -785,24 +784,24 @@ 
 	 * @param boolean $check_symlink_components =true check if path contains symlinks in path components other then the last one
 	 * @return array
 	 */
-	function url_stat ( $path, $flags, $try_create_home=false, $check_symlink_components=true, $check_symlink_depth=self::MAX_SYMLINK_DEPTH, $try_reconnect=true )
+	function url_stat($path, $flags, $try_create_home = false, $check_symlink_components = true, $check_symlink_depth = self::MAX_SYMLINK_DEPTH, $try_reconnect = true)
 	{
-		if (!($url = self::resolve_url($path,!($flags & STREAM_URL_STAT_LINK), $check_symlink_components)))
+		if (!($url = self::resolve_url($path, !($flags&STREAM_URL_STAT_LINK), $check_symlink_components)))
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path',$flags) can NOT resolve path!");
 			return false;
 		}
 
 		try {
-			if ($flags & STREAM_URL_STAT_LINK)
+			if ($flags&STREAM_URL_STAT_LINK)
 			{
-				$stat = @lstat($url);	// suppressed the stat failed warnings
+				$stat = @lstat($url); // suppressed the stat failed warnings
 			}
 			else
 			{
-				$stat = @stat($url);	// suppressed the stat failed warnings
+				$stat = @stat($url); // suppressed the stat failed warnings
 
-				if ($stat && ($stat['mode'] & self::MODE_LINK))
+				if ($stat && ($stat['mode']&self::MODE_LINK))
 				{
 					if (!$check_symlink_depth)
 					{
@@ -813,25 +812,25 @@ 
 					{
 						if ($lpath[0] != '/')	// concat relative path
 						{
-							$lpath = Vfs::concat(Vfs::parse_url($path,PHP_URL_PATH),'../'.$lpath);
+							$lpath = Vfs::concat(Vfs::parse_url($path, PHP_URL_PATH), '../'.$lpath);
 						}
-						$u_query = parse_url($url,PHP_URL_QUERY);
+						$u_query = parse_url($url, PHP_URL_QUERY);
 						$url = Vfs::PREFIX.$lpath;
 						if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,$flags) symlif (substr($path,-1) == '/' && $path != '/') $path = substr($path,0,-1);	// remove trailing slash eg. added by WebDAVink found and resolved to $url");
 						// try reading the stat of the link
-						if (($stat = $this->url_stat($lpath, STREAM_URL_STAT_QUIET, false, true, $check_symlink_depth-1)))
+						if (($stat = $this->url_stat($lpath, STREAM_URL_STAT_QUIET, false, true, $check_symlink_depth - 1)))
 						{
 							$stat_query = parse_url($stat['url'], PHP_URL_QUERY);
-							if($u_query || $stat_query)
+							if ($u_query || $stat_query)
 							{
 								$stat_url = parse_url($stat['url']);
-								parse_str($stat_query,$stat_query);
+								parse_str($stat_query, $stat_query);
 								parse_str($u_query, $u_query);
 								$stat_query = http_build_query(array_merge($stat_query, $u_query));
 								$stat['url'] = $stat_url['scheme'].'://'.$stat_url['host'].$stat_url['path'].'?'.$stat_query;
 							}
-							if(isset($stat['url'])) $url = $stat['url'];	// if stat returns an url use that, as there might be more links ...
-							self::symlinkCache_add($path,$url);
+							if (isset($stat['url'])) $url = $stat['url']; // if stat returns an url use that, as there might be more links ...
+							self::symlinkCache_add($path, $url);
 						}
 					}
 				}
@@ -851,7 +850,7 @@ 
 			throw $e;
 		}
 		// check if a failed url_stat was for a home dir, in that case silently create it
-		if (!$stat && $try_create_home && Vfs::dirname(Vfs::parse_url($path,PHP_URL_PATH)) == '/home' &&
+		if (!$stat && $try_create_home && Vfs::dirname(Vfs::parse_url($path, PHP_URL_PATH)) == '/home' &&
 			($id = $GLOBALS['egw']->accounts->name2id(basename($path))) &&
 			$GLOBALS['egw']->accounts->id2name($id) == basename($path))	// make sure path has the right case!
 		{
@@ -861,25 +860,25 @@ 
 				'account_lid' => basename($path),
 				'account_name' => basename($path),
 			);
-			call_user_func(array(__NAMESPACE__.'\\Hooks',$hook_data['location']),$hook_data);
+			call_user_func(array(__NAMESPACE__.'\\Hooks', $hook_data['location']), $hook_data);
 			unset($hook_data);
-			$stat = $this->url_stat($path,$flags,false);
+			$stat = $this->url_stat($path, $flags, false);
 		}
 		$query = parse_url($url, PHP_URL_QUERY);
 		if (!$stat && $check_symlink_components)	// check if there's a symlink somewhere inbetween the path
 		{
-			$stat = self::check_symlink_components($path,$flags,$url);
-			if ($stat && isset($stat['url']) && !$query) self::symlinkCache_add($path,$stat['url']);
+			$stat = self::check_symlink_components($path, $flags, $url);
+			if ($stat && isset($stat['url']) && !$query) self::symlinkCache_add($path, $stat['url']);
 		}
-		elseif(is_array($stat) && !isset($stat['url']))
+		elseif (is_array($stat) && !isset($stat['url']))
 		{
 			$stat['url'] = $url;
 		}
-		if (($stat['mode'] & 0222) && self::url_is_readonly($stat['url']))
+		if (($stat['mode']&0222) && self::url_is_readonly($stat['url']))
 		{
 			$stat['mode'] &= ~0222;
 		}
-		if($stat['url'] && $query && strpos($stat['url'],'?'.$query)===false)
+		if ($stat['url'] && $query && strpos($stat['url'], '?'.$query) === false)
 		{
 			$stat['url'] .= '?'.$query;
 		}
@@ -906,7 +905,7 @@ 
 	 * @param string &$url=null already resolved path
 	 * @return array|boolean stat array or false if not found
 	 */
-	private function check_symlink_components($path,$flags=0,&$url=null)
+	private function check_symlink_components($path, $flags = 0, &$url = null)
 	{
 		if (is_null($url) && !($url = self::resolve_url($path)))
 		{
@@ -926,20 +925,20 @@ 
 
 					if ($lpath[0] != '/')
 					{
-						$lpath = Vfs::concat(Vfs::parse_url($url,PHP_URL_PATH),'../'.$lpath);
+						$lpath = Vfs::concat(Vfs::parse_url($url, PHP_URL_PATH), '../'.$lpath);
 					}
 					//self::symlinkCache_add($path,Vfs::PREFIX.$lpath);
-					$url = Vfs::PREFIX.Vfs::concat($lpath,$rel_path);
+					$url = Vfs::PREFIX.Vfs::concat($lpath, $rel_path);
 					if (self::LOG_LEVEL > 1) error_log("$log --> lpath='$lpath', url='$url'");
-					return $this->url_stat($url,$flags);
+					return $this->url_stat($url, $flags);
 				}
-				$url = Vfs::concat($url,$rel_path);
+				$url = Vfs::concat($url, $rel_path);
 				if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,'$url') returning null");
 				return null;
 			}
 		}
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,'$url') returning false");
-		return false;	// $path does not exist
+		return false; // $path does not exist
 	}
 
 	/**
@@ -955,13 +954,13 @@ 
 	 * @param string $_path vfs path
 	 * @param string $target target path
 	 */
-	static protected function symlinkCache_add($_path,$target)
+	static protected function symlinkCache_add($_path, $target)
 	{
 		$path = self::get_path($_path);
 
-		if (isset(self::$symlink_cache[$path])) return;	// nothing to do
+		if (isset(self::$symlink_cache[$path])) return; // nothing to do
 
-		if ($target[0] != '/') $target = Vfs::parse_url($target,PHP_URL_PATH);
+		if ($target[0] != '/') $target = Vfs::parse_url($target, PHP_URL_PATH);
 
 		self::$symlink_cache[$path] = $target;
 
@@ -995,25 +994,25 @@ 
 	 * @param boolean $do_symlink =true is a direct match allowed, default yes (must be false for a lstat or readlink!)
 	 * @return string target or path, if path not found
 	 */
-	static public function symlinkCache_resolve($_path,$do_symlink=true)
+	static public function symlinkCache_resolve($_path, $do_symlink = true)
 	{
 		// remove vfs scheme, but no other schemes (eg. filesystem!)
 		$path = self::get_path($_path);
 
 		$strlen_path = strlen($path);
 
-		foreach(self::$symlink_cache as $p => $t)
+		foreach (self::$symlink_cache as $p => $t)
 		{
-			if (($strlen_p = strlen($p)) > $strlen_path) continue;	// $path can NOT start with $p
+			if (($strlen_p = strlen($p)) > $strlen_path) continue; // $path can NOT start with $p
 
 			if ($path == $p)
 			{
 				if ($do_symlink) $target = $t;
 				break;
 			}
-			elseif (substr($path,0,$strlen_p+1) == $p.'/')
+			elseif (substr($path, 0, $strlen_p + 1) == $p.'/')
 			{
-				$target = $t . substr($path,$strlen_p);
+				$target = $t.substr($path, $strlen_p);
 				break;
 			}
 		}
@@ -1041,7 +1040,7 @@ 
 	 *
 	 * @return string
 	 */
-	function dir_readdir ( )
+	function dir_readdir( )
 	{
 		if ($this->extra_dirs && count($this->extra_dirs) > $this->extra_dir_ptr)
 		{
@@ -1053,10 +1052,10 @@ 
 			do {
 				$file = readdir($this->opened_dir);
 			}
-			while($file !== false &&
-				(is_array($this->extra_dirs) && in_array($file,$this->extra_dirs) || // do NOT return extra_dirs twice
+			while ($file !== false &&
+				(is_array($this->extra_dirs) && in_array($file, $this->extra_dirs) || // do NOT return extra_dirs twice
 				self::HIDE_UNREADABLES && !$this->opened_dir_writable &&
-				!Vfs::check_access(Vfs::concat($this->opened_dir_url,$file),Vfs::READABLE)));
+				!Vfs::check_access(Vfs::concat($this->opened_dir_url, $file), Vfs::READABLE)));
 		}
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( $this->opened_dir ) = '$file'");
 		return $file;
@@ -1070,7 +1069,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_rewinddir ( )
+	function dir_rewinddir( )
 	{
 		$this->extra_dir_ptr = 0;
 
@@ -1084,7 +1083,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_closedir ( )
+	function dir_closedir( )
 	{
 		$ret = closedir($this->opened_dir);
 
@@ -1101,9 +1100,9 @@ 
 	 */
 	static function load_wrapper($scheme)
 	{
-		if (!in_array($scheme,self::get_wrappers()))
+		if (!in_array($scheme, self::get_wrappers()))
 		{
-			switch($scheme)
+			switch ($scheme)
 			{
 				case 'webdav':
 				case 'webdavs':
@@ -1111,16 +1110,16 @@ 
 					self::$wrappers[] = $scheme;
 					break;
 				case '':
-					break;	// default file, always loaded
+					break; // default file, always loaded
 				default:
 					// check if scheme is buildin in php or one of our own stream wrappers
-					if (in_array($scheme,stream_get_wrappers()) || class_exists(self::scheme2class($scheme)))
+					if (in_array($scheme, stream_get_wrappers()) || class_exists(self::scheme2class($scheme)))
 					{
 						self::$wrappers[] = $scheme;
 					}
 					else
 					{
-						trigger_error("Can't load stream-wrapper for scheme '$scheme'!",E_USER_WARNING);
+						trigger_error("Can't load stream-wrapper for scheme '$scheme'!", E_USER_WARNING);
 						return false;
 					}
 			}
@@ -1154,10 +1153,10 @@ 
 	static function scheme2class($scheme)
 	{
 		list($app, $app_scheme) = explode('.', $scheme);
-		foreach(array(
-			empty($app_scheme) ? 'EGroupware\\Api\\Vfs\\'.ucfirst($scheme).'\\StreamWrapper' :	// streamwrapper in Api\Vfs
+		foreach (array(
+			empty($app_scheme) ? 'EGroupware\\Api\\Vfs\\'.ucfirst($scheme).'\\StreamWrapper' : // streamwrapper in Api\Vfs
 				'EGroupware\\'.ucfirst($app).'\\Vfs\\'.ucfirst($app_scheme).'\\StreamWrapper', // streamwrapper in $app\Vfs
-			str_replace('.','_',$scheme).'_stream_wrapper',	// old (flat) name
+			str_replace('.', '_', $scheme).'_stream_wrapper', // old (flat) name
 		) as $class)
 		{
 			//error_log(__METHOD__."('$scheme') class_exists('$class')=".array2string(class_exists($class)));
@@ -1172,7 +1171,7 @@ 
 	 * @param string $only_remove_scheme =self::SCHEME if given only that scheme get's removed
 	 * @return string path without training slash
 	 */
-	static protected function get_path($path,$only_remove_scheme=self::SCHEME)
+	static protected function get_path($path, $only_remove_scheme = self::SCHEME)
 	{
 		if ($path[0] != '/' && (!$only_remove_scheme || Vfs::parse_url($path, PHP_URL_SCHEME) == $only_remove_scheme))
 		{
@@ -1183,7 +1182,7 @@ 
 		{
 			while (mb_substr($path, -1) == '/' && $path != '/' && ($path[0] == '/' || Vfs::parse_url($path, PHP_URL_PATH) != '/'))
 			{
-				$path = mb_substr($path,0,-1);
+				$path = mb_substr($path, 0, -1);
 			}
 		}
 		return $path;
@@ -1198,7 +1197,7 @@ 
 	static function url_is_readonly($url)
 	{
 		static $cache = array();
-		$ret =& $cache[$url];
+		$ret = & $cache[$url];
 		if (!isset($ret))
 		{
 			$matches = null;
@@ -1220,9 +1219,9 @@ 
 	 * @param boolean $clear_fstab =false true clear current fstab, false (default) only add given mount
 	 * @return array|boolean array with fstab, if called without parameter or true on successful mount
 	 */
-	static function mount($url=null,$path=null,$check_url=null,$persitent_mount=true,$clear_fstab=false)
+	static function mount($url = null, $path = null, $check_url = null, $persitent_mount = true, $clear_fstab = false)
 	{
-		if (is_null($check_url)) $check_url = strpos($url,'$') === false;
+		if (is_null($check_url)) $check_url = strpos($url, '$') === false;
 
 		if (!isset($GLOBALS['egw_info']['server']['vfs_fstab']))	// happens eg. in setup
 		{
@@ -1248,7 +1247,7 @@ 
 		if (!Vfs::$is_root)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') permission denied, you are NOT root!');
-			return false;	// only root can mount
+			return false; // only root can mount
 		}
 		if ($clear_fstab)
 		{
@@ -1257,14 +1256,14 @@ 
 		if (isset(self::$fstab[$path]) && self::$fstab[$path] === $url)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') already mounted.');
-			return true;	// already mounted
+			return true; // already mounted
 		}
-		self::load_wrapper(Vfs::parse_url($url,PHP_URL_SCHEME));
+		self::load_wrapper(Vfs::parse_url($url, PHP_URL_SCHEME));
 
 		if ($check_url && (!file_exists($url) || opendir($url) === false))
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') url does NOT exist!');
-			return false;	// url does not exist
+			return false; // url does not exist
 		}
 		self::$fstab[$path] = $url;
 
@@ -1275,10 +1274,10 @@ 
 
 		if ($persitent_mount)
 		{
-			Api\Config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
+			Api\Config::save_value('vfs_fstab', self::$fstab, 'phpgwapi');
 			$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 			// invalidate session cache
-			if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 			{
 				$GLOBALS['egw']->invalidate_session_cache();
 			}
@@ -1297,19 +1296,19 @@ 
 		if (!Vfs::$is_root)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($path).','.array2string($path).') permission denied, you are NOT root!');
-			return false;	// only root can mount
+			return false; // only root can mount
 		}
-		if (!isset(self::$fstab[$path]) && ($path = array_search($path,self::$fstab)) === false)
+		if (!isset(self::$fstab[$path]) && ($path = array_search($path, self::$fstab)) === false)
 		{
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($path).') NOT mounted!');
-			return false;	// $path not mounted
+			return false; // $path not mounted
 		}
 		unset(self::$fstab[$path]);
 
-		Api\Config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
+		Api\Config::save_value('vfs_fstab', self::$fstab, 'phpgwapi');
 		$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 		// invalidate session cache
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -1323,7 +1322,7 @@ 
 	 */
 	static function init_static()
 	{
-		stream_register_wrapper(self::SCHEME,__CLASS__);
+		stream_register_wrapper(self::SCHEME, __CLASS__);
 
 		if (($fstab = $GLOBALS['egw_info']['server']['vfs_fstab']) && is_array($fstab) && count($fstab))
 		{

Braces +234 added lines, -58 removed lines

@@ -165,7 +165,10 @@ 
 		{
 			$url = null;
 			$stat = self::check_symlink_components($path,0,$url);
-			if (self::LOG_LEVEL > 1) $log = " (check_symlink_components('$path',0,'$url') = $stat)";
+			if (self::LOG_LEVEL > 1)
+			{
+				$log = " (check_symlink_components('$path',0,'$url') = $stat)";
+			}
 		}
 		else
 		{
@@ -176,7 +179,10 @@ 
 		{
 			$url = self::resolve_url(Vfs::parse_url($url,PHP_URL_PATH));
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,file_exists=$file_exists,resolve_last_symlink=$resolve_last_symlink) = '$url'$log");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($path,file_exists=$file_exists,resolve_last_symlink=$resolve_last_symlink) = '$url'$log");
+		}
 		return $url;
 	}
 
@@ -204,7 +210,10 @@ 
 		// we do some caching here
 		if (isset(self::$resolve_url_cache[$path]) && $replace_user_pass_host)
 		{
-			if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = '".self::$resolve_url_cache[$path]."' (from cache)");
+			if (self::LOG_LEVEL > 1)
+			{
+				error_log(__METHOD__."('$path') = '".self::$resolve_url_cache[$path]."' (from cache)");
+			}
 			return self::$resolve_url_cache[$path];
 		}
 		// check if we can already resolve path (or a part of it) with a known symlinks
@@ -224,14 +233,24 @@ 
 			);
 		}
 		$parts = array_merge(Vfs::parse_url($path),$defaults);
-		if (!$parts['host']) $parts['host'] = 'default';	// otherwise we get an invalid url (scheme:///path/to/something)!
+		if (!$parts['host'])
+		{
+			$parts['host'] = 'default';
+		}
+		// otherwise we get an invalid url (scheme:///path/to/something)!
 
 		if (!empty($parts['scheme']) && $parts['scheme'] != self::SCHEME)
 		{
-			if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = '$path' (path is already an url)");
+			if (self::LOG_LEVEL > 1)
+			{
+				error_log(__METHOD__."('$path') = '$path' (path is already an url)");
+			}
 			return $path;	// path is already a non-vfs url --> nothing to do
 		}
-		if (empty($parts['path'])) $parts['path'] = '/';
+		if (empty($parts['path']))
+		{
+			$parts['path'] = '/';
+		}
 
 		foreach(array_reverse(self::$fstab) as $mounted => $url)
 		{
@@ -257,17 +276,32 @@ 
 				{
 					$url = str_replace(array('$user','$pass','$host','$home'),array($parts['user'],$parts['pass'],$parts['host'],$parts['home']),$url);
 				}
-				if ($parts['query']) $url .= '?'.$parts['query'];
-				if ($parts['fragment']) $url .= '#'.$parts['fragment'];
+				if ($parts['query'])
+				{
+					$url .= '?'.$parts['query'];
+				}
+				if ($parts['fragment'])
+				{
+					$url .= '#'.$parts['fragment'];
+				}
 
-				if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = '$url'");
+				if (self::LOG_LEVEL > 1)
+				{
+					error_log(__METHOD__."('$path') = '$url'");
+				}
 
-				if ($replace_user_pass_host) self::$resolve_url_cache[$path] = $url;
+				if ($replace_user_pass_host)
+				{
+					self::$resolve_url_cache[$path] = $url;
+				}
 
 				return $url;
 			}
 		}
-		if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path') can't resolve path!\n");
+		if (self::LOG_LEVEL > 0)
+		{
+			error_log(__METHOD__."('$path') can't resolve path!\n");
+		}
 		trigger_error(__METHOD__."($path) can't resolve path!\n",E_USER_WARNING);
 		return false;
 	}
@@ -488,15 +522,21 @@ 
 	 */
 	function stream_metadata($path, $option, $value)
 	{
-		if (!($url = $this->resolve_url_symlinks($path, $option != STREAM_META_TOUCH, false)))	// true,false file need to exist, but do not resolve last component
+		if (!($url = $this->resolve_url_symlinks($path, $option != STREAM_META_TOUCH, false)))
+		{
+			// true,false file need to exist, but do not resolve last component
 		{
 			return false;
 		}
+		}
 		if (self::url_is_readonly($url))
 		{
 			return false;
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path', $option, ".array2string($value).") url=$url");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."('$path', $option, ".array2string($value).") url=$url");
+		}
 
 		switch($option)
 		{
@@ -508,14 +548,18 @@ 
 
 			case STREAM_META_OWNER_NAME:
 				if (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'u')) === false)
-					return false;
+				{
+									return false;
+				}
 				// fall through
 			case STREAM_META_OWNER:
 				return chown($url, $value);
 
 			case STREAM_META_GROUP_NAME:
 				if (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'g')) === false)
-					return false;
+				{
+									return false;
+				}
 				// fall through
 			case STREAM_META_GROUP:
 				return chgrp($url, $value);
@@ -534,10 +578,13 @@ 
 	 */
 	function unlink ( $path )
 	{
-		if (!($url = $this->resolve_url_symlinks($path,true,false)))	// true,false file need to exist, but do not resolve last component
+		if (!($url = $this->resolve_url_symlinks($path,true,false)))
+		{
+			// true,false file need to exist, but do not resolve last component
 		{
 			return false;
 		}
+		}
 		if (self::url_is_readonly($url))
 		{
 			return false;
@@ -600,7 +647,10 @@ 
 			$ret = stream_copy_to_stream($from,$to) !== false;
 			fclose($from);
 			fclose($to);
-			if ($ret) $this->unlink($path_from);
+			if ($ret)
+			{
+				$this->unlink($path_from);
+			}
 		}
 		else
 		{
@@ -637,10 +687,13 @@ 
 	 */
 	function mkdir ( $path, $mode, $options )
 	{
-		if (!($url = $this->resolve_url_symlinks($path,false)))	// false = directory does not need to exists
+		if (!($url = $this->resolve_url_symlinks($path,false)))
+		{
+			// false = directory does not need to exists
 		{
 			return false;
 		}
+		}
 		// refuse to modify readonly target (eg. readonly share)
 		if (self::url_is_readonly($url))
 		{
@@ -652,7 +705,10 @@ 
 			!($this->url_stat($parent_url, STREAM_URL_STAT_QUIET)) &&
 			Vfs::parse_url($parent_url, PHP_URL_PATH) !== '/')
 		{
-			if (!mkdir($parent_url, $mode, $options)) return false;
+			if (!mkdir($parent_url, $mode, $options))
+			{
+				return false;
+			}
 		}
 		// unset it now, as it was handled above
 		$options &= ~STREAM_MKDIR_RECURSIVE;
@@ -729,13 +785,19 @@ 
 
 		if (!($this->opened_dir_url = $this->resolve_url_symlinks($path)))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."( $path,$options) resolve_url_symlinks() failed!");
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__."( $path,$options) resolve_url_symlinks() failed!");
+			}
 			return false;
 		}
 		if (!($this->opened_dir = $this->context ?
 			opendir($this->opened_dir_url, $this->context) : opendir($this->opened_dir_url)))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."( $path,$options) opendir($this->opened_dir_url) failed!");
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__."( $path,$options) opendir($this->opened_dir_url) failed!");
+			}
 			return false;
 		}
 		$this->opened_dir_writable = Vfs::check_access($this->opened_dir_url,Vfs::WRITABLE);
@@ -753,7 +815,10 @@ 
 		}
 
 
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( $path,$options): opendir($this->opened_dir_url)=$this->opened_dir, extra_dirs=".array2string($this->extra_dirs).', '.function_backtrace());
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."( $path,$options): opendir($this->opened_dir_url)=$this->opened_dir, extra_dirs=".array2string($this->extra_dirs).', '.function_backtrace());
+		}
 		return true;
 	}
 
@@ -789,7 +854,10 @@ 
 	{
 		if (!($url = self::resolve_url($path,!($flags & STREAM_URL_STAT_LINK), $check_symlink_components)))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path',$flags) can NOT resolve path!");
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__."('$path',$flags) can NOT resolve path!");
+			}
 			return false;
 		}
 
@@ -806,18 +874,27 @@ 
 				{
 					if (!$check_symlink_depth)
 					{
-						if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path',$flags) maximum symlink depth exceeded, might be a circular symlink!");
+						if (self::LOG_LEVEL > 0)
+						{
+							error_log(__METHOD__."('$path',$flags) maximum symlink depth exceeded, might be a circular symlink!");
+						}
 						$stat = false;
 					}
 					elseif (($lpath = Vfs::readlink($url)))
 					{
-						if ($lpath[0] != '/')	// concat relative path
+						if ($lpath[0] != '/')
+						{
+							// concat relative path
 						{
 							$lpath = Vfs::concat(Vfs::parse_url($path,PHP_URL_PATH),'../'.$lpath);
 						}
+						}
 						$u_query = parse_url($url,PHP_URL_QUERY);
 						$url = Vfs::PREFIX.$lpath;
-						if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,$flags) symlif (substr($path,-1) == '/' && $path != '/') $path = substr($path,0,-1);	// remove trailing slash eg. added by WebDAVink found and resolved to $url");
+						if (self::LOG_LEVEL > 1)
+						{
+							error_log(__METHOD__."($path,$flags) symlif (substr($path,-1) == '/' && $path != '/') $path = substr($path,0,-1);	// remove trailing slash eg. added by WebDAVink found and resolved to $url");
+						}
 						// try reading the stat of the link
 						if (($stat = $this->url_stat($lpath, STREAM_URL_STAT_QUIET, false, true, $check_symlink_depth-1)))
 						{
@@ -830,7 +907,11 @@ 
 								$stat_query = http_build_query(array_merge($stat_query, $u_query));
 								$stat['url'] = $stat_url['scheme'].'://'.$stat_url['host'].$stat_url['path'].'?'.$stat_query;
 							}
-							if(isset($stat['url'])) $url = $stat['url'];	// if stat returns an url use that, as there might be more links ...
+							if(isset($stat['url']))
+							{
+								$url = $stat['url'];
+							}
+							// if stat returns an url use that, as there might be more links ...
 							self::symlinkCache_add($path,$url);
 						}
 					}
@@ -853,7 +934,9 @@ 
 		// check if a failed url_stat was for a home dir, in that case silently create it
 		if (!$stat && $try_create_home && Vfs::dirname(Vfs::parse_url($path,PHP_URL_PATH)) == '/home' &&
 			($id = $GLOBALS['egw']->accounts->name2id(basename($path))) &&
-			$GLOBALS['egw']->accounts->id2name($id) == basename($path))	// make sure path has the right case!
+			$GLOBALS['egw']->accounts->id2name($id) == basename($path))
+		{
+			// make sure path has the right case!
 		{
 			$hook_data = array(
 				'location' => $GLOBALS['egw']->accounts->get_type($id) == 'g' ? 'addgroup' : 'addaccount',
@@ -861,15 +944,22 @@ 
 				'account_lid' => basename($path),
 				'account_name' => basename($path),
 			);
+		}
 			call_user_func(array(__NAMESPACE__.'\\Hooks',$hook_data['location']),$hook_data);
 			unset($hook_data);
 			$stat = $this->url_stat($path,$flags,false);
 		}
 		$query = parse_url($url, PHP_URL_QUERY);
-		if (!$stat && $check_symlink_components)	// check if there's a symlink somewhere inbetween the path
+		if (!$stat && $check_symlink_components)
+		{
+			// check if there's a symlink somewhere inbetween the path
 		{
 			$stat = self::check_symlink_components($path,$flags,$url);
-			if ($stat && isset($stat['url']) && !$query) self::symlinkCache_add($path,$stat['url']);
+		}
+			if ($stat && isset($stat['url']) && !$query)
+			{
+				self::symlinkCache_add($path,$stat['url']);
+			}
 		}
 		elseif(is_array($stat) && !isset($stat['url']))
 		{
@@ -884,7 +974,10 @@ 
 			$stat['url'] .= '?'.$query;
 		}
 
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,try_create_home=$try_create_home,check_symlink_components=$check_symlink_components) returning ".array2string($stat));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."('$path',$flags,try_create_home=$try_create_home,check_symlink_components=$check_symlink_components) returning ".array2string($stat));
+		}
 
 		return $stat;
 
@@ -910,10 +1003,16 @@ 
 	{
 		if (is_null($url) && !($url = self::resolve_url($path)))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."('$path',$flags,'$url') can NOT resolve path: ".function_backtrace(1));
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__."('$path',$flags,'$url') can NOT resolve path: ".function_backtrace(1));
+			}
 			return false;
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,'$url'): ".function_backtrace(1));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."('$path',$flags,'$url'): ".function_backtrace(1));
+		}
 
 		while (($rel_path = Vfs::basename($url).($rel_path ? '/'.$rel_path : '')) &&
 		       ($url = Vfs::dirname($url)))
@@ -922,7 +1021,10 @@ 
 			{
 				if (is_link($url) && ($lpath = Vfs::readlink($url)))
 				{
-					if (self::LOG_LEVEL > 1) $log = "rel_path='$rel_path', url='$url': lpath='$lpath'";
+					if (self::LOG_LEVEL > 1)
+					{
+						$log = "rel_path='$rel_path', url='$url': lpath='$lpath'";
+					}
 
 					if ($lpath[0] != '/')
 					{
@@ -930,15 +1032,24 @@ 
 					}
 					//self::symlinkCache_add($path,Vfs::PREFIX.$lpath);
 					$url = Vfs::PREFIX.Vfs::concat($lpath,$rel_path);
-					if (self::LOG_LEVEL > 1) error_log("$log --> lpath='$lpath', url='$url'");
+					if (self::LOG_LEVEL > 1)
+					{
+						error_log("$log --> lpath='$lpath', url='$url'");
+					}
 					return $this->url_stat($url,$flags);
 				}
 				$url = Vfs::concat($url,$rel_path);
-				if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,'$url') returning null");
+				if (self::LOG_LEVEL > 1)
+				{
+					error_log(__METHOD__."('$path',$flags,'$url') returning null");
+				}
 				return null;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,'$url') returning false");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."('$path',$flags,'$url') returning false");
+		}
 		return false;	// $path does not exist
 	}
 
@@ -959,9 +1070,16 @@ 
 	{
 		$path = self::get_path($_path);
 
-		if (isset(self::$symlink_cache[$path])) return;	// nothing to do
+		if (isset(self::$symlink_cache[$path]))
+		{
+			return;
+		}
+		// nothing to do
 
-		if ($target[0] != '/') $target = Vfs::parse_url($target,PHP_URL_PATH);
+		if ($target[0] != '/')
+		{
+			$target = Vfs::parse_url($target,PHP_URL_PATH);
+		}
 
 		self::$symlink_cache[$path] = $target;
 
@@ -970,7 +1088,10 @@ 
 		{
 			return strlen($a) - strlen($b);
 		});
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,$target) cache now ".array2string(self::$symlink_cache));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($path,$target) cache now ".array2string(self::$symlink_cache));
+		}
 	}
 
 	/**
@@ -983,7 +1104,10 @@ 
 		$path = self::get_path($_path);
 
 		unset(self::$symlink_cache[$path]);
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path) cache now ".array2string(self::$symlink_cache));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($path) cache now ".array2string(self::$symlink_cache));
+		}
 	}
 
 	/**
@@ -1004,11 +1128,18 @@ 
 
 		foreach(self::$symlink_cache as $p => $t)
 		{
-			if (($strlen_p = strlen($p)) > $strlen_path) continue;	// $path can NOT start with $p
+			if (($strlen_p = strlen($p)) > $strlen_path)
+			{
+				continue;
+			}
+			// $path can NOT start with $p
 
 			if ($path == $p)
 			{
-				if ($do_symlink) $target = $t;
+				if ($do_symlink)
+				{
+					$target = $t;
+				}
 				break;
 			}
 			elseif (substr($path,0,$strlen_p+1) == $p.'/')
@@ -1017,7 +1148,10 @@ 
 				break;
 			}
 		}
-		if (self::LOG_LEVEL > 1 && isset($target)) error_log(__METHOD__."($path) = $target");
+		if (self::LOG_LEVEL > 1 && isset($target))
+		{
+			error_log(__METHOD__."($path) = $target");
+		}
 		return isset($target) ? $target : $path;
 	}
 
@@ -1058,7 +1192,10 @@ 
 				self::HIDE_UNREADABLES && !$this->opened_dir_writable &&
 				!Vfs::check_access(Vfs::concat($this->opened_dir_url,$file),Vfs::READABLE)));
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( $this->opened_dir ) = '$file'");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."( $this->opened_dir ) = '$file'");
+		}
 		return $file;
 	}
 
@@ -1161,7 +1298,10 @@ 
 		) as $class)
 		{
 			//error_log(__METHOD__."('$scheme') class_exists('$class')=".array2string(class_exists($class)));
-			if (class_exists($class))  return $class;
+			if (class_exists($class))
+			{
+				return $class;
+			}
 		}
 	}
 
@@ -1222,11 +1362,17 @@ 
 	 */
 	static function mount($url=null,$path=null,$check_url=null,$persitent_mount=true,$clear_fstab=false)
 	{
-		if (is_null($check_url)) $check_url = strpos($url,'$') === false;
+		if (is_null($check_url))
+		{
+			$check_url = strpos($url,'$') === false;
+		}
 
-		if (!isset($GLOBALS['egw_info']['server']['vfs_fstab']))	// happens eg. in setup
+		if (!isset($GLOBALS['egw_info']['server']['vfs_fstab']))
+		{
+			// happens eg. in setup
 		{
 			$api_config = Api\Config::read('phpgwapi');
+		}
 			if (isset($api_config['vfs_fstab']) && is_array($api_config['vfs_fstab']))
 			{
 				self::$fstab = $api_config['vfs_fstab'];
@@ -1242,12 +1388,18 @@ 
 		}
 		if (is_null($url) || is_null($path))
 		{
-			if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns '.array2string(self::$fstab));
+			if (self::LOG_LEVEL > 1)
+			{
+				error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns '.array2string(self::$fstab));
+			}
 			return self::$fstab;
 		}
 		if (!Vfs::$is_root)
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') permission denied, you are NOT root!');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($url).','.array2string($path).') permission denied, you are NOT root!');
+			}
 			return false;	// only root can mount
 		}
 		if ($clear_fstab)
@@ -1256,14 +1408,20 @@ 
 		}
 		if (isset(self::$fstab[$path]) && self::$fstab[$path] === $url)
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') already mounted.');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($url).','.array2string($path).') already mounted.');
+			}
 			return true;	// already mounted
 		}
 		self::load_wrapper(Vfs::parse_url($url,PHP_URL_SCHEME));
 
 		if ($check_url && (!file_exists($url) || opendir($url) === false))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') url does NOT exist!');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($url).','.array2string($path).') url does NOT exist!');
+			}
 			return false;	// url does not exist
 		}
 		self::$fstab[$path] = $url;
@@ -1278,12 +1436,18 @@ 
 			Api\Config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
 			$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 			// invalidate session cache
-			if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+			{
+				// egw object in setup is limited
 			{
 				$GLOBALS['egw']->invalidate_session_cache();
 			}
+			}
+		}
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns true (successful new mount).');
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($url).','.array2string($path).') returns true (successful new mount).');
 		return true;
 	}
 
@@ -1296,12 +1460,18 @@ 
 	{
 		if (!Vfs::$is_root)
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($path).','.array2string($path).') permission denied, you are NOT root!');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($path).','.array2string($path).') permission denied, you are NOT root!');
+			}
 			return false;	// only root can mount
 		}
 		if (!isset(self::$fstab[$path]) && ($path = array_search($path,self::$fstab)) === false)
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($path).') NOT mounted!');
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__.'('.array2string($path).') NOT mounted!');
+			}
 			return false;	// $path not mounted
 		}
 		unset(self::$fstab[$path]);
@@ -1309,11 +1479,17 @@ 
 		Api\Config::save_value('vfs_fstab',self::$fstab,'phpgwapi');
 		$GLOBALS['egw_info']['server']['vfs_fstab'] = self::$fstab;
 		// invalidate session cache
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'('.array2string($path).') returns true (successful unmount).');
+		}
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'('.array2string($path).') returns true (successful unmount).');
+		}
 		return true;
 	}