EGroupware / egroupware

api/src/Vfs/Dav/Directory.php

Doc Comments +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	/**
 	 * Returns available diskspace information
 	 *
-	 * @return array [ available-space, free-space ]
+	 * @return false[] [ available-space, free-space ]
 	 */
 	function getQuotaInfo()
 	{

Spacing +4 added lines, -4 removed lines

@@ -66,10 +66,10 @@ 
 	function getChild($name)
 	{
 		//error_log(__METHOD__."('$name') this->path=$this->path, this->vfs_path=$this->vfs_path");
-		$path = $this->vfs_path . '/' . $name;
-		$vfs_path = $this->vfs_path . '/' . Vfs::encodePathComponent($name);
+		$path = $this->vfs_path.'/'.$name;
+		$vfs_path = $this->vfs_path.'/'.Vfs::encodePathComponent($name);
 
-		if (!Vfs::file_exists($vfs_path)) throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+		if (!Vfs::file_exists($vfs_path)) throw new DAV\Exception\NotFound('File with name '.$path.' could not be located');
 
 		if (Vfs::is_dir($vfs_path))
 		{
@@ -88,6 +88,6 @@ 
 	 */
 	function getQuotaInfo()
 	{
-		return [ false, false ];
+		return [false, false];
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -69,7 +69,10 @@
 		$path = $this->vfs_path . '/' . $name;
 		$vfs_path = $this->vfs_path . '/' . Vfs::encodePathComponent($name);
 
-		if (!Vfs::file_exists($vfs_path)) throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+		if (!Vfs::file_exists($vfs_path))
+		{
+			throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+		}
 
 		if (Vfs::is_dir($vfs_path))
 		{

api/src/Vfs/Dav/File.php

Doc Comments +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 	 *
 	 * Return null if the ETag can not effectively be determined
 	 *
-	 * @return mixed
+	 * @return string|null
 	 */
 	function getETag()
 	{
@@ -78,7 +78,7 @@ 
 	 *
 	 * If null is returned, we'll assume application/octet-stream
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	function getContentType()
 	{

api/src/Vfs/Filesystem/StreamWrapper.php

Doc Comments +3 added lines, -3 removed lines

@@ -271,7 +271,7 @@ 
 	 *
 	 * If you have cached data in your stream but not yet stored it into the underlying storage, you should do so now.
 	 *
-	 * @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.
+	 * @return boolean 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 ( )
 	{
@@ -507,7 +507,7 @@ 
 	 *
 	 * @param string $url URL that was passed to opendir() and that this object is expected to explore.
 	 * @param int $options
-	 * @return booelan
+	 * @return boolean
 	 */
 	function dir_opendir ( $url, $options )
 	{
@@ -616,7 +616,7 @@ 
 	 * It should reset the output generated by dir_readdir(). i.e.:
 	 * The next call to dir_readdir() should return the first entry in the location returned by dir_opendir().
 	 *
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function dir_rewinddir ( )
 	{

Indentation +2 added lines, -2 removed lines

@@ -228,10 +228,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 ( )

Spacing +84 added lines, -84 removed lines

@@ -51,7 +51,7 @@ 
 	/**
 	 * Mime type of directories, the old vfs used 'Directory', while eg. WebDAV uses 'httpd/unix-directory'
 	 */
-	const DIR_MIME_TYPE = Vfs::DIR_MIME_TYPE ;
+	const DIR_MIME_TYPE = Vfs::DIR_MIME_TYPE;
 
 	/**
 	 * mode-bits, which have to be set for files
@@ -60,7 +60,7 @@ 
 	/**
 	 * mode-bits, which have to be set for directories
 	 */
-	const MODE_DIR =   040000;
+	const MODE_DIR = 040000;
 
 	/**
 	 * optional context param when opening the stream, null if no context passed
@@ -123,50 +123,50 @@ 
 	 * @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 ( $url, $mode, $options, &$opened_path )
+	function stream_open($url, $mode, $options, &$opened_path)
 	{
-		unset($opened_path);	// not used, but required by interface
+		unset($opened_path); // not used, but required by interface
 
 		$this->opened_stream = $this->opened_stream_url = null;
-		$read_only = str_replace('b','',$mode) == 'r';
+		$read_only = str_replace('b', '', $mode) == 'r';
 
 		// check access rights, based on the eGW mount perms
-		if (!($stat = $this->url_stat($url,0)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!($stat = $this->url_stat($url, 0)) || $mode[0] == 'x')	// file not found or file should NOT exist
 		{
-			if ($mode[0] == 'r' ||	// does $mode require the file to exist (r,r+)
-				$mode[0] == 'x' ||	// or file should not exist, but does
+			if ($mode[0] == 'r' || // does $mode require the file to exist (r,r+)
+				$mode[0] == 'x' || // or file should not exist, but does
 				!($dir = Vfs::dirname($url)) ||
-				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=$this->url_stat($dir,0)))	// or we are not allowed to 																																			create it
+				!Vfs::check_access($dir, Vfs::WRITABLE, $dir_stat = $this->url_stat($dir, 0)))	// or we are not allowed to 																																			create it
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
-				if (!($options & STREAM_URL_STAT_QUIET))
+				if (!($options&STREAM_URL_STAT_QUIET))
 				{
-					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!",E_USER_WARNING);
+					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!", E_USER_WARNING);
 				}
 				return false;
 			}
 		}
-		elseif (!$read_only && !Vfs::check_access($url,Vfs::WRITABLE,$stat))	// we are not allowed to edit it
+		elseif (!$read_only && !Vfs::check_access($url, Vfs::WRITABLE, $stat))	// we are not allowed to edit it
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file can not be edited!");
-			if (!($options & STREAM_URL_STAT_QUIET))
+			if (!($options&STREAM_URL_STAT_QUIET))
 			{
-				trigger_error(__METHOD__."($url,$mode,$options) file can not be edited!",E_USER_WARNING);
+				trigger_error(__METHOD__."($url,$mode,$options) file can not be edited!", E_USER_WARNING);
 			}
 			return false;
 		}
 		if (!$read_only && self::deny_script($url))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
-			if (!($options & STREAM_URL_STAT_QUIET))
+			if (!($options&STREAM_URL_STAT_QUIET))
 			{
-				trigger_error(__METHOD__."($url,$mode,$options) permission denied, file is a script!",E_USER_WARNING);
+				trigger_error(__METHOD__."($url,$mode,$options) permission denied, file is a script!", E_USER_WARNING);
 			}
 			return false;
 		}
 
 		// open the "real" file
-		if (!($this->opened_stream = fopen($path=Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH)),$mode,$options)))
+		if (!($this->opened_stream = fopen($path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH)), $mode, $options)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) fopen('$path','$mode',$options) returned false!");
 			return false;
@@ -181,7 +181,7 @@ 
 	 *
 	 * You must release any resources that were locked or allocated by the stream.
 	 */
-	function stream_close ( )
+	function stream_close( )
 	{
 		$ret = fclose($this->opened_stream);
 
@@ -201,9 +201,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);
 	}
 
 	/**
@@ -217,9 +217,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);
 	}
 
  	/**
@@ -234,7 +234,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);
 	}
@@ -244,7 +244,7 @@ 
 	 *
 	 * @return integer current read/write position of the stream
 	 */
- 	function stream_tell ( )
+ 	function stream_tell( )
  	{
  		return ftell($this->opened_stream);
  	}
@@ -261,9 +261,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
 	}
 
 	/**
@@ -273,7 +273,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);
 	}
@@ -292,9 +292,9 @@ 
 	 *
 	 * @return array containing the same values as appropriate for the stream.
 	 */
-	function stream_stat ( )
+	function stream_stat( )
 	{
-		return $this->url_stat($this->opened_stream_url,0);
+		return $this->url_stat($this->opened_stream_url, 0);
 	}
 
 	/**
@@ -306,15 +306,15 @@ 
 	 * @param string $url
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	function unlink ( $url )
+	function unlink($url)
 	{
-		$path = Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH));
+		$path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH));
 
 		// check access rights (file need to exist and directory need to be writable
-		if (!file_exists($path) || is_dir($path) || !($dir = Vfs::dirname($url)) || !Vfs::check_access($dir,Vfs::WRITABLE))
+		if (!file_exists($path) || is_dir($path) || !($dir = Vfs::dirname($url)) || !Vfs::check_access($dir, Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		return unlink($path);
 	}
@@ -331,21 +331,21 @@ 
 	 * @param string $url_to
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	function rename ( $url_from, $url_to )
+	function rename($url_from, $url_to)
 	{
 		$from = Vfs::parse_url($url_from);
 		$to   = Vfs::parse_url($url_to);
 
 		// check access rights
-		if (!($from_stat = $this->url_stat($url_from,0)) || !($dir = Vfs::dirname($url_from)) || !Vfs::check_access($dir,Vfs::WRITABLE))
+		if (!($from_stat = $this->url_stat($url_from, 0)) || !($dir = Vfs::dirname($url_from)) || !Vfs::check_access($dir, Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $from[path] permission denied!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
-		if (!($to_dir = Vfs::dirname($url_to)) || !Vfs::check_access($to_dir,Vfs::WRITABLE,$to_dir_stat = $this->url_stat($to_dir,0)))
+		if (!($to_dir = Vfs::dirname($url_to)) || !Vfs::check_access($to_dir, Vfs::WRITABLE, $to_dir_stat = $this->url_stat($to_dir, 0)))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $to_dir permission denied!");
-			return false;	// no permission or parent-dir does not exist
+			return false; // no permission or parent-dir does not exist
 		}
 		if (self::deny_script($url_to))
 		{
@@ -354,12 +354,12 @@ 
 		}
 		// the filesystem stream-wrapper does NOT allow to rename files to directories, as this makes problems
 		// for our vfs too, we abort here with an error, like the filesystem one does
-		if (($to_stat = $this->url_stat($to['path'],0)) &&
+		if (($to_stat = $this->url_stat($to['path'], 0)) &&
 			($to_stat['mime'] === self::DIR_MIME_TYPE) !== ($from_stat['mime'] === self::DIR_MIME_TYPE))
 		{
 			$is_dir = $to_stat['mime'] === self::DIR_MIME_TYPE ? 'a' : 'no';
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $to[path] is $is_dir directory!");
-			return false;	// no permission or file does not exist
+			return false; // no permission or file does not exist
 		}
 		// if destination file already exists, delete it
 		if ($to_stat && !self::unlink($url_to))
@@ -367,7 +367,7 @@ 
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
 			return false;
 		}
-		return rename(Vfs::decodePath($from['path']),Vfs::decodePath($to['path']));
+		return rename(Vfs::decodePath($from['path']), Vfs::decodePath($to['path']));
 	}
 
 	/**
@@ -381,12 +381,12 @@ 
 	 * @param int $options Posible values include STREAM_REPORT_ERRORS and STREAM_MKDIR_RECURSIVE
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	function mkdir ( $url, $mode, $options )
+	function mkdir($url, $mode, $options)
 	{
-		unset($mode);	// not used, but required by interface
+		unset($mode); // not used, but required by interface
 
-		$path = Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH));
-		$recursive = (bool)($options & STREAM_MKDIR_RECURSIVE);
+		$path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH));
+		$recursive = (bool)($options&STREAM_MKDIR_RECURSIVE);
 
 		// find the real parent (might be more then one level if $recursive!)
 		do {
@@ -397,12 +397,12 @@ 
 		//echo __METHOD__."($url,$mode,$options) path=$path, recursive=$recursive, parent=$parent, Vfs::check_access(parent_url=$parent_url,Vfs::WRITABLE)=".(int)Vfs::check_access($parent_url,Vfs::WRITABLE)."\n";
 
 		// check access rights (in real filesystem AND by mount perms)
-		if (!$parent_url || file_exists($path) || !file_exists($parent) || !is_writable($parent) || !Vfs::check_access($parent_url,Vfs::WRITABLE))
+		if (!$parent_url || file_exists($path) || !file_exists($parent) || !is_writable($parent) || !Vfs::check_access($parent_url, Vfs::WRITABLE))
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
 			return false;
 		}
-		return mkdir($path, 0700, $recursive);	// setting mode 0700 allows (only) apache to write into the dir
+		return mkdir($path, 0700, $recursive); // setting mode 0700 allows (only) apache to write into the dir
 	}
 
 	/**
@@ -415,11 +415,11 @@ 
 	 * @param int $options Possible values include STREAM_REPORT_ERRORS.
 	 * @return boolean TRUE on success or FALSE on failure.
 	 */
-	function rmdir ( $url, $options )
+	function rmdir($url, $options)
 	{
-		unset($options);	// not used, but required by interface
+		unset($options); // not used, but required by interface
 
-		$path = Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH));
+		$path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH));
 		$parent = dirname($path);
 
 		// check access rights (in real filesystem AND by mount perms)
@@ -449,7 +449,7 @@ 
 	{
  		if ($option != STREAM_META_TOUCH)
 		{
-			return false;	// not implemented / supported
+			return false; // not implemented / supported
 		}
 
 		$path = Vfs::decodePath(Vfs::parse_url($url, PHP_URL_PATH));
@@ -473,13 +473,13 @@ 
 	 * @param int $options
 	 * @return booelan
 	 */
-	function dir_opendir ( $url, $options )
+	function dir_opendir($url, $options)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options)");
 
 		$this->opened_dir = null;
 
-		$path = Vfs::decodePath(Vfs::parse_url($this->opened_dir_url = $url,PHP_URL_PATH));
+		$path = Vfs::decodePath(Vfs::parse_url($this->opened_dir_url = $url, PHP_URL_PATH));
 
 		// ToDo: check access rights
 
@@ -517,31 +517,31 @@ 
 	 *                          stat triggers it's own warning anyway, so it makes no sense to trigger one by our stream-wrapper!
 	 * @return array
 	 */
-	function url_stat ( $url, $flags )
+	function url_stat($url, $flags)
 	{
 		$parts = Vfs::parse_url($url);
 		$path = Vfs::decodePath($parts['path']);
 
-		$stat = @stat($path);	// suppressed the stat failed warnings
+		$stat = @stat($path); // suppressed the stat failed warnings
 
 		if ($stat)
 		{
 			// set owner, group and mode from mount options
 			$uid = $gid = $mode = null;
-			if (!self::parse_query($parts['query'],$uid,$gid,$mode))
+			if (!self::parse_query($parts['query'], $uid, $gid, $mode))
 			{
 				return false;
 			}
 			$stat['uid'] = $stat[4] = $uid;
 			$stat['gid'] = $stat[5] = $gid;
-			$stat['mode'] = $stat[2] = $stat['mode'] & self::MODE_DIR ? self::MODE_DIR | $mode : self::MODE_FILE | ($mode & ~0111);
+			$stat['mode'] = $stat[2] = $stat['mode']&self::MODE_DIR ? self::MODE_DIR|$mode : self::MODE_FILE|($mode&~0111);
 			// write rights also depend on the write rights of the webserver
 			if (!is_writable($path))
 			{
-				$stat['mode'] = $stat[2] = $stat['mode'] & ~0222;
+				$stat['mode'] = $stat[2] = $stat['mode']&~0222;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.Vfs::int2mode($stat['mode']));
+		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o', $mode).", mode=".sprintf('0%o', $stat['mode']).'='.Vfs::int2mode($stat['mode']));
 		return $stat;
 	}
 
@@ -555,13 +555,13 @@ 
 	 *
 	 * @return string
 	 */
-	function dir_readdir ( )
+	function dir_readdir( )
 	{
 		do {
 			$file = readdir($this->opened_dir);
 
-			$ignore = !($file === false ||							// stop if no more dirs or
-				($file != '.' && $file != '..' ));					// file not . or ..
+			$ignore = !($file === false || // stop if no more dirs or
+				($file != '.' && $file != '..')); // file not . or ..
 			if (self::LOG_LEVEL > 1 && $ignore) error_log(__METHOD__.'() ignoring '.array2string($file));
 		}
 		while ($ignore);
@@ -582,7 +582,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_rewinddir ( )
+	function dir_rewinddir( )
 	{
 		return rewinddir($this->opened_dir);
 	}
@@ -594,7 +594,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_closedir ( )
+	function dir_closedir( )
 	{
 		closedir($this->opened_dir);
 
@@ -612,18 +612,18 @@ 
 	 * @param int &$mode default if not set is 05 r-x for others
 	 * @return boolean true on successfull parse, false on error
 	 */
-	static function parse_query($query,&$uid,&$gid,&$mode)
+	static function parse_query($query, &$uid, &$gid, &$mode)
 	{
 		$params = null;
-		parse_str(is_array($query) ? $query['query'] : $query,$params);
+		parse_str(is_array($query) ? $query['query'] : $query, $params);
 
 		// setting the default perms root.root r-x for other
 		$uid = $gid = 0;
 		$mode = 05;
 
-		foreach($params as $name => $value)
+		foreach ($params as $name => $value)
 		{
-			switch($name)
+			switch ($name)
 			{
 				case 'user':
 					if (!is_numeric($value))
@@ -632,10 +632,10 @@ 
 						{
 							$value = 0;
 						}
-						elseif (($value = $GLOBALS['egw']->accounts->name2id($value,'account_lid','u')) === false)
+						elseif (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'u')) === false)
 						{
 							error_log(__METHOD__."('$query') unknown user-name '$value'!");
-							return false;	// wrong user-name
+							return false; // wrong user-name
 						}
 					}
 					// fall-through
@@ -654,12 +654,12 @@ 
 						{
 							$value = 0;
 						}
-						elseif (($value = $GLOBALS['egw']->accounts->name2id($value,'account_lid','g')) === false)
+						elseif (($value = $GLOBALS['egw']->accounts->name2id($value, 'account_lid', 'g')) === false)
 						{
 							error_log(__METHOD__."('$query') unknown group-name '$value'!");
-							return false;	// wrong group-name
+							return false; // wrong group-name
 						}
-						$value = -$value;	// vfs uses positiv gid's!
+						$value = -$value; // vfs uses positiv gid's!
 					}
 					// fall-through
 				case 'gid':
@@ -695,9 +695,9 @@ 
 	{
 		$parts = Vfs::parse_url($url);
 		$get = null;
-		parse_str($parts['query'],$get);
+		parse_str($parts['query'], $get);
 
-		$deny = !$get['exec'] && preg_match(self::SCRIPT_EXTENSIONS_PREG,$parts['path']);
+		$deny = !$get['exec'] && preg_match(self::SCRIPT_EXTENSIONS_PREG, $parts['path']);
 
 		if (self::LOG_LEVEL > 1 || self::LOG_LEVEL > 0 && $deny)
 		{
@@ -717,21 +717,21 @@ 
 	 * @todo get $force_download working through webdav
 	 * @return string|false string with full download url or false to use default webdav.php url
 	 */
-	static function download_url($_url,$force_download=false)
+	static function download_url($_url, $force_download = false)
 	{
-		unset($force_download);	// not used, but required by interface
+		unset($force_download); // not used, but required by interface
 
-		list($url,$query) = explode('?',$_url,2);
+		list($url, $query) = explode('?', $_url, 2);
 		$get = null;
-		parse_str($query,$get);
-		if (empty($get['url'])) return false;	// no download url given for this mount-point
+		parse_str($query, $get);
+		if (empty($get['url'])) return false; // no download url given for this mount-point
 
-		if (!($mount_url = Vfs::mount_url($_url))) return false;	// no mount url found, should not happen
-		list($mount_url) = explode('?',$mount_url);
+		if (!($mount_url = Vfs::mount_url($_url))) return false; // no mount url found, should not happen
+		list($mount_url) = explode('?', $mount_url);
 
-		$relpath = substr($url,strlen($mount_url));
+		$relpath = substr($url, strlen($mount_url));
 
-		$download_url = Vfs::concat($get['url'],$relpath);
+		$download_url = Vfs::concat($get['url'], $relpath);
 		if ($download_url[0] == '/')
 		{
 			$download_url = ($_SERVER['HTTPS'] ? 'https://' : 'http://').

Braces +87 added lines, -22 removed lines

@@ -131,7 +131,9 @@ 
 		$read_only = str_replace('b','',$mode) == 'r';
 
 		// check access rights, based on the eGW mount perms
-		if (!($stat = $this->url_stat($url,0)) || $mode[0] == 'x')	// file not found or file should NOT exist
+		if (!($stat = $this->url_stat($url,0)) || $mode[0] == 'x')
+		{
+			// file not found or file should NOT exist
 		{
 			if ($mode[0] == 'r' ||	// does $mode require the file to exist (r,r+)
 				$mode[0] == 'x' ||	// or file should not exist, but does
@@ -139,6 +141,7 @@ 
 				!Vfs::check_access($dir,Vfs::WRITABLE,$dir_stat=$this->url_stat($dir,0)))	// or we are not allowed to 																																			create it
 			{
 				if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file does not exist or can not be created!");
+		}
 				if (!($options & STREAM_URL_STAT_QUIET))
 				{
 					trigger_error(__METHOD__."($url,$mode,$options) file does not exist or can not be created!",E_USER_WARNING);
@@ -146,9 +149,12 @@ 
 				return false;
 			}
 		}
-		elseif (!$read_only && !Vfs::check_access($url,Vfs::WRITABLE,$stat))	// we are not allowed to edit it
+		elseif (!$read_only && !Vfs::check_access($url,Vfs::WRITABLE,$stat))
+		{
+			// we are not allowed to edit it
 		{
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) file can not be edited!");
+		}
 			if (!($options & STREAM_URL_STAT_QUIET))
 			{
 				trigger_error(__METHOD__."($url,$mode,$options) file can not be edited!",E_USER_WARNING);
@@ -157,7 +163,10 @@ 
 		}
 		if (!$read_only && self::deny_script($url))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$mode,$options) permission denied, file is a script!");
+			}
 			if (!($options & STREAM_URL_STAT_QUIET))
 			{
 				trigger_error(__METHOD__."($url,$mode,$options) permission denied, file is a script!",E_USER_WARNING);
@@ -168,7 +177,10 @@ 
 		// open the "real" file
 		if (!($this->opened_stream = fopen($path=Vfs::decodePath(Vfs::parse_url($url,PHP_URL_PATH)),$mode,$options)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url,$mode,$options) fopen('$path','$mode',$options) returned false!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url,$mode,$options) fopen('$path','$mode',$options) returned false!");
+			}
 			return false;
 		}
 		$this->opened_stream_url = $url;
@@ -313,7 +325,10 @@ 
 		// check access rights (file need to exist and directory need to be writable
 		if (!file_exists($path) || is_dir($path) || !($dir = Vfs::dirname($url)) || !Vfs::check_access($dir,Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		return unlink($path);
@@ -339,17 +354,26 @@ 
 		// check access rights
 		if (!($from_stat = $this->url_stat($url_from,0)) || !($dir = Vfs::dirname($url_from)) || !Vfs::check_access($dir,Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $from[path] permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to): $from[path] permission denied!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		if (!($to_dir = Vfs::dirname($url_to)) || !Vfs::check_access($to_dir,Vfs::WRITABLE,$to_dir_stat = $this->url_stat($to_dir,0)))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to): $to_dir permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to): $to_dir permission denied!");
+			}
 			return false;	// no permission or parent-dir does not exist
 		}
 		if (self::deny_script($url_to))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_from,$url_to) permission denied, file is a script!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_from,$url_to) permission denied, file is a script!");
+			}
 			return false;
 		}
 		// the filesystem stream-wrapper does NOT allow to rename files to directories, as this makes problems
@@ -358,13 +382,19 @@ 
 			($to_stat['mime'] === self::DIR_MIME_TYPE) !== ($from_stat['mime'] === self::DIR_MIME_TYPE))
 		{
 			$is_dir = $to_stat['mime'] === self::DIR_MIME_TYPE ? 'a' : 'no';
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) $to[path] is $is_dir directory!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_to,$url_from) $to[path] is $is_dir directory!");
+			}
 			return false;	// no permission or file does not exist
 		}
 		// if destination file already exists, delete it
 		if ($to_stat && !self::unlink($url_to))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url_to,$url_from) can't unlink existing $url_to!");
+			}
 			return false;
 		}
 		return rename(Vfs::decodePath($from['path']),Vfs::decodePath($to['path']));
@@ -399,7 +429,10 @@ 
 		// check access rights (in real filesystem AND by mount perms)
 		if (!$parent_url || file_exists($path) || !file_exists($parent) || !is_writable($parent) || !Vfs::check_access($parent_url,Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;
 		}
 		return mkdir($path, 0700, $recursive);	// setting mode 0700 allows (only) apache to write into the dir
@@ -425,7 +458,10 @@ 
 		// check access rights (in real filesystem AND by mount perms)
 		if (!file_exists($path) || !is_writable($parent) || !($dir = Vfs::dirname($url)) || !Vfs::check_access($dir, Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;
 		}
 		return rmdir($path);
@@ -448,7 +484,7 @@ 
 	function stream_metadata($url, $option, $value)
 	{
  		if ($option != STREAM_META_TOUCH)
-		{
+ 		{
 			return false;	// not implemented / supported
 		}
 
@@ -458,7 +494,10 @@ 
 		// check access rights (in real filesystem AND by mount perms)
 		if (!file_exists($path) || !is_writable($parent) || !($dir = Vfs::dirname($url)) || !Vfs::check_access($dir, Vfs::WRITABLE))
 		{
-			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
+			if (self::LOG_LEVEL)
+			{
+				error_log(__METHOD__."($url) permission denied!");
+			}
 			return false;
 		}
 
@@ -475,7 +514,10 @@ 
 	 */
 	function dir_opendir ( $url, $options )
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$options)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$options)");
+		}
 
 		$this->opened_dir = null;
 
@@ -485,7 +527,10 @@ 
 
 		if (!($this->opened_dir = opendir($path)))
 		{
-			if (self::LOG_LEVEL > 0) error_log(__METHOD__."($url,$options) opendir('$path') failed!");
+			if (self::LOG_LEVEL > 0)
+			{
+				error_log(__METHOD__."($url,$options) opendir('$path') failed!");
+			}
 			return false;
 		}
 		return true;
@@ -541,7 +586,10 @@ 
 				$stat['mode'] = $stat[2] = $stat['mode'] & ~0222;
 			}
 		}
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.Vfs::int2mode($stat['mode']));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$flags) path=$path, mount_mode=".sprintf('0%o',$mode).", mode=".sprintf('0%o',$stat['mode']).'='.Vfs::int2mode($stat['mode']));
+		}
 		return $stat;
 	}
 
@@ -562,14 +610,23 @@ 
 
 			$ignore = !($file === false ||							// stop if no more dirs or
 				($file != '.' && $file != '..' ));					// file not . or ..
-			if (self::LOG_LEVEL > 1 && $ignore) error_log(__METHOD__.'() ignoring '.array2string($file));
+			if (self::LOG_LEVEL > 1 && $ignore)
+			{
+				error_log(__METHOD__.'() ignoring '.array2string($file));
+			}
 		}
 		while ($ignore);
 
 		// encode special chars messing up url's
-		if ($file !== false) $file = Vfs::encodePathComponent($file);
+		if ($file !== false)
+		{
+			$file = Vfs::encodePathComponent($file);
+		}
 
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__.'() returning '.array2string($file));
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__.'() returning '.array2string($file));
+		}
 
 		return $file;
 	}
@@ -724,9 +781,17 @@ 
 		list($url,$query) = explode('?',$_url,2);
 		$get = null;
 		parse_str($query,$get);
-		if (empty($get['url'])) return false;	// no download url given for this mount-point
+		if (empty($get['url']))
+		{
+			return false;
+		}
+		// no download url given for this mount-point
 
-		if (!($mount_url = Vfs::mount_url($_url))) return false;	// no mount url found, should not happen
+		if (!($mount_url = Vfs::mount_url($_url)))
+		{
+			return false;
+		}
+		// no mount url found, should not happen
 		list($mount_url) = explode('?',$mount_url);
 
 		$relpath = substr($url,strlen($mount_url));

api/src/Vfs/Hooks.php

Doc Comments -15 removed lines

@@ -37,8 +37,6 @@ 
 	 * Hook called after new accounts have been added
 	 *
 	 * @param array $data
-	 * @param int $data['account_id'] numerical id
-	 * @param string $data['account_lid'] account-name
 	 */
 	static function addAccount($data)
 	{
@@ -58,9 +56,6 @@ 
 	 * Hook called after accounts has been modified
 	 *
 	 * @param array $data
-	 * @param int $data['account_id'] numerical id
-	 * @param string $data['account_lid'] new account-name
-	 * @param string $data['old_loginid'] old account-name
 	 */
 	static function editAccount($data)
 	{
@@ -79,9 +74,6 @@ 
 	 * Hook called before an account get deleted
 	 *
 	 * @param array $data
-	 * @param int $data['account_id'] numerical id
-	 * @param string $data['account_lid'] account-name
-	 * @param int $data['new_owner'] account-id of new owner, or false if data should get deleted
 	 */
 	static function deleteAccount($data)
 	{
@@ -114,8 +106,6 @@ 
 	 * Hook called after new groups have been added
 	 *
 	 * @param array $data
-	 * @param int $data['account_id'] numerical id
-	 * @param string $data['account_lid'] group-name
 	 */
 	static function addGroup($data)
 	{
@@ -140,9 +130,6 @@ 
 	 * or if the group directory exists and creates it if not.
 	 *
 	 * @param array $data
-	 * @param int $data['account_id'] numerical id
-	 * @param string $data['account_lid'] new group-name
-	 * @param string $data['old_name'] old account-name
 	 */
 	static function editGroup($data)
 	{
@@ -170,8 +157,6 @@ 
 	 * Hook called before a group get deleted
 	 *
 	 * @param array $data
-	 * @param int $data['account_id'] numerical id
-	 * @param string $data['account_lid'] account-name
 	 */
 	static function deleteGroup($data)
 	{

Spacing +15 added lines, -15 removed lines

@@ -45,11 +45,11 @@ 
 		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 		// create a user-dir
 		Api\Vfs::$is_root = true;
-		if (Api\Vfs::file_exists($dir='/home/'.$data['account_lid']) || Api\Vfs::mkdir($dir, 0700, 0))
+		if (Api\Vfs::file_exists($dir = '/home/'.$data['account_lid']) || Api\Vfs::mkdir($dir, 0700, 0))
 		{
-			Api\Vfs::chown($dir,(int)$data['account_id']);
-			Api\Vfs::chgrp($dir,0);
-			Api\Vfs::chmod($dir,0700);	// only user has access
+			Api\Vfs::chown($dir, (int)$data['account_id']);
+			Api\Vfs::chgrp($dir, 0);
+			Api\Vfs::chmod($dir, 0700); // only user has access
 		}
 		Api\Vfs::$is_root = false;
 	}
@@ -67,11 +67,11 @@ 
 		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 		if (empty($data['account_lid']) || empty($data['old_loginid']) || $data['account_lid'] == $data['old_loginid'])
 		{
-			return;	// nothing to do here
+			return; // nothing to do here
 		}
 		// rename the user-dir
 		Api\Vfs::$is_root = true;
-		Api\Vfs::rename('/home/'.$data['old_loginid'],'/home/'.$data['account_lid']);
+		Api\Vfs::rename('/home/'.$data['old_loginid'], '/home/'.$data['account_lid']);
 		Api\Vfs::$is_root = false;
 	}
 
@@ -90,15 +90,15 @@ 
 		if ($data['new_owner'] && ($new_lid = $GLOBALS['egw']->accounts->id2name($data['new_owner'])))
 		{
 			// copy content of user-dir to new owner's user-dir as old-home-$name
-			for ($i=''; file_exists(Api\Vfs::PREFIX.($new_dir = '/home/'.$new_lid.'/old-home-'.$data['account_lid'].$i)); $i++)
+			for ($i = ''; file_exists(Api\Vfs::PREFIX.($new_dir = '/home/'.$new_lid.'/old-home-'.$data['account_lid'].$i)); $i++)
 			{
 
 			}
-			Api\Vfs::rename('/home/'.$data['account_lid'],$new_dir);
+			Api\Vfs::rename('/home/'.$data['account_lid'], $new_dir);
 			// make the new owner the owner of the dir and it's content
 			Api\Vfs::find($new_dir, array(), 'EGroupware\Api\Vfs::chown', $data['new_owner']);
 		}
-		elseif(!empty($data['account_lid']) && $data['account_lid'] != '/')
+		elseif (!empty($data['account_lid']) && $data['account_lid'] != '/')
 		{
 			// delete the user-directory
 			Api\Vfs::remove('/home/'.$data['account_lid']);
@@ -124,11 +124,11 @@ 
 
 		// create a group-dir
 		Api\Vfs::$is_root = true;
-		if (Api\Vfs::file_exists($dir='/home/'.$data['account_lid']) || Api\Vfs::mkdir($dir, 0070, 0))
+		if (Api\Vfs::file_exists($dir = '/home/'.$data['account_lid']) || Api\Vfs::mkdir($dir, 0070, 0))
 		{
-			Api\Vfs::chown($dir,0);
-			Api\Vfs::chgrp($dir,abs($data['account_id']));	// gid in Vfs is positiv!
-			Api\Vfs::chmod($dir,0070);	// only group has access
+			Api\Vfs::chown($dir, 0);
+			Api\Vfs::chgrp($dir, abs($data['account_id'])); // gid in Vfs is positiv!
+			Api\Vfs::chmod($dir, 0070); // only group has access
 		}
 		Api\Vfs::$is_root = false;
 	}
@@ -161,7 +161,7 @@ 
 		{
 			// rename the group-dir
 			Api\Vfs::$is_root = true;
-			Api\Vfs::rename('/home/'.$data['old_name'],'/home/'.$data['account_lid']);
+			Api\Vfs::rename('/home/'.$data['old_name'], '/home/'.$data['account_lid']);
 			Api\Vfs::$is_root = false;
 		}
 	}
@@ -177,7 +177,7 @@ 
 	{
 		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
 
-		if(empty($data['account_lid']) || $data['account_lid'] == '/')
+		if (empty($data['account_lid']) || $data['account_lid'] == '/')
 		{
 			throw new Api\Exception\AssertionFailed(__METHOD__.'('.array2string($data).') account_lid NOT set!');
 		}

Braces +32 added lines, -8 removed lines

@@ -42,7 +42,10 @@ 
 	 */
 	static function addAccount($data)
 	{
-		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
+		if (self::LOG_LEVEL > 0)
+		{
+			error_log(__METHOD__.'('.array2string($data).')');
+		}
 		// create a user-dir
 		Api\Vfs::$is_root = true;
 		if (Api\Vfs::file_exists($dir='/home/'.$data['account_lid']) || Api\Vfs::mkdir($dir, 0700, 0))
@@ -64,7 +67,10 @@ 
 	 */
 	static function editAccount($data)
 	{
-		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
+		if (self::LOG_LEVEL > 0)
+		{
+			error_log(__METHOD__.'('.array2string($data).')');
+		}
 		if (empty($data['account_lid']) || empty($data['old_loginid']) || $data['account_lid'] == $data['old_loginid'])
 		{
 			return;	// nothing to do here
@@ -85,7 +91,10 @@ 
 	 */
 	static function deleteAccount($data)
 	{
-		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
+		if (self::LOG_LEVEL > 0)
+		{
+			error_log(__METHOD__.'('.array2string($data).')');
+		}
 		Api\Vfs::$is_root = true;
 		if ($data['new_owner'] && ($new_lid = $GLOBALS['egw']->accounts->id2name($data['new_owner'])))
 		{
@@ -119,8 +128,14 @@ 
 	 */
 	static function addGroup($data)
 	{
-		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
-		if (empty($data['account_lid'])) throw new Api\Exception\WrongParameter('account_lid must not be empty!');
+		if (self::LOG_LEVEL > 0)
+		{
+			error_log(__METHOD__.'('.array2string($data).')');
+		}
+		if (empty($data['account_lid']))
+		{
+			throw new Api\Exception\WrongParameter('account_lid must not be empty!');
+		}
 
 		// create a group-dir
 		Api\Vfs::$is_root = true;
@@ -146,8 +161,14 @@ 
 	 */
 	static function editGroup($data)
 	{
-		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
-		if (empty($data['account_lid']) || empty($data['old_name'])) throw new Api\Exception\WrongParameter('account_lid and old_name must not be empty!');
+		if (self::LOG_LEVEL > 0)
+		{
+			error_log(__METHOD__.'('.array2string($data).')');
+		}
+		if (empty($data['account_lid']) || empty($data['old_name']))
+		{
+			throw new Api\Exception\WrongParameter('account_lid and old_name must not be empty!');
+		}
 
 		if ($data['account_lid'] == $data['old_name'])
 		{
@@ -175,7 +196,10 @@ 
 	 */
 	static function deleteGroup($data)
 	{
-		if (self::LOG_LEVEL > 0) error_log(__METHOD__.'('.array2string($data).')');
+		if (self::LOG_LEVEL > 0)
+		{
+			error_log(__METHOD__.'('.array2string($data).')');
+		}
 
 		if(empty($data['account_lid']) || $data['account_lid'] == '/')
 		{

api/src/Vfs/Links/StreamWrapper.php

Doc Comments +1 added lines, -1 removed lines

@@ -316,7 +316,7 @@
 	 *
 	 * @param string $url URL that was passed to opendir() and that this object is expected to explore.
 	 * @param $options
-	 * @return booelan
+	 * @return boolean
 	 */
 	function dir_opendir ( $url, $options )
 	{

Braces +31 added lines, -9 removed lines

@@ -26,7 +26,9 @@ 
  */
 if (!class_exists('EGroupware\\Api\\Vfs\\Links\\LinksParent', false))
 {
-	class LinksParent extends Vfs\Sqlfs\StreamWrapper {}
+	class LinksParent extends Vfs\Sqlfs\StreamWrapper
+	{
+}
 }
 
 /**
@@ -116,7 +118,10 @@ 
 			$access = Api\Link::file_access($app,$id,$required,$rel_path,Vfs::$user);
 			$what = "from Api\Link::file_access('$app',$id,$required,'$rel_path,".Vfs::$user.")";
 		}
-		if (self::DEBUG) error_log(__METHOD__."($url,$check) user=".Vfs::$user." ($what) ".($access?"access granted ($app:$id:$rel_path)":'no access!!!'));
+		if (self::DEBUG)
+		{
+			error_log(__METHOD__."($url,$check) user=".Vfs::$user." ($what) ".($access?"access granted ($app:$id:$rel_path)":'no access!!!'));
+		}
 		return $access;
 	}
 
@@ -180,7 +185,10 @@ 
 				);
 			}
 		}
-		if (self::DEBUG) error_log(__METHOD__."('$url', $flags) calling parent::url_stat(,,".array2string($eacl_check).') returning '.array2string($ret));
+		if (self::DEBUG)
+		{
+			error_log(__METHOD__."('$url', $flags) calling parent::url_stat(,,".array2string($eacl_check).') returning '.array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -238,20 +246,31 @@ 
 
 		if($path[0] != '/')
 		{
-			if (strpos($path,'?') !== false) $query = Vfs::parse_url($path,PHP_URL_QUERY);
+			if (strpos($path,'?') !== false)
+			{
+				$query = Vfs::parse_url($path,PHP_URL_QUERY);
+			}
 			$path = Vfs::parse_url($path,PHP_URL_PATH).($query ? '?'.$query : '');
 		}
 		list(,$apps,$app,$id) = explode('/',$path);
 
 		$ret = false;
-		if ($apps == 'apps' && $app && !$id || self::check_extended_acl($path,Vfs::WRITABLE))	// app directory itself is allways ok
+		if ($apps == 'apps' && $app && !$id || self::check_extended_acl($path,Vfs::WRITABLE))
 		{
-			$current_is_root = Vfs::$is_root; Vfs::$is_root = true;
+			// app directory itself is allways ok
+		{
+			$current_is_root = Vfs::$is_root;
+		}
+		Vfs::$is_root = true;
 			$current_user = Vfs::$user; Vfs::$user = 0;
 
 			$sqlfs = new parent();
 			$ret = $sqlfs->mkdir($path,0,$options|STREAM_MKDIR_RECURSIVE);
-			if ($id) $sqlfs->chmod($path,0);	// no other rights
+			if ($id)
+			{
+				$sqlfs->chmod($path,0);
+			}
+			// no other rights
 
 			Vfs::$user = $current_user;
 			Vfs::$is_root = $current_is_root;
@@ -339,10 +358,13 @@ 
 	 */
 	protected function touch($url,$time=null,$atime=null)
 	{
-		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$time,$atime)");
+		if (self::LOG_LEVEL > 1)
+		{
+			error_log(__METHOD__."($url,$time,$atime)");
+		}
 
  		if (!($stat = $this->url_stat($url,STREAM_URL_STAT_QUIET)))
-		{
+ 		{
 			// file does not exist --> create an empty one
 			if (!($f = fopen(self::SCHEME.'://default'.Vfs::parse_url($url,PHP_URL_PATH),'w')) || !fclose($f))
 			{

Spacing +46 added lines, -46 removed lines

@@ -76,34 +76,34 @@ 
 	 * @param int $check mode to check: one or more or'ed together of: 4 = read, 2 = write, 1 = executable
 	 * @return boolean
 	 */
-	static function check_extended_acl($url,$check)
+	static function check_extended_acl($url, $check)
 	{
 		if (Vfs::$is_root)
 		{
 			return true;
 		}
-		$path = Vfs::parse_url($url,PHP_URL_PATH);
+		$path = Vfs::parse_url($url, PHP_URL_PATH);
 
-		list(,$apps,$app,$id,$rel_path) = explode('/',$path,5);
+		list(,$apps, $app, $id, $rel_path) = explode('/', $path, 5);
 
 		if ($apps != 'apps')
 		{
-			$access = false;							// no access to anything, but /apps
+			$access = false; // no access to anything, but /apps
 			$what = '!= apps';
 		}
 		elseif (!$app)
 		{
-			$access = !($check & Vfs::WRITABLE);	// always grant read access to /apps
+			$access = !($check&Vfs::WRITABLE); // always grant read access to /apps
 			$what = '!$app';
 		}
-		elseif(!isset($GLOBALS['egw_info']['user']['apps'][$app]))
+		elseif (!isset($GLOBALS['egw_info']['user']['apps'][$app]))
 		{
-			$access = false;							// user has no access to the $app application
+			$access = false; // user has no access to the $app application
 			$what = 'no app-rights';
 		}
 		elseif (!$id)
 		{
-			$access = true;								// grant read&write access to /apps/$app
+			$access = true; // grant read&write access to /apps/$app
 			$what = 'app dir';
 		}
 		// allow applications to implement their own access control to the file storage
@@ -112,11 +112,11 @@ 
 		else
 		{
 			// vfs & stream-wrapper use posix rights, Api\Link::file_access uses Api\Acl::{EDIT|READ}!
-			$required = $check & Vfs::WRITABLE ? Api\Acl::EDIT : Api\Acl::READ;
-			$access = Api\Link::file_access($app,$id,$required,$rel_path,Vfs::$user);
+			$required = $check&Vfs::WRITABLE ? Api\Acl::EDIT : Api\Acl::READ;
+			$access = Api\Link::file_access($app, $id, $required, $rel_path, Vfs::$user);
 			$what = "from Api\Link::file_access('$app',$id,$required,'$rel_path,".Vfs::$user.")";
 		}
-		if (self::DEBUG) error_log(__METHOD__."($url,$check) user=".Vfs::$user." ($what) ".($access?"access granted ($app:$id:$rel_path)":'no access!!!'));
+		if (self::DEBUG) error_log(__METHOD__."($url,$check) user=".Vfs::$user." ($what) ".($access ? "access granted ($app:$id:$rel_path)" : 'no access!!!'));
 		return $access;
 	}
 
@@ -137,19 +137,19 @@ 
 	 *                          stat triggers it's own warning anyway, so it makes no sense to trigger one by our stream-wrapper!
 	 * @return array
 	 */
-	function url_stat ( $url, $flags )
+	function url_stat($url, $flags)
 	{
-		$eacl_check=self::check_extended_acl($url,Vfs::READABLE);
+		$eacl_check = self::check_extended_acl($url, Vfs::READABLE);
 
 		// return vCard as /.entry
-		if ( $eacl_check && substr($url,-7) == '/.entry' &&
-			(list($app) = array_slice(explode('/',$url),-3,1)) && $app === 'addressbook')
+		if ($eacl_check && substr($url, -7) == '/.entry' &&
+			(list($app) = array_slice(explode('/', $url), -3, 1)) && $app === 'addressbook')
 		{
 			$ret = array(
 				'ino'   => '#'.md5($url),
 				'name'  => '.entry',
-				'mode'  => self::MODE_FILE|Vfs::READABLE,	// required by the stream wrapper
-				'size'  => 1024,	// fmail does NOT attach files with size 0!
+				'mode'  => self::MODE_FILE|Vfs::READABLE, // required by the stream wrapper
+				'size'  => 1024, // fmail does NOT attach files with size 0!
 				'uid'   => 0,
 				'gid'   => 0,
 				'mtime' => time(),
@@ -160,15 +160,15 @@ 
 			);
 		}
 		// if entry directory does not exist --> return fake directory
-		elseif (!($ret = parent::url_stat($url,$flags,$eacl_check)) && $eacl_check)
+		elseif (!($ret = parent::url_stat($url, $flags, $eacl_check)) && $eacl_check)
 		{
-			list(,/*$apps*/,/*$app*/,$id,$rel_path) = explode('/', Vfs::parse_url($url, PHP_URL_PATH), 5);
+			list(,/*$apps*/, /*$app*/, $id, $rel_path) = explode('/', Vfs::parse_url($url, PHP_URL_PATH), 5);
 			if ($id && !isset($rel_path))
 			{
 				$ret = array(
 					'ino'   => '#'.md5($url),
 					'name'  => $id,
-					'mode'  => self::MODE_DIR,	// required by the stream wrapper
+					'mode'  => self::MODE_DIR, // required by the stream wrapper
 					'size'  => 0,
 					'uid'   => 0,
 					'gid'   => 0,
@@ -195,9 +195,9 @@ 
 	 * @param int $fs_id =null fs_id to use, to not query it again (eg. because it's already deleted)
 	 * @return boolean true if acl is set/deleted, false on error
 	 */
-	static function eacl($path,$rights=null,$owner=null,$fs_id=null)
+	static function eacl($path, $rights = null, $owner = null, $fs_id = null)
 	{
-		unset($path, $rights, $owner, $fs_id);	// not used, but required by function signature
+		unset($path, $rights, $owner, $fs_id); // not used, but required by function signature
 
 		return false;
 	}
@@ -212,7 +212,7 @@ 
 	 */
 	static function get_eacl($path)
 	{
-		unset($path);	// not used, but required by function signature
+		unset($path); // not used, but required by function signature
 
 		return false;
 	}
@@ -232,26 +232,26 @@ 
 	 * @param int $options Posible values include STREAM_REPORT_ERRORS and STREAM_MKDIR_RECURSIVE, we allways use recursive!
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	function mkdir($path,$mode,$options)
+	function mkdir($path, $mode, $options)
 	{
-		unset($mode);	// not used, but required by function signature
+		unset($mode); // not used, but required by function signature
 
-		if($path[0] != '/')
+		if ($path[0] != '/')
 		{
-			if (strpos($path,'?') !== false) $query = Vfs::parse_url($path,PHP_URL_QUERY);
-			$path = Vfs::parse_url($path,PHP_URL_PATH).($query ? '?'.$query : '');
+			if (strpos($path, '?') !== false) $query = Vfs::parse_url($path, PHP_URL_QUERY);
+			$path = Vfs::parse_url($path, PHP_URL_PATH).($query ? '?'.$query : '');
 		}
-		list(,$apps,$app,$id) = explode('/',$path);
+		list(,$apps, $app, $id) = explode('/', $path);
 
 		$ret = false;
-		if ($apps == 'apps' && $app && !$id || self::check_extended_acl($path,Vfs::WRITABLE))	// app directory itself is allways ok
+		if ($apps == 'apps' && $app && !$id || self::check_extended_acl($path, Vfs::WRITABLE))	// app directory itself is allways ok
 		{
 			$current_is_root = Vfs::$is_root; Vfs::$is_root = true;
 			$current_user = Vfs::$user; Vfs::$user = 0;
 
 			$sqlfs = new parent();
-			$ret = $sqlfs->mkdir($path,0,$options|STREAM_MKDIR_RECURSIVE);
-			if ($id) $sqlfs->chmod($path,0);	// no other rights
+			$ret = $sqlfs->mkdir($path, 0, $options|STREAM_MKDIR_RECURSIVE);
+			if ($id) $sqlfs->chmod($path, 0); // no other rights
 
 			Vfs::$user = $current_user;
 			Vfs::$is_root = $current_is_root;
@@ -275,23 +275,23 @@ 
 	 * @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 ( $url, $mode, $options, &$opened_path )
+	function stream_open($url, $mode, $options, &$opened_path)
 	{
 		// the following call is necessary to fill sqlfs_stream_wrapper::$stat_cache, WITH the extendes ACL!
-		$stat = $this->url_stat($url,0);
+		$stat = $this->url_stat($url, 0);
 		//error_log(__METHOD__."('$url', '$mode', $options) stat=".array2string($stat));
 
 		// return vCard as /.entry
-		if ($stat && $mode[0] == 'r' && substr($url,-7) === '/.entry' &&
-			(list($app) = array_slice(explode('/',$url),-3,1)) && $app === 'addressbook')
+		if ($stat && $mode[0] == 'r' && substr($url, -7) === '/.entry' &&
+			(list($app) = array_slice(explode('/', $url), -3, 1)) && $app === 'addressbook')
 		{
-			list($id) = array_slice(explode('/',$url),-2,1);
-			$ab_vcard = new addressbook_vcal('addressbook','text/vcard');
+			list($id) = array_slice(explode('/', $url), -2, 1);
+			$ab_vcard = new addressbook_vcal('addressbook', 'text/vcard');
 			if (!($charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset']))
 			{
 				$charset = 'utf-8';
 			}
-			if (!($vcard =& $ab_vcard->getVCard($id, $charset)))
+			if (!($vcard = & $ab_vcard->getVCard($id, $charset)))
 			{
 				error_log(__METHOD__."('$url', '$mode', $options) addressbook_vcal::getVCard($id) returned false!");
 				return false;
@@ -306,9 +306,9 @@ 
 		if ($mode[0] != 'r' && ($dir = Vfs::dirname($url)) &&
 			!parent::url_stat($dir, 0) && self::check_extended_acl($dir, Vfs::WRITABLE))
 		{
-			$this->mkdir($dir,0,STREAM_MKDIR_RECURSIVE);
+			$this->mkdir($dir, 0, STREAM_MKDIR_RECURSIVE);
 		}
-		return parent::stream_open($url,$mode,$options,$opened_path);
+		return parent::stream_open($url, $mode, $options, $opened_path);
 	}
 
 	/**
@@ -320,7 +320,7 @@ 
 	 * @param $options
 	 * @return booelan
 	 */
-	function dir_opendir ( $url, $options )
+	function dir_opendir($url, $options)
 	{
 		if (!parent::url_stat($url, STREAM_URL_STAT_QUIET) && $this->url_stat($url, STREAM_URL_STAT_QUIET))
 		{
@@ -337,20 +337,20 @@ 
 	 * @param int $time =null modification time (unix timestamp), default null = current time
 	 * @param int $atime =null access time (unix timestamp), default null = current time, not implemented in the vfs!
 	 */
-	protected function touch($url,$time=null,$atime=null)
+	protected function touch($url, $time = null, $atime = null)
 	{
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($url,$time,$atime)");
 
- 		if (!($stat = $this->url_stat($url,STREAM_URL_STAT_QUIET)))
+ 		if (!($stat = $this->url_stat($url, STREAM_URL_STAT_QUIET)))
 		{
 			// file does not exist --> create an empty one
-			if (!($f = fopen(self::SCHEME.'://default'.Vfs::parse_url($url,PHP_URL_PATH),'w')) || !fclose($f))
+			if (!($f = fopen(self::SCHEME.'://default'.Vfs::parse_url($url, PHP_URL_PATH), 'w')) || !fclose($f))
 			{
 				return false;
 			}
 		}
 
-		return is_null($time) ? true : parent::touch($url,$time,$atime);
+		return is_null($time) ? true : parent::touch($url, $time, $atime);
 	}
 
 	/**

api/src/Vfs/Sharing.php

Doc Comments +1 added lines, -1 removed lines

@@ -98,7 +98,6 @@ 
 	/**
 	 * Protected constructor called via self::create_session
 	 *
-	 * @param string $token
 	 * @param array $share
 	 */
 	protected function __construct(array $share)
@@ -109,6 +108,7 @@ 
 
 	/**
 	 * Get token from url
+	 * @return string
 	 */
 	public static function get_token()
 	{

Indentation +13 added lines, -13 removed lines

@@ -72,10 +72,10 @@ 
 	const WRITABLE = 'share_rw';
 
  	/**
-	 * Modes for sharing files
-	 *
-	 * @var array
-	 */
+ 	 * Modes for sharing files
+ 	 *
+ 	 * @var array
+ 	 */
 	static $modes = array(
 		self::ATTACH => array(
 			'label' => 'Attachment',
@@ -112,16 +112,16 @@ 
 	 */
 	public static function get_token()
 	{
-        // WebDAV has no concept of a query string and clients (including cadaver)
-        // seem to pass '?' unencoded, so we need to extract the path info out
-        // of the request URI ourselves
-        // if request URI contains a full url, remove schema and domain
+		// WebDAV has no concept of a query string and clients (including cadaver)
+		// seem to pass '?' unencoded, so we need to extract the path info out
+		// of the request URI ourselves
+		// if request URI contains a full url, remove schema and domain
 		$matches = null;
-        if (preg_match('|^https?://[^/]+(/.*)$|', $path_info=$_SERVER['REQUEST_URI'], $matches))
-        {
-        	$path_info = $matches[1];
-        }
-        $path_info = substr($path_info, strlen($_SERVER['SCRIPT_NAME']));
+		if (preg_match('|^https?://[^/]+(/.*)$|', $path_info=$_SERVER['REQUEST_URI'], $matches))
+		{
+			$path_info = $matches[1];
+		}
+		$path_info = substr($path_info, strlen($_SERVER['SCRIPT_NAME']));
 		list(, $token/*, $path*/) = preg_split('|[/?]|', $path_info, 3);
 
 		return $token;

Spacing +26 added lines, -27 removed lines

@@ -117,7 +117,7 @@ 
         // of the request URI ourselves
         // if request URI contains a full url, remove schema and domain
 		$matches = null;
-        if (preg_match('|^https?://[^/]+(/.*)$|', $path_info=$_SERVER['REQUEST_URI'], $matches))
+        if (preg_match('|^https?://[^/]+(/.*)$|', $path_info = $_SERVER['REQUEST_URI'], $matches))
         {
         	$path_info = $matches[1];
         }
@@ -155,7 +155,7 @@ 
 	 * @param boolean $keep_session =null null: create a new session, true: try mounting it into existing (already verified) session
 	 * @return string with sessionid, does NOT return if no session created
 	 */
-	public static function create_session($keep_session=null)
+	public static function create_session($keep_session = null)
 	{
 		self::$db = $GLOBALS['egw']->db;
 
@@ -208,11 +208,11 @@ 
 		// need to reset fs_tab, as resolve_url does NOT work with just share mounted
 		if (count($GLOBALS['egw_info']['server']['vfs_fstab']) <= 1)
 		{
-			unset($GLOBALS['egw_info']['server']['vfs_fstab']);	// triggers reset of fstab in mount()
+			unset($GLOBALS['egw_info']['server']['vfs_fstab']); // triggers reset of fstab in mount()
 			$GLOBALS['egw_info']['server']['vfs_fstab'] = Vfs::mount();
 			Vfs::clearstatcache();
 		}
-		$share['resolve_url'] = Vfs::resolve_url($share['share_path'], true, true, true, true);	// true = fix evtl. contained url parameter
+		$share['resolve_url'] = Vfs::resolve_url($share['share_path'], true, true, true, true); // true = fix evtl. contained url parameter
 		// if share not writable append ro=1 to mount url to make it readonly
 		if (!self::$db->from_bool($share['share_writable']))
 		{
@@ -257,7 +257,7 @@ 
 
 		// update accessed timestamp
 		self::$db->update(self::TABLE, array(
-			'share_last_accessed' => $share['share_last_accessed']=time(),
+			'share_last_accessed' => $share['share_last_accessed'] = time(),
 		), array(
 			'share_id' => $share['share_id'],
 		), __LINE__, __FILE__);
@@ -299,7 +299,7 @@ 
 		if ($keep_session || $sessionid)
 		{
 			$_SESSION[Api\Session::EGW_INFO_CACHE] = $GLOBALS['egw_info'];
-			unset($_SESSION[Api\Session::EGW_INFO_CACHE]['flags']);	// dont save the flags, they change on each request
+			unset($_SESSION[Api\Session::EGW_INFO_CACHE]['flags']); // dont save the flags, they change on each request
 
 			$_SESSION[Api\Session::EGW_OBJECT_CACHE] = serialize($GLOBALS['egw']);
 		}
@@ -368,8 +368,7 @@ 
 		// generate random token (using oppenssl if available otherwise mt_rand based Api\Auth::randomstring)
 		do {
 			$token = function_exists('openssl_random_pseudo_bytes') ?
-				base64_encode(openssl_random_pseudo_bytes(3*self::TOKEN_LENGTH/4)) :
-				Api\Auth::randomstring(self::TOKEN_LENGTH);
+				base64_encode(openssl_random_pseudo_bytes(3 * self::TOKEN_LENGTH / 4)) : Api\Auth::randomstring(self::TOKEN_LENGTH);
 			// base64 can contain chars not allowed in our vfs-urls eg. / or #
 		} while ($token != Vfs::encodePathComponent($token));
 
@@ -389,13 +388,13 @@ 
 	 * @throw Api\Exception\AssertionFailed if user temp. directory does not exist and can not be created
 	 * @return array with share data, eg. value for key 'share_token'
 	 */
-	public static function create($path, $mode, $name, $recipients, $extra=array())
+	public static function create($path, $mode, $name, $recipients, $extra = array())
 	{
 		if (!isset(self::$db)) self::$db = $GLOBALS['egw']->db;
 
 		if (empty($name)) $name = $path;
 
-		$path2tmp =& Api\Cache::getSession(__CLASS__, 'path2tmp');
+		$path2tmp = & Api\Cache::getSession(__CLASS__, 'path2tmp');
 
 		// allow filesystem path only for temp_dir
 		$temp_dir = $GLOBALS['egw_info']['server']['temp_dir'].'/';
@@ -406,7 +405,7 @@ 
 		}
 		else
 		{
-			if(parse_url($path, PHP_URL_SCHEME) !== 'vfs')
+			if (parse_url($path, PHP_URL_SCHEME) !== 'vfs')
 			{
 				$path = 'vfs://default'.($path[0] == '/' ? '' : '/').$path;
 			}
@@ -420,7 +419,7 @@ 
 		}
 		// check if file has been shared before, with identical attributes
 		if (($mode != self::LINK || isset($path2tmp[$path])) &&
-			($share = self::$db->select(self::TABLE, '*', $extra+array(
+			($share = self::$db->select(self::TABLE, '*', $extra + array(
 				'share_path' => $mode == 'link' ? $path2tmp[$path] : $vfs_path,
 				'share_owner' => $GLOBALS['egw_info']['user']['account_id'],
 				'share_expires' => null,
@@ -431,7 +430,7 @@ 
 			// if yes, just add additional recipients
 			$share['share_with'] = $share['share_with'] ? explode(',', $share['share_with']) : array();
 			$need_save = false;
-			foreach((array)$recipients as $recipient)
+			foreach ((array)$recipients as $recipient)
 			{
 				if (!in_array($recipient, $share['share_with']))
 				{
@@ -461,9 +460,9 @@ 
 				}
 				$n = 0;
 				do {
-					$tmp_file = Vfs::concat($user_tmp, ($n?$n.'.':'').Vfs::basename($name));
+					$tmp_file = Vfs::concat($user_tmp, ($n ? $n.'.' : '').Vfs::basename($name));
 				}
-				while(!(is_dir($path) && Vfs::mkdir($tmp_file, null, STREAM_MKDIR_RECURSIVE) ||
+				while (!(is_dir($path) && Vfs::mkdir($tmp_file, null, STREAM_MKDIR_RECURSIVE) ||
 					!is_dir($path) && (!Vfs::file_exists($tmp_file) && ($fp = Vfs::fopen($tmp_file, 'x')) ||
 						// do not copy identical files again to users tmp dir, just re-use them
 						Vfs::file_exists($tmp_file) && Vfs::compare(Vfs::PREFIX.$tmp_file, $path))) && $n++ < 100);
@@ -488,12 +487,12 @@ 
 				$async = new Api\Asyncservice();
 				if (!$async->read('egw_sharing-tmp-cleanup'))
 				{
-					$async->set_timer(array('day' => 28),'egw_sharing-tmp_cleanup','EGroupware\\Api\\Vfs\\Sharing::tmp_cleanup',null);
+					$async->set_timer(array('day' => 28), 'egw_sharing-tmp_cleanup', 'EGroupware\\Api\\Vfs\\Sharing::tmp_cleanup', null);
 				}
 			}
 
 			$i = 0;
-			while(true)	// self::token() can return an existing value
+			while (true)	// self::token() can return an existing value
 			{
 				try {
 					self::$db->insert(self::TABLE, $share = array(
@@ -502,12 +501,12 @@ 
 						'share_owner' => $GLOBALS['egw_info']['user']['account_id'],
 						'share_with' => implode(',', (array)$recipients),
 						'share_created' => time(),
-					)+$extra, false, __LINE__, __FILE__);
+					) + $extra, false, __LINE__, __FILE__);
 
 					$share['share_id'] = self::$db->get_last_insert_id(self::TABLE, 'share_id');
 					break;
 				}
-				catch(Api\Db\Exception $e) {
+				catch (Api\Db\Exception $e) {
 					if ($i++ > 3) throw $e;
 					unset($e);
 				}
@@ -550,8 +549,8 @@ 
 
 		// get all temp. files, to be able to delete them
 		$tmp_paths = array();
-		foreach(self::$db->select(self::TABLE, 'share_path', array(
-			"share_path LIKE '/home/%/.tmp/%'")+$keys, __LINE__, __FILE__, false) as $row)
+		foreach (self::$db->select(self::TABLE, 'share_path', array(
+			"share_path LIKE '/home/%/.tmp/%'") + $keys, __LINE__, __FILE__, false) as $row)
 		{
 			$tmp_paths[] = $row['share_path'];
 		}
@@ -563,7 +562,7 @@ 
 		// check if temp. files are used elsewhere
 		if ($tmp_paths)
 		{
-			foreach(self::$db->select(self::TABLE, 'share_path,COUNT(*) AS cnt', array(
+			foreach (self::$db->select(self::TABLE, 'share_path,COUNT(*) AS cnt', array(
 				'share_path' => $tmp_paths,
 			), __LINE__, __FILE__, false, 'GROUP BY share_path') as $row)
 			{
@@ -573,7 +572,7 @@ 
 				}
 			}
 			// if not delete them
-			foreach($tmp_paths as $path)
+			foreach ($tmp_paths as $path)
 			{
 				Vfs::remove($path);
 			}
@@ -607,11 +606,11 @@ 
 			// remove expired tmp-files unconditionally
 			$having = 'HAVING MAX(share_expires) < '.self::$db->quote(self::$db->to_timestamp(time())).' OR '.
 				// remove without expiration date, when created over 100 days ago AND
-				'MAX(share_expires) IS NULL AND MAX(share_created) < '.self::$db->quote(self::$db->to_timestamp(time()-self::TMP_KEEP)). ' AND '.
+				'MAX(share_expires) IS NULL AND MAX(share_created) < '.self::$db->quote(self::$db->to_timestamp(time() - self::TMP_KEEP)).' AND '.
 					// (last accessed over 100 days ago OR never)
-					'(MAX(share_last_accessed) IS NULL OR MAX(share_last_accessed) < '.self::$db->quote(self::$db->to_timestamp(time()-self::TMP_KEEP)).')';
+					'(MAX(share_last_accessed) IS NULL OR MAX(share_last_accessed) < '.self::$db->quote(self::$db->to_timestamp(time() - self::TMP_KEEP)).')';
 
-			foreach(self::$db->select(self::TABLE, $cols, array(
+			foreach (self::$db->select(self::TABLE, $cols, array(
 				"share_path LIKE '/home/%/.tmp/%'",
 			), __LINE__, __FILE__, false, 'GROUP BY share_path '.$having) as $row)
 			{
@@ -624,7 +623,7 @@ 
 				else
 				{
 					$share_ids = array();
-					foreach(self::$db->selec(self::TABLE, 'share_id', array(
+					foreach (self::$db->selec(self::TABLE, 'share_id', array(
 						'share_path' => $row['share_path'],
 					), __LINE__, __FILE__) as $id)
 					{

Braces +48 added lines, -12 removed lines

@@ -166,7 +166,10 @@ 
 		if ($token && !$keep_session)
 		{
 			$_SERVER['PHP_AUTH_USER'] = $token;
-			if (!isset($_SERVER['PHP_AUTH_PW'])) $_SERVER['PHP_AUTH_PW'] = '';
+			if (!isset($_SERVER['PHP_AUTH_PW']))
+			{
+				$_SERVER['PHP_AUTH_PW'] = '';
+			}
 
 			unset($GLOBALS['egw_info']['flags']['autocreate_session_callback']);
 			if ($GLOBALS['egw']->session->verify() && isset($GLOBALS['egw']->sharing) &&
@@ -220,9 +223,12 @@ 
 		}
 		//_debug_array($share);
 
-		if ($keep_session)	// add share to existing session
+		if ($keep_session)
+		{
+			// add share to existing session
 		{
 			$share['share_root'] = '/'.$share['share_token'];
+		}
 
 			// if current user is not the share owner, we cant just mount share
 			if (Vfs::$user != $share['share_owner'])
@@ -230,12 +236,15 @@ 
 				$keep_session = false;
 			}
 		}
-		if (!$keep_session)	// do NOT change to else, as we might have set $keep_session=false!
+		if (!$keep_session)
+		{
+			// do NOT change to else, as we might have set $keep_session=false!
 		{
 			// only allow filemanager app
 			$GLOBALS['egw_info']['user']['apps'] = array(
 				'filemanager' => $GLOBALS['egw_info']['apps']['filemanager']
 			);
+		}
 
 			$share['share_root'] = '/';
 			Vfs::$user = $share['share_owner'];
@@ -391,9 +400,15 @@ 
 	 */
 	public static function create($path, $mode, $name, $recipients, $extra=array())
 	{
-		if (!isset(self::$db)) self::$db = $GLOBALS['egw']->db;
+		if (!isset(self::$db))
+		{
+			self::$db = $GLOBALS['egw']->db;
+		}
 
-		if (empty($name)) $name = $path;
+		if (empty($name))
+		{
+			$name = $path;
+		}
 
 		$path2tmp =& Api\Cache::getSession(__CLASS__, 'path2tmp');
 
@@ -472,7 +487,10 @@ 
 				{
 					throw new Api\Exception\AssertionFailed("Could NOT create temp. file '$tmp_file'!");
 				}
-				if ($fp) fclose($fp);
+				if ($fp)
+				{
+					fclose($fp);
+				}
 
 				if (is_dir($path) && !Vfs::copy_files(array($path), $tmp_file) ||
 					!is_dir($path) && !copy($path, Vfs::PREFIX.$tmp_file))
@@ -493,7 +511,9 @@ 
 			}
 
 			$i = 0;
-			while(true)	// self::token() can return an existing value
+			while(true)
+			{
+				// self::token() can return an existing value
 			{
 				try {
 					self::$db->insert(self::TABLE, $share = array(
@@ -503,12 +523,16 @@ 
 						'share_with' => implode(',', (array)$recipients),
 						'share_created' => time(),
 					)+$extra, false, __LINE__, __FILE__);
+			}
 
 					$share['share_id'] = self::$db->get_last_insert_id(self::TABLE, 'share_id');
 					break;
 				}
 				catch(Api\Db\Exception $e) {
-					if ($i++ > 3) throw $e;
+					if ($i++ > 3)
+					{
+						throw $e;
+					}
 					unset($e);
 				}
 			}
@@ -546,7 +570,10 @@ 
 	{
 		self::$db = $GLOBALS['egw']->db;
 
-		if (is_scalar($keys)) $keys = array('share_id' => $keys);
+		if (is_scalar($keys))
+		{
+			$keys = array('share_id' => $keys);
+		}
 
 		// get all temp. files, to be able to delete them
 		$tmp_paths = array();
@@ -593,7 +620,10 @@ 
 	 */
 	public static function tmp_cleanup()
 	{
-		if (!isset(self::$db)) self::$db = $GLOBALS['egw']->db;
+		if (!isset(self::$db))
+		{
+			self::$db = $GLOBALS['egw']->db;
+		}
 		Vfs::$is_root = true;
 
 		try {
@@ -603,7 +633,10 @@ 
 				'MAX(share_created) AS share_created',
 				'MAX(share_last_accessed) AS share_last_accessed',
 			);
-			if (($group_concat = self::$db->group_concat('share_id'))) $cols[] = $group_concat.' AS share_id';
+			if (($group_concat = self::$db->group_concat('share_id')))
+			{
+				$cols[] = $group_concat.' AS share_id';
+			}
 			// remove expired tmp-files unconditionally
 			$having = 'HAVING MAX(share_expires) < '.self::$db->quote(self::$db->to_timestamp(time())).' OR '.
 				// remove without expiration date, when created over 100 days ago AND
@@ -651,7 +684,10 @@ 
 	 */
 	public static function share2link($share)
 	{
-		if (is_array($share)) $share = $share['share_token'];
+		if (is_array($share))
+		{
+			$share = $share['share_token'];
+		}
 
 		$link = Api\Framework::link('/share.php').'/'.$share;
 		if ($link[0] == '/')

api/src/Vfs/StreamWrapper.php

Doc Comments +4 added lines, -4 removed lines

@@ -454,7 +454,7 @@ 
 	 *
 	 * If you have cached data in your stream but not yet stored it into the underlying storage, you should do so now.
 	 *
-	 * @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.
+	 * @return boolean 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 ( )
 	{
@@ -856,7 +856,7 @@ 
 	 * This method is called immediately when your stream object is created for examining directory contents with opendir().
 	 *
 	 * @param string $path URL that was passed to opendir() and that this object is expected to explore.
-	 * @return booelan
+	 * @return boolean
 	 */
 	function dir_opendir ( $path, $options )
 	{
@@ -1213,7 +1213,7 @@ 
 	 * It should reset the output generated by dir_readdir(). i.e.:
 	 * The next call to dir_readdir() should return the first entry in the location returned by dir_opendir().
 	 *
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function dir_rewinddir ( )
 	{
@@ -1227,7 +1227,7 @@ 
 	 *
 	 * You should release any resources which were locked or allocated during the opening and use of the directory stream.
 	 *
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function dir_closedir ( )
 	{

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;
@@ -590,7 +637,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
 		{
@@ -627,17 +677,23 @@ 
 	 */
 	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;
 		}
+		}
 		// check if recursive option is set and needed
 		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) !== '/')
 		{
-			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;
@@ -709,13 +765,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);
@@ -733,7 +795,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;
 	}
 
@@ -769,7 +834,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;
 		}
 
@@ -786,18 +854,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)))
 						{
@@ -810,7 +887,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);
 						}
 					}
@@ -833,7 +914,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',
@@ -841,15 +924,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']))
 		{
@@ -864,7 +954,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;
 
@@ -890,10 +983,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)))
@@ -902,7 +1001,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] != '/')
 					{
@@ -910,15 +1012,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
 	}
 
@@ -939,9 +1050,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;
 
@@ -950,7 +1068,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));
+		}
 	}
 
 	/**
@@ -963,7 +1084,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));
+		}
 	}
 
 	/**
@@ -984,11 +1108,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.'/')
@@ -997,7 +1128,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;
 	}
 
@@ -1038,7 +1172,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;
 	}
 
@@ -1141,7 +1278,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;
+			}
 		}
 	}
 
@@ -1202,11 +1342,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'];
@@ -1222,12 +1368,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)
@@ -1236,14 +1388,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;
@@ -1258,12 +1416,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;
 	}
 
@@ -1276,12 +1440,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]);
@@ -1289,11 +1459,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;
 	}
 

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 ( )
@@ -906,7 +906,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,true,false)))
 			{

Spacing +133 added lines, -134 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,26 +572,26 @@ 
 	 * @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;
 		}
 		// 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);
@@ -614,7 +613,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;
 	}
@@ -630,14 +629,14 @@ 
 	 * @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;
 		}
 		// 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) !== '/')
@@ -647,7 +646,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))
@@ -656,7 +655,7 @@ 
 				'location' => 'vfs_mkdir',
 				'path' => $path[0] == '/' ? $path : Vfs::parse_url($path, PHP_URL_PATH),
 				'url' => $url,
-			),'',true);
+			), '', true);
 		}
 		return $ret;
 	}
@@ -672,13 +671,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;
@@ -700,7 +699,7 @@ 
 				'path' => $path[0] == '/' ? $path : Vfs::parse_url($path, PHP_URL_PATH),
 				'url' => $url,
 				'stat' => $stat,
-			),'',true);
+			), '', true);
 		}
 		return $ok;
 	}
@@ -711,7 +710,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();
@@ -728,15 +727,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);
 			}
@@ -775,24 +774,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)
 					{
@@ -803,25 +802,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);
 						}
 					}
 				}
@@ -841,7 +840,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!
 		{
@@ -851,25 +850,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;
 		}
@@ -896,7 +895,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)))
 		{
@@ -908,7 +907,7 @@ 
 		while (($rel_path = Vfs::basename($url).($rel_path ? '/'.$rel_path : '')) &&
 		       ($url = Vfs::dirname($url)))
 		{
-			if (($stat = $this->url_stat($url,0,true,false)))
+			if (($stat = $this->url_stat($url, 0, true, false)))
 			{
 				if (is_link($url) && ($lpath = Vfs::readlink($url)))
 				{
@@ -916,20 +915,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
 	}
 
 	/**
@@ -945,13 +944,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;
 
@@ -985,25 +984,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;
 			}
 		}
@@ -1031,7 +1030,7 @@ 
 	 *
 	 * @return string
 	 */
-	function dir_readdir ( )
+	function dir_readdir( )
 	{
 		if ($this->extra_dirs && count($this->extra_dirs) > $this->extra_dir_ptr)
 		{
@@ -1043,10 +1042,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;
@@ -1060,7 +1059,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_rewinddir ( )
+	function dir_rewinddir( )
 	{
 		$this->extra_dir_ptr = 0;
 
@@ -1074,7 +1073,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_closedir ( )
+	function dir_closedir( )
 	{
 		$ret = closedir($this->opened_dir);
 
@@ -1091,9 +1090,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':
@@ -1101,16 +1100,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;
 					}
 			}
@@ -1144,10 +1143,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)));
@@ -1162,7 +1161,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))
 		{
@@ -1173,7 +1172,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;
@@ -1188,7 +1187,7 @@ 
 	static function url_is_readonly($url)
 	{
 		static $cache = array();
-		$ret =& $cache[$url];
+		$ret = & $cache[$url];
 		if (!isset($ret))
 		{
 			$matches = null;
@@ -1210,9 +1209,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
 		{
@@ -1238,7 +1237,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)
 		{
@@ -1247,14 +1246,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;
 
@@ -1265,10 +1264,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();
 			}
@@ -1287,19 +1286,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();
 		}
@@ -1313,7 +1312,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))
 		{

api/src/Vfs/StreamWrapperIface.php

Doc Comments +4 added lines, -3 removed lines

@@ -45,6 +45,7 @@ 
 	 * This method is called when the stream is closed, using fclose().
 	 *
 	 * You must release any resources that were locked or allocated by the stream.
+	 * @return boolean
 	 */
 	function stream_close ( );
 
@@ -57,7 +58,7 @@ 
 	 * You must also update the read/write position of the stream by the number of bytes that were successfully read.
 	 *
 	 * @param int $count
-	 * @return string/false up to count bytes read or false on EOF
+	 * @return string|false up to count bytes read or false on EOF
 	 */
 	function stream_read ( $count );
 
@@ -114,7 +115,7 @@ 
 	 *
 	 * If you have cached data in your stream but not yet stored it into the underlying storage, you should do so now.
 	 *
-	 * @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.
+	 * @return boolean 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 ( );
 
@@ -188,7 +189,7 @@ 
 	 * This method is called immediately when your stream object is created for examining directory contents with opendir().
 	 *
 	 * @param string $path URL that was passed to opendir() and that this object is expected to explore.
-	 * @return booelan
+	 * @return boolean
 	 */
 	function dir_opendir ( $path, $options );
 

Indentation +2 added lines, -2 removed lines

@@ -80,10 +80,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 ( );

Spacing +18 added lines, -18 removed lines

@@ -39,14 +39,14 @@ 
 	 * @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);
 
 	/**
 	 * This method is called when the stream is closed, using fclose().
 	 *
 	 * You must release any resources that were locked or allocated by the stream.
 	 */
-	function stream_close ( );
+	function stream_close( );
 
 	/**
 	 * This method is called in response to fread() and fgets() calls on the stream.
@@ -59,7 +59,7 @@ 
 	 * @param int $count
 	 * @return string/false up to count bytes read or false on EOF
 	 */
-	function stream_read ( $count );
+	function stream_read($count);
 
 	/**
 	 * This method is called in response to fwrite() calls on the stream.
@@ -72,7 +72,7 @@ 
 	 * @param string $data
 	 * @return integer
 	 */
-	function stream_write ( $data );
+	function stream_write($data);
 
  	/**
  	 * This method is called in response to feof() calls on the stream.
@@ -86,14 +86,14 @@ 
   	 *
  	 * @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( );
 
 	/**
 	 * This method is called in response to ftell() calls on the stream.
 	 *
 	 * @return integer current read/write position of the stream
 	 */
- 	function stream_tell ( );
+ 	function stream_tell( );
 
  	/**
  	 * This method is called in response to fseek() calls on the stream.
@@ -107,7 +107,7 @@ 
  	 * 							SEEK_END - 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);
 
 	/**
 	 * This method is called in response to fflush() calls on the stream.
@@ -116,7 +116,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( );
 
 	/**
 	 * This method is called in response to fstat() calls on the stream.
@@ -132,7 +132,7 @@ 
 	 *
 	 * @return array containing the same values as appropriate for the stream.
 	 */
-	function stream_stat ( );
+	function stream_stat( );
 
 	/**
 	 * This method is called in response to unlink() calls on URL paths associated with the wrapper.
@@ -143,7 +143,7 @@ 
 	 * @param string $path
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	function unlink ( $path );
+	function unlink($path);
 
 	/**
 	 * This method is called in response to rename() calls on URL paths associated with the wrapper.
@@ -157,7 +157,7 @@ 
 	 * @param string $path_to
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	function rename ( $path_from, $path_to );
+	function rename($path_from, $path_to);
 
 	/**
 	 * This method is called in response to mkdir() calls on URL paths associated with the wrapper.
@@ -170,7 +170,7 @@ 
 	 * @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);
 
 	/**
 	 * This method is called in response to rmdir() calls on URL paths associated with the wrapper.
@@ -182,7 +182,7 @@ 
 	 * @param int $options Possible values include STREAM_REPORT_ERRORS.
 	 * @return boolean TRUE on success or FALSE on failure.
 	 */
-	function rmdir ( $path, $options );
+	function rmdir($path, $options);
 
 	/**
 	 * This method is called immediately when your stream object is created for examining directory contents with opendir().
@@ -190,7 +190,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 method is called in response to stat() calls on the URL paths associated with the wrapper.
@@ -218,7 +218,7 @@ 
 	 *                          stat triggers it's own warning anyway, so it makes no sense to trigger one by our stream-wrapper!
 	 * @return array
 	 */
-	function url_stat ( $path, $flags );
+	function url_stat($path, $flags);
 
 	/**
 	 * This method is called in response to readdir().
@@ -227,7 +227,7 @@ 
 	 *
 	 * @return string
 	 */
-	function dir_readdir ( );
+	function dir_readdir( );
 
 	/**
 	 * This method is called in response to rewinddir().
@@ -237,7 +237,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_rewinddir ( );
+	function dir_rewinddir( );
 
 	/**
 	 * This method is called in response to closedir().
@@ -246,5 +246,5 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_closedir ( );
+	function dir_closedir( );
 }

api/src/Vfs/WebDAV.php

Doc Comments +8 added lines, -8 removed lines

@@ -57,7 +57,7 @@ 
 	* Reimplemented to not check our vfs base path with realpath and connect to mysql DB
 	*
 	* @access public
-    * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
+    * @param  string $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
 	*/
 	function ServeRequest($prefix=null)
 	{
@@ -76,7 +76,7 @@ 
 	* DELETE method handler
 	*
 	* @param  array  general parameter passing array
-	* @return bool   true on success
+	* @return string   true on success
 	*/
 	function DELETE($options)
 	{
@@ -116,7 +116,7 @@ 
      * Reimplemented to NOT use dirname/basename, which has problems with utf-8 chars
      *
      * @param  array  general parameter passing array
-     * @return bool   true on success
+     * @return string   true on success
      */
     function MKCOL($options)
     {
@@ -151,7 +151,7 @@ 
      * COPY method handler
      *
      * @param  array  general parameter passing array
-     * @return bool   true on success
+     * @return string   true on success
      */
     function COPY($options, $del=false)
     {
@@ -477,7 +477,7 @@ 
 	 * but in the regular vfs attributes.
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function PROPPATCH(&$options)
 	{
@@ -557,7 +557,7 @@ 
 	 * LOCK method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string|boolean   true on success
 	 */
 	function LOCK(&$options)
 	{
@@ -583,7 +583,7 @@ 
 	 * UNLOCK method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function UNLOCK(&$options)
 	{
@@ -640,7 +640,7 @@ 
 	 * Reimplement to add a Content-Disposition header, if ?download is appended to the REQUEST_URI
 	 *
 	 * @param  array  parameter passing array
-	 * @return bool   true on success
+	 * @return boolean|null   true on success
 	 */
 	function GET(&$options)
 	{

Switch Indentation +10 added lines, -10 removed lines

@@ -171,16 +171,16 @@
 
         if (is_dir($source)) { // resource is a collection
             switch ($options["depth"]) {
-            case "infinity": // valid
-                break;
-            case "0": // valid for COPY only
-                if ($del) { // MOVE?
-                    return "400 Bad request";
-                }
-                break;
-            case "1": // invalid for both COPY and MOVE
-            default:
-                return "400 Bad request";
+            	case "infinity": // valid
+                	break;
+            	case "0": // valid for COPY only
+                	if ($del) { // MOVE?
+                    	return "400 Bad request";
+                	}
+                	break;
+            	case "1": // invalid for both COPY and MOVE
+            	default:
+                	return "400 Bad request";
             }
         }
 

Indentation +196 added lines, -196 removed lines

@@ -52,13 +52,13 @@ 
 	var $debug = 0;
 
 	/**
-	* Serve a webdav request
-	*
-	* Reimplemented to not check our vfs base path with realpath and connect to mysql DB
-	*
-	* @access public
-    * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
-	*/
+	 * Serve a webdav request
+	 *
+	 * Reimplemented to not check our vfs base path with realpath and connect to mysql DB
+	 *
+	 * @access public
+	 * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
+	 */
 	function ServeRequest($prefix=null)
 	{
 		// special treatment for litmus compliance test
@@ -73,11 +73,11 @@ 
 	}
 
 	/**
-	* DELETE method handler
-	*
-	* @param  array  general parameter passing array
-	* @return bool   true on success
-	*/
+	 * DELETE method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
 	function DELETE($options)
 	{
 		$path = $this->base . $options['path'];
@@ -110,117 +110,117 @@ 
 		return '204 No Content';
 	}
 
-    /**
-     * MKCOL method handler
-     *
-     * Reimplemented to NOT use dirname/basename, which has problems with utf-8 chars
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function MKCOL($options)
-    {
-        $path   = $this->_unslashify($this->base .$options["path"]);
-        $parent = Vfs::dirname($path);
-
-        if (!file_exists($parent)) {
-            return "409 Conflict";
-        }
-
-        if (!is_dir($parent)) {
-            return "403 Forbidden";
-        }
-
-        if ( file_exists($path) ) {
-            return "405 Method not allowed";
-        }
-
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
-            return "415 Unsupported media type";
-        }
-
-        $stat = mkdir($path, 0777);
-        if (!$stat) {
-            return "403 Forbidden";
-        }
-
-        return ("201 Created");
-    }
+	/**
+	 * MKCOL method handler
+	 *
+	 * Reimplemented to NOT use dirname/basename, which has problems with utf-8 chars
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function MKCOL($options)
+	{
+		$path   = $this->_unslashify($this->base .$options["path"]);
+		$parent = Vfs::dirname($path);
+
+		if (!file_exists($parent)) {
+			return "409 Conflict";
+		}
+
+		if (!is_dir($parent)) {
+			return "403 Forbidden";
+		}
+
+		if ( file_exists($path) ) {
+			return "405 Method not allowed";
+		}
+
+		if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+			return "415 Unsupported media type";
+		}
+
+		$stat = mkdir($path, 0777);
+		if (!$stat) {
+			return "403 Forbidden";
+		}
+
+		return ("201 Created");
+	}
 
 	/**
-     * COPY method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function COPY($options, $del=false)
-    {
-        // TODO Property updates still broken (Litmus should detect this?)
-
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
-            return "415 Unsupported media type";
-        }
-
-        // no copying to different WebDAV Servers yet
-        if (isset($options["dest_url"])) {
-            return "502 bad gateway";
-        }
-
-        $source = $this->base .$options["path"];
-        if (!file_exists($source)) return "404 Not found";
-
-        if (is_dir($source)) { // resource is a collection
-            switch ($options["depth"]) {
-            case "infinity": // valid
-                break;
-            case "0": // valid for COPY only
-                if ($del) { // MOVE?
-                    return "400 Bad request";
-                }
-                break;
-            case "1": // invalid for both COPY and MOVE
-            default:
-                return "400 Bad request";
-            }
-        }
-
-        $dest         = $this->base . $options["dest"];
-        $destdir      = dirname($dest);
-
-        if (!file_exists($destdir) || !is_dir($destdir)) {
-            return "409 Conflict";
-        }
-
-        $new          = !file_exists($dest);
-        $existing_col = false;
-
-        if (!$new) {
-            if ($del && is_dir($dest)) {
-                if (!$options["overwrite"]) {
-                    return "412 precondition failed";
-                }
-                $dest .= basename($source);
-                if (file_exists($dest)) {
-                    $options["dest"] .= basename($source);
-                } else {
-                    $new          = true;
-                    $existing_col = true;
-                }
-            }
-        }
-
-        if (!$new) {
-            if ($options["overwrite"]) {
-                $stat = $this->DELETE(array("path" => $options["dest"]));
-                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
-                    return $stat;
-                }
-            } else {
-                return "412 precondition failed";
-            }
-        }
-
-        if ($del) {
+	 * COPY method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function COPY($options, $del=false)
+	{
+		// TODO Property updates still broken (Litmus should detect this?)
+
+		if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+			return "415 Unsupported media type";
+		}
+
+		// no copying to different WebDAV Servers yet
+		if (isset($options["dest_url"])) {
+			return "502 bad gateway";
+		}
+
+		$source = $this->base .$options["path"];
+		if (!file_exists($source)) return "404 Not found";
+
+		if (is_dir($source)) { // resource is a collection
+			switch ($options["depth"]) {
+			case "infinity": // valid
+				break;
+			case "0": // valid for COPY only
+				if ($del) { // MOVE?
+					return "400 Bad request";
+				}
+				break;
+			case "1": // invalid for both COPY and MOVE
+			default:
+				return "400 Bad request";
+			}
+		}
+
+		$dest         = $this->base . $options["dest"];
+		$destdir      = dirname($dest);
+
+		if (!file_exists($destdir) || !is_dir($destdir)) {
+			return "409 Conflict";
+		}
+
+		$new          = !file_exists($dest);
+		$existing_col = false;
+
+		if (!$new) {
+			if ($del && is_dir($dest)) {
+				if (!$options["overwrite"]) {
+					return "412 precondition failed";
+				}
+				$dest .= basename($source);
+				if (file_exists($dest)) {
+					$options["dest"] .= basename($source);
+				} else {
+					$new          = true;
+					$existing_col = true;
+				}
+			}
+		}
+
+		if (!$new) {
+			if ($options["overwrite"]) {
+				$stat = $this->DELETE(array("path" => $options["dest"]));
+				if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
+					return $stat;
+				}
+			} else {
+				return "412 precondition failed";
+			}
+		}
+
+		if ($del) {
 			try {
 				if (!rename($source, $dest)) {
 					return "500 Internal server error";
@@ -229,51 +229,51 @@ 
 			catch (Exception\ProtectedDirectory $e) {
 				return "403 Forbidden: ".$e->getMessage();
 			}
-        } else {
-            if (is_dir($source) && $options['depth'] == 'infinity') {
-            	$files = Vfs::find($source,array('depth' => true,'url' => true));	// depth=true: return dirs first, url=true: allow urls!
-            } else {
-                $files = array($source);
-            }
-
-            if (!is_array($files) || empty($files)) {
-                return "500 Internal server error";
-            }
-
-
-            foreach ($files as $file) {
-                if (is_dir($file)) {
-                    $file = $this->_slashify($file);
-                }
-
-                $destfile = str_replace($source, $dest, $file);
-
-                if (is_dir($file)) {
-                    if (!is_dir($destfile)) {
-                        // TODO "mkdir -p" here? (only natively supported by PHP 5)
-                        if (!@mkdir($destfile)) {
-                            return "409 Conflict";
-                        }
-                    }
-                } else {
-                    if (!@copy($file, $destfile)) {
-                        return "409 Conflict";
-                    }
-                }
-            }
-        }
-        // adding Location header as shown in example in rfc2518 section 8.9.5
+		} else {
+			if (is_dir($source) && $options['depth'] == 'infinity') {
+				$files = Vfs::find($source,array('depth' => true,'url' => true));	// depth=true: return dirs first, url=true: allow urls!
+			} else {
+				$files = array($source);
+			}
+
+			if (!is_array($files) || empty($files)) {
+				return "500 Internal server error";
+			}
+
+
+			foreach ($files as $file) {
+				if (is_dir($file)) {
+					$file = $this->_slashify($file);
+				}
+
+				$destfile = str_replace($source, $dest, $file);
+
+				if (is_dir($file)) {
+					if (!is_dir($destfile)) {
+						// TODO "mkdir -p" here? (only natively supported by PHP 5)
+						if (!@mkdir($destfile)) {
+							return "409 Conflict";
+						}
+					}
+				} else {
+					if (!@copy($file, $destfile)) {
+						return "409 Conflict";
+					}
+				}
+			}
+		}
+		// adding Location header as shown in example in rfc2518 section 8.9.5
 		header('Location: '.$this->base_uri.$options['dest']);
 
-        return ($new && !$existing_col) ? "201 Created" : "204 No Content";
-    }
+		return ($new && !$existing_col) ? "201 Created" : "204 No Content";
+	}
 
-    /**
-	* Get properties for a single file/resource
-	*
-	* @param  string  $_path resource path
-	* @return array   resource properties
-	*/
+	/**
+	 * Get properties for a single file/resource
+	 *
+	 * @param  string  $_path resource path
+	 * @return array   resource properties
+	 */
 	function fileinfo($_path)
 	{
 		// internally we require some url-encoding, as vfs_stream_wrapper uses URL's internally
@@ -301,9 +301,9 @@ 
 		$info['props'][] = self::mkprop	('creationdate',    filectime($fspath));
 		$info['props'][] = self::mkprop	('getlastmodified', filemtime($fspath));
 
-        // Microsoft extensions: last access time and 'hidden' status
-        $info["props"][] = self::mkprop("lastaccessed",    fileatime($fspath));
-        $info["props"][] = self::mkprop("ishidden",        Vfs::is_hidden($fspath));
+		// Microsoft extensions: last access time and 'hidden' status
+		$info["props"][] = self::mkprop("lastaccessed",    fileatime($fspath));
+		$info["props"][] = self::mkprop("ishidden",        Vfs::is_hidden($fspath));
 
 		// type and size (caller already made sure that path exists)
 		if (is_dir($fspath)) {
@@ -441,38 +441,38 @@ 
 	}
 
  	/**
-	 * Used eg. by get
-	 *
-	 * @todo replace all calls to _mimetype with Vfs::mime_content_type()
-	 * @param string $path
-	 * @return string
-	 */
+ 	 * Used eg. by get
+ 	 *
+ 	 * @todo replace all calls to _mimetype with Vfs::mime_content_type()
+ 	 * @param string $path
+ 	 * @return string
+ 	 */
 	function _mimetype($path)
 	{
 		return Vfs::mime_content_type($path);
 	}
 
-    /**
-     * Check if path is readable by current user
-     *
-     * @param string $fspath
-     * @return boolean
-     */
-    function _is_readable($fspath)
-    {
-    	return Vfs::is_readable($fspath);
-    }
-
-    /**
-     * Check if path is writable by current user
-     *
-     * @param string $fspath
-     * @return boolean
-     */
-    function _is_writable($fspath)
-    {
-    	return Vfs::is_writable($fspath);
-    }
+	/**
+	 * Check if path is readable by current user
+	 *
+	 * @param string $fspath
+	 * @return boolean
+	 */
+	function _is_readable($fspath)
+	{
+		return Vfs::is_readable($fspath);
+	}
+
+	/**
+	 * Check if path is writable by current user
+	 *
+	 * @param string $fspath
+	 * @return boolean
+	 */
+	function _is_writable($fspath)
+	{
+		return Vfs::is_writable($fspath);
+	}
 
 	/**
 	 * PROPPATCH method handler
@@ -615,13 +615,13 @@ 
 	 * @param  string  directory path
 	 * @return void    function has to handle HTTP response itself
 	 */
-    function GetDir($fspath, &$options)
-    {
+	function GetDir($fspath, &$options)
+	{
 		// add a content-type header to overwrite an existing default charset in apache (AddDefaultCharset directiv)
 		header('Content-type: text/html; charset='.Api\Translation::charset());
 
 		parent::GetDir($fspath, $options);
-    }
+	}
 
 	private $force_download = false;
 

Braces +133 added lines, -50 removed lines

@@ -64,7 +64,8 @@ 
 		// special treatment for litmus compliance test
 		// reply on its identifier header
 		// not needed for the test itself but eases debugging
-		if (isset($this->_SERVER['HTTP_X_LITMUS'])) {
+		if (isset($this->_SERVER['HTTP_X_LITMUS']))
+		{
 			error_log("Litmus test ".$this->_SERVER['HTTP_X_LITMUS']);
 			header("X-Litmus-reply: ".$this->_SERVER['HTTP_X_LITMUS']);
 		}
@@ -123,24 +124,30 @@ 
         $path   = $this->_unslashify($this->base .$options["path"]);
         $parent = Vfs::dirname($path);
 
-        if (!file_exists($parent)) {
+        if (!file_exists($parent))
+        {
             return "409 Conflict";
         }
 
-        if (!is_dir($parent)) {
+        if (!is_dir($parent))
+        {
             return "403 Forbidden";
         }
 
-        if ( file_exists($path) ) {
+        if ( file_exists($path) )
+        {
             return "405 Method not allowed";
         }
 
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+        if (!empty($this->_SERVER["CONTENT_LENGTH"]))
+        {
+// no body parsing yet
             return "415 Unsupported media type";
         }
 
         $stat = mkdir($path, 0777);
-        if (!$stat) {
+        if (!$stat)
+        {
             return "403 Forbidden";
         }
 
@@ -157,24 +164,35 @@ 
     {
         // TODO Property updates still broken (Litmus should detect this?)
 
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+        if (!empty($this->_SERVER["CONTENT_LENGTH"]))
+        {
+// no body parsing yet
             return "415 Unsupported media type";
         }
 
         // no copying to different WebDAV Servers yet
-        if (isset($options["dest_url"])) {
+        if (isset($options["dest_url"]))
+        {
             return "502 bad gateway";
         }
 
         $source = $this->base .$options["path"];
-        if (!file_exists($source)) return "404 Not found";
+        if (!file_exists($source))
+        {
+        	return "404 Not found";
+        }
 
-        if (is_dir($source)) { // resource is a collection
-            switch ($options["depth"]) {
+        if (is_dir($source))
+        {
+// resource is a collection
+            switch ($options["depth"])
+            {
             case "infinity": // valid
                 break;
             case "0": // valid for COPY only
-                if ($del) { // MOVE?
+                if ($del)
+                {
+// MOVE?
                     return "400 Bad request";
                 }
                 break;
@@ -187,76 +205,104 @@ 
         $dest         = $this->base . $options["dest"];
         $destdir      = dirname($dest);
 
-        if (!file_exists($destdir) || !is_dir($destdir)) {
+        if (!file_exists($destdir) || !is_dir($destdir))
+        {
             return "409 Conflict";
         }
 
         $new          = !file_exists($dest);
         $existing_col = false;
 
-        if (!$new) {
-            if ($del && is_dir($dest)) {
-                if (!$options["overwrite"]) {
+        if (!$new)
+        {
+            if ($del && is_dir($dest))
+            {
+                if (!$options["overwrite"])
+                {
                     return "412 precondition failed";
                 }
                 $dest .= basename($source);
-                if (file_exists($dest)) {
+                if (file_exists($dest))
+                {
                     $options["dest"] .= basename($source);
-                } else {
+                }
+                else
+                {
                     $new          = true;
                     $existing_col = true;
                 }
             }
         }
 
-        if (!$new) {
-            if ($options["overwrite"]) {
+        if (!$new)
+        {
+            if ($options["overwrite"])
+            {
                 $stat = $this->DELETE(array("path" => $options["dest"]));
-                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
+                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404"))
+                {
                     return $stat;
                 }
-            } else {
+            }
+            else
+            {
                 return "412 precondition failed";
             }
         }
 
-        if ($del) {
+        if ($del)
+        {
 			try {
-				if (!rename($source, $dest)) {
+				if (!rename($source, $dest))
+				{
 					return "500 Internal server error";
 				}
 			}
 			catch (Exception\ProtectedDirectory $e) {
 				return "403 Forbidden: ".$e->getMessage();
 			}
-        } else {
-            if (is_dir($source) && $options['depth'] == 'infinity') {
+        }
+        else
+        {
+            if (is_dir($source) && $options['depth'] == 'infinity')
+            {
             	$files = Vfs::find($source,array('depth' => true,'url' => true));	// depth=true: return dirs first, url=true: allow urls!
-            } else {
+            }
+            else
+            {
                 $files = array($source);
             }
 
-            if (!is_array($files) || empty($files)) {
+            if (!is_array($files) || empty($files))
+            {
                 return "500 Internal server error";
             }
 
 
-            foreach ($files as $file) {
-                if (is_dir($file)) {
+            foreach ($files as $file)
+            {
+                if (is_dir($file))
+                {
                     $file = $this->_slashify($file);
                 }
 
                 $destfile = str_replace($source, $dest, $file);
 
-                if (is_dir($file)) {
-                    if (!is_dir($destfile)) {
+                if (is_dir($file))
+                {
+                    if (!is_dir($destfile))
+                    {
                         // TODO "mkdir -p" here? (only natively supported by PHP 5)
-                        if (!@mkdir($destfile)) {
+                        if (!@mkdir($destfile))
+                        {
                             return "409 Conflict";
                         }
                     }
-                } else {
-                    if (!@copy($file, $destfile)) {
+                }
+                else
+                {
+                    if (!@copy($file, $destfile))
+                    {
                         return "409 Conflict";
                     }
                 }
@@ -306,17 +352,23 @@ 
         $info["props"][] = self::mkprop("ishidden",        Vfs::is_hidden($fspath));
 
 		// type and size (caller already made sure that path exists)
-		if (is_dir($fspath)) {
+		if (is_dir($fspath))
+		{
 			// directory (WebDAV collection)
 			$info['props'][] = self::mkprop	('resourcetype', array(
 			 	self::mkprop('collection', '')));
 			$info['props'][] = self::mkprop	('getcontenttype', 'httpd/unix-directory');
-		} else {
+		}
+		else
+		{
 			// plain file (WebDAV resource)
 			$info['props'][] = self::mkprop	('resourcetype', '');
-			if (Vfs::is_readable($path)) {
+			if (Vfs::is_readable($path))
+			{
 				$info['props'][] = self::mkprop	('getcontenttype', Vfs::mime_content_type($path));
-			} else {
+			}
+			else
+			{
 				error_log(__METHOD__."($path) $fspath is not readable!");
 				$info['props'][] = self::mkprop	('getcontenttype', 'application/x-non-readable');
 			}
@@ -388,7 +440,10 @@ 
 				continue;
 			}
 			$_path = $info['path'];
-			if (!$n && $info['path'] != '/' && substr($info['path'],-1) == '/') $_path = substr($info['path'],0,-1);
+			if (!$n && $info['path'] != '/' && substr($info['path'],-1) == '/')
+			{
+				$_path = substr($info['path'],0,-1);
+			}
 
 			// need to encode path again, as $info['path'] is NOT encoded, but Vfs::(stat|propfind) require it
 			// otherwise pathes containing url special chars like ? or # will not stat
@@ -427,16 +482,22 @@ 
 				$fileprops =& $files['files'][$path2n[$path]]['props'];
 				foreach($props as $prop)
 				{
-					if ($prop['ns'] == Vfs::DEFAULT_PROP_NAMESPACE && $prop['name'][0] == '#')	// eGW's customfields
+					if ($prop['ns'] == Vfs::DEFAULT_PROP_NAMESPACE && $prop['name'][0] == '#')
+					{
+						// eGW's customfields
 					{
 						$prop['ns'] .= 'customfields/';
+					}
 						$prop['name'] = substr($prop['name'],1);
 					}
 					$fileprops[] = $prop;
 				}
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."() props=".array2string($files['files']));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() props=".array2string($files['files']));
+		}
 		return true;
 	}
 
@@ -488,7 +549,8 @@ 
 	{
 		$path = Api\Translation::convert($options['path'],'utf-8');
 
-		foreach ($options['props'] as $key => $prop) {
+		foreach ($options['props'] as $key => $prop)
+		{
 			$attributes = array();
 			switch($prop['ns'])
 			{
@@ -505,7 +567,10 @@ 
 							//$attributes['created'] = strtotime($prop['val']);
 							//break;
 						default:
-							if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!Vfs::proppatch($path,array($prop)))
+							{
+								$options['props'][$key]['status'] = '403 Forbidden';
+							}
 							break;
 					}
 					break;
@@ -534,7 +599,10 @@ 
 						case 'Win32LastAccessTime':
 						case 'Win32FileAttributes':	// not sure what that is, it was always "00000000"
 						default:
-							if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!Vfs::proppatch($path,array($prop)))
+							{
+								$options['props'][$key]['status'] = '403 Forbidden';
+							}
 							break;
 					}
 					break;
@@ -544,15 +612,24 @@ 
 					$prop['name'] = '#'.$prop['name'];
 					// fall through
 				default:
-					if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+					if (!Vfs::proppatch($path,array($prop)))
+					{
+						$options['props'][$key]['status'] = '403 Forbidden';
+					}
 					break;
 			}
-			if ($this->debug) $props[] = '('.$prop['ns'].')'.$prop['name'].'='.$prop['val'];
+			if ($this->debug)
+			{
+				$props[] = '('.$prop['ns'].')'.$prop['name'].'='.$prop['val'];
+			}
 		}
 		if ($this->debug)
 		{
 			error_log(__METHOD__.": path=$options[path], props=".implode(', ',$props));
-			if ($attributes) error_log(__METHOD__.": path=$options[path], set attributes=".str_replace("\n",' ',print_r($attributes,true)));
+			if ($attributes)
+			{
+				error_log(__METHOD__.": path=$options[path], set attributes=".str_replace("\n",' ',print_r($attributes,true)));
+			}
 		}
 
 		return '';	// this is as the filesystem example handler does it, no true or false ...
@@ -566,7 +643,10 @@ 
 	 */
 	function LOCK(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		}
 		// TODO recursive locks on directories not supported yet
 		if (is_dir($this->base . $options['path']) && !empty($options['depth']))
 		{
@@ -592,7 +672,10 @@ 
 	 */
 	function UNLOCK(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		}
 		return Vfs::unlock($options['path'],$options['token']) ? '204 No Content' : '409 Conflict';
 	}
 

Spacing +85 added lines, -85 removed lines

@@ -59,7 +59,7 @@ 
 	* @access public
     * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
 	*/
-	function ServeRequest($prefix=null)
+	function ServeRequest($prefix = null)
 	{
 		// special treatment for litmus compliance test
 		// reply on its identifier header
@@ -80,7 +80,7 @@ 
 	*/
 	function DELETE($options)
 	{
-		$path = $this->base . $options['path'];
+		$path = $this->base.$options['path'];
 
 		if (!file_exists($path))
 		{
@@ -120,7 +120,7 @@ 
      */
     function MKCOL($options)
     {
-        $path   = $this->_unslashify($this->base .$options["path"]);
+        $path   = $this->_unslashify($this->base.$options["path"]);
         $parent = Vfs::dirname($path);
 
         if (!file_exists($parent)) {
@@ -131,7 +131,7 @@ 
             return "403 Forbidden";
         }
 
-        if ( file_exists($path) ) {
+        if (file_exists($path)) {
             return "405 Method not allowed";
         }
 
@@ -153,7 +153,7 @@ 
      * @param  array  general parameter passing array
      * @return bool   true on success
      */
-    function COPY($options, $del=false)
+    function COPY($options, $del = false)
     {
         // TODO Property updates still broken (Litmus should detect this?)
 
@@ -166,7 +166,7 @@ 
             return "502 bad gateway";
         }
 
-        $source = $this->base .$options["path"];
+        $source = $this->base.$options["path"];
         if (!file_exists($source)) return "404 Not found";
 
         if (is_dir($source)) { // resource is a collection
@@ -184,7 +184,7 @@ 
             }
         }
 
-        $dest         = $this->base . $options["dest"];
+        $dest         = $this->base.$options["dest"];
         $destdir      = dirname($dest);
 
         if (!file_exists($destdir) || !is_dir($destdir)) {
@@ -231,7 +231,7 @@ 
 			}
         } else {
             if (is_dir($source) && $options['depth'] == 'infinity') {
-            	$files = Vfs::find($source,array('depth' => true,'url' => true));	// depth=true: return dirs first, url=true: allow urls!
+            	$files = Vfs::find($source, array('depth' => true, 'url' => true)); // depth=true: return dirs first, url=true: allow urls!
             } else {
                 $files = array($source);
             }
@@ -277,16 +277,16 @@ 
 	function fileinfo($_path)
 	{
 		// internally we require some url-encoding, as vfs_stream_wrapper uses URL's internally
-		$path = str_replace(array('#','?'),array('%23','%3F'),$_path);
+		$path = str_replace(array('#', '?'), array('%23', '%3F'), $_path);
 
 		//error_log(__METHOD__."($path)");
 		// map URI path to filesystem path
-		$fspath = $this->base . $path;
+		$fspath = $this->base.$path;
 
 		// create result array
 		$info = array();
 		// TODO remove slash append code when base class is able to do it itself
-		$info['path']  = is_dir($fspath) ? $this->_slashify($path) : $path;
+		$info['path'] = is_dir($fspath) ? $this->_slashify($path) : $path;
 
 		// remove all urlencoding we need internally in EGw, HTTP_WebDAV_Server will add it's own!
 		// rawurldecode does NOT touch +
@@ -295,32 +295,32 @@ 
 		$info['props'] = array();
 
 		// no special beautified displayname here ...
-		$info['props'][] = self::mkprop	('displayname', Vfs::basename(self::_unslashify($info['path'])));
+		$info['props'][] = self::mkprop('displayname', Vfs::basename(self::_unslashify($info['path'])));
 
 		// creation and modification time
-		$info['props'][] = self::mkprop	('creationdate',    filectime($fspath));
-		$info['props'][] = self::mkprop	('getlastmodified', filemtime($fspath));
+		$info['props'][] = self::mkprop('creationdate', filectime($fspath));
+		$info['props'][] = self::mkprop('getlastmodified', filemtime($fspath));
 
         // Microsoft extensions: last access time and 'hidden' status
-        $info["props"][] = self::mkprop("lastaccessed",    fileatime($fspath));
-        $info["props"][] = self::mkprop("ishidden",        Vfs::is_hidden($fspath));
+        $info["props"][] = self::mkprop("lastaccessed", fileatime($fspath));
+        $info["props"][] = self::mkprop("ishidden", Vfs::is_hidden($fspath));
 
 		// type and size (caller already made sure that path exists)
 		if (is_dir($fspath)) {
 			// directory (WebDAV collection)
-			$info['props'][] = self::mkprop	('resourcetype', array(
+			$info['props'][] = self::mkprop('resourcetype', array(
 			 	self::mkprop('collection', '')));
-			$info['props'][] = self::mkprop	('getcontenttype', 'httpd/unix-directory');
+			$info['props'][] = self::mkprop('getcontenttype', 'httpd/unix-directory');
 		} else {
 			// plain file (WebDAV resource)
-			$info['props'][] = self::mkprop	('resourcetype', '');
+			$info['props'][] = self::mkprop('resourcetype', '');
 			if (Vfs::is_readable($path)) {
-				$info['props'][] = self::mkprop	('getcontenttype', Vfs::mime_content_type($path));
+				$info['props'][] = self::mkprop('getcontenttype', Vfs::mime_content_type($path));
 			} else {
 				error_log(__METHOD__."($path) $fspath is not readable!");
-				$info['props'][] = self::mkprop	('getcontenttype', 'application/x-non-readable');
+				$info['props'][] = self::mkprop('getcontenttype', 'application/x-non-readable');
 			}
-			$info['props'][] = self::mkprop	('getcontentlength', filesize($fspath));
+			$info['props'][] = self::mkprop('getcontentlength', filesize($fspath));
 		}
 		// generate etag from inode (sqlfs: fs_id), modification time and size
 		$stat = stat($fspath);
@@ -374,21 +374,21 @@ 
 	 */
 	function PROPFIND(&$options, &$files)
 	{
-		if (!parent::PROPFIND($options,$files))
+		if (!parent::PROPFIND($options, $files))
 		{
 			return false;
 		}
 		$path2n = array();
-		foreach($files['files'] as $n => $info)
+		foreach ($files['files'] as $n => $info)
 		{
 			// do NOT report /clientsync/.favorites/, as it fails
-			if (strpos($info['path'],'/clientsync/.favorites/') === 0)
+			if (strpos($info['path'], '/clientsync/.favorites/') === 0)
 			{
 				unset($files['files'][$n]);
 				continue;
 			}
 			$_path = $info['path'];
-			if (!$n && $info['path'] != '/' && substr($info['path'],-1) == '/') $_path = substr($info['path'],0,-1);
+			if (!$n && $info['path'] != '/' && substr($info['path'], -1) == '/') $_path = substr($info['path'], 0, -1);
 
 			// need to encode path again, as $info['path'] is NOT encoded, but Vfs::(stat|propfind) require it
 			// otherwise pathes containing url special chars like ? or # will not stat
@@ -398,21 +398,21 @@ 
 			// adding some properties used instead of regular DAV times
 			if (($stat = Vfs::stat($path)))
 			{
-				$fileprops =& $files['files'][$path2n[$path]]['props'];
-				foreach(self::$auto_props as $attr => $props)
+				$fileprops = & $files['files'][$path2n[$path]]['props'];
+				foreach (self::$auto_props as $attr => $props)
 				{
-					switch($attr)
+					switch ($attr)
 					{
 						case 'ctime':
 						case 'mtime':
 						case 'atime':
-							$value = gmdate('D, d M Y H:i:s T',$stat[$attr]);
+							$value = gmdate('D, d M Y H:i:s T', $stat[$attr]);
 							break;
 
 						default:
 							continue 2;
 					}
-					foreach($props as $prop)
+					foreach ($props as $prop)
 					{
 						$prop['val'] = $value;
 						$fileprops[] = $prop;
@@ -420,17 +420,17 @@ 
 				}
 			}
 		}
-		if ($path2n && ($path2props = Vfs::propfind(array_keys($path2n),null)))
+		if ($path2n && ($path2props = Vfs::propfind(array_keys($path2n), null)))
 		{
-			foreach($path2props as $path => $props)
+			foreach ($path2props as $path => $props)
 			{
-				$fileprops =& $files['files'][$path2n[$path]]['props'];
-				foreach($props as $prop)
+				$fileprops = & $files['files'][$path2n[$path]]['props'];
+				foreach ($props as $prop)
 				{
 					if ($prop['ns'] == Vfs::DEFAULT_PROP_NAMESPACE && $prop['name'][0] == '#')	// eGW's customfields
 					{
 						$prop['ns'] .= 'customfields/';
-						$prop['name'] = substr($prop['name'],1);
+						$prop['name'] = substr($prop['name'], 1);
 					}
 					$fileprops[] = $prop;
 				}
@@ -486,36 +486,36 @@ 
 	 */
 	function PROPPATCH(&$options)
 	{
-		$path = Api\Translation::convert($options['path'],'utf-8');
+		$path = Api\Translation::convert($options['path'], 'utf-8');
 
 		foreach ($options['props'] as $key => $prop) {
 			$attributes = array();
-			switch($prop['ns'])
+			switch ($prop['ns'])
 			{
 				// allow Webdrive to set creation and modification time
 				case 'http://www.southrivertech.com/':
-					switch($prop['name'])
+					switch ($prop['name'])
 					{
 						case 'srt_modifiedtime':
 						case 'getlastmodified':
-							Vfs::touch($path,strtotime($prop['val']));
+							Vfs::touch($path, strtotime($prop['val']));
 							break;
 						//case 'srt_creationtime':
 							// no streamwrapper interface / php function to set the ctime currently
 							//$attributes['created'] = strtotime($prop['val']);
 							//break;
 						default:
-							if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!Vfs::proppatch($path, array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
 							break;
 					}
 					break;
 
 				case 'DAV:':
-					switch($prop['name'])
+					switch ($prop['name'])
 					{
 						// allow netdrive to change the modification time
 						case 'getlastmodified':
-							Vfs::touch($path,strtotime($prop['val']));
+							Vfs::touch($path, strtotime($prop['val']));
 							break;
 						// not sure why, the filesystem example of the WebDAV class does it ...
 						default:
@@ -525,16 +525,16 @@ 
 					break;
 
 				case 'urn:schemas-microsoft-com:':
-					switch($prop['name'])
+					switch ($prop['name'])
 					{
 						case 'Win32LastModifiedTime':
-							Vfs::touch($path,strtotime($prop['val']));
+							Vfs::touch($path, strtotime($prop['val']));
 							break;
 						case 'Win32CreationTime':	// eg. "Wed, 14 Sep 2011 15:48:26 GMT"
 						case 'Win32LastAccessTime':
 						case 'Win32FileAttributes':	// not sure what that is, it was always "00000000"
 						default:
-							if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!Vfs::proppatch($path, array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
 							break;
 					}
 					break;
@@ -544,18 +544,18 @@ 
 					$prop['name'] = '#'.$prop['name'];
 					// fall through
 				default:
-					if (!Vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+					if (!Vfs::proppatch($path, array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
 					break;
 			}
 			if ($this->debug) $props[] = '('.$prop['ns'].')'.$prop['name'].'='.$prop['val'];
 		}
 		if ($this->debug)
 		{
-			error_log(__METHOD__.": path=$options[path], props=".implode(', ',$props));
-			if ($attributes) error_log(__METHOD__.": path=$options[path], set attributes=".str_replace("\n",' ',print_r($attributes,true)));
+			error_log(__METHOD__.": path=$options[path], props=".implode(', ', $props));
+			if ($attributes) error_log(__METHOD__.": path=$options[path], set attributes=".str_replace("\n", ' ', print_r($attributes, true)));
 		}
 
-		return '';	// this is as the filesystem example handler does it, no true or false ...
+		return ''; // this is as the filesystem example handler does it, no true or false ...
 	}
 
 	/**
@@ -566,18 +566,18 @@ 
 	 */
 	function LOCK(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
+		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n", '    '), '', print_r($options, true)).')');
 		// TODO recursive locks on directories not supported yet
-		if (is_dir($this->base . $options['path']) && !empty($options['depth']))
+		if (is_dir($this->base.$options['path']) && !empty($options['depth']))
 		{
 			return '409 Conflict';
 		}
-		$options['timeout'] = time()+300; // 5min. hardcoded
+		$options['timeout'] = time() + 300; // 5min. hardcoded
 
 		// dont know why, but HTTP_WebDAV_Server passes the owner in D:href tags, which get's passed unchanged to checkLock/PROPFIND
 		// that's wrong according to the standard and cadaver does not show it on discover --> strip_tags removes eventual tags
-		if (($ret = Vfs::lock($options['path'],$options['locktoken'],$options['timeout'],strip_tags($options['owner']),
-			$options['scope'],$options['type'],isset($options['update']))) && !isset($options['update']))
+		if (($ret = Vfs::lock($options['path'], $options['locktoken'], $options['timeout'], strip_tags($options['owner']),
+			$options['scope'], $options['type'], isset($options['update']))) && !isset($options['update']))
 		{
 			return $ret ? '200 OK' : '409 Conflict';
 		}
@@ -592,8 +592,8 @@ 
 	 */
 	function UNLOCK(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
-		return Vfs::unlock($options['path'],$options['token']) ? '204 No Content' : '409 Conflict';
+		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n", '    '), '', print_r($options, true)).')');
+		return Vfs::unlock($options['path'], $options['token']) ? '204 No Content' : '409 Conflict';
 	}
 
 	/**
@@ -632,9 +632,9 @@ 
 	 */
 	function __construct()
 	{
-		if ($_SERVER['REQUEST_METHOD'] == 'GET' && (($this->force_download = strpos($_SERVER['REQUEST_URI'],'?download')) !== false))
+		if ($_SERVER['REQUEST_METHOD'] == 'GET' && (($this->force_download = strpos($_SERVER['REQUEST_URI'], '?download')) !== false))
 		{
-			$_SERVER['REQUEST_URI'] = substr($_SERVER['REQUEST_URI'],0,$this->force_download);
+			$_SERVER['REQUEST_URI'] = substr($_SERVER['REQUEST_URI'], 0, $this->force_download);
 		}
 		parent::__construct();
 	}
@@ -649,7 +649,7 @@ 
 	 */
 	function GET(&$options)
 	{
-		if (is_dir($this->base . $options["path"]))
+		if (is_dir($this->base.$options["path"]))
 		{
 			return $this->autoindex($options);
 		}
@@ -657,11 +657,11 @@ 
 		{
 			// mitigate risks of serving javascript or css from our domain
 			Api\Header\Content::safe($options['stream'], $options['path'], $options['mimetype'], $options['size'], false,
-				$this->force_download, true);	// true = do not send content-type and content-length header, but modify values
+				$this->force_download, true); // true = do not send content-type and content-length header, but modify values
 
 			if (!is_resource($options['stream']))
 			{
-				$options['data'] =& $options['stream'];
+				$options['data'] = & $options['stream'];
 				unset($options['stream']);
 			}
 		}
@@ -680,9 +680,9 @@ 
 			'depth' => 1,
 		);
 		$files = array();
-		if (($ret = $this->PROPFIND($propfind_options,$files)) !== true)
+		if (($ret = $this->PROPFIND($propfind_options, $files)) !== true)
 		{
-			return $ret;	// no collection
+			return $ret; // no collection
 		}
 		header('Content-type: text/html; charset='.Api\Translation::charset());
 		echo "<html>\n<head>\n\t<title>".'EGroupware WebDAV server '.htmlspecialchars($options['path'])."</title>\n";
@@ -694,10 +694,10 @@ 
 		echo '<h1>WebDAV ';
 		list(,$base) = explode(parse_url($GLOBALS['egw_info']['server']['webserver_url'], PHP_URL_PATH), $this->base_uri, 2);
 		$path = $base;
-		foreach(explode('/',$this->_unslashify($options['path'])) as $n => $name)
+		foreach (explode('/', $this->_unslashify($options['path'])) as $n => $name)
 		{
 			$path .= ($n != 1 ? '/' : '').$name;
-			echo Api\Html::a_href(htmlspecialchars($name.'/'),$path);
+			echo Api\Html::a_href(htmlspecialchars($name.'/'), $path);
 		}
 		echo "</h1>\n";
 
@@ -714,18 +714,18 @@ 
 		);
 		$n = 0;
 		$collection_props = null;
-		foreach($files['files'] as $file)
+		foreach ($files['files'] as $file)
 		{
 			if (!isset($collection_props))
 			{
 				$collection_props = $this->props2array($file['props']);
 				echo '<h3>'.lang('Collection listing').': '.htmlspecialchars($collection_props['DAV:displayname'])."</h3>\n";
-				continue;	// own entry --> displaying properies later
+				continue; // own entry --> displaying properies later
 			}
-			if(!$n++)
+			if (!$n++)
 			{
 				echo "<table>\n\t<tr class='th'>\n\t\t<th>#</th>\n\t\t<th>".lang('Name')."</th>";
-				foreach($props2show as $label)
+				foreach ($props2show as $label)
 				{
 					echo "\t\t<th>".lang($label)."</th>\n";
 				}
@@ -735,9 +735,9 @@ 
 			//echo $file['path']; _debug_array($props);
 			$class = $class == 'row_on' ? 'row_off' : 'row_on';
 
-			if (substr($file['path'],-1) == '/')
+			if (substr($file['path'], -1) == '/')
 			{
-				$name = basename(substr($file['path'],0,-1)).'/';
+				$name = basename(substr($file['path'], 0, -1)).'/';
 			}
 			else
 			{
@@ -745,14 +745,14 @@ 
 			}
 
 			echo "\t<tr class='$class'>\n\t\t<td>$n</td>\n\t\t<td>".
-				Api\Html::a_href(htmlspecialchars($name),$base.strtr($file['path'], array(
+				Api\Html::a_href(htmlspecialchars($name), $base.strtr($file['path'], array(
 					'%' => '%25',
 					'#' => '%23',
 					'?' => '%3F',
 				)))."</td>\n";
-			foreach($props2show as $prop => $label)
+			foreach ($props2show as $prop => $label)
 			{
-				echo "\t\t<td>".($prop=='DAV:getlastmodified'&&!empty($props[$prop])?date('Y-m-d H:i:s',$props[$prop]):$props[$prop])."</td>\n";
+				echo "\t\t<td>".($prop == 'DAV:getlastmodified' && !empty($props[$prop]) ? date('Y-m-d H:i:s', $props[$prop]) : $props[$prop])."</td>\n";
 			}
 			echo "\t</tr>\n";
 		}
@@ -766,12 +766,12 @@ 
 		}
 		echo '<h3>'.lang('Properties')."</h3>\n";
 		echo "<table>\n\t<tr class='th'><th>".lang('Namespace')."</th><th>".lang('Name')."</th><th>".lang('Value')."</th></tr>\n";
-		foreach($collection_props as $name => $value)
+		foreach ($collection_props as $name => $value)
 		{
 			$class = $class == 'row_on' ? 'row_off' : 'row_on';
-			$parts = explode(':',$name);
+			$parts = explode(':', $name);
 			$name = array_pop($parts);
-			$ns = implode(':',$parts);
+			$ns = implode(':', $parts);
 			echo "\t<tr class='$class'>\n\t\t<td>".htmlspecialchars($ns)."</td><td style='white-space: nowrap'>".htmlspecialchars($name)."</td>\n";
 			echo "\t\t<td>".$value."</td>\n\t</tr>\n";
 		}
@@ -814,11 +814,11 @@ 
 				'wrap'            => 0,
 			));
 		}
-		if (($href=preg_match('/\<(D:)?href\>[^<]+\<\/(D:)?href\>/i',$value)))
+		if (($href = preg_match('/\<(D:)?href\>[^<]+\<\/(D:)?href\>/i', $value)))
 		{
-			$value = preg_replace('/\<(D:)?href\>('.preg_quote($this->base_uri.'/','/').')?([^<]+)\<\/(D:)?href\>/i','<\\1href><a href="\\2\\3">\\3</a></\\4href>',$value);
+			$value = preg_replace('/\<(D:)?href\>('.preg_quote($this->base_uri.'/', '/').')?([^<]+)\<\/(D:)?href\>/i', '<\\1href><a href="\\2\\3">\\3</a></\\4href>', $value);
 		}
-		$ret = $value[0] == '<'  || strpos($value, "\n") !== false ?
+		$ret = $value[0] == '<' || strpos($value, "\n") !== false ?
 			'<pre>'.htmlspecialchars($value).'</pre>' : htmlspecialchars($value);
 
 		if ($href)
@@ -838,10 +838,10 @@ 
 	protected function props2array(array $props)
 	{
 		$arr = array();
-		foreach($props as $prop)
+		foreach ($props as $prop)
 		{
 			$ns_hash = array('DAV:' => 'D');
-			switch($prop['ns'])
+			switch ($prop['ns'])
 			{
 				case 'DAV:';
 					$ns = 'DAV';
@@ -851,10 +851,10 @@ 
 			}
 			if (is_array($prop['val']))
 			{
-				$prop['val'] = $this->_hierarchical_prop_encode($prop['val'], $prop['ns'], $ns_defs='', $ns_hash);
+				$prop['val'] = $this->_hierarchical_prop_encode($prop['val'], $prop['ns'], $ns_defs = '', $ns_hash);
 				// hack to show real namespaces instead of not (visibly) defined shortcuts
 				unset($ns_hash['DAV:']);
-				$value = strtr($v=$this->prop_value($prop['val']),array_flip($ns_hash));
+				$value = strtr($v = $this->prop_value($prop['val']), array_flip($ns_hash));
 			}
 			else
 			{