EGroupware / egroupware

phpgwapi/inc/class.vfs_stream_wrapper.inc.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 ( )
 	{

Indentation +3 added lines, -3 removed lines

@@ -388,10 +388,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 ( )
@@ -1010,7 +1010,7 @@ 
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path',$flags,'$url'): ".function_backtrace(1));
 
 		while (($rel_path = egw_vfs::basename($url).($rel_path ? '/'.$rel_path : '')) &&
-		       ($url = egw_vfs::dirname($url)))
+			   ($url = egw_vfs::dirname($url)))
 		{
 			if (($stat = self::url_stat($url,0,false,false)))
 			{

Spacing +143 added lines, -144 removed lines

@@ -145,14 +145,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
 	 */
-	static function resolve_url_symlinks($_path,$file_exists=true,$resolve_last_symlink=true,&$stat=null)
+	static function resolve_url_symlinks($_path, $file_exists = true, $resolve_last_symlink = true, &$stat = null)
 	{
 		$path = self::get_path($_path);
 
-		if (!($stat = self::url_stat($path,$resolve_last_symlink?0:STREAM_URL_STAT_LINK)) && !$file_exists)
+		if (!($stat = self::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
@@ -160,9 +160,9 @@ 
 			$url = $stat['url'];
 		}
 		// if the url resolves to a symlink to the vfs, resolve this vfs:// url direct
-		if ($url && self::parse_url($url,PHP_URL_SCHEME) == self::SCHEME)
+		if ($url && self::parse_url($url, PHP_URL_SCHEME) == self::SCHEME)
 		{
-			$url = self::resolve_url(self::parse_url($url,PHP_URL_PATH));
+			$url = self::resolve_url(self::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;
@@ -184,7 +184,7 @@ 
 	 * @param boolean $replace_user_pass_host =true replace $user,$pass,$host in url, default true, if false result is not cached
 	 * @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)
+	static function resolve_url($_path, $do_symlink = true, $use_symlinkcache = true, $replace_user_pass_host = true)
 	{
 		$path = self::get_path($_path);
 
@@ -197,43 +197,43 @@ 
 		// 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(self::parse_url($path),$defaults);
-		if (!$parts['host']) $parts['host'] = 'default';	// otherwise we get an invalid url (scheme:///path/to/something)!
+		$parts = array_merge(self::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 = self::parse_url($url,PHP_URL_SCHEME);
-				if (is_null(self::$wrappers) || !in_array($scheme,self::$wrappers))
+				$scheme = self::parse_url($url, PHP_URL_SCHEME);
+				if (is_null(self::$wrappers) || !in_array($scheme, self::$wrappers))
 				{
 					self::load_wrapper($scheme);
 				}
-				$url = egw_vfs::concat($url,substr($parts['path'],strlen($mounted)));
+				$url = egw_vfs::concat($url, substr($parts['path'], strlen($mounted)));
 
 				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'];
@@ -246,7 +246,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;
 	}
 
@@ -258,10 +258,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;
 			}
@@ -288,13 +288,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($opened_path);	// not used but required by function signature
+		unset($opened_path); // not used but required by function signature
 		$this->opened_stream = null;
 
 		$stat = null;
-		if (!($url = self::resolve_url_symlinks($path,$mode[0]=='r',true,$stat)))
+		if (!($url = self::resolve_url_symlinks($path, $mode[0] == 'r', true, $stat)))
 		{
 			return false;
 		}
@@ -302,7 +302,7 @@ 
 		{
 			return false;
 		}
-		if (!($this->opened_stream = fopen($url,$mode,$options)))
+		if (!($this->opened_stream = fopen($url, $mode, $options)))
 		{
 			return false;
 		}
@@ -328,7 +328,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,
@@ -338,12 +338,11 @@ 
 		if (isset($GLOBALS['egw']) && isset($GLOBALS['egw']->hooks))
 		{
 			$GLOBALS['egw']->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;
 
@@ -361,9 +360,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);
 	}
 
 	/**
@@ -377,9 +376,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);
 	}
 
  	/**
@@ -394,7 +393,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);
 	}
@@ -404,7 +403,7 @@ 
 	 *
 	 * @return integer current read/write position of the stream
 	 */
- 	function stream_tell ( )
+ 	function stream_tell( )
  	{
  		return ftell($this->opened_stream);
  	}
@@ -421,9 +420,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
 	}
 
 	/**
@@ -433,7 +432,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);
 	}
@@ -452,7 +451,7 @@ 
 	 *
 	 * @return array containing the same values as appropriate for the stream.
 	 */
-	function stream_stat ( )
+	function stream_stat( )
 	{
 		return fstat($this->opened_stream);
 	}
@@ -466,9 +465,9 @@ 
 	 * @param string $path
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function unlink ( $path )
+	static function unlink($path)
 	{
-		if (!($url = self::resolve_url_symlinks($path,true,false)))	// true,false file need to exist, but do not resolve last component
+		if (!($url = self::resolve_url_symlinks($path, true, false)))	// true,false file need to exist, but do not resolve last component
 		{
 			return false;
 		}
@@ -489,7 +488,7 @@ 
 				'path' => $path[0] == '/' ? $path : self::parse_url($path, PHP_URL_PATH),
 				'url'  => $url,
 				'stat' => $stat,
-			),'',true);
+			), '', true);
 		}
 		return $ok;
 	}
@@ -506,22 +505,22 @@ 
 	 * @param string $path_to
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function rename ( $path_from, $path_to )
+	static function rename($path_from, $path_to)
 	{
-		if (!($url_from = self::resolve_url_symlinks($path_from,true,false)) ||
-			!($url_to = self::resolve_url_symlinks($path_to,false)))
+		if (!($url_from = self::resolve_url_symlinks($path_from, true, false)) ||
+			!($url_to = self::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 (self::parse_url($url_from,PHP_URL_SCHEME) == self::parse_url($url_to,PHP_URL_SCHEME))
+		if (self::parse_url($url_from, PHP_URL_SCHEME) == self::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) self::unlink($path_from);
@@ -543,7 +542,7 @@ 
 				'to' => $path_to[0] == '/' ? $path_to : self::parse_url($path_to, PHP_URL_PATH),
 				'url_from' => $url_from,
 				'url_to' => $url_to,
-			),'',true);
+			), '', true);
 		}
 		return $ret;
 	}
@@ -559,13 +558,13 @@ 
 	 * @param int $options Posible values include STREAM_REPORT_ERRORS and STREAM_MKDIR_RECURSIVE
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
-	static function mkdir ( $path, $mode, $options )
+	static function mkdir($path, $mode, $options)
 	{
-		if (!($url = self::resolve_url_symlinks($path,false)))	// false = directory does not need to exists
+		if (!($url = self::resolve_url_symlinks($path, false)))	// false = directory does not need to exists
 		{
 			return false;
 		}
-		$ret = mkdir($url,$mode,$options);
+		$ret = mkdir($url, $mode, $options);
 
 		// call "vfs_mkdir" hook
 		if ($ret && isset($GLOBALS['egw']) && isset($GLOBALS['egw']->hooks))
@@ -574,7 +573,7 @@ 
 				'location' => 'vfs_mkdir',
 				'path' => $path[0] == '/' ? $path : self::parse_url($path, PHP_URL_PATH),
 				'url' => $url,
-			),'',true);
+			), '', true);
 		}
 		return $ret;
 	}
@@ -589,9 +588,9 @@ 
 	 * @param int $options Possible values include STREAM_REPORT_ERRORS.
 	 * @return boolean TRUE on success or FALSE on failure.
 	 */
-	static function rmdir ( $path, $options )
+	static function rmdir($path, $options)
 	{
-		unset($options);	// not uses but required by function signature
+		unset($options); // not uses but required by function signature
 		if (!($url = self::resolve_url_symlinks($path)))
 		{
 			return false;
@@ -613,7 +612,7 @@ 
 				'path' => $path[0] == '/' ? $path : self::parse_url($path, PHP_URL_PATH),
 				'url' => $url,
 				'stat' => $stat,
-			),'',true);
+			), '', true);
 		}
 		return $ok;
 	}
@@ -630,60 +629,60 @@ 
 	 * @param int $path_param_key =0 key in params containing the path, default 0
 	 * @return mixed return value of backend or false if function does not exist on backend
 	 */
-	static protected function _call_on_backend($name,$params,$fail_silent=false,$path_param_key=0)
+	static protected function _call_on_backend($name, $params, $fail_silent = false, $path_param_key = 0)
 	{
 		$pathes = $params[$path_param_key];
 
 		$scheme2urls = array();
-		foreach(is_array($pathes) ? $pathes : array($pathes) as $path)
+		foreach (is_array($pathes) ? $pathes : array($pathes) as $path)
 		{
-			if (!($url = self::resolve_url_symlinks($path,false,false)))
+			if (!($url = self::resolve_url_symlinks($path, false, false)))
 			{
 				return false;
 			}
-			$k=(string)self::parse_url($url,PHP_URL_SCHEME);
+			$k = (string)self::parse_url($url, PHP_URL_SCHEME);
 			if (!(is_array($scheme2urls[$k]))) $scheme2urls[$k] = array();
 			$scheme2urls[$k][$path] = $url;
 		}
 		$ret = array();
-		foreach($scheme2urls as $scheme => $urls)
+		foreach ($scheme2urls as $scheme => $urls)
 		{
 			if ($scheme)
 			{
-				if (!class_exists($class = self::scheme2class($scheme)) || !method_exists($class,$name))
+				if (!class_exists($class = self::scheme2class($scheme)) || !method_exists($class, $name))
 				{
-					if (!$fail_silent) trigger_error("Can't $name for scheme $scheme!\n",E_USER_WARNING);
+					if (!$fail_silent) trigger_error("Can't $name for scheme $scheme!\n", E_USER_WARNING);
 					return false;
 				}
 				if (!is_array($pathes))
 				{
 					$params[$path_param_key] = $url;
 
-					return call_user_func_array(array($class,$name),$params);
+					return call_user_func_array(array($class, $name), $params);
 				}
 				$params[$path_param_key] = $urls;
-				if (!is_array($r = call_user_func_array(array($class,$name),$params)))
+				if (!is_array($r = call_user_func_array(array($class, $name), $params)))
 				{
 					return $r;
 				}
 				// we need to re-translate the urls to pathes, as they can eg. contain symlinks
-				foreach($urls as $path => $url)
+				foreach ($urls as $path => $url)
 				{
-					if (isset($r[$url]) || isset($r[$url=self::parse_url($url,PHP_URL_PATH)]))
+					if (isset($r[$url]) || isset($r[$url = self::parse_url($url, PHP_URL_PATH)]))
 					{
 						$ret[$path] = $r[$url];
 					}
 				}
 			}
 			// call the filesystem specific function (dont allow to use arrays!)
-			elseif(!function_exists($name) || is_array($pathes))
+			elseif (!function_exists($name) || is_array($pathes))
 			{
 				return false;
 			}
 			else
 			{
 				$time = null;
-				return $name($url,$time);
+				return $name($url, $time);
 			}
 		}
 		return $ret;
@@ -697,9 +696,9 @@ 
 	 * @param int $atime =null access time (unix timestamp), default null = current time, not implemented in the vfs!
 	 * @return boolean true on success, false otherwise
 	 */
-	static function touch($path,$time=null,$atime=null)
+	static function touch($path, $time = null, $atime = null)
 	{
-		return self::_call_on_backend('touch',array($path,$time,$atime));
+		return self::_call_on_backend('touch', array($path, $time, $atime));
 	}
 
 	/**
@@ -711,9 +710,9 @@ 
 	 * @param string $mode mode string see egw_vfs::mode2int
 	 * @return boolean true on success, false otherwise
 	 */
-	static function chmod($path,$mode)
+	static function chmod($path, $mode)
 	{
-		return self::_call_on_backend('chmod',array($path,$mode));
+		return self::_call_on_backend('chmod', array($path, $mode));
 	}
 
 	/**
@@ -725,9 +724,9 @@ 
 	 * @param int $owner numeric user id
 	 * @return boolean true on success, false otherwise
 	 */
-	static function chown($path,$owner)
+	static function chown($path, $owner)
 	{
-		return self::_call_on_backend('chown',array($path,$owner));
+		return self::_call_on_backend('chown', array($path, $owner));
 	}
 
 	/**
@@ -739,9 +738,9 @@ 
 	 * @param int $group numeric group id
 	 * @return boolean true on success, false otherwise
 	 */
-	static function chgrp($path,$group)
+	static function chgrp($path, $group)
 	{
-		return self::_call_on_backend('chgrp',array($path,$group));
+		return self::_call_on_backend('chgrp', array($path, $group));
 	}
 
 	/**
@@ -754,7 +753,7 @@ 
 	 */
 	static function readlink($path)
 	{
-		$ret = self::_call_on_backend('readlink',array($path),true);	// true = fail silent, if backend does not support readlink
+		$ret = self::_call_on_backend('readlink', array($path), true); // true = fail silent, if backend does not support readlink
 		//error_log(__METHOD__."('$path') returning ".array2string($ret).' '.function_backtrace());
 		return $ret;
 	}
@@ -768,9 +767,9 @@ 
 	 * @param string $link path of the link to create
 	 * @return boolean true on success, false on error
 	 */
-	static function symlink($target,$link)
+	static function symlink($target, $link)
 	{
-		if (($ret = self::_call_on_backend('symlink',array($target,$link),false,1)))	// 1=path is in $link!
+		if (($ret = self::_call_on_backend('symlink', array($target, $link), false, 1)))	// 1=path is in $link!
 		{
 			self::symlinkCache_remove($link);
 		}
@@ -790,13 +789,13 @@ 
 	 * @param boolean $recheck =false true = do a new check, false = rely on stored mime type (if existing)
 	 * @return string mime-type (self::DIR_MIME_TYPE for directories)
 	 */
-	static function mime_content_type($path,$recheck=false)
+	static function mime_content_type($path, $recheck = false)
 	{
 		if (!($url = self::resolve_url_symlinks($path)))
 		{
 			return false;
 		}
-		if (($scheme = self::parse_url($url,PHP_URL_SCHEME)) && !$recheck)
+		if (($scheme = self::parse_url($url, PHP_URL_SCHEME)) && !$recheck)
 		{
 			// check it it's an eGW stream wrapper returning mime-type via url_stat
 			// we need to first check if the constant is defined, as we get a fatal error in php5.3 otherwise
@@ -804,7 +803,7 @@ 
 				defined($class.'::STAT_RETURN_MIME_TYPE') &&
 				($mime_attr = constant($class.'::STAT_RETURN_MIME_TYPE')))
 			{
-				$stat = call_user_func(array($class,'url_stat'),self::parse_url($url,PHP_URL_PATH),0);
+				$stat = call_user_func(array($class, 'url_stat'), self::parse_url($url, PHP_URL_PATH), 0);
 				if ($stat && $stat[$mime_attr])
 				{
 					$mime = $stat[$mime_attr];
@@ -823,7 +822,7 @@ 
 		// using EGw's own mime magic (currently only checking the extension!)
 		if (!$mime)
 		{
-			$mime = mime_magic::filename2mime(self::parse_url($url,PHP_URL_PATH));
+			$mime = mime_magic::filename2mime(self::parse_url($url, PHP_URL_PATH));
 		}
 		//error_log(__METHOD__."($path,$recheck) mime=$mime");
 		return $mime;
@@ -835,7 +834,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->extra_dir_ptr = 0;
@@ -850,15 +849,15 @@ 
 			if (self::LOG_LEVEL > 0) error_log(__METHOD__."( $path,$options) opendir($this->opened_dir_url) failed!");
 			return false;
 		}
-		$this->opened_dir_writable = egw_vfs::check_access($this->opened_dir_url,egw_vfs::WRITABLE);
+		$this->opened_dir_writable = egw_vfs::check_access($this->opened_dir_url, egw_vfs::WRITABLE);
 		// check our fstab if we need to add some of the mountpoints
-		$basepath = self::parse_url($path,PHP_URL_PATH);
-		foreach(array_keys(self::$fstab) as $mounted)
+		$basepath = self::parse_url($path, PHP_URL_PATH);
+		foreach (array_keys(self::$fstab) as $mounted)
 		{
 			if (((egw_vfs::dirname($mounted) == $basepath || egw_vfs::dirname($mounted).'/' == $basepath) && $mounted != '/') &&
 				// only return children readable by the user, if dir is not writable
 				(!self::HIDE_UNREADABLES || $this->opened_dir_writable ||
-					egw_vfs::check_access($mounted,egw_vfs::READABLE)))
+					egw_vfs::check_access($mounted, egw_vfs::READABLE)))
 			{
 				$this->extra_dirs[] = basename($mounted);
 			}
@@ -895,24 +894,24 @@ 
 	 * @param boolean $check_symlink_components =true check if path contains symlinks in path components other then the last one
 	 * @return array
 	 */
-	static function url_stat ( $path, $flags, $try_create_home=false, $check_symlink_components=true, $check_symlink_depth=self::MAX_SYMLINK_DEPTH, $try_reconnect=true )
+	static 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)
 					{
@@ -923,15 +922,15 @@ 
 					{
 						if ($lpath[0] != '/')	// concat relative path
 						{
-							$lpath = egw_vfs::concat(self::parse_url($path,PHP_URL_PATH),'../'.$lpath);
+							$lpath = egw_vfs::concat(self::parse_url($path, PHP_URL_PATH), '../'.$lpath);
 						}
 						$url = egw_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 = self::url_stat($lpath, STREAM_URL_STAT_QUIET, false, true, $check_symlink_depth-1)))
+						if (($stat = self::url_stat($lpath, STREAM_URL_STAT_QUIET, false, true, $check_symlink_depth - 1)))
 						{
-							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);
 						}
 					}
 				}
@@ -951,7 +950,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 && egw_vfs::dirname(self::parse_url($path,PHP_URL_PATH)) == '/home' &&
+		if (!$stat && $try_create_home && egw_vfs::dirname(self::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!
 		{
@@ -961,20 +960,20 @@ 
 				'account_lid' => basename($path),
 				'account_name' => basename($path),
 			);
-			call_user_func(array('vfs_home_hooks',$hook_data['location']),$hook_data);
+			call_user_func(array('vfs_home_hooks', $hook_data['location']), $hook_data);
 			unset($hook_data);
-			$stat = self::url_stat($path,$flags,false);
+			$stat = self::url_stat($path, $flags, false);
 		}
 		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'])) self::symlinkCache_add($path,$stat['url']);
+			$stat = self::check_symlink_components($path, $flags, $url);
+			if ($stat && isset($stat['url'])) 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;
 		}
@@ -1000,7 +999,7 @@ 
 	 * @param string &$url=null already resolved path
 	 * @return array|boolean stat array or false if not found
 	 */
-	static private function check_symlink_components($path,$flags=0,&$url=null)
+	static private function check_symlink_components($path, $flags = 0, &$url = null)
 	{
 		if (is_null($url) && !($url = self::resolve_url($path)))
 		{
@@ -1012,7 +1011,7 @@ 
 		while (($rel_path = egw_vfs::basename($url).($rel_path ? '/'.$rel_path : '')) &&
 		       ($url = egw_vfs::dirname($url)))
 		{
-			if (($stat = self::url_stat($url,0,false,false)))
+			if (($stat = self::url_stat($url, 0, false, false)))
 			{
 				if (is_link($url) && ($lpath = self::readlink($url)))
 				{
@@ -1020,20 +1019,20 @@ 
 
 					if ($lpath[0] != '/')
 					{
-						$lpath = egw_vfs::concat(self::parse_url($url,PHP_URL_PATH),'../'.$lpath);
+						$lpath = egw_vfs::concat(self::parse_url($url, PHP_URL_PATH), '../'.$lpath);
 					}
 					//self::symlinkCache_add($path,egw_vfs::PREFIX.$lpath);
-					$url = egw_vfs::PREFIX.egw_vfs::concat($lpath,$rel_path);
+					$url = egw_vfs::PREFIX.egw_vfs::concat($lpath, $rel_path);
 					if (self::LOG_LEVEL > 1) error_log("$log --> lpath='$lpath', url='$url'");
-					return self::url_stat($url,$flags);
+					return self::url_stat($url, $flags);
 				}
-				$url = egw_vfs::concat($url,$rel_path);
+				$url = egw_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
 	}
 
 	/**
@@ -1049,18 +1048,18 @@ 
 	 * @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 = self::parse_url($target,PHP_URL_PATH);
+		if ($target[0] != '/') $target = self::parse_url($target, PHP_URL_PATH);
 
 		self::$symlink_cache[$path] = $target;
 
 		// sort longest path first
-		uksort(self::$symlink_cache,create_function('$b,$a','return strlen($a)-strlen($b);'));
+		uksort(self::$symlink_cache, create_function('$b,$a', 'return strlen($a)-strlen($b);'));
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."($path,$target) cache now ".array2string(self::$symlink_cache));
 	}
 
@@ -1086,25 +1085,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;
 			}
 		}
@@ -1122,7 +1121,7 @@ 
 	 *
 	 * @param string $path ='/' path of backend, whos cache to clear
 	 */
-	static function clearstatcache($path='/')
+	static function clearstatcache($path = '/')
 	{
 		//error_log(__METHOD__."('$path')");
 		self::$symlink_cache = self::$resolve_url_cache = array();
@@ -1140,7 +1139,7 @@ 
 	 *
 	 * @return string
 	 */
-	function dir_readdir ( )
+	function dir_readdir( )
 	{
 		if ($this->extra_dirs && count($this->extra_dirs) > $this->extra_dir_ptr)
 		{
@@ -1152,10 +1151,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 &&
-				!egw_vfs::check_access(egw_vfs::concat($this->opened_dir_url,$file),egw_vfs::READABLE)));
+				!egw_vfs::check_access(egw_vfs::concat($this->opened_dir_url, $file), egw_vfs::READABLE)));
 		}
 		if (self::LOG_LEVEL > 1) error_log(__METHOD__."( $this->opened_dir ) = '$file'");
 		return $file;
@@ -1169,7 +1168,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_rewinddir ( )
+	function dir_rewinddir( )
 	{
 		$this->extra_dir_ptr = 0;
 
@@ -1183,7 +1182,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function dir_closedir ( )
+	function dir_closedir( )
 	{
 		$ret = closedir($this->opened_dir);
 
@@ -1200,9 +1199,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':
@@ -1210,16 +1209,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;
 					}
 			}
@@ -1252,7 +1251,7 @@ 
 	 */
 	static function scheme2class($scheme)
 	{
-		return str_replace('.','_',$scheme).'_stream_wrapper';
+		return str_replace('.', '_', $scheme).'_stream_wrapper';
 	}
 
 	/**
@@ -1264,7 +1263,7 @@ 
 	 * @param int $component =-1 PHP_URL_* constants
 	 * @return array|string|boolean on success array or string, if $component given, or false on failure
 	 */
-	static function parse_url($url, $component=-1)
+	static function parse_url($url, $component = -1)
 	{
 		static $component2str = array(
 			PHP_URL_SCHEME => 'scheme',
@@ -1276,9 +1275,9 @@ 
 			PHP_URL_QUERY => 'query',
 			PHP_URL_FRAGMENT => 'fragment',
 		);
-		static $cache = array();	// some caching
+		static $cache = array(); // some caching
 
-		$result =& $cache[$url];
+		$result = & $cache[$url];
 
 		if (!isset($result))
 		{
@@ -1315,7 +1314,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 || self::parse_url($path, PHP_URL_SCHEME) == $only_remove_scheme))
 		{
@@ -1326,7 +1325,7 @@ 
 		{
 			while (mb_substr($path, -1) == '/' && $path != '/' && ($path[0] == '/' || self::parse_url($path, PHP_URL_PATH) != '/'))
 			{
-				$path = mb_substr($path,0,-1);
+				$path = mb_substr($path, 0, -1);
 			}
 		}
 		return $path;
@@ -1341,7 +1340,7 @@ 
 	static function url_is_readonly($url)
 	{
 		static $cache = array();
-		$ret =& $cache[$url];
+		$ret = & $cache[$url];
 		if (!isset($ret))
 		{
 			$matches = null;
@@ -1356,7 +1355,7 @@ 
 	 */
 	static function init_static()
 	{
-		stream_register_wrapper(self::SCHEME,__CLASS__);
+		stream_register_wrapper(self::SCHEME, __CLASS__);
 
 		if (($fstab = $GLOBALS['egw_info']['server']['vfs_fstab']) && is_array($fstab) && count($fstab))
 		{

Braces +180 added lines, -44 removed lines

@@ -153,7 +153,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
 		{
@@ -164,7 +167,10 @@ 
 		{
 			$url = self::resolve_url(self::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;
 	}
 
@@ -191,7 +197,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
@@ -211,14 +220,24 @@ 
 			);
 		}
 		$parts = array_merge(self::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)
 		{
@@ -235,17 +254,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;
 	}
@@ -468,10 +502,13 @@ 
 	 */
 	static function unlink ( $path )
 	{
-		if (!($url = self::resolve_url_symlinks($path,true,false)))	// true,false file need to exist, but do not resolve last component
+		if (!($url = self::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;
@@ -524,7 +561,10 @@ 
 			$ret = stream_copy_to_stream($from,$to) !== false;
 			fclose($from);
 			fclose($to);
-			if ($ret) self::unlink($path_from);
+			if ($ret)
+			{
+				self::unlink($path_from);
+			}
 		}
 		else
 		{
@@ -561,10 +601,13 @@ 
 	 */
 	static function mkdir ( $path, $mode, $options )
 	{
-		if (!($url = self::resolve_url_symlinks($path,false)))	// false = directory does not need to exists
+		if (!($url = self::resolve_url_symlinks($path,false)))
+		{
+			// false = directory does not need to exists
 		{
 			return false;
 		}
+		}
 		$ret = mkdir($url,$mode,$options);
 
 		// call "vfs_mkdir" hook
@@ -642,7 +685,10 @@ 
 				return false;
 			}
 			$k=(string)self::parse_url($url,PHP_URL_SCHEME);
-			if (!(is_array($scheme2urls[$k]))) $scheme2urls[$k] = array();
+			if (!(is_array($scheme2urls[$k])))
+			{
+				$scheme2urls[$k] = array();
+			}
 			$scheme2urls[$k][$path] = $url;
 		}
 		$ret = array();
@@ -652,7 +698,10 @@ 
 			{
 				if (!class_exists($class = self::scheme2class($scheme)) || !method_exists($class,$name))
 				{
-					if (!$fail_silent) trigger_error("Can't $name for scheme $scheme!\n",E_USER_WARNING);
+					if (!$fail_silent)
+					{
+						trigger_error("Can't $name for scheme $scheme!\n",E_USER_WARNING);
+					}
 					return false;
 				}
 				if (!is_array($pathes))
@@ -770,10 +819,13 @@ 
 	 */
 	static function symlink($target,$link)
 	{
-		if (($ret = self::_call_on_backend('symlink',array($target,$link),false,1)))	// 1=path is in $link!
+		if (($ret = self::_call_on_backend('symlink',array($target,$link),false,1)))
+		{
+			// 1=path is in $link!
 		{
 			self::symlinkCache_remove($link);
 		}
+		}
 		return $ret;
 	}
 
@@ -842,12 +894,18 @@ 
 
 		if (!($this->opened_dir_url = self::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 = 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 = egw_vfs::check_access($this->opened_dir_url,egw_vfs::WRITABLE);
@@ -863,7 +921,10 @@ 
 				$this->extra_dirs[] = basename($mounted);
 			}
 		}
-		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;
 	}
 
@@ -899,7 +960,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;
 		}
 
@@ -916,21 +980,34 @@ 
 				{
 					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 = self::readlink($url)))
 					{
-						if ($lpath[0] != '/')	// concat relative path
+						if ($lpath[0] != '/')
+						{
+							// concat relative path
 						{
 							$lpath = egw_vfs::concat(self::parse_url($path,PHP_URL_PATH),'../'.$lpath);
 						}
+						}
 						$url = egw_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 = self::url_stat($lpath, STREAM_URL_STAT_QUIET, false, true, $check_symlink_depth-1)))
 						{
-							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);
 						}
 					}
@@ -953,7 +1030,9 @@ 
 		// check if a failed url_stat was for a home dir, in that case silently create it
 		if (!$stat && $try_create_home && egw_vfs::dirname(self::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',
@@ -961,14 +1040,21 @@ 
 				'account_lid' => basename($path),
 				'account_name' => basename($path),
 			);
+		}
 			call_user_func(array('vfs_home_hooks',$hook_data['location']),$hook_data);
 			unset($hook_data);
 			$stat = self::url_stat($path,$flags,false);
 		}
-		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'])) self::symlinkCache_add($path,$stat['url']);
+		}
+			if ($stat && isset($stat['url']))
+			{
+				self::symlinkCache_add($path,$stat['url']);
+			}
 		}
 		elseif(is_array($stat) && !isset($stat['url']))
 		{
@@ -978,7 +1064,10 @@ 
 		{
 			$stat['mode'] &= ~0222;
 		}
-		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;
 
@@ -1004,10 +1093,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 = egw_vfs::basename($url).($rel_path ? '/'.$rel_path : '')) &&
 		       ($url = egw_vfs::dirname($url)))
@@ -1016,7 +1111,10 @@ 
 			{
 				if (is_link($url) && ($lpath = self::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] != '/')
 					{
@@ -1024,15 +1122,24 @@ 
 					}
 					//self::symlinkCache_add($path,egw_vfs::PREFIX.$lpath);
 					$url = egw_vfs::PREFIX.egw_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 self::url_stat($url,$flags);
 				}
 				$url = egw_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
 	}
 
@@ -1053,15 +1160,25 @@ 
 	{
 		$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 = self::parse_url($target,PHP_URL_PATH);
+		if ($target[0] != '/')
+		{
+			$target = self::parse_url($target,PHP_URL_PATH);
+		}
 
 		self::$symlink_cache[$path] = $target;
 
 		// sort longest path first
 		uksort(self::$symlink_cache,create_function('$b,$a','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));
+		}
 	}
 
 	/**
@@ -1074,7 +1191,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));
+		}
 	}
 
 	/**
@@ -1095,11 +1215,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.'/')
@@ -1108,7 +1235,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;
 	}
 
@@ -1157,7 +1287,10 @@ 
 				self::HIDE_UNREADABLES && !$this->opened_dir_writable &&
 				!egw_vfs::check_access(egw_vfs::concat($this->opened_dir_url,$file),egw_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;
 	}
 
@@ -1286,7 +1419,10 @@ 
 			static $entities = array('%21', '%2A', '%27', '%28', '%29', '%3B', '%3A', '%40', '%26', '%3D', '%24', '%2C', '%2F', '%3F', '%23', '%5B', '%5D');
 			static $replacements = array('!', '*', "'", "(", ")", ";", ":", "@", "&", "=", "$", ",", "/", "?", "#", "[", "]");
 			static $str_replace = null;
-			if (!isset($str_replace)) $str_replace = function_exists('mb_str_replace') ? 'mb_str_replace' : 'str_replace';
+			if (!isset($str_replace))
+			{
+				$str_replace = function_exists('mb_str_replace') ? 'mb_str_replace' : 'str_replace';
+			}
 
 			// Create encoded URL with special URL characters decoded so it can be parsed
 			// All other characters will be encoded

phpgwapi/inc/class.vfs_webdav_server.inc.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)
 	{

Indentation +200 added lines, -200 removed lines

@@ -51,13 +51,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
@@ -72,11 +72,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'];
@@ -109,166 +109,166 @@ 
 		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 = egw_vfs::dirname($path);
-        $name   = egw_vfs::basename($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 = egw_vfs::dirname($path);
+		$name   = egw_vfs::basename($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) {
-            if (!rename($source, $dest)) {
-                return "500 Internal server error";
-            }
-        } else {
-            if (is_dir($source) && $options['depth'] == 'infinity') {
-            	$files = egw_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
+	 * 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) {
+			if (!rename($source, $dest)) {
+				return "500 Internal server error";
+			}
+		} else {
+			if (is_dir($source) && $options['depth'] == 'infinity') {
+				$files = egw_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
@@ -296,9 +296,9 @@ 
 		$info['props'][] = HTTP_WebDAV_Server::mkprop	('creationdate',    filectime($fspath));
 		$info['props'][] = HTTP_WebDAV_Server::mkprop	('getlastmodified', filemtime($fspath));
 
-        // Microsoft extensions: last access time and 'hidden' status
-        $info["props"][] = HTTP_WebDAV_Server::mkprop("lastaccessed",    fileatime($fspath));
-        $info["props"][] = HTTP_WebDAV_Server::mkprop("ishidden",        egw_vfs::is_hidden($fspath));
+		// Microsoft extensions: last access time and 'hidden' status
+		$info["props"][] = HTTP_WebDAV_Server::mkprop("lastaccessed",    fileatime($fspath));
+		$info["props"][] = HTTP_WebDAV_Server::mkprop("ishidden",        egw_vfs::is_hidden($fspath));
 
 		// type and size (caller already made sure that path exists)
 		if (is_dir($fspath)) {
@@ -436,38 +436,38 @@ 
 	}
 
  	/**
-	 * Used eg. by get
-	 *
-	 * @todo replace all calls to _mimetype with egw_vfs::mime_content_type()
-	 * @param string $path
-	 * @return string
-	 */
+ 	 * Used eg. by get
+ 	 *
+ 	 * @todo replace all calls to _mimetype with egw_vfs::mime_content_type()
+ 	 * @param string $path
+ 	 * @return string
+ 	 */
 	function _mimetype($path)
 	{
 		return egw_vfs::mime_content_type($path);
 	}
 
-    /**
-     * Check if path is readable by current user
-     *
-     * @param string $fspath
-     * @return boolean
-     */
-    function _is_readable($fspath)
-    {
-    	return egw_vfs::is_readable($fspath);
-    }
-
-    /**
-     * Check if path is writable by current user
-     *
-     * @param string $fspath
-     * @return boolean
-     */
-    function _is_writable($fspath)
-    {
-    	return egw_vfs::is_writable($fspath);
-    }
+	/**
+	 * Check if path is readable by current user
+	 *
+	 * @param string $fspath
+	 * @return boolean
+	 */
+	function _is_readable($fspath)
+	{
+		return egw_vfs::is_readable($fspath);
+	}
+
+	/**
+	 * Check if path is writable by current user
+	 *
+	 * @param string $fspath
+	 * @return boolean
+	 */
+	function _is_writable($fspath)
+	{
+		return egw_vfs::is_writable($fspath);
+	}
 
 	/**
 	 * PROPPATCH method handler
@@ -610,13 +610,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='.translation::charset());
 
 		parent::GetDir($fspath, $options);
-    }
+	}
 
 	private $force_download = false;
 

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";
             }
         }
 

Spacing +85 added lines, -85 removed lines

@@ -58,7 +58,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
@@ -79,7 +79,7 @@ 
 	*/
 	function DELETE($options)
 	{
-		$path = $this->base . $options['path'];
+		$path = $this->base.$options['path'];
 
 		if (!file_exists($path))
 		{
@@ -119,7 +119,7 @@ 
      */
     function MKCOL($options)
     {
-        $path   = $this->_unslashify($this->base .$options["path"]);
+        $path   = $this->_unslashify($this->base.$options["path"]);
         $parent = egw_vfs::dirname($path);
         $name   = egw_vfs::basename($path);
 
@@ -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)) {
@@ -226,7 +226,7 @@ 
             }
         } else {
             if (is_dir($source) && $options['depth'] == 'infinity') {
-            	$files = egw_vfs::find($source,array('depth' => true,'url' => true));	// depth=true: return dirs first, url=true: allow urls!
+            	$files = egw_vfs::find($source, array('depth' => true, 'url' => true)); // depth=true: return dirs first, url=true: allow urls!
             } else {
                 $files = array($source);
             }
@@ -272,16 +272,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 +
@@ -290,32 +290,32 @@ 
 		$info['props'] = array();
 
 		// no special beautified displayname here ...
-		$info['props'][] = HTTP_WebDAV_Server::mkprop	('displayname', egw_vfs::basename(self::_unslashify($info['path'])));
+		$info['props'][] = HTTP_WebDAV_Server::mkprop('displayname', egw_vfs::basename(self::_unslashify($info['path'])));
 
 		// creation and modification time
-		$info['props'][] = HTTP_WebDAV_Server::mkprop	('creationdate',    filectime($fspath));
-		$info['props'][] = HTTP_WebDAV_Server::mkprop	('getlastmodified', filemtime($fspath));
+		$info['props'][] = HTTP_WebDAV_Server::mkprop('creationdate', filectime($fspath));
+		$info['props'][] = HTTP_WebDAV_Server::mkprop('getlastmodified', filemtime($fspath));
 
         // Microsoft extensions: last access time and 'hidden' status
-        $info["props"][] = HTTP_WebDAV_Server::mkprop("lastaccessed",    fileatime($fspath));
-        $info["props"][] = HTTP_WebDAV_Server::mkprop("ishidden",        egw_vfs::is_hidden($fspath));
+        $info["props"][] = HTTP_WebDAV_Server::mkprop("lastaccessed", fileatime($fspath));
+        $info["props"][] = HTTP_WebDAV_Server::mkprop("ishidden", egw_vfs::is_hidden($fspath));
 
 		// type and size (caller already made sure that path exists)
 		if (is_dir($fspath)) {
 			// directory (WebDAV collection)
-			$info['props'][] = HTTP_WebDAV_Server::mkprop	('resourcetype', array(
+			$info['props'][] = HTTP_WebDAV_Server::mkprop('resourcetype', array(
 			 	HTTP_WebDAV_Server::mkprop('collection', '')));
-			$info['props'][] = HTTP_WebDAV_Server::mkprop	('getcontenttype', 'httpd/unix-directory');
+			$info['props'][] = HTTP_WebDAV_Server::mkprop('getcontenttype', 'httpd/unix-directory');
 		} else {
 			// plain file (WebDAV resource)
-			$info['props'][] = HTTP_WebDAV_Server::mkprop	('resourcetype', '');
+			$info['props'][] = HTTP_WebDAV_Server::mkprop('resourcetype', '');
 			if (egw_vfs::is_readable($path)) {
-				$info['props'][] = HTTP_WebDAV_Server::mkprop	('getcontenttype', egw_vfs::mime_content_type($path));
+				$info['props'][] = HTTP_WebDAV_Server::mkprop('getcontenttype', egw_vfs::mime_content_type($path));
 			} else {
 				error_log(__METHOD__."($path) $fspath is not readable!");
-				$info['props'][] = HTTP_WebDAV_Server::mkprop	('getcontenttype', 'application/x-non-readable');
+				$info['props'][] = HTTP_WebDAV_Server::mkprop('getcontenttype', 'application/x-non-readable');
 			}
-			$info['props'][] = HTTP_WebDAV_Server::mkprop	('getcontentlength', filesize($fspath));
+			$info['props'][] = HTTP_WebDAV_Server::mkprop('getcontentlength', filesize($fspath));
 		}
 		// generate etag from inode (sqlfs: fs_id), modification time and size
 		$stat = stat($fspath);
@@ -369,21 +369,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 egw_vfs::(stat|propfind) require it
 			// otherwise pathes containing url special chars like ? or # will not stat
@@ -393,21 +393,21 @@ 
 			// adding some properties used instead of regular DAV times
 			if (($stat = egw_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;
@@ -415,17 +415,17 @@ 
 				}
 			}
 		}
-		if ($path2n && ($path2props = egw_vfs::propfind(array_keys($path2n),null)))
+		if ($path2n && ($path2props = egw_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'] == egw_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;
 				}
@@ -481,36 +481,36 @@ 
 	 */
 	function PROPPATCH(&$options)
 	{
-		$path = translation::convert($options['path'],'utf-8');
+		$path = 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':
-							egw_vfs::touch($path,strtotime($prop['val']));
+							egw_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 (!egw_vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!egw_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':
-							egw_vfs::touch($path,strtotime($prop['val']));
+							egw_vfs::touch($path, strtotime($prop['val']));
 							break;
 						// not sure why, the filesystem example of the WebDAV class does it ...
 						default:
@@ -520,16 +520,16 @@ 
 					break;
 
 				case 'urn:schemas-microsoft-com:':
-					switch($prop['name'])
+					switch ($prop['name'])
 					{
 						case 'Win32LastModifiedTime':
-							egw_vfs::touch($path,strtotime($prop['val']));
+							egw_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 (!egw_vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!egw_vfs::proppatch($path, array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
 							break;
 					}
 					break;
@@ -539,18 +539,18 @@ 
 					$prop['name'] = '#'.$prop['name'];
 					// fall through
 				default:
-					if (!egw_vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+					if (!egw_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 ...
 	}
 
 	/**
@@ -561,18 +561,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 = egw_vfs::lock($options['path'],$options['locktoken'],$options['timeout'],strip_tags($options['owner']),
-			$options['scope'],$options['type'],isset($options['update']))) && !isset($options['update']))
+		if (($ret = egw_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';
 		}
@@ -587,8 +587,8 @@ 
 	 */
 	function UNLOCK(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.str_replace(array("\n",'    '),'',print_r($options,true)).')');
-		return egw_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 egw_vfs::unlock($options['path'], $options['token']) ? '204 No Content' : '409 Conflict';
 	}
 
 	/**
@@ -627,9 +627,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::HTTP_WebDAV_Server();
 	}
@@ -644,7 +644,7 @@ 
 	 */
 	function GET(&$options)
 	{
-		if (is_dir($this->base . $options["path"]))
+		if (is_dir($this->base.$options["path"]))
 		{
 			return $this->autoindex($options);
 		}
@@ -652,11 +652,11 @@ 
 		{
 			// mitigate risks of serving javascript or css from our domain
 			html::safe_content_header($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']);
 			}
 		}
@@ -675,9 +675,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='.translation::charset());
 		echo "<html>\n<head>\n\t<title>".'EGroupware WebDAV server '.htmlspecialchars($options['path'])."</title>\n";
@@ -689,10 +689,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 html::a_href(htmlspecialchars($name.'/'),$path);
+			echo html::a_href(htmlspecialchars($name.'/'), $path);
 		}
 		echo "</h1>\n";
 
@@ -709,18 +709,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";
 				}
@@ -730,9 +730,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
 			{
@@ -740,14 +740,14 @@ 
 			}
 
 			echo "\t<tr class='$class'>\n\t\t<td>$n</td>\n\t\t<td>".
-				html::a_href(htmlspecialchars($name),$base.strtr($file['path'], array(
+				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";
 		}
@@ -761,12 +761,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";
 		}
@@ -809,11 +809,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)
@@ -833,10 +833,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';
@@ -846,10 +846,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
 			{

Braces +133 added lines, -50 removed lines

@@ -63,7 +63,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 @@ 
         $parent = egw_vfs::dirname($path);
         $name   = egw_vfs::basename($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,71 +205,99 @@ 
         $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 (!rename($source, $dest)) {
+        if ($del)
+        {
+            if (!rename($source, $dest))
+            {
                 return "500 Internal server error";
             }
-        } else {
-            if (is_dir($source) && $options['depth'] == 'infinity') {
+        }
+        else
+        {
+            if (is_dir($source) && $options['depth'] == 'infinity')
+            {
             	$files = egw_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";
                     }
                 }
@@ -301,17 +347,23 @@ 
         $info["props"][] = HTTP_WebDAV_Server::mkprop("ishidden",        egw_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'][] = HTTP_WebDAV_Server::mkprop	('resourcetype', array(
 			 	HTTP_WebDAV_Server::mkprop('collection', '')));
 			$info['props'][] = HTTP_WebDAV_Server::mkprop	('getcontenttype', 'httpd/unix-directory');
-		} else {
+		}
+		else
+		{
 			// plain file (WebDAV resource)
 			$info['props'][] = HTTP_WebDAV_Server::mkprop	('resourcetype', '');
-			if (egw_vfs::is_readable($path)) {
+			if (egw_vfs::is_readable($path))
+			{
 				$info['props'][] = HTTP_WebDAV_Server::mkprop	('getcontenttype', egw_vfs::mime_content_type($path));
-			} else {
+			}
+			else
+			{
 				error_log(__METHOD__."($path) $fspath is not readable!");
 				$info['props'][] = HTTP_WebDAV_Server::mkprop	('getcontenttype', 'application/x-non-readable');
 			}
@@ -383,7 +435,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 egw_vfs::(stat|propfind) require it
 			// otherwise pathes containing url special chars like ? or # will not stat
@@ -422,16 +477,22 @@ 
 				$fileprops =& $files['files'][$path2n[$path]]['props'];
 				foreach($props as $prop)
 				{
-					if ($prop['ns'] == egw_vfs::DEFAULT_PROP_NAMESPACE && $prop['name'][0] == '#')	// eGW's customfields
+					if ($prop['ns'] == egw_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;
 	}
 
@@ -483,7 +544,8 @@ 
 	{
 		$path = translation::convert($options['path'],'utf-8');
 
-		foreach ($options['props'] as $key => $prop) {
+		foreach ($options['props'] as $key => $prop)
+		{
 			$attributes = array();
 			switch($prop['ns'])
 			{
@@ -500,7 +562,10 @@ 
 							//$attributes['created'] = strtotime($prop['val']);
 							//break;
 						default:
-							if (!egw_vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!egw_vfs::proppatch($path,array($prop)))
+							{
+								$options['props'][$key]['status'] = '403 Forbidden';
+							}
 							break;
 					}
 					break;
@@ -529,7 +594,10 @@ 
 						case 'Win32LastAccessTime':
 						case 'Win32FileAttributes':	// not sure what that is, it was always "00000000"
 						default:
-							if (!egw_vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+							if (!egw_vfs::proppatch($path,array($prop)))
+							{
+								$options['props'][$key]['status'] = '403 Forbidden';
+							}
 							break;
 					}
 					break;
@@ -539,15 +607,24 @@ 
 					$prop['name'] = '#'.$prop['name'];
 					// fall through
 				default:
-					if (!egw_vfs::proppatch($path,array($prop))) $options['props'][$key]['status'] = '403 Forbidden';
+					if (!egw_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 ...
@@ -561,7 +638,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']))
 		{
@@ -587,7 +667,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 egw_vfs::unlock($options['path'],$options['token']) ? '204 No Content' : '409 Conflict';
 	}
 

phpgwapi/inc/common_functions.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -959,7 +959,7 @@ 
  * @author skeeter
  * This function is used to retrieve a value from a user defined order of methods.
  * $this->id = get_var('id',array('HTTP_POST_VARS'||'POST','HTTP_GET_VARS'||'GET','HTTP_COOKIE_VARS'||'COOKIE','GLOBAL','DEFAULT'));
- * @param $variable name
+ * @param string $variable name
  * @param $method ordered array of methods to search for supplied variable
  * @param $default_value (optional)
  */
@@ -1186,7 +1186,7 @@ 
  * This is completely unnecessary, as you can use forward slashes in php under every OS -- RalfBecker 2005/11/09
  *
  * @deprecated just use forward slashes supported by PHP on all OS
- * @return file system separator
+ * @return string system separator
  */
 function filesystem_separator()
 {

Indentation +5 added lines, -5 removed lines

@@ -470,11 +470,11 @@
 }
 
 /**
-  * Allows for array and direct function params as well as sanatization.
-  *
-  * @author seek3r
-  * This function is used to validate param data as well as offer flexible function usage.
-  *
+ * Allows for array and direct function params as well as sanatization.
+ *
+ * @author seek3r
+ * This function is used to validate param data as well as offer flexible function usage.
+ *
 	function somefunc()
 	{
 		$expected_args[0] = Array('name'=>'fname','default'=>'joe', 'type'=>'string');

Spacing +202 added lines, -202 removed lines

@@ -37,7 +37,7 @@ 
 spl_autoload_register(function($class)
 {
 	$parts = explode('\\', $class);
-	if (array_shift($parts) != 'EGroupware') return;	// not our prefix
+	if (array_shift($parts) != 'EGroupware') return; // not our prefix
 
 	$app = lcfirst(array_shift($parts));
 	$base = EGW_INCLUDE_ROOT.'/'.$app.'/src/';
@@ -65,14 +65,14 @@ 
 	// fixing warnings generated by php 5.3.8 is_a($obj) trying to autoload huge strings
 	if (strlen($class) > 64 || strpos($class, '.') !== false) return;
 
-	$components = explode('_',$class);
+	$components = explode('_', $class);
 	$app = array_shift($components);
 	// classes using the new naming schema app_class_name, eg. admin_cmd
 	if (file_exists($file = EGW_INCLUDE_ROOT.'/'.$app.'/inc/class.'.$class.'.inc.php') ||
 		// classes using the new naming schema app_class_name, eg. admin_cmd
 		isset($components[0]) && file_exists($file = EGW_INCLUDE_ROOT.'/'.$app.'/inc/class.'.$app.'_'.$components[0].'.inc.php') ||
 		// classes with an underscore in their name
-		!isset($GLOBALS['egw_info']['apps'][$app]) && isset($GLOBALS['egw_info']['apps'][$app . '_' . $components[0]]) &&
+		!isset($GLOBALS['egw_info']['apps'][$app]) && isset($GLOBALS['egw_info']['apps'][$app.'_'.$components[0]]) &&
 			file_exists($file = EGW_INCLUDE_ROOT.'/'.$app.'_'.$components[0].'/inc/class.'.$class.'.inc.php') ||
 		// eGW api classes using the old naming schema, eg. html
 		file_exists($file = EGW_API_INC.'/class.'.$class.'.inc.php') ||
@@ -85,7 +85,7 @@ 
 		// include_once('Horde/String.php') to return true, even if the former was included with an absolute path
 		// only use include_path, if no Composer vendor directory exists
 		!isset($GLOBALS['egw_info']['apps'][$app]) && !file_exists(EGW_SERVER_ROOT.'/vendor') &&
-			@include($file = strtr($class, array('_'=>'/','\\'=>'/')).'.php'))
+			@include($file = strtr($class, array('_'=>'/', '\\'=>'/')).'.php'))
 	{
 		include_once($file);
 		//if (!class_exists($class, false) && !interface_exists($class, false)) error_log("autoloading class $class by include_once($file) failed!");
@@ -93,7 +93,7 @@ 
 	// allow apps to define an own autoload method
 	elseif (isset($GLOBALS['egw_info']['flags']['autoload']) && is_callable($GLOBALS['egw_info']['flags']['autoload']))
 	{
-		call_user_func($GLOBALS['egw_info']['flags']['autoload'],$class);
+		call_user_func($GLOBALS['egw_info']['flags']['autoload'], $class);
 	}
 });
 
@@ -115,7 +115,7 @@ 
 	{
 		return stripslashes($var);
 	}
-	foreach($var as $key => $val)
+	foreach ($var as $key => $val)
 	{
 		$var[$key] = is_array($val) ? array_stripslashes($val) : stripslashes($val);
 	}
@@ -135,7 +135,7 @@ 
 
 	if (is_null($func_overload)) $func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
 
-	return $func_overload & 2 ? mb_strlen($str,'ascii') : strlen($str);
+	return $func_overload&2 ? mb_strlen($str, 'ascii') : strlen($str);
 }
 
 /**
@@ -146,7 +146,7 @@ 
  * @param int $len
  * @return string
  */
-function cut_bytes(&$data,$offset,$len=null)
+function cut_bytes(&$data, $offset, $len = null)
 {
 	static $func_overload = null;
 
@@ -154,9 +154,9 @@ 
 
 	if (is_null($len))
 	{
-		return $func_overload & 2 ? mb_substr($data,$offset,bytes($data),'ascii') : substr($data,$offset);
+		return $func_overload&2 ? mb_substr($data, $offset, bytes($data), 'ascii') : substr($data, $offset);
 	}
-	return $func_overload & 2 ? mb_substr($data,$offset,$len,'ascii') : substr($data,$offset,$len);
+	return $func_overload&2 ? mb_substr($data, $offset, $len, 'ascii') : substr($data, $offset, $len);
 }
 
 if (!function_exists('imap_rfc822_parse_adrlist'))
@@ -188,10 +188,10 @@ 
 	{
 		$addresses = array();
 		$pending = '';
-		foreach(explode(',', $address) as $part)
+		foreach (explode(',', $address) as $part)
 		{
 			$trimmed = trim(($pending ? $pending.',' : '').$part);
-			if (($trimmed[0] == '"' && substr($trimmed, -1) != '>')||strpos($part, '@')===false)
+			if (($trimmed[0] == '"' && substr($trimmed, -1) != '>') || strpos($part, '@') === false)
 			{
 				$pending .= ($pending ? $pending.',' : '').$part;
 				continue;
@@ -244,7 +244,7 @@ 
 		//if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal))	// that's how I read the rfc(2)822
 		if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))	// but quoting is never wrong, so quote more then necessary
 		{
-			$personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"';
+			$personal = '"'.str_replace(array('\\', '"'), array('\\\\', '\\"'), $personal).'"';
 		}
 		return ($personal ? $personal.' <' : '').$mailbox.($host ? '@'.$host : '').($personal ? '>' : '');
 	}
@@ -265,7 +265,7 @@ 
 	{
 		return array((object)array(
 			'text' => Horde_Mime::decode($text),
-			'charset' => translation::charset(),	// is already in our internal encoding!
+			'charset' => translation::charset(), // is already in our internal encoding!
 		));
 	}
 }
@@ -294,7 +294,7 @@ 
 	 * @param int $len
 	 * @return string
 	 */
-	function mb_substr(&$data, $offset, $len=null)
+	function mb_substr(&$data, $offset, $len = null)
 	{
 		return is_null($len) ? substr($data, $offset) : substr($data, $offset, $len);
 	}
@@ -322,7 +322,7 @@ 
 			return 'NULL';
 		case 'object':
 		case 'array':
-			return str_replace(array("\n",'    '/*,'Array'*/),'',print_r($var,true));
+			return str_replace(array("\n", '    '/*,'Array'*/), '', print_r($var, true));
 	}
 	return 'UNKNOWN TYPE!';
 }
@@ -334,18 +334,18 @@ 
  * @param boolean $throw =false should we throw an exception, if $extension could not be loaded, default false = no
  * @return boolean true if loaded now, false otherwise
  */
-function check_load_extension($extension,$throw=false)
+function check_load_extension($extension, $throw = false)
 {
 	if (!defined('PHP_SHLIB_PREFIX'))
 	{
-		define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
+		define('PHP_SHLIB_PREFIX', PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
 	}
 	// we check for the existens of 'dl', as multithreaded webservers dont have it and some hosters disable it !!!
-	$loaded = extension_loaded($extension) || function_exists('dl') && @dl($dl=PHP_SHLIB_PREFIX.$extension.'.'.PHP_SHLIB_SUFFIX);
+	$loaded = extension_loaded($extension) || function_exists('dl') && @dl($dl = PHP_SHLIB_PREFIX.$extension.'.'.PHP_SHLIB_SUFFIX);
 
 	if (!$loaded && $throw)
 	{
-		throw new Exception ("PHP extension '$extension' not loaded AND can NOT be loaded via dl('$dl')!");
+		throw new Exception("PHP extension '$extension' not loaded AND can NOT be loaded via dl('$dl')!");
 	}
 	return $loaded;
 }
@@ -355,7 +355,7 @@ 
  */
 function print_debug_subarray($array)
 {
-	foreach($array as $key => $value)
+	foreach ($array as $key => $value)
 	{
 		if (is_array($value))
 		{
@@ -376,7 +376,7 @@ 
  * This function is used to debugging data.
  * print_debug('this is some debugging data',$somevar);
  */
-function print_debug($message,$var = 'messageonly',$part = 'app', $level = 3)
+function print_debug($message, $var = 'messageonly', $part = 'app', $level = 3)
 {
 	if (($part == 'app' && DEBUG_APP == True) || ($part == 'api' && DEBUG_API == True))
 	{
@@ -405,12 +405,12 @@ 
 				}
 
 				/* Bit 1 means to output to screen */
-				if (!!(DEBUG_OUTPUT & 1))
+				if (!!(DEBUG_OUTPUT&1))
 				{
 					echo "$output<br>\n";
 				}
 				/* Bit 2 means to output to sql */
-				if (!!(DEBUG_OUTPUT & 2))
+				if (!!(DEBUG_OUTPUT&2))
 				{
 					/* Need to flesh this out still. I dont have a table to dump this in yet.*/
 					/* So the SQL statement will go here*/
@@ -430,7 +430,7 @@ 
 			}
 			else
 			{
-				if (floor(phpversion()) > 3 && !!(DEBUG_OUTPUT & 2))
+				if (floor(phpversion()) > 3 && !!(DEBUG_OUTPUT&2))
 				{
 					ob_start();
 				}
@@ -438,7 +438,7 @@ 
 				print_r($var);
 				if (DEBUG_DATATYPES)
 				{
-					foreach($var as $key => $value)
+					foreach ($var as $key => $value)
 					{
 						if (is_array($value))
 						{
@@ -453,13 +453,13 @@ 
 					print_r($vartypes);
 				}
 				echo "\n<pre>\n";
-				if (floor(phpversion()) > 3 && !!(DEBUG_OUTPUT & 2))
+				if (floor(phpversion()) > 3 && !!(DEBUG_OUTPUT&2))
 				{
 					$output .= ob_get_contents();
 					ob_end_clean();
 					/* Need to flesh this out still. I dont have a table to dump this in yet.*/
 					/* So the SQL statement will go here*/
-					if (!!(DEBUG_OUTPUT & 1))
+					if (!!(DEBUG_OUTPUT&1))
 					{
 						echo "$output<br>\n";
 					}
@@ -507,7 +507,7 @@ 
 	Its using the default value for the second param.
 	Of course if you have the second param as a required field it will fail to work.
  */
-function safe_args($expected, $recieved, $line='??', $file='??')
+function safe_args($expected, $recieved, $line = '??', $file = '??')
 {
 	/* This array will contain all the required fields */
 	$required = Array();
@@ -530,16 +530,16 @@ 
 	}
 
 	/* Make sure they passed at least one param */
-	if(count($recieved) != 0)
+	if (count($recieved) != 0)
 	{
 		/* if used as standard function we loop thru and set by position */
-		if(!is_array($recieved[0]))
+		if (!is_array($recieved[0]))
 		{
 		for ($i = 0; $i < $num; $i++)
 			{
-				if(isset($recieved[$i]) && $recieved[$i] !== '##DEFAULT##')
+				if (isset($recieved[$i]) && $recieved[$i] !== '##DEFAULT##')
 				{
-					if(sanitize($recieved[$i],$expected[$i]['type']))
+					if (sanitize($recieved[$i], $expected[$i]['type']))
 					{
 						$args[$expected[$i]['name']] = $recieved[$i];
 						unset($required[$expected[$i]['name']]);
@@ -559,11 +559,11 @@ 
 			{
 				$types[$expected[$i]['name']] = $expected[$i]['type'];
 			}
-			while(list($key,$val) = each($recieved[0]))
+			while (list($key, $val) = each($recieved[0]))
 			{
-				if($val !== '##DEFAULT##')
+				if ($val !== '##DEFAULT##')
 				{
-					if(sanitize($val,$types[$key]) == True)
+					if (sanitize($val, $types[$key]) == True)
 					{
 						$args[$key] = $val;
 						unset($required[$key]);
@@ -577,7 +577,7 @@ 
 			}
 		}
 	}
-	if(count($required) != 0)
+	if (count($required) != 0)
 	{
 		while (list($key) = each($required))
 		{
@@ -595,7 +595,7 @@ 
  * This function is used to validate input data.
  * sanitize('number',$somestring);
  */
-function sanitize($string,$type)
+function sanitize($string, $type)
 {
 	switch ($type)
 	{
@@ -647,10 +647,10 @@ 
 			}
 			break;
 		case 'ip':
-			if (preg_match('/'."^[0-9]{1,3}(\.[0-9]{1,3}){3}$".'/i',$string))
+			if (preg_match('/'."^[0-9]{1,3}(\.[0-9]{1,3}){3}$".'/i', $string))
 			{
-				$octets = preg_split('/\./',$string);
-				for ($i=0; $i != count($octets); $i++)
+				$octets = preg_split('/\./', $string);
+				for ($i = 0; $i != count($octets); $i++)
 				{
 					if ($octets[$i] < 0 || $octets[$i] > 255)
 					{
@@ -668,17 +668,17 @@ 
 			}
 			break;
 		case 'email':
-			if (preg_match('/'."^([[:alnum:]_%+=.-]+)@([[:alnum:]_.-]+)\.([a-z]{2,3}|[0-9]{1,3})$".'/i',$string))
+			if (preg_match('/'."^([[:alnum:]_%+=.-]+)@([[:alnum:]_.-]+)\.([a-z]{2,3}|[0-9]{1,3})$".'/i', $string))
 			{
 				return True;
 			}
 			break;
 		case 'password':
 			$password_length = strlen($string);
-			$password_numbers = Array('0','1','2','3','4','5','6','7','8','9');
-			$password_special_chars = Array(' ','~','`','!','@','#','$','%','^','&','*','(',')','_','+','-','=','{','}','|','[',']',"\\",':','"',';',"'",'<','>','?',',','.','/');
+			$password_numbers = Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9');
+			$password_special_chars = Array(' ', '~', '`', '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', '-', '=', '{', '}', '|', '[', ']', "\\", ':', '"', ';', "'", '<', '>', '?', ',', '.', '/');
 
-			if(@isset($GLOBALS['egw_info']['server']['pass_min_length']) && is_int($GLOBALS['egw_info']['server']['pass_min_length']) && $GLOBALS['egw_info']['server']['pass_min_length'] > 1)
+			if (@isset($GLOBALS['egw_info']['server']['pass_min_length']) && is_int($GLOBALS['egw_info']['server']['pass_min_length']) && $GLOBALS['egw_info']['server']['pass_min_length'] > 1)
 			{
 				$min_length = $GLOBALS['egw_info']['server']['pass_min_length'];
 			}
@@ -687,7 +687,7 @@ 
 				$min_length = 1;
 			}
 
-			if(@isset($GLOBALS['egw_info']['server']['pass_require_non_alpha']) && $GLOBALS['egw_info']['server']['pass_require_non_alpha'] == True)
+			if (@isset($GLOBALS['egw_info']['server']['pass_require_non_alpha']) && $GLOBALS['egw_info']['server']['pass_require_non_alpha'] == True)
 			{
 				$pass_verify_non_alpha = False;
 			}
@@ -696,7 +696,7 @@ 
 				$pass_verify_non_alpha = True;
 			}
 
-			if(@isset($GLOBALS['egw_info']['server']['pass_require_numbers']) && $GLOBALS['egw_info']['server']['pass_require_numbers'] == True)
+			if (@isset($GLOBALS['egw_info']['server']['pass_require_numbers']) && $GLOBALS['egw_info']['server']['pass_require_numbers'] == True)
 			{
 				$pass_verify_num = False;
 			}
@@ -705,7 +705,7 @@ 
 				$pass_verify_num = True;
 			}
 
-			if(@isset($GLOBALS['egw_info']['server']['pass_require_special_char']) && $GLOBALS['egw_info']['server']['pass_require_special_char'] == True)
+			if (@isset($GLOBALS['egw_info']['server']['pass_require_special_char']) && $GLOBALS['egw_info']['server']['pass_require_special_char'] == True)
 			{
 				$pass_verify_special_char = False;
 			}
@@ -716,7 +716,7 @@ 
 
 			if ($password_length >= $min_length)
 			{
-				for ($i=0; $i != $password_length; $i++)
+				for ($i = 0; $i != $password_length; $i++)
 				{
 					$cur_test_string = substr($string, $i, 1);
 					if (in_array($cur_test_string, $password_numbers) || in_array($cur_test_string, $password_special_chars))
@@ -735,17 +735,17 @@ 
 
 				if ($pass_verify_num == False)
 				{
-					$GLOBALS['egw_info']['flags']['msgbox_data']['Password requires at least one non-alpha character']=False;
+					$GLOBALS['egw_info']['flags']['msgbox_data']['Password requires at least one non-alpha character'] = False;
 				}
 
 				if ($pass_verify_num == False)
 				{
-					$GLOBALS['egw_info']['flags']['msgbox_data']['Password requires at least one numeric character']=False;
+					$GLOBALS['egw_info']['flags']['msgbox_data']['Password requires at least one numeric character'] = False;
 				}
 
 				if ($pass_verify_special_char == False)
 				{
-					$GLOBALS['egw_info']['flags']['msgbox_data']['Password requires at least one special character (non-letter and non-number)']=False;
+					$GLOBALS['egw_info']['flags']['msgbox_data']['Password requires at least one special character (non-letter and non-number)'] = False;
 				}
 
 				if ($pass_verify_num == True && $pass_verify_special_char == True)
@@ -754,7 +754,7 @@ 
 				}
 				return False;
 			}
-			$GLOBALS['egw_info']['flags']['msgbox_data']['Password must be at least '.$min_length.' characters']=False;
+			$GLOBALS['egw_info']['flags']['msgbox_data']['Password must be at least '.$min_length.' characters'] = False;
 			return False;
 
 		case 'any':
@@ -772,40 +772,40 @@ 
 	}
 }
 
-function reg_var($varname, $method='any', $valuetype='alphanumeric',$default_value='',$register=True)
+function reg_var($varname, $method = 'any', $valuetype = 'alphanumeric', $default_value = '', $register = True)
 {
-	if($method == 'any' || $method == array('any'))
+	if ($method == 'any' || $method == array('any'))
 	{
-		$method = Array('POST','GET','COOKIE','SERVER','FILES','GLOBAL','DEFAULT');
+		$method = Array('POST', 'GET', 'COOKIE', 'SERVER', 'FILES', 'GLOBAL', 'DEFAULT');
 	}
-	elseif(!is_array($method))
+	elseif (!is_array($method))
 	{
 		$method = Array($method);
 	}
 	$cnt = count($method);
-	for($i=0;$i<$cnt;$i++)
+	for ($i = 0; $i < $cnt; $i++)
 	{
-		switch(strtoupper($method[$i]))
+		switch (strtoupper($method[$i]))
 		{
 			case 'DEFAULT':
-				if($default_value)
+				if ($default_value)
 				{
 					$value = $default_value;
-					$i = $cnt+1; /* Found what we were looking for, now we end the loop */
+					$i = $cnt + 1; /* Found what we were looking for, now we end the loop */
 				}
 				break;
 			case 'GLOBAL':
-				if(@isset($GLOBALS[$varname]))
+				if (@isset($GLOBALS[$varname]))
 				{
 					$value = $GLOBALS[$varname];
-					$i = $cnt+1;
+					$i = $cnt + 1;
 				}
 				break;
 			case 'POST':
 			case 'GET':
 			case 'COOKIE':
 			case 'SERVER':
-				if(phpversion() >= '4.1.0')
+				if (phpversion() >= '4.1.0')
 				{
 					$meth = '_'.strtoupper($method[$i]);
 				}
@@ -813,30 +813,30 @@ 
 				{
 					$meth = 'HTTP_'.strtoupper($method[$i]).'_VARS';
 				}
-				if(@isset($GLOBALS[$meth][$varname]))
+				if (@isset($GLOBALS[$meth][$varname]))
 				{
 					$value = $GLOBALS[$meth][$varname];
-					$i = $cnt+1;
+					$i = $cnt + 1;
 				}
-				if(get_magic_quotes_gpc() && isset($value))
+				if (get_magic_quotes_gpc() && isset($value))
 				{
 					// we need to stripslash 3 levels of arrays
 					// because of the password function in preferences
 					// it's named ['user']['variablename']['pw']
 					// or something like this in projects
 					// $values['budgetBegin']['1']['year']
-					if(@is_array($value))
+					if (@is_array($value))
 					{
 						/* stripslashes on the first level of array values */
-						foreach($value as $name => $val)
+						foreach ($value as $name => $val)
 						{
-							if(@is_array($val))
+							if (@is_array($val))
 							{
-								foreach($val as $name2 => $val2)
+								foreach ($val as $name2 => $val2)
 								{
-									if(@is_array($val2))
+									if (@is_array($val2))
 									{
-										foreach($val2 as $name3 => $val3)
+										foreach ($val2 as $name3 => $val3)
 										{
 											$value[$name][$name2][$name3] = stripslashes($val3);
 										}
@@ -861,7 +861,7 @@ 
 				}
 				break;
 			case 'FILES':
-				if(phpversion() >= '4.1.0')
+				if (phpversion() >= '4.1.0')
 				{
 					$meth = '_FILES';
 				}
@@ -869,17 +869,17 @@ 
 				{
 					$meth = 'HTTP_POST_FILES';
 				}
-				if(@isset($GLOBALS[$meth][$varname]))
+				if (@isset($GLOBALS[$meth][$varname]))
 				{
 					$value = $GLOBALS[$meth][$varname];
-					$i = $cnt+1;
+					$i = $cnt + 1;
 				}
 				break;
 			default:
-				if(@isset($GLOBALS[strtoupper($method[$i])][$varname]))
+				if (@isset($GLOBALS[strtoupper($method[$i])][$varname]))
 				{
 					$value = $GLOBALS[strtoupper($method[$i])][$varname];
-					$i = $cnt+1;
+					$i = $cnt + 1;
 				}
 				break;
 		}
@@ -898,7 +898,7 @@ 
 		}
 		else
 		{
-			if (sanitize($value,$valuetype) == 1)
+			if (sanitize($value, $valuetype) == 1)
 			{
 				$result = $value;
 			}
@@ -911,7 +911,7 @@ 
 	else
 	{
 		reset($value);
-		while(list($k, $v) = each($value))
+		while (list($k, $v) = each($value))
 		{
 			if ($v == '')
 			{
@@ -928,7 +928,7 @@ 
 					$vt = $valuetype;
 				}
 
-				if (sanitize($v,$vt) == 1)
+				if (sanitize($v, $vt) == 1)
 				{
 					$result[$k] = $v;
 				}
@@ -946,7 +946,7 @@ 
 			}
 		}
 	}
-	if($register)
+	if ($register)
 	{
 		$GLOBALS['egw_info'][$GLOBALS['egw_info']['flags']['currentapp']][$varname] = $result;
 	}
@@ -963,13 +963,13 @@ 
  * @param $method ordered array of methods to search for supplied variable
  * @param $default_value (optional)
  */
-function get_var($variable,$method='any',$default_value='')
+function get_var($variable, $method = 'any', $default_value = '')
 {
-	if(!@is_array($method))
+	if (!@is_array($method))
 	{
 		$method = array($method);
 	}
-	return reg_var($variable,$method,'any',$default_value,False);
+	return reg_var($variable, $method, 'any', $default_value, False);
 }
 
 /**
@@ -985,7 +985,7 @@ 
  */
 function &CreateObject($class)
 {
-	list($appname,$classname) = explode('.',$class);
+	list($appname, $classname) = explode('.', $class);
 
 	if (!class_exists($classname))
 	{
@@ -1011,7 +1011,7 @@ 
 				$classname = $replace[$classname];
 			}
 		}
-		if (!file_exists($f=EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
+		if (!file_exists($f = EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
 		{
 			throw new egw_exception_assertion_failed(__FUNCTION__."($classname) file $f not found!");
 		}
@@ -1019,7 +1019,7 @@ 
 		require_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php');
 	}
 	$args = func_get_args();
-	switch(count($args))
+	switch (count($args))
 	{
 		case 1:
 			$obj = new $classname;
@@ -1028,18 +1028,18 @@ 
 			$obj = new $classname($args[1]);
 			break;
 		case 3:
-			$obj = new $classname($args[1],$args[2]);
+			$obj = new $classname($args[1], $args[2]);
 			break;
 		case 4:
-			$obj = new $classname($args[1],$args[2],$args[3]);
+			$obj = new $classname($args[1], $args[2], $args[3]);
 			break;
 		default:
-			$code = '$obj = new ' . $classname . '(';
-			foreach(array_keys($args) as $n)
+			$code = '$obj = new '.$classname.'(';
+			foreach (array_keys($args) as $n)
 			{
 				if ($n)
 				{
-					$code .= ($n > 1 ? ',' : '') . '$args[' . $n . ']';
+					$code .= ($n > 1 ? ',' : '').'$args['.$n.']';
 				}
 			}
 			$code .= ');';
@@ -1064,30 +1064,30 @@ 
 function &ExecMethod2($acm)
 {
 	// class::method is php5.2.3+
-	if (strpos($acm,'::') !== false && version_compare(PHP_VERSION,'5.2.3','<'))
+	if (strpos($acm, '::') !== false && version_compare(PHP_VERSION, '5.2.3', '<'))
 	{
-		list($class,$method) = explode('::',$acm);
-		$acm = array($class,$method);
+		list($class, $method) = explode('::', $acm);
+		$acm = array($class, $method);
 	}
 	if (!is_callable($acm))
 	{
-		list(,$class,$method) = explode('.',$acm);
-		if (!is_object($obj =& $GLOBALS[$class]))
+		list(,$class, $method) = explode('.', $acm);
+		if (!is_object($obj = & $GLOBALS[$class]))
 		{
-			$obj =& CreateObject($acm);
+			$obj = & CreateObject($acm);
 		}
 
-		if (!method_exists($obj,$method))
+		if (!method_exists($obj, $method))
 		{
 			echo "<p><b>".function_backtrace()."</b>: no methode '$method' in class '$class'</p>\n";
 			return False;
 		}
-		$acm = array($obj,$method);
+		$acm = array($obj, $method);
 	}
 	$args = func_get_args();
 	unset($args[0]);
 
-	return call_user_func_array($acm,$args);
+	return call_user_func_array($acm, $args);
 }
 
 /**
@@ -1104,13 +1104,13 @@ 
  */
 function ExecMethod($method, $functionparam = '_UNDEF_', $loglevel = 3, $classparams = '_UNDEF_')
 {
-	unset($loglevel);	// not used
+	unset($loglevel); // not used
 	/* Need to make sure this is working against a single dimensional object */
-	$partscount = count(explode('.',$method)) - 1;
+	$partscount = count(explode('.', $method)) - 1;
 
 	if (!is_callable($method) && $partscount == 2)
 	{
-		list($appname,$classname,$functionname) = explode(".", $method);
+		list($appname, $classname, $functionname) = explode(".", $method);
 		if (!is_object($GLOBALS[$classname]))
 		{
 			// please note: no reference assignment (=&) here, as $GLOBALS is a reference itself!!!
@@ -1124,16 +1124,16 @@ 
 			}
 		}
 
-		if (!method_exists($GLOBALS[$classname],$functionname))
+		if (!method_exists($GLOBALS[$classname], $functionname))
 		{
 			error_log("ExecMethod('$method', ...) No methode '$functionname' in class '$classname'! ".function_backtrace());
 			return false;
 		}
-		$method = array($GLOBALS[$classname],$functionname);
+		$method = array($GLOBALS[$classname], $functionname);
 	}
 	if (is_callable($method))
 	{
-		return $functionparam != '_UNDEF_' ? call_user_func($method,$functionparam) : call_user_func($method);
+		return $functionparam != '_UNDEF_' ? call_user_func($method, $functionparam) : call_user_func($method);
 	}
 	error_log("ExecMethod('$method', ...) Error in parts! ".function_backtrace());
 	return false;
@@ -1149,7 +1149,7 @@ 
  * @param int/string $default_id either a name or an id
  * @return int account_id
  */
-function get_account_id($account_id = '',$default_id = '')
+function get_account_id($account_id = '', $default_id = '')
 {
 	if (gettype($account_id) == 'integer')
 	{
@@ -1159,7 +1159,7 @@ 
 	{
 		if ($default_id == '')
 		{
-			return (isset($GLOBALS['egw_info']['user']['account_id'])?$GLOBALS['egw_info']['user']['account_id']:0);
+			return (isset($GLOBALS['egw_info']['user']['account_id']) ? $GLOBALS['egw_info']['user']['account_id'] : 0);
 		}
 		elseif (is_string($default_id))
 		{
@@ -1169,7 +1169,7 @@ 
 	}
 	elseif (is_string($account_id))
 	{
-		if($GLOBALS['egw']->accounts->exists((int)$account_id) == True)
+		if ($GLOBALS['egw']->accounts->exists((int)$account_id) == True)
 		{
 			return (int)$account_id;
 		}
@@ -1190,7 +1190,7 @@ 
  */
 function filesystem_separator()
 {
-	if(PHP_OS == 'Windows' || PHP_OS == 'OS/2' || PHP_OS == 'WINNT')
+	if (PHP_OS == 'Windows' || PHP_OS == 'OS/2' || PHP_OS == 'WINNT')
 	{
 		return '\\';
 	}
@@ -1212,9 +1212,9 @@ 
  * @param boolean $print =true print or return the content
  * @return string if !$print
  */
-function _debug_array($array,$print=True)
+function _debug_array($array, $print = True)
 {
-	$output = '<pre>'.print_r($array,true)."</pre>\n";
+	$output = '<pre>'.print_r($array, true)."</pre>\n";
 
 	if ($print)
 	{
@@ -1233,44 +1233,44 @@ 
  * @param string $b egw version number to check $a against
  * @return boolean True if $a < $b
  */
-function alessthanb($a,$b,$DEBUG=False)
+function alessthanb($a, $b, $DEBUG = False)
 {
-	$num = array('1st','2nd','3rd','4th');
+	$num = array('1st', '2nd', '3rd', '4th');
 
 	if ($DEBUG)
 	{
-		echo'<br>Input values: ' . 'A="'.$a.'", B="'.$b.'"';
+		echo'<br>Input values: '.'A="'.$a.'", B="'.$b.'"';
 	}
-	$newa = str_replace('pre','.',$a);
-	$newb = str_replace('pre','.',$b);
-	$testa = explode('.',$newa);
-	if(@$testa[1] == '')
+	$newa = str_replace('pre', '.', $a);
+	$newb = str_replace('pre', '.', $b);
+	$testa = explode('.', $newa);
+	if (@$testa[1] == '')
 	{
 		$testa[1] = 0;
 	}
-	if(@$testa[3] == '')
+	if (@$testa[3] == '')
 	{
 		$testa[3] = 0;
 	}
-	$testb = explode('.',$newb);
-	if(@$testb[1] == '')
+	$testb = explode('.', $newb);
+	if (@$testb[1] == '')
 	{
 		$testb[1] = 0;
 	}
-	if(@$testb[3] == '')
+	if (@$testb[3] == '')
 	{
 		$testb[3] = 0;
 	}
 	$less = 0;
 
-	for ($i=0;$i<count($testa);$i++)
+	for ($i = 0; $i < count($testa); $i++)
 	{
-		if ($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is less than ' . (int)$testb[$i] . ' ...'; }
+		if ($DEBUG) { echo'<br>Checking if '.(int)$testa[$i].' is less than '.(int)$testb[$i].' ...'; }
 		if ((int)$testa[$i] < (int)$testb[$i])
 		{
 			if ($DEBUG) { echo ' yes.'; }
 			$less++;
-			if ($i<3)
+			if ($i < 3)
 			{
 				/* Ensure that this is definitely smaller */
 				if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
@@ -1278,11 +1278,11 @@ 
 				break;
 			}
 		}
-		elseif((int)$testa[$i] > (int)$testb[$i])
+		elseif ((int)$testa[$i] > (int)$testb[$i])
 		{
 			if ($DEBUG) { echo ' no.'; }
 			$less--;
-			if ($i<2)
+			if ($i < 2)
 			{
 				/* Ensure that this is definitely greater */
 				if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
@@ -1297,12 +1297,12 @@ 
 		}
 	}
 	if ($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
-	if ($less>0)
+	if ($less > 0)
 	{
 		if ($DEBUG) { echo '<br>A is less than B'; }
 		return True;
 	}
-	elseif($less<0)
+	elseif ($less < 0)
 	{
 		if ($DEBUG) { echo '<br>A is greater than B'; }
 		return False;
@@ -1321,36 +1321,36 @@ 
  * @param string $b eGW version number to check check $a against
  * @return boolean True if $a > $b
  */
-function amorethanb($a,$b,$DEBUG=False)
+function amorethanb($a, $b, $DEBUG = False)
 {
-	$num = array('1st','2nd','3rd','4th');
+	$num = array('1st', '2nd', '3rd', '4th');
 
 	if ($DEBUG)
 	{
-		echo'<br>Input values: ' . 'A="'.$a.'", B="'.$b.'"';
+		echo'<br>Input values: '.'A="'.$a.'", B="'.$b.'"';
 	}
-	$newa = str_replace('pre','.',$a);
-	$newb = str_replace('pre','.',$b);
-	$testa = explode('.',$newa);
-	if($testa[3] == '')
+	$newa = str_replace('pre', '.', $a);
+	$newb = str_replace('pre', '.', $b);
+	$testa = explode('.', $newa);
+	if ($testa[3] == '')
 	{
 		$testa[3] = 0;
 	}
-	$testb = explode('.',$newb);
-	if($testb[3] == '')
+	$testb = explode('.', $newb);
+	if ($testb[3] == '')
 	{
 		$testb[3] = 0;
 	}
 	$less = 0;
 
-	for ($i=0;$i<count($testa);$i++)
+	for ($i = 0; $i < count($testa); $i++)
 	{
-		if ($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is more than ' . (int)$testb[$i] . ' ...'; }
+		if ($DEBUG) { echo'<br>Checking if '.(int)$testa[$i].' is more than '.(int)$testb[$i].' ...'; }
 		if ((int)$testa[$i] > (int)$testb[$i])
 		{
 			if ($DEBUG) { echo ' yes.'; }
 			$less++;
-			if ($i<3)
+			if ($i < 3)
 			{
 				/* Ensure that this is definitely greater */
 				if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
@@ -1358,11 +1358,11 @@ 
 				break;
 			}
 		}
-		elseif((int)$testa[$i] < (int)$testb[$i])
+		elseif ((int)$testa[$i] < (int)$testb[$i])
 		{
 			if ($DEBUG) { echo ' no.'; }
 			$less--;
-			if ($i<2)
+			if ($i < 2)
 			{
 				/* Ensure that this is definitely smaller */
 				if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
@@ -1377,12 +1377,12 @@ 
 		}
 	}
 	if ($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
-	if ($less>0)
+	if ($less > 0)
 	{
 		if ($DEBUG) { echo '<br>A is greater than B'; }
 		return True;
 	}
-	elseif($less<0)
+	elseif ($less < 0)
 	{
 		if ($DEBUG) { echo '<br>A is less than B'; }
 		return False;
@@ -1402,9 +1402,9 @@ 
  * @param	$tables	and array of tables to have the prefix prepended to
  * @return array of table names with the prefix prepended
  */
-function prepend_tables_prefix($prefix,$tables)
+function prepend_tables_prefix($prefix, $tables)
 {
-	foreach($tables as $key => $value)
+	foreach ($tables as $key => $value)
 	{
 		$tables[$key] = $prefix.$value;
 	}
@@ -1418,28 +1418,28 @@ 
  * @param int $remove =0 number of levels to remove
  * @return string function-names separated by slashes (beginning with the calling function not this one)
  */
-function function_backtrace($remove=0)
+function function_backtrace($remove = 0)
 {
 	if (function_exists('debug_backtrace'))
 	{
 		$backtrace = debug_backtrace();
 		//echo "function_backtrace($remove)<pre>".print_r($backtrace,True)."</pre>\n";
-		foreach($backtrace as $n => $level)
+		foreach ($backtrace as $n => $level)
 		{
 			if ($remove-- < 0)
 			{
-				$ret[] = (isset($level['class'])?$level['class'].$level['type']:'').$level['function'].
-					($n > 0 && isset($backtrace[$n-1]['line']) ? ':'.$backtrace[$n-1]['line'] : '').	// add line number of call
+				$ret[] = (isset($level['class']) ? $level['class'].$level['type'] : '').$level['function'].
+					($n > 0 && isset($backtrace[$n - 1]['line']) ? ':'.$backtrace[$n - 1]['line'] : '').// add line number of call
 					(!$level['class'] && !is_object($level['args'][0]) && $level['function'] != 'unserialize' ?
-					'('.substr(str_replace(EGW_SERVER_ROOT,'',(string)$level['args'][0]),0,64).')' : '');
+					'('.substr(str_replace(EGW_SERVER_ROOT, '', (string)$level['args'][0]), 0, 64).')' : '');
 			}
 		}
 		if (is_array($ret))
 		{
-			return implode(' / ',$ret);
+			return implode(' / ', $ret);
 		}
 	}
-	return $_GET['menuaction'] ? $_GET['menuaction'] : str_replace(EGW_SERVER_ROOT,'',$_SERVER['SCRIPT_FILENAME']);
+	return $_GET['menuaction'] ? $_GET['menuaction'] : str_replace(EGW_SERVER_ROOT, '', $_SERVER['SCRIPT_FILENAME']);
 }
 
 /**
@@ -1449,9 +1449,9 @@ 
  * @param array &$var reference of array to check
  * @param string $name ='' name of the array
  */
-function _check_script_tag(&$var,$name='')
+function _check_script_tag(&$var, $name = '')
 {
-	static $preg=null;
+	static $preg = null;
 	//old: '/<\/?[^>]*\b(iframe|script|javascript|on(before)?(abort|blur|change|click|dblclick|error|focus|keydown|keypress|keyup|load|mousedown|mousemove|mouseout|mouseover|mouseup|reset|select|submit|unload))\b[^>]*>/i';
 	if (!isset($preg)) $preg =
 		// forbidden tags like iframe or script
@@ -1464,15 +1464,15 @@ 
 		'<[^>]+style\s*=\s*("|\')[^>]*(behavior\s*:\s*url|expression)\s*\()/i';
 	if (is_array($var))
 	{
-		foreach($var as $key => $val)
+		foreach ($var as $key => $val)
 		{
 			if (is_array($val))
 			{
-				_check_script_tag($var[$key],$name.'['.$key.']');
+				_check_script_tag($var[$key], $name.'['.$key.']');
 			}
-			elseif(strpos($val, '<') !== false)	// speedup: ignore everything without <
+			elseif (strpos($val, '<') !== false)	// speedup: ignore everything without <
 			{
-				if (preg_match($preg,$val))
+				if (preg_match($preg, $val))
 				{
 					// special handling for $_POST[json_data], to decend into it's decoded content, fixing json direct might break json syntax
 					if ($name == '_POST' && $key == 'json_data' && ($json_data = json_decode($val, true)))
@@ -1486,7 +1486,7 @@ 
 					// attempt to clean the thing
 					$var[$key] = $val = html::purify($val);
 					// check if we succeeded, if not drop the var anyway, keep the egw_unset_var in any case
-					if (preg_match($preg,$val))
+					if (preg_match($preg, $val))
 					{
 						error_log("*** _check_script_tag($name): unset(${name}[$key]) with value $val***");
 						unset($var[$key]);
@@ -1598,15 +1598,15 @@ 
 	die("<p style='color: ".($num_failed?'red':'black')."'>Tests finished: $num_failed / $total failed</p>");
 }*/
 
-foreach(array('_GET','_POST','_REQUEST','HTTP_GET_VARS','HTTP_POST_VARS') as $n => $where)
+foreach (array('_GET', '_POST', '_REQUEST', 'HTTP_GET_VARS', 'HTTP_POST_VARS') as $n => $where)
 {
 	$pregs = array(
 		'order' => '/^[a-zA-Z0-9_,]*$/',
 		'sort'  => '/^(ASC|DESC|asc|desc|0|1|2|3|4|5|6|7){0,1}$/',
 	);
-	foreach(array('order','sort') as $name)
+	foreach (array('order', 'sort') as $name)
 	{
-		if (isset($GLOBALS[$where][$name]) && !is_array($GLOBALS[$where][$name]) && !preg_match($pregs[$name],$GLOBALS[$where][$name]))
+		if (isset($GLOBALS[$where][$name]) && !is_array($GLOBALS[$where][$name]) && !preg_match($pregs[$name], $GLOBALS[$where][$name]))
 		{
 			$GLOBALS[$where][$name] = '';
 		}
@@ -1615,14 +1615,14 @@ 
 	// speeds up the execusion a bit
 	if (isset($GLOBALS[$where]) && is_array($GLOBALS[$where]) && ($n < 2 || isset($GLOBALS['egw_unset_vars'])))
 	{
-		_check_script_tag($GLOBALS[$where],$where);
+		_check_script_tag($GLOBALS[$where], $where);
 	}
 }
 //if (is_array($GLOBALS['egw_unset_vars'])) { echo "egw_unset_vars=<pre>".htmlspecialchars(print_r($GLOBALS['egw_unset_vars'],true))."</pre>"; exit; }
 
 // $GLOBALS[egw_info][flags][currentapp] and die  if it contains something nasty or unexpected
 if (isset($GLOBALS['egw_info']) && isset($GLOBALS['egw_info']['flags']) &&
-	isset($GLOBALS['egw_info']['flags']['currentapp']) && !preg_match('/^[A-Za-z0-9_-]+$/',$GLOBALS['egw_info']['flags']['currentapp']))
+	isset($GLOBALS['egw_info']['flags']['currentapp']) && !preg_match('/^[A-Za-z0-9_-]+$/', $GLOBALS['egw_info']['flags']['currentapp']))
 {
 	error_log(__FILE__.': '.__LINE__.' Invalid $GLOBALS[egw_info][flags][currentapp]='.array2string($GLOBALS['egw_info']['flags']['currentapp']).', $_SERVER[REQUEST_URI]='.array2string($_SERVER[REQUEST_URI]));
 	die('Invalid $GLOBALS[egw_info][flags][currentapp]!');
@@ -1640,12 +1640,12 @@ 
 			die('GLOBALS overwrite detected!!!');
 		}
 		// unregister all globals
-		$noUnset = array('GLOBALS','_GET','_POST','_COOKIE','_SERVER','_ENV','_FILES','xajax');
-		foreach(array_unique(array_merge(
-			array_keys($_GET),array_keys($_POST),array_keys($_COOKIE),array_keys($_SERVER),array_keys($_ENV),array_keys($_FILES),
+		$noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_SERVER', '_ENV', '_FILES', 'xajax');
+		foreach (array_unique(array_merge(
+			array_keys($_GET), array_keys($_POST), array_keys($_COOKIE), array_keys($_SERVER), array_keys($_ENV), array_keys($_FILES),
 			isset($_SESSION) && is_array($_SESSION) ? array_keys($_SESSION) : array())) as $k)
 		{
-			if (!in_array($k,$noUnset) && isset($GLOBALS[$k]))
+			if (!in_array($k, $noUnset) && isset($GLOBALS[$k]))
 			{
 				unset($GLOBALS[$k]);
 			}
@@ -1663,14 +1663,14 @@ 
 	 * @param string $vars =null multiple values to replace the placeholders
 	 * @return string translated message with placeholders replaced
 	 */
-	function lang($key,$vars=null)
+	function lang($key, $vars = null)
 	{
-		if(!is_array($vars))
+		if (!is_array($vars))
 		{
 			$vars = func_get_args();
-			array_shift($vars);	// remove $key
+			array_shift($vars); // remove $key
 		}
-		return translation::translate($key,$vars);
+		return translation::translate($key, $vars);
 	}
 }
 
@@ -1684,16 +1684,16 @@ 
  * @param string $vars =null multiple values to replace the placeholders
  * @return string translated message with placeholders replaced
  */
-function try_lang($key,$vars=null)
+function try_lang($key, $vars = null)
 {
-	static $varnames = array('%1','%2','%3','%4');
+	static $varnames = array('%1', '%2', '%3', '%4');
 
-	if(!is_array($vars))
+	if (!is_array($vars))
 	{
 		$vars = func_get_args();
-		array_shift($vars);	// remove $key
+		array_shift($vars); // remove $key
 	}
-	return class_exists(translations,false) ? translation::translate($key,$vars) : str_replace($varnames,$vars,$key);
+	return class_exists(translations, false) ? translation::translate($key, $vars) : str_replace($varnames, $vars, $key);
 }
 
 /**
@@ -1710,7 +1710,7 @@ 
 		preg_match('/(^|;|{)[OC]:\d+:"/', $str))
 	{
 		error_log(__METHOD__."('$str') contains objects --> return false");
-		return null;	// null, not false, to not trigger behavior of returning string itself to app code
+		return null; // null, not false, to not trigger behavior of returning string itself to app code
 	}
 	return unserialize($str);
 }
@@ -1760,7 +1760,7 @@ 
  * @param boolean $allow_not_serialized =false true: return $str as is, if it is no serialized array
  * @return array|str|false
  */
-function json_php_unserialize($str, $allow_not_serialized=false)
+function json_php_unserialize($str, $allow_not_serialized = false)
 {
 	if ((in_array($str[0], array('a', 'i', 's', 'b', 'O', 'C')) && $str[1] == ':' || $str === 'N;') &&
 		($arr = php_safe_unserialize($str)) !== false || $str === 'b:0;')
@@ -1780,7 +1780,7 @@ 
  * @param Exception|Error $e
  * @param string &$headline
  */
-function _egw_log_exception($e,&$headline=null)
+function _egw_log_exception($e, &$headline = null)
 {
 	$trace = explode("\n", $e->getTraceAsString());
 	if ($e instanceof egw_exception_no_permission)
@@ -1793,7 +1793,7 @@ 
 	}
 	elseif ($e instanceof egw_exception_wrong_userinput)
 	{
-		$headline = '';	// message contains the whole message, it's usually no real error but some input validation
+		$headline = ''; // message contains the whole message, it's usually no real error but some input validation
 	}
 	elseif ($e instanceof egw_exception_warning)
 	{
@@ -1806,15 +1806,15 @@ 
 	}
 	// log exception to error log, if not running as cli,
 	// which outputs the error_log to stderr and therefore output it twice to the user
-	if(isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] !== 'cli')
+	if (isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] !== 'cli')
 	{
 		error_log($headline.($e instanceof egw_exception_warning ? ': ' : ' ('.get_class($e).'): ').$e->getMessage());
-		foreach($trace as $line)
+		foreach ($trace as $line)
 		{
 			error_log($line);
 		}
 		error_log('# Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid'].
-			', Request='.$_SERVER['REQUEST_METHOD'].' '.($_SERVER['HTTPS']?'https://':'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].
+			', Request='.$_SERVER['REQUEST_METHOD'].' '.($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].
 			', User-agent='.$_SERVER['HTTP_USER_AGENT']);
 	}
 }
@@ -1835,17 +1835,17 @@ 
 	}
 	// logging all exceptions to the error_log (if not cli) and get headline
 	$headline = null;
-	_egw_log_exception($e,$headline);
+	_egw_log_exception($e, $headline);
 
 	// exception handler for cli (command line interface) clients, no html, no logging
-	if(!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')
+	if (!isset($_SERVER['HTTP_HOST']) || $GLOBALS['egw_info']['flags']['no_exception_handler'] == 'cli')
 	{
 		echo ($headline ? $headline.': ' : '').$e->getMessage()."\n";
 		if ($GLOBALS['egw_info']['server']['exception_show_trace'])
 		{
 			echo $e->getTraceAsString()."\n";
 		}
-		exit($e->getCode() ? $e->getCode() : 9999);		// allways give a non-zero exit code
+		exit($e->getCode() ? $e->getCode() : 9999); // allways give a non-zero exit code
 	}
 	// regular GUI exception
 	if (!isset($GLOBALS['egw_info']['flags']['no_exception_handler']))
@@ -1862,16 +1862,16 @@ 
 		$message .= "</pre>\n";
 		if (is_a($e, 'egw_exception_db_setup'))
 		{
-			$setup_dir = str_replace(array('home/index.php','index.php'),'setup/',$_SERVER['PHP_SELF']);
+			$setup_dir = str_replace(array('home/index.php', 'index.php'), 'setup/', $_SERVER['PHP_SELF']);
 			$message .= '<a href="'.$setup_dir.'">Run setup to install or configure EGroupware.</a>';
 		}
-		elseif (is_object($GLOBALS['egw']) && isset($GLOBALS['egw']->session) && method_exists($GLOBALS['egw'],'link'))
+		elseif (is_object($GLOBALS['egw']) && isset($GLOBALS['egw']->session) && method_exists($GLOBALS['egw'], 'link'))
 		{
 			$message .= '<p><a href="'.$GLOBALS['egw']->link('/index.php').'">'.try_lang('Click here to resume your eGroupWare Session.').'</a></p>';
 		}
 		if (is_object($GLOBALS['egw']) && isset($GLOBALS['egw']->framework))
 		{
-			$GLOBALS['egw']->framework->render($message,$headline);
+			$GLOBALS['egw']->framework->render($message, $headline);
 		}
 		else
 		{
@@ -1879,7 +1879,7 @@ 
 		}
 	}
 	// exception handler sending message back to the client as basic auth message
-	elseif($GLOBALS['egw_info']['flags']['no_exception_handler'] == 'basic_auth')
+	elseif ($GLOBALS['egw_info']['flags']['no_exception_handler'] == 'basic_auth')
 	{
 		$error = str_replace(array("\r", "\n"), array('', ' | '), $e->getMessage());
 		header('WWW-Authenticate: Basic realm="'.$headline.' '.$error.'"');
@@ -1908,7 +1908,7 @@ 
  * @link http://www.php.net/manual/en/function.set-error-handler.php
  * @throws ErrorException
  */
-function egw_error_handler ($errno, $errstr, $errfile, $errline)
+function egw_error_handler($errno, $errstr, $errfile, $errline)
 {
 	switch ($errno)
 	{
@@ -1940,13 +1940,13 @@ 
 // some not longer necessary defines
 if (isset($GLOBALS['egw_info']['flags']['phpgw_compatibility']) && $GLOBALS['egw_info']['flags']['phpgw_compatibility'])
 {
-	define('PHPGW_API_INC',EGW_API_INC);
-	define('PHPGW_SERVER_ROOT',EGW_SERVER_ROOT);
-	define('PHPGW_INCLUDE_ROOT',EGW_INCLUDE_ROOT);
+	define('PHPGW_API_INC', EGW_API_INC);
+	define('PHPGW_SERVER_ROOT', EGW_SERVER_ROOT);
+	define('PHPGW_INCLUDE_ROOT', EGW_INCLUDE_ROOT);
 
 	/* debugging settings */
-	define('DEBUG_DATATYPES',  True);
-	define('DEBUG_LEVEL',  3);
+	define('DEBUG_DATATYPES', True);
+	define('DEBUG_LEVEL', 3);
 	define('DEBUG_OUTPUT', 2); /* 1 = screen,  2 = DB. For both use 3. */
 	define('DEBUG_TIMER', False);
 }

Braces +105 added lines, -32 removed lines

@@ -37,7 +37,11 @@ 
 spl_autoload_register(function($class)
 {
 	$parts = explode('\\', $class);
-	if (array_shift($parts) != 'EGroupware') return;	// not our prefix
+	if (array_shift($parts) != 'EGroupware')
+	{
+		return;
+	}
+	// not our prefix
 
 	$app = lcfirst(array_shift($parts));
 	$base = EGW_INCLUDE_ROOT.'/'.$app.'/src/';
@@ -63,7 +67,10 @@ 
 spl_autoload_register(function($class)
 {
 	// fixing warnings generated by php 5.3.8 is_a($obj) trying to autoload huge strings
-	if (strlen($class) > 64 || strpos($class, '.') !== false) return;
+	if (strlen($class) > 64 || strpos($class, '.') !== false)
+	{
+		return;
+	}
 
 	$components = explode('_',$class);
 	$app = array_shift($components);
@@ -133,7 +140,10 @@ 
 {
 	static $func_overload = null;
 
-	if (is_null($func_overload)) $func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+	if (is_null($func_overload))
+	{
+		$func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+	}
 
 	return $func_overload & 2 ? mb_strlen($str,'ascii') : strlen($str);
 }
@@ -150,7 +160,10 @@ 
 {
 	static $func_overload = null;
 
-	if (is_null($func_overload)) $func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+	if (is_null($func_overload))
+	{
+		$func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+	}
 
 	if (is_null($len))
 	{
@@ -216,7 +229,10 @@ 
 			{
 				$personal = str_replace('\\', '', substr($personal, 1, -1));
 			}
-			if (empty($host)) $host = $default_host;
+			if (empty($host))
+			{
+				$host = $default_host;
+			}
 
 			$addresses[] = (object)array_diff(array(
 				'mailbox'  => $mailbox,
@@ -239,13 +255,19 @@ 
 	 */
 	function imap_rfc822_write_address($mailbox, $host, $personal)
 	{
-		if (is_array($personal))  $personal = implode(' ', $personal);
+		if (is_array($personal))
+		{
+			$personal = implode(' ', $personal);
+		}
 
 		//if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal))	// that's how I read the rfc(2)822
-		if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))	// but quoting is never wrong, so quote more then necessary
+		if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))
+		{
+			// but quoting is never wrong, so quote more then necessary
 		{
 			$personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"';
 		}
+		}
 		return ($personal ? $personal.' <' : '').$mailbox.($host ? '@'.$host : '').($personal ? '>' : '');
 	}
 }
@@ -536,7 +558,7 @@ 
 		if(!is_array($recieved[0]))
 		{
 		for ($i = 0; $i < $num; $i++)
-			{
+		{
 				if(isset($recieved[$i]) && $recieved[$i] !== '##DEFAULT##')
 				{
 					if(sanitize($recieved[$i],$expected[$i]['type']))
@@ -1265,51 +1287,71 @@ 
 
 	for ($i=0;$i<count($testa);$i++)
 	{
-		if ($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is less than ' . (int)$testb[$i] . ' ...'; }
+		if ($DEBUG)
+		{
+echo'<br>Checking if '. (int)$testa[$i] . ' is less than ' . (int)$testb[$i] . ' ...'; }
 		if ((int)$testa[$i] < (int)$testb[$i])
 		{
-			if ($DEBUG) { echo ' yes.'; }
+			if ($DEBUG)
+			{
+echo ' yes.'; }
 			$less++;
 			if ($i<3)
 			{
 				/* Ensure that this is definitely smaller */
-				if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
+				if ($DEBUG)
+				{
+echo"  This is the $num[$i] octet, so A is definitely less than B."; }
 				$less = 5;
 				break;
 			}
 		}
 		elseif((int)$testa[$i] > (int)$testb[$i])
 		{
-			if ($DEBUG) { echo ' no.'; }
+			if ($DEBUG)
+			{
+echo ' no.'; }
 			$less--;
 			if ($i<2)
 			{
 				/* Ensure that this is definitely greater */
-				if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
+				if ($DEBUG)
+				{
+echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
 				$less = -5;
 				break;
 			}
 		}
 		else
 		{
-			if ($DEBUG) { echo ' no, they are equal.'; }
+			if ($DEBUG)
+			{
+echo ' no, they are equal.'; }
 			$less = 0;
 		}
 	}
-	if ($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
+	if ($DEBUG)
+	{
+echo '<br>Check value is: "'.$less.'"'; }
 	if ($less>0)
 	{
-		if ($DEBUG) { echo '<br>A is less than B'; }
+		if ($DEBUG)
+		{
+echo '<br>A is less than B'; }
 		return True;
 	}
 	elseif($less<0)
 	{
-		if ($DEBUG) { echo '<br>A is greater than B'; }
+		if ($DEBUG)
+		{
+echo '<br>A is greater than B'; }
 		return False;
 	}
 	else
 	{
-		if ($DEBUG) { echo '<br>A is equal to B'; }
+		if ($DEBUG)
+		{
+echo '<br>A is equal to B'; }
 		return False;
 	}
 }
@@ -1345,51 +1387,71 @@ 
 
 	for ($i=0;$i<count($testa);$i++)
 	{
-		if ($DEBUG) { echo'<br>Checking if '. (int)$testa[$i] . ' is more than ' . (int)$testb[$i] . ' ...'; }
+		if ($DEBUG)
+		{
+echo'<br>Checking if '. (int)$testa[$i] . ' is more than ' . (int)$testb[$i] . ' ...'; }
 		if ((int)$testa[$i] > (int)$testb[$i])
 		{
-			if ($DEBUG) { echo ' yes.'; }
+			if ($DEBUG)
+			{
+echo ' yes.'; }
 			$less++;
 			if ($i<3)
 			{
 				/* Ensure that this is definitely greater */
-				if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
+				if ($DEBUG)
+				{
+echo"  This is the $num[$i] octet, so A is definitely greater than B."; }
 				$less = 5;
 				break;
 			}
 		}
 		elseif((int)$testa[$i] < (int)$testb[$i])
 		{
-			if ($DEBUG) { echo ' no.'; }
+			if ($DEBUG)
+			{
+echo ' no.'; }
 			$less--;
 			if ($i<2)
 			{
 				/* Ensure that this is definitely smaller */
-				if ($DEBUG) { echo"  This is the $num[$i] octet, so A is definitely less than B."; }
+				if ($DEBUG)
+				{
+echo"  This is the $num[$i] octet, so A is definitely less than B."; }
 				$less = -5;
 				break;
 			}
 		}
 		else
 		{
-			if ($DEBUG) { echo ' no, they are equal.'; }
+			if ($DEBUG)
+			{
+echo ' no, they are equal.'; }
 			$less = 0;
 		}
 	}
-	if ($DEBUG) { echo '<br>Check value is: "'.$less.'"'; }
+	if ($DEBUG)
+	{
+echo '<br>Check value is: "'.$less.'"'; }
 	if ($less>0)
 	{
-		if ($DEBUG) { echo '<br>A is greater than B'; }
+		if ($DEBUG)
+		{
+echo '<br>A is greater than B'; }
 		return True;
 	}
 	elseif($less<0)
 	{
-		if ($DEBUG) { echo '<br>A is less than B'; }
+		if ($DEBUG)
+		{
+echo '<br>A is less than B'; }
 		return False;
 	}
 	else
 	{
-		if ($DEBUG) { echo '<br>A is equal to B'; }
+		if ($DEBUG)
+		{
+echo '<br>A is equal to B'; }
 		return False;
 	}
 }
@@ -1453,7 +1515,9 @@ 
 {
 	static $preg=null;
 	//old: '/<\/?[^>]*\b(iframe|script|javascript|on(before)?(abort|blur|change|click|dblclick|error|focus|keydown|keypress|keyup|load|mousedown|mousemove|mouseout|mouseover|mouseup|reset|select|submit|unload))\b[^>]*>/i';
-	if (!isset($preg)) $preg =
+	if (!isset($preg))
+	{
+		$preg =
 		// forbidden tags like iframe or script
 		'/(<(\s*\/)?\s*(iframe|script|object|embed|math|meta)[^a-z0-9]|'.
 		// on* attributes
@@ -1462,6 +1526,7 @@ 
 		'<[^>]+(href|src|dynsrc|lowsrc|background|style|poster|action)\s*=\s*("|\')?[^"\']*javascript|'.
 		// benavior:url and expression in style attribute
 		'<[^>]+style\s*=\s*("|\')[^>]*(behavior\s*:\s*url|expression)\s*\()/i';
+	}
 	if (is_array($var))
 	{
 		foreach($var as $key => $val)
@@ -1470,7 +1535,9 @@ 
 			{
 				_check_script_tag($var[$key],$name.'['.$key.']');
 			}
-			elseif(strpos($val, '<') !== false)	// speedup: ignore everything without <
+			elseif(strpos($val, '<') !== false)
+			{
+				// speedup: ignore everything without <
 			{
 				if (preg_match($preg,$val))
 				{
@@ -1478,6 +1545,7 @@ 
 					if ($name == '_POST' && $key == 'json_data' && ($json_data = json_decode($val, true)))
 					{
 						_check_script_tag($json_data, $name.'[json_data]');
+			}
 						$_REQUEST[$key] = $var[$key] = json_encode($json_data);
 						continue;
 					}
@@ -1654,7 +1722,9 @@ 
 	unregister_globals();
 }
 
-if (!function_exists('lang') || defined('NO_LANG'))	// setup declares an own version
+if (!function_exists('lang') || defined('NO_LANG'))
+{
+	// setup declares an own version
 {
 	/**
 	 * function to handle multilanguage support
@@ -1668,6 +1738,7 @@ 
 		if(!is_array($vars))
 		{
 			$vars = func_get_args();
+}
 			array_shift($vars);	// remove $key
 		}
 		return translation::translate($key,$vars);
@@ -1931,7 +2002,9 @@ 
 /**
  * Used internally to trace warnings
  */
-class egw_exception_warning extends Exception {}
+class egw_exception_warning extends Exception
+{
+}
 
 // install our error-handler only for catchable fatal errors and warnings
 // following error types cannot be handled with a user defined function: E_ERROR, E_PARSE, E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR, E_COMPILE_WARNING

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -510,11 +510,11 @@ 
 function safe_args($expected, $recieved, $line='??', $file='??')
 {
 	/* This array will contain all the required fields */
-	$required = Array();
+	$required = array();
 
 	/* This array will contain all types for sanatization checking */
 	/* only used when an array is passed as the first arg          */
-	$types = Array();
+	$types = array();
 
 	/* start by looping thru the expected list and set params with */
 	/* the default values                                          */
@@ -675,8 +675,8 @@ 
 			break;
 		case 'password':
 			$password_length = strlen($string);
-			$password_numbers = Array('0','1','2','3','4','5','6','7','8','9');
-			$password_special_chars = Array(' ','~','`','!','@','#','$','%','^','&','*','(',')','_','+','-','=','{','}','|','[',']',"\\",':','"',';',"'",'<','>','?',',','.','/');
+			$password_numbers = array('0','1','2','3','4','5','6','7','8','9');
+			$password_special_chars = array(' ','~','`','!','@','#','$','%','^','&','*','(',')','_','+','-','=','{','}','|','[',']',"\\",':','"',';',"'",'<','>','?',',','.','/');
 
 			if(@isset($GLOBALS['egw_info']['server']['pass_min_length']) && is_int($GLOBALS['egw_info']['server']['pass_min_length']) && $GLOBALS['egw_info']['server']['pass_min_length'] > 1)
 			{
@@ -776,11 +776,11 @@ 
 {
 	if($method == 'any' || $method == array('any'))
 	{
-		$method = Array('POST','GET','COOKIE','SERVER','FILES','GLOBAL','DEFAULT');
+		$method = array('POST','GET','COOKIE','SERVER','FILES','GLOBAL','DEFAULT');
 	}
 	elseif(!is_array($method))
 	{
-		$method = Array($method);
+		$method = array($method);
 	}
 	$cnt = count($method);
 	for($i=0;$i<$cnt;$i++)

phpgwapi/inc/horde/Horde.php

Doc Comments +3 added lines, -2 removed lines

@@ -398,7 +398,7 @@ 
     /**
      * Returns the driver parameters for the specified backend.
      *
-     * @param mixed $backend  The backend system (e.g. 'prefs', 'categories',
+     * @param string $backend  The backend system (e.g. 'prefs', 'categories',
      *                        'contacts') being used.
      *                        The used configuration array will be
      *                        $conf[$backend]. If an array gets passed, it will
@@ -835,6 +835,7 @@ 
      *                               Can be a pre-built string or an array of key/value
      *                               pairs that will be assembled and html-encoded.
      * @param optional string $dir   The root graphics directory.
+     * @param string $dir
      *
      * @return string  The full image tag.
      */
@@ -1028,7 +1029,7 @@ 
      *
      * @access public
      *
-     * @param string|array $app  The Horde application(s).
+     * @param string|array $apps  The Horde application(s).
      * @param mixed $theme       The theme to use; specify an empty value to
      *                           retrieve the theme from user preferences, and
      *                           false for no theme.

Indentation +1428 added lines, -1428 removed lines

@@ -22,1453 +22,1453 @@
  */
 class Horde {
 
-    /**
-     * Logs a message to the global Horde log backend.
-     *
-     * @access public
-     *
-     * @param mixed $message     Either a string or a PEAR_Error object.
-     * @param string $file       What file was the log function called from
-     *                           (e.g. __FILE__)?
-     * @param integer $line      What line was the log function called from
-     *                           (e.g. __LINE__)?
-     * @param integer $priority  The priority of the message. One of:
-     * <pre>
-     * PEAR_LOG_EMERG
-     * PEAR_LOG_ALERT
-     * PEAR_LOG_CRIT
-     * PEAR_LOG_ERR
-     * PEAR_LOG_WARNING
-     * PEAR_LOG_NOTICE
-     * PEAR_LOG_INFO
-     * PEAR_LOG_DEBUG
-     * </pre>
-     */
-    function logMessage($message, $file, $line, $priority = PEAR_LOG_INFO)
-    {
-        global $conf;
-
-        if (!$conf['log']['enabled']) {
-            return;
-        }
-
-        if ($priority > $conf['log']['priority']) {
-            return;
-        }
-
-        $logger = &Horde::getLogger();
-        if (!is_a($logger, 'Log')) {
-            Horde::fatal(PEAR::raiseError('An error has occurred. Furthermore, Horde encountered an error attempting to log this error. Please check your Horde logging configuration in horde/config/conf.php.'), __FILE__, __LINE__, false);
-        }
-
-        if (is_a($message, 'PEAR_Error')) {
-            $userinfo = $message->getUserInfo();
-            $message = $message->getMessage();
-            if (!empty($userinfo)) {
-                if (is_array($userinfo)) {
-                    $userinfo = implode(', ', $userinfo);
-                }
-                $message .= ': ' . $userinfo;
-            }
-        } elseif (is_callable(array($message, 'getMessage'))) {
-            $message = $message->getMessage();
-        }
-
-        $app = isset($GLOBALS['registry']) ? $GLOBALS['registry']->getApp() : 'horde';
-        $message = '[' . $app . '] ' . $message . ' [on line ' . $line . ' of "' . $file . '"]';
-
-        /* Make sure to log in the system's locale. */
-        $locale = setlocale(LC_TIME, 0);
-        setlocale(LC_TIME, 'C');
-
-        $logger->log($message, $priority);
-
-        /* Restore original locale. */
-        setlocale(LC_TIME, $locale);
-
-        return true;
-    }
-
-    function &getLogger()
-    {
-        global $conf;
-
-        if (empty($conf['log']['enabled'])) {
-            return false;
-        }
-
-        static $logcheck;
-        if (!isset($logcheck)) {
-            // Try to make sure that we can log messages somehow.
-            if (empty($conf['log']) ||
-                empty($conf['log']['type']) ||
-                empty($conf['log']['name']) ||
-                empty($conf['log']['ident']) ||
-                !isset($conf['log']['params'])) {
-                Horde::fatal(PEAR::raiseError('Horde is not correctly configured to log error messages. You must configure at least a text file log in horde/config/conf.php.'), __FILE__, __LINE__, false);
-            }
-            $logcheck = true;
-        }
-
-        return $logger = &Log::singleton($conf['log']['type'], $conf['log']['name'],
-                                         $conf['log']['ident'], $conf['log']['params']);
-    }
-
-    /**
-     * Destroys any existing session on login and make sure to use a new
-     * session ID, to avoid session fixation issues. Should be called before
-     * checking a login.
-     *
-     * @access public
-     */
-    function getCleanSession()
-    {
-        // Make sure to force a completely new session ID and clear
-        // all session data.
-        if (version_compare(phpversion(), '4.3.3') !== -1) {
-            session_regenerate_id();
-            session_unset();
-        } else {
-            @session_destroy();
-            if (Util::extensionExists('posix')) {
-                $new_session_id = md5(microtime() . posix_getpid());
-            } else {
-                $new_session_id = md5(uniqid(mt_rand(), true));
-            }
-            session_id($new_session_id);
-
-            // Restart the session, including setting up the session
-            // handler.
-            Horde::setupSessionHandler();
-            @session_start();
-        }
-    }
-
-    /**
-     * Aborts with a fatal error, displaying debug information to the user.
-     *
-     * @access public
-     *
-     * @param mixed $error   A PEAR_Error object with debug information or an
-     *                       error message.
-     * @param integer $file  The file in which the error occured.
-     * @param integer $line  The line on which the error occured.
-     * @param boolean $log   Log this message via Horde::logMesage()?
-     */
-    function fatal($error, $file, $line, $log = true)
-    {
-        @include_once 'Horde/Auth.php';
-        @include_once 'Horde/CLI.php';
-
-        $admin = class_exists('Auth') && Auth::isAdmin();
-        $cli = class_exists('Horde_CLI') && Horde_CLI::runningFromCLI();
-
-        $errortext = '<h1>' . _("A fatal error has occurred") . '</h1>';
-        if (is_a($error, 'PEAR_Error')) {
-            $info = array_merge(array('file' => 'conf.php', 'variable' => '$conf'),
-                                array($error->getUserInfo()));
-
-            switch ($error->getCode()) {
-            case HORDE_ERROR_DRIVER_CONFIG_MISSING:
-                $message = sprintf(_("No configuration information specified for %s."), $info['name']) . '<br />' .
-                    sprintf(_("The file %s should contain some %s settings."),
-                            $GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
-                            sprintf("%s['%s']['params']", $info['variable'], $info['driver']));
-                break;
-
-            case HORDE_ERROR_DRIVER_CONFIG:
-                $message = sprintf(_("Required '%s' not specified in %s configuration."), $info['field'], $info['name']) . '<br />' .
-                    sprintf(_("The file %s should contain a %s setting."),
-                            $GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
-                            sprintf("%s['%s']['params']['%s']", $info['variable'], $info['driver'], $info['field']));
-                break;
-
-            default:
-                $message = $error->getMessage();
-                break;
-            }
-
-            $errortext .= '<h3>' . htmlspecialchars($message) . '</h3>';
-        } elseif (is_object($error) && method_exists($error, 'getMessage')) {
-            $errortext .= '<h3>' . htmlspecialchars($error->getMessage()) . '</h3>';
-        } elseif (is_string($error)) {
-            $errortext .= '<h3>' . $error . '</h3>';
-        }
-
-        if ($admin) {
-            $errortext .= '<p><code>' . sprintf(_("[line %s of %s]"), $line, $file) . '</code></p>';
-            if (is_object($error)) {
-                $errortext .= '<h3>' . _("Details (also in Horde's logfile):") . '</h3>';
-                $errortext .= '<p><pre>' . htmlspecialchars(Util::bufferOutput('var_dump', $error)) . '</pre></p>';
-            }
-        } elseif ($log) {
-            $errortext .= '<h3>' . _("Details have been logged for the administrator.") . '</h3>';
-        }
-
-        // Log the error via Horde::logMessage() if requested.
-        if ($log) {
-            Horde::logMessage($error, $file, $line, PEAR_LOG_EMERG);
-        }
-
-        if ($cli) {
-            echo strip_tags(str_replace(array('<br />', '<p>', '</p>', '<h1>', '</h1>', '<h3>', '</h3>'), "\n", $errortext));
-        } else {
-            echo <<< HTML
+	/**
+	 * Logs a message to the global Horde log backend.
+	 *
+	 * @access public
+	 *
+	 * @param mixed $message     Either a string or a PEAR_Error object.
+	 * @param string $file       What file was the log function called from
+	 *                           (e.g. __FILE__)?
+	 * @param integer $line      What line was the log function called from
+	 *                           (e.g. __LINE__)?
+	 * @param integer $priority  The priority of the message. One of:
+	 * <pre>
+	 * PEAR_LOG_EMERG
+	 * PEAR_LOG_ALERT
+	 * PEAR_LOG_CRIT
+	 * PEAR_LOG_ERR
+	 * PEAR_LOG_WARNING
+	 * PEAR_LOG_NOTICE
+	 * PEAR_LOG_INFO
+	 * PEAR_LOG_DEBUG
+	 * </pre>
+	 */
+	function logMessage($message, $file, $line, $priority = PEAR_LOG_INFO)
+	{
+		global $conf;
+
+		if (!$conf['log']['enabled']) {
+			return;
+		}
+
+		if ($priority > $conf['log']['priority']) {
+			return;
+		}
+
+		$logger = &Horde::getLogger();
+		if (!is_a($logger, 'Log')) {
+			Horde::fatal(PEAR::raiseError('An error has occurred. Furthermore, Horde encountered an error attempting to log this error. Please check your Horde logging configuration in horde/config/conf.php.'), __FILE__, __LINE__, false);
+		}
+
+		if (is_a($message, 'PEAR_Error')) {
+			$userinfo = $message->getUserInfo();
+			$message = $message->getMessage();
+			if (!empty($userinfo)) {
+				if (is_array($userinfo)) {
+					$userinfo = implode(', ', $userinfo);
+				}
+				$message .= ': ' . $userinfo;
+			}
+		} elseif (is_callable(array($message, 'getMessage'))) {
+			$message = $message->getMessage();
+		}
+
+		$app = isset($GLOBALS['registry']) ? $GLOBALS['registry']->getApp() : 'horde';
+		$message = '[' . $app . '] ' . $message . ' [on line ' . $line . ' of "' . $file . '"]';
+
+		/* Make sure to log in the system's locale. */
+		$locale = setlocale(LC_TIME, 0);
+		setlocale(LC_TIME, 'C');
+
+		$logger->log($message, $priority);
+
+		/* Restore original locale. */
+		setlocale(LC_TIME, $locale);
+
+		return true;
+	}
+
+	function &getLogger()
+	{
+		global $conf;
+
+		if (empty($conf['log']['enabled'])) {
+			return false;
+		}
+
+		static $logcheck;
+		if (!isset($logcheck)) {
+			// Try to make sure that we can log messages somehow.
+			if (empty($conf['log']) ||
+				empty($conf['log']['type']) ||
+				empty($conf['log']['name']) ||
+				empty($conf['log']['ident']) ||
+				!isset($conf['log']['params'])) {
+				Horde::fatal(PEAR::raiseError('Horde is not correctly configured to log error messages. You must configure at least a text file log in horde/config/conf.php.'), __FILE__, __LINE__, false);
+			}
+			$logcheck = true;
+		}
+
+		return $logger = &Log::singleton($conf['log']['type'], $conf['log']['name'],
+										 $conf['log']['ident'], $conf['log']['params']);
+	}
+
+	/**
+	 * Destroys any existing session on login and make sure to use a new
+	 * session ID, to avoid session fixation issues. Should be called before
+	 * checking a login.
+	 *
+	 * @access public
+	 */
+	function getCleanSession()
+	{
+		// Make sure to force a completely new session ID and clear
+		// all session data.
+		if (version_compare(phpversion(), '4.3.3') !== -1) {
+			session_regenerate_id();
+			session_unset();
+		} else {
+			@session_destroy();
+			if (Util::extensionExists('posix')) {
+				$new_session_id = md5(microtime() . posix_getpid());
+			} else {
+				$new_session_id = md5(uniqid(mt_rand(), true));
+			}
+			session_id($new_session_id);
+
+			// Restart the session, including setting up the session
+			// handler.
+			Horde::setupSessionHandler();
+			@session_start();
+		}
+	}
+
+	/**
+	 * Aborts with a fatal error, displaying debug information to the user.
+	 *
+	 * @access public
+	 *
+	 * @param mixed $error   A PEAR_Error object with debug information or an
+	 *                       error message.
+	 * @param integer $file  The file in which the error occured.
+	 * @param integer $line  The line on which the error occured.
+	 * @param boolean $log   Log this message via Horde::logMesage()?
+	 */
+	function fatal($error, $file, $line, $log = true)
+	{
+		@include_once 'Horde/Auth.php';
+		@include_once 'Horde/CLI.php';
+
+		$admin = class_exists('Auth') && Auth::isAdmin();
+		$cli = class_exists('Horde_CLI') && Horde_CLI::runningFromCLI();
+
+		$errortext = '<h1>' . _("A fatal error has occurred") . '</h1>';
+		if (is_a($error, 'PEAR_Error')) {
+			$info = array_merge(array('file' => 'conf.php', 'variable' => '$conf'),
+								array($error->getUserInfo()));
+
+			switch ($error->getCode()) {
+			case HORDE_ERROR_DRIVER_CONFIG_MISSING:
+				$message = sprintf(_("No configuration information specified for %s."), $info['name']) . '<br />' .
+					sprintf(_("The file %s should contain some %s settings."),
+							$GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
+							sprintf("%s['%s']['params']", $info['variable'], $info['driver']));
+				break;
+
+			case HORDE_ERROR_DRIVER_CONFIG:
+				$message = sprintf(_("Required '%s' not specified in %s configuration."), $info['field'], $info['name']) . '<br />' .
+					sprintf(_("The file %s should contain a %s setting."),
+							$GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
+							sprintf("%s['%s']['params']['%s']", $info['variable'], $info['driver'], $info['field']));
+				break;
+
+			default:
+				$message = $error->getMessage();
+				break;
+			}
+
+			$errortext .= '<h3>' . htmlspecialchars($message) . '</h3>';
+		} elseif (is_object($error) && method_exists($error, 'getMessage')) {
+			$errortext .= '<h3>' . htmlspecialchars($error->getMessage()) . '</h3>';
+		} elseif (is_string($error)) {
+			$errortext .= '<h3>' . $error . '</h3>';
+		}
+
+		if ($admin) {
+			$errortext .= '<p><code>' . sprintf(_("[line %s of %s]"), $line, $file) . '</code></p>';
+			if (is_object($error)) {
+				$errortext .= '<h3>' . _("Details (also in Horde's logfile):") . '</h3>';
+				$errortext .= '<p><pre>' . htmlspecialchars(Util::bufferOutput('var_dump', $error)) . '</pre></p>';
+			}
+		} elseif ($log) {
+			$errortext .= '<h3>' . _("Details have been logged for the administrator.") . '</h3>';
+		}
+
+		// Log the error via Horde::logMessage() if requested.
+		if ($log) {
+			Horde::logMessage($error, $file, $line, PEAR_LOG_EMERG);
+		}
+
+		if ($cli) {
+			echo strip_tags(str_replace(array('<br />', '<p>', '</p>', '<h1>', '</h1>', '<h3>', '</h3>'), "\n", $errortext));
+		} else {
+			echo <<< HTML
 <html>
 <head><title>Horde :: Fatal Error</title></head>
 <body style="background-color: white; color: black;">$errortext</body>
 </html>
 HTML;
-        }
-        exit;
-    }
-
-    /**
-     * Adds the javascript code to the output (if output has already started)
-     * or to the list of script files to include via includeScriptFiles().
-     *
-     * @access public
-     *
-     * @param string $file     The full javascript file name.
-     * @param string $app      The application name. Defaults to the current
-     *                         application.
-     * @param boolean $direct  Include the file directly without passing it
-     *                         through javascript.php?
-     */
-    function addScriptFile($file, $app = null, $direct = false)
-    {
-        global $registry;
-        static $included = array();
-
-        if (empty($app)) {
-            $app = $registry->getApp();
-        }
-
-        // Don't include scripts multiple times.
-        if (!empty($included[$app][$file])) {
-            return;
-        }
-        $included[$app][$file] = true;
-
-        if (ob_get_length() || headers_sent()) {
-            if ($direct) {
-                $url = Horde::url($file{0} == '/' ? $registry->get('webroot', $app) . $file : $registry->get('jsuri', $app) . '/' . $file);
-            } else {
-                $url = Horde::url($registry->get('webroot', 'horde') . '/services/javascript.php');
-                $url = Util::addParameter($url, array('file' => $file,
-                                                      'app'  => $app));
-            }
-            echo '<script language="JavaScript" type="text/javascript" src="' . $url . '"></script>';
-        } else {
-            global $_horde_script_files;
-            $_horde_script_files[$app][] = array($file, $direct);
-        }
-    }
-
-    /**
-     * Includes javascript files that were needed before any headers were sent.
-     *
-     * @access public
-     */
-    function includeScriptFiles()
-    {
-        global $_horde_script_files, $registry;
-
-        if (!empty($_horde_script_files)) {
-            $base_url = Horde::url($registry->get('webroot', 'horde') . '/services/javascript.php');
-            foreach ($_horde_script_files as $app => $files) {
-                foreach ($files as $file) {
-                    if (!empty($file[1])) {
-                        $url = $file[0]{0} == '/' ? $registry->get('webroot', $app) . $file[0] : $registry->get('jsuri', $app) . '/' . $file[0];
-                        echo '<script language="JavaScript" type="text/javascript" src="' . Horde::url($url) . "\"></script>\n";
-                    } else {
-                        $url = Util::addParameter($base_url, array('file' => $file[0],
-                                                                   'app'  => $app));
-                        echo '<script language="JavaScript" type="text/javascript" src="' . $url . "\"></script>\n";
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Includes javascript files that were needed before any headers were sent.
-     *
-     * @access public
-     */
-    function inlineScriptFiles()
-    {
-        global $_horde_script_files, $registry;
-
-        if (!empty($_horde_script_files)) {
-            $jsWrapper = $registry->get('fileroot', 'horde') . '/services/javascript.php';
-            foreach ($_horde_script_files as $app => $files) {
-                foreach ($files as $file) {
-                    if (!empty($file[1])) {
-                        @readfile($file[0]{0} == '/' ? $registry->get('fileroot', $app) . $file[0] : $registry->get('jsfs', $app) . '/' . $file[0]);
-                    } else {
-                        $file = $file[0];
-                        require $jsWrapper;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Checks if link should be shown and return the nescessary code.
-     *
-     * @access public
-     *
-     * @param string  $type      Type of link to display
-     * @param string  $app       The name of the current Horde application.
-     * @param boolean $override  Override Horde settings?
-     * @param boolean $referrer  Include the current page as the referrer (url=)?
-     *
-     * @return string  The HTML to create the link.
-     */
-    function getServiceLink($type, $app, $override = false, $referrer = true)
-    {
-        if (!Horde::showService($type) && !$override) {
-            return false;
-        }
-
-        switch ($type) {
-        case 'help':
-            if ($GLOBALS['browser']->hasFeature('javascript')) {
-                Horde::addScriptFile('open_help_win.js', 'horde');
-                return "javascript:open_help_win('$app');";
-            } else {
-                $url = Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/help/', true);
-                return Util::addParameter($url, array('module' => $app,
-                                                      'show' => 'topics'));
-            }
-            break;
-
-        case 'problem':
-            return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/problem.php?return_url=' . urlencode(Horde::selfUrl(true)));
-
-        case 'logout':
-            return Auth::addLogoutParameters(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/login.php'), AUTH_REASON_LOGOUT);
-
-        case 'login':
-            return Auth::getLoginScreen('', $referrer ? Horde::selfUrl(true) : null);
-
-        case 'options':
-            global $conf;
-            if (($conf['prefs']['driver'] != '') && ($conf['prefs']['driver'] != 'none')) {
-                return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=' . $app);
-            }
-            break;
-        }
-
-        return false;
-    }
-
-    /**
-     * @access public
-     *
-     * @param string $type  The type of link.
-     *
-     * @return boolean  True if the link is to be shown.
-     */
-    function showService($type)
-    {
-        global $conf;
-
-        if (empty($conf['menu']['links'][$type])) {
-            return false;
-        }
-
-        switch ($conf['menu']['links'][$type]) {
-        case 'all':
-            return true;
-
-        case 'never':
-            return false;
-
-        case 'authenticated':
-            return (bool)Auth::getAuth();
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Returns the driver parameters for the specified backend.
-     *
-     * @param mixed $backend  The backend system (e.g. 'prefs', 'categories',
-     *                        'contacts') being used.
-     *                        The used configuration array will be
-     *                        $conf[$backend]. If an array gets passed, it will
-     *                        be $conf[$key1][$key2].
-     * @param string $type    The type of driver.
-     *
-     * @return array  The connection parameters.
-     */
-    function getDriverConfig($backend, $type = 'sql')
-    {
-        global $conf;
-
-        $c = null;
-        if (is_array($backend)) {
-            require_once 'Horde/Array.php';
-            $c = Horde_Array::getElement($conf, $backend);
-        } elseif (isset($conf[$backend])) {
-            $c = $conf[$backend];
-        }
-        if (!is_null($c) && isset($c['params'])) {
-            if (isset($conf[$type])) {
-                return array_merge($conf[$type], $c['params']);
-            } else {
-                return $c['params'];
-            }
-        }
-
-        return isset($conf[$type]) ? $conf[$type] : array();
-    }
-
-
-    /**
-     * Returns the VFS driver parameters for the specified backend.
-     *
-     * @param string $name  The VFS system name (e.g. 'images', 'documents')
-     *                      being used.
-     *
-     * @return array  A hash with the VFS parameters; the VFS driver in 'type'
-     *                and the connection parameters in 'params'.
-     */
-    function getVFSConfig($name)
-    {
-        global $conf;
-
-        if (!isset($conf[$name]['type'])) {
-            return PEAR::raiseError(_("You must configure a VFS backend."));
-        }
-
-        if ($conf[$name]['type'] == 'horde') {
-            $vfs = $conf['vfs'];
-        } else {
-            $vfs = $conf[$name];
-        }
-
-        if ($vfs['type'] == 'sql') {
-            $vfs['params'] = Horde::getDriverConfig($name, 'sql');
-        }
-
-        return $vfs;
-    }
-
-    /**
-     * Checks if all necessary parameters for a driver configuration
-     * are set and throws a fatal error with a detailed explaination
-     * how to fix this, if something is missing.
-     *
-     * @param array $params     The configuration array with all parameters.
-     * @param string $driver    The key name (in the configuration array) of
-     *                          the driver.
-     * @param array $fields     An array with mandatory parameter names for
-     *                          this driver.
-     * @param string $name      The clear text name of the driver. If not
-     *                          specified, the application name will be used.
-     * @param string $file      The configuration file that should contain
-     *                          these settings.
-     * @param string $variable  The name of the configuration variable.
-     */
-    function assertDriverConfig($params, $driver, $fields, $name = null,
-                                $file = 'conf.php', $variable = '$conf')
-    {
-        global $registry;
-
-        // Don't generate a fatal error if we fail during or before
-        // Registry instantiation.
-        if (is_null($name)) {
-            $name = isset($registry) ? $registry->getApp() : '[unknown]';
-        }
-        $fileroot = isset($registry) ? $registry->get('fileroot') : '';
-
-        if (!is_array($params) || !count($params)) {
-            Horde::fatal(PEAR::raiseError(
-                sprintf(_("No configuration information specified for %s."), $name) . "\n\n" .
-                sprintf(_("The file %s should contain some %s settings."),
-                    $fileroot . '/config/' . $file,
-                    sprintf("%s['%s']['params']", $variable, $driver))),
-                __FILE__, __LINE__);
-        }
-
-        foreach ($fields as $field) {
-            if (!isset($params[$field])) {
-                Horde::fatal(PEAR::raiseError(
-                    sprintf(_("Required '%s' not specified in %s configuration."), $field, $name) . "\n\n" .
-                    sprintf(_("The file %s should contain a %s setting."),
-                        $fileroot . '/config/' . $file,
-                        sprintf("%s['%s']['params']['%s']", $variable, $driver, $field))),
-                    __FILE__, __LINE__);
-            }
-        }
-    }
-
-    /**
-     * Returns a session-id-ified version of $uri.
-     * If a full URL is requested, all parameter separators get converted to
-     * "&", otherwise to "&amp;".
-     *
-     * @access public
-     *
-     * @param string $uri          The URI to be modified.
-     * @param bool $full           Generate a full (http://server/path/) URL.
-     * @param int $append_session  0 = only if needed, 1 = always, -1 = never.
-     *
-     * @return string  The URL with the session id appended (if needed).
-     */
-    function url($uri, $full = false, $append_session = 0, $force_ssl = false)
-    {
-        if ($force_ssl) {
-            $full = true;
-        }
-
-        if ($full) {
-            global $conf, $registry, $browser;
-
-            /* Store connection parameters in local variables. */
-            $server_name = $conf['server']['name'];
-            $server_port = $conf['server']['port'];
-
-            $protocol = 'http';
-            if ($conf['use_ssl'] == 1) {
-                $protocol = 'https';
-            } elseif ($conf['use_ssl'] == 2 &&
-                      $browser->usingSSLConnection()) {
-                $protocol = 'https';
-            } elseif ($conf['use_ssl'] == 3) {
-                $server_port = '';
-                if ($force_ssl) {
-                    $protocol = 'https';
-                }
-            }
-
-            /* If using non-standard ports, add the port to the URL. */
-            if (!empty($server_port) &&
-                ((($protocol == 'http') && ($server_port != 80)) ||
-                 (($protocol == 'https') && ($server_port != 443)))) {
-                $server_name .= ':' . $server_port;
-            }
-
-            /* Store the webroot in a local variable. */
-            $webroot = $registry->get('webroot');
-
-            $url = $protocol . '://' . $server_name;
-            if (substr($uri, 0, 1) != '/') {
-                if (substr($webroot, -1) == '/') {
-                    $url .= $webroot . $uri;
-                } else {
-                    $url .= $webroot . '/' . $uri;
-                }
-            } else {
-                $url .= $uri;
-            }
-        } else {
-            $url = $uri;
-        }
-
-        if (($append_session == 1) ||
-            (($append_session == 0) &&
-             !isset($_COOKIE[session_name()]))) {
-            $url = Util::addParameter($url, session_name(), session_id());
-        }
-
-        if ($full) {
-            /* We need to run the replace twice, because we only catch every
+		}
+		exit;
+	}
+
+	/**
+	 * Adds the javascript code to the output (if output has already started)
+	 * or to the list of script files to include via includeScriptFiles().
+	 *
+	 * @access public
+	 *
+	 * @param string $file     The full javascript file name.
+	 * @param string $app      The application name. Defaults to the current
+	 *                         application.
+	 * @param boolean $direct  Include the file directly without passing it
+	 *                         through javascript.php?
+	 */
+	function addScriptFile($file, $app = null, $direct = false)
+	{
+		global $registry;
+		static $included = array();
+
+		if (empty($app)) {
+			$app = $registry->getApp();
+		}
+
+		// Don't include scripts multiple times.
+		if (!empty($included[$app][$file])) {
+			return;
+		}
+		$included[$app][$file] = true;
+
+		if (ob_get_length() || headers_sent()) {
+			if ($direct) {
+				$url = Horde::url($file{0} == '/' ? $registry->get('webroot', $app) . $file : $registry->get('jsuri', $app) . '/' . $file);
+			} else {
+				$url = Horde::url($registry->get('webroot', 'horde') . '/services/javascript.php');
+				$url = Util::addParameter($url, array('file' => $file,
+													  'app'  => $app));
+			}
+			echo '<script language="JavaScript" type="text/javascript" src="' . $url . '"></script>';
+		} else {
+			global $_horde_script_files;
+			$_horde_script_files[$app][] = array($file, $direct);
+		}
+	}
+
+	/**
+	 * Includes javascript files that were needed before any headers were sent.
+	 *
+	 * @access public
+	 */
+	function includeScriptFiles()
+	{
+		global $_horde_script_files, $registry;
+
+		if (!empty($_horde_script_files)) {
+			$base_url = Horde::url($registry->get('webroot', 'horde') . '/services/javascript.php');
+			foreach ($_horde_script_files as $app => $files) {
+				foreach ($files as $file) {
+					if (!empty($file[1])) {
+						$url = $file[0]{0} == '/' ? $registry->get('webroot', $app) . $file[0] : $registry->get('jsuri', $app) . '/' . $file[0];
+						echo '<script language="JavaScript" type="text/javascript" src="' . Horde::url($url) . "\"></script>\n";
+					} else {
+						$url = Util::addParameter($base_url, array('file' => $file[0],
+																   'app'  => $app));
+						echo '<script language="JavaScript" type="text/javascript" src="' . $url . "\"></script>\n";
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Includes javascript files that were needed before any headers were sent.
+	 *
+	 * @access public
+	 */
+	function inlineScriptFiles()
+	{
+		global $_horde_script_files, $registry;
+
+		if (!empty($_horde_script_files)) {
+			$jsWrapper = $registry->get('fileroot', 'horde') . '/services/javascript.php';
+			foreach ($_horde_script_files as $app => $files) {
+				foreach ($files as $file) {
+					if (!empty($file[1])) {
+						@readfile($file[0]{0} == '/' ? $registry->get('fileroot', $app) . $file[0] : $registry->get('jsfs', $app) . '/' . $file[0]);
+					} else {
+						$file = $file[0];
+						require $jsWrapper;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Checks if link should be shown and return the nescessary code.
+	 *
+	 * @access public
+	 *
+	 * @param string  $type      Type of link to display
+	 * @param string  $app       The name of the current Horde application.
+	 * @param boolean $override  Override Horde settings?
+	 * @param boolean $referrer  Include the current page as the referrer (url=)?
+	 *
+	 * @return string  The HTML to create the link.
+	 */
+	function getServiceLink($type, $app, $override = false, $referrer = true)
+	{
+		if (!Horde::showService($type) && !$override) {
+			return false;
+		}
+
+		switch ($type) {
+		case 'help':
+			if ($GLOBALS['browser']->hasFeature('javascript')) {
+				Horde::addScriptFile('open_help_win.js', 'horde');
+				return "javascript:open_help_win('$app');";
+			} else {
+				$url = Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/help/', true);
+				return Util::addParameter($url, array('module' => $app,
+													  'show' => 'topics'));
+			}
+			break;
+
+		case 'problem':
+			return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/problem.php?return_url=' . urlencode(Horde::selfUrl(true)));
+
+		case 'logout':
+			return Auth::addLogoutParameters(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/login.php'), AUTH_REASON_LOGOUT);
+
+		case 'login':
+			return Auth::getLoginScreen('', $referrer ? Horde::selfUrl(true) : null);
+
+		case 'options':
+			global $conf;
+			if (($conf['prefs']['driver'] != '') && ($conf['prefs']['driver'] != 'none')) {
+				return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=' . $app);
+			}
+			break;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @access public
+	 *
+	 * @param string $type  The type of link.
+	 *
+	 * @return boolean  True if the link is to be shown.
+	 */
+	function showService($type)
+	{
+		global $conf;
+
+		if (empty($conf['menu']['links'][$type])) {
+			return false;
+		}
+
+		switch ($conf['menu']['links'][$type]) {
+		case 'all':
+			return true;
+
+		case 'never':
+			return false;
+
+		case 'authenticated':
+			return (bool)Auth::getAuth();
+
+		default:
+			return false;
+		}
+	}
+
+	/**
+	 * Returns the driver parameters for the specified backend.
+	 *
+	 * @param mixed $backend  The backend system (e.g. 'prefs', 'categories',
+	 *                        'contacts') being used.
+	 *                        The used configuration array will be
+	 *                        $conf[$backend]. If an array gets passed, it will
+	 *                        be $conf[$key1][$key2].
+	 * @param string $type    The type of driver.
+	 *
+	 * @return array  The connection parameters.
+	 */
+	function getDriverConfig($backend, $type = 'sql')
+	{
+		global $conf;
+
+		$c = null;
+		if (is_array($backend)) {
+			require_once 'Horde/Array.php';
+			$c = Horde_Array::getElement($conf, $backend);
+		} elseif (isset($conf[$backend])) {
+			$c = $conf[$backend];
+		}
+		if (!is_null($c) && isset($c['params'])) {
+			if (isset($conf[$type])) {
+				return array_merge($conf[$type], $c['params']);
+			} else {
+				return $c['params'];
+			}
+		}
+
+		return isset($conf[$type]) ? $conf[$type] : array();
+	}
+
+
+	/**
+	 * Returns the VFS driver parameters for the specified backend.
+	 *
+	 * @param string $name  The VFS system name (e.g. 'images', 'documents')
+	 *                      being used.
+	 *
+	 * @return array  A hash with the VFS parameters; the VFS driver in 'type'
+	 *                and the connection parameters in 'params'.
+	 */
+	function getVFSConfig($name)
+	{
+		global $conf;
+
+		if (!isset($conf[$name]['type'])) {
+			return PEAR::raiseError(_("You must configure a VFS backend."));
+		}
+
+		if ($conf[$name]['type'] == 'horde') {
+			$vfs = $conf['vfs'];
+		} else {
+			$vfs = $conf[$name];
+		}
+
+		if ($vfs['type'] == 'sql') {
+			$vfs['params'] = Horde::getDriverConfig($name, 'sql');
+		}
+
+		return $vfs;
+	}
+
+	/**
+	 * Checks if all necessary parameters for a driver configuration
+	 * are set and throws a fatal error with a detailed explaination
+	 * how to fix this, if something is missing.
+	 *
+	 * @param array $params     The configuration array with all parameters.
+	 * @param string $driver    The key name (in the configuration array) of
+	 *                          the driver.
+	 * @param array $fields     An array with mandatory parameter names for
+	 *                          this driver.
+	 * @param string $name      The clear text name of the driver. If not
+	 *                          specified, the application name will be used.
+	 * @param string $file      The configuration file that should contain
+	 *                          these settings.
+	 * @param string $variable  The name of the configuration variable.
+	 */
+	function assertDriverConfig($params, $driver, $fields, $name = null,
+								$file = 'conf.php', $variable = '$conf')
+	{
+		global $registry;
+
+		// Don't generate a fatal error if we fail during or before
+		// Registry instantiation.
+		if (is_null($name)) {
+			$name = isset($registry) ? $registry->getApp() : '[unknown]';
+		}
+		$fileroot = isset($registry) ? $registry->get('fileroot') : '';
+
+		if (!is_array($params) || !count($params)) {
+			Horde::fatal(PEAR::raiseError(
+				sprintf(_("No configuration information specified for %s."), $name) . "\n\n" .
+				sprintf(_("The file %s should contain some %s settings."),
+					$fileroot . '/config/' . $file,
+					sprintf("%s['%s']['params']", $variable, $driver))),
+				__FILE__, __LINE__);
+		}
+
+		foreach ($fields as $field) {
+			if (!isset($params[$field])) {
+				Horde::fatal(PEAR::raiseError(
+					sprintf(_("Required '%s' not specified in %s configuration."), $field, $name) . "\n\n" .
+					sprintf(_("The file %s should contain a %s setting."),
+						$fileroot . '/config/' . $file,
+						sprintf("%s['%s']['params']['%s']", $variable, $driver, $field))),
+					__FILE__, __LINE__);
+			}
+		}
+	}
+
+	/**
+	 * Returns a session-id-ified version of $uri.
+	 * If a full URL is requested, all parameter separators get converted to
+	 * "&", otherwise to "&amp;".
+	 *
+	 * @access public
+	 *
+	 * @param string $uri          The URI to be modified.
+	 * @param bool $full           Generate a full (http://server/path/) URL.
+	 * @param int $append_session  0 = only if needed, 1 = always, -1 = never.
+	 *
+	 * @return string  The URL with the session id appended (if needed).
+	 */
+	function url($uri, $full = false, $append_session = 0, $force_ssl = false)
+	{
+		if ($force_ssl) {
+			$full = true;
+		}
+
+		if ($full) {
+			global $conf, $registry, $browser;
+
+			/* Store connection parameters in local variables. */
+			$server_name = $conf['server']['name'];
+			$server_port = $conf['server']['port'];
+
+			$protocol = 'http';
+			if ($conf['use_ssl'] == 1) {
+				$protocol = 'https';
+			} elseif ($conf['use_ssl'] == 2 &&
+					  $browser->usingSSLConnection()) {
+				$protocol = 'https';
+			} elseif ($conf['use_ssl'] == 3) {
+				$server_port = '';
+				if ($force_ssl) {
+					$protocol = 'https';
+				}
+			}
+
+			/* If using non-standard ports, add the port to the URL. */
+			if (!empty($server_port) &&
+				((($protocol == 'http') && ($server_port != 80)) ||
+				 (($protocol == 'https') && ($server_port != 443)))) {
+				$server_name .= ':' . $server_port;
+			}
+
+			/* Store the webroot in a local variable. */
+			$webroot = $registry->get('webroot');
+
+			$url = $protocol . '://' . $server_name;
+			if (substr($uri, 0, 1) != '/') {
+				if (substr($webroot, -1) == '/') {
+					$url .= $webroot . $uri;
+				} else {
+					$url .= $webroot . '/' . $uri;
+				}
+			} else {
+				$url .= $uri;
+			}
+		} else {
+			$url = $uri;
+		}
+
+		if (($append_session == 1) ||
+			(($append_session == 0) &&
+			 !isset($_COOKIE[session_name()]))) {
+			$url = Util::addParameter($url, session_name(), session_id());
+		}
+
+		if ($full) {
+			/* We need to run the replace twice, because we only catch every
              * second match. */
-            return preg_replace(array('/(=?.*?)&amp;(.*?=)/',
-                                      '/(=?.*?)&amp;(.*?=)/'),
-                                '$1&$2', $url);
-        } elseif (preg_match('/=.*&amp;.*=/', $url)) {
-            return $url;
-        } else {
-            return htmlentities($url);
-        }
-    }
-
-    /**
-     * Returns a session-id-ified version of $uri, using the current
-     * application's webroot setting.
-     *
-     * @access public
-     *
-     * @param string $uri          The URI to be modified.
-     * @param bool $full           Generate a full (http://server/path/) URL.
-     * @param int $append_session  0 = only if needed, 1 = always, -1 = never.
-     *
-     * @return string  The url with the session id appended.
-     */
-    function applicationUrl($uri, $full = false, $append_session = 0)
-    {
-        global $registry;
-
-        /* Store the webroot in a local variable. */
-        $webroot = $registry->get('webroot');
-
-        if ($full) {
-            return Horde::url($uri, $full, $append_session);
-        } elseif (substr($webroot, -1) == '/') {
-            return Horde::url($webroot . $uri, $full, $append_session);
-        } else {
-            return Horde::url($webroot . '/' . $uri, $full, $append_session);
-        }
-    }
-
-    /**
-     * Returns an external link passed through the dereferer to strip session
-     * IDs from the referer.
-     *
-     * @param string $url   The external URL to link to.
-     * @param boolean $tag  If true, a complete <a> tag is returned, only the
-     *                      url otherwise.
-     *
-     * @return string  The correct link to the dereferer script.
-     */
-    function externalUrl($url, $tag = false)
-    {
-        $ext = Horde::url($GLOBALS['registry']->get('webroot', 'horde') .
-                          '/services/go.php', true, -1);
-
-        /* We must make sure there are no &amp's in the URL. */
-        $url = preg_replace(array('/(=?.*?)&amp;(.*?=)/', '/(=?.*?)&amp;(.*?=)/'), '$1&$2', $url);
-        $ext = Util::addParameter($ext, 'url', $url);
-        if ($tag) {
-            $ext = Horde::link($ext, $url, '', '_blank');
-        }
-        return $ext;
-    }
-
-    /**
-     * Returns a URL to be used for downloading, that takes into account any
-     * special browser quirks (i.e. IE's broken filename handling).
-     *
-     * @access public
-     *
-     * @param string $filename  The filename of the download data.
-     * @param array $params     Any additional parameters needed.
-     * @param string $url       The URL to alter. If none passed in, will use
-     *                          the file 'view.php' located in the current
-     *                          module's base directory.
-     *
-     * @return string  The download URL.
-     */
-    function downloadUrl($filename, $params = array(), $url = null)
-    {
-        global $browser;
-
-        $horde_url = false;
-
-        if (is_null($url)) {
-            global $registry;
-            $url = Util::addParameter(Horde::url($registry->get('webroot', 'horde') . '/services/download/'), 'module', $registry->getApp());
-            $horde_url = true;
-        }
-
-        /* Add parameters. */
-        if (!is_null($params)) {
-            foreach ($params as $key => $val) {
-                $url = Util::addParameter($url, $key, $val);
-            }
-        }
-
-        /* If we are using the default Horde download link, add the
+			return preg_replace(array('/(=?.*?)&amp;(.*?=)/',
+									  '/(=?.*?)&amp;(.*?=)/'),
+								'$1&$2', $url);
+		} elseif (preg_match('/=.*&amp;.*=/', $url)) {
+			return $url;
+		} else {
+			return htmlentities($url);
+		}
+	}
+
+	/**
+	 * Returns a session-id-ified version of $uri, using the current
+	 * application's webroot setting.
+	 *
+	 * @access public
+	 *
+	 * @param string $uri          The URI to be modified.
+	 * @param bool $full           Generate a full (http://server/path/) URL.
+	 * @param int $append_session  0 = only if needed, 1 = always, -1 = never.
+	 *
+	 * @return string  The url with the session id appended.
+	 */
+	function applicationUrl($uri, $full = false, $append_session = 0)
+	{
+		global $registry;
+
+		/* Store the webroot in a local variable. */
+		$webroot = $registry->get('webroot');
+
+		if ($full) {
+			return Horde::url($uri, $full, $append_session);
+		} elseif (substr($webroot, -1) == '/') {
+			return Horde::url($webroot . $uri, $full, $append_session);
+		} else {
+			return Horde::url($webroot . '/' . $uri, $full, $append_session);
+		}
+	}
+
+	/**
+	 * Returns an external link passed through the dereferer to strip session
+	 * IDs from the referer.
+	 *
+	 * @param string $url   The external URL to link to.
+	 * @param boolean $tag  If true, a complete <a> tag is returned, only the
+	 *                      url otherwise.
+	 *
+	 * @return string  The correct link to the dereferer script.
+	 */
+	function externalUrl($url, $tag = false)
+	{
+		$ext = Horde::url($GLOBALS['registry']->get('webroot', 'horde') .
+						  '/services/go.php', true, -1);
+
+		/* We must make sure there are no &amp's in the URL. */
+		$url = preg_replace(array('/(=?.*?)&amp;(.*?=)/', '/(=?.*?)&amp;(.*?=)/'), '$1&$2', $url);
+		$ext = Util::addParameter($ext, 'url', $url);
+		if ($tag) {
+			$ext = Horde::link($ext, $url, '', '_blank');
+		}
+		return $ext;
+	}
+
+	/**
+	 * Returns a URL to be used for downloading, that takes into account any
+	 * special browser quirks (i.e. IE's broken filename handling).
+	 *
+	 * @access public
+	 *
+	 * @param string $filename  The filename of the download data.
+	 * @param array $params     Any additional parameters needed.
+	 * @param string $url       The URL to alter. If none passed in, will use
+	 *                          the file 'view.php' located in the current
+	 *                          module's base directory.
+	 *
+	 * @return string  The download URL.
+	 */
+	function downloadUrl($filename, $params = array(), $url = null)
+	{
+		global $browser;
+
+		$horde_url = false;
+
+		if (is_null($url)) {
+			global $registry;
+			$url = Util::addParameter(Horde::url($registry->get('webroot', 'horde') . '/services/download/'), 'module', $registry->getApp());
+			$horde_url = true;
+		}
+
+		/* Add parameters. */
+		if (!is_null($params)) {
+			foreach ($params as $key => $val) {
+				$url = Util::addParameter($url, $key, $val);
+			}
+		}
+
+		/* If we are using the default Horde download link, add the
          * filename to the end of the URL. Although not necessary for
          * many browsers, this should allow every browser to download
          * correctly. */
-        if ($horde_url) {
-            $url = Util::addParameter($url, 'fn=/' . rawurlencode($filename));
-        } elseif ($browser->hasQuirk('break_disposition_filename')) {
-            /* Some browsers will only obtain the filename correctly
+		if ($horde_url) {
+			$url = Util::addParameter($url, 'fn=/' . rawurlencode($filename));
+		} elseif ($browser->hasQuirk('break_disposition_filename')) {
+			/* Some browsers will only obtain the filename correctly
              * if the extension is the last argument in the query
              * string and rest of the filename appears in the
              * PATH_INFO element. */
-            $filename = rawurlencode($filename);
+			$filename = rawurlencode($filename);
 
-            /* Get the webserver ID. */
-            $server = Horde::webServerID();
+			/* Get the webserver ID. */
+			$server = Horde::webServerID();
 
-            /* Get the name and extension of the file.  Apache 2 does
+			/* Get the name and extension of the file.  Apache 2 does
              * NOT support PATH_INFO information being passed to the
              * PHP module by default, so disable that
              * functionality. */
-            if (($server != 'apache2')) {
-                if (($pos = strrpos($filename, '.'))) {
-                    $name = '/' . preg_replace('/\./', '%2E', substr($filename, 0, $pos));
-                    $ext = substr($filename, $pos);
-                } else {
-                    $name = '/' . $filename;
-                    $ext = '';
-                }
-
-                /* Enter the PATH_INFO information. */
-                if (($pos = strpos($url, '?'))) {
-                    $url = substr($url, 0, $pos) . $name . substr($url, $pos);
-                } else {
-                    $url .= $name;
-                }
-            }
-
-            /* Append the extension, if it exists. */
-            if (($server == 'apache2') || !empty($ext)) {
-                $url = Util::addParameter($url, 'fn_ext=/' . $filename);
-            }
-        }
-
-        return $url;
-    }
-
-    /**
-     * Returns an anchor tag with the relevant parameters
-     *
-     * @access public
-     *
-     * @param string $url        The full URL to be linked to
-     * @param string $status     The JavaScript mouse-over string
-     * @param string $class      The CSS class of the link
-     * @param string $target     The window target to point to.
-     * @param string $onclick    JavaScript action for the 'onclick' event.
-     * @param string $title      The link title (tooltip).
-     * @param string $accesskey  The access key to use.
-     * @param array $attributes  Any other name/value pairs to add to the <a>
-     *                           tag.
-     *
-     * @return string  The full <a href> tag.
-     */
-    function link($url, $status = '', $class = '', $target = '', $onclick = '',
-                  $title = '', $accesskey = '', $attributes = array())
-    {
-        $ret = "<a href=\"$url\"";
-        if (!empty($onclick)) {
-            $ret .= " onclick=\"$onclick\"";
-        }
-        if (!empty($status)) {
-            $ret .= ' onmouseout="window.status=\'\';" onmouseover="window.status=\'' . @htmlspecialchars(strtr(addslashes($status), array("\r" => '', "\n" => '')), ENT_QUOTES, NLS::getCharset()) . '\'; return true;"';
-        }
-        if (!empty($class)) {
-            $ret .= " class=\"$class\"";
-        }
-        if (!empty($target)) {
-            $ret .= " target=\"$target\"";
-        }
-        if (!empty($title)) {
-            $ret .= ' title="' . @htmlspecialchars($title, ENT_QUOTES, NLS::getCharset()) . '"';
-        }
-        if (!empty($accesskey)) {
-            $ret .= ' accesskey="' . htmlspecialchars($accesskey) . '"';
-        }
-
-        foreach ($attributes as $name => $value) {
-            $ret .= ' ' . htmlspecialchars($name) . '="' . htmlspecialchars($value) . '"';
-        }
-
-        return "$ret>";
-    }
-
-    /**
-     * Returns an anchor sequence with the relevant parameters for a widget
-     * with accesskey and text.
-     *
-     * @access public
-     *
-     * @param string $url       The full URL to be linked to
-     * @param string $status    The JavaScript mouse-over string
-     * @param string $class     The CSS class of the link
-     * @param string $target    The window target to point to.
-     * @param string $onclick   JavaScript action for the 'onclick' event.
-     * @param string $title     The link title (tooltip).
-     * @param boolean $nocheck  Don't check if the access key already has been
-     *                          used?
-     *
-     * @return string  The full <a href>Title</a> sequence.
-     */
-    function widget($url, $status = '', $class = 'widget', $target = '',
-                    $onclick = '', $title = '', $nocheck = false)
-    {
-        $ak = Horde::getAccessKey($title, $nocheck);
-        $plaintitle = Horde::stripAccessKey($title);
-
-        return Horde::link($url, $status, $class, $target, $onclick, $plaintitle, $ak) . Horde::highlightAccessKey($title, $ak) . '</a>';
-    }
-
-    /**
-     * Returns a session-id-ified version of $PHP_SELF.
-     *
-     * @access public
-     *
-     * @param boolean $query_string  Include any QUERY_STRING?
-     * @param boolean $nocache       Include a nocache parameter in the URL?
-     * @param boolean $full          Return a full URL?
-     *
-     * @return string  The requested URI.
-     */
-    function selfUrl($query_string = false, $nocache = true, $full = false,
-                     $force_ssl = false)
-    {
-        $url = $_SERVER['PHP_SELF'];
-
-        if ($query_string && !empty($_SERVER['QUERY_STRING'])) {
-            $url .= '?' . $_SERVER['QUERY_STRING'];
-        }
-
-        $url = Horde::url($url, $full, 0, $force_ssl);
-
-        if ($nocache) {
-            return Util::nocacheUrl($url);
-        } else {
-            return $url;
-        }
-    }
-
-    /**
-     * Constructs a correctly-pathed link to an image.
-     *
-     * @access public
-     *
-     * @param          string $src   The image file.
-     * @param optional string $alt   Text describing the image.
-     * @param optional mixed  $attr  Any additional attributes for the image tag.
-     *                               Can be a pre-built string or an array of key/value
-     *                               pairs that will be assembled and html-encoded.
-     * @param optional string $dir   The root graphics directory.
-     *
-     * @return string  The full image tag.
-     */
-    function img($src, $alt = '', $attr = '', $dir = null)
-    {
-        /* If browser does not support images, simply return the ALT text. */
-        if (!$GLOBALS['browser']->hasFeature('images')) {
-            return @htmlspecialchars($alt, ENT_COMPAT, NLS::getCharset());
-        }
-
-        /* If no directory has been specified, get it from the registry. */
-        if ($dir === null) {
-            global $registry;
-            $dir = $registry->getImageDir();
-        }
-
-        /* If a directory has been provided, prepend it to the image source. */
-        if (!empty($dir)) {
-            $src = $dir . '/' . $src;
-        }
-
-        /* Build all of the tag attributes. */
-        $attributes = array('src' => $src,
-                            'alt' => $alt,
-                            'title' => $alt);
-        if (is_array($attr)) {
-            $attributes = array_merge($attributes, $attr);
-        }
-
-        $img = '<img';
-        foreach ($attributes as $attribute => $value) {
-            $img .= ' ' . $attribute . '="' . ($attribute == 'src' ? $value : @htmlspecialchars($value, ENT_COMPAT, NLS::getCharset())) . '"';
-        }
-
-        /* If the user supplied a pre-built string of attributes, add that. */
-        if (is_string($attr) && !empty($attr)) {
-            $img .= ' ' . $attr;
-        }
-
-        /* Return the closed image tag. */
-        return $img . ' />';
-    }
-
-    /**
-     * Determines the location of the system temporary directory. If a specific
-     * setting cannot be found, it defaults to /tmp.
-     *
-     * @access public
-     *
-     * @return string  A directory name which can be used for temp files.
-     *                 Returns false if one could not be found.
-     */
-    function getTempDir()
-    {
-        global $conf;
-
-        /* If one has been specifically set, then use that */
-        if (!empty($conf['tmpdir'])) {
-            $tmp = $conf['tmpdir'];
-        }
-
-        /* Next, try Util::getTempDir(). */
-        if (empty($tmp)) {
-            $tmp = Util::getTempDir();
-        }
-
-        /* If it is still empty, we have failed, so return false;
+			if (($server != 'apache2')) {
+				if (($pos = strrpos($filename, '.'))) {
+					$name = '/' . preg_replace('/\./', '%2E', substr($filename, 0, $pos));
+					$ext = substr($filename, $pos);
+				} else {
+					$name = '/' . $filename;
+					$ext = '';
+				}
+
+				/* Enter the PATH_INFO information. */
+				if (($pos = strpos($url, '?'))) {
+					$url = substr($url, 0, $pos) . $name . substr($url, $pos);
+				} else {
+					$url .= $name;
+				}
+			}
+
+			/* Append the extension, if it exists. */
+			if (($server == 'apache2') || !empty($ext)) {
+				$url = Util::addParameter($url, 'fn_ext=/' . $filename);
+			}
+		}
+
+		return $url;
+	}
+
+	/**
+	 * Returns an anchor tag with the relevant parameters
+	 *
+	 * @access public
+	 *
+	 * @param string $url        The full URL to be linked to
+	 * @param string $status     The JavaScript mouse-over string
+	 * @param string $class      The CSS class of the link
+	 * @param string $target     The window target to point to.
+	 * @param string $onclick    JavaScript action for the 'onclick' event.
+	 * @param string $title      The link title (tooltip).
+	 * @param string $accesskey  The access key to use.
+	 * @param array $attributes  Any other name/value pairs to add to the <a>
+	 *                           tag.
+	 *
+	 * @return string  The full <a href> tag.
+	 */
+	function link($url, $status = '', $class = '', $target = '', $onclick = '',
+				  $title = '', $accesskey = '', $attributes = array())
+	{
+		$ret = "<a href=\"$url\"";
+		if (!empty($onclick)) {
+			$ret .= " onclick=\"$onclick\"";
+		}
+		if (!empty($status)) {
+			$ret .= ' onmouseout="window.status=\'\';" onmouseover="window.status=\'' . @htmlspecialchars(strtr(addslashes($status), array("\r" => '', "\n" => '')), ENT_QUOTES, NLS::getCharset()) . '\'; return true;"';
+		}
+		if (!empty($class)) {
+			$ret .= " class=\"$class\"";
+		}
+		if (!empty($target)) {
+			$ret .= " target=\"$target\"";
+		}
+		if (!empty($title)) {
+			$ret .= ' title="' . @htmlspecialchars($title, ENT_QUOTES, NLS::getCharset()) . '"';
+		}
+		if (!empty($accesskey)) {
+			$ret .= ' accesskey="' . htmlspecialchars($accesskey) . '"';
+		}
+
+		foreach ($attributes as $name => $value) {
+			$ret .= ' ' . htmlspecialchars($name) . '="' . htmlspecialchars($value) . '"';
+		}
+
+		return "$ret>";
+	}
+
+	/**
+	 * Returns an anchor sequence with the relevant parameters for a widget
+	 * with accesskey and text.
+	 *
+	 * @access public
+	 *
+	 * @param string $url       The full URL to be linked to
+	 * @param string $status    The JavaScript mouse-over string
+	 * @param string $class     The CSS class of the link
+	 * @param string $target    The window target to point to.
+	 * @param string $onclick   JavaScript action for the 'onclick' event.
+	 * @param string $title     The link title (tooltip).
+	 * @param boolean $nocheck  Don't check if the access key already has been
+	 *                          used?
+	 *
+	 * @return string  The full <a href>Title</a> sequence.
+	 */
+	function widget($url, $status = '', $class = 'widget', $target = '',
+					$onclick = '', $title = '', $nocheck = false)
+	{
+		$ak = Horde::getAccessKey($title, $nocheck);
+		$plaintitle = Horde::stripAccessKey($title);
+
+		return Horde::link($url, $status, $class, $target, $onclick, $plaintitle, $ak) . Horde::highlightAccessKey($title, $ak) . '</a>';
+	}
+
+	/**
+	 * Returns a session-id-ified version of $PHP_SELF.
+	 *
+	 * @access public
+	 *
+	 * @param boolean $query_string  Include any QUERY_STRING?
+	 * @param boolean $nocache       Include a nocache parameter in the URL?
+	 * @param boolean $full          Return a full URL?
+	 *
+	 * @return string  The requested URI.
+	 */
+	function selfUrl($query_string = false, $nocache = true, $full = false,
+					 $force_ssl = false)
+	{
+		$url = $_SERVER['PHP_SELF'];
+
+		if ($query_string && !empty($_SERVER['QUERY_STRING'])) {
+			$url .= '?' . $_SERVER['QUERY_STRING'];
+		}
+
+		$url = Horde::url($url, $full, 0, $force_ssl);
+
+		if ($nocache) {
+			return Util::nocacheUrl($url);
+		} else {
+			return $url;
+		}
+	}
+
+	/**
+	 * Constructs a correctly-pathed link to an image.
+	 *
+	 * @access public
+	 *
+	 * @param          string $src   The image file.
+	 * @param optional string $alt   Text describing the image.
+	 * @param optional mixed  $attr  Any additional attributes for the image tag.
+	 *                               Can be a pre-built string or an array of key/value
+	 *                               pairs that will be assembled and html-encoded.
+	 * @param optional string $dir   The root graphics directory.
+	 *
+	 * @return string  The full image tag.
+	 */
+	function img($src, $alt = '', $attr = '', $dir = null)
+	{
+		/* If browser does not support images, simply return the ALT text. */
+		if (!$GLOBALS['browser']->hasFeature('images')) {
+			return @htmlspecialchars($alt, ENT_COMPAT, NLS::getCharset());
+		}
+
+		/* If no directory has been specified, get it from the registry. */
+		if ($dir === null) {
+			global $registry;
+			$dir = $registry->getImageDir();
+		}
+
+		/* If a directory has been provided, prepend it to the image source. */
+		if (!empty($dir)) {
+			$src = $dir . '/' . $src;
+		}
+
+		/* Build all of the tag attributes. */
+		$attributes = array('src' => $src,
+							'alt' => $alt,
+							'title' => $alt);
+		if (is_array($attr)) {
+			$attributes = array_merge($attributes, $attr);
+		}
+
+		$img = '<img';
+		foreach ($attributes as $attribute => $value) {
+			$img .= ' ' . $attribute . '="' . ($attribute == 'src' ? $value : @htmlspecialchars($value, ENT_COMPAT, NLS::getCharset())) . '"';
+		}
+
+		/* If the user supplied a pre-built string of attributes, add that. */
+		if (is_string($attr) && !empty($attr)) {
+			$img .= ' ' . $attr;
+		}
+
+		/* Return the closed image tag. */
+		return $img . ' />';
+	}
+
+	/**
+	 * Determines the location of the system temporary directory. If a specific
+	 * setting cannot be found, it defaults to /tmp.
+	 *
+	 * @access public
+	 *
+	 * @return string  A directory name which can be used for temp files.
+	 *                 Returns false if one could not be found.
+	 */
+	function getTempDir()
+	{
+		global $conf;
+
+		/* If one has been specifically set, then use that */
+		if (!empty($conf['tmpdir'])) {
+			$tmp = $conf['tmpdir'];
+		}
+
+		/* Next, try Util::getTempDir(). */
+		if (empty($tmp)) {
+			$tmp = Util::getTempDir();
+		}
+
+		/* If it is still empty, we have failed, so return false;
          * otherwise return the directory determined. */
-        return empty($tmp) ? false : $tmp;
-    }
-
-    /**
-     * Creates a temporary filename for the lifetime of the script, and
-     * (optionally) registers it to be deleted at request shutdown.
-     *
-     * @access public
-     *
-     * @param string $prefix   Prefix to make the temporary name more
-     *                         recognizable.
-     * @param boolean $delete  Delete the file at the end of the request?
-     * @param string $dir      Directory to create the temporary file in.
-     * @param boolean $secure  If deleting file, should we securely delete the
-     *                         file?
-     *
-     * @return string   Returns the full path-name to the temporary file or
-     *                  false if a temporary file could not be created.
-     */
-    function getTempFile($prefix = 'Horde', $delete = true, $dir = '',
-                         $secure = false)
-    {
-        if (empty($dir) || !is_dir($dir)) {
-            $dir = Horde::getTempDir();
-        }
-
-        return Util::getTempFile($prefix, $delete, $dir, $secure);
-    }
-
-    /**
-     * Starts output compression, if requested.
-     *
-     * @access public
-     *
-     * @since Horde 2.2
-     */
-    function compressOutput()
-    {
-        static $started;
-
-        if (isset($started)) {
-            return;
-        }
-
-        /* Compress output if requested and possible. */
-        if ($GLOBALS['conf']['compress_pages'] &&
-            !$GLOBALS['browser']->hasQuirk('buggy_compression') &&
-            ini_get('zlib.output_compression') == '' &&
-            ini_get('output_handler') != 'ob_gzhandler') {
-            if (ob_get_level()) {
-                ob_end_clean();
-            }
-            ob_start('ob_gzhandler');
-        }
-
-        $started = true;
-    }
-
-    /**
-     * Determines if output compression can be used.
-     *
-     * @access public
-     *
-     * @return boolean  True if output compression can be used, false if not.
-     */
-    function allowOutputCompression()
-    {
-        require_once 'Horde/Browser.php';
-        $browser = &Browser::singleton();
-
-        /* Turn off compression for buggy browsers. */
-        if ($browser->hasQuirk('buggy_compression')) {
-            return false;
-        }
-
-        return (ini_get('zlib.output_compression') == '' &&
-                ini_get('output_handler') != 'ob_gzhandler');
-    }
-
-    /**
-     * Returns the Web server being used.
-     * PHP string list built from the PHP 'configure' script.
-     *
-     * @access public
-     *
-     * @return string  A web server identification string.
-     * <pre>
-     * 'aolserver' = AOL Server
-     * 'apache1'   = Apache 1.x
-     * 'apache2'   = Apache 2.x
-     * 'caudium'   = Caudium
-     * 'cgi'       = Unknown server - PHP built as CGI program
-     * 'cli'       = Command Line Interface build
-     * 'embed'     = Embedded PHP
-     * 'isapi'     = Zeus ISAPI
-     * 'milter'    = Milter
-     * 'nsapi'     = NSAPI
-     * 'phttpd'    = PHTTPD
-     * 'pi3web'    = Pi3Web
-     * 'roxen'     = Roxen/Pike
-     * 'servlet'   = Servlet
-     * 'thttpd'    = thttpd
-     * 'tux'       = Tux
-     * 'webjames'  = Webjames
-     * </pre>
-     */
-    function webServerID()
-    {
-        $server = php_sapi_name();
-
-        if ($server == 'apache') {
-            return 'apache1';
-        } elseif (($server == 'apache2filter') ||
-                  ($server == 'apache2handler')) {
-            return 'apache2';
-        } else {
-            return $server;
-        }
-    }
-
-    /**
-     * Returns the <link> tags for the CSS stylesheets.
-     *
-     * @access public
-     *
-     * @param string|array $app  The Horde application(s).
-     * @param mixed $theme       The theme to use; specify an empty value to
-     *                           retrieve the theme from user preferences, and
-     *                           false for no theme.
-     * @param boolean $inherit   Inherit Horde-wide CSS?
-     *
-     * @return string  <link> tags for CSS stylesheets.
-     */
-    function stylesheetLink($apps = null, $theme = '', $inherit = true)
-    {
-        if ($theme !== false && empty($theme)) {
-            $theme = $GLOBALS['prefs']->getValue('theme');
-        }
-
-        $css = array();
-        $themes_fs = $GLOBALS['registry']->get('themesfs', 'horde');
-        if ($inherit) {
-            $themes_uri = Horde::url($GLOBALS['registry']->get('themesuri', 'horde'), false, -1);
-            $css[] = $themes_uri . '/screen.css';
-            if (!empty($theme) &&
-                file_exists($themes_fs . '/' . $theme . '/screen.css')) {
-                $css[] = $themes_uri . '/' . $theme . '/screen.css';
-            }
-        }
-
-        if (!empty($apps)) {
-            if (!is_array($apps)) {
-                $apps = array($apps);
-            }
-            foreach ($apps as $app) {
-                if ($inherit && $app == 'horde') {
-                    continue;
-                }
-
-                $themes_fs = $GLOBALS['registry']->get('themesfs', $app);
-                if (file_exists($themes_fs . '/screen.css')) {
-                    $themes_uri = Horde::url($GLOBALS['registry']->get('themesuri', $app), false, -1);
-                    $css[] = $themes_uri . '/screen.css';
-                }
-                if (!empty($theme) &&
-                    file_exists($themes_fs . '/' . $theme . '/screen.css')) {
-                    $css[] = $themes_uri . '/' . $theme . '/screen.css';
-                }
-            }
-        }
-
-        $html = '';
-        foreach ($css as $css_link) {
-            $html .= '<link href="' . $css_link . '" rel="stylesheet" type="text/css" />' . "\n";
-        }
-
-        /* Load IE PNG transparency code if needed. */
-        if ($GLOBALS['browser']->hasQuirk('png_transparency') &&
-            $GLOBALS['prefs']->getValue('alpha_filter')) {
-            $url = Horde::url($GLOBALS['registry']->get('jsuri', 'horde') . '/alphaImageLoader.php', true, -1);
-            $html .= '<style type="text/css"> img { behavior: url("' . $url . '"); } </style>';
-        }
-
-        /* Load browser specific stylesheets if needed. */
-        if ($GLOBALS['browser']->isBrowser('msie')) {
-            $html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/ie.css" rel="stylesheet" type="text/css" />' . "\n";
-            if ($GLOBALS['browser']->getPlatform() == 'mac') {
-                $html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/ie5mac.css" rel="stylesheet" type="text/css" />' . "\n";
-            }
-        }
-        if ($GLOBALS['browser']->isBrowser('opera')) {
-            $html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/opera.css" rel="stylesheet" type="text/css" />' . "\n";
-        }
-        if (strpos(strtolower($GLOBALS['browser']->getAgentString()), 'safari') !== false) {
-            $html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/safari.css" rel="stylesheet" type="text/css" />' . "\n";
-        }
-
-        return $html;
-    }
-
-    /**
-     * Sets a custom session handler up, if there is one.
-     *
-     * @access public
-     */
-    function setupSessionHandler()
-    {
-        global $conf;
-
-        ini_set('url_rewriter.tags', 0);
-        session_set_cookie_params($conf['session']['timeout'],
-                                  $conf['cookie']['path'], $conf['cookie']['domain'], $conf['use_ssl'] == 1 ? 1 : 0);
-        session_cache_limiter($conf['session']['cache_limiter']);
-        session_name(urlencode($conf['session']['name']));
-
-        $type = !empty($conf['sessionhandler']['type']) ? $conf['sessionhandler']['type'] : 'none';
-
-        if ($type == 'external') {
-            $calls = $conf['sessionhandler']['params'];
-            session_set_save_handler($calls['open'],
-                                     $calls['close'],
-                                     $calls['read'],
-                                     $calls['write'],
-                                     $calls['destroy'],
-                                     $calls['gc']);
-        } elseif ($type != 'none') {
-            global $_session_handler;
-            require_once 'Horde/SessionHandler.php';
-            $_session_handler = &SessionHandler::singleton($conf['sessionhandler']['type']);
-            if (!empty($_session_handler) &&
-                !is_a($_session_handler, 'PEAR_Error')) {
-                ini_set('session.save_handler', 'user');
-                session_set_save_handler(array(&$_session_handler, 'open'),
-                                         array(&$_session_handler, 'close'),
-                                         array(&$_session_handler, 'read'),
-                                         array(&$_session_handler, 'write'),
-                                         array(&$_session_handler, 'destroy'),
-                                         array(&$_session_handler, 'gc'));
-            } else {
-                Horde::fatal(PEAR::raiseError('Horde is unable to correctly start the custom session handler.'), __FILE__, __LINE__, false);
-            }
-        }
-    }
-
-    /**
-     * Returns an un-used access key from the label given.
-     *
-     * @access public
-     *
-     * @param string $label     The label to choose an access key from.
-     * @param boolean $nocheck  Don't check if the access key already has been
-     *                          used?
-     *
-     * @return string  A single lower case character access key or empty
-     *                 string if none can be found
-     */
-    function getAccessKey($label, $nocheck = false, $shutdown = false)
-    {
-        /* The access keys already used in this page */
-        static $_used = array();
-
-        /* The labels already used in this page */
-        static $_labels = array();
-
-        /* Shutdown call for translators? */
-        if ($shutdown) {
-            if (!count($_labels)) {
-                return;
-            }
-            $script = basename($_SERVER['PHP_SELF']);
-            $labels = array_keys($_labels);
-            sort($labels);
-            $used = array_keys($_used);
-            sort($used);
-            $remaining = str_replace($used, array(), 'abcdefghijklmnopqrstuvwxyz');
-            Horde::logMessage('Access key information for ' . $script, __FILE__, __LINE__);
-            Horde::logMessage('Used labels: ' . implode(',', $labels), __FILE__, __LINE__);
-            Horde::logMessage('Used keys: ' . implode('', $used), __FILE__, __LINE__);
-            Horde::logMessage('Free keys: ' . $remaining, __FILE__, __LINE__);
-            return;
-        }
-
-        /* Use access keys at all? */
-        static $notsupported;
-        if (!isset($notsupported)) {
-            $notsupported = !$GLOBALS['browser']->hasFeature('accesskey') ||
-                !$GLOBALS['prefs']->getValue('widget_accesskey');
-        }
-
-        if ($notsupported || !preg_match('/_([A-Za-z])/', $label, $match)) {
-            return '';
-        }
-        $key = $match[1];
-
-        /* Has this key already been used? */
-        if (isset($_used[strtolower($key)]) &&
-            !($nocheck && isset($_labels[$label]))) {
-            return '';
-        }
-
-        /* Save key and label. */
-        $_used[strtolower($key)] = true;
-        $_labels[$label] = true;
-
-        return $key;
-    }
-
-    /**
-     * Strips an access key from a label.
-     * For multibyte charset strings the access key gets removed completely,
-     * otherwise only the underscore gets removed.
-     *
-     * @access public
-     *
-     * @param string $label  The label containing an access key.
-     *
-     * @return string  The label with the access key being stripped.
-     */
-    function stripAccessKey($label)
-    {
-        include_once HORDE_BASE . '/config/nls.php';
-        $multibyte = isset($GLOBALS['nls']['multibyte'][NLS::getCharset(true)]);
-
-        return preg_replace('/_([A-Za-z])/',
-                            $multibyte && preg_match('/[\x80-\xff]/', $label) ? '' : '\1',
-                            $label);
-    }
-
-    /**
-     * Highlights an access key in a label.
-     *
-     * @access public
-     *
-     * @param string $label      The label to to highlight the access key in.
-     * @param string $accessKey  The access key to highlight.
-     *
-     * @return string  The HTML version of the label with the access key
-     *                 highlighted.
-     */
-    function highlightAccessKey($label, $accessKey)
-    {
-        $stripped_label = Horde::stripAccesskey($label);
-
-        if (empty($accessKey)) {
-            return $stripped_label;
-        }
-
-        if (isset($GLOBALS['nls']['multibyte'][NLS::getCharset(true)])) {
-            return $stripped_label . '(' . '<span class="accessKey">' .
-                strtoupper($accessKey) . '</span>' . ')';
-        } else {
-            return str_replace('_' . $accessKey, '<span class="accessKey">' . $accessKey . '</span>', $label);
-        }
-    }
-
-    /**
-     * Returns the appropriate "accesskey" and "title" attributes for an HTML
-     * tag and the given label.
-     *
-     * @param string $label     The title of an HTML element
-     * @param boolean $nocheck  Don't check if the access key already has been
-     *                          used?
-     *
-     * @return string  The title, and if appropriate, the accesskey attributes
-     *                 for the element.
-     */
-    function getAccessKeyAndTitle($label, $nocheck = false)
-    {
-        $ak = Horde::getAccessKey($label, $nocheck);
-        $attributes = 'title="' . Horde::stripAccessKey($label);
-        if (!empty($ak)) {
-            $attributes .= sprintf(_(" (Accesskey %s)"), $ak);
-            $attributes .= '" accesskey="' . $ak;
-        }
-        $attributes .= '"';
-        return $attributes;
-    }
-
-    /**
-     * Returns a label element including an access key for usage in conjuction
-     * with a form field. User preferences regarding access keys are respected.
-     *
-     * @param string $for    The form field's id attribute.
-     * @param string $label  The label text.
-     * @param string $ak     The access key to use. If null a new access key
-     *                       will be generated.
-     *
-     * @return string  The html code for the label element.
-     */
-    function label($for, $label, $ak = null)
-    {
-        global $prefs;
-
-        if (is_null($ak)) {
-            $ak = Horde::getAccesskey($label, 1);
-        }
-        $label = Horde::highlightAccessKey($label, $ak);
-
-        return sprintf('<label for="%s"%s>%s</label>',
-                       $for,
-                       !empty($ak) ? ' accesskey="' . $ak . '"' : '',
-                       $label);
-    }
-
-    /**
-     * Redirects to the main Horde login page on authentication failure.
-     *
-     * @access public
-     */
-    function authenticationFailureRedirect()
-    {
-        require_once 'Horde/CLI.php';
-        if (Horde_CLI::runningFromCLI()) {
-            $cli = &Horde_CLI::singleton();
-            $cli->fatal(_("You are not authenticated."));
-        }
-
-        $url = $GLOBALS['registry']->get('webroot', 'horde') . '/login.php';
-        $url = Util::addParameter($url, 'url', Horde::selfUrl(true));
-        $url = Auth::addLogoutParameters($url);
-        header('Location: ' . Horde::url($url, true));
-        exit;
-    }
-
-    /**
-     * Uses DOM Tooltips (via javascript) to display the 'title'
-     * attribute for Horde::link() calls.
-     *
-     * If using this function, the following function must be called:
-     *   Horde::addScriptFile('tooltip.js', 'horde', true);
-     *
-     * @access public
-     *
-     * @param string $url        The full URL to be linked to
-     * @param string $status     The JavaScript mouse-over string
-     * @param string $class      The CSS class of the link
-     * @param string $target     The window target to point to.
-     * @param string $onclick    JavaScript action for the 'onclick' event.
-     * @param string $title      The link title (tooltip).
-     * @param string $accesskey  The access key to use.
-     * @param array $attributes  Any other name/value pairs to add to the <a>
-     *                           tag.
-     *
-     * @return string  The full <a href> tag.
-     */
-    function linkTooltip($url, $status = '', $class = '', $target = '',
-                         $onclick = '', $title = '', $accesskey = '',
-                         $attributes = array())
-    {
-        $url = substr(Horde::link($url, null, $class, $target, $onclick, null, $accesskey, $attributes), 0, -1);
-
-        if (strlen($status)) {
-            $status = @htmlspecialchars(addslashes($status), ENT_QUOTES, NLS::getCharset());
-        }
-
-        $title = trim($title);
-        if (strlen($title)) {
-            require_once 'Horde/Text/Filter.php';
-            $title = Text_Filter::filter($title, 'text2html', array('parselevel' => TEXT_HTML_NOHTML, 'charset' => '', 'class' => ''));
-            $title = '<pre style="margin:0px;">' . strtr(addslashes($title), array("\r" => '', "\n" => '')) . '</pre>';
-            $url .= ' onmouseover="tooltipLink(\'' . @htmlspecialchars($title, ENT_QUOTES, NLS::getCharset()) . '\', \'' . $status . '\'); return true;" onmouseout="tooltipClose();"';
-        }
-        $url .= '>';
-
-        return $url;
-    }
-
-    /**
-     * Provides a standardised function to call a Horde hook, checking whether
-     * a hook config file exists and whether the function itself exists. If
-     * these two conditions are not satisfied it will return the specified
-     * value (by default a PEAR error).
-     *
-     * @access public
-     *
-     * @param string $hook  The function to call.
-     * @param array  $args  An array of any arguments to pass to the hook
-     *                      function.
-     * @param string $app   If specified look for hooks in the config directory
-     *                      of this app.
-     * @param mixed $error  What to return if $app/config/hooks.php or $hook
-     *                      does not exist. If this is the string 'PEAR_Error'
-     *                      a PEAR error object is returned instead, detailing
-     *                      the failure.
-     *
-     * @return mixed  Either the results of the hook or PEAR error on failure.
-     */
-    function callHook($hook, $args = array(), $app = 'horde', $error = 'PEAR_Error')
-    {
-        global $registry;
-        static $hooks_loaded;
-
-        if (!isset($hooks_loaded)) {
-            if (file_exists($registry->get('fileroot', $app) . '/config/hooks.php')) {
-                require_once $registry->get('fileroot', $app) . '/config/hooks.php';
-                $hooks_loaded = true;
-            } else {
-                $hooks_loaded = false;
-            }
-        }
-        if ($hooks_loaded && function_exists($hook)) {
-            return call_user_func_array($hook, $args);
-        }
-
-        if (is_string($error) && strcmp($error, 'PEAR_Error') == 0) {
-            $error = PEAR::raiseError(sprintf('Hook %s in application %s not called.', $hook, $app));
-            Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG);
-        }
-
-        return $error;
-    }
-
-    /**
-     * Return the initial page to load when accessing Horde.
-     *
-     * @return string  The URL of the initial page.
-     */
-    function initialPage()
-    {
-        global $prefs, $registry, $perms;
-
-        $initial_app = $prefs->getValue('initial_application');
-        if (!empty($initial_app) && $registry->hasPermission($initial_app)) {
-            return Horde::url($registry->getInitialPage($initial_app), true);
-        } elseif (isset($registry->applications['horde']['initial_page'])) {
-            return Horde::applicationUrl($registry->applications['horde']['initial_page'], true);
-        } elseif (Auth::getAuth()) {
-            return Horde::applicationUrl('services/portal/', true);
-        } else {
-            return Horde::applicationUrl('login.php', true);
-        }
-    }
-
-    /**
-     * Returns an array of available menu items when in a Horde script.
-     *
-     * @return array  Available menu items.
-     */
-    function getHordeMenu()
-    {
-        global $registry, $prefs;
-
-        $menu = array();
-
-        /* The home page button. If an initial application has been set in the
+		return empty($tmp) ? false : $tmp;
+	}
+
+	/**
+	 * Creates a temporary filename for the lifetime of the script, and
+	 * (optionally) registers it to be deleted at request shutdown.
+	 *
+	 * @access public
+	 *
+	 * @param string $prefix   Prefix to make the temporary name more
+	 *                         recognizable.
+	 * @param boolean $delete  Delete the file at the end of the request?
+	 * @param string $dir      Directory to create the temporary file in.
+	 * @param boolean $secure  If deleting file, should we securely delete the
+	 *                         file?
+	 *
+	 * @return string   Returns the full path-name to the temporary file or
+	 *                  false if a temporary file could not be created.
+	 */
+	function getTempFile($prefix = 'Horde', $delete = true, $dir = '',
+						 $secure = false)
+	{
+		if (empty($dir) || !is_dir($dir)) {
+			$dir = Horde::getTempDir();
+		}
+
+		return Util::getTempFile($prefix, $delete, $dir, $secure);
+	}
+
+	/**
+	 * Starts output compression, if requested.
+	 *
+	 * @access public
+	 *
+	 * @since Horde 2.2
+	 */
+	function compressOutput()
+	{
+		static $started;
+
+		if (isset($started)) {
+			return;
+		}
+
+		/* Compress output if requested and possible. */
+		if ($GLOBALS['conf']['compress_pages'] &&
+			!$GLOBALS['browser']->hasQuirk('buggy_compression') &&
+			ini_get('zlib.output_compression') == '' &&
+			ini_get('output_handler') != 'ob_gzhandler') {
+			if (ob_get_level()) {
+				ob_end_clean();
+			}
+			ob_start('ob_gzhandler');
+		}
+
+		$started = true;
+	}
+
+	/**
+	 * Determines if output compression can be used.
+	 *
+	 * @access public
+	 *
+	 * @return boolean  True if output compression can be used, false if not.
+	 */
+	function allowOutputCompression()
+	{
+		require_once 'Horde/Browser.php';
+		$browser = &Browser::singleton();
+
+		/* Turn off compression for buggy browsers. */
+		if ($browser->hasQuirk('buggy_compression')) {
+			return false;
+		}
+
+		return (ini_get('zlib.output_compression') == '' &&
+				ini_get('output_handler') != 'ob_gzhandler');
+	}
+
+	/**
+	 * Returns the Web server being used.
+	 * PHP string list built from the PHP 'configure' script.
+	 *
+	 * @access public
+	 *
+	 * @return string  A web server identification string.
+	 * <pre>
+	 * 'aolserver' = AOL Server
+	 * 'apache1'   = Apache 1.x
+	 * 'apache2'   = Apache 2.x
+	 * 'caudium'   = Caudium
+	 * 'cgi'       = Unknown server - PHP built as CGI program
+	 * 'cli'       = Command Line Interface build
+	 * 'embed'     = Embedded PHP
+	 * 'isapi'     = Zeus ISAPI
+	 * 'milter'    = Milter
+	 * 'nsapi'     = NSAPI
+	 * 'phttpd'    = PHTTPD
+	 * 'pi3web'    = Pi3Web
+	 * 'roxen'     = Roxen/Pike
+	 * 'servlet'   = Servlet
+	 * 'thttpd'    = thttpd
+	 * 'tux'       = Tux
+	 * 'webjames'  = Webjames
+	 * </pre>
+	 */
+	function webServerID()
+	{
+		$server = php_sapi_name();
+
+		if ($server == 'apache') {
+			return 'apache1';
+		} elseif (($server == 'apache2filter') ||
+				  ($server == 'apache2handler')) {
+			return 'apache2';
+		} else {
+			return $server;
+		}
+	}
+
+	/**
+	 * Returns the <link> tags for the CSS stylesheets.
+	 *
+	 * @access public
+	 *
+	 * @param string|array $app  The Horde application(s).
+	 * @param mixed $theme       The theme to use; specify an empty value to
+	 *                           retrieve the theme from user preferences, and
+	 *                           false for no theme.
+	 * @param boolean $inherit   Inherit Horde-wide CSS?
+	 *
+	 * @return string  <link> tags for CSS stylesheets.
+	 */
+	function stylesheetLink($apps = null, $theme = '', $inherit = true)
+	{
+		if ($theme !== false && empty($theme)) {
+			$theme = $GLOBALS['prefs']->getValue('theme');
+		}
+
+		$css = array();
+		$themes_fs = $GLOBALS['registry']->get('themesfs', 'horde');
+		if ($inherit) {
+			$themes_uri = Horde::url($GLOBALS['registry']->get('themesuri', 'horde'), false, -1);
+			$css[] = $themes_uri . '/screen.css';
+			if (!empty($theme) &&
+				file_exists($themes_fs . '/' . $theme . '/screen.css')) {
+				$css[] = $themes_uri . '/' . $theme . '/screen.css';
+			}
+		}
+
+		if (!empty($apps)) {
+			if (!is_array($apps)) {
+				$apps = array($apps);
+			}
+			foreach ($apps as $app) {
+				if ($inherit && $app == 'horde') {
+					continue;
+				}
+
+				$themes_fs = $GLOBALS['registry']->get('themesfs', $app);
+				if (file_exists($themes_fs . '/screen.css')) {
+					$themes_uri = Horde::url($GLOBALS['registry']->get('themesuri', $app), false, -1);
+					$css[] = $themes_uri . '/screen.css';
+				}
+				if (!empty($theme) &&
+					file_exists($themes_fs . '/' . $theme . '/screen.css')) {
+					$css[] = $themes_uri . '/' . $theme . '/screen.css';
+				}
+			}
+		}
+
+		$html = '';
+		foreach ($css as $css_link) {
+			$html .= '<link href="' . $css_link . '" rel="stylesheet" type="text/css" />' . "\n";
+		}
+
+		/* Load IE PNG transparency code if needed. */
+		if ($GLOBALS['browser']->hasQuirk('png_transparency') &&
+			$GLOBALS['prefs']->getValue('alpha_filter')) {
+			$url = Horde::url($GLOBALS['registry']->get('jsuri', 'horde') . '/alphaImageLoader.php', true, -1);
+			$html .= '<style type="text/css"> img { behavior: url("' . $url . '"); } </style>';
+		}
+
+		/* Load browser specific stylesheets if needed. */
+		if ($GLOBALS['browser']->isBrowser('msie')) {
+			$html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/ie.css" rel="stylesheet" type="text/css" />' . "\n";
+			if ($GLOBALS['browser']->getPlatform() == 'mac') {
+				$html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/ie5mac.css" rel="stylesheet" type="text/css" />' . "\n";
+			}
+		}
+		if ($GLOBALS['browser']->isBrowser('opera')) {
+			$html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/opera.css" rel="stylesheet" type="text/css" />' . "\n";
+		}
+		if (strpos(strtolower($GLOBALS['browser']->getAgentString()), 'safari') !== false) {
+			$html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/safari.css" rel="stylesheet" type="text/css" />' . "\n";
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Sets a custom session handler up, if there is one.
+	 *
+	 * @access public
+	 */
+	function setupSessionHandler()
+	{
+		global $conf;
+
+		ini_set('url_rewriter.tags', 0);
+		session_set_cookie_params($conf['session']['timeout'],
+								  $conf['cookie']['path'], $conf['cookie']['domain'], $conf['use_ssl'] == 1 ? 1 : 0);
+		session_cache_limiter($conf['session']['cache_limiter']);
+		session_name(urlencode($conf['session']['name']));
+
+		$type = !empty($conf['sessionhandler']['type']) ? $conf['sessionhandler']['type'] : 'none';
+
+		if ($type == 'external') {
+			$calls = $conf['sessionhandler']['params'];
+			session_set_save_handler($calls['open'],
+									 $calls['close'],
+									 $calls['read'],
+									 $calls['write'],
+									 $calls['destroy'],
+									 $calls['gc']);
+		} elseif ($type != 'none') {
+			global $_session_handler;
+			require_once 'Horde/SessionHandler.php';
+			$_session_handler = &SessionHandler::singleton($conf['sessionhandler']['type']);
+			if (!empty($_session_handler) &&
+				!is_a($_session_handler, 'PEAR_Error')) {
+				ini_set('session.save_handler', 'user');
+				session_set_save_handler(array(&$_session_handler, 'open'),
+										 array(&$_session_handler, 'close'),
+										 array(&$_session_handler, 'read'),
+										 array(&$_session_handler, 'write'),
+										 array(&$_session_handler, 'destroy'),
+										 array(&$_session_handler, 'gc'));
+			} else {
+				Horde::fatal(PEAR::raiseError('Horde is unable to correctly start the custom session handler.'), __FILE__, __LINE__, false);
+			}
+		}
+	}
+
+	/**
+	 * Returns an un-used access key from the label given.
+	 *
+	 * @access public
+	 *
+	 * @param string $label     The label to choose an access key from.
+	 * @param boolean $nocheck  Don't check if the access key already has been
+	 *                          used?
+	 *
+	 * @return string  A single lower case character access key or empty
+	 *                 string if none can be found
+	 */
+	function getAccessKey($label, $nocheck = false, $shutdown = false)
+	{
+		/* The access keys already used in this page */
+		static $_used = array();
+
+		/* The labels already used in this page */
+		static $_labels = array();
+
+		/* Shutdown call for translators? */
+		if ($shutdown) {
+			if (!count($_labels)) {
+				return;
+			}
+			$script = basename($_SERVER['PHP_SELF']);
+			$labels = array_keys($_labels);
+			sort($labels);
+			$used = array_keys($_used);
+			sort($used);
+			$remaining = str_replace($used, array(), 'abcdefghijklmnopqrstuvwxyz');
+			Horde::logMessage('Access key information for ' . $script, __FILE__, __LINE__);
+			Horde::logMessage('Used labels: ' . implode(',', $labels), __FILE__, __LINE__);
+			Horde::logMessage('Used keys: ' . implode('', $used), __FILE__, __LINE__);
+			Horde::logMessage('Free keys: ' . $remaining, __FILE__, __LINE__);
+			return;
+		}
+
+		/* Use access keys at all? */
+		static $notsupported;
+		if (!isset($notsupported)) {
+			$notsupported = !$GLOBALS['browser']->hasFeature('accesskey') ||
+				!$GLOBALS['prefs']->getValue('widget_accesskey');
+		}
+
+		if ($notsupported || !preg_match('/_([A-Za-z])/', $label, $match)) {
+			return '';
+		}
+		$key = $match[1];
+
+		/* Has this key already been used? */
+		if (isset($_used[strtolower($key)]) &&
+			!($nocheck && isset($_labels[$label]))) {
+			return '';
+		}
+
+		/* Save key and label. */
+		$_used[strtolower($key)] = true;
+		$_labels[$label] = true;
+
+		return $key;
+	}
+
+	/**
+	 * Strips an access key from a label.
+	 * For multibyte charset strings the access key gets removed completely,
+	 * otherwise only the underscore gets removed.
+	 *
+	 * @access public
+	 *
+	 * @param string $label  The label containing an access key.
+	 *
+	 * @return string  The label with the access key being stripped.
+	 */
+	function stripAccessKey($label)
+	{
+		include_once HORDE_BASE . '/config/nls.php';
+		$multibyte = isset($GLOBALS['nls']['multibyte'][NLS::getCharset(true)]);
+
+		return preg_replace('/_([A-Za-z])/',
+							$multibyte && preg_match('/[\x80-\xff]/', $label) ? '' : '\1',
+							$label);
+	}
+
+	/**
+	 * Highlights an access key in a label.
+	 *
+	 * @access public
+	 *
+	 * @param string $label      The label to to highlight the access key in.
+	 * @param string $accessKey  The access key to highlight.
+	 *
+	 * @return string  The HTML version of the label with the access key
+	 *                 highlighted.
+	 */
+	function highlightAccessKey($label, $accessKey)
+	{
+		$stripped_label = Horde::stripAccesskey($label);
+
+		if (empty($accessKey)) {
+			return $stripped_label;
+		}
+
+		if (isset($GLOBALS['nls']['multibyte'][NLS::getCharset(true)])) {
+			return $stripped_label . '(' . '<span class="accessKey">' .
+				strtoupper($accessKey) . '</span>' . ')';
+		} else {
+			return str_replace('_' . $accessKey, '<span class="accessKey">' . $accessKey . '</span>', $label);
+		}
+	}
+
+	/**
+	 * Returns the appropriate "accesskey" and "title" attributes for an HTML
+	 * tag and the given label.
+	 *
+	 * @param string $label     The title of an HTML element
+	 * @param boolean $nocheck  Don't check if the access key already has been
+	 *                          used?
+	 *
+	 * @return string  The title, and if appropriate, the accesskey attributes
+	 *                 for the element.
+	 */
+	function getAccessKeyAndTitle($label, $nocheck = false)
+	{
+		$ak = Horde::getAccessKey($label, $nocheck);
+		$attributes = 'title="' . Horde::stripAccessKey($label);
+		if (!empty($ak)) {
+			$attributes .= sprintf(_(" (Accesskey %s)"), $ak);
+			$attributes .= '" accesskey="' . $ak;
+		}
+		$attributes .= '"';
+		return $attributes;
+	}
+
+	/**
+	 * Returns a label element including an access key for usage in conjuction
+	 * with a form field. User preferences regarding access keys are respected.
+	 *
+	 * @param string $for    The form field's id attribute.
+	 * @param string $label  The label text.
+	 * @param string $ak     The access key to use. If null a new access key
+	 *                       will be generated.
+	 *
+	 * @return string  The html code for the label element.
+	 */
+	function label($for, $label, $ak = null)
+	{
+		global $prefs;
+
+		if (is_null($ak)) {
+			$ak = Horde::getAccesskey($label, 1);
+		}
+		$label = Horde::highlightAccessKey($label, $ak);
+
+		return sprintf('<label for="%s"%s>%s</label>',
+					   $for,
+					   !empty($ak) ? ' accesskey="' . $ak . '"' : '',
+					   $label);
+	}
+
+	/**
+	 * Redirects to the main Horde login page on authentication failure.
+	 *
+	 * @access public
+	 */
+	function authenticationFailureRedirect()
+	{
+		require_once 'Horde/CLI.php';
+		if (Horde_CLI::runningFromCLI()) {
+			$cli = &Horde_CLI::singleton();
+			$cli->fatal(_("You are not authenticated."));
+		}
+
+		$url = $GLOBALS['registry']->get('webroot', 'horde') . '/login.php';
+		$url = Util::addParameter($url, 'url', Horde::selfUrl(true));
+		$url = Auth::addLogoutParameters($url);
+		header('Location: ' . Horde::url($url, true));
+		exit;
+	}
+
+	/**
+	 * Uses DOM Tooltips (via javascript) to display the 'title'
+	 * attribute for Horde::link() calls.
+	 *
+	 * If using this function, the following function must be called:
+	 *   Horde::addScriptFile('tooltip.js', 'horde', true);
+	 *
+	 * @access public
+	 *
+	 * @param string $url        The full URL to be linked to
+	 * @param string $status     The JavaScript mouse-over string
+	 * @param string $class      The CSS class of the link
+	 * @param string $target     The window target to point to.
+	 * @param string $onclick    JavaScript action for the 'onclick' event.
+	 * @param string $title      The link title (tooltip).
+	 * @param string $accesskey  The access key to use.
+	 * @param array $attributes  Any other name/value pairs to add to the <a>
+	 *                           tag.
+	 *
+	 * @return string  The full <a href> tag.
+	 */
+	function linkTooltip($url, $status = '', $class = '', $target = '',
+						 $onclick = '', $title = '', $accesskey = '',
+						 $attributes = array())
+	{
+		$url = substr(Horde::link($url, null, $class, $target, $onclick, null, $accesskey, $attributes), 0, -1);
+
+		if (strlen($status)) {
+			$status = @htmlspecialchars(addslashes($status), ENT_QUOTES, NLS::getCharset());
+		}
+
+		$title = trim($title);
+		if (strlen($title)) {
+			require_once 'Horde/Text/Filter.php';
+			$title = Text_Filter::filter($title, 'text2html', array('parselevel' => TEXT_HTML_NOHTML, 'charset' => '', 'class' => ''));
+			$title = '<pre style="margin:0px;">' . strtr(addslashes($title), array("\r" => '', "\n" => '')) . '</pre>';
+			$url .= ' onmouseover="tooltipLink(\'' . @htmlspecialchars($title, ENT_QUOTES, NLS::getCharset()) . '\', \'' . $status . '\'); return true;" onmouseout="tooltipClose();"';
+		}
+		$url .= '>';
+
+		return $url;
+	}
+
+	/**
+	 * Provides a standardised function to call a Horde hook, checking whether
+	 * a hook config file exists and whether the function itself exists. If
+	 * these two conditions are not satisfied it will return the specified
+	 * value (by default a PEAR error).
+	 *
+	 * @access public
+	 *
+	 * @param string $hook  The function to call.
+	 * @param array  $args  An array of any arguments to pass to the hook
+	 *                      function.
+	 * @param string $app   If specified look for hooks in the config directory
+	 *                      of this app.
+	 * @param mixed $error  What to return if $app/config/hooks.php or $hook
+	 *                      does not exist. If this is the string 'PEAR_Error'
+	 *                      a PEAR error object is returned instead, detailing
+	 *                      the failure.
+	 *
+	 * @return mixed  Either the results of the hook or PEAR error on failure.
+	 */
+	function callHook($hook, $args = array(), $app = 'horde', $error = 'PEAR_Error')
+	{
+		global $registry;
+		static $hooks_loaded;
+
+		if (!isset($hooks_loaded)) {
+			if (file_exists($registry->get('fileroot', $app) . '/config/hooks.php')) {
+				require_once $registry->get('fileroot', $app) . '/config/hooks.php';
+				$hooks_loaded = true;
+			} else {
+				$hooks_loaded = false;
+			}
+		}
+		if ($hooks_loaded && function_exists($hook)) {
+			return call_user_func_array($hook, $args);
+		}
+
+		if (is_string($error) && strcmp($error, 'PEAR_Error') == 0) {
+			$error = PEAR::raiseError(sprintf('Hook %s in application %s not called.', $hook, $app));
+			Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Return the initial page to load when accessing Horde.
+	 *
+	 * @return string  The URL of the initial page.
+	 */
+	function initialPage()
+	{
+		global $prefs, $registry, $perms;
+
+		$initial_app = $prefs->getValue('initial_application');
+		if (!empty($initial_app) && $registry->hasPermission($initial_app)) {
+			return Horde::url($registry->getInitialPage($initial_app), true);
+		} elseif (isset($registry->applications['horde']['initial_page'])) {
+			return Horde::applicationUrl($registry->applications['horde']['initial_page'], true);
+		} elseif (Auth::getAuth()) {
+			return Horde::applicationUrl('services/portal/', true);
+		} else {
+			return Horde::applicationUrl('login.php', true);
+		}
+	}
+
+	/**
+	 * Returns an array of available menu items when in a Horde script.
+	 *
+	 * @return array  Available menu items.
+	 */
+	function getHordeMenu()
+	{
+		global $registry, $prefs;
+
+		$menu = array();
+
+		/* The home page button. If an initial application has been set in the
          * prefs this will default to that application. Otherwise it will go
          * to the portal screen. */
-        $initial_app = $prefs->getValue('initial_application');
-        if (!empty($initial_app)) {
-            $url = Horde::url($registry->getInitialPage($initial_app));
-        } else {
-            $url = Horde::applicationUrl('services/portal/');
-        }
-        $menu[] = array('url' => $url,
-                        'text' =>  _("Home"),
-                        'icon' => 'horde.png',
-                        'icon_path' => $registry->getImageDir());
-
-        if (Auth::isAdmin()) {
-            $menu[] = array('url' => Horde::applicationUrl('admin/'),
-                            'text' =>  _("_Administration"),
-                            'icon' => 'administration.png',
-                            'icon_path' => $registry->getImageDir());
-        }
-
-        return $menu;
-    }
+		$initial_app = $prefs->getValue('initial_application');
+		if (!empty($initial_app)) {
+			$url = Horde::url($registry->getInitialPage($initial_app));
+		} else {
+			$url = Horde::applicationUrl('services/portal/');
+		}
+		$menu[] = array('url' => $url,
+						'text' =>  _("Home"),
+						'icon' => 'horde.png',
+						'icon_path' => $registry->getImageDir());
+
+		if (Auth::isAdmin()) {
+			$menu[] = array('url' => Horde::applicationUrl('admin/'),
+							'text' =>  _("_Administration"),
+							'icon' => 'administration.png',
+							'icon_path' => $registry->getImageDir());
+		}
+
+		return $menu;
+	}
 
 }

Switch Indentation +51 added lines, -51 removed lines

@@ -169,23 +169,23 @@ 
                                 array($error->getUserInfo()));
 
             switch ($error->getCode()) {
-            case HORDE_ERROR_DRIVER_CONFIG_MISSING:
-                $message = sprintf(_("No configuration information specified for %s."), $info['name']) . '<br />' .
-                    sprintf(_("The file %s should contain some %s settings."),
-                            $GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
-                            sprintf("%s['%s']['params']", $info['variable'], $info['driver']));
-                break;
-
-            case HORDE_ERROR_DRIVER_CONFIG:
-                $message = sprintf(_("Required '%s' not specified in %s configuration."), $info['field'], $info['name']) . '<br />' .
-                    sprintf(_("The file %s should contain a %s setting."),
-                            $GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
-                            sprintf("%s['%s']['params']['%s']", $info['variable'], $info['driver'], $info['field']));
-                break;
-
-            default:
-                $message = $error->getMessage();
-                break;
+            	case HORDE_ERROR_DRIVER_CONFIG_MISSING:
+                	$message = sprintf(_("No configuration information specified for %s."), $info['name']) . '<br />' .
+                    	sprintf(_("The file %s should contain some %s settings."),
+                            	$GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
+                            	sprintf("%s['%s']['params']", $info['variable'], $info['driver']));
+                	break;
+
+            	case HORDE_ERROR_DRIVER_CONFIG:
+                	$message = sprintf(_("Required '%s' not specified in %s configuration."), $info['field'], $info['name']) . '<br />' .
+                    	sprintf(_("The file %s should contain a %s setting."),
+                            	$GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
+                            	sprintf("%s['%s']['params']['%s']", $info['variable'], $info['driver'], $info['field']));
+                	break;
+
+            	default:
+                	$message = $error->getMessage();
+                	break;
             }
 
             $errortext .= '<h3>' . htmlspecialchars($message) . '</h3>';
@@ -334,32 +334,32 @@ 
         }
 
         switch ($type) {
-        case 'help':
-            if ($GLOBALS['browser']->hasFeature('javascript')) {
-                Horde::addScriptFile('open_help_win.js', 'horde');
-                return "javascript:open_help_win('$app');";
-            } else {
-                $url = Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/help/', true);
-                return Util::addParameter($url, array('module' => $app,
-                                                      'show' => 'topics'));
-            }
-            break;
-
-        case 'problem':
-            return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/problem.php?return_url=' . urlencode(Horde::selfUrl(true)));
-
-        case 'logout':
-            return Auth::addLogoutParameters(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/login.php'), AUTH_REASON_LOGOUT);
-
-        case 'login':
-            return Auth::getLoginScreen('', $referrer ? Horde::selfUrl(true) : null);
-
-        case 'options':
-            global $conf;
-            if (($conf['prefs']['driver'] != '') && ($conf['prefs']['driver'] != 'none')) {
-                return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=' . $app);
-            }
-            break;
+        	case 'help':
+            	if ($GLOBALS['browser']->hasFeature('javascript')) {
+                	Horde::addScriptFile('open_help_win.js', 'horde');
+                	return "javascript:open_help_win('$app');";
+            	} else {
+                	$url = Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/help/', true);
+                	return Util::addParameter($url, array('module' => $app,
+                                                      	'show' => 'topics'));
+            	}
+            	break;
+
+        	case 'problem':
+            	return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/problem.php?return_url=' . urlencode(Horde::selfUrl(true)));
+
+        	case 'logout':
+            	return Auth::addLogoutParameters(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/login.php'), AUTH_REASON_LOGOUT);
+
+        	case 'login':
+            	return Auth::getLoginScreen('', $referrer ? Horde::selfUrl(true) : null);
+
+        	case 'options':
+            	global $conf;
+            	if (($conf['prefs']['driver'] != '') && ($conf['prefs']['driver'] != 'none')) {
+                	return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=' . $app);
+            	}
+            	break;
         }
 
         return false;
@@ -381,17 +381,17 @@ 
         }
 
         switch ($conf['menu']['links'][$type]) {
-        case 'all':
-            return true;
+        	case 'all':
+            	return true;
 
-        case 'never':
-            return false;
+        	case 'never':
+            	return false;
 
-        case 'authenticated':
-            return (bool)Auth::getAuth();
+        	case 'authenticated':
+            	return (bool)Auth::getAuth();
 
-        default:
-            return false;
+        	default:
+            	return false;
         }
     }
 

Spacing +86 added lines, -86 removed lines

@@ -68,14 +68,14 @@ 
                 if (is_array($userinfo)) {
                     $userinfo = implode(', ', $userinfo);
                 }
-                $message .= ': ' . $userinfo;
+                $message .= ': '.$userinfo;
             }
         } elseif (is_callable(array($message, 'getMessage'))) {
             $message = $message->getMessage();
         }
 
         $app = isset($GLOBALS['registry']) ? $GLOBALS['registry']->getApp() : 'horde';
-        $message = '[' . $app . '] ' . $message . ' [on line ' . $line . ' of "' . $file . '"]';
+        $message = '['.$app.'] '.$message.' [on line '.$line.' of "'.$file.'"]';
 
         /* Make sure to log in the system's locale. */
         $locale = setlocale(LC_TIME, 0);
@@ -131,7 +131,7 @@ 
         } else {
             @session_destroy();
             if (Util::extensionExists('posix')) {
-                $new_session_id = md5(microtime() . posix_getpid());
+                $new_session_id = md5(microtime().posix_getpid());
             } else {
                 $new_session_id = md5(uniqid(mt_rand(), true));
             }
@@ -163,23 +163,23 @@ 
         $admin = class_exists('Auth') && Auth::isAdmin();
         $cli = class_exists('Horde_CLI') && Horde_CLI::runningFromCLI();
 
-        $errortext = '<h1>' . _("A fatal error has occurred") . '</h1>';
+        $errortext = '<h1>'._("A fatal error has occurred").'</h1>';
         if (is_a($error, 'PEAR_Error')) {
             $info = array_merge(array('file' => 'conf.php', 'variable' => '$conf'),
                                 array($error->getUserInfo()));
 
             switch ($error->getCode()) {
             case HORDE_ERROR_DRIVER_CONFIG_MISSING:
-                $message = sprintf(_("No configuration information specified for %s."), $info['name']) . '<br />' .
+                $message = sprintf(_("No configuration information specified for %s."), $info['name']).'<br />'.
                     sprintf(_("The file %s should contain some %s settings."),
-                            $GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
+                            $GLOBALS['registry']->get('fileroot').'/config/'.$info['file'],
                             sprintf("%s['%s']['params']", $info['variable'], $info['driver']));
                 break;
 
             case HORDE_ERROR_DRIVER_CONFIG:
-                $message = sprintf(_("Required '%s' not specified in %s configuration."), $info['field'], $info['name']) . '<br />' .
+                $message = sprintf(_("Required '%s' not specified in %s configuration."), $info['field'], $info['name']).'<br />'.
                     sprintf(_("The file %s should contain a %s setting."),
-                            $GLOBALS['registry']->get('fileroot') . '/config/' . $info['file'],
+                            $GLOBALS['registry']->get('fileroot').'/config/'.$info['file'],
                             sprintf("%s['%s']['params']['%s']", $info['variable'], $info['driver'], $info['field']));
                 break;
 
@@ -188,21 +188,21 @@ 
                 break;
             }
 
-            $errortext .= '<h3>' . htmlspecialchars($message) . '</h3>';
+            $errortext .= '<h3>'.htmlspecialchars($message).'</h3>';
         } elseif (is_object($error) && method_exists($error, 'getMessage')) {
-            $errortext .= '<h3>' . htmlspecialchars($error->getMessage()) . '</h3>';
+            $errortext .= '<h3>'.htmlspecialchars($error->getMessage()).'</h3>';
         } elseif (is_string($error)) {
-            $errortext .= '<h3>' . $error . '</h3>';
+            $errortext .= '<h3>'.$error.'</h3>';
         }
 
         if ($admin) {
-            $errortext .= '<p><code>' . sprintf(_("[line %s of %s]"), $line, $file) . '</code></p>';
+            $errortext .= '<p><code>'.sprintf(_("[line %s of %s]"), $line, $file).'</code></p>';
             if (is_object($error)) {
-                $errortext .= '<h3>' . _("Details (also in Horde's logfile):") . '</h3>';
-                $errortext .= '<p><pre>' . htmlspecialchars(Util::bufferOutput('var_dump', $error)) . '</pre></p>';
+                $errortext .= '<h3>'._("Details (also in Horde's logfile):").'</h3>';
+                $errortext .= '<p><pre>'.htmlspecialchars(Util::bufferOutput('var_dump', $error)).'</pre></p>';
             }
         } elseif ($log) {
-            $errortext .= '<h3>' . _("Details have been logged for the administrator.") . '</h3>';
+            $errortext .= '<h3>'._("Details have been logged for the administrator.").'</h3>';
         }
 
         // Log the error via Horde::logMessage() if requested.
@@ -252,13 +252,13 @@ 
 
         if (ob_get_length() || headers_sent()) {
             if ($direct) {
-                $url = Horde::url($file{0} == '/' ? $registry->get('webroot', $app) . $file : $registry->get('jsuri', $app) . '/' . $file);
+                $url = Horde::url($file{0} == '/' ? $registry->get('webroot', $app).$file : $registry->get('jsuri', $app).'/'.$file);
             } else {
-                $url = Horde::url($registry->get('webroot', 'horde') . '/services/javascript.php');
+                $url = Horde::url($registry->get('webroot', 'horde').'/services/javascript.php');
                 $url = Util::addParameter($url, array('file' => $file,
                                                       'app'  => $app));
             }
-            echo '<script language="JavaScript" type="text/javascript" src="' . $url . '"></script>';
+            echo '<script language="JavaScript" type="text/javascript" src="'.$url.'"></script>';
         } else {
             global $_horde_script_files;
             $_horde_script_files[$app][] = array($file, $direct);
@@ -275,16 +275,16 @@ 
         global $_horde_script_files, $registry;
 
         if (!empty($_horde_script_files)) {
-            $base_url = Horde::url($registry->get('webroot', 'horde') . '/services/javascript.php');
+            $base_url = Horde::url($registry->get('webroot', 'horde').'/services/javascript.php');
             foreach ($_horde_script_files as $app => $files) {
                 foreach ($files as $file) {
                     if (!empty($file[1])) {
-                        $url = $file[0]{0} == '/' ? $registry->get('webroot', $app) . $file[0] : $registry->get('jsuri', $app) . '/' . $file[0];
-                        echo '<script language="JavaScript" type="text/javascript" src="' . Horde::url($url) . "\"></script>\n";
+                        $url = $file[0]{0} == '/' ? $registry->get('webroot', $app).$file[0] : $registry->get('jsuri', $app).'/'.$file[0];
+                        echo '<script language="JavaScript" type="text/javascript" src="'.Horde::url($url)."\"></script>\n";
                     } else {
                         $url = Util::addParameter($base_url, array('file' => $file[0],
                                                                    'app'  => $app));
-                        echo '<script language="JavaScript" type="text/javascript" src="' . $url . "\"></script>\n";
+                        echo '<script language="JavaScript" type="text/javascript" src="'.$url."\"></script>\n";
                     }
                 }
             }
@@ -301,11 +301,11 @@ 
         global $_horde_script_files, $registry;
 
         if (!empty($_horde_script_files)) {
-            $jsWrapper = $registry->get('fileroot', 'horde') . '/services/javascript.php';
+            $jsWrapper = $registry->get('fileroot', 'horde').'/services/javascript.php';
             foreach ($_horde_script_files as $app => $files) {
                 foreach ($files as $file) {
                     if (!empty($file[1])) {
-                        @readfile($file[0]{0} == '/' ? $registry->get('fileroot', $app) . $file[0] : $registry->get('jsfs', $app) . '/' . $file[0]);
+                        @readfile($file[0]{0} == '/' ? $registry->get('fileroot', $app).$file[0] : $registry->get('jsfs', $app).'/'.$file[0]);
                     } else {
                         $file = $file[0];
                         require $jsWrapper;
@@ -339,17 +339,17 @@ 
                 Horde::addScriptFile('open_help_win.js', 'horde');
                 return "javascript:open_help_win('$app');";
             } else {
-                $url = Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/help/', true);
+                $url = Horde::url($GLOBALS['registry']->get('webroot', 'horde').'/services/help/', true);
                 return Util::addParameter($url, array('module' => $app,
                                                       'show' => 'topics'));
             }
             break;
 
         case 'problem':
-            return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/problem.php?return_url=' . urlencode(Horde::selfUrl(true)));
+            return Horde::url($GLOBALS['registry']->get('webroot', 'horde').'/services/problem.php?return_url='.urlencode(Horde::selfUrl(true)));
 
         case 'logout':
-            return Auth::addLogoutParameters(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/login.php'), AUTH_REASON_LOGOUT);
+            return Auth::addLogoutParameters(Horde::url($GLOBALS['registry']->get('webroot', 'horde').'/login.php'), AUTH_REASON_LOGOUT);
 
         case 'login':
             return Auth::getLoginScreen('', $referrer ? Horde::selfUrl(true) : null);
@@ -357,7 +357,7 @@ 
         case 'options':
             global $conf;
             if (($conf['prefs']['driver'] != '') && ($conf['prefs']['driver'] != 'none')) {
-                return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=' . $app);
+                return Horde::url($GLOBALS['registry']->get('webroot', 'horde').'/services/prefs.php?app='.$app);
             }
             break;
         }
@@ -490,9 +490,9 @@ 
 
         if (!is_array($params) || !count($params)) {
             Horde::fatal(PEAR::raiseError(
-                sprintf(_("No configuration information specified for %s."), $name) . "\n\n" .
+                sprintf(_("No configuration information specified for %s."), $name)."\n\n".
                 sprintf(_("The file %s should contain some %s settings."),
-                    $fileroot . '/config/' . $file,
+                    $fileroot.'/config/'.$file,
                     sprintf("%s['%s']['params']", $variable, $driver))),
                 __FILE__, __LINE__);
         }
@@ -500,9 +500,9 @@ 
         foreach ($fields as $field) {
             if (!isset($params[$field])) {
                 Horde::fatal(PEAR::raiseError(
-                    sprintf(_("Required '%s' not specified in %s configuration."), $field, $name) . "\n\n" .
+                    sprintf(_("Required '%s' not specified in %s configuration."), $field, $name)."\n\n".
                     sprintf(_("The file %s should contain a %s setting."),
-                        $fileroot . '/config/' . $file,
+                        $fileroot.'/config/'.$file,
                         sprintf("%s['%s']['params']['%s']", $variable, $driver, $field))),
                     __FILE__, __LINE__);
             }
@@ -552,18 +552,18 @@ 
             if (!empty($server_port) &&
                 ((($protocol == 'http') && ($server_port != 80)) ||
                  (($protocol == 'https') && ($server_port != 443)))) {
-                $server_name .= ':' . $server_port;
+                $server_name .= ':'.$server_port;
             }
 
             /* Store the webroot in a local variable. */
             $webroot = $registry->get('webroot');
 
-            $url = $protocol . '://' . $server_name;
+            $url = $protocol.'://'.$server_name;
             if (substr($uri, 0, 1) != '/') {
                 if (substr($webroot, -1) == '/') {
-                    $url .= $webroot . $uri;
+                    $url .= $webroot.$uri;
                 } else {
-                    $url .= $webroot . '/' . $uri;
+                    $url .= $webroot.'/'.$uri;
                 }
             } else {
                 $url .= $uri;
@@ -613,9 +613,9 @@ 
         if ($full) {
             return Horde::url($uri, $full, $append_session);
         } elseif (substr($webroot, -1) == '/') {
-            return Horde::url($webroot . $uri, $full, $append_session);
+            return Horde::url($webroot.$uri, $full, $append_session);
         } else {
-            return Horde::url($webroot . '/' . $uri, $full, $append_session);
+            return Horde::url($webroot.'/'.$uri, $full, $append_session);
         }
     }
 
@@ -631,7 +631,7 @@ 
      */
     function externalUrl($url, $tag = false)
     {
-        $ext = Horde::url($GLOBALS['registry']->get('webroot', 'horde') .
+        $ext = Horde::url($GLOBALS['registry']->get('webroot', 'horde').
                           '/services/go.php', true, -1);
 
         /* We must make sure there are no &amp's in the URL. */
@@ -665,7 +665,7 @@ 
 
         if (is_null($url)) {
             global $registry;
-            $url = Util::addParameter(Horde::url($registry->get('webroot', 'horde') . '/services/download/'), 'module', $registry->getApp());
+            $url = Util::addParameter(Horde::url($registry->get('webroot', 'horde').'/services/download/'), 'module', $registry->getApp());
             $horde_url = true;
         }
 
@@ -681,7 +681,7 @@ 
          * many browsers, this should allow every browser to download
          * correctly. */
         if ($horde_url) {
-            $url = Util::addParameter($url, 'fn=/' . rawurlencode($filename));
+            $url = Util::addParameter($url, 'fn=/'.rawurlencode($filename));
         } elseif ($browser->hasQuirk('break_disposition_filename')) {
             /* Some browsers will only obtain the filename correctly
              * if the extension is the last argument in the query
@@ -698,16 +698,16 @@ 
              * functionality. */
             if (($server != 'apache2')) {
                 if (($pos = strrpos($filename, '.'))) {
-                    $name = '/' . preg_replace('/\./', '%2E', substr($filename, 0, $pos));
+                    $name = '/'.preg_replace('/\./', '%2E', substr($filename, 0, $pos));
                     $ext = substr($filename, $pos);
                 } else {
-                    $name = '/' . $filename;
+                    $name = '/'.$filename;
                     $ext = '';
                 }
 
                 /* Enter the PATH_INFO information. */
                 if (($pos = strpos($url, '?'))) {
-                    $url = substr($url, 0, $pos) . $name . substr($url, $pos);
+                    $url = substr($url, 0, $pos).$name.substr($url, $pos);
                 } else {
                     $url .= $name;
                 }
@@ -715,7 +715,7 @@ 
 
             /* Append the extension, if it exists. */
             if (($server == 'apache2') || !empty($ext)) {
-                $url = Util::addParameter($url, 'fn_ext=/' . $filename);
+                $url = Util::addParameter($url, 'fn_ext=/'.$filename);
             }
         }
 
@@ -747,7 +747,7 @@ 
             $ret .= " onclick=\"$onclick\"";
         }
         if (!empty($status)) {
-            $ret .= ' onmouseout="window.status=\'\';" onmouseover="window.status=\'' . @htmlspecialchars(strtr(addslashes($status), array("\r" => '', "\n" => '')), ENT_QUOTES, NLS::getCharset()) . '\'; return true;"';
+            $ret .= ' onmouseout="window.status=\'\';" onmouseover="window.status=\''.@htmlspecialchars(strtr(addslashes($status), array("\r" => '', "\n" => '')), ENT_QUOTES, NLS::getCharset()).'\'; return true;"';
         }
         if (!empty($class)) {
             $ret .= " class=\"$class\"";
@@ -756,14 +756,14 @@ 
             $ret .= " target=\"$target\"";
         }
         if (!empty($title)) {
-            $ret .= ' title="' . @htmlspecialchars($title, ENT_QUOTES, NLS::getCharset()) . '"';
+            $ret .= ' title="'.@htmlspecialchars($title, ENT_QUOTES, NLS::getCharset()).'"';
         }
         if (!empty($accesskey)) {
-            $ret .= ' accesskey="' . htmlspecialchars($accesskey) . '"';
+            $ret .= ' accesskey="'.htmlspecialchars($accesskey).'"';
         }
 
         foreach ($attributes as $name => $value) {
-            $ret .= ' ' . htmlspecialchars($name) . '="' . htmlspecialchars($value) . '"';
+            $ret .= ' '.htmlspecialchars($name).'="'.htmlspecialchars($value).'"';
         }
 
         return "$ret>";
@@ -792,7 +792,7 @@ 
         $ak = Horde::getAccessKey($title, $nocheck);
         $plaintitle = Horde::stripAccessKey($title);
 
-        return Horde::link($url, $status, $class, $target, $onclick, $plaintitle, $ak) . Horde::highlightAccessKey($title, $ak) . '</a>';
+        return Horde::link($url, $status, $class, $target, $onclick, $plaintitle, $ak).Horde::highlightAccessKey($title, $ak).'</a>';
     }
 
     /**
@@ -812,7 +812,7 @@ 
         $url = $_SERVER['PHP_SELF'];
 
         if ($query_string && !empty($_SERVER['QUERY_STRING'])) {
-            $url .= '?' . $_SERVER['QUERY_STRING'];
+            $url .= '?'.$_SERVER['QUERY_STRING'];
         }
 
         $url = Horde::url($url, $full, 0, $force_ssl);
@@ -853,7 +853,7 @@ 
 
         /* If a directory has been provided, prepend it to the image source. */
         if (!empty($dir)) {
-            $src = $dir . '/' . $src;
+            $src = $dir.'/'.$src;
         }
 
         /* Build all of the tag attributes. */
@@ -866,16 +866,16 @@ 
 
         $img = '<img';
         foreach ($attributes as $attribute => $value) {
-            $img .= ' ' . $attribute . '="' . ($attribute == 'src' ? $value : @htmlspecialchars($value, ENT_COMPAT, NLS::getCharset())) . '"';
+            $img .= ' '.$attribute.'="'.($attribute == 'src' ? $value : @htmlspecialchars($value, ENT_COMPAT, NLS::getCharset())).'"';
         }
 
         /* If the user supplied a pre-built string of attributes, add that. */
         if (is_string($attr) && !empty($attr)) {
-            $img .= ' ' . $attr;
+            $img .= ' '.$attr;
         }
 
         /* Return the closed image tag. */
-        return $img . ' />';
+        return $img.' />';
     }
 
     /**
@@ -1046,10 +1046,10 @@ 
         $themes_fs = $GLOBALS['registry']->get('themesfs', 'horde');
         if ($inherit) {
             $themes_uri = Horde::url($GLOBALS['registry']->get('themesuri', 'horde'), false, -1);
-            $css[] = $themes_uri . '/screen.css';
+            $css[] = $themes_uri.'/screen.css';
             if (!empty($theme) &&
-                file_exists($themes_fs . '/' . $theme . '/screen.css')) {
-                $css[] = $themes_uri . '/' . $theme . '/screen.css';
+                file_exists($themes_fs.'/'.$theme.'/screen.css')) {
+                $css[] = $themes_uri.'/'.$theme.'/screen.css';
             }
         }
 
@@ -1063,41 +1063,41 @@ 
                 }
 
                 $themes_fs = $GLOBALS['registry']->get('themesfs', $app);
-                if (file_exists($themes_fs . '/screen.css')) {
+                if (file_exists($themes_fs.'/screen.css')) {
                     $themes_uri = Horde::url($GLOBALS['registry']->get('themesuri', $app), false, -1);
-                    $css[] = $themes_uri . '/screen.css';
+                    $css[] = $themes_uri.'/screen.css';
                 }
                 if (!empty($theme) &&
-                    file_exists($themes_fs . '/' . $theme . '/screen.css')) {
-                    $css[] = $themes_uri . '/' . $theme . '/screen.css';
+                    file_exists($themes_fs.'/'.$theme.'/screen.css')) {
+                    $css[] = $themes_uri.'/'.$theme.'/screen.css';
                 }
             }
         }
 
         $html = '';
         foreach ($css as $css_link) {
-            $html .= '<link href="' . $css_link . '" rel="stylesheet" type="text/css" />' . "\n";
+            $html .= '<link href="'.$css_link.'" rel="stylesheet" type="text/css" />'."\n";
         }
 
         /* Load IE PNG transparency code if needed. */
         if ($GLOBALS['browser']->hasQuirk('png_transparency') &&
             $GLOBALS['prefs']->getValue('alpha_filter')) {
-            $url = Horde::url($GLOBALS['registry']->get('jsuri', 'horde') . '/alphaImageLoader.php', true, -1);
-            $html .= '<style type="text/css"> img { behavior: url("' . $url . '"); } </style>';
+            $url = Horde::url($GLOBALS['registry']->get('jsuri', 'horde').'/alphaImageLoader.php', true, -1);
+            $html .= '<style type="text/css"> img { behavior: url("'.$url.'"); } </style>';
         }
 
         /* Load browser specific stylesheets if needed. */
         if ($GLOBALS['browser']->isBrowser('msie')) {
-            $html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/ie.css" rel="stylesheet" type="text/css" />' . "\n";
+            $html .= '<link href="'.$GLOBALS['registry']->get('themesuri', 'horde').'/ie.css" rel="stylesheet" type="text/css" />'."\n";
             if ($GLOBALS['browser']->getPlatform() == 'mac') {
-                $html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/ie5mac.css" rel="stylesheet" type="text/css" />' . "\n";
+                $html .= '<link href="'.$GLOBALS['registry']->get('themesuri', 'horde').'/ie5mac.css" rel="stylesheet" type="text/css" />'."\n";
             }
         }
         if ($GLOBALS['browser']->isBrowser('opera')) {
-            $html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/opera.css" rel="stylesheet" type="text/css" />' . "\n";
+            $html .= '<link href="'.$GLOBALS['registry']->get('themesuri', 'horde').'/opera.css" rel="stylesheet" type="text/css" />'."\n";
         }
         if (strpos(strtolower($GLOBALS['browser']->getAgentString()), 'safari') !== false) {
-            $html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/safari.css" rel="stylesheet" type="text/css" />' . "\n";
+            $html .= '<link href="'.$GLOBALS['registry']->get('themesuri', 'horde').'/safari.css" rel="stylesheet" type="text/css" />'."\n";
         }
 
         return $html;
@@ -1178,10 +1178,10 @@ 
             $used = array_keys($_used);
             sort($used);
             $remaining = str_replace($used, array(), 'abcdefghijklmnopqrstuvwxyz');
-            Horde::logMessage('Access key information for ' . $script, __FILE__, __LINE__);
-            Horde::logMessage('Used labels: ' . implode(',', $labels), __FILE__, __LINE__);
-            Horde::logMessage('Used keys: ' . implode('', $used), __FILE__, __LINE__);
-            Horde::logMessage('Free keys: ' . $remaining, __FILE__, __LINE__);
+            Horde::logMessage('Access key information for '.$script, __FILE__, __LINE__);
+            Horde::logMessage('Used labels: '.implode(',', $labels), __FILE__, __LINE__);
+            Horde::logMessage('Used keys: '.implode('', $used), __FILE__, __LINE__);
+            Horde::logMessage('Free keys: '.$remaining, __FILE__, __LINE__);
             return;
         }
 
@@ -1223,7 +1223,7 @@ 
      */
     function stripAccessKey($label)
     {
-        include_once HORDE_BASE . '/config/nls.php';
+        include_once HORDE_BASE.'/config/nls.php';
         $multibyte = isset($GLOBALS['nls']['multibyte'][NLS::getCharset(true)]);
 
         return preg_replace('/_([A-Za-z])/',
@@ -1251,10 +1251,10 @@ 
         }
 
         if (isset($GLOBALS['nls']['multibyte'][NLS::getCharset(true)])) {
-            return $stripped_label . '(' . '<span class="accessKey">' .
-                strtoupper($accessKey) . '</span>' . ')';
+            return $stripped_label.'('.'<span class="accessKey">'.
+                strtoupper($accessKey).'</span>'.')';
         } else {
-            return str_replace('_' . $accessKey, '<span class="accessKey">' . $accessKey . '</span>', $label);
+            return str_replace('_'.$accessKey, '<span class="accessKey">'.$accessKey.'</span>', $label);
         }
     }
 
@@ -1272,10 +1272,10 @@ 
     function getAccessKeyAndTitle($label, $nocheck = false)
     {
         $ak = Horde::getAccessKey($label, $nocheck);
-        $attributes = 'title="' . Horde::stripAccessKey($label);
+        $attributes = 'title="'.Horde::stripAccessKey($label);
         if (!empty($ak)) {
             $attributes .= sprintf(_(" (Accesskey %s)"), $ak);
-            $attributes .= '" accesskey="' . $ak;
+            $attributes .= '" accesskey="'.$ak;
         }
         $attributes .= '"';
         return $attributes;
@@ -1303,7 +1303,7 @@ 
 
         return sprintf('<label for="%s"%s>%s</label>',
                        $for,
-                       !empty($ak) ? ' accesskey="' . $ak . '"' : '',
+                       !empty($ak) ? ' accesskey="'.$ak.'"' : '',
                        $label);
     }
 
@@ -1320,10 +1320,10 @@ 
             $cli->fatal(_("You are not authenticated."));
         }
 
-        $url = $GLOBALS['registry']->get('webroot', 'horde') . '/login.php';
+        $url = $GLOBALS['registry']->get('webroot', 'horde').'/login.php';
         $url = Util::addParameter($url, 'url', Horde::selfUrl(true));
         $url = Auth::addLogoutParameters($url);
-        header('Location: ' . Horde::url($url, true));
+        header('Location: '.Horde::url($url, true));
         exit;
     }
 
@@ -1362,8 +1362,8 @@ 
         if (strlen($title)) {
             require_once 'Horde/Text/Filter.php';
             $title = Text_Filter::filter($title, 'text2html', array('parselevel' => TEXT_HTML_NOHTML, 'charset' => '', 'class' => ''));
-            $title = '<pre style="margin:0px;">' . strtr(addslashes($title), array("\r" => '', "\n" => '')) . '</pre>';
-            $url .= ' onmouseover="tooltipLink(\'' . @htmlspecialchars($title, ENT_QUOTES, NLS::getCharset()) . '\', \'' . $status . '\'); return true;" onmouseout="tooltipClose();"';
+            $title = '<pre style="margin:0px;">'.strtr(addslashes($title), array("\r" => '', "\n" => '')).'</pre>';
+            $url .= ' onmouseover="tooltipLink(\''.@htmlspecialchars($title, ENT_QUOTES, NLS::getCharset()).'\', \''.$status.'\'); return true;" onmouseout="tooltipClose();"';
         }
         $url .= '>';
 
@@ -1396,8 +1396,8 @@ 
         static $hooks_loaded;
 
         if (!isset($hooks_loaded)) {
-            if (file_exists($registry->get('fileroot', $app) . '/config/hooks.php')) {
-                require_once $registry->get('fileroot', $app) . '/config/hooks.php';
+            if (file_exists($registry->get('fileroot', $app).'/config/hooks.php')) {
+                require_once $registry->get('fileroot', $app).'/config/hooks.php';
                 $hooks_loaded = true;
             } else {
                 $hooks_loaded = false;

Braces +364 added lines, -164 removed lines

@@ -20,7 +20,8 @@ 
  * @since   Horde 1.3
  * @package Horde_Framework
  */
-class Horde {
+class Horde
+{
 
     /**
      * Logs a message to the global Horde log backend.
@@ -48,29 +49,37 @@ 
     {
         global $conf;
 
-        if (!$conf['log']['enabled']) {
+        if (!$conf['log']['enabled'])
+        {
             return;
         }
 
-        if ($priority > $conf['log']['priority']) {
+        if ($priority > $conf['log']['priority'])
+        {
             return;
         }
 
         $logger = &Horde::getLogger();
-        if (!is_a($logger, 'Log')) {
+        if (!is_a($logger, 'Log'))
+        {
             Horde::fatal(PEAR::raiseError('An error has occurred. Furthermore, Horde encountered an error attempting to log this error. Please check your Horde logging configuration in horde/config/conf.php.'), __FILE__, __LINE__, false);
         }
 
-        if (is_a($message, 'PEAR_Error')) {
+        if (is_a($message, 'PEAR_Error'))
+        {
             $userinfo = $message->getUserInfo();
             $message = $message->getMessage();
-            if (!empty($userinfo)) {
-                if (is_array($userinfo)) {
+            if (!empty($userinfo))
+            {
+                if (is_array($userinfo))
+                {
                     $userinfo = implode(', ', $userinfo);
                 }
                 $message .= ': ' . $userinfo;
             }
-        } elseif (is_callable(array($message, 'getMessage'))) {
+        }
+        elseif (is_callable(array($message, 'getMessage')))
+        {
             $message = $message->getMessage();
         }
 
@@ -93,18 +102,21 @@ 
     {
         global $conf;
 
-        if (empty($conf['log']['enabled'])) {
+        if (empty($conf['log']['enabled']))
+        {
             return false;
         }
 
         static $logcheck;
-        if (!isset($logcheck)) {
+        if (!isset($logcheck))
+        {
             // Try to make sure that we can log messages somehow.
             if (empty($conf['log']) ||
                 empty($conf['log']['type']) ||
                 empty($conf['log']['name']) ||
                 empty($conf['log']['ident']) ||
-                !isset($conf['log']['params'])) {
+                !isset($conf['log']['params']))
+            {
                 Horde::fatal(PEAR::raiseError('Horde is not correctly configured to log error messages. You must configure at least a text file log in horde/config/conf.php.'), __FILE__, __LINE__, false);
             }
             $logcheck = true;
@@ -125,14 +137,20 @@ 
     {
         // Make sure to force a completely new session ID and clear
         // all session data.
-        if (version_compare(phpversion(), '4.3.3') !== -1) {
+        if (version_compare(phpversion(), '4.3.3') !== -1)
+        {
             session_regenerate_id();
             session_unset();
-        } else {
+        }
+        else
+        {
             @session_destroy();
-            if (Util::extensionExists('posix')) {
+            if (Util::extensionExists('posix'))
+            {
                 $new_session_id = md5(microtime() . posix_getpid());
-            } else {
+            }
+            else
+            {
                 $new_session_id = md5(uniqid(mt_rand(), true));
             }
             session_id($new_session_id);
@@ -164,11 +182,13 @@ 
         $cli = class_exists('Horde_CLI') && Horde_CLI::runningFromCLI();
 
         $errortext = '<h1>' . _("A fatal error has occurred") . '</h1>';
-        if (is_a($error, 'PEAR_Error')) {
+        if (is_a($error, 'PEAR_Error'))
+        {
             $info = array_merge(array('file' => 'conf.php', 'variable' => '$conf'),
                                 array($error->getUserInfo()));
 
-            switch ($error->getCode()) {
+            switch ($error->getCode())
+            {
             case HORDE_ERROR_DRIVER_CONFIG_MISSING:
                 $message = sprintf(_("No configuration information specified for %s."), $info['name']) . '<br />' .
                     sprintf(_("The file %s should contain some %s settings."),
@@ -189,30 +209,42 @@ 
             }
 
             $errortext .= '<h3>' . htmlspecialchars($message) . '</h3>';
-        } elseif (is_object($error) && method_exists($error, 'getMessage')) {
+        }
+        elseif (is_object($error) && method_exists($error, 'getMessage'))
+        {
             $errortext .= '<h3>' . htmlspecialchars($error->getMessage()) . '</h3>';
-        } elseif (is_string($error)) {
+        }
+        elseif (is_string($error))
+        {
             $errortext .= '<h3>' . $error . '</h3>';
         }
 
-        if ($admin) {
+        if ($admin)
+        {
             $errortext .= '<p><code>' . sprintf(_("[line %s of %s]"), $line, $file) . '</code></p>';
-            if (is_object($error)) {
+            if (is_object($error))
+            {
                 $errortext .= '<h3>' . _("Details (also in Horde's logfile):") . '</h3>';
                 $errortext .= '<p><pre>' . htmlspecialchars(Util::bufferOutput('var_dump', $error)) . '</pre></p>';
             }
-        } elseif ($log) {
+        }
+        elseif ($log)
+        {
             $errortext .= '<h3>' . _("Details have been logged for the administrator.") . '</h3>';
         }
 
         // Log the error via Horde::logMessage() if requested.
-        if ($log) {
+        if ($log)
+        {
             Horde::logMessage($error, $file, $line, PEAR_LOG_EMERG);
         }
 
-        if ($cli) {
+        if ($cli)
+        {
             echo strip_tags(str_replace(array('<br />', '<p>', '</p>', '<h1>', '</h1>', '<h3>', '</h3>'), "\n", $errortext));
-        } else {
+        }
+        else
+        {
             echo <<< HTML
 <html>
 <head><title>Horde :: Fatal Error</title></head>
@@ -240,26 +272,34 @@ 
         global $registry;
         static $included = array();
 
-        if (empty($app)) {
+        if (empty($app))
+        {
             $app = $registry->getApp();
         }
 
         // Don't include scripts multiple times.
-        if (!empty($included[$app][$file])) {
+        if (!empty($included[$app][$file]))
+        {
             return;
         }
         $included[$app][$file] = true;
 
-        if (ob_get_length() || headers_sent()) {
-            if ($direct) {
+        if (ob_get_length() || headers_sent())
+        {
+            if ($direct)
+            {
                 $url = Horde::url($file{0} == '/' ? $registry->get('webroot', $app) . $file : $registry->get('jsuri', $app) . '/' . $file);
-            } else {
+            }
+            else
+            {
                 $url = Horde::url($registry->get('webroot', 'horde') . '/services/javascript.php');
                 $url = Util::addParameter($url, array('file' => $file,
                                                       'app'  => $app));
             }
             echo '<script language="JavaScript" type="text/javascript" src="' . $url . '"></script>';
-        } else {
+        }
+        else
+        {
             global $_horde_script_files;
             $_horde_script_files[$app][] = array($file, $direct);
         }
@@ -274,14 +314,20 @@ 
     {
         global $_horde_script_files, $registry;
 
-        if (!empty($_horde_script_files)) {
+        if (!empty($_horde_script_files))
+        {
             $base_url = Horde::url($registry->get('webroot', 'horde') . '/services/javascript.php');
-            foreach ($_horde_script_files as $app => $files) {
-                foreach ($files as $file) {
-                    if (!empty($file[1])) {
+            foreach ($_horde_script_files as $app => $files)
+            {
+                foreach ($files as $file)
+                {
+                    if (!empty($file[1]))
+                    {
                         $url = $file[0]{0} == '/' ? $registry->get('webroot', $app) . $file[0] : $registry->get('jsuri', $app) . '/' . $file[0];
                         echo '<script language="JavaScript" type="text/javascript" src="' . Horde::url($url) . "\"></script>\n";
-                    } else {
+                    }
+                    else
+                    {
                         $url = Util::addParameter($base_url, array('file' => $file[0],
                                                                    'app'  => $app));
                         echo '<script language="JavaScript" type="text/javascript" src="' . $url . "\"></script>\n";
@@ -300,13 +346,19 @@ 
     {
         global $_horde_script_files, $registry;
 
-        if (!empty($_horde_script_files)) {
+        if (!empty($_horde_script_files))
+        {
             $jsWrapper = $registry->get('fileroot', 'horde') . '/services/javascript.php';
-            foreach ($_horde_script_files as $app => $files) {
-                foreach ($files as $file) {
-                    if (!empty($file[1])) {
+            foreach ($_horde_script_files as $app => $files)
+            {
+                foreach ($files as $file)
+                {
+                    if (!empty($file[1]))
+                    {
                         @readfile($file[0]{0} == '/' ? $registry->get('fileroot', $app) . $file[0] : $registry->get('jsfs', $app) . '/' . $file[0]);
-                    } else {
+                    }
+                    else
+                    {
                         $file = $file[0];
                         require $jsWrapper;
                     }
@@ -329,16 +381,21 @@ 
      */
     function getServiceLink($type, $app, $override = false, $referrer = true)
     {
-        if (!Horde::showService($type) && !$override) {
+        if (!Horde::showService($type) && !$override)
+        {
             return false;
         }
 
-        switch ($type) {
+        switch ($type)
+        {
         case 'help':
-            if ($GLOBALS['browser']->hasFeature('javascript')) {
+            if ($GLOBALS['browser']->hasFeature('javascript'))
+            {
                 Horde::addScriptFile('open_help_win.js', 'horde');
                 return "javascript:open_help_win('$app');";
-            } else {
+            }
+            else
+            {
                 $url = Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/help/', true);
                 return Util::addParameter($url, array('module' => $app,
                                                       'show' => 'topics'));
@@ -356,7 +413,8 @@ 
 
         case 'options':
             global $conf;
-            if (($conf['prefs']['driver'] != '') && ($conf['prefs']['driver'] != 'none')) {
+            if (($conf['prefs']['driver'] != '') && ($conf['prefs']['driver'] != 'none'))
+            {
                 return Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/prefs.php?app=' . $app);
             }
             break;
@@ -376,11 +434,13 @@ 
     {
         global $conf;
 
-        if (empty($conf['menu']['links'][$type])) {
+        if (empty($conf['menu']['links'][$type]))
+        {
             return false;
         }
 
-        switch ($conf['menu']['links'][$type]) {
+        switch ($conf['menu']['links'][$type])
+        {
         case 'all':
             return true;
 
@@ -412,16 +472,23 @@ 
         global $conf;
 
         $c = null;
-        if (is_array($backend)) {
+        if (is_array($backend))
+        {
             require_once 'Horde/Array.php';
             $c = Horde_Array::getElement($conf, $backend);
-        } elseif (isset($conf[$backend])) {
+        }
+        elseif (isset($conf[$backend]))
+        {
             $c = $conf[$backend];
         }
-        if (!is_null($c) && isset($c['params'])) {
-            if (isset($conf[$type])) {
+        if (!is_null($c) && isset($c['params']))
+        {
+            if (isset($conf[$type]))
+            {
                 return array_merge($conf[$type], $c['params']);
-            } else {
+            }
+            else
+            {
                 return $c['params'];
             }
         }
@@ -443,17 +510,22 @@ 
     {
         global $conf;
 
-        if (!isset($conf[$name]['type'])) {
+        if (!isset($conf[$name]['type']))
+        {
             return PEAR::raiseError(_("You must configure a VFS backend."));
         }
 
-        if ($conf[$name]['type'] == 'horde') {
+        if ($conf[$name]['type'] == 'horde')
+        {
             $vfs = $conf['vfs'];
-        } else {
+        }
+        else
+        {
             $vfs = $conf[$name];
         }
 
-        if ($vfs['type'] == 'sql') {
+        if ($vfs['type'] == 'sql')
+        {
             $vfs['params'] = Horde::getDriverConfig($name, 'sql');
         }
 
@@ -483,12 +555,14 @@ 
 
         // Don't generate a fatal error if we fail during or before
         // Registry instantiation.
-        if (is_null($name)) {
+        if (is_null($name))
+        {
             $name = isset($registry) ? $registry->getApp() : '[unknown]';
         }
         $fileroot = isset($registry) ? $registry->get('fileroot') : '';
 
-        if (!is_array($params) || !count($params)) {
+        if (!is_array($params) || !count($params))
+        {
             Horde::fatal(PEAR::raiseError(
                 sprintf(_("No configuration information specified for %s."), $name) . "\n\n" .
                 sprintf(_("The file %s should contain some %s settings."),
@@ -497,8 +571,10 @@ 
                 __FILE__, __LINE__);
         }
 
-        foreach ($fields as $field) {
-            if (!isset($params[$field])) {
+        foreach ($fields as $field)
+        {
+            if (!isset($params[$field]))
+            {
                 Horde::fatal(PEAR::raiseError(
                     sprintf(_("Required '%s' not specified in %s configuration."), $field, $name) . "\n\n" .
                     sprintf(_("The file %s should contain a %s setting."),
@@ -524,11 +600,13 @@ 
      */
     function url($uri, $full = false, $append_session = 0, $force_ssl = false)
     {
-        if ($force_ssl) {
+        if ($force_ssl)
+        {
             $full = true;
         }
 
-        if ($full) {
+        if ($full)
+        {
             global $conf, $registry, $browser;
 
             /* Store connection parameters in local variables. */
@@ -536,14 +614,20 @@ 
             $server_port = $conf['server']['port'];
 
             $protocol = 'http';
-            if ($conf['use_ssl'] == 1) {
+            if ($conf['use_ssl'] == 1)
+            {
                 $protocol = 'https';
-            } elseif ($conf['use_ssl'] == 2 &&
-                      $browser->usingSSLConnection()) {
+            }
+            elseif ($conf['use_ssl'] == 2 &&
+                      $browser->usingSSLConnection())
+            {
                 $protocol = 'https';
-            } elseif ($conf['use_ssl'] == 3) {
+            }
+            elseif ($conf['use_ssl'] == 3)
+            {
                 $server_port = '';
-                if ($force_ssl) {
+                if ($force_ssl)
+                {
                     $protocol = 'https';
                 }
             }
@@ -551,7 +635,8 @@ 
             /* If using non-standard ports, add the port to the URL. */
             if (!empty($server_port) &&
                 ((($protocol == 'http') && ($server_port != 80)) ||
-                 (($protocol == 'https') && ($server_port != 443)))) {
+                 (($protocol == 'https') && ($server_port != 443))))
+            {
                 $server_name .= ':' . $server_port;
             }
 
@@ -559,34 +644,48 @@ 
             $webroot = $registry->get('webroot');
 
             $url = $protocol . '://' . $server_name;
-            if (substr($uri, 0, 1) != '/') {
-                if (substr($webroot, -1) == '/') {
+            if (substr($uri, 0, 1) != '/')
+            {
+                if (substr($webroot, -1) == '/')
+                {
                     $url .= $webroot . $uri;
-                } else {
+                }
+                else
+                {
                     $url .= $webroot . '/' . $uri;
                 }
-            } else {
+            }
+            else
+            {
                 $url .= $uri;
             }
-        } else {
+        }
+        else
+        {
             $url = $uri;
         }
 
         if (($append_session == 1) ||
             (($append_session == 0) &&
-             !isset($_COOKIE[session_name()]))) {
+             !isset($_COOKIE[session_name()])))
+        {
             $url = Util::addParameter($url, session_name(), session_id());
         }
 
-        if ($full) {
+        if ($full)
+        {
             /* We need to run the replace twice, because we only catch every
              * second match. */
             return preg_replace(array('/(=?.*?)&amp;(.*?=)/',
                                       '/(=?.*?)&amp;(.*?=)/'),
                                 '$1&$2', $url);
-        } elseif (preg_match('/=.*&amp;.*=/', $url)) {
+        }
+        elseif (preg_match('/=.*&amp;.*=/', $url))
+        {
             return $url;
-        } else {
+        }
+        else
+        {
             return htmlentities($url);
         }
     }
@@ -610,11 +709,16 @@ 
         /* Store the webroot in a local variable. */
         $webroot = $registry->get('webroot');
 
-        if ($full) {
+        if ($full)
+        {
             return Horde::url($uri, $full, $append_session);
-        } elseif (substr($webroot, -1) == '/') {
+        }
+        elseif (substr($webroot, -1) == '/')
+        {
             return Horde::url($webroot . $uri, $full, $append_session);
-        } else {
+        }
+        else
+        {
             return Horde::url($webroot . '/' . $uri, $full, $append_session);
         }
     }
@@ -637,7 +741,8 @@ 
         /* We must make sure there are no &amp's in the URL. */
         $url = preg_replace(array('/(=?.*?)&amp;(.*?=)/', '/(=?.*?)&amp;(.*?=)/'), '$1&$2', $url);
         $ext = Util::addParameter($ext, 'url', $url);
-        if ($tag) {
+        if ($tag)
+        {
             $ext = Horde::link($ext, $url, '', '_blank');
         }
         return $ext;
@@ -663,15 +768,18 @@ 
 
         $horde_url = false;
 
-        if (is_null($url)) {
+        if (is_null($url))
+        {
             global $registry;
             $url = Util::addParameter(Horde::url($registry->get('webroot', 'horde') . '/services/download/'), 'module', $registry->getApp());
             $horde_url = true;
         }
 
         /* Add parameters. */
-        if (!is_null($params)) {
-            foreach ($params as $key => $val) {
+        if (!is_null($params))
+        {
+            foreach ($params as $key => $val)
+            {
                 $url = Util::addParameter($url, $key, $val);
             }
         }
@@ -680,9 +788,12 @@ 
          * filename to the end of the URL. Although not necessary for
          * many browsers, this should allow every browser to download
          * correctly. */
-        if ($horde_url) {
+        if ($horde_url)
+        {
             $url = Util::addParameter($url, 'fn=/' . rawurlencode($filename));
-        } elseif ($browser->hasQuirk('break_disposition_filename')) {
+        }
+        elseif ($browser->hasQuirk('break_disposition_filename'))
+        {
             /* Some browsers will only obtain the filename correctly
              * if the extension is the last argument in the query
              * string and rest of the filename appears in the
@@ -696,25 +807,33 @@ 
              * NOT support PATH_INFO information being passed to the
              * PHP module by default, so disable that
              * functionality. */
-            if (($server != 'apache2')) {
-                if (($pos = strrpos($filename, '.'))) {
+            if (($server != 'apache2'))
+            {
+                if (($pos = strrpos($filename, '.')))
+                {
                     $name = '/' . preg_replace('/\./', '%2E', substr($filename, 0, $pos));
                     $ext = substr($filename, $pos);
-                } else {
+                }
+                else
+                {
                     $name = '/' . $filename;
                     $ext = '';
                 }
 
                 /* Enter the PATH_INFO information. */
-                if (($pos = strpos($url, '?'))) {
+                if (($pos = strpos($url, '?')))
+                {
                     $url = substr($url, 0, $pos) . $name . substr($url, $pos);
-                } else {
+                }
+                else
+                {
                     $url .= $name;
                 }
             }
 
             /* Append the extension, if it exists. */
-            if (($server == 'apache2') || !empty($ext)) {
+            if (($server == 'apache2') || !empty($ext))
+            {
                 $url = Util::addParameter($url, 'fn_ext=/' . $filename);
             }
         }
@@ -743,26 +862,33 @@ 
                   $title = '', $accesskey = '', $attributes = array())
     {
         $ret = "<a href=\"$url\"";
-        if (!empty($onclick)) {
+        if (!empty($onclick))
+        {
             $ret .= " onclick=\"$onclick\"";
         }
-        if (!empty($status)) {
+        if (!empty($status))
+        {
             $ret .= ' onmouseout="window.status=\'\';" onmouseover="window.status=\'' . @htmlspecialchars(strtr(addslashes($status), array("\r" => '', "\n" => '')), ENT_QUOTES, NLS::getCharset()) . '\'; return true;"';
         }
-        if (!empty($class)) {
+        if (!empty($class))
+        {
             $ret .= " class=\"$class\"";
         }
-        if (!empty($target)) {
+        if (!empty($target))
+        {
             $ret .= " target=\"$target\"";
         }
-        if (!empty($title)) {
+        if (!empty($title))
+        {
             $ret .= ' title="' . @htmlspecialchars($title, ENT_QUOTES, NLS::getCharset()) . '"';
         }
-        if (!empty($accesskey)) {
+        if (!empty($accesskey))
+        {
             $ret .= ' accesskey="' . htmlspecialchars($accesskey) . '"';
         }
 
-        foreach ($attributes as $name => $value) {
+        foreach ($attributes as $name => $value)
+        {
             $ret .= ' ' . htmlspecialchars($name) . '="' . htmlspecialchars($value) . '"';
         }
 
@@ -811,15 +937,19 @@ 
     {
         $url = $_SERVER['PHP_SELF'];
 
-        if ($query_string && !empty($_SERVER['QUERY_STRING'])) {
+        if ($query_string && !empty($_SERVER['QUERY_STRING']))
+        {
             $url .= '?' . $_SERVER['QUERY_STRING'];
         }
 
         $url = Horde::url($url, $full, 0, $force_ssl);
 
-        if ($nocache) {
+        if ($nocache)
+        {
             return Util::nocacheUrl($url);
-        } else {
+        }
+        else
+        {
             return $url;
         }
     }
@@ -841,18 +971,21 @@ 
     function img($src, $alt = '', $attr = '', $dir = null)
     {
         /* If browser does not support images, simply return the ALT text. */
-        if (!$GLOBALS['browser']->hasFeature('images')) {
+        if (!$GLOBALS['browser']->hasFeature('images'))
+        {
             return @htmlspecialchars($alt, ENT_COMPAT, NLS::getCharset());
         }
 
         /* If no directory has been specified, get it from the registry. */
-        if ($dir === null) {
+        if ($dir === null)
+        {
             global $registry;
             $dir = $registry->getImageDir();
         }
 
         /* If a directory has been provided, prepend it to the image source. */
-        if (!empty($dir)) {
+        if (!empty($dir))
+        {
             $src = $dir . '/' . $src;
         }
 
@@ -860,17 +993,20 @@ 
         $attributes = array('src' => $src,
                             'alt' => $alt,
                             'title' => $alt);
-        if (is_array($attr)) {
+        if (is_array($attr))
+        {
             $attributes = array_merge($attributes, $attr);
         }
 
         $img = '<img';
-        foreach ($attributes as $attribute => $value) {
+        foreach ($attributes as $attribute => $value)
+        {
             $img .= ' ' . $attribute . '="' . ($attribute == 'src' ? $value : @htmlspecialchars($value, ENT_COMPAT, NLS::getCharset())) . '"';
         }
 
         /* If the user supplied a pre-built string of attributes, add that. */
-        if (is_string($attr) && !empty($attr)) {
+        if (is_string($attr) && !empty($attr))
+        {
             $img .= ' ' . $attr;
         }
 
@@ -892,12 +1028,14 @@ 
         global $conf;
 
         /* If one has been specifically set, then use that */
-        if (!empty($conf['tmpdir'])) {
+        if (!empty($conf['tmpdir']))
+        {
             $tmp = $conf['tmpdir'];
         }
 
         /* Next, try Util::getTempDir(). */
-        if (empty($tmp)) {
+        if (empty($tmp))
+        {
             $tmp = Util::getTempDir();
         }
 
@@ -925,7 +1063,8 @@ 
     function getTempFile($prefix = 'Horde', $delete = true, $dir = '',
                          $secure = false)
     {
-        if (empty($dir) || !is_dir($dir)) {
+        if (empty($dir) || !is_dir($dir))
+        {
             $dir = Horde::getTempDir();
         }
 
@@ -943,7 +1082,8 @@ 
     {
         static $started;
 
-        if (isset($started)) {
+        if (isset($started))
+        {
             return;
         }
 
@@ -951,8 +1091,10 @@ 
         if ($GLOBALS['conf']['compress_pages'] &&
             !$GLOBALS['browser']->hasQuirk('buggy_compression') &&
             ini_get('zlib.output_compression') == '' &&
-            ini_get('output_handler') != 'ob_gzhandler') {
-            if (ob_get_level()) {
+            ini_get('output_handler') != 'ob_gzhandler')
+        {
+            if (ob_get_level())
+            {
                 ob_end_clean();
             }
             ob_start('ob_gzhandler');
@@ -974,7 +1116,8 @@ 
         $browser = &Browser::singleton();
 
         /* Turn off compression for buggy browsers. */
-        if ($browser->hasQuirk('buggy_compression')) {
+        if ($browser->hasQuirk('buggy_compression'))
+        {
             return false;
         }
 
@@ -1013,12 +1156,17 @@ 
     {
         $server = php_sapi_name();
 
-        if ($server == 'apache') {
+        if ($server == 'apache')
+        {
             return 'apache1';
-        } elseif (($server == 'apache2filter') ||
-                  ($server == 'apache2handler')) {
+        }
+        elseif (($server == 'apache2filter') ||
+                  ($server == 'apache2handler'))
+        {
             return 'apache2';
-        } else {
+        }
+        else
+        {
             return $server;
         }
     }
@@ -1038,65 +1186,80 @@ 
      */
     function stylesheetLink($apps = null, $theme = '', $inherit = true)
     {
-        if ($theme !== false && empty($theme)) {
+        if ($theme !== false && empty($theme))
+        {
             $theme = $GLOBALS['prefs']->getValue('theme');
         }
 
         $css = array();
         $themes_fs = $GLOBALS['registry']->get('themesfs', 'horde');
-        if ($inherit) {
+        if ($inherit)
+        {
             $themes_uri = Horde::url($GLOBALS['registry']->get('themesuri', 'horde'), false, -1);
             $css[] = $themes_uri . '/screen.css';
             if (!empty($theme) &&
-                file_exists($themes_fs . '/' . $theme . '/screen.css')) {
+                file_exists($themes_fs . '/' . $theme . '/screen.css'))
+            {
                 $css[] = $themes_uri . '/' . $theme . '/screen.css';
             }
         }
 
-        if (!empty($apps)) {
-            if (!is_array($apps)) {
+        if (!empty($apps))
+        {
+            if (!is_array($apps))
+            {
                 $apps = array($apps);
             }
-            foreach ($apps as $app) {
-                if ($inherit && $app == 'horde') {
+            foreach ($apps as $app)
+            {
+                if ($inherit && $app == 'horde')
+                {
                     continue;
                 }
 
                 $themes_fs = $GLOBALS['registry']->get('themesfs', $app);
-                if (file_exists($themes_fs . '/screen.css')) {
+                if (file_exists($themes_fs . '/screen.css'))
+                {
                     $themes_uri = Horde::url($GLOBALS['registry']->get('themesuri', $app), false, -1);
                     $css[] = $themes_uri . '/screen.css';
                 }
                 if (!empty($theme) &&
-                    file_exists($themes_fs . '/' . $theme . '/screen.css')) {
+                    file_exists($themes_fs . '/' . $theme . '/screen.css'))
+                {
                     $css[] = $themes_uri . '/' . $theme . '/screen.css';
                 }
             }
         }
 
         $html = '';
-        foreach ($css as $css_link) {
+        foreach ($css as $css_link)
+        {
             $html .= '<link href="' . $css_link . '" rel="stylesheet" type="text/css" />' . "\n";
         }
 
         /* Load IE PNG transparency code if needed. */
         if ($GLOBALS['browser']->hasQuirk('png_transparency') &&
-            $GLOBALS['prefs']->getValue('alpha_filter')) {
+            $GLOBALS['prefs']->getValue('alpha_filter'))
+        {
             $url = Horde::url($GLOBALS['registry']->get('jsuri', 'horde') . '/alphaImageLoader.php', true, -1);
             $html .= '<style type="text/css"> img { behavior: url("' . $url . '"); } </style>';
         }
 
         /* Load browser specific stylesheets if needed. */
-        if ($GLOBALS['browser']->isBrowser('msie')) {
+        if ($GLOBALS['browser']->isBrowser('msie'))
+        {
             $html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/ie.css" rel="stylesheet" type="text/css" />' . "\n";
-            if ($GLOBALS['browser']->getPlatform() == 'mac') {
+            if ($GLOBALS['browser']->getPlatform() == 'mac')
+            {
                 $html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/ie5mac.css" rel="stylesheet" type="text/css" />' . "\n";
             }
         }
-        if ($GLOBALS['browser']->isBrowser('opera')) {
+        if ($GLOBALS['browser']->isBrowser('opera'))
+        {
             $html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/opera.css" rel="stylesheet" type="text/css" />' . "\n";
         }
-        if (strpos(strtolower($GLOBALS['browser']->getAgentString()), 'safari') !== false) {
+        if (strpos(strtolower($GLOBALS['browser']->getAgentString()), 'safari') !== false)
+        {
             $html .= '<link href="' . $GLOBALS['registry']->get('themesuri', 'horde') . '/safari.css" rel="stylesheet" type="text/css" />' . "\n";
         }
 
@@ -1120,7 +1283,8 @@ 
 
         $type = !empty($conf['sessionhandler']['type']) ? $conf['sessionhandler']['type'] : 'none';
 
-        if ($type == 'external') {
+        if ($type == 'external')
+        {
             $calls = $conf['sessionhandler']['params'];
             session_set_save_handler($calls['open'],
                                      $calls['close'],
@@ -1128,12 +1292,15 @@ 
                                      $calls['write'],
                                      $calls['destroy'],
                                      $calls['gc']);
-        } elseif ($type != 'none') {
+        }
+        elseif ($type != 'none')
+        {
             global $_session_handler;
             require_once 'Horde/SessionHandler.php';
             $_session_handler = &SessionHandler::singleton($conf['sessionhandler']['type']);
             if (!empty($_session_handler) &&
-                !is_a($_session_handler, 'PEAR_Error')) {
+                !is_a($_session_handler, 'PEAR_Error'))
+            {
                 ini_set('session.save_handler', 'user');
                 session_set_save_handler(array(&$_session_handler, 'open'),
                                          array(&$_session_handler, 'close'),
@@ -1141,7 +1308,9 @@ 
                                          array(&$_session_handler, 'write'),
                                          array(&$_session_handler, 'destroy'),
                                          array(&$_session_handler, 'gc'));
-            } else {
+            }
+            else
+            {
                 Horde::fatal(PEAR::raiseError('Horde is unable to correctly start the custom session handler.'), __FILE__, __LINE__, false);
             }
         }
@@ -1168,8 +1337,10 @@ 
         static $_labels = array();
 
         /* Shutdown call for translators? */
-        if ($shutdown) {
-            if (!count($_labels)) {
+        if ($shutdown)
+        {
+            if (!count($_labels))
+            {
                 return;
             }
             $script = basename($_SERVER['PHP_SELF']);
@@ -1187,19 +1358,22 @@ 
 
         /* Use access keys at all? */
         static $notsupported;
-        if (!isset($notsupported)) {
+        if (!isset($notsupported))
+        {
             $notsupported = !$GLOBALS['browser']->hasFeature('accesskey') ||
                 !$GLOBALS['prefs']->getValue('widget_accesskey');
         }
 
-        if ($notsupported || !preg_match('/_([A-Za-z])/', $label, $match)) {
+        if ($notsupported || !preg_match('/_([A-Za-z])/', $label, $match))
+        {
             return '';
         }
         $key = $match[1];
 
         /* Has this key already been used? */
         if (isset($_used[strtolower($key)]) &&
-            !($nocheck && isset($_labels[$label]))) {
+            !($nocheck && isset($_labels[$label])))
+        {
             return '';
         }
 
@@ -1246,14 +1420,18 @@ 
     {
         $stripped_label = Horde::stripAccesskey($label);
 
-        if (empty($accessKey)) {
+        if (empty($accessKey))
+        {
             return $stripped_label;
         }
 
-        if (isset($GLOBALS['nls']['multibyte'][NLS::getCharset(true)])) {
+        if (isset($GLOBALS['nls']['multibyte'][NLS::getCharset(true)]))
+        {
             return $stripped_label . '(' . '<span class="accessKey">' .
                 strtoupper($accessKey) . '</span>' . ')';
-        } else {
+        }
+        else
+        {
             return str_replace('_' . $accessKey, '<span class="accessKey">' . $accessKey . '</span>', $label);
         }
     }
@@ -1273,7 +1451,8 @@ 
     {
         $ak = Horde::getAccessKey($label, $nocheck);
         $attributes = 'title="' . Horde::stripAccessKey($label);
-        if (!empty($ak)) {
+        if (!empty($ak))
+        {
             $attributes .= sprintf(_(" (Accesskey %s)"), $ak);
             $attributes .= '" accesskey="' . $ak;
         }
@@ -1296,7 +1475,8 @@ 
     {
         global $prefs;
 
-        if (is_null($ak)) {
+        if (is_null($ak))
+        {
             $ak = Horde::getAccesskey($label, 1);
         }
         $label = Horde::highlightAccessKey($label, $ak);
@@ -1315,7 +1495,8 @@ 
     function authenticationFailureRedirect()
     {
         require_once 'Horde/CLI.php';
-        if (Horde_CLI::runningFromCLI()) {
+        if (Horde_CLI::runningFromCLI())
+        {
             $cli = &Horde_CLI::singleton();
             $cli->fatal(_("You are not authenticated."));
         }
@@ -1354,12 +1535,14 @@ 
     {
         $url = substr(Horde::link($url, null, $class, $target, $onclick, null, $accesskey, $attributes), 0, -1);
 
-        if (strlen($status)) {
+        if (strlen($status))
+        {
             $status = @htmlspecialchars(addslashes($status), ENT_QUOTES, NLS::getCharset());
         }
 
         $title = trim($title);
-        if (strlen($title)) {
+        if (strlen($title))
+        {
             require_once 'Horde/Text/Filter.php';
             $title = Text_Filter::filter($title, 'text2html', array('parselevel' => TEXT_HTML_NOHTML, 'charset' => '', 'class' => ''));
             $title = '<pre style="margin:0px;">' . strtr(addslashes($title), array("\r" => '', "\n" => '')) . '</pre>';
@@ -1395,19 +1578,25 @@ 
         global $registry;
         static $hooks_loaded;
 
-        if (!isset($hooks_loaded)) {
-            if (file_exists($registry->get('fileroot', $app) . '/config/hooks.php')) {
+        if (!isset($hooks_loaded))
+        {
+            if (file_exists($registry->get('fileroot', $app) . '/config/hooks.php'))
+            {
                 require_once $registry->get('fileroot', $app) . '/config/hooks.php';
                 $hooks_loaded = true;
-            } else {
+            }
+            else
+            {
                 $hooks_loaded = false;
             }
         }
-        if ($hooks_loaded && function_exists($hook)) {
+        if ($hooks_loaded && function_exists($hook))
+        {
             return call_user_func_array($hook, $args);
         }
 
-        if (is_string($error) && strcmp($error, 'PEAR_Error') == 0) {
+        if (is_string($error) && strcmp($error, 'PEAR_Error') == 0)
+        {
             $error = PEAR::raiseError(sprintf('Hook %s in application %s not called.', $hook, $app));
             Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG);
         }
@@ -1425,13 +1614,20 @@ 
         global $prefs, $registry, $perms;
 
         $initial_app = $prefs->getValue('initial_application');
-        if (!empty($initial_app) && $registry->hasPermission($initial_app)) {
+        if (!empty($initial_app) && $registry->hasPermission($initial_app))
+        {
             return Horde::url($registry->getInitialPage($initial_app), true);
-        } elseif (isset($registry->applications['horde']['initial_page'])) {
+        }
+        elseif (isset($registry->applications['horde']['initial_page']))
+        {
             return Horde::applicationUrl($registry->applications['horde']['initial_page'], true);
-        } elseif (Auth::getAuth()) {
+        }
+        elseif (Auth::getAuth())
+        {
             return Horde::applicationUrl('services/portal/', true);
-        } else {
+        }
+        else
+        {
             return Horde::applicationUrl('login.php', true);
         }
     }
@@ -1451,9 +1647,12 @@ 
          * prefs this will default to that application. Otherwise it will go
          * to the portal screen. */
         $initial_app = $prefs->getValue('initial_application');
-        if (!empty($initial_app)) {
+        if (!empty($initial_app))
+        {
             $url = Horde::url($registry->getInitialPage($initial_app));
-        } else {
+        }
+        else
+        {
             $url = Horde::applicationUrl('services/portal/');
         }
         $menu[] = array('url' => $url,
@@ -1461,7 +1660,8 @@ 
                         'icon' => 'horde.png',
                         'icon_path' => $registry->getImageDir());
 
-        if (Auth::isAdmin()) {
+        if (Auth::isAdmin())
+        {
             $menu[] = array('url' => Horde::applicationUrl('admin/'),
                             'text' =>  _("_Administration"),
                             'icon' => 'administration.png',

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -218,7 +218,7 @@
 <head><title>Horde :: Fatal Error</title></head>
 <body style="background-color: white; color: black;">$errortext</body>
 </html>
-HTML;
+html;
         }
         exit;
     }

phpgwapi/inc/horde/Horde/Date.php

Doc Comments +8 added lines, -3 removed lines

@@ -181,6 +181,8 @@ 
 
     /**
      * @static
+     * @param integer $month
+     * @param integer $year
      */
     function daysInMonth($month, $year)
     {
@@ -243,7 +245,7 @@ 
      *
      * @since Horde 3.2
      *
-     * @return integer  The week number.
+     * @return double  The week number.
      */
     function weekOfMonth()
     {
@@ -253,7 +255,7 @@ 
     /**
      * Returns the week of the year, first Monday is first day of first week.
      *
-     * @return integer  The week number.
+     * @return string  The week number.
      */
     function weekOfYear()
     {
@@ -267,7 +269,7 @@ 
      *
      * @param integer $year  The year to count the number of weeks in.
      *
-     * @return integer $numWeeks   The number of weeks in $year.
+     * @return string $numWeeks   The number of weeks in $year.
      */
     function weeksInYear($year)
     {
@@ -668,6 +670,9 @@ 
      * This does NOT work with pre-1970 daylight saving times.
      *
      * @static
+     * @param integer $hr
+     * @param integer $min
+     * @param integer $sec
      */
     function _mktime($hr, $min, $sec, $mon = false, $day = false,
                      $year = false, $is_dst = false, $is_gmt = false)

Indentation +728 added lines, -728 removed lines

@@ -37,733 +37,733 @@
  */
 class Horde_Date {
 
-    /**
-     * Year
-     *
-     * @var integer
-     */
-    var $year;
-
-    /**
-     * Month
-     *
-     * @var integer
-     */
-    var $month;
-
-    /**
-     * Day
-     *
-     * @var integer
-     */
-    var $mday;
-
-    /**
-     * Hour
-     *
-     * @var integer
-     */
-    var $hour = 0;
-
-    /**
-     * Minute
-     *
-     * @var integer
-     */
-    var $min = 0;
-
-    /**
-     * Second
-     *
-     * @var integer
-     */
-    var $sec = 0;
-
-    /**
-     * Internally supported strftime() specifiers.
-     *
-     * @var string
-     */
-    var $_supportedSpecs = '%CdDeHImMnRStTyY';
-
-    /**
-     * Build a new date object. If $date contains date parts, use them to
-     * initialize the object.
-     *
-     * Recognized formats:
-     * - arrays with keys 'year', 'month', 'mday', 'day' (since Horde 3.2),
-     *   'hour', 'min', 'minute' (since Horde 3.2), 'sec'
-     * - objects with properties 'year', 'month', 'mday', 'hour', 'min', 'sec'
-     * - yyyy-mm-dd hh:mm:ss (since Horde 3.1)
-     * - yyyymmddhhmmss (since Horde 3.1)
-     * - yyyymmddThhmmssZ (since Horde 3.1.4)
-     * - unix timestamps
-     */
-    function Horde_Date($date = null)
-    {
-        if (function_exists('nl_langinfo')) {
-            $this->_supportedSpecs .= 'bBpxX';
-        }
-
-        if (is_array($date) || is_object($date)) {
-            foreach ($date as $key => $val) {
-                if (in_array($key, array('year', 'month', 'mday', 'hour', 'min', 'sec'))) {
-                    $this->$key = (int)$val;
-                }
-            }
-
-            // If $date['day'] is present and numeric we may have been passed
-            // a Horde_Form_datetime array.
-            if (is_array($date) && isset($date['day']) &&
-                is_numeric($date['day'])) {
-                $this->mday = (int)$date['day'];
-            }
-            // 'minute' key also from Horde_Form_datetime
-            if (is_array($date) && isset($date['minute'])) {
-                $this->min = $date['minute'];
-            }
-        } elseif (!is_null($date)) {
-            // Match YYYY-MM-DD HH:MM:SS, YYYYMMDDHHMMSS and YYYYMMDD'T'HHMMSS'Z'.
-            if (preg_match('/(\d{4})-?(\d{2})-?(\d{2})T? ?(\d{2}):?(\d{2}):?(\d{2})Z?/', $date, $parts)) {
-                $this->year = (int)$parts[1];
-                $this->month = (int)$parts[2];
-                $this->mday = (int)$parts[3];
-                $this->hour = (int)$parts[4];
-                $this->min = (int)$parts[5];
-                $this->sec = (int)$parts[6];
-            } else {
-                // Try as a timestamp.
-                $parts = @getdate($date);
-                if ($parts) {
-                    $this->year = $parts['year'];
-                    $this->month = $parts['mon'];
-                    $this->mday = $parts['mday'];
-                    $this->hour = $parts['hours'];
-                    $this->min = $parts['minutes'];
-                    $this->sec = $parts['seconds'];
-                }
-            }
-        }
-    }
-
-    /**
-     * @static
-     */
-    function isLeapYear($year)
-    {
-        if (strlen($year) != 4 || preg_match('/\D/', $year)) {
-            return false;
-        }
-
-        return (($year % 4 == 0 && $year % 100 != 0) || $year % 400 == 0);
-    }
-
-    /**
-     * Returns the day of the year (1-366) that corresponds to the
-     * first day of the given week.
-     *
-     * TODO: with PHP 5.1+, see http://derickrethans.nl/calculating_start_and_end_dates_of_a_week.php
-     *
-     * @param integer $week  The week of the year to find the first day of.
-     * @param integer $year  The year to calculate for.
-     *
-     * @return integer  The day of the year of the first day of the given week.
-     */
-    function firstDayOfWeek($week, $year)
-    {
-        $jan1 = new Horde_Date(array('year' => $year, 'month' => 1, 'mday' => 1));
-        $start = $jan1->dayOfWeek();
-        if ($start > HORDE_DATE_THURSDAY) {
-            $start -= 7;
-        }
-        return (($week * 7) - (7 + $start)) + 1;
-    }
-
-    /**
-     * @static
-     */
-    function daysInMonth($month, $year)
-    {
-        if ($month == 2) {
-            if (Horde_Date::isLeapYear($year)) {
-                return 29;
-            } else {
-                return 28;
-            }
-        } elseif ($month == 4 || $month == 6 || $month == 9 || $month == 11) {
-            return 30;
-        } else {
-            return 31;
-        }
-    }
-
-    /**
-     * Return the day of the week (0 = Sunday, 6 = Saturday) of this
-     * object's date.
-     *
-     * @return integer  The day of the week.
-     */
-    function dayOfWeek()
-    {
-        if ($this->month > 2) {
-            $month = $this->month - 2;
-            $year = $this->year;
-        } else {
-            $month = $this->month + 10;
-            $year = $this->year - 1;
-        }
-
-        $day = (floor((13 * $month - 1) / 5) +
-                $this->mday + ($year % 100) +
-                floor(($year % 100) / 4) +
-                floor(($year / 100) / 4) - 2 *
-                floor($year / 100) + 77);
-
-        return (int)($day - 7 * floor($day / 7));
-    }
-
-    /**
-     * Returns the day number of the year (1 to 365/366).
-     *
-     * @return integer  The day of the year.
-     */
-    function dayOfYear()
-    {
-        $monthTotals = array(0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334);
-        $dayOfYear = $this->mday + $monthTotals[$this->month - 1];
-        if (Horde_Date::isLeapYear($this->year) && $this->month > 2) {
-            ++$dayOfYear;
-        }
-
-        return $dayOfYear;
-    }
-
-    /**
-     * Returns the week of the month.
-     *
-     * @since Horde 3.2
-     *
-     * @return integer  The week number.
-     */
-    function weekOfMonth()
-    {
-        return ceil($this->mday / 7);
-    }
-
-    /**
-     * Returns the week of the year, first Monday is first day of first week.
-     *
-     * @return integer  The week number.
-     */
-    function weekOfYear()
-    {
-        return $this->format('W');
-    }
-
-    /**
-     * Return the number of weeks in the given year (52 or 53).
-     *
-     * @static
-     *
-     * @param integer $year  The year to count the number of weeks in.
-     *
-     * @return integer $numWeeks   The number of weeks in $year.
-     */
-    function weeksInYear($year)
-    {
-        // Find the last Thursday of the year.
-        $day = 31;
-        $date = new Horde_Date(array('year' => $year, 'month' => 12, 'mday' => $day, 'hour' => 0, 'min' => 0, 'sec' => 0));
-        while ($date->dayOfWeek() != HORDE_DATE_THURSDAY) {
-            --$date->mday;
-        }
-        return $date->weekOfYear();
-    }
-
-    /**
-     * Set the date of this object to the $nth weekday of $weekday.
-     *
-     * @param integer $weekday  The day of the week (0 = Sunday, etc).
-     * @param integer $nth      The $nth $weekday to set to (defaults to 1).
-     */
-    function setNthWeekday($weekday, $nth = 1)
-    {
-        if ($weekday < HORDE_DATE_SUNDAY || $weekday > HORDE_DATE_SATURDAY) {
-            return false;
-        }
-
-        $this->mday = 1;
-        $first = $this->dayOfWeek();
-        if ($weekday < $first) {
-            $this->mday = 8 + $weekday - $first;
-        } else {
-            $this->mday = $weekday - $first + 1;
-        }
-        $this->mday += 7 * $nth - 7;
-
-        $this->correct();
-
-        return true;
-    }
-
-    function dump($prefix = '')
-    {
-        echo ($prefix ? $prefix . ': ' : '') . $this->year . '-' . $this->month . '-' . $this->mday . "<br />\n";
-    }
-
-    /**
-     * Is the date currently represented by this object a valid date?
-     *
-     * @return boolean  Validity, counting leap years, etc.
-     */
-    function isValid()
-    {
-        if ($this->year < 0 || $this->year > 9999) {
-            return false;
-        }
-        return checkdate($this->month, $this->mday, $this->year);
-    }
-
-    /**
-     * Correct any over- or underflows in any of the date's members.
-     *
-     * @param integer $mask  We may not want to correct some overflows.
-     */
-    function correct($mask = HORDE_DATE_MASK_ALLPARTS)
-    {
-        if ($mask & HORDE_DATE_MASK_SECOND) {
-            while ($this->sec < 0) {
-                --$this->min;
-                $this->sec += 60;
-            }
-            while ($this->sec > 59) {
-                ++$this->min;
-                $this->sec -= 60;
-            }
-        }
-
-        if ($mask & HORDE_DATE_MASK_MINUTE) {
-            while ($this->min < 0) {
-                --$this->hour;
-                $this->min += 60;
-            }
-            while ($this->min > 59) {
-                ++$this->hour;
-                $this->min -= 60;
-            }
-        }
-
-        if ($mask & HORDE_DATE_MASK_HOUR) {
-            while ($this->hour < 0) {
-                --$this->mday;
-                $this->hour += 24;
-            }
-            while ($this->hour > 23) {
-                ++$this->mday;
-                $this->hour -= 24;
-            }
-        }
-
-        if ($mask & HORDE_DATE_MASK_MONTH) {
-            while ($this->month > 12) {
-                ++$this->year;
-                $this->month -= 12;
-            }
-            while ($this->month < 1) {
-                --$this->year;
-                $this->month += 12;
-            }
-        }
-
-        if ($mask & HORDE_DATE_MASK_DAY) {
-            while ($this->mday > Horde_Date::daysInMonth($this->month, $this->year)) {
-                $this->mday -= Horde_Date::daysInMonth($this->month, $this->year);
-                ++$this->month;
-                $this->correct(HORDE_DATE_MASK_MONTH);
-            }
-            while ($this->mday < 1) {
-                --$this->month;
-                $this->correct(HORDE_DATE_MASK_MONTH);
-                $this->mday += Horde_Date::daysInMonth($this->month, $this->year);
-            }
-        }
-    }
-
-    /**
-     * Compare this date to another date object to see which one is
-     * greater (later). Assumes that the dates are in the same
-     * timezone.
-     *
-     * @param mixed $date  The date to compare to.
-     *
-     * @return integer  ==  0 if the dates are equal
-     *                  >=  1 if this date is greater (later)
-     *                  <= -1 if the other date is greater (later)
-     */
-    function compareDate($date)
-    {
-        if (!is_a($date, 'Horde_Date')) {
-            $date = new Horde_Date($date);
-        }
-
-        if ($this->year != $date->year) {
-            return $this->year - $date->year;
-        }
-        if ($this->month != $date->month) {
-            return $this->month - $date->month;
-        }
-
-        return $this->mday - $date->mday;
-    }
-
-    /**
-     * Compare this to another date object by time, to see which one
-     * is greater (later). Assumes that the dates are in the same
-     * timezone.
-     *
-     * @param mixed $date  The date to compare to.
-     *
-     * @return integer  ==  0 if the dates are equal
-     *                  >=  1 if this date is greater (later)
-     *                  <= -1 if the other date is greater (later)
-     */
-    function compareTime($date)
-    {
-        if (!is_a($date, 'Horde_Date')) {
-            $date = new Horde_Date($date);
-        }
-
-        if ($this->hour != $date->hour) {
-            return $this->hour - $date->hour;
-        }
-        if ($this->min != $date->min) {
-            return $this->min - $date->min;
-        }
-
-        return $this->sec - $date->sec;
-    }
-
-    /**
-     * Compare this to another date object, including times, to see
-     * which one is greater (later). Assumes that the dates are in the
-     * same timezone.
-     *
-     * @param mixed $date  The date to compare to.
-     *
-     * @return integer  ==  0 if the dates are equal
-     *                  >=  1 if this date is greater (later)
-     *                  <= -1 if the other date is greater (later)
-     */
-    function compareDateTime($date)
-    {
-        if (!is_a($date, 'Horde_Date')) {
-            $date = new Horde_Date($date);
-        }
-
-        if ($diff = $this->compareDate($date)) {
-            return $diff;
-        }
-
-        return $this->compareTime($date);
-    }
-
-    /**
-     * Get the time offset for local time zone.
-     *
-     * @param boolean $colon  Place a colon between hours and minutes?
-     *
-     * @return string  Timezone offset as a string in the format +HH:MM.
-     */
-    function tzOffset($colon = true)
-    {
-        $secs = $this->format('Z');
-
-        if ($secs < 0) {
-            $sign = '-';
-            $secs = -$secs;
-        } else {
-            $sign = '+';
-        }
-        $colon = $colon ? ':' : '';
-        $mins = intval(($secs + 30) / 60);
-        return sprintf('%s%02d%s%02d',
-                       $sign, $mins / 60, $colon, $mins % 60);
-    }
-
-    /**
-     * Return the unix timestamp representation of this date.
-     *
-     * @return integer  A unix timestamp.
-     */
-    function timestamp()
-    {
-        if (class_exists('DateTime')) {
-            return $this->format('U');
-        } else {
-            return Horde_Date::_mktime($this->hour, $this->min, $this->sec, $this->month, $this->mday, $this->year);
-        }
-    }
-
-    /**
-     * Return the unix timestamp representation of this date, 12:00am.
-     *
-     * @return integer  A unix timestamp.
-     */
-    function datestamp()
-    {
-        if (class_exists('DateTime')) {
-            $dt = new DateTime();
-            $dt->setDate($this->year, $this->month, $this->mday);
-            $dt->setTime(0, 0, 0);
-            return $dt->format('U');
-        } else {
-            return Horde_Date::_mktime(0, 0, 0, $this->month, $this->mday, $this->year);
-        }
-    }
-
-    /**
-     * Format time using the specifiers available in date() or in the DateTime
-     * class' format() method.
-     *
-     * @since Horde 3.3
-     *
-     * @param string $format
-     *
-     * @return string  Formatted time.
-     */
-    function format($format)
-    {
-        if (class_exists('DateTime')) {
-            $dt = new DateTime();
-            $dt->setDate($this->year, $this->month, $this->mday);
-            $dt->setTime($this->hour, $this->min, $this->sec);
-            return $dt->format($format);
-        } else {
-            return date($format, $this->timestamp());
-        }
-    }
-
-    /**
-     * Format time in ISO-8601 format. Works correctly since Horde 3.2.
-     *
-     * @return string  Date and time in ISO-8601 format.
-     */
-    function iso8601DateTime()
-    {
-        return $this->rfc3339DateTime() . $this->tzOffset();
-    }
-
-    /**
-     * Format time in RFC 2822 format.
-     *
-     * @return string  Date and time in RFC 2822 format.
-     */
-    function rfc2822DateTime()
-    {
-        return $this->format('D, j M Y H:i:s') . ' ' . $this->tzOffset(false);
-    }
-
-    /**
-     * Format time in RFC 3339 format.
-     *
-     * @since Horde 3.1
-     *
-     * @return string  Date and time in RFC 3339 format. The seconds part has
-     *                 been added with Horde 3.2.
-     */
-    function rfc3339DateTime()
-    {
-        return $this->format('Y-m-d\TH:i:s');
-    }
-
-    /**
-     * Format time to standard 'ctime' format.
-     *
-     * @return string  Date and time.
-     */
-    function cTime()
-    {
-        return $this->format('D M j H:i:s Y');
-    }
-
-    /**
-     * Format date and time using strftime() format.
-     *
-     * @since Horde 3.1
-     *
-     * @return string  strftime() formatted date and time.
-     */
-    function strftime($format)
-    {
-        if (preg_match('/%[^' . $this->_supportedSpecs . ']/', $format)) {
-            return strftime($format, $this->timestamp());
-        } else {
-            return $this->_strftime($format);
-        }
-    }
-
-    /**
-     * Format date and time using a limited set of the strftime() format.
-     *
-     * @return string  strftime() formatted date and time.
-     */
-    function _strftime($format)
-    {
-        if (preg_match('/%[bBpxX]/', $format)) {
-            require_once 'Horde/NLS.php';
-        }
-
-        return preg_replace(
-            array('/%b/e',
-                  '/%B/e',
-                  '/%C/e',
-                  '/%d/e',
-                  '/%D/e',
-                  '/%e/e',
-                  '/%H/e',
-                  '/%I/e',
-                  '/%m/e',
-                  '/%M/e',
-                  '/%n/',
-                  '/%p/e',
-                  '/%R/e',
-                  '/%S/e',
-                  '/%t/',
-                  '/%T/e',
-                  '/%x/e',
-                  '/%X/e',
-                  '/%y/e',
-                  '/%Y/',
-                  '/%%/'),
-            array('$this->_strftime(NLS::getLangInfo(constant(\'ABMON_\' . (int)$this->month)))',
-                  '$this->_strftime(NLS::getLangInfo(constant(\'MON_\' . (int)$this->month)))',
-                  '(int)($this->year / 100)',
-                  'sprintf(\'%02d\', $this->mday)',
-                  '$this->_strftime(\'%m/%d/%y\')',
-                  'sprintf(\'%2d\', $this->mday)',
-                  'sprintf(\'%02d\', $this->hour)',
-                  'sprintf(\'%02d\', $this->hour == 0 ? 12 : ($this->hour > 12 ? $this->hour - 12 : $this->hour))',
-                  'sprintf(\'%02d\', $this->month)',
-                  'sprintf(\'%02d\', $this->min)',
-                  "\n",
-                  '$this->_strftime(NLS::getLangInfo($this->hour < 12 ? AM_STR : PM_STR))',
-                  '$this->_strftime(\'%H:%M\')',
-                  'sprintf(\'%02d\', $this->sec)',
-                  "\t",
-                  '$this->_strftime(\'%H:%M:%S\')',
-                  '$this->_strftime(NLS::getLangInfo(D_FMT))',
-                  '$this->_strftime(NLS::getLangInfo(T_FMT))',
-                  'substr(sprintf(\'%04d\', $this->year), -2)',
-                  (int)$this->year,
-                  '%'),
-            $format);
-    }
-
-    /**
-     * mktime() implementation that supports dates outside of 1970-2038,
-     * from http://phplens.com/phpeverywhere/adodb_date_library.
-     *
-     * @TODO remove in Horde 4
-     *
-     * This does NOT work with pre-1970 daylight saving times.
-     *
-     * @static
-     */
-    function _mktime($hr, $min, $sec, $mon = false, $day = false,
-                     $year = false, $is_dst = false, $is_gmt = false)
-    {
-        if ($mon === false) {
-            return $is_gmt
-                ? @gmmktime($hr, $min, $sec)
-                : @mktime($hr, $min, $sec);
-        }
-
-        if ($year > 1901 && $year < 2038 &&
-            ($year >= 1970 || version_compare(PHP_VERSION, '5.0.0', '>='))) {
-            return $is_gmt
-                ? @gmmktime($hr, $min, $sec, $mon, $day, $year)
-                : @mktime($hr, $min, $sec, $mon, $day, $year);
-        }
-
-        $gmt_different = $is_gmt
-            ? 0
-            : (mktime(0, 0, 0, 1, 2, 1970, 0) - gmmktime(0, 0, 0, 1, 2, 1970, 0));
-
-        $mon = intval($mon);
-        $day = intval($day);
-        $year = intval($year);
-
-        if ($mon > 12) {
-            $y = floor($mon / 12);
-            $year += $y;
-            $mon -= $y * 12;
-        } elseif ($mon < 1) {
-            $y = ceil((1 - $mon) / 12);
-            $year -= $y;
-            $mon += $y * 12;
-        }
-
-        $_day_power = 86400;
-        $_hour_power = 3600;
-        $_min_power = 60;
-
-        $_month_table_normal = array('', 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-        $_month_table_leaf = array('', 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-
-        $_total_date = 0;
-        if ($year >= 1970) {
-            for ($a = 1970; $a <= $year; $a++) {
-                $leaf = Horde_Date::isLeapYear($a);
-                if ($leaf == true) {
-                    $loop_table = $_month_table_leaf;
-                    $_add_date = 366;
-                } else {
-                    $loop_table = $_month_table_normal;
-                    $_add_date = 365;
-                }
-                if ($a < $year) {
-                    $_total_date += $_add_date;
-                } else {
-                    for ($b = 1; $b < $mon; $b++) {
-                        $_total_date += $loop_table[$b];
-                    }
-                }
-            }
-
-            return ($_total_date + $day - 1) * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
-        }
-
-        for ($a = 1969 ; $a >= $year; $a--) {
-            $leaf = Horde_Date::isLeapYear($a);
-            if ($leaf == true) {
-                $loop_table = $_month_table_leaf;
-                $_add_date = 366;
-            } else {
-                $loop_table = $_month_table_normal;
-                $_add_date = 365;
-            }
-            if ($a > $year) {
-                $_total_date += $_add_date;
-            } else {
-                for ($b = 12; $b > $mon; $b--) {
-                    $_total_date += $loop_table[$b];
-                }
-            }
-        }
-
-        $_total_date += $loop_table[$mon] - $day;
-        $_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
-        $_day_time = $_day_power - $_day_time;
-        $ret = -($_total_date * $_day_power + $_day_time - $gmt_different);
-        if ($ret < -12220185600) {
-            // If earlier than 5 Oct 1582 - gregorian correction.
-            return $ret + 10 * 86400;
-        } elseif ($ret < -12219321600) {
-            // If in limbo, reset to 15 Oct 1582.
-            return -12219321600;
-        } else {
-            return $ret;
-        }
-    }
+	/**
+	 * Year
+	 *
+	 * @var integer
+	 */
+	var $year;
+
+	/**
+	 * Month
+	 *
+	 * @var integer
+	 */
+	var $month;
+
+	/**
+	 * Day
+	 *
+	 * @var integer
+	 */
+	var $mday;
+
+	/**
+	 * Hour
+	 *
+	 * @var integer
+	 */
+	var $hour = 0;
+
+	/**
+	 * Minute
+	 *
+	 * @var integer
+	 */
+	var $min = 0;
+
+	/**
+	 * Second
+	 *
+	 * @var integer
+	 */
+	var $sec = 0;
+
+	/**
+	 * Internally supported strftime() specifiers.
+	 *
+	 * @var string
+	 */
+	var $_supportedSpecs = '%CdDeHImMnRStTyY';
+
+	/**
+	 * Build a new date object. If $date contains date parts, use them to
+	 * initialize the object.
+	 *
+	 * Recognized formats:
+	 * - arrays with keys 'year', 'month', 'mday', 'day' (since Horde 3.2),
+	 *   'hour', 'min', 'minute' (since Horde 3.2), 'sec'
+	 * - objects with properties 'year', 'month', 'mday', 'hour', 'min', 'sec'
+	 * - yyyy-mm-dd hh:mm:ss (since Horde 3.1)
+	 * - yyyymmddhhmmss (since Horde 3.1)
+	 * - yyyymmddThhmmssZ (since Horde 3.1.4)
+	 * - unix timestamps
+	 */
+	function Horde_Date($date = null)
+	{
+		if (function_exists('nl_langinfo')) {
+			$this->_supportedSpecs .= 'bBpxX';
+		}
+
+		if (is_array($date) || is_object($date)) {
+			foreach ($date as $key => $val) {
+				if (in_array($key, array('year', 'month', 'mday', 'hour', 'min', 'sec'))) {
+					$this->$key = (int)$val;
+				}
+			}
+
+			// If $date['day'] is present and numeric we may have been passed
+			// a Horde_Form_datetime array.
+			if (is_array($date) && isset($date['day']) &&
+				is_numeric($date['day'])) {
+				$this->mday = (int)$date['day'];
+			}
+			// 'minute' key also from Horde_Form_datetime
+			if (is_array($date) && isset($date['minute'])) {
+				$this->min = $date['minute'];
+			}
+		} elseif (!is_null($date)) {
+			// Match YYYY-MM-DD HH:MM:SS, YYYYMMDDHHMMSS and YYYYMMDD'T'HHMMSS'Z'.
+			if (preg_match('/(\d{4})-?(\d{2})-?(\d{2})T? ?(\d{2}):?(\d{2}):?(\d{2})Z?/', $date, $parts)) {
+				$this->year = (int)$parts[1];
+				$this->month = (int)$parts[2];
+				$this->mday = (int)$parts[3];
+				$this->hour = (int)$parts[4];
+				$this->min = (int)$parts[5];
+				$this->sec = (int)$parts[6];
+			} else {
+				// Try as a timestamp.
+				$parts = @getdate($date);
+				if ($parts) {
+					$this->year = $parts['year'];
+					$this->month = $parts['mon'];
+					$this->mday = $parts['mday'];
+					$this->hour = $parts['hours'];
+					$this->min = $parts['minutes'];
+					$this->sec = $parts['seconds'];
+				}
+			}
+		}
+	}
+
+	/**
+	 * @static
+	 */
+	function isLeapYear($year)
+	{
+		if (strlen($year) != 4 || preg_match('/\D/', $year)) {
+			return false;
+		}
+
+		return (($year % 4 == 0 && $year % 100 != 0) || $year % 400 == 0);
+	}
+
+	/**
+	 * Returns the day of the year (1-366) that corresponds to the
+	 * first day of the given week.
+	 *
+	 * TODO: with PHP 5.1+, see http://derickrethans.nl/calculating_start_and_end_dates_of_a_week.php
+	 *
+	 * @param integer $week  The week of the year to find the first day of.
+	 * @param integer $year  The year to calculate for.
+	 *
+	 * @return integer  The day of the year of the first day of the given week.
+	 */
+	function firstDayOfWeek($week, $year)
+	{
+		$jan1 = new Horde_Date(array('year' => $year, 'month' => 1, 'mday' => 1));
+		$start = $jan1->dayOfWeek();
+		if ($start > HORDE_DATE_THURSDAY) {
+			$start -= 7;
+		}
+		return (($week * 7) - (7 + $start)) + 1;
+	}
+
+	/**
+	 * @static
+	 */
+	function daysInMonth($month, $year)
+	{
+		if ($month == 2) {
+			if (Horde_Date::isLeapYear($year)) {
+				return 29;
+			} else {
+				return 28;
+			}
+		} elseif ($month == 4 || $month == 6 || $month == 9 || $month == 11) {
+			return 30;
+		} else {
+			return 31;
+		}
+	}
+
+	/**
+	 * Return the day of the week (0 = Sunday, 6 = Saturday) of this
+	 * object's date.
+	 *
+	 * @return integer  The day of the week.
+	 */
+	function dayOfWeek()
+	{
+		if ($this->month > 2) {
+			$month = $this->month - 2;
+			$year = $this->year;
+		} else {
+			$month = $this->month + 10;
+			$year = $this->year - 1;
+		}
+
+		$day = (floor((13 * $month - 1) / 5) +
+				$this->mday + ($year % 100) +
+				floor(($year % 100) / 4) +
+				floor(($year / 100) / 4) - 2 *
+				floor($year / 100) + 77);
+
+		return (int)($day - 7 * floor($day / 7));
+	}
+
+	/**
+	 * Returns the day number of the year (1 to 365/366).
+	 *
+	 * @return integer  The day of the year.
+	 */
+	function dayOfYear()
+	{
+		$monthTotals = array(0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334);
+		$dayOfYear = $this->mday + $monthTotals[$this->month - 1];
+		if (Horde_Date::isLeapYear($this->year) && $this->month > 2) {
+			++$dayOfYear;
+		}
+
+		return $dayOfYear;
+	}
+
+	/**
+	 * Returns the week of the month.
+	 *
+	 * @since Horde 3.2
+	 *
+	 * @return integer  The week number.
+	 */
+	function weekOfMonth()
+	{
+		return ceil($this->mday / 7);
+	}
+
+	/**
+	 * Returns the week of the year, first Monday is first day of first week.
+	 *
+	 * @return integer  The week number.
+	 */
+	function weekOfYear()
+	{
+		return $this->format('W');
+	}
+
+	/**
+	 * Return the number of weeks in the given year (52 or 53).
+	 *
+	 * @static
+	 *
+	 * @param integer $year  The year to count the number of weeks in.
+	 *
+	 * @return integer $numWeeks   The number of weeks in $year.
+	 */
+	function weeksInYear($year)
+	{
+		// Find the last Thursday of the year.
+		$day = 31;
+		$date = new Horde_Date(array('year' => $year, 'month' => 12, 'mday' => $day, 'hour' => 0, 'min' => 0, 'sec' => 0));
+		while ($date->dayOfWeek() != HORDE_DATE_THURSDAY) {
+			--$date->mday;
+		}
+		return $date->weekOfYear();
+	}
+
+	/**
+	 * Set the date of this object to the $nth weekday of $weekday.
+	 *
+	 * @param integer $weekday  The day of the week (0 = Sunday, etc).
+	 * @param integer $nth      The $nth $weekday to set to (defaults to 1).
+	 */
+	function setNthWeekday($weekday, $nth = 1)
+	{
+		if ($weekday < HORDE_DATE_SUNDAY || $weekday > HORDE_DATE_SATURDAY) {
+			return false;
+		}
+
+		$this->mday = 1;
+		$first = $this->dayOfWeek();
+		if ($weekday < $first) {
+			$this->mday = 8 + $weekday - $first;
+		} else {
+			$this->mday = $weekday - $first + 1;
+		}
+		$this->mday += 7 * $nth - 7;
+
+		$this->correct();
+
+		return true;
+	}
+
+	function dump($prefix = '')
+	{
+		echo ($prefix ? $prefix . ': ' : '') . $this->year . '-' . $this->month . '-' . $this->mday . "<br />\n";
+	}
+
+	/**
+	 * Is the date currently represented by this object a valid date?
+	 *
+	 * @return boolean  Validity, counting leap years, etc.
+	 */
+	function isValid()
+	{
+		if ($this->year < 0 || $this->year > 9999) {
+			return false;
+		}
+		return checkdate($this->month, $this->mday, $this->year);
+	}
+
+	/**
+	 * Correct any over- or underflows in any of the date's members.
+	 *
+	 * @param integer $mask  We may not want to correct some overflows.
+	 */
+	function correct($mask = HORDE_DATE_MASK_ALLPARTS)
+	{
+		if ($mask & HORDE_DATE_MASK_SECOND) {
+			while ($this->sec < 0) {
+				--$this->min;
+				$this->sec += 60;
+			}
+			while ($this->sec > 59) {
+				++$this->min;
+				$this->sec -= 60;
+			}
+		}
+
+		if ($mask & HORDE_DATE_MASK_MINUTE) {
+			while ($this->min < 0) {
+				--$this->hour;
+				$this->min += 60;
+			}
+			while ($this->min > 59) {
+				++$this->hour;
+				$this->min -= 60;
+			}
+		}
+
+		if ($mask & HORDE_DATE_MASK_HOUR) {
+			while ($this->hour < 0) {
+				--$this->mday;
+				$this->hour += 24;
+			}
+			while ($this->hour > 23) {
+				++$this->mday;
+				$this->hour -= 24;
+			}
+		}
+
+		if ($mask & HORDE_DATE_MASK_MONTH) {
+			while ($this->month > 12) {
+				++$this->year;
+				$this->month -= 12;
+			}
+			while ($this->month < 1) {
+				--$this->year;
+				$this->month += 12;
+			}
+		}
+
+		if ($mask & HORDE_DATE_MASK_DAY) {
+			while ($this->mday > Horde_Date::daysInMonth($this->month, $this->year)) {
+				$this->mday -= Horde_Date::daysInMonth($this->month, $this->year);
+				++$this->month;
+				$this->correct(HORDE_DATE_MASK_MONTH);
+			}
+			while ($this->mday < 1) {
+				--$this->month;
+				$this->correct(HORDE_DATE_MASK_MONTH);
+				$this->mday += Horde_Date::daysInMonth($this->month, $this->year);
+			}
+		}
+	}
+
+	/**
+	 * Compare this date to another date object to see which one is
+	 * greater (later). Assumes that the dates are in the same
+	 * timezone.
+	 *
+	 * @param mixed $date  The date to compare to.
+	 *
+	 * @return integer  ==  0 if the dates are equal
+	 *                  >=  1 if this date is greater (later)
+	 *                  <= -1 if the other date is greater (later)
+	 */
+	function compareDate($date)
+	{
+		if (!is_a($date, 'Horde_Date')) {
+			$date = new Horde_Date($date);
+		}
+
+		if ($this->year != $date->year) {
+			return $this->year - $date->year;
+		}
+		if ($this->month != $date->month) {
+			return $this->month - $date->month;
+		}
+
+		return $this->mday - $date->mday;
+	}
+
+	/**
+	 * Compare this to another date object by time, to see which one
+	 * is greater (later). Assumes that the dates are in the same
+	 * timezone.
+	 *
+	 * @param mixed $date  The date to compare to.
+	 *
+	 * @return integer  ==  0 if the dates are equal
+	 *                  >=  1 if this date is greater (later)
+	 *                  <= -1 if the other date is greater (later)
+	 */
+	function compareTime($date)
+	{
+		if (!is_a($date, 'Horde_Date')) {
+			$date = new Horde_Date($date);
+		}
+
+		if ($this->hour != $date->hour) {
+			return $this->hour - $date->hour;
+		}
+		if ($this->min != $date->min) {
+			return $this->min - $date->min;
+		}
+
+		return $this->sec - $date->sec;
+	}
+
+	/**
+	 * Compare this to another date object, including times, to see
+	 * which one is greater (later). Assumes that the dates are in the
+	 * same timezone.
+	 *
+	 * @param mixed $date  The date to compare to.
+	 *
+	 * @return integer  ==  0 if the dates are equal
+	 *                  >=  1 if this date is greater (later)
+	 *                  <= -1 if the other date is greater (later)
+	 */
+	function compareDateTime($date)
+	{
+		if (!is_a($date, 'Horde_Date')) {
+			$date = new Horde_Date($date);
+		}
+
+		if ($diff = $this->compareDate($date)) {
+			return $diff;
+		}
+
+		return $this->compareTime($date);
+	}
+
+	/**
+	 * Get the time offset for local time zone.
+	 *
+	 * @param boolean $colon  Place a colon between hours and minutes?
+	 *
+	 * @return string  Timezone offset as a string in the format +HH:MM.
+	 */
+	function tzOffset($colon = true)
+	{
+		$secs = $this->format('Z');
+
+		if ($secs < 0) {
+			$sign = '-';
+			$secs = -$secs;
+		} else {
+			$sign = '+';
+		}
+		$colon = $colon ? ':' : '';
+		$mins = intval(($secs + 30) / 60);
+		return sprintf('%s%02d%s%02d',
+					   $sign, $mins / 60, $colon, $mins % 60);
+	}
+
+	/**
+	 * Return the unix timestamp representation of this date.
+	 *
+	 * @return integer  A unix timestamp.
+	 */
+	function timestamp()
+	{
+		if (class_exists('DateTime')) {
+			return $this->format('U');
+		} else {
+			return Horde_Date::_mktime($this->hour, $this->min, $this->sec, $this->month, $this->mday, $this->year);
+		}
+	}
+
+	/**
+	 * Return the unix timestamp representation of this date, 12:00am.
+	 *
+	 * @return integer  A unix timestamp.
+	 */
+	function datestamp()
+	{
+		if (class_exists('DateTime')) {
+			$dt = new DateTime();
+			$dt->setDate($this->year, $this->month, $this->mday);
+			$dt->setTime(0, 0, 0);
+			return $dt->format('U');
+		} else {
+			return Horde_Date::_mktime(0, 0, 0, $this->month, $this->mday, $this->year);
+		}
+	}
+
+	/**
+	 * Format time using the specifiers available in date() or in the DateTime
+	 * class' format() method.
+	 *
+	 * @since Horde 3.3
+	 *
+	 * @param string $format
+	 *
+	 * @return string  Formatted time.
+	 */
+	function format($format)
+	{
+		if (class_exists('DateTime')) {
+			$dt = new DateTime();
+			$dt->setDate($this->year, $this->month, $this->mday);
+			$dt->setTime($this->hour, $this->min, $this->sec);
+			return $dt->format($format);
+		} else {
+			return date($format, $this->timestamp());
+		}
+	}
+
+	/**
+	 * Format time in ISO-8601 format. Works correctly since Horde 3.2.
+	 *
+	 * @return string  Date and time in ISO-8601 format.
+	 */
+	function iso8601DateTime()
+	{
+		return $this->rfc3339DateTime() . $this->tzOffset();
+	}
+
+	/**
+	 * Format time in RFC 2822 format.
+	 *
+	 * @return string  Date and time in RFC 2822 format.
+	 */
+	function rfc2822DateTime()
+	{
+		return $this->format('D, j M Y H:i:s') . ' ' . $this->tzOffset(false);
+	}
+
+	/**
+	 * Format time in RFC 3339 format.
+	 *
+	 * @since Horde 3.1
+	 *
+	 * @return string  Date and time in RFC 3339 format. The seconds part has
+	 *                 been added with Horde 3.2.
+	 */
+	function rfc3339DateTime()
+	{
+		return $this->format('Y-m-d\TH:i:s');
+	}
+
+	/**
+	 * Format time to standard 'ctime' format.
+	 *
+	 * @return string  Date and time.
+	 */
+	function cTime()
+	{
+		return $this->format('D M j H:i:s Y');
+	}
+
+	/**
+	 * Format date and time using strftime() format.
+	 *
+	 * @since Horde 3.1
+	 *
+	 * @return string  strftime() formatted date and time.
+	 */
+	function strftime($format)
+	{
+		if (preg_match('/%[^' . $this->_supportedSpecs . ']/', $format)) {
+			return strftime($format, $this->timestamp());
+		} else {
+			return $this->_strftime($format);
+		}
+	}
+
+	/**
+	 * Format date and time using a limited set of the strftime() format.
+	 *
+	 * @return string  strftime() formatted date and time.
+	 */
+	function _strftime($format)
+	{
+		if (preg_match('/%[bBpxX]/', $format)) {
+			require_once 'Horde/NLS.php';
+		}
+
+		return preg_replace(
+			array('/%b/e',
+				  '/%B/e',
+				  '/%C/e',
+				  '/%d/e',
+				  '/%D/e',
+				  '/%e/e',
+				  '/%H/e',
+				  '/%I/e',
+				  '/%m/e',
+				  '/%M/e',
+				  '/%n/',
+				  '/%p/e',
+				  '/%R/e',
+				  '/%S/e',
+				  '/%t/',
+				  '/%T/e',
+				  '/%x/e',
+				  '/%X/e',
+				  '/%y/e',
+				  '/%Y/',
+				  '/%%/'),
+			array('$this->_strftime(NLS::getLangInfo(constant(\'ABMON_\' . (int)$this->month)))',
+				  '$this->_strftime(NLS::getLangInfo(constant(\'MON_\' . (int)$this->month)))',
+				  '(int)($this->year / 100)',
+				  'sprintf(\'%02d\', $this->mday)',
+				  '$this->_strftime(\'%m/%d/%y\')',
+				  'sprintf(\'%2d\', $this->mday)',
+				  'sprintf(\'%02d\', $this->hour)',
+				  'sprintf(\'%02d\', $this->hour == 0 ? 12 : ($this->hour > 12 ? $this->hour - 12 : $this->hour))',
+				  'sprintf(\'%02d\', $this->month)',
+				  'sprintf(\'%02d\', $this->min)',
+				  "\n",
+				  '$this->_strftime(NLS::getLangInfo($this->hour < 12 ? AM_STR : PM_STR))',
+				  '$this->_strftime(\'%H:%M\')',
+				  'sprintf(\'%02d\', $this->sec)',
+				  "\t",
+				  '$this->_strftime(\'%H:%M:%S\')',
+				  '$this->_strftime(NLS::getLangInfo(D_FMT))',
+				  '$this->_strftime(NLS::getLangInfo(T_FMT))',
+				  'substr(sprintf(\'%04d\', $this->year), -2)',
+				  (int)$this->year,
+				  '%'),
+			$format);
+	}
+
+	/**
+	 * mktime() implementation that supports dates outside of 1970-2038,
+	 * from http://phplens.com/phpeverywhere/adodb_date_library.
+	 *
+	 * @TODO remove in Horde 4
+	 *
+	 * This does NOT work with pre-1970 daylight saving times.
+	 *
+	 * @static
+	 */
+	function _mktime($hr, $min, $sec, $mon = false, $day = false,
+					 $year = false, $is_dst = false, $is_gmt = false)
+	{
+		if ($mon === false) {
+			return $is_gmt
+				? @gmmktime($hr, $min, $sec)
+				: @mktime($hr, $min, $sec);
+		}
+
+		if ($year > 1901 && $year < 2038 &&
+			($year >= 1970 || version_compare(PHP_VERSION, '5.0.0', '>='))) {
+			return $is_gmt
+				? @gmmktime($hr, $min, $sec, $mon, $day, $year)
+				: @mktime($hr, $min, $sec, $mon, $day, $year);
+		}
+
+		$gmt_different = $is_gmt
+			? 0
+			: (mktime(0, 0, 0, 1, 2, 1970, 0) - gmmktime(0, 0, 0, 1, 2, 1970, 0));
+
+		$mon = intval($mon);
+		$day = intval($day);
+		$year = intval($year);
+
+		if ($mon > 12) {
+			$y = floor($mon / 12);
+			$year += $y;
+			$mon -= $y * 12;
+		} elseif ($mon < 1) {
+			$y = ceil((1 - $mon) / 12);
+			$year -= $y;
+			$mon += $y * 12;
+		}
+
+		$_day_power = 86400;
+		$_hour_power = 3600;
+		$_min_power = 60;
+
+		$_month_table_normal = array('', 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+		$_month_table_leaf = array('', 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+
+		$_total_date = 0;
+		if ($year >= 1970) {
+			for ($a = 1970; $a <= $year; $a++) {
+				$leaf = Horde_Date::isLeapYear($a);
+				if ($leaf == true) {
+					$loop_table = $_month_table_leaf;
+					$_add_date = 366;
+				} else {
+					$loop_table = $_month_table_normal;
+					$_add_date = 365;
+				}
+				if ($a < $year) {
+					$_total_date += $_add_date;
+				} else {
+					for ($b = 1; $b < $mon; $b++) {
+						$_total_date += $loop_table[$b];
+					}
+				}
+			}
+
+			return ($_total_date + $day - 1) * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
+		}
+
+		for ($a = 1969 ; $a >= $year; $a--) {
+			$leaf = Horde_Date::isLeapYear($a);
+			if ($leaf == true) {
+				$loop_table = $_month_table_leaf;
+				$_add_date = 366;
+			} else {
+				$loop_table = $_month_table_normal;
+				$_add_date = 365;
+			}
+			if ($a > $year) {
+				$_total_date += $_add_date;
+			} else {
+				for ($b = 12; $b > $mon; $b--) {
+					$_total_date += $loop_table[$b];
+				}
+			}
+		}
+
+		$_total_date += $loop_table[$mon] - $day;
+		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
+		$_day_time = $_day_power - $_day_time;
+		$ret = -($_total_date * $_day_power + $_day_time - $gmt_different);
+		if ($ret < -12220185600) {
+			// If earlier than 5 Oct 1582 - gregorian correction.
+			return $ret + 10 * 86400;
+		} elseif ($ret < -12219321600) {
+			// If in limbo, reset to 15 Oct 1582.
+			return -12219321600;
+		} else {
+			return $ret;
+		}
+	}
 
 }

Spacing +27 added lines, -27 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 
-define('HORDE_DATE_SUNDAY',    0);
-define('HORDE_DATE_MONDAY',    1);
-define('HORDE_DATE_TUESDAY',   2);
+define('HORDE_DATE_SUNDAY', 0);
+define('HORDE_DATE_MONDAY', 1);
+define('HORDE_DATE_TUESDAY', 2);
 define('HORDE_DATE_WEDNESDAY', 3);
-define('HORDE_DATE_THURSDAY',  4);
-define('HORDE_DATE_FRIDAY',    5);
-define('HORDE_DATE_SATURDAY',  6);
+define('HORDE_DATE_THURSDAY', 4);
+define('HORDE_DATE_FRIDAY', 5);
+define('HORDE_DATE_SATURDAY', 6);
 
-define('HORDE_DATE_MASK_SUNDAY',    1);
-define('HORDE_DATE_MASK_MONDAY',    2);
-define('HORDE_DATE_MASK_TUESDAY',   4);
+define('HORDE_DATE_MASK_SUNDAY', 1);
+define('HORDE_DATE_MASK_MONDAY', 2);
+define('HORDE_DATE_MASK_TUESDAY', 4);
 define('HORDE_DATE_MASK_WEDNESDAY', 8);
 define('HORDE_DATE_MASK_THURSDAY', 16);
-define('HORDE_DATE_MASK_FRIDAY',   32);
+define('HORDE_DATE_MASK_FRIDAY', 32);
 define('HORDE_DATE_MASK_SATURDAY', 64);
 define('HORDE_DATE_MASK_WEEKDAYS', 62);
-define('HORDE_DATE_MASK_WEEKEND',  65);
+define('HORDE_DATE_MASK_WEEKEND', 65);
 define('HORDE_DATE_MASK_ALLDAYS', 127);
 
-define('HORDE_DATE_MASK_SECOND',    1);
-define('HORDE_DATE_MASK_MINUTE',    2);
-define('HORDE_DATE_MASK_HOUR',      4);
-define('HORDE_DATE_MASK_DAY',       8);
-define('HORDE_DATE_MASK_MONTH',    16);
-define('HORDE_DATE_MASK_YEAR',     32);
+define('HORDE_DATE_MASK_SECOND', 1);
+define('HORDE_DATE_MASK_MINUTE', 2);
+define('HORDE_DATE_MASK_HOUR', 4);
+define('HORDE_DATE_MASK_DAY', 8);
+define('HORDE_DATE_MASK_MONTH', 16);
+define('HORDE_DATE_MASK_YEAR', 32);
 define('HORDE_DATE_MASK_ALLPARTS', 63);
 
 /**
@@ -308,7 +308,7 @@ 
 
     function dump($prefix = '')
     {
-        echo ($prefix ? $prefix . ': ' : '') . $this->year . '-' . $this->month . '-' . $this->mday . "<br />\n";
+        echo ($prefix ? $prefix.': ' : '').$this->year.'-'.$this->month.'-'.$this->mday."<br />\n";
     }
 
     /**
@@ -331,7 +331,7 @@ 
      */
     function correct($mask = HORDE_DATE_MASK_ALLPARTS)
     {
-        if ($mask & HORDE_DATE_MASK_SECOND) {
+        if ($mask&HORDE_DATE_MASK_SECOND) {
             while ($this->sec < 0) {
                 --$this->min;
                 $this->sec += 60;
@@ -342,7 +342,7 @@ 
             }
         }
 
-        if ($mask & HORDE_DATE_MASK_MINUTE) {
+        if ($mask&HORDE_DATE_MASK_MINUTE) {
             while ($this->min < 0) {
                 --$this->hour;
                 $this->min += 60;
@@ -353,7 +353,7 @@ 
             }
         }
 
-        if ($mask & HORDE_DATE_MASK_HOUR) {
+        if ($mask&HORDE_DATE_MASK_HOUR) {
             while ($this->hour < 0) {
                 --$this->mday;
                 $this->hour += 24;
@@ -364,7 +364,7 @@ 
             }
         }
 
-        if ($mask & HORDE_DATE_MASK_MONTH) {
+        if ($mask&HORDE_DATE_MASK_MONTH) {
             while ($this->month > 12) {
                 ++$this->year;
                 $this->month -= 12;
@@ -375,7 +375,7 @@ 
             }
         }
 
-        if ($mask & HORDE_DATE_MASK_DAY) {
+        if ($mask&HORDE_DATE_MASK_DAY) {
             while ($this->mday > Horde_Date::daysInMonth($this->month, $this->year)) {
                 $this->mday -= Horde_Date::daysInMonth($this->month, $this->year);
                 ++$this->month;
@@ -550,7 +550,7 @@ 
      */
     function iso8601DateTime()
     {
-        return $this->rfc3339DateTime() . $this->tzOffset();
+        return $this->rfc3339DateTime().$this->tzOffset();
     }
 
     /**
@@ -560,7 +560,7 @@ 
      */
     function rfc2822DateTime()
     {
-        return $this->format('D, j M Y H:i:s') . ' ' . $this->tzOffset(false);
+        return $this->format('D, j M Y H:i:s').' '.$this->tzOffset(false);
     }
 
     /**
@@ -595,7 +595,7 @@ 
      */
     function strftime($format)
     {
-        if (preg_match('/%[^' . $this->_supportedSpecs . ']/', $format)) {
+        if (preg_match('/%[^'.$this->_supportedSpecs.']/', $format)) {
             return strftime($format, $this->timestamp());
         } else {
             return $this->_strftime($format);
@@ -733,7 +733,7 @@ 
             return ($_total_date + $day - 1) * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
         }
 
-        for ($a = 1969 ; $a >= $year; $a--) {
+        for ($a = 1969; $a >= $year; $a--) {
             $leaf = Horde_Date::isLeapYear($a);
             if ($leaf == true) {
                 $loop_table = $_month_table_leaf;

Braces +179 added lines, -80 removed lines

@@ -35,7 +35,8 @@ 
  *
  * @package Horde_Date
  */
-class Horde_Date {
+class Horde_Date
+{
 
     /**
      * Year
@@ -101,13 +102,17 @@ 
      */
     function Horde_Date($date = null)
     {
-        if (function_exists('nl_langinfo')) {
+        if (function_exists('nl_langinfo'))
+        {
             $this->_supportedSpecs .= 'bBpxX';
         }
 
-        if (is_array($date) || is_object($date)) {
-            foreach ($date as $key => $val) {
-                if (in_array($key, array('year', 'month', 'mday', 'hour', 'min', 'sec'))) {
+        if (is_array($date) || is_object($date))
+        {
+            foreach ($date as $key => $val)
+            {
+                if (in_array($key, array('year', 'month', 'mday', 'hour', 'min', 'sec')))
+                {
                     $this->$key = (int)$val;
                 }
             }
@@ -115,26 +120,34 @@ 
             // If $date['day'] is present and numeric we may have been passed
             // a Horde_Form_datetime array.
             if (is_array($date) && isset($date['day']) &&
-                is_numeric($date['day'])) {
+                is_numeric($date['day']))
+            {
                 $this->mday = (int)$date['day'];
             }
             // 'minute' key also from Horde_Form_datetime
-            if (is_array($date) && isset($date['minute'])) {
+            if (is_array($date) && isset($date['minute']))
+            {
                 $this->min = $date['minute'];
             }
-        } elseif (!is_null($date)) {
+        }
+        elseif (!is_null($date))
+        {
             // Match YYYY-MM-DD HH:MM:SS, YYYYMMDDHHMMSS and YYYYMMDD'T'HHMMSS'Z'.
-            if (preg_match('/(\d{4})-?(\d{2})-?(\d{2})T? ?(\d{2}):?(\d{2}):?(\d{2})Z?/', $date, $parts)) {
+            if (preg_match('/(\d{4})-?(\d{2})-?(\d{2})T? ?(\d{2}):?(\d{2}):?(\d{2})Z?/', $date, $parts))
+            {
                 $this->year = (int)$parts[1];
                 $this->month = (int)$parts[2];
                 $this->mday = (int)$parts[3];
                 $this->hour = (int)$parts[4];
                 $this->min = (int)$parts[5];
                 $this->sec = (int)$parts[6];
-            } else {
+            }
+            else
+            {
                 // Try as a timestamp.
                 $parts = @getdate($date);
-                if ($parts) {
+                if ($parts)
+                {
                     $this->year = $parts['year'];
                     $this->month = $parts['mon'];
                     $this->mday = $parts['mday'];
@@ -151,7 +164,8 @@ 
      */
     function isLeapYear($year)
     {
-        if (strlen($year) != 4 || preg_match('/\D/', $year)) {
+        if (strlen($year) != 4 || preg_match('/\D/', $year))
+        {
             return false;
         }
 
@@ -173,7 +187,8 @@ 
     {
         $jan1 = new Horde_Date(array('year' => $year, 'month' => 1, 'mday' => 1));
         $start = $jan1->dayOfWeek();
-        if ($start > HORDE_DATE_THURSDAY) {
+        if ($start > HORDE_DATE_THURSDAY)
+        {
             $start -= 7;
         }
         return (($week * 7) - (7 + $start)) + 1;
@@ -184,15 +199,23 @@ 
      */
     function daysInMonth($month, $year)
     {
-        if ($month == 2) {
-            if (Horde_Date::isLeapYear($year)) {
+        if ($month == 2)
+        {
+            if (Horde_Date::isLeapYear($year))
+            {
                 return 29;
-            } else {
+            }
+            else
+            {
                 return 28;
             }
-        } elseif ($month == 4 || $month == 6 || $month == 9 || $month == 11) {
+        }
+        elseif ($month == 4 || $month == 6 || $month == 9 || $month == 11)
+        {
             return 30;
-        } else {
+        }
+        else
+        {
             return 31;
         }
     }
@@ -205,10 +228,13 @@ 
      */
     function dayOfWeek()
     {
-        if ($this->month > 2) {
+        if ($this->month > 2)
+        {
             $month = $this->month - 2;
             $year = $this->year;
-        } else {
+        }
+        else
+        {
             $month = $this->month + 10;
             $year = $this->year - 1;
         }
@@ -231,7 +257,8 @@ 
     {
         $monthTotals = array(0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334);
         $dayOfYear = $this->mday + $monthTotals[$this->month - 1];
-        if (Horde_Date::isLeapYear($this->year) && $this->month > 2) {
+        if (Horde_Date::isLeapYear($this->year) && $this->month > 2)
+        {
             ++$dayOfYear;
         }
 
@@ -274,7 +301,8 @@ 
         // Find the last Thursday of the year.
         $day = 31;
         $date = new Horde_Date(array('year' => $year, 'month' => 12, 'mday' => $day, 'hour' => 0, 'min' => 0, 'sec' => 0));
-        while ($date->dayOfWeek() != HORDE_DATE_THURSDAY) {
+        while ($date->dayOfWeek() != HORDE_DATE_THURSDAY)
+        {
             --$date->mday;
         }
         return $date->weekOfYear();
@@ -288,15 +316,19 @@ 
      */
     function setNthWeekday($weekday, $nth = 1)
     {
-        if ($weekday < HORDE_DATE_SUNDAY || $weekday > HORDE_DATE_SATURDAY) {
+        if ($weekday < HORDE_DATE_SUNDAY || $weekday > HORDE_DATE_SATURDAY)
+        {
             return false;
         }
 
         $this->mday = 1;
         $first = $this->dayOfWeek();
-        if ($weekday < $first) {
+        if ($weekday < $first)
+        {
             $this->mday = 8 + $weekday - $first;
-        } else {
+        }
+        else
+        {
             $this->mday = $weekday - $first + 1;
         }
         $this->mday += 7 * $nth - 7;
@@ -318,7 +350,8 @@ 
      */
     function isValid()
     {
-        if ($this->year < 0 || $this->year > 9999) {
+        if ($this->year < 0 || $this->year > 9999)
+        {
             return false;
         }
         return checkdate($this->month, $this->mday, $this->year);
@@ -331,57 +364,72 @@ 
      */
     function correct($mask = HORDE_DATE_MASK_ALLPARTS)
     {
-        if ($mask & HORDE_DATE_MASK_SECOND) {
-            while ($this->sec < 0) {
+        if ($mask & HORDE_DATE_MASK_SECOND)
+        {
+            while ($this->sec < 0)
+            {
                 --$this->min;
                 $this->sec += 60;
             }
-            while ($this->sec > 59) {
+            while ($this->sec > 59)
+            {
                 ++$this->min;
                 $this->sec -= 60;
             }
         }
 
-        if ($mask & HORDE_DATE_MASK_MINUTE) {
-            while ($this->min < 0) {
+        if ($mask & HORDE_DATE_MASK_MINUTE)
+        {
+            while ($this->min < 0)
+            {
                 --$this->hour;
                 $this->min += 60;
             }
-            while ($this->min > 59) {
+            while ($this->min > 59)
+            {
                 ++$this->hour;
                 $this->min -= 60;
             }
         }
 
-        if ($mask & HORDE_DATE_MASK_HOUR) {
-            while ($this->hour < 0) {
+        if ($mask & HORDE_DATE_MASK_HOUR)
+        {
+            while ($this->hour < 0)
+            {
                 --$this->mday;
                 $this->hour += 24;
             }
-            while ($this->hour > 23) {
+            while ($this->hour > 23)
+            {
                 ++$this->mday;
                 $this->hour -= 24;
             }
         }
 
-        if ($mask & HORDE_DATE_MASK_MONTH) {
-            while ($this->month > 12) {
+        if ($mask & HORDE_DATE_MASK_MONTH)
+        {
+            while ($this->month > 12)
+            {
                 ++$this->year;
                 $this->month -= 12;
             }
-            while ($this->month < 1) {
+            while ($this->month < 1)
+            {
                 --$this->year;
                 $this->month += 12;
             }
         }
 
-        if ($mask & HORDE_DATE_MASK_DAY) {
-            while ($this->mday > Horde_Date::daysInMonth($this->month, $this->year)) {
+        if ($mask & HORDE_DATE_MASK_DAY)
+        {
+            while ($this->mday > Horde_Date::daysInMonth($this->month, $this->year))
+            {
                 $this->mday -= Horde_Date::daysInMonth($this->month, $this->year);
                 ++$this->month;
                 $this->correct(HORDE_DATE_MASK_MONTH);
             }
-            while ($this->mday < 1) {
+            while ($this->mday < 1)
+            {
                 --$this->month;
                 $this->correct(HORDE_DATE_MASK_MONTH);
                 $this->mday += Horde_Date::daysInMonth($this->month, $this->year);
@@ -402,14 +450,17 @@ 
      */
     function compareDate($date)
     {
-        if (!is_a($date, 'Horde_Date')) {
+        if (!is_a($date, 'Horde_Date'))
+        {
             $date = new Horde_Date($date);
         }
 
-        if ($this->year != $date->year) {
+        if ($this->year != $date->year)
+        {
             return $this->year - $date->year;
         }
-        if ($this->month != $date->month) {
+        if ($this->month != $date->month)
+        {
             return $this->month - $date->month;
         }
 
@@ -429,14 +480,17 @@ 
      */
     function compareTime($date)
     {
-        if (!is_a($date, 'Horde_Date')) {
+        if (!is_a($date, 'Horde_Date'))
+        {
             $date = new Horde_Date($date);
         }
 
-        if ($this->hour != $date->hour) {
+        if ($this->hour != $date->hour)
+        {
             return $this->hour - $date->hour;
         }
-        if ($this->min != $date->min) {
+        if ($this->min != $date->min)
+        {
             return $this->min - $date->min;
         }
 
@@ -456,11 +510,13 @@ 
      */
     function compareDateTime($date)
     {
-        if (!is_a($date, 'Horde_Date')) {
+        if (!is_a($date, 'Horde_Date'))
+        {
             $date = new Horde_Date($date);
         }
 
-        if ($diff = $this->compareDate($date)) {
+        if ($diff = $this->compareDate($date))
+        {
             return $diff;
         }
 
@@ -478,10 +534,13 @@ 
     {
         $secs = $this->format('Z');
 
-        if ($secs < 0) {
+        if ($secs < 0)
+        {
             $sign = '-';
             $secs = -$secs;
-        } else {
+        }
+        else
+        {
             $sign = '+';
         }
         $colon = $colon ? ':' : '';
@@ -497,9 +556,12 @@ 
      */
     function timestamp()
     {
-        if (class_exists('DateTime')) {
+        if (class_exists('DateTime'))
+        {
             return $this->format('U');
-        } else {
+        }
+        else
+        {
             return Horde_Date::_mktime($this->hour, $this->min, $this->sec, $this->month, $this->mday, $this->year);
         }
     }
@@ -511,12 +573,15 @@ 
      */
     function datestamp()
     {
-        if (class_exists('DateTime')) {
+        if (class_exists('DateTime'))
+        {
             $dt = new DateTime();
             $dt->setDate($this->year, $this->month, $this->mday);
             $dt->setTime(0, 0, 0);
             return $dt->format('U');
-        } else {
+        }
+        else
+        {
             return Horde_Date::_mktime(0, 0, 0, $this->month, $this->mday, $this->year);
         }
     }
@@ -533,12 +598,15 @@ 
      */
     function format($format)
     {
-        if (class_exists('DateTime')) {
+        if (class_exists('DateTime'))
+        {
             $dt = new DateTime();
             $dt->setDate($this->year, $this->month, $this->mday);
             $dt->setTime($this->hour, $this->min, $this->sec);
             return $dt->format($format);
-        } else {
+        }
+        else
+        {
             return date($format, $this->timestamp());
         }
     }
@@ -595,9 +663,12 @@ 
      */
     function strftime($format)
     {
-        if (preg_match('/%[^' . $this->_supportedSpecs . ']/', $format)) {
+        if (preg_match('/%[^' . $this->_supportedSpecs . ']/', $format))
+        {
             return strftime($format, $this->timestamp());
-        } else {
+        }
+        else
+        {
             return $this->_strftime($format);
         }
     }
@@ -609,7 +680,8 @@ 
      */
     function _strftime($format)
     {
-        if (preg_match('/%[bBpxX]/', $format)) {
+        if (preg_match('/%[bBpxX]/', $format))
+        {
             require_once 'Horde/NLS.php';
         }
 
@@ -672,14 +744,16 @@ 
     function _mktime($hr, $min, $sec, $mon = false, $day = false,
                      $year = false, $is_dst = false, $is_gmt = false)
     {
-        if ($mon === false) {
+        if ($mon === false)
+        {
             return $is_gmt
                 ? @gmmktime($hr, $min, $sec)
                 : @mktime($hr, $min, $sec);
         }
 
         if ($year > 1901 && $year < 2038 &&
-            ($year >= 1970 || version_compare(PHP_VERSION, '5.0.0', '>='))) {
+            ($year >= 1970 || version_compare(PHP_VERSION, '5.0.0', '>=')))
+        {
             return $is_gmt
                 ? @gmmktime($hr, $min, $sec, $mon, $day, $year)
                 : @mktime($hr, $min, $sec, $mon, $day, $year);
@@ -693,11 +767,14 @@ 
         $day = intval($day);
         $year = intval($year);
 
-        if ($mon > 12) {
+        if ($mon > 12)
+        {
             $y = floor($mon / 12);
             $year += $y;
             $mon -= $y * 12;
-        } elseif ($mon < 1) {
+        }
+        elseif ($mon < 1)
+        {
             $y = ceil((1 - $mon) / 12);
             $year -= $y;
             $mon += $y * 12;
@@ -711,20 +788,29 @@ 
         $_month_table_leaf = array('', 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
         $_total_date = 0;
-        if ($year >= 1970) {
-            for ($a = 1970; $a <= $year; $a++) {
+        if ($year >= 1970)
+        {
+            for ($a = 1970; $a <= $year; $a++)
+            {
                 $leaf = Horde_Date::isLeapYear($a);
-                if ($leaf == true) {
+                if ($leaf == true)
+                {
                     $loop_table = $_month_table_leaf;
                     $_add_date = 366;
-                } else {
+                }
+                else
+                {
                     $loop_table = $_month_table_normal;
                     $_add_date = 365;
                 }
-                if ($a < $year) {
+                if ($a < $year)
+                {
                     $_total_date += $_add_date;
-                } else {
-                    for ($b = 1; $b < $mon; $b++) {
+                }
+                else
+                {
+                    for ($b = 1; $b < $mon; $b++)
+                    {
                         $_total_date += $loop_table[$b];
                     }
                 }
@@ -733,19 +819,27 @@ 
             return ($_total_date + $day - 1) * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
         }
 
-        for ($a = 1969 ; $a >= $year; $a--) {
+        for ($a = 1969 ; $a >= $year; $a--)
+        {
             $leaf = Horde_Date::isLeapYear($a);
-            if ($leaf == true) {
+            if ($leaf == true)
+            {
                 $loop_table = $_month_table_leaf;
                 $_add_date = 366;
-            } else {
+            }
+            else
+            {
                 $loop_table = $_month_table_normal;
                 $_add_date = 365;
             }
-            if ($a > $year) {
+            if ($a > $year)
+            {
                 $_total_date += $_add_date;
-            } else {
-                for ($b = 12; $b > $mon; $b--) {
+            }
+            else
+            {
+                for ($b = 12; $b > $mon; $b--)
+                {
                     $_total_date += $loop_table[$b];
                 }
             }
@@ -755,13 +849,18 @@ 
         $_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
         $_day_time = $_day_power - $_day_time;
         $ret = -($_total_date * $_day_power + $_day_time - $gmt_different);
-        if ($ret < -12220185600) {
+        if ($ret < -12220185600)
+        {
             // If earlier than 5 Oct 1582 - gregorian correction.
             return $ret + 10 * 86400;
-        } elseif ($ret < -12219321600) {
+        }
+        elseif ($ret < -12219321600)
+        {
             // If in limbo, reset to 15 Oct 1582.
             return -12219321600;
-        } else {
+        }
+        else
+        {
             return $ret;
         }
     }

phpgwapi/inc/horde/Horde/iCalendar.php

Doc Comments +3 added lines, -2 removed lines

@@ -242,7 +242,7 @@ 
      * if the attribute does not exist.
      *
      * @param string $name    The name of the attribute.
-     * @param mixed $default  What to return if the attribute specified by
+     * @param string $default  What to return if the attribute specified by
      *                        $name does not exist.
      *
      * @return mixed (string) The value of $name.
@@ -371,7 +371,6 @@ 
      * Locates the first child component of the specified class, and returns a
      * reference to it.
      *
-     * @param string $type  The type of component to find.
      *
      * @return boolean|Horde_iCalendar_*  False if no subcomponent of the
      *                                    specified class exists or a reference
@@ -1316,6 +1315,7 @@ 
 
     /**
      * Parse a Time Period field.
+     * @param string $text
      */
     function _parsePeriod($text)
     {
@@ -1348,6 +1348,7 @@ 
     /**
      * Grok the TZID and return an offset in seconds from UTC for this
      * date and time.
+     * @param boolean $tzid
      */
     function _parseTZID($date, $time, $tzid)
     {

Indentation +1633 added lines, -1633 removed lines

@@ -22,1687 +22,1687 @@
  */
 class Horde_iCalendar {
 
-    /**
-     * The parent (containing) iCalendar object.
-     *
-     * @var Horde_iCalendar
-     */
-    var $_container = false;
-
-    /**
-     * The name/value pairs of attributes for this object (UID,
-     * DTSTART, etc.). Which are present depends on the object and on
-     * what kind of component it is.
-     *
-     * @var array
-     */
-    var $_attributes = array();
-
-    /**
-     * Any children (contained) iCalendar components of this object.
-     *
-     * @var array
-     */
-    var $_components = array();
-
-    /**
-     * According to RFC 2425, we should always use CRLF-terminated lines.
-     *
-     * @var string
-     */
-    var $_newline = "\r\n";
-
-    /**
-     * iCalendar format version (different behavior for 1.0 and 2.0
-     * especially with recurring events).
-     *
-     * @var string
-     */
-    var $_version;
-
-    function Horde_iCalendar($version = '2.0')
-    {
-        $this->_version = $version;
-        $this->setAttribute('VERSION', $version);
-    }
-
-    /**
-     * Return a reference to a new component.
-     *
-     * @param string          $type       The type of component to return
-     * @param Horde_iCalendar $container  A container that this component
-     *                                    will be associated with.
-     *
-     * @return object  Reference to a Horde_iCalendar_* object as specified.
-     *
-     * @static
-     */
-    function &newComponent($type, &$container)
-    {
-        $type = String::lower($type);
-        $class = 'Horde_iCalendar_' . $type;
-        if (!class_exists($class)) {
+	/**
+	 * The parent (containing) iCalendar object.
+	 *
+	 * @var Horde_iCalendar
+	 */
+	var $_container = false;
+
+	/**
+	 * The name/value pairs of attributes for this object (UID,
+	 * DTSTART, etc.). Which are present depends on the object and on
+	 * what kind of component it is.
+	 *
+	 * @var array
+	 */
+	var $_attributes = array();
+
+	/**
+	 * Any children (contained) iCalendar components of this object.
+	 *
+	 * @var array
+	 */
+	var $_components = array();
+
+	/**
+	 * According to RFC 2425, we should always use CRLF-terminated lines.
+	 *
+	 * @var string
+	 */
+	var $_newline = "\r\n";
+
+	/**
+	 * iCalendar format version (different behavior for 1.0 and 2.0
+	 * especially with recurring events).
+	 *
+	 * @var string
+	 */
+	var $_version;
+
+	function Horde_iCalendar($version = '2.0')
+	{
+		$this->_version = $version;
+		$this->setAttribute('VERSION', $version);
+	}
+
+	/**
+	 * Return a reference to a new component.
+	 *
+	 * @param string          $type       The type of component to return
+	 * @param Horde_iCalendar $container  A container that this component
+	 *                                    will be associated with.
+	 *
+	 * @return object  Reference to a Horde_iCalendar_* object as specified.
+	 *
+	 * @static
+	 */
+	function &newComponent($type, &$container)
+	{
+		$type = String::lower($type);
+		$class = 'Horde_iCalendar_' . $type;
+		if (!class_exists($class)) {
 			// include relative from current dir, as we no longer set (old) Horde dir in include path
-            include 'iCalendar/' . $type . '.php';
-        }
-        if (class_exists($class)) {
-            $component = new $class();
-            if ($container !== false) {
-                $component->_container = &$container;
-                // Use version of container, not default set by component
-                // constructor.
-                $component->_version = $container->_version;
-            }
-        } else {
-            // Should return an dummy x-unknown type class here.
-            $component = false;
-        }
-
-        return $component;
-    }
-
-    /**
-     * Sets the value of an attribute.
-     *
-     * @param string $name     The name of the attribute.
-     * @param string $value    The value of the attribute.
-     * @param array $params    Array containing any addition parameters for
-     *                         this attribute.
-     * @param boolean $append  True to append the attribute, False to replace
-     *                         the first matching attribute found.
-     * @param array $values    Array representation of $value.  For
-     *                         comma/semicolon seperated lists of values.  If
-     *                         not set use $value as single array element.
-     */
-    function setAttribute($name, $value, $params = array(), $append = true,
-                          $values = false)
-    {
-        // Make sure we update the internal format version if
-        // setAttribute('VERSION', ...) is called.
-        if ($name == 'VERSION') {
-            $this->_version = $value;
-            if ($this->_container !== false) {
-                $this->_container->_version = $value;
-            }
-        }
-
-        if (!$values) {
-            $values = array($value);
-        }
-        $found = false;
-        if (!$append) {
-            foreach (array_keys($this->_attributes) as $key) {
-                if ($this->_attributes[$key]['name'] == String::upper($name)) {
-                    $this->_attributes[$key]['params'] = $params;
-                    $this->_attributes[$key]['value'] = $value;
-                    $this->_attributes[$key]['values'] = $values;
-                    $found = true;
-                    break;
-                }
-            }
-        }
-
-        if ($append || !$found) {
-            $this->_attributes[] = array(
-                'name'      => String::upper($name),
-                'params'    => $params,
-                'value'     => $value,
-                'values'    => $values
-            );
-        }
-    }
-
-    /**
-     * Sets parameter(s) for an (already existing) attribute.  The
-     * parameter set is merged into the existing set.
-     *
-     * @param string $name   The name of the attribute.
-     * @param array $params  Array containing any additional parameters for
-     *                       this attribute.
-     * @return boolean  True on success, false if no attribute $name exists.
-     */
-    function setParameter($name, $params = array())
-    {
-        $keys = array_keys($this->_attributes);
-        foreach ($keys as $key) {
-            if ($this->_attributes[$key]['name'] == $name) {
-                $this->_attributes[$key]['params'] =
-                    array_merge($this->_attributes[$key]['params'], $params);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the value of an attribute.
-     *
-     * @param string $name     The name of the attribute.
-     * @param boolean $params  Return the parameters for this attribute instead
-     *                         of its value.
-     *
-     * @return mixed (object)  PEAR_Error if the attribute does not exist.
-     *               (string)  The value of the attribute.
-     *               (array)   The parameters for the attribute or
-     *                         multiple values for an attribute.
-     */
-    function getAttribute($name, $params = false)
-    {
-        $result = array();
-        foreach ($this->_attributes as $attribute) {
-            if ($attribute['name'] == $name) {
-                if ($params) {
-                    $result[] = $attribute['params'];
-                } else {
-                    $result[] = $attribute['value'];
-                }
-            }
-        }
-        if (!count($result)) {
-            require_once 'PEAR.php';
-            return PEAR::raiseError('Attribute "' . $name . '" Not Found');
-        } if (count($result) == 1 && !$params) {
-            return $result[0];
-        } else {
-            return $result;
-        }
-    }
-
-    /**
-     * Gets the values of an attribute as an array.  Multiple values
-     * are possible due to:
-     *
-     *  a) multiplce occurences of 'name'
-     *  b) (unsecapd) comma seperated lists.
-     *
-     * So for a vcard like "KEY:a,b\nKEY:c" getAttributesValues('KEY')
-     * will return array('a', 'b', 'c').
-     *
-     * @param string  $name    The name of the attribute.
-     * @return mixed (object)  PEAR_Error if the attribute does not exist.
-     *               (array)   Multiple values for an attribute.
-     */
-    function getAttributeValues($name)
-    {
-        $result = array();
-        foreach ($this->_attributes as $attribute) {
-            if ($attribute['name'] == $name) {
-                $result = array_merge($attribute['values'], $result);
-            }
-        }
-        if (!count($result)) {
-            return PEAR::raiseError('Attribute "' . $name . '" Not Found');
-        }
-        return $result;
-    }
-
-    /**
-     * Returns the value of an attribute, or a specified default value
-     * if the attribute does not exist.
-     *
-     * @param string $name    The name of the attribute.
-     * @param mixed $default  What to return if the attribute specified by
-     *                        $name does not exist.
-     *
-     * @return mixed (string) The value of $name.
-     *               (mixed)  $default if $name does not exist.
-     */
-    function getAttributeDefault($name, $default = '')
-    {
-        $value = $this->getAttribute($name);
-        return is_a($value, 'PEAR_Error') ? $default : $value;
-    }
-
-    /**
-     * Remove all occurences of an attribute.
-     *
-     * @param string $name  The name of the attribute.
-     */
-    function removeAttribute($name)
-    {
-        $keys = array_keys($this->_attributes);
-        foreach ($keys as $key) {
-            if ($this->_attributes[$key]['name'] == $name) {
-                unset($this->_attributes[$key]);
-            }
-        }
-    }
-
-    /**
-     * Get attributes for all tags or for a given tag.
-     *
-     * @param string $tag  Return attributes for this tag, or all attributes if
-     *                     not given.
-     *
-     * @return array  An array containing all the attributes and their types.
-     */
-    function getAllAttributes($tag = false)
-    {
-        if ($tag === false) {
-            return $this->_attributes;
-        }
-        $result = array();
-        foreach ($this->_attributes as $attribute) {
-            if ($attribute['name'] == $tag) {
-                $result[] = $attribute;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Add a vCalendar component (eg vEvent, vTimezone, etc.).
-     *
-     * @param Horde_iCalendar $component  Component (subclass) to add.
-     */
-    function addComponent($component)
-    {
-        if (is_a($component, 'Horde_iCalendar')) {
-            $component->_container = &$this;
-            $this->_components[] = &$component;
-        }
-    }
-
-    /**
-     * Retrieve all the components.
-     *
-     * @return array  Array of Horde_iCalendar objects.
-     */
-    function getComponents()
-    {
-        return $this->_components;
-    }
-
-    function getType()
-    {
-        return 'vcalendar';
-    }
-
-    /**
-     * Return the classes (entry types) we have.
-     *
-     * @return array  Hash with class names Horde_iCalendar_xxx as keys
-     *                and number of components of this class as value.
-     */
-    function getComponentClasses()
-    {
-        $r = array();
-        foreach ($this->_components as $c) {
-            $cn = strtolower(get_class($c));
-            if (empty($r[$cn])) {
-                $r[$cn] = 1;
-            } else {
-                $r[$cn]++;
-            }
-        }
-
-        return $r;
-    }
-
-    /**
-     * Number of components in this container.
-     *
-     * @return integer  Number of components in this container.
-     */
-    function getComponentCount()
-    {
-        return count($this->_components);
-    }
-
-    /**
-     * Retrieve a specific component.
-     *
-     * @param integer $idx  The index of the object to retrieve.
-     *
-     * @return mixed    (boolean) False if the index does not exist.
-     *                  (Horde_iCalendar_*) The requested component.
-     */
-    function getComponent($idx)
-    {
-        if (isset($this->_components[$idx])) {
-            return $this->_components[$idx];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Locates the first child component of the specified class, and returns a
-     * reference to it.
-     *
-     * @param string $type  The type of component to find.
-     *
-     * @return boolean|Horde_iCalendar_*  False if no subcomponent of the
-     *                                    specified class exists or a reference
-     *                                    to the requested component.
-     */
-    function &findComponent($childclass)
-    {
-        $childclass = 'Horde_iCalendar_' . String::lower($childclass);
-        $keys = array_keys($this->_components);
-        foreach ($keys as $key) {
-            if (is_a($this->_components[$key], $childclass)) {
-                return $this->_components[$key];
-            }
-        }
-
-        $component = false;
-        return $component;
-    }
-
-    /**
-     * Locates the first matching child component of the specified class, and
-     * returns a reference to it.
-     *
-     * @param string $childclass  The type of component to find.
-     * @param string $attribute   This attribute must be set in the component
-     *                            for it to match.
-     * @param string $value       Optional value that $attribute must match.
-     *
-     * @return boolean|Horde_iCalendar_*  False if no matching subcomponent of
-     *                                    the specified class exists, or a
-     *                                    reference to the requested component.
-     */
-    function &findComponentByAttribute($childclass, $attribute, $value = null)
-    {
-        $childclass = 'Horde_iCalendar_' . String::lower($childclass);
-        $keys = array_keys($this->_components);
-        foreach ($keys as $key) {
-            if (is_a($this->_components[$key], $childclass)) {
-                $attr = $this->_components[$key]->getAttribute($attribute);
-                if (is_a($attr, 'PEAR_Error')) {
-                    continue;
-                }
-                if ($value !== null && $value != $attr) {
-                    continue;
-                }
-                return $this->_components[$key];
-            }
-        }
-
-        $component = false;
-        return $component;
-    }
-
-    /**
-     * Clears the iCalendar object (resets the components and attributes
-     * arrays).
-     */
-    function clear()
-    {
-        $this->_components = array();
-        $this->_attributes = array();
-    }
-
-    /**
-     * Checks if entry is vcalendar 1.0, vcard 2.1 or vnote 1.1.
-     *
-     * These 'old' formats are defined by www.imc.org. The 'new' (non-old)
-     * formats icalendar 2.0 and vcard 3.0 are defined in rfc2426 and rfc2445
-     * respectively.
-     *
-     * @since Horde 3.1.2
-     */
-    function isOldFormat()
-    {
+			include 'iCalendar/' . $type . '.php';
+		}
+		if (class_exists($class)) {
+			$component = new $class();
+			if ($container !== false) {
+				$component->_container = &$container;
+				// Use version of container, not default set by component
+				// constructor.
+				$component->_version = $container->_version;
+			}
+		} else {
+			// Should return an dummy x-unknown type class here.
+			$component = false;
+		}
+
+		return $component;
+	}
+
+	/**
+	 * Sets the value of an attribute.
+	 *
+	 * @param string $name     The name of the attribute.
+	 * @param string $value    The value of the attribute.
+	 * @param array $params    Array containing any addition parameters for
+	 *                         this attribute.
+	 * @param boolean $append  True to append the attribute, False to replace
+	 *                         the first matching attribute found.
+	 * @param array $values    Array representation of $value.  For
+	 *                         comma/semicolon seperated lists of values.  If
+	 *                         not set use $value as single array element.
+	 */
+	function setAttribute($name, $value, $params = array(), $append = true,
+						  $values = false)
+	{
+		// Make sure we update the internal format version if
+		// setAttribute('VERSION', ...) is called.
+		if ($name == 'VERSION') {
+			$this->_version = $value;
+			if ($this->_container !== false) {
+				$this->_container->_version = $value;
+			}
+		}
+
+		if (!$values) {
+			$values = array($value);
+		}
+		$found = false;
+		if (!$append) {
+			foreach (array_keys($this->_attributes) as $key) {
+				if ($this->_attributes[$key]['name'] == String::upper($name)) {
+					$this->_attributes[$key]['params'] = $params;
+					$this->_attributes[$key]['value'] = $value;
+					$this->_attributes[$key]['values'] = $values;
+					$found = true;
+					break;
+				}
+			}
+		}
+
+		if ($append || !$found) {
+			$this->_attributes[] = array(
+				'name'      => String::upper($name),
+				'params'    => $params,
+				'value'     => $value,
+				'values'    => $values
+			);
+		}
+	}
+
+	/**
+	 * Sets parameter(s) for an (already existing) attribute.  The
+	 * parameter set is merged into the existing set.
+	 *
+	 * @param string $name   The name of the attribute.
+	 * @param array $params  Array containing any additional parameters for
+	 *                       this attribute.
+	 * @return boolean  True on success, false if no attribute $name exists.
+	 */
+	function setParameter($name, $params = array())
+	{
+		$keys = array_keys($this->_attributes);
+		foreach ($keys as $key) {
+			if ($this->_attributes[$key]['name'] == $name) {
+				$this->_attributes[$key]['params'] =
+					array_merge($this->_attributes[$key]['params'], $params);
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the value of an attribute.
+	 *
+	 * @param string $name     The name of the attribute.
+	 * @param boolean $params  Return the parameters for this attribute instead
+	 *                         of its value.
+	 *
+	 * @return mixed (object)  PEAR_Error if the attribute does not exist.
+	 *               (string)  The value of the attribute.
+	 *               (array)   The parameters for the attribute or
+	 *                         multiple values for an attribute.
+	 */
+	function getAttribute($name, $params = false)
+	{
+		$result = array();
+		foreach ($this->_attributes as $attribute) {
+			if ($attribute['name'] == $name) {
+				if ($params) {
+					$result[] = $attribute['params'];
+				} else {
+					$result[] = $attribute['value'];
+				}
+			}
+		}
+		if (!count($result)) {
+			require_once 'PEAR.php';
+			return PEAR::raiseError('Attribute "' . $name . '" Not Found');
+		} if (count($result) == 1 && !$params) {
+			return $result[0];
+		} else {
+			return $result;
+		}
+	}
+
+	/**
+	 * Gets the values of an attribute as an array.  Multiple values
+	 * are possible due to:
+	 *
+	 *  a) multiplce occurences of 'name'
+	 *  b) (unsecapd) comma seperated lists.
+	 *
+	 * So for a vcard like "KEY:a,b\nKEY:c" getAttributesValues('KEY')
+	 * will return array('a', 'b', 'c').
+	 *
+	 * @param string  $name    The name of the attribute.
+	 * @return mixed (object)  PEAR_Error if the attribute does not exist.
+	 *               (array)   Multiple values for an attribute.
+	 */
+	function getAttributeValues($name)
+	{
+		$result = array();
+		foreach ($this->_attributes as $attribute) {
+			if ($attribute['name'] == $name) {
+				$result = array_merge($attribute['values'], $result);
+			}
+		}
+		if (!count($result)) {
+			return PEAR::raiseError('Attribute "' . $name . '" Not Found');
+		}
+		return $result;
+	}
+
+	/**
+	 * Returns the value of an attribute, or a specified default value
+	 * if the attribute does not exist.
+	 *
+	 * @param string $name    The name of the attribute.
+	 * @param mixed $default  What to return if the attribute specified by
+	 *                        $name does not exist.
+	 *
+	 * @return mixed (string) The value of $name.
+	 *               (mixed)  $default if $name does not exist.
+	 */
+	function getAttributeDefault($name, $default = '')
+	{
+		$value = $this->getAttribute($name);
+		return is_a($value, 'PEAR_Error') ? $default : $value;
+	}
+
+	/**
+	 * Remove all occurences of an attribute.
+	 *
+	 * @param string $name  The name of the attribute.
+	 */
+	function removeAttribute($name)
+	{
+		$keys = array_keys($this->_attributes);
+		foreach ($keys as $key) {
+			if ($this->_attributes[$key]['name'] == $name) {
+				unset($this->_attributes[$key]);
+			}
+		}
+	}
+
+	/**
+	 * Get attributes for all tags or for a given tag.
+	 *
+	 * @param string $tag  Return attributes for this tag, or all attributes if
+	 *                     not given.
+	 *
+	 * @return array  An array containing all the attributes and their types.
+	 */
+	function getAllAttributes($tag = false)
+	{
+		if ($tag === false) {
+			return $this->_attributes;
+		}
+		$result = array();
+		foreach ($this->_attributes as $attribute) {
+			if ($attribute['name'] == $tag) {
+				$result[] = $attribute;
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Add a vCalendar component (eg vEvent, vTimezone, etc.).
+	 *
+	 * @param Horde_iCalendar $component  Component (subclass) to add.
+	 */
+	function addComponent($component)
+	{
+		if (is_a($component, 'Horde_iCalendar')) {
+			$component->_container = &$this;
+			$this->_components[] = &$component;
+		}
+	}
+
+	/**
+	 * Retrieve all the components.
+	 *
+	 * @return array  Array of Horde_iCalendar objects.
+	 */
+	function getComponents()
+	{
+		return $this->_components;
+	}
+
+	function getType()
+	{
+		return 'vcalendar';
+	}
+
+	/**
+	 * Return the classes (entry types) we have.
+	 *
+	 * @return array  Hash with class names Horde_iCalendar_xxx as keys
+	 *                and number of components of this class as value.
+	 */
+	function getComponentClasses()
+	{
+		$r = array();
+		foreach ($this->_components as $c) {
+			$cn = strtolower(get_class($c));
+			if (empty($r[$cn])) {
+				$r[$cn] = 1;
+			} else {
+				$r[$cn]++;
+			}
+		}
+
+		return $r;
+	}
+
+	/**
+	 * Number of components in this container.
+	 *
+	 * @return integer  Number of components in this container.
+	 */
+	function getComponentCount()
+	{
+		return count($this->_components);
+	}
+
+	/**
+	 * Retrieve a specific component.
+	 *
+	 * @param integer $idx  The index of the object to retrieve.
+	 *
+	 * @return mixed    (boolean) False if the index does not exist.
+	 *                  (Horde_iCalendar_*) The requested component.
+	 */
+	function getComponent($idx)
+	{
+		if (isset($this->_components[$idx])) {
+			return $this->_components[$idx];
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Locates the first child component of the specified class, and returns a
+	 * reference to it.
+	 *
+	 * @param string $type  The type of component to find.
+	 *
+	 * @return boolean|Horde_iCalendar_*  False if no subcomponent of the
+	 *                                    specified class exists or a reference
+	 *                                    to the requested component.
+	 */
+	function &findComponent($childclass)
+	{
+		$childclass = 'Horde_iCalendar_' . String::lower($childclass);
+		$keys = array_keys($this->_components);
+		foreach ($keys as $key) {
+			if (is_a($this->_components[$key], $childclass)) {
+				return $this->_components[$key];
+			}
+		}
+
+		$component = false;
+		return $component;
+	}
+
+	/**
+	 * Locates the first matching child component of the specified class, and
+	 * returns a reference to it.
+	 *
+	 * @param string $childclass  The type of component to find.
+	 * @param string $attribute   This attribute must be set in the component
+	 *                            for it to match.
+	 * @param string $value       Optional value that $attribute must match.
+	 *
+	 * @return boolean|Horde_iCalendar_*  False if no matching subcomponent of
+	 *                                    the specified class exists, or a
+	 *                                    reference to the requested component.
+	 */
+	function &findComponentByAttribute($childclass, $attribute, $value = null)
+	{
+		$childclass = 'Horde_iCalendar_' . String::lower($childclass);
+		$keys = array_keys($this->_components);
+		foreach ($keys as $key) {
+			if (is_a($this->_components[$key], $childclass)) {
+				$attr = $this->_components[$key]->getAttribute($attribute);
+				if (is_a($attr, 'PEAR_Error')) {
+					continue;
+				}
+				if ($value !== null && $value != $attr) {
+					continue;
+				}
+				return $this->_components[$key];
+			}
+		}
+
+		$component = false;
+		return $component;
+	}
+
+	/**
+	 * Clears the iCalendar object (resets the components and attributes
+	 * arrays).
+	 */
+	function clear()
+	{
+		$this->_components = array();
+		$this->_attributes = array();
+	}
+
+	/**
+	 * Checks if entry is vcalendar 1.0, vcard 2.1 or vnote 1.1.
+	 *
+	 * These 'old' formats are defined by www.imc.org. The 'new' (non-old)
+	 * formats icalendar 2.0 and vcard 3.0 are defined in rfc2426 and rfc2445
+	 * respectively.
+	 *
+	 * @since Horde 3.1.2
+	 */
+	function isOldFormat()
+	{
 	$retval = true;
 	switch ($this->getType()) {
 		case 'vcard':
-            		$retval = ($this->_version < 3);
+					$retval = ($this->_version < 3);
 			break;
 		case 'vNote':
-            		$retval = ($this->_version < 2);
+					$retval = ($this->_version < 2);
 			break;
 		default:
 			$retval = ($this->_version < 2);
 			break;
 	}
-        return $retval;
-    }
-
-    /**
-     * Export as vCalendar format.
-     *
-     * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, standard character set for old format.
-     */
-    function exportvCalendar($charset = null)
-    {
-        // Default values.
-        $requiredAttributes['PRODID'] = '-//The Horde Project//Horde_iCalendar Library' . (defined('HORDE_VERSION') ? ', Horde ' . constant('HORDE_VERSION') : '') . '//EN';
-        // METHOD is only required for iTip, but not for CalDAV, therefore removing it here calendar_ical sets it anyway by default
-        //$requiredAttributes['METHOD'] = 'PUBLISH';
-
-        foreach ($requiredAttributes as $name => $default_value) {
-            if (is_a($this->getattribute($name), 'PEAR_Error')) {
-                $this->setAttribute($name, $default_value);
-            }
-        }
-
-        return $this->_exportvData('VCALENDAR', $charset);
-    }
-
-    /**
-     * Export this entry as a hash array with tag names as keys.
-     *
-     * @param boolean $paramsInKeys
-     *                If false, the operation can be quite lossy as the
-     *                parameters are ignored when building the array keys.
-     *                So if you export a vcard with
-     *                LABEL;TYPE=WORK:foo
-     *                LABEL;TYPE=HOME:bar
-     *                the resulting hash contains only one label field!
-     *                If set to true, array keys look like 'LABEL;TYPE=WORK'
-     * @return array  A hash array with tag names as keys.
-     */
-    function toHash($paramsInKeys = false)
-    {
-        $hash = array();
-        foreach ($this->_attributes as $a)  {
-            $k = $a['name'];
-            if ($paramsInKeys && is_array($a['params'])) {
-                foreach ($a['params'] as $p => $v) {
-                    $k .= ";$p=$v";
-                }
-            }
-            $hash[$k] = $a['value'];
-        }
-
-        return $hash;
-    }
-
-    /**
-     * Parses a string containing vCalendar data.
-     *
-     * @todo This method doesn't work well at all, if $base is VCARD.
-     *
-     * @param string $text     The data to parse.
-     * @param string $base     The type of the base object.
-     * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
-     * @param boolean $clear   If true clears the iCal object before parsing.
-     *
-     * @return boolean  True on successful import, false otherwise.
-     */
-    function parsevCalendar($text, $base = 'VCALENDAR', $charset = null, $clear = true)
-    {
-        if ($clear) {
-            $this->clear();
-        }
-
-        if ($base == 'VTODO' &&
-        	preg_match('/^BEGIN:VTODO(.*)^END:VEVENT/ism', $text, $matches)) {
-        	// Workaround for Funambol VTODO bug in Mozilla Sync Plugins
-        	Horde::logMessage('iCalendar: Funambol VTODO-bug detected, workaround activated...',
-        		__FILE__, __LINE__, PEAR_LOG_WARNING);
-            $container = true;
-            $vCal = $matches[1];
-        } elseif (preg_match('/^BEGIN:' . $base . '(.*)^END:' . $base . '/ism', $text, $matches)) {
-            $container = true;
-            $vCal = $matches[1];
-        } else {
-            // Text isn't enclosed in BEGIN:VCALENDAR
-            // .. END:VCALENDAR. We'll try to parse it anyway.
-            $container = false;
-            $vCal = $text;
-        }
-
-        if (preg_match('/^VERSION:(\d\.\d)\s*$/ism', $vCal, $matches)) {
-            // define the version asap
-            #Horde::logMessage("iCalendar VERSION:" . $matches[1], __FILE__, __LINE__, PEAR_LOG_DEBUG);
-            $this->setAttribute('VERSION', $matches[1]);
-        }
+		return $retval;
+	}
+
+	/**
+	 * Export as vCalendar format.
+	 *
+	 * @param string $charset  The encoding charset for $text. Defaults to
+	 *                         utf-8 for new format, standard character set for old format.
+	 */
+	function exportvCalendar($charset = null)
+	{
+		// Default values.
+		$requiredAttributes['PRODID'] = '-//The Horde Project//Horde_iCalendar Library' . (defined('HORDE_VERSION') ? ', Horde ' . constant('HORDE_VERSION') : '') . '//EN';
+		// METHOD is only required for iTip, but not for CalDAV, therefore removing it here calendar_ical sets it anyway by default
+		//$requiredAttributes['METHOD'] = 'PUBLISH';
+
+		foreach ($requiredAttributes as $name => $default_value) {
+			if (is_a($this->getattribute($name), 'PEAR_Error')) {
+				$this->setAttribute($name, $default_value);
+			}
+		}
+
+		return $this->_exportvData('VCALENDAR', $charset);
+	}
+
+	/**
+	 * Export this entry as a hash array with tag names as keys.
+	 *
+	 * @param boolean $paramsInKeys
+	 *                If false, the operation can be quite lossy as the
+	 *                parameters are ignored when building the array keys.
+	 *                So if you export a vcard with
+	 *                LABEL;TYPE=WORK:foo
+	 *                LABEL;TYPE=HOME:bar
+	 *                the resulting hash contains only one label field!
+	 *                If set to true, array keys look like 'LABEL;TYPE=WORK'
+	 * @return array  A hash array with tag names as keys.
+	 */
+	function toHash($paramsInKeys = false)
+	{
+		$hash = array();
+		foreach ($this->_attributes as $a)  {
+			$k = $a['name'];
+			if ($paramsInKeys && is_array($a['params'])) {
+				foreach ($a['params'] as $p => $v) {
+					$k .= ";$p=$v";
+				}
+			}
+			$hash[$k] = $a['value'];
+		}
+
+		return $hash;
+	}
+
+	/**
+	 * Parses a string containing vCalendar data.
+	 *
+	 * @todo This method doesn't work well at all, if $base is VCARD.
+	 *
+	 * @param string $text     The data to parse.
+	 * @param string $base     The type of the base object.
+	 * @param string $charset  The encoding charset for $text. Defaults to
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 * @param boolean $clear   If true clears the iCal object before parsing.
+	 *
+	 * @return boolean  True on successful import, false otherwise.
+	 */
+	function parsevCalendar($text, $base = 'VCALENDAR', $charset = null, $clear = true)
+	{
+		if ($clear) {
+			$this->clear();
+		}
+
+		if ($base == 'VTODO' &&
+			preg_match('/^BEGIN:VTODO(.*)^END:VEVENT/ism', $text, $matches)) {
+			// Workaround for Funambol VTODO bug in Mozilla Sync Plugins
+			Horde::logMessage('iCalendar: Funambol VTODO-bug detected, workaround activated...',
+				__FILE__, __LINE__, PEAR_LOG_WARNING);
+			$container = true;
+			$vCal = $matches[1];
+		} elseif (preg_match('/^BEGIN:' . $base . '(.*)^END:' . $base . '/ism', $text, $matches)) {
+			$container = true;
+			$vCal = $matches[1];
+		} else {
+			// Text isn't enclosed in BEGIN:VCALENDAR
+			// .. END:VCALENDAR. We'll try to parse it anyway.
+			$container = false;
+			$vCal = $text;
+		}
+
+		if (preg_match('/^VERSION:(\d\.\d)\s*$/ism', $vCal, $matches)) {
+			// define the version asap
+			#Horde::logMessage("iCalendar VERSION:" . $matches[1], __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			$this->setAttribute('VERSION', $matches[1]);
+		}
 
 		// Preserve a trailing CR
-        $vCal = trim($vCal) . "\n";
-
-        // All subcomponents.
-        $matches = null;
-        // Workaround for Funambol VTODO bug in Mozilla Sync Plugins
-        if (preg_match_all('/^BEGIN:(VTODO)(\r\n|\r|\n)(.*)^END:VEVENT/Uims', $vCal, $matches) ||
-        	preg_match_all('/^BEGIN:(.*)(\r\n|\r|\n)(.*)^END:\1/Uims', $vCal, $matches)) {
-            // vTimezone components are processed first. They are
-            // needed to process vEvents that may use a TZID.
-            foreach ($matches[0] as $key => $data) {
-                $type = trim($matches[1][$key]);
-                if ($type != 'VTIMEZONE') {
-                    continue;
-                }
-                $component = &Horde_iCalendar::newComponent($type, $this);
-                if ($component === false) {
-                    return PEAR::raiseError("Unable to create object for type $type");
-                }
-                $component->parsevCalendar($data, $type, $charset);
-
-                $this->addComponent($component);
-
-                // Remove from the vCalendar data.
-                $vCal = str_replace($data, '', $vCal);
-            }
-
-            // Now process the non-vTimezone components.
-            foreach ($matches[0] as $key => $data) {
-                $type = trim($matches[1][$key]);
-                if ($type == 'VTIMEZONE') {
-                    continue;
-                }
-                $component = &Horde_iCalendar::newComponent($type, $this);
-                if ($component === false) {
-                    return PEAR::raiseError("Unable to create object for type $type");
-                }
-                $component->parsevCalendar($data, $type, $charset);
-
-                $this->addComponent($component);
-
-                // Remove from the vCalendar data.
-                $vCal = str_replace($data, '', $vCal);
-            }
-        } elseif (!$container) {
-            return false;
-        }
-
-        // Unfold "quoted printable" folded lines like:
-        //  BODY;ENCODING=QUOTED-PRINTABLE:=
-        //  another=20line=
-        //  last=20line
-        while (preg_match_all('/^([^:]+;\s*((ENCODING=)?QUOTED-PRINTABLE|ENCODING=[Q|q])(.*=\r?\n)+(.*[^=])?\r?\n)/mU', $vCal, $matches)) {
-            foreach ($matches[1] as $s) {
-            	if ($this->isOldFormat()) {
-                	$r = preg_replace('/=\r?\n([ \t])?/', '\1', $s);
-            	} else {
-            		$r = preg_replace('/=\r?\n[ \t]*/', '', $s);
-            	}
-                $vCal = str_replace($s, $r, $vCal);
-            }
-        }
-
-        // Unfold any folded lines.
-        if ($this->isOldFormat()) {
-        	// old formats force folding at whitespace which must therefore be preserved
-        	$vCal = preg_replace('/[\r\n]+([ \t])/', '\1', $vCal);
-        } else {
-        	$vCal = preg_replace('/[\r\n]+[ \t]/', '', $vCal);
-        }
+		$vCal = trim($vCal) . "\n";
+
+		// All subcomponents.
+		$matches = null;
+		// Workaround for Funambol VTODO bug in Mozilla Sync Plugins
+		if (preg_match_all('/^BEGIN:(VTODO)(\r\n|\r|\n)(.*)^END:VEVENT/Uims', $vCal, $matches) ||
+			preg_match_all('/^BEGIN:(.*)(\r\n|\r|\n)(.*)^END:\1/Uims', $vCal, $matches)) {
+			// vTimezone components are processed first. They are
+			// needed to process vEvents that may use a TZID.
+			foreach ($matches[0] as $key => $data) {
+				$type = trim($matches[1][$key]);
+				if ($type != 'VTIMEZONE') {
+					continue;
+				}
+				$component = &Horde_iCalendar::newComponent($type, $this);
+				if ($component === false) {
+					return PEAR::raiseError("Unable to create object for type $type");
+				}
+				$component->parsevCalendar($data, $type, $charset);
+
+				$this->addComponent($component);
+
+				// Remove from the vCalendar data.
+				$vCal = str_replace($data, '', $vCal);
+			}
+
+			// Now process the non-vTimezone components.
+			foreach ($matches[0] as $key => $data) {
+				$type = trim($matches[1][$key]);
+				if ($type == 'VTIMEZONE') {
+					continue;
+				}
+				$component = &Horde_iCalendar::newComponent($type, $this);
+				if ($component === false) {
+					return PEAR::raiseError("Unable to create object for type $type");
+				}
+				$component->parsevCalendar($data, $type, $charset);
+
+				$this->addComponent($component);
+
+				// Remove from the vCalendar data.
+				$vCal = str_replace($data, '', $vCal);
+			}
+		} elseif (!$container) {
+			return false;
+		}
+
+		// Unfold "quoted printable" folded lines like:
+		//  BODY;ENCODING=QUOTED-PRINTABLE:=
+		//  another=20line=
+		//  last=20line
+		while (preg_match_all('/^([^:]+;\s*((ENCODING=)?QUOTED-PRINTABLE|ENCODING=[Q|q])(.*=\r?\n)+(.*[^=])?\r?\n)/mU', $vCal, $matches)) {
+			foreach ($matches[1] as $s) {
+				if ($this->isOldFormat()) {
+					$r = preg_replace('/=\r?\n([ \t])?/', '\1', $s);
+				} else {
+					$r = preg_replace('/=\r?\n[ \t]*/', '', $s);
+				}
+				$vCal = str_replace($s, $r, $vCal);
+			}
+		}
+
+		// Unfold any folded lines.
+		if ($this->isOldFormat()) {
+			// old formats force folding at whitespace which must therefore be preserved
+			$vCal = preg_replace('/[\r\n]+([ \t])/', '\1', $vCal);
+		} else {
+			$vCal = preg_replace('/[\r\n]+[ \t]/', '', $vCal);
+		}
 
 		$isDate = false;
 
-        // Parse the remaining attributes.
-        if (preg_match_all('/^((?:[^":]+|(?:"[^"]*")+)*):([^\r\n]*)\r?$/m', $vCal, $matches)) {
-            foreach ($matches[0] as $attribute) {
-                preg_match('/([^:;]*)((;(?:(?:[^":\\\]*(?:\\\.)?)+|(?:"[^"]*")+)*)?):([^\r\n]*)[\r\n]*/', $attribute, $parts);
-                $tag = trim(String::upper($parts[1]));
-                $value = $parts[4];
-                $params = array();
-
-                // Parse parameters.
-                if (!empty($parts[2])) {
-                    preg_match_all('/;(([^;=]*)(=("[^"]*"|(?:[^;\\\]*(?:\\\.)?)*))?)/', $parts[2], $param_parts);
-                    foreach ($param_parts[2] as $key => $paramName) {
-                        $paramName = String::upper($paramName);
-                        $paramValue = $param_parts[4][$key];
-                        if ($paramName == 'TYPE') {
-                            $paramValue = preg_split('/(?<!\\\\),/', $paramValue);
-                            if (isset($params[$paramName])) {
-                        		if (!is_array($params[$paramName])) {
-                        			$params[$paramName] = array($params[$paramName]);
-                        		}
-                        		$params[$paramName] = array_merge($params[$paramName], $paramValue);
-                        	} else {
-                        		if (count($paramValue) == 1) {
-                                	$paramValue = $paramValue[0];
-                            	}
-                            	$params[$paramName] = $paramValue;
-                        	}
-                        } else {
-                        	$params[$paramName] = $paramValue;
-                        }
-                    }
-                }
-
-                // Charset and encoding handling.
-                if (isset($params['QUOTED-PRINTABLE'])) {
-	                $params['ENCODING'] = 'QUOTED-PRINTABLE';
-                }
-                if (isset($params['BASE64'])) {
-	                $params['ENCODING'] = 'BASE64';
-                }
-                if (isset($params['ENCODING'])) {
-	                switch (String::upper($params['ENCODING'])) {
-		                case 'Q':
-		                case 'QUOTED-PRINTABLE':
-			                $value = quoted_printable_decode($value);
-			                if (isset($params['CHARSET'])) {
-				                $value = $GLOBALS['egw']->translation->convert($value, $params['CHARSET']);
-			                } else {
-				                $value = $GLOBALS['egw']->translation->convert($value,
-					                empty($charset) ? ($this->isOldFormat() ? 'iso-8859-1' : 'utf-8') : $charset);
-			                }
-			                // Funambol hack :-(
-			                $value = str_replace('\\\\n', "\n", $value);
-			                break;
-		                case 'B':
-		                case 'BASE64':
-			                $value = base64_decode($value);
-			                break;
-	                }
-                } elseif (isset($params['CHARSET'])) {
-	                $value = $GLOBALS['egw']->translation->convert($value, $params['CHARSET']);
-                } else {
-	                // As per RFC 2279, assume UTF8 if we don't have an
-	                // explicit charset parameter.
-	                $value = $GLOBALS['egw']->translation->convert($value,
-		                empty($charset) ? ($this->isOldFormat() ? 'iso-8859-1' : 'utf-8') : $charset);
-                }
-
-                // Get timezone info for date fields from $params.
-                $tzid = isset($params['TZID']) ? trim($params['TZID'], '\"') : false;
-
-                switch ($tag) {
-	                case 'VERSION': // already processed
-		                break;
-		                // Date fields.
-	                case 'COMPLETED':
-	                case 'CREATED':
-	                case 'LAST-MODIFIED':
-		                $this->setAttribute($tag, $this->_parseDateTime($value, $tzid), $params);
-		                break;
-
-	                case 'BDAY':
-	                case 'X-SYNCJE-ANNIVERSARY':
-		                $this->setAttribute($tag, $value, $params, true, $this->_parseDate($value));
-		                break;
-
-	                case 'DTEND':
-	                case 'DTSTART':
-	                case 'DTSTAMP':
-	                case 'DUE':
-	                case 'AALARM':
-	                case 'DALARM':
-	                case 'RECURRENCE-ID':
-	                case 'X-RECURRENCE-ID':
-		                // types like AALARM may contain additional data after a ;
-		                // ignore these.
-		                $ts = explode(';', $value);
-		                if (isset($params['VALUE']) && $params['VALUE'] == 'DATE') {
-			                $isDate = true;
-			                $this->setAttribute($tag, $this->_parseDateTime($ts[0], $tzid), $params, true, $this->_parseDate($ts[0]));
-		                } else {
-			                $this->setAttribute($tag, $this->_parseDateTime($ts[0], $tzid), $params);
-		                }
-		                break;
-
-	                case 'TRIGGER':
-		                if (isset($params['VALUE'])) {
-			                if ($params['VALUE'] == 'DATE-TIME') {
-				                $this->setAttribute($tag, $this->_parseDateTime($value, $tzid), $params);
-			                } else {
-				                $this->setAttribute($tag, $this->_parseDuration($value), $params);
-			                }
-		                } else {
-			                $this->setAttribute($tag, $this->_parseDuration($value), $params);
-		                }
-		                break;
-
-		                // Comma or semicolon seperated dates.
-	                case 'EXDATE':
-	                case 'RDATE':
-		                $dates = array();
-		                preg_match_all('/[;,]([^;,]*)/', ';' . $value, $values);
-
-		                foreach ($values[1] as $value) {
-			                if ((isset($params['VALUE'])
-					                && $params['VALUE'] == 'DATE') || (!isset($params['VALUE']) && $isDate)) {
-				                $dates[] = $this->_parseDate(trim($value));
-			                } else {
-				                $dates[] = $this->_parseDateTime(trim($value), $tzid);
-			                }
-		                }
-		                $this->setAttribute($tag, isset($dates[0]) ? $dates[0] : null, $params, true, $dates);
-		                break;
-
-		                // Duration fields.
-	                case 'DURATION':
-		                $this->setAttribute($tag, $this->_parseDuration($value), $params);
-		                break;
-
-		                // Period of time fields.
-	                case 'FREEBUSY':
-		                $periods = array();
-		                preg_match_all('/,([^,]*)/', ',' . $value, $values);
-		                foreach ($values[1] as $value) {
-			                $periods[] = $this->_parsePeriod($value);
-		                }
-
-		                $this->setAttribute($tag, isset($periods[0]) ? $periods[0] : null, $params, true, $periods);
-		                break;
-
-		                // UTC offset fields.
-	                case 'TZOFFSETFROM':
-	                case 'TZOFFSETTO':
-		                $this->setAttribute($tag, $this->_parseUtcOffset($value), $params);
-		                break;
-
-		                // Integer fields.
-	                case 'PERCENT-COMPLETE':
-	                case 'PRIORITY':
-	                case 'REPEAT':
-	                case 'SEQUENCE':
-		                $this->setAttribute($tag, intval($value), $params);
-		                break;
-
-		                // Geo fields.
-	                case 'GEO':
-		                if ($this->isOldFormat()) {
-			                $floats = explode(',', $value);
-			                $value = array('latitude' => floatval($floats[1]),
-				                'longitude' => floatval($floats[0]));
-		                } else {
-			                $floats = explode(';', $value);
-			                $value = array('latitude' => floatval($floats[0]),
-				                'longitude' => floatval($floats[1]));
-		                }
-		                $this->setAttribute($tag, $value, $params);
-		                break;
-
-		                // Recursion fields. # add more flexibility
-		                #case 'EXRULE':
-		                #case 'RRULE':
-		                #    $this->setAttribute($tag, trim($value), $params);
-		                #    break;
-
-		                // Binary fields.
-	                case 'PHOTO':
-		                $this->setAttribute($tag, $value, $params);
-		                break;
-
-		                // ADR, ORG and N are lists seperated by unescaped semicolons
-		                // with a specific number of slots.
-	                case 'ADR':
-	                case 'N':
-	                case 'ORG':
-		                $value = trim($value);
-		                // As of rfc 2426 2.4.2 semicolon, comma, and colon must
-		                // be escaped (semicolon is unescaped after splitting below).
-		                $value = str_replace(array('\\n', '\\N', '\\,', '\\:'),
-			                array("\n", "\n", ',', ':'),
+		// Parse the remaining attributes.
+		if (preg_match_all('/^((?:[^":]+|(?:"[^"]*")+)*):([^\r\n]*)\r?$/m', $vCal, $matches)) {
+			foreach ($matches[0] as $attribute) {
+				preg_match('/([^:;]*)((;(?:(?:[^":\\\]*(?:\\\.)?)+|(?:"[^"]*")+)*)?):([^\r\n]*)[\r\n]*/', $attribute, $parts);
+				$tag = trim(String::upper($parts[1]));
+				$value = $parts[4];
+				$params = array();
+
+				// Parse parameters.
+				if (!empty($parts[2])) {
+					preg_match_all('/;(([^;=]*)(=("[^"]*"|(?:[^;\\\]*(?:\\\.)?)*))?)/', $parts[2], $param_parts);
+					foreach ($param_parts[2] as $key => $paramName) {
+						$paramName = String::upper($paramName);
+						$paramValue = $param_parts[4][$key];
+						if ($paramName == 'TYPE') {
+							$paramValue = preg_split('/(?<!\\\\),/', $paramValue);
+							if (isset($params[$paramName])) {
+								if (!is_array($params[$paramName])) {
+									$params[$paramName] = array($params[$paramName]);
+								}
+								$params[$paramName] = array_merge($params[$paramName], $paramValue);
+							} else {
+								if (count($paramValue) == 1) {
+									$paramValue = $paramValue[0];
+								}
+								$params[$paramName] = $paramValue;
+							}
+						} else {
+							$params[$paramName] = $paramValue;
+						}
+					}
+				}
+
+				// Charset and encoding handling.
+				if (isset($params['QUOTED-PRINTABLE'])) {
+					$params['ENCODING'] = 'QUOTED-PRINTABLE';
+				}
+				if (isset($params['BASE64'])) {
+					$params['ENCODING'] = 'BASE64';
+				}
+				if (isset($params['ENCODING'])) {
+					switch (String::upper($params['ENCODING'])) {
+						case 'Q':
+						case 'QUOTED-PRINTABLE':
+							$value = quoted_printable_decode($value);
+							if (isset($params['CHARSET'])) {
+								$value = $GLOBALS['egw']->translation->convert($value, $params['CHARSET']);
+							} else {
+								$value = $GLOBALS['egw']->translation->convert($value,
+									empty($charset) ? ($this->isOldFormat() ? 'iso-8859-1' : 'utf-8') : $charset);
+							}
+							// Funambol hack :-(
+							$value = str_replace('\\\\n', "\n", $value);
+							break;
+						case 'B':
+						case 'BASE64':
+							$value = base64_decode($value);
+							break;
+					}
+				} elseif (isset($params['CHARSET'])) {
+					$value = $GLOBALS['egw']->translation->convert($value, $params['CHARSET']);
+				} else {
+					// As per RFC 2279, assume UTF8 if we don't have an
+					// explicit charset parameter.
+					$value = $GLOBALS['egw']->translation->convert($value,
+						empty($charset) ? ($this->isOldFormat() ? 'iso-8859-1' : 'utf-8') : $charset);
+				}
+
+				// Get timezone info for date fields from $params.
+				$tzid = isset($params['TZID']) ? trim($params['TZID'], '\"') : false;
+
+				switch ($tag) {
+					case 'VERSION': // already processed
+						break;
+						// Date fields.
+					case 'COMPLETED':
+					case 'CREATED':
+					case 'LAST-MODIFIED':
+						$this->setAttribute($tag, $this->_parseDateTime($value, $tzid), $params);
+						break;
+
+					case 'BDAY':
+					case 'X-SYNCJE-ANNIVERSARY':
+						$this->setAttribute($tag, $value, $params, true, $this->_parseDate($value));
+						break;
+
+					case 'DTEND':
+					case 'DTSTART':
+					case 'DTSTAMP':
+					case 'DUE':
+					case 'AALARM':
+					case 'DALARM':
+					case 'RECURRENCE-ID':
+					case 'X-RECURRENCE-ID':
+						// types like AALARM may contain additional data after a ;
+						// ignore these.
+						$ts = explode(';', $value);
+						if (isset($params['VALUE']) && $params['VALUE'] == 'DATE') {
+							$isDate = true;
+							$this->setAttribute($tag, $this->_parseDateTime($ts[0], $tzid), $params, true, $this->_parseDate($ts[0]));
+						} else {
+							$this->setAttribute($tag, $this->_parseDateTime($ts[0], $tzid), $params);
+						}
+						break;
+
+					case 'TRIGGER':
+						if (isset($params['VALUE'])) {
+							if ($params['VALUE'] == 'DATE-TIME') {
+								$this->setAttribute($tag, $this->_parseDateTime($value, $tzid), $params);
+							} else {
+								$this->setAttribute($tag, $this->_parseDuration($value), $params);
+							}
+						} else {
+							$this->setAttribute($tag, $this->_parseDuration($value), $params);
+						}
+						break;
+
+						// Comma or semicolon seperated dates.
+					case 'EXDATE':
+					case 'RDATE':
+						$dates = array();
+						preg_match_all('/[;,]([^;,]*)/', ';' . $value, $values);
+
+						foreach ($values[1] as $value) {
+							if ((isset($params['VALUE'])
+									&& $params['VALUE'] == 'DATE') || (!isset($params['VALUE']) && $isDate)) {
+								$dates[] = $this->_parseDate(trim($value));
+							} else {
+								$dates[] = $this->_parseDateTime(trim($value), $tzid);
+							}
+						}
+						$this->setAttribute($tag, isset($dates[0]) ? $dates[0] : null, $params, true, $dates);
+						break;
+
+						// Duration fields.
+					case 'DURATION':
+						$this->setAttribute($tag, $this->_parseDuration($value), $params);
+						break;
+
+						// Period of time fields.
+					case 'FREEBUSY':
+						$periods = array();
+						preg_match_all('/,([^,]*)/', ',' . $value, $values);
+						foreach ($values[1] as $value) {
+							$periods[] = $this->_parsePeriod($value);
+						}
+
+						$this->setAttribute($tag, isset($periods[0]) ? $periods[0] : null, $params, true, $periods);
+						break;
+
+						// UTC offset fields.
+					case 'TZOFFSETFROM':
+					case 'TZOFFSETTO':
+						$this->setAttribute($tag, $this->_parseUtcOffset($value), $params);
+						break;
+
+						// Integer fields.
+					case 'PERCENT-COMPLETE':
+					case 'PRIORITY':
+					case 'REPEAT':
+					case 'SEQUENCE':
+						$this->setAttribute($tag, intval($value), $params);
+						break;
+
+						// Geo fields.
+					case 'GEO':
+						if ($this->isOldFormat()) {
+							$floats = explode(',', $value);
+							$value = array('latitude' => floatval($floats[1]),
+								'longitude' => floatval($floats[0]));
+						} else {
+							$floats = explode(';', $value);
+							$value = array('latitude' => floatval($floats[0]),
+								'longitude' => floatval($floats[1]));
+						}
+						$this->setAttribute($tag, $value, $params);
+						break;
+
+						// Recursion fields. # add more flexibility
+						#case 'EXRULE':
+						#case 'RRULE':
+						#    $this->setAttribute($tag, trim($value), $params);
+						#    break;
+
+						// Binary fields.
+					case 'PHOTO':
+						$this->setAttribute($tag, $value, $params);
+						break;
+
+						// ADR, ORG and N are lists seperated by unescaped semicolons
+						// with a specific number of slots.
+					case 'ADR':
+					case 'N':
+					case 'ORG':
+						$value = trim($value);
+						// As of rfc 2426 2.4.2 semicolon, comma, and colon must
+						// be escaped (semicolon is unescaped after splitting below).
+						$value = str_replace(array('\\n', '\\N', '\\,', '\\:'),
+							array("\n", "\n", ',', ':'),
 							$value);
 
-		                // Split by unescaped semicolons:
-		                $values = preg_split('/(?<!\\\\);/', $value);
-		                $value = str_replace('\\;', ';', $value);
-		                $values = str_replace('\\;', ';', $values);
-		                $this->setAttribute($tag, trim($value), $params, true, $values);
-		                break;
-
-		                // CATEGORIES is a lists seperated by unescaped commas
-		                // with a unspecific number of slots.
-	                case 'CATEGORIES':
-		                $value = trim($value);
-		                // As of rfc 2426 2.4.2 semicolon, comma, and colon must
-		                // be escaped (comma is unescaped after splitting below).
-		                $value = str_replace(array('\\n', '\\N', '\\;', '\\:'),
-			                array("\n", "\n", ';', ':'),
+						// Split by unescaped semicolons:
+						$values = preg_split('/(?<!\\\\);/', $value);
+						$value = str_replace('\\;', ';', $value);
+						$values = str_replace('\\;', ';', $values);
+						$this->setAttribute($tag, trim($value), $params, true, $values);
+						break;
+
+						// CATEGORIES is a lists seperated by unescaped commas
+						// with a unspecific number of slots.
+					case 'CATEGORIES':
+						$value = trim($value);
+						// As of rfc 2426 2.4.2 semicolon, comma, and colon must
+						// be escaped (comma is unescaped after splitting below).
+						$value = str_replace(array('\\n', '\\N', '\\;', '\\:'),
+							array("\n", "\n", ';', ':'),
 							$value);
 
-		                // Split by unescaped commas:
-		                $values = preg_split('/(?<!\\\\),/', $value);
-		                $value = str_replace('\\,', ',', $value);
-		                $values = str_replace('\\,', ',', $values);
-		                $this->setAttribute($tag, trim($value), $params, true, $values);
-		                break;
-
-		                // String fields.
-	                default:
-		                if ($this->isOldFormat()) {
-			                $value = trim($value);
-			                // vCalendar 1.0 and vCard 2.1 only escape semicolons
-			                // and use unescaped semicolons to create lists.
-			                $value = str_replace(array('\\n', '\\N', '\\,', '\\:'),
-				                array("\n", "\n", ',', ':'),
+						// Split by unescaped commas:
+						$values = preg_split('/(?<!\\\\),/', $value);
+						$value = str_replace('\\,', ',', $value);
+						$values = str_replace('\\,', ',', $values);
+						$this->setAttribute($tag, trim($value), $params, true, $values);
+						break;
+
+						// String fields.
+					default:
+						if ($this->isOldFormat()) {
+							$value = trim($value);
+							// vCalendar 1.0 and vCard 2.1 only escape semicolons
+							// and use unescaped semicolons to create lists.
+							$value = str_replace(array('\\n', '\\N', '\\,', '\\:'),
+								array("\n", "\n", ',', ':'),
 								$value);
 
-			                // Split by unescaped semicolons:
-			                $values = preg_split('/(?<!\\\\);/', $value);
-			                $value = str_replace('\\;', ';', $value);
-			                $values = str_replace('\\;', ';', $values);
-			                $this->setAttribute($tag, trim($value), $params, true, $values);
-		                } else {
-			                $value = trim($value);
-			                // As of rfc 2426 2.4.2 semicolon, comma, and colon
-			                // must be escaped (comma is unescaped after splitting
-			                // below).
-			                $value = str_replace(array('\\n', '\\N', '\\;', '\\:', '\\\\'),
-				                array("\n", "\n", ';', ':', '\\'),
+							// Split by unescaped semicolons:
+							$values = preg_split('/(?<!\\\\);/', $value);
+							$value = str_replace('\\;', ';', $value);
+							$values = str_replace('\\;', ';', $values);
+							$this->setAttribute($tag, trim($value), $params, true, $values);
+						} else {
+							$value = trim($value);
+							// As of rfc 2426 2.4.2 semicolon, comma, and colon
+							// must be escaped (comma is unescaped after splitting
+							// below).
+							$value = str_replace(array('\\n', '\\N', '\\;', '\\:', '\\\\'),
+								array("\n", "\n", ';', ':', '\\'),
 								$value);
 
-			                // Split by unescaped commas.
-			                $values = preg_split('/(?<!\\\\),/', $value);
-			                $value = str_replace('\\,', ',', $value);
-			                $values = str_replace('\\,', ',', $values);
-			                $this->setAttribute($tag, trim($value), $params, true, $values);
-		                }
-	                break;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Export this component in vCal format.
-     *
-     * @param string $base  The type of the base object.
-     * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, standard character set for old format.
-     *
-     * @return string  vCal format data.
-     */
-    function _exportvData($base = 'VCALENDAR', $charset = null)
-    {
-    	$base = String::upper($base);
-
-        $result = 'BEGIN:' . $base . $this->_newline;
-
-        // VERSION is not allowed for entries enclosed in VCALENDAR/ICALENDAR,
-        // as it is part of the enclosing VCALENDAR/ICALENDAR. See rfc2445
-        if ($base !== 'VEVENT' && $base !== 'VTODO' && $base !== 'VALARM' &&
-            $base !== 'VJOURNAL' && $base !== 'VFREEBUSY' &&
-            $base !== 'VTIMEZONE' && $base !== 'STANDARD' && $base != 'DAYLIGHT') {
-            // Ensure that version is the first attribute.
-            $result .= 'VERSION:' . $this->_version . $this->_newline;
-        }
-
-        if (empty($charset)) {
-        	if ($this->isOldFormat()) {
-        		$charset = NLS::getCharset();
-        	} else {
-        		$charset = 'utf-8';
-        	}
-        }
-
-        foreach ($this->_attributes as $attribute) {
-            $name = $attribute['name'];
-            if ($name == 'VERSION') {
-                // Already done.
-                continue;
-            }
-
-            $params_str = '';
-            $params = $attribute['params'];
-            if ($params) {
-                foreach ($params as $param_name => $param_value) {
-                    /* Skip CHARSET for iCalendar 2.0 data, not allowed. */
-                    if ($param_name == 'CHARSET') {
-                    	if (!$this->isOldFormat() || empty($param_value)) {
-                        	continue;
-                    	} else {
-                    		$param_value = String::Upper($param_value);
-                    	}
-                    }
-                    if ($param_name == 'ENCODING') {
-                    	continue;
-                    }
-                    /* Skip VALUE=DATE for vCalendar 1.0 data, not allowed. */
-                    if ($this->isOldFormat() &&
-                        $param_name == 'VALUE' && $param_value == 'DATE') {
-                        continue;
-                    }
-                    /* Skip TZID for iCalendar 1.0 data, not supported. */
+							// Split by unescaped commas.
+							$values = preg_split('/(?<!\\\\),/', $value);
+							$value = str_replace('\\,', ',', $value);
+							$values = str_replace('\\,', ',', $values);
+							$this->setAttribute($tag, trim($value), $params, true, $values);
+						}
+					break;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Export this component in vCal format.
+	 *
+	 * @param string $base  The type of the base object.
+	 * @param string $charset  The encoding charset for $text. Defaults to
+	 *                         utf-8 for new format, standard character set for old format.
+	 *
+	 * @return string  vCal format data.
+	 */
+	function _exportvData($base = 'VCALENDAR', $charset = null)
+	{
+		$base = String::upper($base);
+
+		$result = 'BEGIN:' . $base . $this->_newline;
+
+		// VERSION is not allowed for entries enclosed in VCALENDAR/ICALENDAR,
+		// as it is part of the enclosing VCALENDAR/ICALENDAR. See rfc2445
+		if ($base !== 'VEVENT' && $base !== 'VTODO' && $base !== 'VALARM' &&
+			$base !== 'VJOURNAL' && $base !== 'VFREEBUSY' &&
+			$base !== 'VTIMEZONE' && $base !== 'STANDARD' && $base != 'DAYLIGHT') {
+			// Ensure that version is the first attribute.
+			$result .= 'VERSION:' . $this->_version . $this->_newline;
+		}
+
+		if (empty($charset)) {
+			if ($this->isOldFormat()) {
+				$charset = NLS::getCharset();
+			} else {
+				$charset = 'utf-8';
+			}
+		}
+
+		foreach ($this->_attributes as $attribute) {
+			$name = $attribute['name'];
+			if ($name == 'VERSION') {
+				// Already done.
+				continue;
+			}
+
+			$params_str = '';
+			$params = $attribute['params'];
+			if ($params) {
+				foreach ($params as $param_name => $param_value) {
+					/* Skip CHARSET for iCalendar 2.0 data, not allowed. */
+					if ($param_name == 'CHARSET') {
+						if (!$this->isOldFormat() || empty($param_value)) {
+							continue;
+						} else {
+							$param_value = String::Upper($param_value);
+						}
+					}
+					if ($param_name == 'ENCODING') {
+						continue;
+					}
+					/* Skip VALUE=DATE for vCalendar 1.0 data, not allowed. */
+					if ($this->isOldFormat() &&
+						$param_name == 'VALUE' && $param_value == 'DATE') {
+						continue;
+					}
+					/* Skip TZID for iCalendar 1.0 data, not supported. */
 					if ($this->isOldFormat() && $param_name == 'TZID') {
-                        continue;
-                    }
-                    // Skip CN in ATTENDEE adn ORGANIZER for vCalendar 1.0
-                    if ($this->isOldFormat() && $param_name == 'CN' &&
-                    	($name == 'ATTENDEE' || $name == 'ORGANIZER')) {
-                    	continue;
-                    }
-                    if ($param_value === null) {
-                        $params_str .= ";$param_name";
-                    } else {
-                        $params_str .= ";$param_name=$param_value";
-                    }
-                }
-            }
-
-            $value = $attribute['value'];
-
-            switch ($name) {
-            // Date fields.
-            case 'COMPLETED':
-            case 'CREATED':
-            case 'DCREATED':
-            case 'LAST-MODIFIED':
-                $value = $this->_exportDateTime($value);
-                break;
+						continue;
+					}
+					// Skip CN in ATTENDEE adn ORGANIZER for vCalendar 1.0
+					if ($this->isOldFormat() && $param_name == 'CN' &&
+						($name == 'ATTENDEE' || $name == 'ORGANIZER')) {
+						continue;
+					}
+					if ($param_value === null) {
+						$params_str .= ";$param_name";
+					} else {
+						$params_str .= ";$param_name=$param_value";
+					}
+				}
+			}
+
+			$value = $attribute['value'];
+
+			switch ($name) {
+			// Date fields.
+			case 'COMPLETED':
+			case 'CREATED':
+			case 'DCREATED':
+			case 'LAST-MODIFIED':
+				$value = $this->_exportDateTime($value);
+				break;
 
 			// Support additional fields after date.
  			case 'AALARM':
-            case 'DALARM':
-            	if (isset($params['VALUE'])) {
-                    if ($params['VALUE'] == 'DATE') {
-                        // VCALENDAR 1.0 uses T000000 - T235959 for all day events:
-                        if ($this->isOldFormat() && $name == 'DTEND') {
-                            $d = new Horde_Date($value);
-                            $value = new Horde_Date(array(
-                                'year' => $d->year,
-                                'month' => $d->month,
-                                'mday' => $d->mday - 1));
-                            $value->correct();
-                            $value = $this->_exportDate($value, '235959');
-                        } else {
-                            $value = $this->_exportDate($value, '000000');
-                        }
-                    } else {
-                        $value = $this->_exportDateTime($value);
-                    }
-                } else {
-                    $value = $this->_exportDateTime($value);
-                }
-
-            	if (is_array($attribute['values']) &&
-		            	count($attribute['values']) > 0) {
-		            $values = $attribute['values'];
-	            	if ($this->isOldFormat()) {
-		            	$values = str_replace(';', '\\;', $values);
-	            	} else {
-                        // As of rfc 2426 2.5 semicolon and comma must be
-                        // escaped.
-                        $values = str_replace(array('\\', ';', ','),
-                                              array('\\\\', '\\;', '\\,'),
-                                              $values);
-	            	}
-	            	$value .= ';' . implode(';', $values);
-		         }
-
-                break;
-
-            case 'DTEND':
-            case 'DTSTART':
-            case 'DTSTAMP':
-            case 'DUE':
-            case 'RECURRENCE-ID':
-            case 'X-RECURRENCE-ID':
-                if (isset($params['VALUE'])) {
-                    if ($params['VALUE'] == 'DATE') {
-                        // VCALENDAR 1.0 uses T000000 - T235959 for all day events:
-                        if ($this->isOldFormat() && $name == 'DTEND') {
-                            $d = new Horde_Date($value);
-                            $value = new Horde_Date(array(
-                                'year' => $d->year,
-                                'month' => $d->month,
-                                'mday' => $d->mday - 1));
-                            $value->correct();
-                            $value = $this->_exportDate($value, '235959');
-                        } else {
-                            $value = $this->_exportDate($value, '000000');
-                        }
-                    } else {
-                        $value = $this->_exportDateTime($value);
-                    }
-                } else {
-                    $value = $this->_exportDateTime($value);
-                }
-                break;
-
-            // Comma or semicolon seperated dates.
-            case 'EXDATE':
-            case 'RDATE':
-	            if (is_array($attribute['values'])) {
-		            $values = $attribute['values'];
-	            } elseif (!empty($value)) {
-	            	if ($this->isOldFormat()) {
-		            	$values = explode(';', $value);
-	            	} else {
-	            		$values = explode(',', $value);
-	            	}
-	            } else {
-		            break;
-	            }
-                $dates = array();
-                foreach ($values as $date) {
-                    if (isset($params['VALUE'])) {
-                        if ($params['VALUE'] == 'DATE') {
-                            $dates[] = $this->_exportDate($date, '000000');
-                        } elseif ($params['VALUE'] == 'PERIOD') {
-                            $dates[] = $this->_exportPeriod($date);
-                        } else {
-                            $dates[] = $this->_exportDateTime($date);
-                        }
-                    } else {
-                        $dates[] = $this->_exportDateTime($date);
-                    }
-                }
-                if ($this->isOldFormat()) {
-	                $value = implode(';', $dates);
-                } else {
-	                $value = implode(',', $dates);
-                }
-                break;
-
-            case 'TRIGGER':
-                if (isset($params['VALUE'])) {
-                    if ($params['VALUE'] == 'DATE-TIME') {
-                        $value = $this->_exportDateTime($value);
-                    } elseif ($params['VALUE'] == 'DURATION') {
-                        $value = $this->_exportDuration($value);
-                    }
-                } else {
-                    $value = $this->_exportDuration($value);
-                }
-                break;
-
-            // Duration fields.
-            case 'DURATION':
-                $value = $this->_exportDuration($value);
-                break;
-
-            // Period of time fields.
-            case 'FREEBUSY':
-                $value_str = '';
-                foreach ($value as $period) {
-                    $value_str .= empty($value_str) ? '' : ',';
-                    $value_str .= $this->_exportPeriod($period);
-                }
-                $value = $value_str;
-                break;
-
-            // UTC offset fields.
-            case 'TZOFFSETFROM':
-            case 'TZOFFSETTO':
-                $value = $this->_exportUtcOffset($value);
-                break;
-
-            // Integer fields.
-            case 'PERCENT-COMPLETE':
-            case 'PRIORITY':
-            case 'REPEAT':
-            case 'SEQUENCE':
-                $value = "$value";
-                break;
-
-            // Geo fields.
-            case 'GEO':
-                if ($this->isOldFormat()) {
-                    $value = $value['longitude'] . ',' . $value['latitude'];
-                } else {
-                    $value = $value['latitude'] . ';' . $value['longitude'];
-                }
-                break;
-
-            // Recurrence fields.
-            case 'EXRULE':
-            	break;
-
-            case 'RRULE':
-                if (!empty($params_str) &&  $params_str[0] == ';')
-                {
-                	// The standard requires a double colon RRULE:...
-                	 $params_str[0] = ':';
-                }
-                break;
-
-            case 'PHOTO':
-                break;
-
-            default:
-                if ($this->isOldFormat()) {
-                    if (is_array($attribute['values']) &&
-                        count($attribute['values']) > 1) {
-                        $values = $attribute['values'];
-                        if ($name == 'N' || $name == 'ADR' || $name == 'ORG') {
-                            $glue = ';';
-                        } else {
-                            $glue = ',';
-                        }
-                        $values = str_replace(';', '\\;', $values);
-                        $value = implode($glue, $values);
-                    } else {
-                        /* vcard 2.1 and vcalendar 1.0 escape only
+			case 'DALARM':
+				if (isset($params['VALUE'])) {
+					if ($params['VALUE'] == 'DATE') {
+						// VCALENDAR 1.0 uses T000000 - T235959 for all day events:
+						if ($this->isOldFormat() && $name == 'DTEND') {
+							$d = new Horde_Date($value);
+							$value = new Horde_Date(array(
+								'year' => $d->year,
+								'month' => $d->month,
+								'mday' => $d->mday - 1));
+							$value->correct();
+							$value = $this->_exportDate($value, '235959');
+						} else {
+							$value = $this->_exportDate($value, '000000');
+						}
+					} else {
+						$value = $this->_exportDateTime($value);
+					}
+				} else {
+					$value = $this->_exportDateTime($value);
+				}
+
+				if (is_array($attribute['values']) &&
+						count($attribute['values']) > 0) {
+					$values = $attribute['values'];
+					if ($this->isOldFormat()) {
+						$values = str_replace(';', '\\;', $values);
+					} else {
+						// As of rfc 2426 2.5 semicolon and comma must be
+						// escaped.
+						$values = str_replace(array('\\', ';', ','),
+											  array('\\\\', '\\;', '\\,'),
+											  $values);
+					}
+					$value .= ';' . implode(';', $values);
+				 }
+
+				break;
+
+			case 'DTEND':
+			case 'DTSTART':
+			case 'DTSTAMP':
+			case 'DUE':
+			case 'RECURRENCE-ID':
+			case 'X-RECURRENCE-ID':
+				if (isset($params['VALUE'])) {
+					if ($params['VALUE'] == 'DATE') {
+						// VCALENDAR 1.0 uses T000000 - T235959 for all day events:
+						if ($this->isOldFormat() && $name == 'DTEND') {
+							$d = new Horde_Date($value);
+							$value = new Horde_Date(array(
+								'year' => $d->year,
+								'month' => $d->month,
+								'mday' => $d->mday - 1));
+							$value->correct();
+							$value = $this->_exportDate($value, '235959');
+						} else {
+							$value = $this->_exportDate($value, '000000');
+						}
+					} else {
+						$value = $this->_exportDateTime($value);
+					}
+				} else {
+					$value = $this->_exportDateTime($value);
+				}
+				break;
+
+			// Comma or semicolon seperated dates.
+			case 'EXDATE':
+			case 'RDATE':
+				if (is_array($attribute['values'])) {
+					$values = $attribute['values'];
+				} elseif (!empty($value)) {
+					if ($this->isOldFormat()) {
+						$values = explode(';', $value);
+					} else {
+						$values = explode(',', $value);
+					}
+				} else {
+					break;
+				}
+				$dates = array();
+				foreach ($values as $date) {
+					if (isset($params['VALUE'])) {
+						if ($params['VALUE'] == 'DATE') {
+							$dates[] = $this->_exportDate($date, '000000');
+						} elseif ($params['VALUE'] == 'PERIOD') {
+							$dates[] = $this->_exportPeriod($date);
+						} else {
+							$dates[] = $this->_exportDateTime($date);
+						}
+					} else {
+						$dates[] = $this->_exportDateTime($date);
+					}
+				}
+				if ($this->isOldFormat()) {
+					$value = implode(';', $dates);
+				} else {
+					$value = implode(',', $dates);
+				}
+				break;
+
+			case 'TRIGGER':
+				if (isset($params['VALUE'])) {
+					if ($params['VALUE'] == 'DATE-TIME') {
+						$value = $this->_exportDateTime($value);
+					} elseif ($params['VALUE'] == 'DURATION') {
+						$value = $this->_exportDuration($value);
+					}
+				} else {
+					$value = $this->_exportDuration($value);
+				}
+				break;
+
+			// Duration fields.
+			case 'DURATION':
+				$value = $this->_exportDuration($value);
+				break;
+
+			// Period of time fields.
+			case 'FREEBUSY':
+				$value_str = '';
+				foreach ($value as $period) {
+					$value_str .= empty($value_str) ? '' : ',';
+					$value_str .= $this->_exportPeriod($period);
+				}
+				$value = $value_str;
+				break;
+
+			// UTC offset fields.
+			case 'TZOFFSETFROM':
+			case 'TZOFFSETTO':
+				$value = $this->_exportUtcOffset($value);
+				break;
+
+			// Integer fields.
+			case 'PERCENT-COMPLETE':
+			case 'PRIORITY':
+			case 'REPEAT':
+			case 'SEQUENCE':
+				$value = "$value";
+				break;
+
+			// Geo fields.
+			case 'GEO':
+				if ($this->isOldFormat()) {
+					$value = $value['longitude'] . ',' . $value['latitude'];
+				} else {
+					$value = $value['latitude'] . ';' . $value['longitude'];
+				}
+				break;
+
+			// Recurrence fields.
+			case 'EXRULE':
+				break;
+
+			case 'RRULE':
+				if (!empty($params_str) &&  $params_str[0] == ';')
+				{
+					// The standard requires a double colon RRULE:...
+					 $params_str[0] = ':';
+				}
+				break;
+
+			case 'PHOTO':
+				break;
+
+			default:
+				if ($this->isOldFormat()) {
+					if (is_array($attribute['values']) &&
+						count($attribute['values']) > 1) {
+						$values = $attribute['values'];
+						if ($name == 'N' || $name == 'ADR' || $name == 'ORG') {
+							$glue = ';';
+						} else {
+							$glue = ',';
+						}
+						$values = str_replace(';', '\\;', $values);
+						$value = implode($glue, $values);
+					} else {
+						/* vcard 2.1 and vcalendar 1.0 escape only
                          * semicolons */
-                        $value = str_replace(';', '\\;', $value);
-                    }
-                    // Text containing newlines or ASCII >= 127 must be BASE64
-                    // or QUOTED-PRINTABLE encoded. Currently we use
-                    // QUOTED-PRINTABLE as default.
-                    if (preg_match('/[^\x20-\x7F]/', $value) &&
-		                    !isset($params['ENCODING']))  {
-	                    $params['ENCODING'] = 'QUOTED-PRINTABLE';
-                    }
-                    if (preg_match('/([\177-\377])/', $value) &&
-		                    !isset($params['CHARSET'])) {
-	                    // Add CHARSET as well. At least the synthesis client
-	                    // gets confused otherwise
-	                    $params['CHARSET'] = String::upper($charset);
-	                    $params_str .= ';CHARSET=' . $params['CHARSET'];
-                    }
-                } else {
-                    if (is_array($attribute['values']) &&
-                        count($attribute['values']) > 1) {
-                        $values = $attribute['values'];
-                        if ($name == 'N' || $name == 'ADR' || $name == 'ORG') {
-                            $glue = ';';
-                        } else {
-                            $glue = ',';
-                        }
-                        // As of rfc 2426 2.5 semicolon and comma must be
-                        // escaped.
-                        $values = str_replace(array('\\', ';', ','),
-                                              array('\\\\', '\\;', '\\,'),
-                                              $values);
-                        $value = implode($glue, $values);
-                    } else {
-                        // As of rfc 2426 2.5 semicolon and comma must be
-                        // escaped.
-                        $value = str_replace(array('\\', ';', ','),
-                                             array('\\\\', '\\;', '\\,'),
-                                             $value);
-                    }
-                    $value = preg_replace('/\r?\n/', "\n", $value);
-                }
-            }
+						$value = str_replace(';', '\\;', $value);
+					}
+					// Text containing newlines or ASCII >= 127 must be BASE64
+					// or QUOTED-PRINTABLE encoded. Currently we use
+					// QUOTED-PRINTABLE as default.
+					if (preg_match('/[^\x20-\x7F]/', $value) &&
+							!isset($params['ENCODING']))  {
+						$params['ENCODING'] = 'QUOTED-PRINTABLE';
+					}
+					if (preg_match('/([\177-\377])/', $value) &&
+							!isset($params['CHARSET'])) {
+						// Add CHARSET as well. At least the synthesis client
+						// gets confused otherwise
+						$params['CHARSET'] = String::upper($charset);
+						$params_str .= ';CHARSET=' . $params['CHARSET'];
+					}
+				} else {
+					if (is_array($attribute['values']) &&
+						count($attribute['values']) > 1) {
+						$values = $attribute['values'];
+						if ($name == 'N' || $name == 'ADR' || $name == 'ORG') {
+							$glue = ';';
+						} else {
+							$glue = ',';
+						}
+						// As of rfc 2426 2.5 semicolon and comma must be
+						// escaped.
+						$values = str_replace(array('\\', ';', ','),
+											  array('\\\\', '\\;', '\\,'),
+											  $values);
+						$value = implode($glue, $values);
+					} else {
+						// As of rfc 2426 2.5 semicolon and comma must be
+						// escaped.
+						$value = str_replace(array('\\', ';', ','),
+											 array('\\\\', '\\;', '\\,'),
+											 $value);
+					}
+					$value = preg_replace('/\r?\n/', "\n", $value);
+				}
+			}
 
 			$encoding = (!empty($params['ENCODING']) && strlen(trim($value)) > 0);
 
-            if ($encoding) {
-	            switch($params['ENCODING']) {
-		            case 'Q':
-		            case 'QUOTED-PRINTABLE':
-		            	if (!$this->isOldFormat())
-		            	{
-		            		$encoding = false;
-		            		break;
-		            	}
-			            $params_str .= ';ENCODING=' . $params['ENCODING'];
-			            $value = str_replace("\r", '', $value);
-			            $result .= $name . $params_str . ':'
-				            . str_replace('=0A', '=0D=0A',
-					            $this->_quotedPrintableEncode($value))
+			if ($encoding) {
+				switch($params['ENCODING']) {
+					case 'Q':
+					case 'QUOTED-PRINTABLE':
+						if (!$this->isOldFormat())
+						{
+							$encoding = false;
+							break;
+						}
+						$params_str .= ';ENCODING=' . $params['ENCODING'];
+						$value = str_replace("\r", '', $value);
+						$result .= $name . $params_str . ':'
+							. str_replace('=0A', '=0D=0A',
+								$this->_quotedPrintableEncode($value))
 								. $this->_newline;
-			            break;
-		            case 'FUNAMBOL-QP':
-		            	// Funambol needs some special quoting
-			            $value = str_replace(array('<', "\r"), array('&lt;', ''), $value);
-			            if (!$this->isOldFormat())
-			            {
-			            	$encoding = false;
-			            	break;
-			            }
-			            $params_str .= ';ENCODING=QUOTED-PRINTABLE';
-			            $result .= $name . $params_str . ':'
-				            . str_replace('=0A', '=0D=0A',
-					            $this->_quotedPrintableEncode($value, false))
+						break;
+					case 'FUNAMBOL-QP':
+						// Funambol needs some special quoting
+						$value = str_replace(array('<', "\r"), array('&lt;', ''), $value);
+						if (!$this->isOldFormat())
+						{
+							$encoding = false;
+							break;
+						}
+						$params_str .= ';ENCODING=QUOTED-PRINTABLE';
+						$result .= $name . $params_str . ':'
+							. str_replace('=0A', '=0D=0A',
+								$this->_quotedPrintableEncode($value, false))
 								. $this->_newline;
-			            break;
-		            case 'B':
-		            case 'BASE64':
-			            $params_str .= ';ENCODING=' . $params['ENCODING'];
-			            // using native php wordwrap to speed up encoding of images
-			            $result .= wordwrap($name . $params_str . ':' . $this->_newline . ' ' .
-			            	$this->_base64Encode($value),75,$this->_newline . ' ',true) . $this->_newline;
-			            /*
+						break;
+					case 'B':
+					case 'BASE64':
+						$params_str .= ';ENCODING=' . $params['ENCODING'];
+						// using native php wordwrap to speed up encoding of images
+						$result .= wordwrap($name . $params_str . ':' . $this->_newline . ' ' .
+							$this->_base64Encode($value),75,$this->_newline . ' ',true) . $this->_newline;
+						/*
 			            $attr_string = $name . $params_str . ':' . $this->_newline . ' ' . $this->_base64Encode($value);
 			            $attr_string = String::wordwrap($attr_string, 75, $this->_newline . ' ',
 				            true, 'utf-8', true); // charset does not matter
 			            $result .= $attr_string . $this->_newline;
 			            */
-			            if ($this->isOldFormat()) {
-				            $result .= $this->_newline; // Append an empty line
-			            }
-	            }
-            }
-
-            if (!$encoding) {
-                $value = str_replace(array("\r", "\n"), array('', '\\n'), $value);
-                $attr_string = $name . $params_str;
-                if (strlen($value) > 0) {
-                	$attr_string .= ':' . $value;
-                } elseif ($name != 'RRULE') {
-                	$attr_string .= ':';
-                }
-                if (!$this->isOldFormat()) {
-                    $attr_string = String::wordwrap($attr_string, 75, $this->_newline . ' ',
-                                                    true, $charset, true);
-                }
-                $result .= $attr_string . $this->_newline;
-            }
-        }
-
-        foreach ($this->_components as $component) {
-            if ($this->isOldFormat() &&  $component->getType() == 'vTimeZone') {
-    			// Not supported
+						if ($this->isOldFormat()) {
+							$result .= $this->_newline; // Append an empty line
+						}
+				}
+			}
+
+			if (!$encoding) {
+				$value = str_replace(array("\r", "\n"), array('', '\\n'), $value);
+				$attr_string = $name . $params_str;
+				if (strlen($value) > 0) {
+					$attr_string .= ':' . $value;
+				} elseif ($name != 'RRULE') {
+					$attr_string .= ':';
+				}
+				if (!$this->isOldFormat()) {
+					$attr_string = String::wordwrap($attr_string, 75, $this->_newline . ' ',
+													true, $charset, true);
+				}
+				$result .= $attr_string . $this->_newline;
+			}
+		}
+
+		foreach ($this->_components as $component) {
+			if ($this->isOldFormat() &&  $component->getType() == 'vTimeZone') {
+				// Not supported
 				continue;
-        	}
-            $result .= $component->exportvCalendar($charset);
-        }
-
-        return $result . 'END:' . $base . $this->_newline;
-    }
-
-    /**
-     * Parse a UTC Offset field.
-     */
-    function _parseUtcOffset($text)
-    {
-        $offset = array();
-        if (preg_match('/(\+|-)([0-9]{2})([0-9]{2})([0-9]{2})?/', $text, $timeParts)) {
-            $offset['ahead']  = (bool)($timeParts[1] == '+');
-            $offset['hour']   = intval($timeParts[2]);
-            $offset['minute'] = intval($timeParts[3]);
-            if (isset($timeParts[4])) {
-                $offset['second'] = intval($timeParts[4]);
-            }
-            return $offset;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Export a UTC Offset field.
-     */
-    function _exportUtcOffset($value)
-    {
-        $offset = $value['ahead'] ? '+' : '-';
-        $offset .= sprintf('%02d%02d',
-                           $value['hour'], $value['minute']);
-        if (isset($value['second'])) {
-            $offset .= sprintf('%02d', $value['second']);
-        }
-
-        return $offset;
-    }
-
-    /**
-     * Parse a Time Period field.
-     */
-    function _parsePeriod($text)
-    {
-        $periodParts = explode('/', $text);
-
-        $start = $this->_parseDateTime($periodParts[0]);
-
-        if ($duration = $this->_parseDuration($periodParts[1])) {
-            return array('start' => $start, 'duration' => $duration);
-        } elseif ($end = $this->_parseDateTime($periodParts[1])) {
-            return array('start' => $start, 'end' => $end);
-        }
-    }
-
-    /**
-     * Export a Time Period field.
-     */
-    function _exportPeriod($value)
-    {
-        $period = $this->_exportDateTime($value['start']);
-        $period .= '/';
-        if (isset($value['duration'])) {
-            $period .= $this->_exportDuration($value['duration']);
-        } else {
-            $period .= $this->_exportDateTime($value['end']);
-        }
-        return $period;
-    }
-
-    /**
-     * Grok the TZID and return an offset in seconds from UTC for this
-     * date and time.
-     */
-    function _parseTZID($date, $time, $tzid)
-    {
-        $vtimezone = $this->_container->findComponentByAttribute('vtimezone', 'TZID', $tzid);
-        if (!$vtimezone) {
-            return false;
-        }
-
-        $change_times = array();
-        foreach ($vtimezone->getComponents() as $o) {
-            $t = $vtimezone->parseChild($o, $date['year']);
-            if ($t !== false) {
-                $change_times[] = $t;
-            }
-        }
-
-        if (!$change_times) {
-            return false;
-        }
-
-        sort($change_times);
-
-        // Time is arbitrarily based on UTC for comparison.
-        $t = @gmmktime($time['hour'], $time['minute'], $time['second'],
-                       $date['month'], $date['mday'], $date['year']);
-
-        if ($t < $change_times[0]['time']) {
-            return $change_times[0]['from'];
-        }
-
-        for ($i = 0, $n = count($change_times); $i < $n - 1; $i++) {
-            if (($t >= $change_times[$i]['time']) &&
-                ($t < $change_times[$i + 1]['time'])) {
-                return $change_times[$i]['to'];
-            }
-        }
-
-        if ($t >= $change_times[$n - 1]['time']) {
-            return $change_times[$n - 1]['to'];
-        }
-
-        return false;
-    }
-
-    /**
-     * Parses a DateTime field and returns a unix timestamp. If the
-     * field cannot be parsed then the original text is returned
-     * unmodified.
-     *
-     * @todo This function should be moved to Horde_Date and made public.
-     */
-    function _parseDateTime($text, $tzid = false)
-    {
-        $dateParts = explode('T', $text);
-        if (count($dateParts) != 2 && !empty($text)) {
-            // Not a datetime field but may be just a date field.
-            if (!preg_match('/^(\d{4})-?(\d{2})-?(\d{2})$/', $text, $match)) {
-                // Or not
-                return $text;
-            }
-            $newtext = $text.'T000000';
-            $dateParts = explode('T', $newtext);
-        }
-
-        if (!$date = Horde_iCalendar::_parseDate($dateParts[0])) {
-            return $text;
-        }
-        if (!$time = Horde_iCalendar::_parseTime($dateParts[1])) {
-            return $text;
-        }
-
-        // Get timezone info for date fields from $tzid and container.
-        $tzoffset = ($time['zone'] == 'Local' && $tzid && is_a($this->_container, 'Horde_iCalendar'))
-            ? $this->_parseTZID($date, $time, $tzid) : false;
-        if ($time['zone'] == 'UTC' || $tzoffset !== false) {
-            $result = @gmmktime($time['hour'], $time['minute'], $time['second'],
-                                $date['month'], $date['mday'], $date['year']);
-            if ($tzoffset) {
-                $result -= $tzoffset;
-            }
-        } else {
-            // We don't know the timezone so assume local timezone.
-            // FIXME: shouldn't this be based on the user's timezone
-            // preference rather than the server's timezone?
-            $result = @mktime($time['hour'], $time['minute'], $time['second'],
-                              $date['month'], $date['mday'], $date['year']);
-        }
-
-        return ($result !== false) ? $result : $text;
-    }
-
-    /**
-     * Export a DateTime field.
-     */
-    function _exportDateTime($value)
-    {
-        if (is_numeric($value)) {
-            $temp = array();
-            $tz = date('O', $value);
-            $TZOffset = (3600 * substr($tz, 0, 3)) + (60 * substr(date('O', $value), 3, 2));
-            $value -= $TZOffset;
-
-            $temp['zone']   = 'UTC';
-            $temp['year']   = date('Y', $value);
-            $temp['month']  = date('n', $value);
-            $temp['mday']   = date('j', $value);
-            $temp['hour']   = date('G', $value);
-            $temp['minute'] = date('i', $value);
-            $temp['second'] = date('s', $value);
-            return Horde_iCalendar::_exportDate($temp) . 'T' . Horde_iCalendar::_exportTime($temp);
-        } else if (is_object($value) || is_array($value)) {
-            $dateOb = new Horde_Date($value);
-            return Horde_iCalendar::_exportDateTime($dateOb->timestamp());
-        }
-        return $value; // nothing to do with us, let's not touch it
-    }
-
-    /**
-     * Parses a Time field.
-     *
-     * @static
-     */
-    function _parseTime($text)
-    {
-        if (preg_match('/([0-9]{2})([0-9]{2})([0-9]{2})(Z)?/', $text, $timeParts)) {
-            $time['hour'] = intval($timeParts[1]);
-            $time['minute'] = intval($timeParts[2]);
-            $time['second'] = intval($timeParts[3]);
-            if (isset($timeParts[4])) {
-                $time['zone'] = 'UTC';
-            } else {
-                $time['zone'] = 'Local';
-            }
-            return $time;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Exports a Time field.
-     */
-    function _exportTime($value)
-    {
-        $time = sprintf('%02d%02d%02d',
-                        $value['hour'], $value['minute'], $value['second']);
-        if ($value['zone'] == 'UTC') {
-            $time .= 'Z';
-        }
-        return $time;
-    }
-
-    /**
-     * Parses a Date field.
-     *
-     * @static
-     */
-    function _parseDate($text)
-    {
-        $parts = explode('T', $text);
-        if (count($parts) == 2) {
-            $text = $parts[0];
-        }
-
-        if (!preg_match('/^(\d{4})-?(\d{2})-?(\d{2})$/', $text, $match)) {
-            return false;
-        }
-
-        return array('year' => $match[1],
-                     'month' => $match[2],
-                     'mday' => $match[3]);
-    }
-
-    /**
-     * Exports a date field.
-     *
-     * @param object|array $value  Date object or hash.
-     * @param string $autoconvert  If set, use this as time part to export the
-     *                             date as datetime when exporting to Vcalendar
-     *                             1.0. Examples: '000000' or '235959'
-     */
-    function _exportDate($value, $autoconvert = false)
-    {
-        if (is_object($value)) {
-            $value = array('year' => $value->year, 'month' => $value->month, 'mday' => $value->mday);
-        }
-        if ($autoconvert !== false && $this->isOldFormat()) {
-            return sprintf('%04d%02d%02dT%s', $value['year'], $value['month'], $value['mday'], $autoconvert);
-        } else {
-            return sprintf('%04d%02d%02d', $value['year'], $value['month'], $value['mday']);
-        }
-    }
-
-    /**
-     * Parse a Duration Value field.
-     */
-    function _parseDuration($text)
-    {
-        if (preg_match('/([+]?|[-])P(([0-9]+W)|([0-9]+D)|)(T(([0-9]+H)|([0-9]+M)|([0-9]+S))+)?/', trim($text), $durvalue)) {
-            // Weeks.
-            $duration = 7 * 86400 * intval($durvalue[3]);
-
-            if (count($durvalue) > 4) {
-                // Days.
-                $duration += 86400 * intval($durvalue[4]);
-            }
-            if (count($durvalue) > 5) {
-                // Hours.
-                $duration += 3600 * intval($durvalue[7]);
-
-                // Mins.
-                if (isset($durvalue[8])) {
-                    $duration += 60 * intval($durvalue[8]);
-                }
-
-                // Secs.
-                if (isset($durvalue[9])) {
-                    $duration += intval($durvalue[9]);
-                }
-            }
-
-            // Sign.
-            if ($durvalue[1] == "-") {
-                $duration *= -1;
-            }
-
-            return $duration;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Export a duration value.
-     */
-    function _exportDuration($value)
-    {
-        $duration = '';
-        if ($value < 0) {
-            $value *= -1;
-            $duration .= '-';
-        }
-        $duration .= 'P';
-
-        $weeks = floor($value / (7 * 86400));
-        $value = $value % (7 * 86400);
-        if ($weeks) {
-            $duration .= $weeks . 'W';
-        }
-
-        $days = floor($value / (86400));
-        $value = $value % (86400);
-        if ($days) {
-            $duration .= $days . 'D';
-        }
-
-        if ($value) {
-            $duration .= 'T';
-
-            $hours = floor($value / 3600);
-            $value = $value % 3600;
-            if ($hours) {
-                $duration .= $hours . 'H';
-            }
-
-            $mins = floor($value / 60);
-            $value = $value % 60;
-            if ($mins) {
-                $duration .= $mins . 'M';
-            }
-
-            if ($value) {
-                $duration .= $value . 'S';
-            }
-        }
+			}
+			$result .= $component->exportvCalendar($charset);
+		}
+
+		return $result . 'END:' . $base . $this->_newline;
+	}
+
+	/**
+	 * Parse a UTC Offset field.
+	 */
+	function _parseUtcOffset($text)
+	{
+		$offset = array();
+		if (preg_match('/(\+|-)([0-9]{2})([0-9]{2})([0-9]{2})?/', $text, $timeParts)) {
+			$offset['ahead']  = (bool)($timeParts[1] == '+');
+			$offset['hour']   = intval($timeParts[2]);
+			$offset['minute'] = intval($timeParts[3]);
+			if (isset($timeParts[4])) {
+				$offset['second'] = intval($timeParts[4]);
+			}
+			return $offset;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Export a UTC Offset field.
+	 */
+	function _exportUtcOffset($value)
+	{
+		$offset = $value['ahead'] ? '+' : '-';
+		$offset .= sprintf('%02d%02d',
+						   $value['hour'], $value['minute']);
+		if (isset($value['second'])) {
+			$offset .= sprintf('%02d', $value['second']);
+		}
+
+		return $offset;
+	}
+
+	/**
+	 * Parse a Time Period field.
+	 */
+	function _parsePeriod($text)
+	{
+		$periodParts = explode('/', $text);
+
+		$start = $this->_parseDateTime($periodParts[0]);
+
+		if ($duration = $this->_parseDuration($periodParts[1])) {
+			return array('start' => $start, 'duration' => $duration);
+		} elseif ($end = $this->_parseDateTime($periodParts[1])) {
+			return array('start' => $start, 'end' => $end);
+		}
+	}
+
+	/**
+	 * Export a Time Period field.
+	 */
+	function _exportPeriod($value)
+	{
+		$period = $this->_exportDateTime($value['start']);
+		$period .= '/';
+		if (isset($value['duration'])) {
+			$period .= $this->_exportDuration($value['duration']);
+		} else {
+			$period .= $this->_exportDateTime($value['end']);
+		}
+		return $period;
+	}
+
+	/**
+	 * Grok the TZID and return an offset in seconds from UTC for this
+	 * date and time.
+	 */
+	function _parseTZID($date, $time, $tzid)
+	{
+		$vtimezone = $this->_container->findComponentByAttribute('vtimezone', 'TZID', $tzid);
+		if (!$vtimezone) {
+			return false;
+		}
+
+		$change_times = array();
+		foreach ($vtimezone->getComponents() as $o) {
+			$t = $vtimezone->parseChild($o, $date['year']);
+			if ($t !== false) {
+				$change_times[] = $t;
+			}
+		}
+
+		if (!$change_times) {
+			return false;
+		}
+
+		sort($change_times);
+
+		// Time is arbitrarily based on UTC for comparison.
+		$t = @gmmktime($time['hour'], $time['minute'], $time['second'],
+					   $date['month'], $date['mday'], $date['year']);
+
+		if ($t < $change_times[0]['time']) {
+			return $change_times[0]['from'];
+		}
+
+		for ($i = 0, $n = count($change_times); $i < $n - 1; $i++) {
+			if (($t >= $change_times[$i]['time']) &&
+				($t < $change_times[$i + 1]['time'])) {
+				return $change_times[$i]['to'];
+			}
+		}
+
+		if ($t >= $change_times[$n - 1]['time']) {
+			return $change_times[$n - 1]['to'];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Parses a DateTime field and returns a unix timestamp. If the
+	 * field cannot be parsed then the original text is returned
+	 * unmodified.
+	 *
+	 * @todo This function should be moved to Horde_Date and made public.
+	 */
+	function _parseDateTime($text, $tzid = false)
+	{
+		$dateParts = explode('T', $text);
+		if (count($dateParts) != 2 && !empty($text)) {
+			// Not a datetime field but may be just a date field.
+			if (!preg_match('/^(\d{4})-?(\d{2})-?(\d{2})$/', $text, $match)) {
+				// Or not
+				return $text;
+			}
+			$newtext = $text.'T000000';
+			$dateParts = explode('T', $newtext);
+		}
+
+		if (!$date = Horde_iCalendar::_parseDate($dateParts[0])) {
+			return $text;
+		}
+		if (!$time = Horde_iCalendar::_parseTime($dateParts[1])) {
+			return $text;
+		}
+
+		// Get timezone info for date fields from $tzid and container.
+		$tzoffset = ($time['zone'] == 'Local' && $tzid && is_a($this->_container, 'Horde_iCalendar'))
+			? $this->_parseTZID($date, $time, $tzid) : false;
+		if ($time['zone'] == 'UTC' || $tzoffset !== false) {
+			$result = @gmmktime($time['hour'], $time['minute'], $time['second'],
+								$date['month'], $date['mday'], $date['year']);
+			if ($tzoffset) {
+				$result -= $tzoffset;
+			}
+		} else {
+			// We don't know the timezone so assume local timezone.
+			// FIXME: shouldn't this be based on the user's timezone
+			// preference rather than the server's timezone?
+			$result = @mktime($time['hour'], $time['minute'], $time['second'],
+							  $date['month'], $date['mday'], $date['year']);
+		}
+
+		return ($result !== false) ? $result : $text;
+	}
+
+	/**
+	 * Export a DateTime field.
+	 */
+	function _exportDateTime($value)
+	{
+		if (is_numeric($value)) {
+			$temp = array();
+			$tz = date('O', $value);
+			$TZOffset = (3600 * substr($tz, 0, 3)) + (60 * substr(date('O', $value), 3, 2));
+			$value -= $TZOffset;
+
+			$temp['zone']   = 'UTC';
+			$temp['year']   = date('Y', $value);
+			$temp['month']  = date('n', $value);
+			$temp['mday']   = date('j', $value);
+			$temp['hour']   = date('G', $value);
+			$temp['minute'] = date('i', $value);
+			$temp['second'] = date('s', $value);
+			return Horde_iCalendar::_exportDate($temp) . 'T' . Horde_iCalendar::_exportTime($temp);
+		} else if (is_object($value) || is_array($value)) {
+			$dateOb = new Horde_Date($value);
+			return Horde_iCalendar::_exportDateTime($dateOb->timestamp());
+		}
+		return $value; // nothing to do with us, let's not touch it
+	}
+
+	/**
+	 * Parses a Time field.
+	 *
+	 * @static
+	 */
+	function _parseTime($text)
+	{
+		if (preg_match('/([0-9]{2})([0-9]{2})([0-9]{2})(Z)?/', $text, $timeParts)) {
+			$time['hour'] = intval($timeParts[1]);
+			$time['minute'] = intval($timeParts[2]);
+			$time['second'] = intval($timeParts[3]);
+			if (isset($timeParts[4])) {
+				$time['zone'] = 'UTC';
+			} else {
+				$time['zone'] = 'Local';
+			}
+			return $time;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Exports a Time field.
+	 */
+	function _exportTime($value)
+	{
+		$time = sprintf('%02d%02d%02d',
+						$value['hour'], $value['minute'], $value['second']);
+		if ($value['zone'] == 'UTC') {
+			$time .= 'Z';
+		}
+		return $time;
+	}
+
+	/**
+	 * Parses a Date field.
+	 *
+	 * @static
+	 */
+	function _parseDate($text)
+	{
+		$parts = explode('T', $text);
+		if (count($parts) == 2) {
+			$text = $parts[0];
+		}
+
+		if (!preg_match('/^(\d{4})-?(\d{2})-?(\d{2})$/', $text, $match)) {
+			return false;
+		}
+
+		return array('year' => $match[1],
+					 'month' => $match[2],
+					 'mday' => $match[3]);
+	}
+
+	/**
+	 * Exports a date field.
+	 *
+	 * @param object|array $value  Date object or hash.
+	 * @param string $autoconvert  If set, use this as time part to export the
+	 *                             date as datetime when exporting to Vcalendar
+	 *                             1.0. Examples: '000000' or '235959'
+	 */
+	function _exportDate($value, $autoconvert = false)
+	{
+		if (is_object($value)) {
+			$value = array('year' => $value->year, 'month' => $value->month, 'mday' => $value->mday);
+		}
+		if ($autoconvert !== false && $this->isOldFormat()) {
+			return sprintf('%04d%02d%02dT%s', $value['year'], $value['month'], $value['mday'], $autoconvert);
+		} else {
+			return sprintf('%04d%02d%02d', $value['year'], $value['month'], $value['mday']);
+		}
+	}
+
+	/**
+	 * Parse a Duration Value field.
+	 */
+	function _parseDuration($text)
+	{
+		if (preg_match('/([+]?|[-])P(([0-9]+W)|([0-9]+D)|)(T(([0-9]+H)|([0-9]+M)|([0-9]+S))+)?/', trim($text), $durvalue)) {
+			// Weeks.
+			$duration = 7 * 86400 * intval($durvalue[3]);
+
+			if (count($durvalue) > 4) {
+				// Days.
+				$duration += 86400 * intval($durvalue[4]);
+			}
+			if (count($durvalue) > 5) {
+				// Hours.
+				$duration += 3600 * intval($durvalue[7]);
+
+				// Mins.
+				if (isset($durvalue[8])) {
+					$duration += 60 * intval($durvalue[8]);
+				}
+
+				// Secs.
+				if (isset($durvalue[9])) {
+					$duration += intval($durvalue[9]);
+				}
+			}
+
+			// Sign.
+			if ($durvalue[1] == "-") {
+				$duration *= -1;
+			}
+
+			return $duration;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Export a duration value.
+	 */
+	function _exportDuration($value)
+	{
+		$duration = '';
+		if ($value < 0) {
+			$value *= -1;
+			$duration .= '-';
+		}
+		$duration .= 'P';
+
+		$weeks = floor($value / (7 * 86400));
+		$value = $value % (7 * 86400);
+		if ($weeks) {
+			$duration .= $weeks . 'W';
+		}
+
+		$days = floor($value / (86400));
+		$value = $value % (86400);
+		if ($days) {
+			$duration .= $days . 'D';
+		}
+
+		if ($value) {
+			$duration .= 'T';
+
+			$hours = floor($value / 3600);
+			$value = $value % 3600;
+			if ($hours) {
+				$duration .= $hours . 'H';
+			}
+
+			$mins = floor($value / 60);
+			$value = $value % 60;
+			if ($mins) {
+				$duration .= $mins . 'M';
+			}
+
+			if ($value) {
+				$duration .= $value . 'S';
+			}
+		}
 		// duration without time ("P") is NOT valid, append 0 minutes ("T0M")
 		elseif ($duration === 'P')
 		{
 			$duration .= 'T0M';
 		}
 
-        return $duration;
-    }
+		return $duration;
+	}
 
 
    /**
-     * Convert an 8bit string to a base64 string
-     * to RFC2045, section 6.7.
-     *
-     * @param  string $input  The string to be encoded.
-     *
-     * @return string         The base64 encoded string.
-     */
-    function _base64Encode($input = '')
-    {
-        return base64_encode($input);
-    }
-
-
-    /**
-     * Converts an 8bit string to a quoted-printable string according to RFC
-     * 2045, section 6.7.
-     *
-     * imap_8bit() does not apply all necessary rules.
-     *
-     * @param string $input  The string to be encoded.
-     *
-     * @return string  The quoted-printable encoded string.
-     */
-    function _quotedPrintableEncode($input = '', $withFolding=true)
-    {
-        $output = $line = '';
-        $len = bytes($input);
-
-        for ($i = 0; $i < $len; ++$i) {
-            $ord = ord($input[$i]);
-            // Encode non-printable characters (rule 2).
-            if ($ord == 9 ||
-                ($ord >= 32 && $ord <= 60) ||
-                ($ord >= 62 && $ord <= 126)) {
-                $chunk = $input[$i];
-            } else {
-                // Quoted printable encoding (rule 1).
-                $chunk = '=' . String::upper(sprintf('%02X', $ord));
-            }
-            $line .= $chunk;
-            // Wrap long lines (rule 5)
-            if ($withFolding && strlen($line) + 1 > 76) {
-                $line = String::wordwrap($line, 75, "=\r\n", true, 'us-ascii', true);
-                $newline = strrchr($line, "\r\n");
-                if ($newline !== false) {
-                    $output .= substr($line, 0, -strlen($newline) + 2);
-                    $line = substr($newline, 2);
-                } else {
-                    $output .= $line;
-                }
-                continue;
-            }
-            // Wrap at line breaks for better readability (rule 4).
-            if ($withFolding && substr($line, -3) == '=0A') {
-                $output .= $line . "=\r\n";
-                $line = '';
-            }
-        }
-        $output .= $line;
-
-        // Trailing whitespace must be encoded (rule 3).
-        $lastpos = strlen($output) - 1;
-        if ($output[$lastpos] == chr(9) ||
-            $output[$lastpos] == chr(32)) {
-            $output[$lastpos] = '=';
-            $output .= String::upper(sprintf('%02X', ord($output[$lastpos])));
-        }
-
-        return $output;
-    }
+    * Convert an 8bit string to a base64 string
+    * to RFC2045, section 6.7.
+    *
+    * @param  string $input  The string to be encoded.
+    *
+    * @return string         The base64 encoded string.
+    */
+	function _base64Encode($input = '')
+	{
+		return base64_encode($input);
+	}
+
+
+	/**
+	 * Converts an 8bit string to a quoted-printable string according to RFC
+	 * 2045, section 6.7.
+	 *
+	 * imap_8bit() does not apply all necessary rules.
+	 *
+	 * @param string $input  The string to be encoded.
+	 *
+	 * @return string  The quoted-printable encoded string.
+	 */
+	function _quotedPrintableEncode($input = '', $withFolding=true)
+	{
+		$output = $line = '';
+		$len = bytes($input);
+
+		for ($i = 0; $i < $len; ++$i) {
+			$ord = ord($input[$i]);
+			// Encode non-printable characters (rule 2).
+			if ($ord == 9 ||
+				($ord >= 32 && $ord <= 60) ||
+				($ord >= 62 && $ord <= 126)) {
+				$chunk = $input[$i];
+			} else {
+				// Quoted printable encoding (rule 1).
+				$chunk = '=' . String::upper(sprintf('%02X', $ord));
+			}
+			$line .= $chunk;
+			// Wrap long lines (rule 5)
+			if ($withFolding && strlen($line) + 1 > 76) {
+				$line = String::wordwrap($line, 75, "=\r\n", true, 'us-ascii', true);
+				$newline = strrchr($line, "\r\n");
+				if ($newline !== false) {
+					$output .= substr($line, 0, -strlen($newline) + 2);
+					$line = substr($newline, 2);
+				} else {
+					$output .= $line;
+				}
+				continue;
+			}
+			// Wrap at line breaks for better readability (rule 4).
+			if ($withFolding && substr($line, -3) == '=0A') {
+				$output .= $line . "=\r\n";
+				$line = '';
+			}
+		}
+		$output .= $line;
+
+		// Trailing whitespace must be encoded (rule 3).
+		$lastpos = strlen($output) - 1;
+		if ($output[$lastpos] == chr(9) ||
+			$output[$lastpos] == chr(32)) {
+			$output[$lastpos] = '=';
+			$output .= String::upper(sprintf('%02X', ord($output[$lastpos])));
+		}
+
+		return $output;
+	}
 
 }

Switch Indentation +227 added lines, -227 removed lines

@@ -970,237 +970,237 @@
 
             switch ($name) {
             // Date fields.
-            case 'COMPLETED':
-            case 'CREATED':
-            case 'DCREATED':
-            case 'LAST-MODIFIED':
-                $value = $this->_exportDateTime($value);
-                break;
-
-			// Support additional fields after date.
+            	case 'COMPLETED':
+            	case 'CREATED':
+            	case 'DCREATED':
+            	case 'LAST-MODIFIED':
+                	$value = $this->_exportDateTime($value);
+                	break;
+
+				// Support additional fields after date.
  			case 'AALARM':
-            case 'DALARM':
-            	if (isset($params['VALUE'])) {
-                    if ($params['VALUE'] == 'DATE') {
-                        // VCALENDAR 1.0 uses T000000 - T235959 for all day events:
-                        if ($this->isOldFormat() && $name == 'DTEND') {
-                            $d = new Horde_Date($value);
-                            $value = new Horde_Date(array(
-                                'year' => $d->year,
-                                'month' => $d->month,
-                                'mday' => $d->mday - 1));
-                            $value->correct();
-                            $value = $this->_exportDate($value, '235959');
-                        } else {
-                            $value = $this->_exportDate($value, '000000');
-                        }
-                    } else {
-                        $value = $this->_exportDateTime($value);
-                    }
-                } else {
-                    $value = $this->_exportDateTime($value);
-                }
-
-            	if (is_array($attribute['values']) &&
-		            	count($attribute['values']) > 0) {
-		            $values = $attribute['values'];
-	            	if ($this->isOldFormat()) {
-		            	$values = str_replace(';', '\\;', $values);
-	            	} else {
-                        // As of rfc 2426 2.5 semicolon and comma must be
-                        // escaped.
-                        $values = str_replace(array('\\', ';', ','),
-                                              array('\\\\', '\\;', '\\,'),
-                                              $values);
-	            	}
-	            	$value .= ';' . implode(';', $values);
-		         }
-
-                break;
-
-            case 'DTEND':
-            case 'DTSTART':
-            case 'DTSTAMP':
-            case 'DUE':
-            case 'RECURRENCE-ID':
-            case 'X-RECURRENCE-ID':
-                if (isset($params['VALUE'])) {
-                    if ($params['VALUE'] == 'DATE') {
-                        // VCALENDAR 1.0 uses T000000 - T235959 for all day events:
-                        if ($this->isOldFormat() && $name == 'DTEND') {
-                            $d = new Horde_Date($value);
-                            $value = new Horde_Date(array(
-                                'year' => $d->year,
-                                'month' => $d->month,
-                                'mday' => $d->mday - 1));
-                            $value->correct();
-                            $value = $this->_exportDate($value, '235959');
-                        } else {
-                            $value = $this->_exportDate($value, '000000');
-                        }
-                    } else {
-                        $value = $this->_exportDateTime($value);
-                    }
-                } else {
-                    $value = $this->_exportDateTime($value);
-                }
-                break;
-
-            // Comma or semicolon seperated dates.
-            case 'EXDATE':
-            case 'RDATE':
-	            if (is_array($attribute['values'])) {
-		            $values = $attribute['values'];
-	            } elseif (!empty($value)) {
-	            	if ($this->isOldFormat()) {
-		            	$values = explode(';', $value);
+            	case 'DALARM':
+            		if (isset($params['VALUE'])) {
+                    	if ($params['VALUE'] == 'DATE') {
+                        	// VCALENDAR 1.0 uses T000000 - T235959 for all day events:
+                        	if ($this->isOldFormat() && $name == 'DTEND') {
+                            	$d = new Horde_Date($value);
+                            	$value = new Horde_Date(array(
+                                	'year' => $d->year,
+                                	'month' => $d->month,
+                                	'mday' => $d->mday - 1));
+                            	$value->correct();
+                            	$value = $this->_exportDate($value, '235959');
+                        	} else {
+                            	$value = $this->_exportDate($value, '000000');
+                        	}
+                    	} else {
+                        	$value = $this->_exportDateTime($value);
+                    	}
+                	} else {
+                    	$value = $this->_exportDateTime($value);
+                	}
+
+            		if (is_array($attribute['values']) &&
+		            		count($attribute['values']) > 0) {
+		            	$values = $attribute['values'];
+	            		if ($this->isOldFormat()) {
+		            		$values = str_replace(';', '\\;', $values);
+	            		} else {
+                        	// As of rfc 2426 2.5 semicolon and comma must be
+                        	// escaped.
+                        	$values = str_replace(array('\\', ';', ','),
+                                              	array('\\\\', '\\;', '\\,'),
+                                              	$values);
+	            		}
+	            		$value .= ';' . implode(';', $values);
+		         	}
+
+                	break;
+
+            	case 'DTEND':
+            	case 'DTSTART':
+            	case 'DTSTAMP':
+            	case 'DUE':
+            	case 'RECURRENCE-ID':
+            	case 'X-RECURRENCE-ID':
+                	if (isset($params['VALUE'])) {
+                    	if ($params['VALUE'] == 'DATE') {
+                        	// VCALENDAR 1.0 uses T000000 - T235959 for all day events:
+                        	if ($this->isOldFormat() && $name == 'DTEND') {
+                            	$d = new Horde_Date($value);
+                            	$value = new Horde_Date(array(
+                                	'year' => $d->year,
+                                	'month' => $d->month,
+                                	'mday' => $d->mday - 1));
+                            	$value->correct();
+                            	$value = $this->_exportDate($value, '235959');
+                        	} else {
+                            	$value = $this->_exportDate($value, '000000');
+                        	}
+                    	} else {
+                        	$value = $this->_exportDateTime($value);
+                    	}
+                	} else {
+                    	$value = $this->_exportDateTime($value);
+                	}
+                	break;
+
+            	// Comma or semicolon seperated dates.
+            	case 'EXDATE':
+            	case 'RDATE':
+	            	if (is_array($attribute['values'])) {
+		            	$values = $attribute['values'];
+	            	} elseif (!empty($value)) {
+	            		if ($this->isOldFormat()) {
+		            		$values = explode(';', $value);
+	            		} else {
+	            			$values = explode(',', $value);
+	            		}
 	            	} else {
-	            		$values = explode(',', $value);
+		            	break;
 	            	}
-	            } else {
-		            break;
-	            }
-                $dates = array();
-                foreach ($values as $date) {
-                    if (isset($params['VALUE'])) {
-                        if ($params['VALUE'] == 'DATE') {
-                            $dates[] = $this->_exportDate($date, '000000');
-                        } elseif ($params['VALUE'] == 'PERIOD') {
-                            $dates[] = $this->_exportPeriod($date);
-                        } else {
-                            $dates[] = $this->_exportDateTime($date);
-                        }
-                    } else {
-                        $dates[] = $this->_exportDateTime($date);
-                    }
-                }
-                if ($this->isOldFormat()) {
-	                $value = implode(';', $dates);
-                } else {
-	                $value = implode(',', $dates);
-                }
-                break;
-
-            case 'TRIGGER':
-                if (isset($params['VALUE'])) {
-                    if ($params['VALUE'] == 'DATE-TIME') {
-                        $value = $this->_exportDateTime($value);
-                    } elseif ($params['VALUE'] == 'DURATION') {
-                        $value = $this->_exportDuration($value);
-                    }
-                } else {
-                    $value = $this->_exportDuration($value);
-                }
-                break;
-
-            // Duration fields.
-            case 'DURATION':
-                $value = $this->_exportDuration($value);
-                break;
-
-            // Period of time fields.
-            case 'FREEBUSY':
-                $value_str = '';
-                foreach ($value as $period) {
-                    $value_str .= empty($value_str) ? '' : ',';
-                    $value_str .= $this->_exportPeriod($period);
-                }
-                $value = $value_str;
-                break;
-
-            // UTC offset fields.
-            case 'TZOFFSETFROM':
-            case 'TZOFFSETTO':
-                $value = $this->_exportUtcOffset($value);
-                break;
-
-            // Integer fields.
-            case 'PERCENT-COMPLETE':
-            case 'PRIORITY':
-            case 'REPEAT':
-            case 'SEQUENCE':
-                $value = "$value";
-                break;
-
-            // Geo fields.
-            case 'GEO':
-                if ($this->isOldFormat()) {
-                    $value = $value['longitude'] . ',' . $value['latitude'];
-                } else {
-                    $value = $value['latitude'] . ';' . $value['longitude'];
-                }
-                break;
-
-            // Recurrence fields.
-            case 'EXRULE':
-            	break;
-
-            case 'RRULE':
-                if (!empty($params_str) &&  $params_str[0] == ';')
-                {
-                	// The standard requires a double colon RRULE:...
-                	 $params_str[0] = ':';
-                }
-                break;
-
-            case 'PHOTO':
-                break;
-
-            default:
-                if ($this->isOldFormat()) {
-                    if (is_array($attribute['values']) &&
-                        count($attribute['values']) > 1) {
-                        $values = $attribute['values'];
-                        if ($name == 'N' || $name == 'ADR' || $name == 'ORG') {
-                            $glue = ';';
-                        } else {
-                            $glue = ',';
-                        }
-                        $values = str_replace(';', '\\;', $values);
-                        $value = implode($glue, $values);
-                    } else {
-                        /* vcard 2.1 and vcalendar 1.0 escape only
+                	$dates = array();
+                	foreach ($values as $date) {
+                    	if (isset($params['VALUE'])) {
+                        	if ($params['VALUE'] == 'DATE') {
+                            	$dates[] = $this->_exportDate($date, '000000');
+                        	} elseif ($params['VALUE'] == 'PERIOD') {
+                            	$dates[] = $this->_exportPeriod($date);
+                        	} else {
+                            	$dates[] = $this->_exportDateTime($date);
+                        	}
+                    	} else {
+                        	$dates[] = $this->_exportDateTime($date);
+                    	}
+                	}
+                	if ($this->isOldFormat()) {
+	                	$value = implode(';', $dates);
+                	} else {
+	                	$value = implode(',', $dates);
+                	}
+                	break;
+
+            	case 'TRIGGER':
+                	if (isset($params['VALUE'])) {
+                    	if ($params['VALUE'] == 'DATE-TIME') {
+                        	$value = $this->_exportDateTime($value);
+                    	} elseif ($params['VALUE'] == 'DURATION') {
+                        	$value = $this->_exportDuration($value);
+                    	}
+                	} else {
+                    	$value = $this->_exportDuration($value);
+                	}
+                	break;
+
+            	// Duration fields.
+            	case 'DURATION':
+                	$value = $this->_exportDuration($value);
+                	break;
+
+            	// Period of time fields.
+            	case 'FREEBUSY':
+                	$value_str = '';
+                	foreach ($value as $period) {
+                    	$value_str .= empty($value_str) ? '' : ',';
+                    	$value_str .= $this->_exportPeriod($period);
+                	}
+                	$value = $value_str;
+                	break;
+
+            	// UTC offset fields.
+            	case 'TZOFFSETFROM':
+            	case 'TZOFFSETTO':
+                	$value = $this->_exportUtcOffset($value);
+                	break;
+
+            	// Integer fields.
+            	case 'PERCENT-COMPLETE':
+            	case 'PRIORITY':
+            	case 'REPEAT':
+            	case 'SEQUENCE':
+                	$value = "$value";
+                	break;
+
+            	// Geo fields.
+            	case 'GEO':
+                	if ($this->isOldFormat()) {
+                    	$value = $value['longitude'] . ',' . $value['latitude'];
+                	} else {
+                    	$value = $value['latitude'] . ';' . $value['longitude'];
+                	}
+                	break;
+
+            	// Recurrence fields.
+            	case 'EXRULE':
+            		break;
+
+            	case 'RRULE':
+                	if (!empty($params_str) &&  $params_str[0] == ';')
+                	{
+                		// The standard requires a double colon RRULE:...
+                	 	$params_str[0] = ':';
+                	}
+                	break;
+
+            	case 'PHOTO':
+                	break;
+
+            	default:
+                	if ($this->isOldFormat()) {
+                    	if (is_array($attribute['values']) &&
+                        	count($attribute['values']) > 1) {
+                        	$values = $attribute['values'];
+                        	if ($name == 'N' || $name == 'ADR' || $name == 'ORG') {
+                            	$glue = ';';
+                        	} else {
+                            	$glue = ',';
+                        	}
+                        	$values = str_replace(';', '\\;', $values);
+                        	$value = implode($glue, $values);
+                    	} else {
+                        	/* vcard 2.1 and vcalendar 1.0 escape only
                          * semicolons */
-                        $value = str_replace(';', '\\;', $value);
-                    }
-                    // Text containing newlines or ASCII >= 127 must be BASE64
-                    // or QUOTED-PRINTABLE encoded. Currently we use
-                    // QUOTED-PRINTABLE as default.
-                    if (preg_match('/[^\x20-\x7F]/', $value) &&
-		                    !isset($params['ENCODING']))  {
-	                    $params['ENCODING'] = 'QUOTED-PRINTABLE';
-                    }
-                    if (preg_match('/([\177-\377])/', $value) &&
-		                    !isset($params['CHARSET'])) {
-	                    // Add CHARSET as well. At least the synthesis client
-	                    // gets confused otherwise
-	                    $params['CHARSET'] = String::upper($charset);
-	                    $params_str .= ';CHARSET=' . $params['CHARSET'];
-                    }
-                } else {
-                    if (is_array($attribute['values']) &&
-                        count($attribute['values']) > 1) {
-                        $values = $attribute['values'];
-                        if ($name == 'N' || $name == 'ADR' || $name == 'ORG') {
-                            $glue = ';';
-                        } else {
-                            $glue = ',';
-                        }
-                        // As of rfc 2426 2.5 semicolon and comma must be
-                        // escaped.
-                        $values = str_replace(array('\\', ';', ','),
-                                              array('\\\\', '\\;', '\\,'),
-                                              $values);
-                        $value = implode($glue, $values);
-                    } else {
-                        // As of rfc 2426 2.5 semicolon and comma must be
-                        // escaped.
-                        $value = str_replace(array('\\', ';', ','),
-                                             array('\\\\', '\\;', '\\,'),
-                                             $value);
-                    }
-                    $value = preg_replace('/\r?\n/', "\n", $value);
-                }
+                        	$value = str_replace(';', '\\;', $value);
+                    	}
+                    	// Text containing newlines or ASCII >= 127 must be BASE64
+                    	// or QUOTED-PRINTABLE encoded. Currently we use
+                    	// QUOTED-PRINTABLE as default.
+                    	if (preg_match('/[^\x20-\x7F]/', $value) &&
+		                    	!isset($params['ENCODING']))  {
+	                    	$params['ENCODING'] = 'QUOTED-PRINTABLE';
+                    	}
+                    	if (preg_match('/([\177-\377])/', $value) &&
+		                    	!isset($params['CHARSET'])) {
+	                    	// Add CHARSET as well. At least the synthesis client
+	                    	// gets confused otherwise
+	                    	$params['CHARSET'] = String::upper($charset);
+	                    	$params_str .= ';CHARSET=' . $params['CHARSET'];
+                    	}
+                	} else {
+                    	if (is_array($attribute['values']) &&
+                        	count($attribute['values']) > 1) {
+                        	$values = $attribute['values'];
+                        	if ($name == 'N' || $name == 'ADR' || $name == 'ORG') {
+                            	$glue = ';';
+                        	} else {
+                            	$glue = ',';
+                        	}
+                        	// As of rfc 2426 2.5 semicolon and comma must be
+                        	// escaped.
+                        	$values = str_replace(array('\\', ';', ','),
+                                              	array('\\\\', '\\;', '\\,'),
+                                              	$values);
+                        	$value = implode($glue, $values);
+                    	} else {
+                        	// As of rfc 2426 2.5 semicolon and comma must be
+                        	// escaped.
+                        	$value = str_replace(array('\\', ';', ','),
+                                             	array('\\\\', '\\;', '\\,'),
+                                             	$value);
+                    	}
+                    	$value = preg_replace('/\r?\n/', "\n", $value);
+                	}
             }
 
 			$encoding = (!empty($params['ENCODING']) && strlen(trim($value)) > 0);

Spacing +42 added lines, -42 removed lines

@@ -80,10 +80,10 @@ 
     function &newComponent($type, &$container)
     {
         $type = String::lower($type);
-        $class = 'Horde_iCalendar_' . $type;
+        $class = 'Horde_iCalendar_'.$type;
         if (!class_exists($class)) {
 			// include relative from current dir, as we no longer set (old) Horde dir in include path
-            include 'iCalendar/' . $type . '.php';
+            include 'iCalendar/'.$type.'.php';
         }
         if (class_exists($class)) {
             $component = new $class();
@@ -201,7 +201,7 @@ 
         }
         if (!count($result)) {
             require_once 'PEAR.php';
-            return PEAR::raiseError('Attribute "' . $name . '" Not Found');
+            return PEAR::raiseError('Attribute "'.$name.'" Not Found');
         } if (count($result) == 1 && !$params) {
             return $result[0];
         } else {
@@ -232,7 +232,7 @@ 
             }
         }
         if (!count($result)) {
-            return PEAR::raiseError('Attribute "' . $name . '" Not Found');
+            return PEAR::raiseError('Attribute "'.$name.'" Not Found');
         }
         return $result;
     }
@@ -379,7 +379,7 @@ 
      */
     function &findComponent($childclass)
     {
-        $childclass = 'Horde_iCalendar_' . String::lower($childclass);
+        $childclass = 'Horde_iCalendar_'.String::lower($childclass);
         $keys = array_keys($this->_components);
         foreach ($keys as $key) {
             if (is_a($this->_components[$key], $childclass)) {
@@ -406,7 +406,7 @@ 
      */
     function &findComponentByAttribute($childclass, $attribute, $value = null)
     {
-        $childclass = 'Horde_iCalendar_' . String::lower($childclass);
+        $childclass = 'Horde_iCalendar_'.String::lower($childclass);
         $keys = array_keys($this->_components);
         foreach ($keys as $key) {
             if (is_a($this->_components[$key], $childclass)) {
@@ -470,7 +470,7 @@ 
     function exportvCalendar($charset = null)
     {
         // Default values.
-        $requiredAttributes['PRODID'] = '-//The Horde Project//Horde_iCalendar Library' . (defined('HORDE_VERSION') ? ', Horde ' . constant('HORDE_VERSION') : '') . '//EN';
+        $requiredAttributes['PRODID'] = '-//The Horde Project//Horde_iCalendar Library'.(defined('HORDE_VERSION') ? ', Horde '.constant('HORDE_VERSION') : '').'//EN';
         // METHOD is only required for iTip, but not for CalDAV, therefore removing it here calendar_ical sets it anyway by default
         //$requiredAttributes['METHOD'] = 'PUBLISH';
 
@@ -499,7 +499,7 @@ 
     function toHash($paramsInKeys = false)
     {
         $hash = array();
-        foreach ($this->_attributes as $a)  {
+        foreach ($this->_attributes as $a) {
             $k = $a['name'];
             if ($paramsInKeys && is_array($a['params'])) {
                 foreach ($a['params'] as $p => $v) {
@@ -538,7 +538,7 @@ 
         		__FILE__, __LINE__, PEAR_LOG_WARNING);
             $container = true;
             $vCal = $matches[1];
-        } elseif (preg_match('/^BEGIN:' . $base . '(.*)^END:' . $base . '/ism', $text, $matches)) {
+        } elseif (preg_match('/^BEGIN:'.$base.'(.*)^END:'.$base.'/ism', $text, $matches)) {
             $container = true;
             $vCal = $matches[1];
         } else {
@@ -555,7 +555,7 @@ 
         }
 
 		// Preserve a trailing CR
-        $vCal = trim($vCal) . "\n";
+        $vCal = trim($vCal)."\n";
 
         // All subcomponents.
         $matches = null;
@@ -748,7 +748,7 @@ 
 	                case 'EXDATE':
 	                case 'RDATE':
 		                $dates = array();
-		                preg_match_all('/[;,]([^;,]*)/', ';' . $value, $values);
+		                preg_match_all('/[;,]([^;,]*)/', ';'.$value, $values);
 
 		                foreach ($values[1] as $value) {
 			                if ((isset($params['VALUE'])
@@ -769,7 +769,7 @@ 
 		                // Period of time fields.
 	                case 'FREEBUSY':
 		                $periods = array();
-		                preg_match_all('/,([^,]*)/', ',' . $value, $values);
+		                preg_match_all('/,([^,]*)/', ','.$value, $values);
 		                foreach ($values[1] as $value) {
 			                $periods[] = $this->_parsePeriod($value);
 		                }
@@ -903,7 +903,7 @@ 
     {
     	$base = String::upper($base);
 
-        $result = 'BEGIN:' . $base . $this->_newline;
+        $result = 'BEGIN:'.$base.$this->_newline;
 
         // VERSION is not allowed for entries enclosed in VCALENDAR/ICALENDAR,
         // as it is part of the enclosing VCALENDAR/ICALENDAR. See rfc2445
@@ -911,7 +911,7 @@ 
             $base !== 'VJOURNAL' && $base !== 'VFREEBUSY' &&
             $base !== 'VTIMEZONE' && $base !== 'STANDARD' && $base != 'DAYLIGHT') {
             // Ensure that version is the first attribute.
-            $result .= 'VERSION:' . $this->_version . $this->_newline;
+            $result .= 'VERSION:'.$this->_version.$this->_newline;
         }
 
         if (empty($charset)) {
@@ -1013,7 +1013,7 @@ 
                                               array('\\\\', '\\;', '\\,'),
                                               $values);
 	            	}
-	            	$value .= ';' . implode(';', $values);
+	            	$value .= ';'.implode(';', $values);
 		         }
 
                 break;
@@ -1125,9 +1125,9 @@ 
             // Geo fields.
             case 'GEO':
                 if ($this->isOldFormat()) {
-                    $value = $value['longitude'] . ',' . $value['latitude'];
+                    $value = $value['longitude'].','.$value['latitude'];
                 } else {
-                    $value = $value['latitude'] . ';' . $value['longitude'];
+                    $value = $value['latitude'].';'.$value['longitude'];
                 }
                 break;
 
@@ -1136,7 +1136,7 @@ 
             	break;
 
             case 'RRULE':
-                if (!empty($params_str) &&  $params_str[0] == ';')
+                if (!empty($params_str) && $params_str[0] == ';')
                 {
                 	// The standard requires a double colon RRULE:...
                 	 $params_str[0] = ':';
@@ -1167,7 +1167,7 @@ 
                     // or QUOTED-PRINTABLE encoded. Currently we use
                     // QUOTED-PRINTABLE as default.
                     if (preg_match('/[^\x20-\x7F]/', $value) &&
-		                    !isset($params['ENCODING']))  {
+		                    !isset($params['ENCODING'])) {
 	                    $params['ENCODING'] = 'QUOTED-PRINTABLE';
                     }
                     if (preg_match('/([\177-\377])/', $value) &&
@@ -1175,7 +1175,7 @@ 
 	                    // Add CHARSET as well. At least the synthesis client
 	                    // gets confused otherwise
 	                    $params['CHARSET'] = String::upper($charset);
-	                    $params_str .= ';CHARSET=' . $params['CHARSET'];
+	                    $params_str .= ';CHARSET='.$params['CHARSET'];
                     }
                 } else {
                     if (is_array($attribute['values']) &&
@@ -1206,7 +1206,7 @@ 
 			$encoding = (!empty($params['ENCODING']) && strlen(trim($value)) > 0);
 
             if ($encoding) {
-	            switch($params['ENCODING']) {
+	            switch ($params['ENCODING']) {
 		            case 'Q':
 		            case 'QUOTED-PRINTABLE':
 		            	if (!$this->isOldFormat())
@@ -1214,9 +1214,9 @@ 
 		            		$encoding = false;
 		            		break;
 		            	}
-			            $params_str .= ';ENCODING=' . $params['ENCODING'];
+			            $params_str .= ';ENCODING='.$params['ENCODING'];
 			            $value = str_replace("\r", '', $value);
-			            $result .= $name . $params_str . ':'
+			            $result .= $name.$params_str.':'
 				            . str_replace('=0A', '=0D=0A',
 					            $this->_quotedPrintableEncode($value))
 								. $this->_newline;
@@ -1230,17 +1230,17 @@ 
 			            	break;
 			            }
 			            $params_str .= ';ENCODING=QUOTED-PRINTABLE';
-			            $result .= $name . $params_str . ':'
+			            $result .= $name.$params_str.':'
 				            . str_replace('=0A', '=0D=0A',
 					            $this->_quotedPrintableEncode($value, false))
 								. $this->_newline;
 			            break;
 		            case 'B':
 		            case 'BASE64':
-			            $params_str .= ';ENCODING=' . $params['ENCODING'];
+			            $params_str .= ';ENCODING='.$params['ENCODING'];
 			            // using native php wordwrap to speed up encoding of images
-			            $result .= wordwrap($name . $params_str . ':' . $this->_newline . ' ' .
-			            	$this->_base64Encode($value),75,$this->_newline . ' ',true) . $this->_newline;
+			            $result .= wordwrap($name.$params_str.':'.$this->_newline.' '.
+			            	$this->_base64Encode($value), 75, $this->_newline.' ', true).$this->_newline;
 			            /*
 			            $attr_string = $name . $params_str . ':' . $this->_newline . ' ' . $this->_base64Encode($value);
 			            $attr_string = String::wordwrap($attr_string, 75, $this->_newline . ' ',
@@ -1255,29 +1255,29 @@ 
 
             if (!$encoding) {
                 $value = str_replace(array("\r", "\n"), array('', '\\n'), $value);
-                $attr_string = $name . $params_str;
+                $attr_string = $name.$params_str;
                 if (strlen($value) > 0) {
-                	$attr_string .= ':' . $value;
+                	$attr_string .= ':'.$value;
                 } elseif ($name != 'RRULE') {
                 	$attr_string .= ':';
                 }
                 if (!$this->isOldFormat()) {
-                    $attr_string = String::wordwrap($attr_string, 75, $this->_newline . ' ',
+                    $attr_string = String::wordwrap($attr_string, 75, $this->_newline.' ',
                                                     true, $charset, true);
                 }
-                $result .= $attr_string . $this->_newline;
+                $result .= $attr_string.$this->_newline;
             }
         }
 
         foreach ($this->_components as $component) {
-            if ($this->isOldFormat() &&  $component->getType() == 'vTimeZone') {
+            if ($this->isOldFormat() && $component->getType() == 'vTimeZone') {
     			// Not supported
 				continue;
         	}
             $result .= $component->exportvCalendar($charset);
         }
 
-        return $result . 'END:' . $base . $this->_newline;
+        return $result.'END:'.$base.$this->_newline;
     }
 
     /**
@@ -1457,7 +1457,7 @@ 
             $temp['hour']   = date('G', $value);
             $temp['minute'] = date('i', $value);
             $temp['second'] = date('s', $value);
-            return Horde_iCalendar::_exportDate($temp) . 'T' . Horde_iCalendar::_exportTime($temp);
+            return Horde_iCalendar::_exportDate($temp).'T'.Horde_iCalendar::_exportTime($temp);
         } else if (is_object($value) || is_array($value)) {
             $dateOb = new Horde_Date($value);
             return Horde_iCalendar::_exportDateTime($dateOb->timestamp());
@@ -1595,13 +1595,13 @@ 
         $weeks = floor($value / (7 * 86400));
         $value = $value % (7 * 86400);
         if ($weeks) {
-            $duration .= $weeks . 'W';
+            $duration .= $weeks.'W';
         }
 
         $days = floor($value / (86400));
         $value = $value % (86400);
         if ($days) {
-            $duration .= $days . 'D';
+            $duration .= $days.'D';
         }
 
         if ($value) {
@@ -1610,17 +1610,17 @@ 
             $hours = floor($value / 3600);
             $value = $value % 3600;
             if ($hours) {
-                $duration .= $hours . 'H';
+                $duration .= $hours.'H';
             }
 
             $mins = floor($value / 60);
             $value = $value % 60;
             if ($mins) {
-                $duration .= $mins . 'M';
+                $duration .= $mins.'M';
             }
 
             if ($value) {
-                $duration .= $value . 'S';
+                $duration .= $value.'S';
             }
         }
 		// duration without time ("P") is NOT valid, append 0 minutes ("T0M")
@@ -1657,7 +1657,7 @@ 
      *
      * @return string  The quoted-printable encoded string.
      */
-    function _quotedPrintableEncode($input = '', $withFolding=true)
+    function _quotedPrintableEncode($input = '', $withFolding = true)
     {
         $output = $line = '';
         $len = bytes($input);
@@ -1671,7 +1671,7 @@ 
                 $chunk = $input[$i];
             } else {
                 // Quoted printable encoding (rule 1).
-                $chunk = '=' . String::upper(sprintf('%02X', $ord));
+                $chunk = '='.String::upper(sprintf('%02X', $ord));
             }
             $line .= $chunk;
             // Wrap long lines (rule 5)
@@ -1688,7 +1688,7 @@ 
             }
             // Wrap at line breaks for better readability (rule 4).
             if ($withFolding && substr($line, -3) == '=0A') {
-                $output .= $line . "=\r\n";
+                $output .= $line."=\r\n";
                 $line = '';
             }
         }

Braces +518 added lines, -230 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * Class representing iCalendar files.
  */
-class Horde_iCalendar {
+class Horde_iCalendar
+{
 
     /**
      * The parent (containing) iCalendar object.
@@ -81,19 +82,24 @@ 
     {
         $type = String::lower($type);
         $class = 'Horde_iCalendar_' . $type;
-        if (!class_exists($class)) {
+        if (!class_exists($class))
+        {
 			// include relative from current dir, as we no longer set (old) Horde dir in include path
             include 'iCalendar/' . $type . '.php';
         }
-        if (class_exists($class)) {
+        if (class_exists($class))
+        {
             $component = new $class();
-            if ($container !== false) {
+            if ($container !== false)
+            {
                 $component->_container = &$container;
                 // Use version of container, not default set by component
                 // constructor.
                 $component->_version = $container->_version;
             }
-        } else {
+        }
+        else
+        {
             // Should return an dummy x-unknown type class here.
             $component = false;
         }
@@ -119,20 +125,26 @@ 
     {
         // Make sure we update the internal format version if
         // setAttribute('VERSION', ...) is called.
-        if ($name == 'VERSION') {
+        if ($name == 'VERSION')
+        {
             $this->_version = $value;
-            if ($this->_container !== false) {
+            if ($this->_container !== false)
+            {
                 $this->_container->_version = $value;
             }
         }
 
-        if (!$values) {
+        if (!$values)
+        {
             $values = array($value);
         }
         $found = false;
-        if (!$append) {
-            foreach (array_keys($this->_attributes) as $key) {
-                if ($this->_attributes[$key]['name'] == String::upper($name)) {
+        if (!$append)
+        {
+            foreach (array_keys($this->_attributes) as $key)
+            {
+                if ($this->_attributes[$key]['name'] == String::upper($name))
+                {
                     $this->_attributes[$key]['params'] = $params;
                     $this->_attributes[$key]['value'] = $value;
                     $this->_attributes[$key]['values'] = $values;
@@ -142,7 +154,8 @@ 
             }
         }
 
-        if ($append || !$found) {
+        if ($append || !$found)
+        {
             $this->_attributes[] = array(
                 'name'      => String::upper($name),
                 'params'    => $params,
@@ -164,8 +177,10 @@ 
     function setParameter($name, $params = array())
     {
         $keys = array_keys($this->_attributes);
-        foreach ($keys as $key) {
-            if ($this->_attributes[$key]['name'] == $name) {
+        foreach ($keys as $key)
+        {
+            if ($this->_attributes[$key]['name'] == $name)
+            {
                 $this->_attributes[$key]['params'] =
                     array_merge($this->_attributes[$key]['params'], $params);
                 return true;
@@ -190,21 +205,30 @@ 
     function getAttribute($name, $params = false)
     {
         $result = array();
-        foreach ($this->_attributes as $attribute) {
-            if ($attribute['name'] == $name) {
-                if ($params) {
+        foreach ($this->_attributes as $attribute)
+        {
+            if ($attribute['name'] == $name)
+            {
+                if ($params)
+                {
                     $result[] = $attribute['params'];
-                } else {
+                }
+                else
+                {
                     $result[] = $attribute['value'];
                 }
             }
         }
-        if (!count($result)) {
+        if (!count($result))
+        {
             require_once 'PEAR.php';
             return PEAR::raiseError('Attribute "' . $name . '" Not Found');
-        } if (count($result) == 1 && !$params) {
+        } if (count($result) == 1 && !$params)
+        {
             return $result[0];
-        } else {
+        }
+        else
+        {
             return $result;
         }
     }
@@ -226,12 +250,15 @@ 
     function getAttributeValues($name)
     {
         $result = array();
-        foreach ($this->_attributes as $attribute) {
-            if ($attribute['name'] == $name) {
+        foreach ($this->_attributes as $attribute)
+        {
+            if ($attribute['name'] == $name)
+            {
                 $result = array_merge($attribute['values'], $result);
             }
         }
-        if (!count($result)) {
+        if (!count($result))
+        {
             return PEAR::raiseError('Attribute "' . $name . '" Not Found');
         }
         return $result;
@@ -262,8 +289,10 @@ 
     function removeAttribute($name)
     {
         $keys = array_keys($this->_attributes);
-        foreach ($keys as $key) {
-            if ($this->_attributes[$key]['name'] == $name) {
+        foreach ($keys as $key)
+        {
+            if ($this->_attributes[$key]['name'] == $name)
+            {
                 unset($this->_attributes[$key]);
             }
         }
@@ -279,12 +308,15 @@ 
      */
     function getAllAttributes($tag = false)
     {
-        if ($tag === false) {
+        if ($tag === false)
+        {
             return $this->_attributes;
         }
         $result = array();
-        foreach ($this->_attributes as $attribute) {
-            if ($attribute['name'] == $tag) {
+        foreach ($this->_attributes as $attribute)
+        {
+            if ($attribute['name'] == $tag)
+            {
                 $result[] = $attribute;
             }
         }
@@ -298,7 +330,8 @@ 
      */
     function addComponent($component)
     {
-        if (is_a($component, 'Horde_iCalendar')) {
+        if (is_a($component, 'Horde_iCalendar'))
+        {
             $component->_container = &$this;
             $this->_components[] = &$component;
         }
@@ -328,11 +361,15 @@ 
     function getComponentClasses()
     {
         $r = array();
-        foreach ($this->_components as $c) {
+        foreach ($this->_components as $c)
+        {
             $cn = strtolower(get_class($c));
-            if (empty($r[$cn])) {
+            if (empty($r[$cn]))
+            {
                 $r[$cn] = 1;
-            } else {
+            }
+            else
+            {
                 $r[$cn]++;
             }
         }
@@ -360,9 +397,12 @@ 
      */
     function getComponent($idx)
     {
-        if (isset($this->_components[$idx])) {
+        if (isset($this->_components[$idx]))
+        {
             return $this->_components[$idx];
-        } else {
+        }
+        else
+        {
             return false;
         }
     }
@@ -381,8 +421,10 @@ 
     {
         $childclass = 'Horde_iCalendar_' . String::lower($childclass);
         $keys = array_keys($this->_components);
-        foreach ($keys as $key) {
-            if (is_a($this->_components[$key], $childclass)) {
+        foreach ($keys as $key)
+        {
+            if (is_a($this->_components[$key], $childclass))
+            {
                 return $this->_components[$key];
             }
         }
@@ -408,13 +450,17 @@ 
     {
         $childclass = 'Horde_iCalendar_' . String::lower($childclass);
         $keys = array_keys($this->_components);
-        foreach ($keys as $key) {
-            if (is_a($this->_components[$key], $childclass)) {
+        foreach ($keys as $key)
+        {
+            if (is_a($this->_components[$key], $childclass))
+            {
                 $attr = $this->_components[$key]->getAttribute($attribute);
-                if (is_a($attr, 'PEAR_Error')) {
+                if (is_a($attr, 'PEAR_Error'))
+                {
                     continue;
                 }
-                if ($value !== null && $value != $attr) {
+                if ($value !== null && $value != $attr)
+                {
                     continue;
                 }
                 return $this->_components[$key];
@@ -447,7 +493,8 @@ 
     function isOldFormat()
     {
 	$retval = true;
-	switch ($this->getType()) {
+	switch ($this->getType())
+	{
 		case 'vcard':
             		$retval = ($this->_version < 3);
 			break;
@@ -474,8 +521,10 @@ 
         // METHOD is only required for iTip, but not for CalDAV, therefore removing it here calendar_ical sets it anyway by default
         //$requiredAttributes['METHOD'] = 'PUBLISH';
 
-        foreach ($requiredAttributes as $name => $default_value) {
-            if (is_a($this->getattribute($name), 'PEAR_Error')) {
+        foreach ($requiredAttributes as $name => $default_value)
+        {
+            if (is_a($this->getattribute($name), 'PEAR_Error'))
+            {
                 $this->setAttribute($name, $default_value);
             }
         }
@@ -499,10 +548,13 @@ 
     function toHash($paramsInKeys = false)
     {
         $hash = array();
-        foreach ($this->_attributes as $a)  {
+        foreach ($this->_attributes as $a)
+        {
             $k = $a['name'];
-            if ($paramsInKeys && is_array($a['params'])) {
-                foreach ($a['params'] as $p => $v) {
+            if ($paramsInKeys && is_array($a['params']))
+            {
+                foreach ($a['params'] as $p => $v)
+                {
                     $k .= ";$p=$v";
                 }
             }
@@ -527,28 +579,35 @@ 
      */
     function parsevCalendar($text, $base = 'VCALENDAR', $charset = null, $clear = true)
     {
-        if ($clear) {
+        if ($clear)
+        {
             $this->clear();
         }
 
         if ($base == 'VTODO' &&
-        	preg_match('/^BEGIN:VTODO(.*)^END:VEVENT/ism', $text, $matches)) {
+        	preg_match('/^BEGIN:VTODO(.*)^END:VEVENT/ism', $text, $matches))
+        {
         	// Workaround for Funambol VTODO bug in Mozilla Sync Plugins
         	Horde::logMessage('iCalendar: Funambol VTODO-bug detected, workaround activated...',
         		__FILE__, __LINE__, PEAR_LOG_WARNING);
             $container = true;
             $vCal = $matches[1];
-        } elseif (preg_match('/^BEGIN:' . $base . '(.*)^END:' . $base . '/ism', $text, $matches)) {
+        }
+        elseif (preg_match('/^BEGIN:' . $base . '(.*)^END:' . $base . '/ism', $text, $matches))
+        {
             $container = true;
             $vCal = $matches[1];
-        } else {
+        }
+        else
+        {
             // Text isn't enclosed in BEGIN:VCALENDAR
             // .. END:VCALENDAR. We'll try to parse it anyway.
             $container = false;
             $vCal = $text;
         }
 
-        if (preg_match('/^VERSION:(\d\.\d)\s*$/ism', $vCal, $matches)) {
+        if (preg_match('/^VERSION:(\d\.\d)\s*$/ism', $vCal, $matches))
+        {
             // define the version asap
             #Horde::logMessage("iCalendar VERSION:" . $matches[1], __FILE__, __LINE__, PEAR_LOG_DEBUG);
             $this->setAttribute('VERSION', $matches[1]);
@@ -561,16 +620,20 @@ 
         $matches = null;
         // Workaround for Funambol VTODO bug in Mozilla Sync Plugins
         if (preg_match_all('/^BEGIN:(VTODO)(\r\n|\r|\n)(.*)^END:VEVENT/Uims', $vCal, $matches) ||
-        	preg_match_all('/^BEGIN:(.*)(\r\n|\r|\n)(.*)^END:\1/Uims', $vCal, $matches)) {
+        	preg_match_all('/^BEGIN:(.*)(\r\n|\r|\n)(.*)^END:\1/Uims', $vCal, $matches))
+        {
             // vTimezone components are processed first. They are
             // needed to process vEvents that may use a TZID.
-            foreach ($matches[0] as $key => $data) {
+            foreach ($matches[0] as $key => $data)
+            {
                 $type = trim($matches[1][$key]);
-                if ($type != 'VTIMEZONE') {
+                if ($type != 'VTIMEZONE')
+                {
                     continue;
                 }
                 $component = &Horde_iCalendar::newComponent($type, $this);
-                if ($component === false) {
+                if ($component === false)
+                {
                     return PEAR::raiseError("Unable to create object for type $type");
                 }
                 $component->parsevCalendar($data, $type, $charset);
@@ -582,13 +645,16 @@ 
             }
 
             // Now process the non-vTimezone components.
-            foreach ($matches[0] as $key => $data) {
+            foreach ($matches[0] as $key => $data)
+            {
                 $type = trim($matches[1][$key]);
-                if ($type == 'VTIMEZONE') {
+                if ($type == 'VTIMEZONE')
+                {
                     continue;
                 }
                 $component = &Horde_iCalendar::newComponent($type, $this);
-                if ($component === false) {
+                if ($component === false)
+                {
                     return PEAR::raiseError("Unable to create object for type $type");
                 }
                 $component->parsevCalendar($data, $type, $charset);
@@ -598,7 +664,9 @@ 
                 // Remove from the vCalendar data.
                 $vCal = str_replace($data, '', $vCal);
             }
-        } elseif (!$container) {
+        }
+        elseif (!$container)
+        {
             return false;
         }
 
@@ -606,11 +674,16 @@ 
         //  BODY;ENCODING=QUOTED-PRINTABLE:=
         //  another=20line=
         //  last=20line
-        while (preg_match_all('/^([^:]+;\s*((ENCODING=)?QUOTED-PRINTABLE|ENCODING=[Q|q])(.*=\r?\n)+(.*[^=])?\r?\n)/mU', $vCal, $matches)) {
-            foreach ($matches[1] as $s) {
-            	if ($this->isOldFormat()) {
+        while (preg_match_all('/^([^:]+;\s*((ENCODING=)?QUOTED-PRINTABLE|ENCODING=[Q|q])(.*=\r?\n)+(.*[^=])?\r?\n)/mU', $vCal, $matches))
+        {
+            foreach ($matches[1] as $s)
+            {
+            	if ($this->isOldFormat())
+            	{
                 	$r = preg_replace('/=\r?\n([ \t])?/', '\1', $s);
-            	} else {
+            	}
+            	else
+            	{
             		$r = preg_replace('/=\r?\n[ \t]*/', '', $s);
             	}
                 $vCal = str_replace($s, $r, $vCal);
@@ -618,63 +691,85 @@ 
         }
 
         // Unfold any folded lines.
-        if ($this->isOldFormat()) {
+        if ($this->isOldFormat())
+        {
         	// old formats force folding at whitespace which must therefore be preserved
         	$vCal = preg_replace('/[\r\n]+([ \t])/', '\1', $vCal);
-        } else {
+        }
+        else
+        {
         	$vCal = preg_replace('/[\r\n]+[ \t]/', '', $vCal);
         }
 
 		$isDate = false;
 
         // Parse the remaining attributes.
-        if (preg_match_all('/^((?:[^":]+|(?:"[^"]*")+)*):([^\r\n]*)\r?$/m', $vCal, $matches)) {
-            foreach ($matches[0] as $attribute) {
+        if (preg_match_all('/^((?:[^":]+|(?:"[^"]*")+)*):([^\r\n]*)\r?$/m', $vCal, $matches))
+        {
+            foreach ($matches[0] as $attribute)
+            {
                 preg_match('/([^:;]*)((;(?:(?:[^":\\\]*(?:\\\.)?)+|(?:"[^"]*")+)*)?):([^\r\n]*)[\r\n]*/', $attribute, $parts);
                 $tag = trim(String::upper($parts[1]));
                 $value = $parts[4];
                 $params = array();
 
                 // Parse parameters.
-                if (!empty($parts[2])) {
+                if (!empty($parts[2]))
+                {
                     preg_match_all('/;(([^;=]*)(=("[^"]*"|(?:[^;\\\]*(?:\\\.)?)*))?)/', $parts[2], $param_parts);
-                    foreach ($param_parts[2] as $key => $paramName) {
+                    foreach ($param_parts[2] as $key => $paramName)
+                    {
                         $paramName = String::upper($paramName);
                         $paramValue = $param_parts[4][$key];
-                        if ($paramName == 'TYPE') {
+                        if ($paramName == 'TYPE')
+                        {
                             $paramValue = preg_split('/(?<!\\\\),/', $paramValue);
-                            if (isset($params[$paramName])) {
-                        		if (!is_array($params[$paramName])) {
+                            if (isset($params[$paramName]))
+                            {
+                        		if (!is_array($params[$paramName]))
+                        		{
                         			$params[$paramName] = array($params[$paramName]);
                         		}
                         		$params[$paramName] = array_merge($params[$paramName], $paramValue);
-                        	} else {
-                        		if (count($paramValue) == 1) {
+                        	}
+                        	else
+                        	{
+                        		if (count($paramValue) == 1)
+                        		{
                                 	$paramValue = $paramValue[0];
                             	}
                             	$params[$paramName] = $paramValue;
                         	}
-                        } else {
+                        }
+                        else
+                        {
                         	$params[$paramName] = $paramValue;
                         }
                     }
                 }
 
                 // Charset and encoding handling.
-                if (isset($params['QUOTED-PRINTABLE'])) {
+                if (isset($params['QUOTED-PRINTABLE']))
+                {
 	                $params['ENCODING'] = 'QUOTED-PRINTABLE';
                 }
-                if (isset($params['BASE64'])) {
+                if (isset($params['BASE64']))
+                {
 	                $params['ENCODING'] = 'BASE64';
                 }
-                if (isset($params['ENCODING'])) {
-	                switch (String::upper($params['ENCODING'])) {
+                if (isset($params['ENCODING']))
+                {
+	                switch (String::upper($params['ENCODING']))
+	                {
 		                case 'Q':
 		                case 'QUOTED-PRINTABLE':
 			                $value = quoted_printable_decode($value);
-			                if (isset($params['CHARSET'])) {
+			                if (isset($params['CHARSET']))
+			                {
 				                $value = $GLOBALS['egw']->translation->convert($value, $params['CHARSET']);
-			                } else {
+			                }
+			                else
+			                {
 				                $value = $GLOBALS['egw']->translation->convert($value,
 					                empty($charset) ? ($this->isOldFormat() ? 'iso-8859-1' : 'utf-8') : $charset);
 			                }
@@ -686,9 +781,13 @@ 
 			                $value = base64_decode($value);
 			                break;
 	                }
-                } elseif (isset($params['CHARSET'])) {
+                }
+                elseif (isset($params['CHARSET']))
+                {
 	                $value = $GLOBALS['egw']->translation->convert($value, $params['CHARSET']);
-                } else {
+                }
+                else
+                {
 	                // As per RFC 2279, assume UTF8 if we don't have an
 	                // explicit charset parameter.
 	                $value = $GLOBALS['egw']->translation->convert($value,
@@ -698,7 +797,8 @@ 
                 // Get timezone info for date fields from $params.
                 $tzid = isset($params['TZID']) ? trim($params['TZID'], '\"') : false;
 
-                switch ($tag) {
+                switch ($tag)
+                {
 	                case 'VERSION': // already processed
 		                break;
 		                // Date fields.
@@ -724,22 +824,31 @@ 
 		                // types like AALARM may contain additional data after a ;
 		                // ignore these.
 		                $ts = explode(';', $value);
-		                if (isset($params['VALUE']) && $params['VALUE'] == 'DATE') {
+		                if (isset($params['VALUE']) && $params['VALUE'] == 'DATE')
+		                {
 			                $isDate = true;
 			                $this->setAttribute($tag, $this->_parseDateTime($ts[0], $tzid), $params, true, $this->_parseDate($ts[0]));
-		                } else {
+		                }
+		                else
+		                {
 			                $this->setAttribute($tag, $this->_parseDateTime($ts[0], $tzid), $params);
 		                }
 		                break;
 
 	                case 'TRIGGER':
-		                if (isset($params['VALUE'])) {
-			                if ($params['VALUE'] == 'DATE-TIME') {
+		                if (isset($params['VALUE']))
+		                {
+			                if ($params['VALUE'] == 'DATE-TIME')
+			                {
 				                $this->setAttribute($tag, $this->_parseDateTime($value, $tzid), $params);
-			                } else {
+			                }
+			                else
+			                {
 				                $this->setAttribute($tag, $this->_parseDuration($value), $params);
 			                }
-		                } else {
+		                }
+		                else
+		                {
 			                $this->setAttribute($tag, $this->_parseDuration($value), $params);
 		                }
 		                break;
@@ -750,11 +859,15 @@ 
 		                $dates = array();
 		                preg_match_all('/[;,]([^;,]*)/', ';' . $value, $values);
 
-		                foreach ($values[1] as $value) {
+		                foreach ($values[1] as $value)
+		                {
 			                if ((isset($params['VALUE'])
-					                && $params['VALUE'] == 'DATE') || (!isset($params['VALUE']) && $isDate)) {
+					                && $params['VALUE'] == 'DATE') || (!isset($params['VALUE']) && $isDate))
+			                {
 				                $dates[] = $this->_parseDate(trim($value));
-			                } else {
+			                }
+			                else
+			                {
 				                $dates[] = $this->_parseDateTime(trim($value), $tzid);
 			                }
 		                }
@@ -770,7 +883,8 @@ 
 	                case 'FREEBUSY':
 		                $periods = array();
 		                preg_match_all('/,([^,]*)/', ',' . $value, $values);
-		                foreach ($values[1] as $value) {
+		                foreach ($values[1] as $value)
+		                {
 			                $periods[] = $this->_parsePeriod($value);
 		                }
 
@@ -793,11 +907,14 @@ 
 
 		                // Geo fields.
 	                case 'GEO':
-		                if ($this->isOldFormat()) {
+		                if ($this->isOldFormat())
+		                {
 			                $floats = explode(',', $value);
 			                $value = array('latitude' => floatval($floats[1]),
 				                'longitude' => floatval($floats[0]));
-		                } else {
+		                }
+		                else
+		                {
 			                $floats = explode(';', $value);
 			                $value = array('latitude' => floatval($floats[0]),
 				                'longitude' => floatval($floats[1]));
@@ -854,7 +971,8 @@ 
 
 		                // String fields.
 	                default:
-		                if ($this->isOldFormat()) {
+		                if ($this->isOldFormat())
+		                {
 			                $value = trim($value);
 			                // vCalendar 1.0 and vCard 2.1 only escape semicolons
 			                // and use unescaped semicolons to create lists.
@@ -867,7 +985,9 @@ 
 			                $value = str_replace('\\;', ';', $value);
 			                $values = str_replace('\\;', ';', $values);
 			                $this->setAttribute($tag, trim($value), $params, true, $values);
-		                } else {
+		                }
+		                else
+		                {
 			                $value = trim($value);
 			                // As of rfc 2426 2.4.2 semicolon, comma, and colon
 			                // must be escaped (comma is unescaped after splitting
@@ -909,58 +1029,78 @@ 
         // as it is part of the enclosing VCALENDAR/ICALENDAR. See rfc2445
         if ($base !== 'VEVENT' && $base !== 'VTODO' && $base !== 'VALARM' &&
             $base !== 'VJOURNAL' && $base !== 'VFREEBUSY' &&
-            $base !== 'VTIMEZONE' && $base !== 'STANDARD' && $base != 'DAYLIGHT') {
+            $base !== 'VTIMEZONE' && $base !== 'STANDARD' && $base != 'DAYLIGHT')
+        {
             // Ensure that version is the first attribute.
             $result .= 'VERSION:' . $this->_version . $this->_newline;
         }
 
-        if (empty($charset)) {
-        	if ($this->isOldFormat()) {
+        if (empty($charset))
+        {
+        	if ($this->isOldFormat())
+        	{
         		$charset = NLS::getCharset();
-        	} else {
+        	}
+        	else
+        	{
         		$charset = 'utf-8';
         	}
         }
 
-        foreach ($this->_attributes as $attribute) {
+        foreach ($this->_attributes as $attribute)
+        {
             $name = $attribute['name'];
-            if ($name == 'VERSION') {
+            if ($name == 'VERSION')
+            {
                 // Already done.
                 continue;
             }
 
             $params_str = '';
             $params = $attribute['params'];
-            if ($params) {
-                foreach ($params as $param_name => $param_value) {
+            if ($params)
+            {
+                foreach ($params as $param_name => $param_value)
+                {
                     /* Skip CHARSET for iCalendar 2.0 data, not allowed. */
-                    if ($param_name == 'CHARSET') {
-                    	if (!$this->isOldFormat() || empty($param_value)) {
+                    if ($param_name == 'CHARSET')
+                    {
+                    	if (!$this->isOldFormat() || empty($param_value))
+                    	{
                         	continue;
-                    	} else {
+                    	}
+                    	else
+                    	{
                     		$param_value = String::Upper($param_value);
                     	}
                     }
-                    if ($param_name == 'ENCODING') {
+                    if ($param_name == 'ENCODING')
+                    {
                     	continue;
                     }
                     /* Skip VALUE=DATE for vCalendar 1.0 data, not allowed. */
                     if ($this->isOldFormat() &&
-                        $param_name == 'VALUE' && $param_value == 'DATE') {
+                        $param_name == 'VALUE' && $param_value == 'DATE')
+                    {
                         continue;
                     }
                     /* Skip TZID for iCalendar 1.0 data, not supported. */
-					if ($this->isOldFormat() && $param_name == 'TZID') {
+					if ($this->isOldFormat() && $param_name == 'TZID')
+					{
                         continue;
                     }
                     // Skip CN in ATTENDEE adn ORGANIZER for vCalendar 1.0
                     if ($this->isOldFormat() && $param_name == 'CN' &&
-                    	($name == 'ATTENDEE' || $name == 'ORGANIZER')) {
+                    	($name == 'ATTENDEE' || $name == 'ORGANIZER'))
+                    {
                     	continue;
                     }
-                    if ($param_value === null) {
+                    if ($param_value === null)
+                    {
                         $params_str .= ";$param_name";
-                    } else {
+                    }
+                    else
+                    {
                         $params_str .= ";$param_name=$param_value";
                     }
                 }
@@ -968,7 +1108,8 @@ 
 
             $value = $attribute['value'];
 
-            switch ($name) {
+            switch ($name)
+            {
             // Date fields.
             case 'COMPLETED':
             case 'CREATED':
@@ -980,10 +1121,13 @@ 
 			// Support additional fields after date.
  			case 'AALARM':
             case 'DALARM':
-            	if (isset($params['VALUE'])) {
-                    if ($params['VALUE'] == 'DATE') {
+            	if (isset($params['VALUE']))
+            	{
+                    if ($params['VALUE'] == 'DATE')
+                    {
                         // VCALENDAR 1.0 uses T000000 - T235959 for all day events:
-                        if ($this->isOldFormat() && $name == 'DTEND') {
+                        if ($this->isOldFormat() && $name == 'DTEND')
+                        {
                             $d = new Horde_Date($value);
                             $value = new Horde_Date(array(
                                 'year' => $d->year,
@@ -991,22 +1135,32 @@ 
                                 'mday' => $d->mday - 1));
                             $value->correct();
                             $value = $this->_exportDate($value, '235959');
-                        } else {
+                        }
+                        else
+                        {
                             $value = $this->_exportDate($value, '000000');
                         }
-                    } else {
+                    }
+                    else
+                    {
                         $value = $this->_exportDateTime($value);
                     }
-                } else {
+                }
+                else
+                {
                     $value = $this->_exportDateTime($value);
                 }
 
             	if (is_array($attribute['values']) &&
-		            	count($attribute['values']) > 0) {
+		            	count($attribute['values']) > 0)
+            	{
 		            $values = $attribute['values'];
-	            	if ($this->isOldFormat()) {
+	            	if ($this->isOldFormat())
+	            	{
 		            	$values = str_replace(';', '\\;', $values);
-	            	} else {
+	            	}
+	            	else
+	            	{
                         // As of rfc 2426 2.5 semicolon and comma must be
                         // escaped.
                         $values = str_replace(array('\\', ';', ','),
@@ -1024,10 +1178,13 @@ 
             case 'DUE':
             case 'RECURRENCE-ID':
             case 'X-RECURRENCE-ID':
-                if (isset($params['VALUE'])) {
-                    if ($params['VALUE'] == 'DATE') {
+                if (isset($params['VALUE']))
+                {
+                    if ($params['VALUE'] == 'DATE')
+                    {
                         // VCALENDAR 1.0 uses T000000 - T235959 for all day events:
-                        if ($this->isOldFormat() && $name == 'DTEND') {
+                        if ($this->isOldFormat() && $name == 'DTEND')
+                        {
                             $d = new Horde_Date($value);
                             $value = new Horde_Date(array(
                                 'year' => $d->year,
@@ -1035,13 +1192,19 @@ 
                                 'mday' => $d->mday - 1));
                             $value->correct();
                             $value = $this->_exportDate($value, '235959');
-                        } else {
+                        }
+                        else
+                        {
                             $value = $this->_exportDate($value, '000000');
                         }
-                    } else {
+                    }
+                    else
+                    {
                         $value = $this->_exportDateTime($value);
                     }
-                } else {
+                }
+                else
+                {
                     $value = $this->_exportDateTime($value);
                 }
                 break;
@@ -1049,46 +1212,72 @@ 
             // Comma or semicolon seperated dates.
             case 'EXDATE':
             case 'RDATE':
-	            if (is_array($attribute['values'])) {
+	            if (is_array($attribute['values']))
+	            {
 		            $values = $attribute['values'];
-	            } elseif (!empty($value)) {
-	            	if ($this->isOldFormat()) {
+	            }
+	            elseif (!empty($value))
+	            {
+	            	if ($this->isOldFormat())
+	            	{
 		            	$values = explode(';', $value);
-	            	} else {
+	            	}
+	            	else
+	            	{
 	            		$values = explode(',', $value);
 	            	}
-	            } else {
+	            }
+	            else
+	            {
 		            break;
 	            }
                 $dates = array();
-                foreach ($values as $date) {
-                    if (isset($params['VALUE'])) {
-                        if ($params['VALUE'] == 'DATE') {
+                foreach ($values as $date)
+                {
+                    if (isset($params['VALUE']))
+                    {
+                        if ($params['VALUE'] == 'DATE')
+                        {
                             $dates[] = $this->_exportDate($date, '000000');
-                        } elseif ($params['VALUE'] == 'PERIOD') {
+                        }
+                        elseif ($params['VALUE'] == 'PERIOD')
+                        {
                             $dates[] = $this->_exportPeriod($date);
-                        } else {
+                        }
+                        else
+                        {
                             $dates[] = $this->_exportDateTime($date);
                         }
-                    } else {
+                    }
+                    else
+                    {
                         $dates[] = $this->_exportDateTime($date);
                     }
                 }
-                if ($this->isOldFormat()) {
+                if ($this->isOldFormat())
+                {
 	                $value = implode(';', $dates);
-                } else {
+                }
+                else
+                {
 	                $value = implode(',', $dates);
                 }
                 break;
 
             case 'TRIGGER':
-                if (isset($params['VALUE'])) {
-                    if ($params['VALUE'] == 'DATE-TIME') {
+                if (isset($params['VALUE']))
+                {
+                    if ($params['VALUE'] == 'DATE-TIME')
+                    {
                         $value = $this->_exportDateTime($value);
-                    } elseif ($params['VALUE'] == 'DURATION') {
+                    }
+                    elseif ($params['VALUE'] == 'DURATION')
+                    {
                         $value = $this->_exportDuration($value);
                     }
-                } else {
+                }
+                else
+                {
                     $value = $this->_exportDuration($value);
                 }
                 break;
@@ -1101,7 +1290,8 @@ 
             // Period of time fields.
             case 'FREEBUSY':
                 $value_str = '';
-                foreach ($value as $period) {
+                foreach ($value as $period)
+                {
                     $value_str .= empty($value_str) ? '' : ',';
                     $value_str .= $this->_exportPeriod($period);
                 }
@@ -1124,9 +1314,12 @@ 
 
             // Geo fields.
             case 'GEO':
-                if ($this->isOldFormat()) {
+                if ($this->isOldFormat())
+                {
                     $value = $value['longitude'] . ',' . $value['latitude'];
-                } else {
+                }
+                else
+                {
                     $value = $value['latitude'] . ';' . $value['longitude'];
                 }
                 break;
@@ -1147,18 +1340,25 @@ 
                 break;
 
             default:
-                if ($this->isOldFormat()) {
+                if ($this->isOldFormat())
+                {
                     if (is_array($attribute['values']) &&
-                        count($attribute['values']) > 1) {
+                        count($attribute['values']) > 1)
+                    {
                         $values = $attribute['values'];
-                        if ($name == 'N' || $name == 'ADR' || $name == 'ORG') {
+                        if ($name == 'N' || $name == 'ADR' || $name == 'ORG')
+                        {
                             $glue = ';';
-                        } else {
+                        }
+                        else
+                        {
                             $glue = ',';
                         }
                         $values = str_replace(';', '\\;', $values);
                         $value = implode($glue, $values);
-                    } else {
+                    }
+                    else
+                    {
                         /* vcard 2.1 and vcalendar 1.0 escape only
                          * semicolons */
                         $value = str_replace(';', '\\;', $value);
@@ -1167,23 +1367,31 @@ 
                     // or QUOTED-PRINTABLE encoded. Currently we use
                     // QUOTED-PRINTABLE as default.
                     if (preg_match('/[^\x20-\x7F]/', $value) &&
-		                    !isset($params['ENCODING']))  {
+		                    !isset($params['ENCODING']))
+                    {
 	                    $params['ENCODING'] = 'QUOTED-PRINTABLE';
                     }
                     if (preg_match('/([\177-\377])/', $value) &&
-		                    !isset($params['CHARSET'])) {
+		                    !isset($params['CHARSET']))
+                    {
 	                    // Add CHARSET as well. At least the synthesis client
 	                    // gets confused otherwise
 	                    $params['CHARSET'] = String::upper($charset);
 	                    $params_str .= ';CHARSET=' . $params['CHARSET'];
                     }
-                } else {
+                }
+                else
+                {
                     if (is_array($attribute['values']) &&
-                        count($attribute['values']) > 1) {
+                        count($attribute['values']) > 1)
+                    {
                         $values = $attribute['values'];
-                        if ($name == 'N' || $name == 'ADR' || $name == 'ORG') {
+                        if ($name == 'N' || $name == 'ADR' || $name == 'ORG')
+                        {
                             $glue = ';';
-                        } else {
+                        }
+                        else
+                        {
                             $glue = ',';
                         }
                         // As of rfc 2426 2.5 semicolon and comma must be
@@ -1192,7 +1400,9 @@ 
                                               array('\\\\', '\\;', '\\,'),
                                               $values);
                         $value = implode($glue, $values);
-                    } else {
+                    }
+                    else
+                    {
                         // As of rfc 2426 2.5 semicolon and comma must be
                         // escaped.
                         $value = str_replace(array('\\', ';', ','),
@@ -1205,8 +1415,10 @@ 
 
 			$encoding = (!empty($params['ENCODING']) && strlen(trim($value)) > 0);
 
-            if ($encoding) {
-	            switch($params['ENCODING']) {
+            if ($encoding)
+            {
+	            switch($params['ENCODING'])
+	            {
 		            case 'Q':
 		            case 'QUOTED-PRINTABLE':
 		            	if (!$this->isOldFormat())
@@ -1247,21 +1459,27 @@ 
 				            true, 'utf-8', true); // charset does not matter
 			            $result .= $attr_string . $this->_newline;
 			            */
-			            if ($this->isOldFormat()) {
+			            if ($this->isOldFormat())
+			            {
 				            $result .= $this->_newline; // Append an empty line
 			            }
 	            }
             }
 
-            if (!$encoding) {
+            if (!$encoding)
+            {
                 $value = str_replace(array("\r", "\n"), array('', '\\n'), $value);
                 $attr_string = $name . $params_str;
-                if (strlen($value) > 0) {
+                if (strlen($value) > 0)
+                {
                 	$attr_string .= ':' . $value;
-                } elseif ($name != 'RRULE') {
+                }
+                elseif ($name != 'RRULE')
+                {
                 	$attr_string .= ':';
                 }
-                if (!$this->isOldFormat()) {
+                if (!$this->isOldFormat())
+                {
                     $attr_string = String::wordwrap($attr_string, 75, $this->_newline . ' ',
                                                     true, $charset, true);
                 }
@@ -1269,8 +1487,10 @@ 
             }
         }
 
-        foreach ($this->_components as $component) {
-            if ($this->isOldFormat() &&  $component->getType() == 'vTimeZone') {
+        foreach ($this->_components as $component)
+        {
+            if ($this->isOldFormat() &&  $component->getType() == 'vTimeZone')
+            {
     			// Not supported
 				continue;
         	}
@@ -1286,15 +1506,19 @@ 
     function _parseUtcOffset($text)
     {
         $offset = array();
-        if (preg_match('/(\+|-)([0-9]{2})([0-9]{2})([0-9]{2})?/', $text, $timeParts)) {
+        if (preg_match('/(\+|-)([0-9]{2})([0-9]{2})([0-9]{2})?/', $text, $timeParts))
+        {
             $offset['ahead']  = (bool)($timeParts[1] == '+');
             $offset['hour']   = intval($timeParts[2]);
             $offset['minute'] = intval($timeParts[3]);
-            if (isset($timeParts[4])) {
+            if (isset($timeParts[4]))
+            {
                 $offset['second'] = intval($timeParts[4]);
             }
             return $offset;
-        } else {
+        }
+        else
+        {
             return false;
         }
     }
@@ -1307,7 +1531,8 @@ 
         $offset = $value['ahead'] ? '+' : '-';
         $offset .= sprintf('%02d%02d',
                            $value['hour'], $value['minute']);
-        if (isset($value['second'])) {
+        if (isset($value['second']))
+        {
             $offset .= sprintf('%02d', $value['second']);
         }
 
@@ -1323,9 +1548,12 @@ 
 
         $start = $this->_parseDateTime($periodParts[0]);
 
-        if ($duration = $this->_parseDuration($periodParts[1])) {
+        if ($duration = $this->_parseDuration($periodParts[1]))
+        {
             return array('start' => $start, 'duration' => $duration);
-        } elseif ($end = $this->_parseDateTime($periodParts[1])) {
+        }
+        elseif ($end = $this->_parseDateTime($periodParts[1]))
+        {
             return array('start' => $start, 'end' => $end);
         }
     }
@@ -1337,9 +1565,12 @@ 
     {
         $period = $this->_exportDateTime($value['start']);
         $period .= '/';
-        if (isset($value['duration'])) {
+        if (isset($value['duration']))
+        {
             $period .= $this->_exportDuration($value['duration']);
-        } else {
+        }
+        else
+        {
             $period .= $this->_exportDateTime($value['end']);
         }
         return $period;
@@ -1352,19 +1583,23 @@ 
     function _parseTZID($date, $time, $tzid)
     {
         $vtimezone = $this->_container->findComponentByAttribute('vtimezone', 'TZID', $tzid);
-        if (!$vtimezone) {
+        if (!$vtimezone)
+        {
             return false;
         }
 
         $change_times = array();
-        foreach ($vtimezone->getComponents() as $o) {
+        foreach ($vtimezone->getComponents() as $o)
+        {
             $t = $vtimezone->parseChild($o, $date['year']);
-            if ($t !== false) {
+            if ($t !== false)
+            {
                 $change_times[] = $t;
             }
         }
 
-        if (!$change_times) {
+        if (!$change_times)
+        {
             return false;
         }
 
@@ -1374,18 +1609,22 @@ 
         $t = @gmmktime($time['hour'], $time['minute'], $time['second'],
                        $date['month'], $date['mday'], $date['year']);
 
-        if ($t < $change_times[0]['time']) {
+        if ($t < $change_times[0]['time'])
+        {
             return $change_times[0]['from'];
         }
 
-        for ($i = 0, $n = count($change_times); $i < $n - 1; $i++) {
+        for ($i = 0, $n = count($change_times); $i < $n - 1; $i++)
+        {
             if (($t >= $change_times[$i]['time']) &&
-                ($t < $change_times[$i + 1]['time'])) {
+                ($t < $change_times[$i + 1]['time']))
+            {
                 return $change_times[$i]['to'];
             }
         }
 
-        if ($t >= $change_times[$n - 1]['time']) {
+        if ($t >= $change_times[$n - 1]['time'])
+        {
             return $change_times[$n - 1]['to'];
         }
 
@@ -1402,9 +1641,11 @@ 
     function _parseDateTime($text, $tzid = false)
     {
         $dateParts = explode('T', $text);
-        if (count($dateParts) != 2 && !empty($text)) {
+        if (count($dateParts) != 2 && !empty($text))
+        {
             // Not a datetime field but may be just a date field.
-            if (!preg_match('/^(\d{4})-?(\d{2})-?(\d{2})$/', $text, $match)) {
+            if (!preg_match('/^(\d{4})-?(\d{2})-?(\d{2})$/', $text, $match))
+            {
                 // Or not
                 return $text;
             }
@@ -1412,23 +1653,29 @@ 
             $dateParts = explode('T', $newtext);
         }
 
-        if (!$date = Horde_iCalendar::_parseDate($dateParts[0])) {
+        if (!$date = Horde_iCalendar::_parseDate($dateParts[0]))
+        {
             return $text;
         }
-        if (!$time = Horde_iCalendar::_parseTime($dateParts[1])) {
+        if (!$time = Horde_iCalendar::_parseTime($dateParts[1]))
+        {
             return $text;
         }
 
         // Get timezone info for date fields from $tzid and container.
         $tzoffset = ($time['zone'] == 'Local' && $tzid && is_a($this->_container, 'Horde_iCalendar'))
             ? $this->_parseTZID($date, $time, $tzid) : false;
-        if ($time['zone'] == 'UTC' || $tzoffset !== false) {
+        if ($time['zone'] == 'UTC' || $tzoffset !== false)
+        {
             $result = @gmmktime($time['hour'], $time['minute'], $time['second'],
                                 $date['month'], $date['mday'], $date['year']);
-            if ($tzoffset) {
+            if ($tzoffset)
+            {
                 $result -= $tzoffset;
             }
-        } else {
+        }
+        else
+        {
             // We don't know the timezone so assume local timezone.
             // FIXME: shouldn't this be based on the user's timezone
             // preference rather than the server's timezone?
@@ -1444,7 +1691,8 @@ 
      */
     function _exportDateTime($value)
     {
-        if (is_numeric($value)) {
+        if (is_numeric($value))
+        {
             $temp = array();
             $tz = date('O', $value);
             $TZOffset = (3600 * substr($tz, 0, 3)) + (60 * substr(date('O', $value), 3, 2));
@@ -1458,7 +1706,9 @@ 
             $temp['minute'] = date('i', $value);
             $temp['second'] = date('s', $value);
             return Horde_iCalendar::_exportDate($temp) . 'T' . Horde_iCalendar::_exportTime($temp);
-        } else if (is_object($value) || is_array($value)) {
+        }
+        else if (is_object($value) || is_array($value))
+        {
             $dateOb = new Horde_Date($value);
             return Horde_iCalendar::_exportDateTime($dateOb->timestamp());
         }
@@ -1472,17 +1722,23 @@ 
      */
     function _parseTime($text)
     {
-        if (preg_match('/([0-9]{2})([0-9]{2})([0-9]{2})(Z)?/', $text, $timeParts)) {
+        if (preg_match('/([0-9]{2})([0-9]{2})([0-9]{2})(Z)?/', $text, $timeParts))
+        {
             $time['hour'] = intval($timeParts[1]);
             $time['minute'] = intval($timeParts[2]);
             $time['second'] = intval($timeParts[3]);
-            if (isset($timeParts[4])) {
+            if (isset($timeParts[4]))
+            {
                 $time['zone'] = 'UTC';
-            } else {
+            }
+            else
+            {
                 $time['zone'] = 'Local';
             }
             return $time;
-        } else {
+        }
+        else
+        {
             return false;
         }
     }
@@ -1494,7 +1750,8 @@ 
     {
         $time = sprintf('%02d%02d%02d',
                         $value['hour'], $value['minute'], $value['second']);
-        if ($value['zone'] == 'UTC') {
+        if ($value['zone'] == 'UTC')
+        {
             $time .= 'Z';
         }
         return $time;
@@ -1508,11 +1765,13 @@ 
     function _parseDate($text)
     {
         $parts = explode('T', $text);
-        if (count($parts) == 2) {
+        if (count($parts) == 2)
+        {
             $text = $parts[0];
         }
 
-        if (!preg_match('/^(\d{4})-?(\d{2})-?(\d{2})$/', $text, $match)) {
+        if (!preg_match('/^(\d{4})-?(\d{2})-?(\d{2})$/', $text, $match))
+        {
             return false;
         }
 
@@ -1531,12 +1790,16 @@ 
      */
     function _exportDate($value, $autoconvert = false)
     {
-        if (is_object($value)) {
+        if (is_object($value))
+        {
             $value = array('year' => $value->year, 'month' => $value->month, 'mday' => $value->mday);
         }
-        if ($autoconvert !== false && $this->isOldFormat()) {
+        if ($autoconvert !== false && $this->isOldFormat())
+        {
             return sprintf('%04d%02d%02dT%s', $value['year'], $value['month'], $value['mday'], $autoconvert);
-        } else {
+        }
+        else
+        {
             return sprintf('%04d%02d%02d', $value['year'], $value['month'], $value['mday']);
         }
     }
@@ -1546,36 +1809,44 @@ 
      */
     function _parseDuration($text)
     {
-        if (preg_match('/([+]?|[-])P(([0-9]+W)|([0-9]+D)|)(T(([0-9]+H)|([0-9]+M)|([0-9]+S))+)?/', trim($text), $durvalue)) {
+        if (preg_match('/([+]?|[-])P(([0-9]+W)|([0-9]+D)|)(T(([0-9]+H)|([0-9]+M)|([0-9]+S))+)?/', trim($text), $durvalue))
+        {
             // Weeks.
             $duration = 7 * 86400 * intval($durvalue[3]);
 
-            if (count($durvalue) > 4) {
+            if (count($durvalue) > 4)
+            {
                 // Days.
                 $duration += 86400 * intval($durvalue[4]);
             }
-            if (count($durvalue) > 5) {
+            if (count($durvalue) > 5)
+            {
                 // Hours.
                 $duration += 3600 * intval($durvalue[7]);
 
                 // Mins.
-                if (isset($durvalue[8])) {
+                if (isset($durvalue[8]))
+                {
                     $duration += 60 * intval($durvalue[8]);
                 }
 
                 // Secs.
-                if (isset($durvalue[9])) {
+                if (isset($durvalue[9]))
+                {
                     $duration += intval($durvalue[9]);
                 }
             }
 
             // Sign.
-            if ($durvalue[1] == "-") {
+            if ($durvalue[1] == "-")
+            {
                 $duration *= -1;
             }
 
             return $duration;
-        } else {
+        }
+        else
+        {
             return false;
         }
     }
@@ -1586,7 +1857,8 @@ 
     function _exportDuration($value)
     {
         $duration = '';
-        if ($value < 0) {
+        if ($value < 0)
+        {
             $value *= -1;
             $duration .= '-';
         }
@@ -1594,32 +1866,38 @@ 
 
         $weeks = floor($value / (7 * 86400));
         $value = $value % (7 * 86400);
-        if ($weeks) {
+        if ($weeks)
+        {
             $duration .= $weeks . 'W';
         }
 
         $days = floor($value / (86400));
         $value = $value % (86400);
-        if ($days) {
+        if ($days)
+        {
             $duration .= $days . 'D';
         }
 
-        if ($value) {
+        if ($value)
+        {
             $duration .= 'T';
 
             $hours = floor($value / 3600);
             $value = $value % 3600;
-            if ($hours) {
+            if ($hours)
+            {
                 $duration .= $hours . 'H';
             }
 
             $mins = floor($value / 60);
             $value = $value % 60;
-            if ($mins) {
+            if ($mins)
+            {
                 $duration .= $mins . 'M';
             }
 
-            if ($value) {
+            if ($value)
+            {
                 $duration .= $value . 'S';
             }
         }
@@ -1662,32 +1940,41 @@ 
         $output = $line = '';
         $len = bytes($input);
 
-        for ($i = 0; $i < $len; ++$i) {
+        for ($i = 0; $i < $len; ++$i)
+        {
             $ord = ord($input[$i]);
             // Encode non-printable characters (rule 2).
             if ($ord == 9 ||
                 ($ord >= 32 && $ord <= 60) ||
-                ($ord >= 62 && $ord <= 126)) {
+                ($ord >= 62 && $ord <= 126))
+            {
                 $chunk = $input[$i];
-            } else {
+            }
+            else
+            {
                 // Quoted printable encoding (rule 1).
                 $chunk = '=' . String::upper(sprintf('%02X', $ord));
             }
             $line .= $chunk;
             // Wrap long lines (rule 5)
-            if ($withFolding && strlen($line) + 1 > 76) {
+            if ($withFolding && strlen($line) + 1 > 76)
+            {
                 $line = String::wordwrap($line, 75, "=\r\n", true, 'us-ascii', true);
                 $newline = strrchr($line, "\r\n");
-                if ($newline !== false) {
+                if ($newline !== false)
+                {
                     $output .= substr($line, 0, -strlen($newline) + 2);
                     $line = substr($newline, 2);
-                } else {
+                }
+                else
+                {
                     $output .= $line;
                 }
                 continue;
             }
             // Wrap at line breaks for better readability (rule 4).
-            if ($withFolding && substr($line, -3) == '=0A') {
+            if ($withFolding && substr($line, -3) == '=0A')
+            {
                 $output .= $line . "=\r\n";
                 $line = '';
             }
@@ -1697,7 +1984,8 @@ 
         // Trailing whitespace must be encoded (rule 3).
         $lastpos = strlen($output) - 1;
         if ($output[$lastpos] == chr(9) ||
-            $output[$lastpos] == chr(32)) {
+            $output[$lastpos] == chr(32))
+        {
             $output[$lastpos] = '=';
             $output .= String::upper(sprintf('%02X', ord($output[$lastpos])));
         }

phpgwapi/inc/horde/Horde/iCalendar/vfreebusy.php

Doc Comments +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
     /**
      * Returns any additional freebusy parameters.
      *
-     * @return array  Additional parameters of the freebusy periods.
+     * @return integer|null  Additional parameters of the freebusy periods.
      */
     function getExtraParams()
     {

Indentation +438 added lines, -438 removed lines

@@ -17,443 +17,443 @@
  */
 class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
 
-    var $_busyPeriods = array();
-    var $_extraParams = array();
-
-    /**
-     * Returns the type of this calendar component.
-     *
-     * @return string  The type of this component.
-     */
-    function getType()
-    {
-        return 'vFreebusy';
-    }
-
-    /**
-     * Parses a string containing vFreebusy data.
-     *
-     * @param string $data     The data to parse.
-     */
-    function parsevCalendar($data, $type = null, $charset = null)
-    {
-        parent::parsevCalendar($data, 'VFREEBUSY', $charset);
-
-        // Do something with all the busy periods.
-        foreach ($this->_attributes as $key => $attribute) {
-            if ($attribute['name'] != 'FREEBUSY') {
-                continue;
-            }
-            foreach ($attribute['values'] as $value) {
-                $params = isset($attribute['params'])
-                    ? $attribute['params']
-                    : array();
-                if (isset($value['duration'])) {
-                    $this->addBusyPeriod('BUSY', $value['start'], null,
-                                         $value['duration'], $params);
-                } else {
-                    $this->addBusyPeriod('BUSY', $value['start'],
-                                         $value['end'], null, $params);
-                }
-            }
-            unset($this->_attributes[$key]);
-        }
-    }
-
-    /**
-     * Returns the component exported as string.
-     *
-     * @return string  The exported vFreeBusy information according to the
-     *                 iCalender format specification.
-     */
-    function exportvCalendar()
-    {
-        foreach ($this->_busyPeriods as $start => $end) {
-            $periods = array(array('start' => $start, 'end' => $end));
-            $this->setAttribute('FREEBUSY', $periods,
-                                isset($this->_extraParams[$start])
-                                ? $this->_extraParams[$start] : array());
-        }
-
-        $res = parent::_exportvData('VFREEBUSY');
-
-        foreach ($this->_attributes as $key => $attribute) {
-            if ($attribute['name'] == 'FREEBUSY') {
-                unset($this->_attributes[$key]);
-            }
-        }
-
-        return $res;
-    }
-
-    /**
-     * Returns a display name for this object.
-     *
-     * @return string  A clear text name for displaying this object.
-     */
-    function getName()
-    {
-        $name = '';
-        $method = !empty($this->_container) ?
-            $this->_container->getAttribute('METHOD') : 'PUBLISH';
-
-        if (is_a($method, 'PEAR_Error') || $method == 'PUBLISH') {
-            $attr = 'ORGANIZER';
-        } elseif ($method == 'REPLY') {
-            $attr = 'ATTENDEE';
-        }
-
-        $name = $this->getAttribute($attr, true);
-        if (!is_a($name, 'PEAR_Error') && isset($name[0]['CN'])) {
-            return $name[0]['CN'];
-        }
-
-        $name = $this->getAttribute($attr);
-        if (is_a($name, 'PEAR_Error')) {
-            return '';
-        } else {
-            $name = parse_url($name);
-            return $name['path'];
-        }
-    }
-
-    /**
-     * Returns the email address for this object.
-     *
-     * @return string  The email address of this object's owner.
-     */
-    function getEmail()
-    {
-        $name = '';
-        $method = !empty($this->_container)
-                  ? $this->_container->getAttribute('METHOD') : 'PUBLISH';
-
-        if (is_a($method, 'PEAR_Error') || $method == 'PUBLISH') {
-            $attr = 'ORGANIZER';
-        } elseif ($method == 'REPLY') {
-            $attr = 'ATTENDEE';
-        }
-
-        $name = $this->getAttribute($attr);
-        if (is_a($name, 'PEAR_Error')) {
-            return '';
-        } else {
-            $name = parse_url($name);
-            return $name['path'];
-        }
-    }
-
-    /**
-     * Returns the busy periods.
-     *
-     * @return array  All busy periods.
-     */
-    function getBusyPeriods()
-    {
-        return $this->_busyPeriods;
-    }
-
-    /**
-     * Returns any additional freebusy parameters.
-     *
-     * @return array  Additional parameters of the freebusy periods.
-     */
-    function getExtraParams()
-    {
-        return $this->_extraParams;
-    }
-
-    /**
-     * Returns all the free periods of time in a given period.
-     *
-     * @param integer $startStamp  The start timestamp.
-     * @param integer $endStamp    The end timestamp.
-     *
-     * @return array  A hash with free time periods, the start times as the
-     *                keys and the end times as the values.
-     */
-    function getFreePeriods($startStamp, $endStamp)
-    {
-        $this->simplify();
-        $periods = array();
-
-        // Check that we have data for some part of this period.
-        if ($this->getEnd() < $startStamp || $this->getStart() > $endStamp) {
-            return $periods;
-        }
-
-        // Locate the first time in the requested period we have data for.
-        $nextstart = max($startStamp, $this->getStart());
-
-        // Check each busy period and add free periods in between.
-        foreach ($this->_busyPeriods as $start => $end) {
-            if ($start <= $endStamp && $end >= $nextstart) {
-                if ($nextstart <= $start) {
-                    $periods[$nextstart] = min($start, $endStamp);
-                }
-                $nextstart = min($end, $endStamp);
-            }
-        }
-
-        // If we didn't read the end of the requested period but still have
-        // data then mark as free to the end of the period or available data.
-        if ($nextstart < $endStamp && $nextstart < $this->getEnd()) {
-            $periods[$nextstart] = min($this->getEnd(), $endStamp);
-        }
-
-        return $periods;
-    }
-
-    /**
-     * Adds a busy period to the info.
-     *
-     * This function may throw away data in case you add a period with a start
-     * date that already exists. The longer of the two periods will be chosen
-     * (and all information associated with the shorter one will be removed).
-     *
-     * @param string $type       The type of the period. Either 'FREE' or
-     *                           'BUSY'; only 'BUSY' supported at the moment.
-     * @param integer $start     The start timestamp of the period.
-     * @param integer $end       The end timestamp of the period.
-     * @param integer $duration  The duration of the period. If specified, the
-     *                           $end parameter will be ignored.
-     * @param array   $extra     Additional parameters for this busy period.
-     */
-    function addBusyPeriod($type, $start, $end = null, $duration = null,
-                           $extra = array())
-    {
-        if ($type == 'FREE') {
-            // Make sure this period is not marked as busy.
-            return false;
-        }
-
-        // Calculate the end time if duration was specified.
-        $tempEnd = is_null($duration) ? $end : $start + $duration;
-
-        // Make sure the period length is always positive.
-        $end = max($start, $tempEnd);
-        $start = min($start, $tempEnd);
-
-        if (isset($this->_busyPeriods[$start])) {
-            // Already a period starting at this time. Change the current
-            // period only if the new one is longer. This might be a problem
-            // if the callee assumes that there is no simplification going
-            // on. But since the periods are stored using the start time of
-            // the busy periods we have to throw away data here.
-            if ($end > $this->_busyPeriods[$start]) {
-                $this->_busyPeriods[$start] = $end;
-                $this->_extraParams[$start] = $extra;
-            }
-        } else {
-            // Add a new busy period.
-            $this->_busyPeriods[$start] = $end;
-            $this->_extraParams[$start] = $extra;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the timestamp of the start of the time period this free busy
-     * information covers.
-     *
-     * @return integer  A timestamp.
-     */
-    function getStart()
-    {
-        if (!is_a($this->getAttribute('DTSTART'), 'PEAR_Error')) {
-            return $this->getAttribute('DTSTART');
-        } elseif (count($this->_busyPeriods)) {
-            return min(array_keys($this->_busyPeriods));
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns the timestamp of the end of the time period this free busy
-     * information covers.
-     *
-     * @return integer  A timestamp.
-     */
-    function getEnd()
-    {
-        if (!is_a($this->getAttribute('DTEND'), 'PEAR_Error')) {
-            return $this->getAttribute('DTEND');
-        } elseif (count($this->_busyPeriods)) {
-            return max(array_values($this->_busyPeriods));
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Merges the busy periods of another Horde_iCalendar_vfreebusy object
-     * into this one.
-     *
-     * This might lead to simplification no matter what you specify for the
-     * "simplify" flag since periods with the same start date will lead to the
-     * shorter period being removed (see addBusyPeriod).
-     *
-     * @param Horde_iCalendar_vfreebusy $freebusy  A freebusy object.
-     * @param boolean $simplify                    If true, simplify() will
-     *                                             called after the merge.
-     */
-    function merge($freebusy, $simplify = true)
-    {
-        if (!is_a($freebusy, 'Horde_iCalendar_vfreebusy')) {
-            return false;
-        }
-
-        $extra = $freebusy->getExtraParams();
-        foreach ($freebusy->getBusyPeriods() as $start => $end) {
-            // This might simplify the busy periods without taking the
-            // "simplify" flag into account.
-            $this->addBusyPeriod('BUSY', $start, $end, null,
-                                 isset($extra[$start])
-                                 ? $extra[$start] : array());
-        }
-
-        $thisattr = $this->getAttribute('DTSTART');
-        $thatattr = $freebusy->getAttribute('DTSTART');
-        if (is_a($thisattr, 'PEAR_Error') && !is_a($thatattr, 'PEAR_Error')) {
-            $this->setAttribute('DTSTART', $thatattr, array(), false);
-        } elseif (!is_a($thatattr, 'PEAR_Error')) {
-            if ($thatattr < $thisattr) {
-                $this->setAttribute('DTSTART', $thatattr, array(), false);
-            }
-        }
-
-        $thisattr = $this->getAttribute('DTEND');
-        $thatattr = $freebusy->getAttribute('DTEND');
-        if (is_a($thisattr, 'PEAR_Error') && !is_a($thatattr, 'PEAR_Error')) {
-            $this->setAttribute('DTEND', $thatattr, array(), false);
-        } elseif (!is_a($thatattr, 'PEAR_Error')) {
-            if ($thatattr > $thisattr) {
-                $this->setAttribute('DTEND', $thatattr, array(), false);
-            }
-        }
-
-        if ($simplify) {
-            $this->simplify();
-        }
-
-        return true;
-    }
-
-    /**
-     * Removes all overlaps and simplifies the busy periods array as much as
-     * possible.
-     */
-    function simplify()
-    {
-        $clean = false;
-        $busy  = array($this->_busyPeriods, $this->_extraParams);
-        while (!$clean) {
-            $result = $this->_simplify($busy[0], $busy[1]);
-            $clean = $result === $busy;
-            $busy = $result;
-        }
-
-        ksort($result[1], SORT_NUMERIC);
-        $this->_extraParams = $result[1];
-
-        ksort($result[0], SORT_NUMERIC);
-        $this->_busyPeriods = $result[0];
-    }
-
-    function _simplify($busyPeriods, $extraParams = array())
-    {
-        $checked = array();
-        $checkedExtra = array();
-        $checkedEmpty = true;
-
-        foreach ($busyPeriods as $start => $end) {
-            if ($checkedEmpty) {
-                $checked[$start] = $end;
-                $checkedExtra[$start] = isset($extraParams[$start])
-                    ? $extraParams[$start] : array();
-                $checkedEmpty = false;
-            } else {
-                $added = false;
-                foreach ($checked as $testStart => $testEnd) {
-                    // Replace old period if the new period lies around the
-                    // old period.
-                    if ($start <= $testStart && $end >= $testEnd) {
-                        // Remove old period entry.
-                        unset($checked[$testStart]);
-                        unset($checkedExtra[$testStart]);
-                        // Add replacing entry.
-                        $checked[$start] = $end;
-                        $checkedExtra[$start] = isset($extraParams[$start])
-                            ? $extraParams[$start] : array();
-                        $added = true;
-                    } elseif ($start >= $testStart && $end <= $testEnd) {
-                        // The new period lies fully within the old
-                        // period. Just forget about it.
-                        $added = true;
-                    } elseif (($end <= $testEnd && $end >= $testStart) ||
-                              ($start >= $testStart && $start <= $testEnd)) {
-                        // Now we are in trouble: Overlapping time periods. If
-                        // we allow for additional parameters we cannot simply
-                        // choose one of the two parameter sets. It's better
-                        // to leave two separated time periods.
-                        $extra = isset($extraParams[$start])
-                            ? $extraParams[$start] : array();
-                        $testExtra = isset($checkedExtra[$testStart])
-                            ? $checkedExtra[$testStart] : array();
-                        // Remove old period entry.
-                        unset($checked[$testStart]);
-                        unset($checkedExtra[$testStart]);
-                        // We have two periods overlapping. Are their
-                        // additional parameters the same or different?
-                        $newStart = min($start, $testStart);
-                        $newEnd = max($end, $testEnd);
-                        if ($extra === $testExtra) {
-                            // Both periods have the same information. So we
-                            // can just merge.
-                            $checked[$newStart] = $newEnd;
-                            $checkedExtra[$newStart] = $extra;
-                        } else {
-                            // Extra parameters are different. Create one
-                            // period at the beginning with the params of the
-                            // first period and create a trailing period with
-                            // the params of the second period. The break
-                            // point will be the end of the first period.
-                            $break = min($end, $testEnd);
-                            $checked[$newStart] = $break;
-                            $checkedExtra[$newStart] =
-                                isset($extraParams[$newStart])
-                                ? $extraParams[$newStart] : array();
-                            $checked[$break] = $newEnd;
-                            $highStart = max($start, $testStart);
-                            $checkedExtra[$break] =
-                                isset($extraParams[$highStart])
-                                ? $extraParams[$highStart] : array();
-
-                            // Ensure we also have the extra data in the
-                            // extraParams.
-                            $extraParams[$break] =
-                                isset($extraParams[$highStart])
-                                ? $extraParams[$highStart] : array();
-                        }
-                        $added = true;
-                    }
-
-                    if ($added) {
-                        break;
-                    }
-                }
-
-                if (!$added) {
-                    $checked[$start] = $end;
-                    $checkedExtra[$start] = isset($extraParams[$start])
-                        ? $extraParams[$start] : array();
-                }
-            }
-        }
-
-        return array($checked, $checkedExtra);
-    }
+	var $_busyPeriods = array();
+	var $_extraParams = array();
+
+	/**
+	 * Returns the type of this calendar component.
+	 *
+	 * @return string  The type of this component.
+	 */
+	function getType()
+	{
+		return 'vFreebusy';
+	}
+
+	/**
+	 * Parses a string containing vFreebusy data.
+	 *
+	 * @param string $data     The data to parse.
+	 */
+	function parsevCalendar($data, $type = null, $charset = null)
+	{
+		parent::parsevCalendar($data, 'VFREEBUSY', $charset);
+
+		// Do something with all the busy periods.
+		foreach ($this->_attributes as $key => $attribute) {
+			if ($attribute['name'] != 'FREEBUSY') {
+				continue;
+			}
+			foreach ($attribute['values'] as $value) {
+				$params = isset($attribute['params'])
+					? $attribute['params']
+					: array();
+				if (isset($value['duration'])) {
+					$this->addBusyPeriod('BUSY', $value['start'], null,
+										 $value['duration'], $params);
+				} else {
+					$this->addBusyPeriod('BUSY', $value['start'],
+										 $value['end'], null, $params);
+				}
+			}
+			unset($this->_attributes[$key]);
+		}
+	}
+
+	/**
+	 * Returns the component exported as string.
+	 *
+	 * @return string  The exported vFreeBusy information according to the
+	 *                 iCalender format specification.
+	 */
+	function exportvCalendar()
+	{
+		foreach ($this->_busyPeriods as $start => $end) {
+			$periods = array(array('start' => $start, 'end' => $end));
+			$this->setAttribute('FREEBUSY', $periods,
+								isset($this->_extraParams[$start])
+								? $this->_extraParams[$start] : array());
+		}
+
+		$res = parent::_exportvData('VFREEBUSY');
+
+		foreach ($this->_attributes as $key => $attribute) {
+			if ($attribute['name'] == 'FREEBUSY') {
+				unset($this->_attributes[$key]);
+			}
+		}
+
+		return $res;
+	}
+
+	/**
+	 * Returns a display name for this object.
+	 *
+	 * @return string  A clear text name for displaying this object.
+	 */
+	function getName()
+	{
+		$name = '';
+		$method = !empty($this->_container) ?
+			$this->_container->getAttribute('METHOD') : 'PUBLISH';
+
+		if (is_a($method, 'PEAR_Error') || $method == 'PUBLISH') {
+			$attr = 'ORGANIZER';
+		} elseif ($method == 'REPLY') {
+			$attr = 'ATTENDEE';
+		}
+
+		$name = $this->getAttribute($attr, true);
+		if (!is_a($name, 'PEAR_Error') && isset($name[0]['CN'])) {
+			return $name[0]['CN'];
+		}
+
+		$name = $this->getAttribute($attr);
+		if (is_a($name, 'PEAR_Error')) {
+			return '';
+		} else {
+			$name = parse_url($name);
+			return $name['path'];
+		}
+	}
+
+	/**
+	 * Returns the email address for this object.
+	 *
+	 * @return string  The email address of this object's owner.
+	 */
+	function getEmail()
+	{
+		$name = '';
+		$method = !empty($this->_container)
+				  ? $this->_container->getAttribute('METHOD') : 'PUBLISH';
+
+		if (is_a($method, 'PEAR_Error') || $method == 'PUBLISH') {
+			$attr = 'ORGANIZER';
+		} elseif ($method == 'REPLY') {
+			$attr = 'ATTENDEE';
+		}
+
+		$name = $this->getAttribute($attr);
+		if (is_a($name, 'PEAR_Error')) {
+			return '';
+		} else {
+			$name = parse_url($name);
+			return $name['path'];
+		}
+	}
+
+	/**
+	 * Returns the busy periods.
+	 *
+	 * @return array  All busy periods.
+	 */
+	function getBusyPeriods()
+	{
+		return $this->_busyPeriods;
+	}
+
+	/**
+	 * Returns any additional freebusy parameters.
+	 *
+	 * @return array  Additional parameters of the freebusy periods.
+	 */
+	function getExtraParams()
+	{
+		return $this->_extraParams;
+	}
+
+	/**
+	 * Returns all the free periods of time in a given period.
+	 *
+	 * @param integer $startStamp  The start timestamp.
+	 * @param integer $endStamp    The end timestamp.
+	 *
+	 * @return array  A hash with free time periods, the start times as the
+	 *                keys and the end times as the values.
+	 */
+	function getFreePeriods($startStamp, $endStamp)
+	{
+		$this->simplify();
+		$periods = array();
+
+		// Check that we have data for some part of this period.
+		if ($this->getEnd() < $startStamp || $this->getStart() > $endStamp) {
+			return $periods;
+		}
+
+		// Locate the first time in the requested period we have data for.
+		$nextstart = max($startStamp, $this->getStart());
+
+		// Check each busy period and add free periods in between.
+		foreach ($this->_busyPeriods as $start => $end) {
+			if ($start <= $endStamp && $end >= $nextstart) {
+				if ($nextstart <= $start) {
+					$periods[$nextstart] = min($start, $endStamp);
+				}
+				$nextstart = min($end, $endStamp);
+			}
+		}
+
+		// If we didn't read the end of the requested period but still have
+		// data then mark as free to the end of the period or available data.
+		if ($nextstart < $endStamp && $nextstart < $this->getEnd()) {
+			$periods[$nextstart] = min($this->getEnd(), $endStamp);
+		}
+
+		return $periods;
+	}
+
+	/**
+	 * Adds a busy period to the info.
+	 *
+	 * This function may throw away data in case you add a period with a start
+	 * date that already exists. The longer of the two periods will be chosen
+	 * (and all information associated with the shorter one will be removed).
+	 *
+	 * @param string $type       The type of the period. Either 'FREE' or
+	 *                           'BUSY'; only 'BUSY' supported at the moment.
+	 * @param integer $start     The start timestamp of the period.
+	 * @param integer $end       The end timestamp of the period.
+	 * @param integer $duration  The duration of the period. If specified, the
+	 *                           $end parameter will be ignored.
+	 * @param array   $extra     Additional parameters for this busy period.
+	 */
+	function addBusyPeriod($type, $start, $end = null, $duration = null,
+						   $extra = array())
+	{
+		if ($type == 'FREE') {
+			// Make sure this period is not marked as busy.
+			return false;
+		}
+
+		// Calculate the end time if duration was specified.
+		$tempEnd = is_null($duration) ? $end : $start + $duration;
+
+		// Make sure the period length is always positive.
+		$end = max($start, $tempEnd);
+		$start = min($start, $tempEnd);
+
+		if (isset($this->_busyPeriods[$start])) {
+			// Already a period starting at this time. Change the current
+			// period only if the new one is longer. This might be a problem
+			// if the callee assumes that there is no simplification going
+			// on. But since the periods are stored using the start time of
+			// the busy periods we have to throw away data here.
+			if ($end > $this->_busyPeriods[$start]) {
+				$this->_busyPeriods[$start] = $end;
+				$this->_extraParams[$start] = $extra;
+			}
+		} else {
+			// Add a new busy period.
+			$this->_busyPeriods[$start] = $end;
+			$this->_extraParams[$start] = $extra;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns the timestamp of the start of the time period this free busy
+	 * information covers.
+	 *
+	 * @return integer  A timestamp.
+	 */
+	function getStart()
+	{
+		if (!is_a($this->getAttribute('DTSTART'), 'PEAR_Error')) {
+			return $this->getAttribute('DTSTART');
+		} elseif (count($this->_busyPeriods)) {
+			return min(array_keys($this->_busyPeriods));
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns the timestamp of the end of the time period this free busy
+	 * information covers.
+	 *
+	 * @return integer  A timestamp.
+	 */
+	function getEnd()
+	{
+		if (!is_a($this->getAttribute('DTEND'), 'PEAR_Error')) {
+			return $this->getAttribute('DTEND');
+		} elseif (count($this->_busyPeriods)) {
+			return max(array_values($this->_busyPeriods));
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Merges the busy periods of another Horde_iCalendar_vfreebusy object
+	 * into this one.
+	 *
+	 * This might lead to simplification no matter what you specify for the
+	 * "simplify" flag since periods with the same start date will lead to the
+	 * shorter period being removed (see addBusyPeriod).
+	 *
+	 * @param Horde_iCalendar_vfreebusy $freebusy  A freebusy object.
+	 * @param boolean $simplify                    If true, simplify() will
+	 *                                             called after the merge.
+	 */
+	function merge($freebusy, $simplify = true)
+	{
+		if (!is_a($freebusy, 'Horde_iCalendar_vfreebusy')) {
+			return false;
+		}
+
+		$extra = $freebusy->getExtraParams();
+		foreach ($freebusy->getBusyPeriods() as $start => $end) {
+			// This might simplify the busy periods without taking the
+			// "simplify" flag into account.
+			$this->addBusyPeriod('BUSY', $start, $end, null,
+								 isset($extra[$start])
+								 ? $extra[$start] : array());
+		}
+
+		$thisattr = $this->getAttribute('DTSTART');
+		$thatattr = $freebusy->getAttribute('DTSTART');
+		if (is_a($thisattr, 'PEAR_Error') && !is_a($thatattr, 'PEAR_Error')) {
+			$this->setAttribute('DTSTART', $thatattr, array(), false);
+		} elseif (!is_a($thatattr, 'PEAR_Error')) {
+			if ($thatattr < $thisattr) {
+				$this->setAttribute('DTSTART', $thatattr, array(), false);
+			}
+		}
+
+		$thisattr = $this->getAttribute('DTEND');
+		$thatattr = $freebusy->getAttribute('DTEND');
+		if (is_a($thisattr, 'PEAR_Error') && !is_a($thatattr, 'PEAR_Error')) {
+			$this->setAttribute('DTEND', $thatattr, array(), false);
+		} elseif (!is_a($thatattr, 'PEAR_Error')) {
+			if ($thatattr > $thisattr) {
+				$this->setAttribute('DTEND', $thatattr, array(), false);
+			}
+		}
+
+		if ($simplify) {
+			$this->simplify();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Removes all overlaps and simplifies the busy periods array as much as
+	 * possible.
+	 */
+	function simplify()
+	{
+		$clean = false;
+		$busy  = array($this->_busyPeriods, $this->_extraParams);
+		while (!$clean) {
+			$result = $this->_simplify($busy[0], $busy[1]);
+			$clean = $result === $busy;
+			$busy = $result;
+		}
+
+		ksort($result[1], SORT_NUMERIC);
+		$this->_extraParams = $result[1];
+
+		ksort($result[0], SORT_NUMERIC);
+		$this->_busyPeriods = $result[0];
+	}
+
+	function _simplify($busyPeriods, $extraParams = array())
+	{
+		$checked = array();
+		$checkedExtra = array();
+		$checkedEmpty = true;
+
+		foreach ($busyPeriods as $start => $end) {
+			if ($checkedEmpty) {
+				$checked[$start] = $end;
+				$checkedExtra[$start] = isset($extraParams[$start])
+					? $extraParams[$start] : array();
+				$checkedEmpty = false;
+			} else {
+				$added = false;
+				foreach ($checked as $testStart => $testEnd) {
+					// Replace old period if the new period lies around the
+					// old period.
+					if ($start <= $testStart && $end >= $testEnd) {
+						// Remove old period entry.
+						unset($checked[$testStart]);
+						unset($checkedExtra[$testStart]);
+						// Add replacing entry.
+						$checked[$start] = $end;
+						$checkedExtra[$start] = isset($extraParams[$start])
+							? $extraParams[$start] : array();
+						$added = true;
+					} elseif ($start >= $testStart && $end <= $testEnd) {
+						// The new period lies fully within the old
+						// period. Just forget about it.
+						$added = true;
+					} elseif (($end <= $testEnd && $end >= $testStart) ||
+							  ($start >= $testStart && $start <= $testEnd)) {
+						// Now we are in trouble: Overlapping time periods. If
+						// we allow for additional parameters we cannot simply
+						// choose one of the two parameter sets. It's better
+						// to leave two separated time periods.
+						$extra = isset($extraParams[$start])
+							? $extraParams[$start] : array();
+						$testExtra = isset($checkedExtra[$testStart])
+							? $checkedExtra[$testStart] : array();
+						// Remove old period entry.
+						unset($checked[$testStart]);
+						unset($checkedExtra[$testStart]);
+						// We have two periods overlapping. Are their
+						// additional parameters the same or different?
+						$newStart = min($start, $testStart);
+						$newEnd = max($end, $testEnd);
+						if ($extra === $testExtra) {
+							// Both periods have the same information. So we
+							// can just merge.
+							$checked[$newStart] = $newEnd;
+							$checkedExtra[$newStart] = $extra;
+						} else {
+							// Extra parameters are different. Create one
+							// period at the beginning with the params of the
+							// first period and create a trailing period with
+							// the params of the second period. The break
+							// point will be the end of the first period.
+							$break = min($end, $testEnd);
+							$checked[$newStart] = $break;
+							$checkedExtra[$newStart] =
+								isset($extraParams[$newStart])
+								? $extraParams[$newStart] : array();
+							$checked[$break] = $newEnd;
+							$highStart = max($start, $testStart);
+							$checkedExtra[$break] =
+								isset($extraParams[$highStart])
+								? $extraParams[$highStart] : array();
+
+							// Ensure we also have the extra data in the
+							// extraParams.
+							$extraParams[$break] =
+								isset($extraParams[$highStart])
+								? $extraParams[$highStart] : array();
+						}
+						$added = true;
+					}
+
+					if ($added) {
+						break;
+					}
+				}
+
+				if (!$added) {
+					$checked[$start] = $end;
+					$checkedExtra[$start] = isset($extraParams[$start])
+						? $extraParams[$start] : array();
+				}
+			}
+		}
+
+		return array($checked, $checkedExtra);
+	}
 
 }

Braces +125 added lines, -55 removed lines

@@ -15,7 +15,8 @@ 
  * @since   Horde 3.0
  * @package Horde_iCalendar
  */
-class Horde_iCalendar_vfreebusy extends Horde_iCalendar {
+class Horde_iCalendar_vfreebusy extends Horde_iCalendar
+{
 
     var $_busyPeriods = array();
     var $_extraParams = array();
@@ -40,18 +41,24 @@ 
         parent::parsevCalendar($data, 'VFREEBUSY', $charset);
 
         // Do something with all the busy periods.
-        foreach ($this->_attributes as $key => $attribute) {
-            if ($attribute['name'] != 'FREEBUSY') {
+        foreach ($this->_attributes as $key => $attribute)
+        {
+            if ($attribute['name'] != 'FREEBUSY')
+            {
                 continue;
             }
-            foreach ($attribute['values'] as $value) {
+            foreach ($attribute['values'] as $value)
+            {
                 $params = isset($attribute['params'])
                     ? $attribute['params']
                     : array();
-                if (isset($value['duration'])) {
+                if (isset($value['duration']))
+                {
                     $this->addBusyPeriod('BUSY', $value['start'], null,
                                          $value['duration'], $params);
-                } else {
+                }
+                else
+                {
                     $this->addBusyPeriod('BUSY', $value['start'],
                                          $value['end'], null, $params);
                 }
@@ -68,7 +75,8 @@ 
      */
     function exportvCalendar()
     {
-        foreach ($this->_busyPeriods as $start => $end) {
+        foreach ($this->_busyPeriods as $start => $end)
+        {
             $periods = array(array('start' => $start, 'end' => $end));
             $this->setAttribute('FREEBUSY', $periods,
                                 isset($this->_extraParams[$start])
@@ -77,8 +85,10 @@ 
 
         $res = parent::_exportvData('VFREEBUSY');
 
-        foreach ($this->_attributes as $key => $attribute) {
-            if ($attribute['name'] == 'FREEBUSY') {
+        foreach ($this->_attributes as $key => $attribute)
+        {
+            if ($attribute['name'] == 'FREEBUSY')
+            {
                 unset($this->_attributes[$key]);
             }
         }
@@ -97,21 +107,28 @@ 
         $method = !empty($this->_container) ?
             $this->_container->getAttribute('METHOD') : 'PUBLISH';
 
-        if (is_a($method, 'PEAR_Error') || $method == 'PUBLISH') {
+        if (is_a($method, 'PEAR_Error') || $method == 'PUBLISH')
+        {
             $attr = 'ORGANIZER';
-        } elseif ($method == 'REPLY') {
+        }
+        elseif ($method == 'REPLY')
+        {
             $attr = 'ATTENDEE';
         }
 
         $name = $this->getAttribute($attr, true);
-        if (!is_a($name, 'PEAR_Error') && isset($name[0]['CN'])) {
+        if (!is_a($name, 'PEAR_Error') && isset($name[0]['CN']))
+        {
             return $name[0]['CN'];
         }
 
         $name = $this->getAttribute($attr);
-        if (is_a($name, 'PEAR_Error')) {
+        if (is_a($name, 'PEAR_Error'))
+        {
             return '';
-        } else {
+        }
+        else
+        {
             $name = parse_url($name);
             return $name['path'];
         }
@@ -128,16 +145,22 @@ 
         $method = !empty($this->_container)
                   ? $this->_container->getAttribute('METHOD') : 'PUBLISH';
 
-        if (is_a($method, 'PEAR_Error') || $method == 'PUBLISH') {
+        if (is_a($method, 'PEAR_Error') || $method == 'PUBLISH')
+        {
             $attr = 'ORGANIZER';
-        } elseif ($method == 'REPLY') {
+        }
+        elseif ($method == 'REPLY')
+        {
             $attr = 'ATTENDEE';
         }
 
         $name = $this->getAttribute($attr);
-        if (is_a($name, 'PEAR_Error')) {
+        if (is_a($name, 'PEAR_Error'))
+        {
             return '';
-        } else {
+        }
+        else
+        {
             $name = parse_url($name);
             return $name['path'];
         }
@@ -178,7 +201,8 @@ 
         $periods = array();
 
         // Check that we have data for some part of this period.
-        if ($this->getEnd() < $startStamp || $this->getStart() > $endStamp) {
+        if ($this->getEnd() < $startStamp || $this->getStart() > $endStamp)
+        {
             return $periods;
         }
 
@@ -186,9 +210,12 @@ 
         $nextstart = max($startStamp, $this->getStart());
 
         // Check each busy period and add free periods in between.
-        foreach ($this->_busyPeriods as $start => $end) {
-            if ($start <= $endStamp && $end >= $nextstart) {
-                if ($nextstart <= $start) {
+        foreach ($this->_busyPeriods as $start => $end)
+        {
+            if ($start <= $endStamp && $end >= $nextstart)
+            {
+                if ($nextstart <= $start)
+                {
                     $periods[$nextstart] = min($start, $endStamp);
                 }
                 $nextstart = min($end, $endStamp);
@@ -197,7 +224,8 @@ 
 
         // If we didn't read the end of the requested period but still have
         // data then mark as free to the end of the period or available data.
-        if ($nextstart < $endStamp && $nextstart < $this->getEnd()) {
+        if ($nextstart < $endStamp && $nextstart < $this->getEnd())
+        {
             $periods[$nextstart] = min($this->getEnd(), $endStamp);
         }
 
@@ -222,7 +250,8 @@ 
     function addBusyPeriod($type, $start, $end = null, $duration = null,
                            $extra = array())
     {
-        if ($type == 'FREE') {
+        if ($type == 'FREE')
+        {
             // Make sure this period is not marked as busy.
             return false;
         }
@@ -234,17 +263,21 @@ 
         $end = max($start, $tempEnd);
         $start = min($start, $tempEnd);
 
-        if (isset($this->_busyPeriods[$start])) {
+        if (isset($this->_busyPeriods[$start]))
+        {
             // Already a period starting at this time. Change the current
             // period only if the new one is longer. This might be a problem
             // if the callee assumes that there is no simplification going
             // on. But since the periods are stored using the start time of
             // the busy periods we have to throw away data here.
-            if ($end > $this->_busyPeriods[$start]) {
+            if ($end > $this->_busyPeriods[$start])
+            {
                 $this->_busyPeriods[$start] = $end;
                 $this->_extraParams[$start] = $extra;
             }
-        } else {
+        }
+        else
+        {
             // Add a new busy period.
             $this->_busyPeriods[$start] = $end;
             $this->_extraParams[$start] = $extra;
@@ -261,11 +294,16 @@ 
      */
     function getStart()
     {
-        if (!is_a($this->getAttribute('DTSTART'), 'PEAR_Error')) {
+        if (!is_a($this->getAttribute('DTSTART'), 'PEAR_Error'))
+        {
             return $this->getAttribute('DTSTART');
-        } elseif (count($this->_busyPeriods)) {
+        }
+        elseif (count($this->_busyPeriods))
+        {
             return min(array_keys($this->_busyPeriods));
-        } else {
+        }
+        else
+        {
             return false;
         }
     }
@@ -278,11 +316,16 @@ 
      */
     function getEnd()
     {
-        if (!is_a($this->getAttribute('DTEND'), 'PEAR_Error')) {
+        if (!is_a($this->getAttribute('DTEND'), 'PEAR_Error'))
+        {
             return $this->getAttribute('DTEND');
-        } elseif (count($this->_busyPeriods)) {
+        }
+        elseif (count($this->_busyPeriods))
+        {
             return max(array_values($this->_busyPeriods));
-        } else {
+        }
+        else
+        {
             return false;
         }
     }
@@ -301,12 +344,14 @@ 
      */
     function merge($freebusy, $simplify = true)
     {
-        if (!is_a($freebusy, 'Horde_iCalendar_vfreebusy')) {
+        if (!is_a($freebusy, 'Horde_iCalendar_vfreebusy'))
+        {
             return false;
         }
 
         $extra = $freebusy->getExtraParams();
-        foreach ($freebusy->getBusyPeriods() as $start => $end) {
+        foreach ($freebusy->getBusyPeriods() as $start => $end)
+        {
             // This might simplify the busy periods without taking the
             // "simplify" flag into account.
             $this->addBusyPeriod('BUSY', $start, $end, null,
@@ -316,25 +361,34 @@ 
 
         $thisattr = $this->getAttribute('DTSTART');
         $thatattr = $freebusy->getAttribute('DTSTART');
-        if (is_a($thisattr, 'PEAR_Error') && !is_a($thatattr, 'PEAR_Error')) {
+        if (is_a($thisattr, 'PEAR_Error') && !is_a($thatattr, 'PEAR_Error'))
+        {
             $this->setAttribute('DTSTART', $thatattr, array(), false);
-        } elseif (!is_a($thatattr, 'PEAR_Error')) {
-            if ($thatattr < $thisattr) {
+        }
+        elseif (!is_a($thatattr, 'PEAR_Error'))
+        {
+            if ($thatattr < $thisattr)
+            {
                 $this->setAttribute('DTSTART', $thatattr, array(), false);
             }
         }
 
         $thisattr = $this->getAttribute('DTEND');
         $thatattr = $freebusy->getAttribute('DTEND');
-        if (is_a($thisattr, 'PEAR_Error') && !is_a($thatattr, 'PEAR_Error')) {
+        if (is_a($thisattr, 'PEAR_Error') && !is_a($thatattr, 'PEAR_Error'))
+        {
             $this->setAttribute('DTEND', $thatattr, array(), false);
-        } elseif (!is_a($thatattr, 'PEAR_Error')) {
-            if ($thatattr > $thisattr) {
+        }
+        elseif (!is_a($thatattr, 'PEAR_Error'))
+        {
+            if ($thatattr > $thisattr)
+            {
                 $this->setAttribute('DTEND', $thatattr, array(), false);
             }
         }
 
-        if ($simplify) {
+        if ($simplify)
+        {
             $this->simplify();
         }
 
@@ -349,7 +403,8 @@ 
     {
         $clean = false;
         $busy  = array($this->_busyPeriods, $this->_extraParams);
-        while (!$clean) {
+        while (!$clean)
+        {
             $result = $this->_simplify($busy[0], $busy[1]);
             $clean = $result === $busy;
             $busy = $result;
@@ -368,18 +423,24 @@ 
         $checkedExtra = array();
         $checkedEmpty = true;
 
-        foreach ($busyPeriods as $start => $end) {
-            if ($checkedEmpty) {
+        foreach ($busyPeriods as $start => $end)
+        {
+            if ($checkedEmpty)
+            {
                 $checked[$start] = $end;
                 $checkedExtra[$start] = isset($extraParams[$start])
                     ? $extraParams[$start] : array();
                 $checkedEmpty = false;
-            } else {
+            }
+            else
+            {
                 $added = false;
-                foreach ($checked as $testStart => $testEnd) {
+                foreach ($checked as $testStart => $testEnd)
+                {
                     // Replace old period if the new period lies around the
                     // old period.
-                    if ($start <= $testStart && $end >= $testEnd) {
+                    if ($start <= $testStart && $end >= $testEnd)
+                    {
                         // Remove old period entry.
                         unset($checked[$testStart]);
                         unset($checkedExtra[$testStart]);
@@ -388,12 +449,16 @@ 
                         $checkedExtra[$start] = isset($extraParams[$start])
                             ? $extraParams[$start] : array();
                         $added = true;
-                    } elseif ($start >= $testStart && $end <= $testEnd) {
+                    }
+                    elseif ($start >= $testStart && $end <= $testEnd)
+                    {
                         // The new period lies fully within the old
                         // period. Just forget about it.
                         $added = true;
-                    } elseif (($end <= $testEnd && $end >= $testStart) ||
-                              ($start >= $testStart && $start <= $testEnd)) {
+                    }
+                    elseif (($end <= $testEnd && $end >= $testStart) ||
+                              ($start >= $testStart && $start <= $testEnd))
+                    {
                         // Now we are in trouble: Overlapping time periods. If
                         // we allow for additional parameters we cannot simply
                         // choose one of the two parameter sets. It's better
@@ -409,12 +474,15 @@ 
                         // additional parameters the same or different?
                         $newStart = min($start, $testStart);
                         $newEnd = max($end, $testEnd);
-                        if ($extra === $testExtra) {
+                        if ($extra === $testExtra)
+                        {
                             // Both periods have the same information. So we
                             // can just merge.
                             $checked[$newStart] = $newEnd;
                             $checkedExtra[$newStart] = $extra;
-                        } else {
+                        }
+                        else
+                        {
                             // Extra parameters are different. Create one
                             // period at the beginning with the params of the
                             // first period and create a trailing period with
@@ -440,12 +508,14 @@ 
                         $added = true;
                     }
 
-                    if ($added) {
+                    if ($added)
+                    {
                         break;
                     }
                 }
 
-                if (!$added) {
+                if (!$added)
+                {
                     $checked[$start] = $end;
                     $checkedExtra[$start] = isset($extraParams[$start])
                         ? $extraParams[$start] : array();

phpgwapi/inc/horde/Horde/NLS.php

Doc Comments +1 added lines, -1 removed lines

@@ -420,7 +420,7 @@
      *
      * @param string $host  The hostname or IP address.
      *
-     * @return mixed  On success, return an array with the following entries:
+     * @return string  On success, return an array with the following entries:
      *                'code'  =>  Country Code
      *                'name'  =>  Country Name
      *                On failure, return false.

Indentation +493 added lines, -493 removed lines

@@ -24,500 +24,500 @@
  */
 class NLS {
 
-    /**
-     * Selects the most preferred language for the current client session.
-     *
-     * @access public
-     *
-     * @return string  The selected language abbreviation.
-     */
-    function select()
-    {
-        global $nls, $prefs;
-
-        $lang = Util::getFormData('new_lang');
-
-        /* First, check if language pref is locked and, if so, set it to its
+	/**
+	 * Selects the most preferred language for the current client session.
+	 *
+	 * @access public
+	 *
+	 * @return string  The selected language abbreviation.
+	 */
+	function select()
+	{
+		global $nls, $prefs;
+
+		$lang = Util::getFormData('new_lang');
+
+		/* First, check if language pref is locked and, if so, set it to its
            value */
-        if (isset($prefs) && $prefs->isLocked('language')) {
-            $language = $prefs->getValue('language');
-        /* Check if the user selected a language from the login screen */
-        } elseif (!empty($lang)) {
-            $language = $lang;
-        /* Check if we have a language set in a cookie */
-        } elseif (isset($_SESSION['horde_language'])) {
-            $language = $_SESSION['horde_language'];
-        /* Use site-wide default, if one is defined */
-        } elseif (!empty($nls['defaults']['language'])) {
-            $language = $nls['defaults']['language'];
-        /* Try browser-accepted languages. */
-        } elseif (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-            /* The browser supplies a list, so return the first valid one. */
-            $browser_langs = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
-            foreach ($browser_langs as $lang) {
-                /* Strip quality value for language */
-                if (($pos = strpos($lang, ';')) !== false) {
-                    $lang = substr($lang, 0, $pos);
-                }
-                $lang = NLS::_map(trim($lang));
-                if (NLS::isValid($lang)) {
-                    $language = $lang;
-                    break;
-                }
-                /* In case no full match, save best guess based on prefix */
-                if (!isset($partial_lang) &&
-                    NLS::isValid(NLS::_map(substr($lang, 0, 2)))) {
-                    $partial_lang = NLS::_map(substr($lang, 0, 2));
-                }
-            }
-        }
-
-        if (!isset($language)) {
-            if (isset($partial_lang)) {
-                $language = $partial_lang;
-            } else {
-                /* No dice auto-detecting, default to US English. */
-                $language = 'en_US';
-            }
-        }
-
-        return basename($language);
-    }
-
-    /**
-     * Sets the language.
-     *
-     * @access public
-     *
-     * @param optional string $lang     The language abbriviation.
-     */
-    function setLang($lang = null)
-    {
-        include_once HORDE_BASE . '/config/nls.php';
-
-        if (empty($lang) || !NLS::isValid($lang)) {
-            $lang = NLS::select();
-        }
-
-        if (isset($GLOBALS['language']) && $GLOBALS['language'] == $lang) {
-            return;
-        }
-
-        $GLOBALS['language'] = $lang;
-
-        /* First try language with the current charset. */
-        $lang_charset = $lang . '.' . NLS::getCharset();
-        if ($lang_charset != setlocale(LC_ALL, $lang_charset)) {
-            /* Next try language with its default charset. */
-            global $nls;
-            $charset = !empty($nls['charsets'][$lang]) ? $nls['charsets'][$lang] : $nls['defaults']['charset'];
-            $lang_charset = $lang . '.' . $charset;
-            NLS::_cachedCharset(0, $charset);
-            if ($lang_charset != setlocale(LC_ALL, $lang_charset)) {
-                /* At last try language solely. */
-                $lang_charset = $lang;
-                setlocale(LC_ALL, $lang_charset);
-            }
-        }
-        @putenv('LANG=' . $lang_charset);
-        @putenv('LANGUAGE=' . $lang_charset);
-    }
-
-    /**
-     * Sets the gettext domain.
-     *
-     * @access public
-     *
-     * @param string $app        The application name.
-     * @param string $directory  The directory where the application's
-     *                           LC_MESSAGES directory resides.
-     * @param string $charset    The charset.
-     */
-    function setTextdomain($app, $directory, $charset)
-    {
-        bindtextdomain($app, $directory);
-        textdomain($app);
-
-        /* The existence of this function depends on the platform. */
-        if (function_exists('bind_textdomain_codeset')) {
-            NLS::_cachedCharset(0, bind_textdomain_codeset($app, $charset));
-        }
-
-        if (!headers_sent()) {
-            header('Content-Type: text/html; charset=' . $charset);
-        }
-    }
-
-    /**
-     * Determines whether the supplied language is valid.
-     *
-     * @access public
-     *
-     * @param string $language  The abbreviated name of the language.
-     *
-     * @return boolean  True if the language is valid, false if it's not
-     *                  valid or unknown.
-     */
-    function isValid($language)
-    {
-        return !empty($GLOBALS['nls']['languages'][$language]);
-    }
-
-    /**
-     * Maps languages with common two-letter codes (such as nl) to the
-     * full gettext code (in this case, nl_NL). Returns the language
-     * unmodified if it isn't an alias.
-     *
-     * @access private
-     *
-     * @param string $language  The language code to map.
-     *
-     * @return string  The mapped language code.
-     */
-
-    function _map($language)
-    {
-        require_once 'Horde/String.php';
-
-        $aliases = &$GLOBALS['nls']['aliases'];
-
-        // Translate the $language to get broader matches.
-        // (eg. de-DE should match de_DE)
-        $trans_lang = str_replace('-', '_', $language);
-        $lang_parts = explode('_', $trans_lang);
-        $trans_lang = String::lower($lang_parts[0]);
-        if (isset($lang_parts[1])) {
-            $trans_lang .= '_' . String::upper($lang_parts[1]);
-        }
-
-        // See if we get a match for this
-        if (!empty($aliases[$trans_lang])) {
-            return $aliases[$trans_lang];
-        }
-
-        // If we get that far down, the language cannot be found.
-        // Return $trans_lang.
-        return $trans_lang;
-    }
-
-    /**
-     * Returns the charset for the current language.
-     *
-     * @access public
-     *
-     * @param boolean $original  If true returns the original charset of the
-     *                           translation, the actually used one otherwise.
-     *
-     * @return string  The character set that should be used with the current
-     *                 locale settings.
-     */
-    function getCharset($original = false)
-    {
-        global $language, $nls;
-
-        /* Get cached results. */
-        $cacheKey = intval($original);
-        $charset = NLS::_cachedCharset($cacheKey);
-        if (!is_null($charset)) {
-            return $charset;
-        }
-
-        if ($original) {
-            $charset = empty($nls['charsets'][$language]) ? $nls['defaults']['charset'] : $nls['charsets'][$language];
-        } else {
-            require_once 'Horde/Browser.php';
-            $browser = &Browser::singleton();
-
-            if ($browser->hasFeature('utf') &&
-                (Util::extensionExists('iconv') ||
-                 Util::extensionExists('mbstring'))) {
-                $charset = 'UTF-8';
-            }
-        }
-
-        if (is_null($charset)) {
-            $charset = NLS::getExternalCharset();
-        }
-
-        NLS::_cachedCharset($cacheKey, $charset);
-        return $charset;
-    }
-
-
-    /**
-     * Returns the current charset of the environment
-     *
-     * @access public
-     *
-     * @return string  The character set that should be used with the current
-     *                 locale settings.
-     */
-    function getExternalCharset()
-    {
-        global $language, $nls;
-
-        /* Get cached results. */
-        $charset = NLS::_cachedCharset(2);
-        if (!is_null($charset)) {
-            return $charset;
-        }
-
-        $lang_charset = setlocale(LC_ALL, 0);
-        if (strpos($lang_charset, ';') === false &&
-            strpos($lang_charset, '/') === false) {
-            $lang_charset = explode('.', $lang_charset);
-            if ((count($lang_charset) == 2) && !empty($lang_charset[1])) {
-                NLS::_cachedCharset(2, $lang_charset[1]);
-                return $lang_charset[1];
-            }
-        }
-
-        return (!empty($nls['charsets'][$language])) ? $nls['charsets'][$language] : $nls['defaults']['charset'];
-    }
-
-    /**
-     * Sets or returns the charset used under certain conditions.
-     *
-     * @access private
-     *
-     * @param integer $index   The ID of a cache slot. 0 for the UI charset, 1
-     *                         for the translation charset and 2 for the
-     *                         external charset.
-     * @param string $charset  If specified, this charset will be stored in the
-     *                         given cache slot. Otherwise the content of the
-     *                         specified cache slot will be returned.
-     */
-    function _cachedCharset($index, $charset = null)
-    {
-        static $cache;
-
-        if (!isset($cache)) {
-            $cache = array();
-        }
-
-        if ($charset == null) {
-            return isset($cache[$index]) ? $cache[$index] : null;
-        } else {
-            $cache[$index] = $charset;
-        }
-    }
-
-    /**
-     * Returns the charset to use for outgoing emails.
-     *
-     * @return string  The preferred charset for outgoing mails based on
-     *                 the user's preferences and the current language.
-     */
-    function getEmailCharset()
-    {
-        global $prefs, $language, $nls;
-
-        $charset = $prefs->getValue('sending_charset');
-        if (!empty($charset)) {
-            return $charset;
-        }
-        return isset($nls['emails'][$language]) ? $nls['emails'][$language] :
-               (isset($nls['charsets'][$language]) ? $nls['charsets'][$language] : $nls['defaults']['charset']);
-    }
-
-    /**
-     * Check to see if character set is valid for htmlspecialchars() calls.
-     *
-     * @access public
-     *
-     * @param string $charset  The character set to check.
-     *
-     * @return boolean  Is charset valid for the current system?
-     */
-    function checkCharset($charset)
-    {
-        static $check;
-
-        if (is_null($charset) || empty($charset)) {
-            return false;
-        }
-
-        if (isset($check[$charset])) {
-            return $check[$charset];
-        } elseif (!isset($check)) {
-            $check = array();
-        }
-
-        $valid = true;
-
-        ini_set('track_errors', 1);
-        @htmlspecialchars('', ENT_COMPAT, $charset);
-        if (isset($php_errormsg)) {
-            $valid = false;
-        }
-        ini_restore('track_errors');
-
-        $check[$charset] = $valid;
-
-        return $valid;
-    }
-
-    /**
-     * Sets the current timezone, if available.
-     *
-     * @access public
-     */
-    function setTimeZone()
-    {
-        global $prefs;
-
-        $tz = $prefs->getValue('timezone');
-        if (!empty($tz)) {
-            @putenv('TZ=' . $tz);
-        }
-    }
-
-    /**
-     * Get the locale info returned by localeconv(), but cache it, to
-     * avoid repeated calls.
-     *
-     * @access public
-     *
-     * @return array  The results of localeconv().
-     */
-    function getLocaleInfo()
-    {
-        static $lc_info;
-
-        if (!isset($lc_info)) {
-            $lc_info = localeconv();
-        }
-
-        return $lc_info;
-    }
-
-    /**
-     * Get the language info returned by nl_langinfo(), but cache it, to
-     * avoid repeated calls.
-     *
-     * @access public
-     * @since Horde 3.1
-     *
-     * @param const $item  The langinfo item to return.
-     *
-     * @return array  The results of nl_langinfo().
-     */
-    function getLangInfo($item)
-    {
-        static $nl_info = array();
-
-        if (!isset($nl_info[$item])) {
-            $nl_info[$item] = nl_langinfo($item);
-        }
-
-        return $nl_info[$item];
-    }
-
-    /**
-     * Get country information from a hostname or IP address.
-     *
-     * @access public
-     *
-     * @param string $host  The hostname or IP address.
-     *
-     * @return mixed  On success, return an array with the following entries:
-     *                'code'  =>  Country Code
-     *                'name'  =>  Country Name
-     *                On failure, return false.
-     */
-    function getCountryByHost($host)
-    {
-        global $conf;
-
-        /* List of generic domains that we know is not in the country TLD
+		if (isset($prefs) && $prefs->isLocked('language')) {
+			$language = $prefs->getValue('language');
+		/* Check if the user selected a language from the login screen */
+		} elseif (!empty($lang)) {
+			$language = $lang;
+		/* Check if we have a language set in a cookie */
+		} elseif (isset($_SESSION['horde_language'])) {
+			$language = $_SESSION['horde_language'];
+		/* Use site-wide default, if one is defined */
+		} elseif (!empty($nls['defaults']['language'])) {
+			$language = $nls['defaults']['language'];
+		/* Try browser-accepted languages. */
+		} elseif (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+			/* The browser supplies a list, so return the first valid one. */
+			$browser_langs = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+			foreach ($browser_langs as $lang) {
+				/* Strip quality value for language */
+				if (($pos = strpos($lang, ';')) !== false) {
+					$lang = substr($lang, 0, $pos);
+				}
+				$lang = NLS::_map(trim($lang));
+				if (NLS::isValid($lang)) {
+					$language = $lang;
+					break;
+				}
+				/* In case no full match, save best guess based on prefix */
+				if (!isset($partial_lang) &&
+					NLS::isValid(NLS::_map(substr($lang, 0, 2)))) {
+					$partial_lang = NLS::_map(substr($lang, 0, 2));
+				}
+			}
+		}
+
+		if (!isset($language)) {
+			if (isset($partial_lang)) {
+				$language = $partial_lang;
+			} else {
+				/* No dice auto-detecting, default to US English. */
+				$language = 'en_US';
+			}
+		}
+
+		return basename($language);
+	}
+
+	/**
+	 * Sets the language.
+	 *
+	 * @access public
+	 *
+	 * @param optional string $lang     The language abbriviation.
+	 */
+	function setLang($lang = null)
+	{
+		include_once HORDE_BASE . '/config/nls.php';
+
+		if (empty($lang) || !NLS::isValid($lang)) {
+			$lang = NLS::select();
+		}
+
+		if (isset($GLOBALS['language']) && $GLOBALS['language'] == $lang) {
+			return;
+		}
+
+		$GLOBALS['language'] = $lang;
+
+		/* First try language with the current charset. */
+		$lang_charset = $lang . '.' . NLS::getCharset();
+		if ($lang_charset != setlocale(LC_ALL, $lang_charset)) {
+			/* Next try language with its default charset. */
+			global $nls;
+			$charset = !empty($nls['charsets'][$lang]) ? $nls['charsets'][$lang] : $nls['defaults']['charset'];
+			$lang_charset = $lang . '.' . $charset;
+			NLS::_cachedCharset(0, $charset);
+			if ($lang_charset != setlocale(LC_ALL, $lang_charset)) {
+				/* At last try language solely. */
+				$lang_charset = $lang;
+				setlocale(LC_ALL, $lang_charset);
+			}
+		}
+		@putenv('LANG=' . $lang_charset);
+		@putenv('LANGUAGE=' . $lang_charset);
+	}
+
+	/**
+	 * Sets the gettext domain.
+	 *
+	 * @access public
+	 *
+	 * @param string $app        The application name.
+	 * @param string $directory  The directory where the application's
+	 *                           LC_MESSAGES directory resides.
+	 * @param string $charset    The charset.
+	 */
+	function setTextdomain($app, $directory, $charset)
+	{
+		bindtextdomain($app, $directory);
+		textdomain($app);
+
+		/* The existence of this function depends on the platform. */
+		if (function_exists('bind_textdomain_codeset')) {
+			NLS::_cachedCharset(0, bind_textdomain_codeset($app, $charset));
+		}
+
+		if (!headers_sent()) {
+			header('Content-Type: text/html; charset=' . $charset);
+		}
+	}
+
+	/**
+	 * Determines whether the supplied language is valid.
+	 *
+	 * @access public
+	 *
+	 * @param string $language  The abbreviated name of the language.
+	 *
+	 * @return boolean  True if the language is valid, false if it's not
+	 *                  valid or unknown.
+	 */
+	function isValid($language)
+	{
+		return !empty($GLOBALS['nls']['languages'][$language]);
+	}
+
+	/**
+	 * Maps languages with common two-letter codes (such as nl) to the
+	 * full gettext code (in this case, nl_NL). Returns the language
+	 * unmodified if it isn't an alias.
+	 *
+	 * @access private
+	 *
+	 * @param string $language  The language code to map.
+	 *
+	 * @return string  The mapped language code.
+	 */
+
+	function _map($language)
+	{
+		require_once 'Horde/String.php';
+
+		$aliases = &$GLOBALS['nls']['aliases'];
+
+		// Translate the $language to get broader matches.
+		// (eg. de-DE should match de_DE)
+		$trans_lang = str_replace('-', '_', $language);
+		$lang_parts = explode('_', $trans_lang);
+		$trans_lang = String::lower($lang_parts[0]);
+		if (isset($lang_parts[1])) {
+			$trans_lang .= '_' . String::upper($lang_parts[1]);
+		}
+
+		// See if we get a match for this
+		if (!empty($aliases[$trans_lang])) {
+			return $aliases[$trans_lang];
+		}
+
+		// If we get that far down, the language cannot be found.
+		// Return $trans_lang.
+		return $trans_lang;
+	}
+
+	/**
+	 * Returns the charset for the current language.
+	 *
+	 * @access public
+	 *
+	 * @param boolean $original  If true returns the original charset of the
+	 *                           translation, the actually used one otherwise.
+	 *
+	 * @return string  The character set that should be used with the current
+	 *                 locale settings.
+	 */
+	function getCharset($original = false)
+	{
+		global $language, $nls;
+
+		/* Get cached results. */
+		$cacheKey = intval($original);
+		$charset = NLS::_cachedCharset($cacheKey);
+		if (!is_null($charset)) {
+			return $charset;
+		}
+
+		if ($original) {
+			$charset = empty($nls['charsets'][$language]) ? $nls['defaults']['charset'] : $nls['charsets'][$language];
+		} else {
+			require_once 'Horde/Browser.php';
+			$browser = &Browser::singleton();
+
+			if ($browser->hasFeature('utf') &&
+				(Util::extensionExists('iconv') ||
+				 Util::extensionExists('mbstring'))) {
+				$charset = 'UTF-8';
+			}
+		}
+
+		if (is_null($charset)) {
+			$charset = NLS::getExternalCharset();
+		}
+
+		NLS::_cachedCharset($cacheKey, $charset);
+		return $charset;
+	}
+
+
+	/**
+	 * Returns the current charset of the environment
+	 *
+	 * @access public
+	 *
+	 * @return string  The character set that should be used with the current
+	 *                 locale settings.
+	 */
+	function getExternalCharset()
+	{
+		global $language, $nls;
+
+		/* Get cached results. */
+		$charset = NLS::_cachedCharset(2);
+		if (!is_null($charset)) {
+			return $charset;
+		}
+
+		$lang_charset = setlocale(LC_ALL, 0);
+		if (strpos($lang_charset, ';') === false &&
+			strpos($lang_charset, '/') === false) {
+			$lang_charset = explode('.', $lang_charset);
+			if ((count($lang_charset) == 2) && !empty($lang_charset[1])) {
+				NLS::_cachedCharset(2, $lang_charset[1]);
+				return $lang_charset[1];
+			}
+		}
+
+		return (!empty($nls['charsets'][$language])) ? $nls['charsets'][$language] : $nls['defaults']['charset'];
+	}
+
+	/**
+	 * Sets or returns the charset used under certain conditions.
+	 *
+	 * @access private
+	 *
+	 * @param integer $index   The ID of a cache slot. 0 for the UI charset, 1
+	 *                         for the translation charset and 2 for the
+	 *                         external charset.
+	 * @param string $charset  If specified, this charset will be stored in the
+	 *                         given cache slot. Otherwise the content of the
+	 *                         specified cache slot will be returned.
+	 */
+	function _cachedCharset($index, $charset = null)
+	{
+		static $cache;
+
+		if (!isset($cache)) {
+			$cache = array();
+		}
+
+		if ($charset == null) {
+			return isset($cache[$index]) ? $cache[$index] : null;
+		} else {
+			$cache[$index] = $charset;
+		}
+	}
+
+	/**
+	 * Returns the charset to use for outgoing emails.
+	 *
+	 * @return string  The preferred charset for outgoing mails based on
+	 *                 the user's preferences and the current language.
+	 */
+	function getEmailCharset()
+	{
+		global $prefs, $language, $nls;
+
+		$charset = $prefs->getValue('sending_charset');
+		if (!empty($charset)) {
+			return $charset;
+		}
+		return isset($nls['emails'][$language]) ? $nls['emails'][$language] :
+			   (isset($nls['charsets'][$language]) ? $nls['charsets'][$language] : $nls['defaults']['charset']);
+	}
+
+	/**
+	 * Check to see if character set is valid for htmlspecialchars() calls.
+	 *
+	 * @access public
+	 *
+	 * @param string $charset  The character set to check.
+	 *
+	 * @return boolean  Is charset valid for the current system?
+	 */
+	function checkCharset($charset)
+	{
+		static $check;
+
+		if (is_null($charset) || empty($charset)) {
+			return false;
+		}
+
+		if (isset($check[$charset])) {
+			return $check[$charset];
+		} elseif (!isset($check)) {
+			$check = array();
+		}
+
+		$valid = true;
+
+		ini_set('track_errors', 1);
+		@htmlspecialchars('', ENT_COMPAT, $charset);
+		if (isset($php_errormsg)) {
+			$valid = false;
+		}
+		ini_restore('track_errors');
+
+		$check[$charset] = $valid;
+
+		return $valid;
+	}
+
+	/**
+	 * Sets the current timezone, if available.
+	 *
+	 * @access public
+	 */
+	function setTimeZone()
+	{
+		global $prefs;
+
+		$tz = $prefs->getValue('timezone');
+		if (!empty($tz)) {
+			@putenv('TZ=' . $tz);
+		}
+	}
+
+	/**
+	 * Get the locale info returned by localeconv(), but cache it, to
+	 * avoid repeated calls.
+	 *
+	 * @access public
+	 *
+	 * @return array  The results of localeconv().
+	 */
+	function getLocaleInfo()
+	{
+		static $lc_info;
+
+		if (!isset($lc_info)) {
+			$lc_info = localeconv();
+		}
+
+		return $lc_info;
+	}
+
+	/**
+	 * Get the language info returned by nl_langinfo(), but cache it, to
+	 * avoid repeated calls.
+	 *
+	 * @access public
+	 * @since Horde 3.1
+	 *
+	 * @param const $item  The langinfo item to return.
+	 *
+	 * @return array  The results of nl_langinfo().
+	 */
+	function getLangInfo($item)
+	{
+		static $nl_info = array();
+
+		if (!isset($nl_info[$item])) {
+			$nl_info[$item] = nl_langinfo($item);
+		}
+
+		return $nl_info[$item];
+	}
+
+	/**
+	 * Get country information from a hostname or IP address.
+	 *
+	 * @access public
+	 *
+	 * @param string $host  The hostname or IP address.
+	 *
+	 * @return mixed  On success, return an array with the following entries:
+	 *                'code'  =>  Country Code
+	 *                'name'  =>  Country Name
+	 *                On failure, return false.
+	 */
+	function getCountryByHost($host)
+	{
+		global $conf;
+
+		/* List of generic domains that we know is not in the country TLD
            list. See: http://www.iana.org/gtld/gtld.htm */
-        $generic = array(
-            'aero', 'biz', 'com', 'coop', 'edu', 'gov', 'info', 'int', 'mil',
-            'museum', 'name', 'net', 'org', 'pro'
-        );
-
-        $checkHost = $host;
-        if (preg_match('/^\d+\.\d+\.\d+\.\d+$/', $host)) {
-            $checkHost = @gethostbyaddr($host);
-        }
-
-        /* Get the TLD of the hostname. */
-        $pos = strrpos($checkHost, '.');
-        if ($pos === false) {
-            return false;
-        }
-        $domain = String::lower(substr($checkHost, $pos + 1));
-
-        /* Try lookup via TLD first. */
-        if (!in_array($domain, $generic)) {
-            require 'Horde/NLS/tld.php';
-            if (isset($tld[$domain])) {
-                return array('code' => $domain, 'name' => $tld[$domain]);
-            }
-        }
-
-        /* Try GeoIP lookup next. */
-        if (!empty($conf['geoip']['datafile'])) {
-            require_once 'Horde/NLS/GeoIP.php';
-            $geoip = &NLS_GeoIP::singleton($conf['geoip']['datafile']);
-            $id = $geoip->countryIdByName($checkHost);
-            if (!empty($id)) {
-                return array('code' => String::lower($GLOBALS['GEOIP_COUNTRY_CODES'][$id]), 'name' => $GLOBALS['GEOIP_COUNTRY_NAMES'][$id]);
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns a Horde image link to the country flag.
-     *
-     * @access public
-     *
-     * @param string $host  The hostname or IP address.
-     *
-     * @return string  The image URL, or the empty string on error.
-     */
-    function generateFlagImageByHost($host)
-    {
-        global $registry;
-
-        $data = NLS::getCountryByHost($host);
-        if ($data !== false) {
-            $img = $data['code'] . '.png';
-            if (file_exists($registry->get('themesfs', 'horde') . '/graphics/flags/' . $img)) {
-                return Horde::img($img, $data['name'], '', $registry->getImageDir('horde') . '/flags');
-            } else {
-                return '[' . $data['name'] . ']';
-            }
-        }
-
-        return '';
-    }
-
-    /**
-     * Returns either a specific or all ISO-3166 country names.
-     *
-     * @access public
-     *
-     * @param optional string $code  The ISO 3166 country code.
-     *
-     * @return mixed  If a country code has been requested will return the
-     *                corresponding country name. If empty will return an
-     *                array of all the country codes and their names.
-     */
-    function &getCountryISO($code = '')
-    {
-        static $countries = array();
-        if (empty($countries)) {
-            require_once 'Horde/NLS/countries.php';
-        }
-        if (empty($code)) {
-            return $countries;
-        } elseif (isset($countries[$code])) {
-            return $countries[$code];
-        }
-        return false;
-    }
+		$generic = array(
+			'aero', 'biz', 'com', 'coop', 'edu', 'gov', 'info', 'int', 'mil',
+			'museum', 'name', 'net', 'org', 'pro'
+		);
+
+		$checkHost = $host;
+		if (preg_match('/^\d+\.\d+\.\d+\.\d+$/', $host)) {
+			$checkHost = @gethostbyaddr($host);
+		}
+
+		/* Get the TLD of the hostname. */
+		$pos = strrpos($checkHost, '.');
+		if ($pos === false) {
+			return false;
+		}
+		$domain = String::lower(substr($checkHost, $pos + 1));
+
+		/* Try lookup via TLD first. */
+		if (!in_array($domain, $generic)) {
+			require 'Horde/NLS/tld.php';
+			if (isset($tld[$domain])) {
+				return array('code' => $domain, 'name' => $tld[$domain]);
+			}
+		}
+
+		/* Try GeoIP lookup next. */
+		if (!empty($conf['geoip']['datafile'])) {
+			require_once 'Horde/NLS/GeoIP.php';
+			$geoip = &NLS_GeoIP::singleton($conf['geoip']['datafile']);
+			$id = $geoip->countryIdByName($checkHost);
+			if (!empty($id)) {
+				return array('code' => String::lower($GLOBALS['GEOIP_COUNTRY_CODES'][$id]), 'name' => $GLOBALS['GEOIP_COUNTRY_NAMES'][$id]);
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns a Horde image link to the country flag.
+	 *
+	 * @access public
+	 *
+	 * @param string $host  The hostname or IP address.
+	 *
+	 * @return string  The image URL, or the empty string on error.
+	 */
+	function generateFlagImageByHost($host)
+	{
+		global $registry;
+
+		$data = NLS::getCountryByHost($host);
+		if ($data !== false) {
+			$img = $data['code'] . '.png';
+			if (file_exists($registry->get('themesfs', 'horde') . '/graphics/flags/' . $img)) {
+				return Horde::img($img, $data['name'], '', $registry->getImageDir('horde') . '/flags');
+			} else {
+				return '[' . $data['name'] . ']';
+			}
+		}
+
+		return '';
+	}
+
+	/**
+	 * Returns either a specific or all ISO-3166 country names.
+	 *
+	 * @access public
+	 *
+	 * @param optional string $code  The ISO 3166 country code.
+	 *
+	 * @return mixed  If a country code has been requested will return the
+	 *                corresponding country name. If empty will return an
+	 *                array of all the country codes and their names.
+	 */
+	function &getCountryISO($code = '')
+	{
+		static $countries = array();
+		if (empty($countries)) {
+			require_once 'Horde/NLS/countries.php';
+		}
+		if (empty($code)) {
+			return $countries;
+		} elseif (isset($countries[$code])) {
+			return $countries[$code];
+		}
+		return false;
+	}
 
 }

Spacing +13 added lines, -14 removed lines

@@ -93,7 +93,7 @@ 
      */
     function setLang($lang = null)
     {
-        include_once HORDE_BASE . '/config/nls.php';
+        include_once HORDE_BASE.'/config/nls.php';
 
         if (empty($lang) || !NLS::isValid($lang)) {
             $lang = NLS::select();
@@ -106,12 +106,12 @@ 
         $GLOBALS['language'] = $lang;
 
         /* First try language with the current charset. */
-        $lang_charset = $lang . '.' . NLS::getCharset();
+        $lang_charset = $lang.'.'.NLS::getCharset();
         if ($lang_charset != setlocale(LC_ALL, $lang_charset)) {
             /* Next try language with its default charset. */
             global $nls;
             $charset = !empty($nls['charsets'][$lang]) ? $nls['charsets'][$lang] : $nls['defaults']['charset'];
-            $lang_charset = $lang . '.' . $charset;
+            $lang_charset = $lang.'.'.$charset;
             NLS::_cachedCharset(0, $charset);
             if ($lang_charset != setlocale(LC_ALL, $lang_charset)) {
                 /* At last try language solely. */
@@ -119,8 +119,8 @@ 
                 setlocale(LC_ALL, $lang_charset);
             }
         }
-        @putenv('LANG=' . $lang_charset);
-        @putenv('LANGUAGE=' . $lang_charset);
+        @putenv('LANG='.$lang_charset);
+        @putenv('LANGUAGE='.$lang_charset);
     }
 
     /**
@@ -144,7 +144,7 @@ 
         }
 
         if (!headers_sent()) {
-            header('Content-Type: text/html; charset=' . $charset);
+            header('Content-Type: text/html; charset='.$charset);
         }
     }
 
@@ -187,7 +187,7 @@ 
         $lang_parts = explode('_', $trans_lang);
         $trans_lang = String::lower($lang_parts[0]);
         if (isset($lang_parts[1])) {
-            $trans_lang .= '_' . String::upper($lang_parts[1]);
+            $trans_lang .= '_'.String::upper($lang_parts[1]);
         }
 
         // See if we get a match for this
@@ -316,8 +316,7 @@ 
         if (!empty($charset)) {
             return $charset;
         }
-        return isset($nls['emails'][$language]) ? $nls['emails'][$language] :
-               (isset($nls['charsets'][$language]) ? $nls['charsets'][$language] : $nls['defaults']['charset']);
+        return isset($nls['emails'][$language]) ? $nls['emails'][$language] : (isset($nls['charsets'][$language]) ? $nls['charsets'][$language] : $nls['defaults']['charset']);
     }
 
     /**
@@ -368,7 +367,7 @@ 
 
         $tz = $prefs->getValue('timezone');
         if (!empty($tz)) {
-            @putenv('TZ=' . $tz);
+            @putenv('TZ='.$tz);
         }
     }
 
@@ -484,11 +483,11 @@ 
 
         $data = NLS::getCountryByHost($host);
         if ($data !== false) {
-            $img = $data['code'] . '.png';
-            if (file_exists($registry->get('themesfs', 'horde') . '/graphics/flags/' . $img)) {
-                return Horde::img($img, $data['name'], '', $registry->getImageDir('horde') . '/flags');
+            $img = $data['code'].'.png';
+            if (file_exists($registry->get('themesfs', 'horde').'/graphics/flags/'.$img)) {
+                return Horde::img($img, $data['name'], '', $registry->getImageDir('horde').'/flags');
             } else {
-                return '[' . $data['name'] . ']';
+                return '['.$data['name'].']';
             }
         }
 

Braces +114 added lines, -52 removed lines

@@ -22,7 +22,8 @@ 
  * @since   Horde 3.0
  * @package Horde_NLS
  */
-class NLS {
+class NLS
+{
 
     /**
      * Selects the most preferred language for the current client session.
@@ -39,43 +40,60 @@ 
 
         /* First, check if language pref is locked and, if so, set it to its
            value */
-        if (isset($prefs) && $prefs->isLocked('language')) {
+        if (isset($prefs) && $prefs->isLocked('language'))
+        {
             $language = $prefs->getValue('language');
         /* Check if the user selected a language from the login screen */
-        } elseif (!empty($lang)) {
+        }
+        elseif (!empty($lang))
+        {
             $language = $lang;
         /* Check if we have a language set in a cookie */
-        } elseif (isset($_SESSION['horde_language'])) {
+        }
+        elseif (isset($_SESSION['horde_language']))
+        {
             $language = $_SESSION['horde_language'];
         /* Use site-wide default, if one is defined */
-        } elseif (!empty($nls['defaults']['language'])) {
+        }
+        elseif (!empty($nls['defaults']['language']))
+        {
             $language = $nls['defaults']['language'];
         /* Try browser-accepted languages. */
-        } elseif (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+        }
+        elseif (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+        {
             /* The browser supplies a list, so return the first valid one. */
             $browser_langs = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
-            foreach ($browser_langs as $lang) {
+            foreach ($browser_langs as $lang)
+            {
                 /* Strip quality value for language */
-                if (($pos = strpos($lang, ';')) !== false) {
+                if (($pos = strpos($lang, ';')) !== false)
+                {
                     $lang = substr($lang, 0, $pos);
                 }
                 $lang = NLS::_map(trim($lang));
-                if (NLS::isValid($lang)) {
+                if (NLS::isValid($lang))
+                {
                     $language = $lang;
                     break;
                 }
                 /* In case no full match, save best guess based on prefix */
                 if (!isset($partial_lang) &&
-                    NLS::isValid(NLS::_map(substr($lang, 0, 2)))) {
+                    NLS::isValid(NLS::_map(substr($lang, 0, 2))))
+                {
                     $partial_lang = NLS::_map(substr($lang, 0, 2));
                 }
             }
         }
 
-        if (!isset($language)) {
-            if (isset($partial_lang)) {
+        if (!isset($language))
+        {
+            if (isset($partial_lang))
+            {
                 $language = $partial_lang;
-            } else {
+            }
+            else
+            {
                 /* No dice auto-detecting, default to US English. */
                 $language = 'en_US';
             }
@@ -95,11 +113,13 @@ 
     {
         include_once HORDE_BASE . '/config/nls.php';
 
-        if (empty($lang) || !NLS::isValid($lang)) {
+        if (empty($lang) || !NLS::isValid($lang))
+        {
             $lang = NLS::select();
         }
 
-        if (isset($GLOBALS['language']) && $GLOBALS['language'] == $lang) {
+        if (isset($GLOBALS['language']) && $GLOBALS['language'] == $lang)
+        {
             return;
         }
 
@@ -107,13 +127,15 @@ 
 
         /* First try language with the current charset. */
         $lang_charset = $lang . '.' . NLS::getCharset();
-        if ($lang_charset != setlocale(LC_ALL, $lang_charset)) {
+        if ($lang_charset != setlocale(LC_ALL, $lang_charset))
+        {
             /* Next try language with its default charset. */
             global $nls;
             $charset = !empty($nls['charsets'][$lang]) ? $nls['charsets'][$lang] : $nls['defaults']['charset'];
             $lang_charset = $lang . '.' . $charset;
             NLS::_cachedCharset(0, $charset);
-            if ($lang_charset != setlocale(LC_ALL, $lang_charset)) {
+            if ($lang_charset != setlocale(LC_ALL, $lang_charset))
+            {
                 /* At last try language solely. */
                 $lang_charset = $lang;
                 setlocale(LC_ALL, $lang_charset);
@@ -139,11 +161,13 @@ 
         textdomain($app);
 
         /* The existence of this function depends on the platform. */
-        if (function_exists('bind_textdomain_codeset')) {
+        if (function_exists('bind_textdomain_codeset'))
+        {
             NLS::_cachedCharset(0, bind_textdomain_codeset($app, $charset));
         }
 
-        if (!headers_sent()) {
+        if (!headers_sent())
+        {
             header('Content-Type: text/html; charset=' . $charset);
         }
     }
@@ -186,12 +210,14 @@ 
         $trans_lang = str_replace('-', '_', $language);
         $lang_parts = explode('_', $trans_lang);
         $trans_lang = String::lower($lang_parts[0]);
-        if (isset($lang_parts[1])) {
+        if (isset($lang_parts[1]))
+        {
             $trans_lang .= '_' . String::upper($lang_parts[1]);
         }
 
         // See if we get a match for this
-        if (!empty($aliases[$trans_lang])) {
+        if (!empty($aliases[$trans_lang]))
+        {
             return $aliases[$trans_lang];
         }
 
@@ -218,24 +244,30 @@ 
         /* Get cached results. */
         $cacheKey = intval($original);
         $charset = NLS::_cachedCharset($cacheKey);
-        if (!is_null($charset)) {
+        if (!is_null($charset))
+        {
             return $charset;
         }
 
-        if ($original) {
+        if ($original)
+        {
             $charset = empty($nls['charsets'][$language]) ? $nls['defaults']['charset'] : $nls['charsets'][$language];
-        } else {
+        }
+        else
+        {
             require_once 'Horde/Browser.php';
             $browser = &Browser::singleton();
 
             if ($browser->hasFeature('utf') &&
                 (Util::extensionExists('iconv') ||
-                 Util::extensionExists('mbstring'))) {
+                 Util::extensionExists('mbstring')))
+            {
                 $charset = 'UTF-8';
             }
         }
 
-        if (is_null($charset)) {
+        if (is_null($charset))
+        {
             $charset = NLS::getExternalCharset();
         }
 
@@ -258,15 +290,18 @@ 
 
         /* Get cached results. */
         $charset = NLS::_cachedCharset(2);
-        if (!is_null($charset)) {
+        if (!is_null($charset))
+        {
             return $charset;
         }
 
         $lang_charset = setlocale(LC_ALL, 0);
         if (strpos($lang_charset, ';') === false &&
-            strpos($lang_charset, '/') === false) {
+            strpos($lang_charset, '/') === false)
+        {
             $lang_charset = explode('.', $lang_charset);
-            if ((count($lang_charset) == 2) && !empty($lang_charset[1])) {
+            if ((count($lang_charset) == 2) && !empty($lang_charset[1]))
+            {
                 NLS::_cachedCharset(2, $lang_charset[1]);
                 return $lang_charset[1];
             }
@@ -291,13 +326,17 @@ 
     {
         static $cache;
 
-        if (!isset($cache)) {
+        if (!isset($cache))
+        {
             $cache = array();
         }
 
-        if ($charset == null) {
+        if ($charset == null)
+        {
             return isset($cache[$index]) ? $cache[$index] : null;
-        } else {
+        }
+        else
+        {
             $cache[$index] = $charset;
         }
     }
@@ -313,7 +352,8 @@ 
         global $prefs, $language, $nls;
 
         $charset = $prefs->getValue('sending_charset');
-        if (!empty($charset)) {
+        if (!empty($charset))
+        {
             return $charset;
         }
         return isset($nls['emails'][$language]) ? $nls['emails'][$language] :
@@ -333,13 +373,17 @@ 
     {
         static $check;
 
-        if (is_null($charset) || empty($charset)) {
+        if (is_null($charset) || empty($charset))
+        {
             return false;
         }
 
-        if (isset($check[$charset])) {
+        if (isset($check[$charset]))
+        {
             return $check[$charset];
-        } elseif (!isset($check)) {
+        }
+        elseif (!isset($check))
+        {
             $check = array();
         }
 
@@ -347,7 +391,8 @@ 
 
         ini_set('track_errors', 1);
         @htmlspecialchars('', ENT_COMPAT, $charset);
-        if (isset($php_errormsg)) {
+        if (isset($php_errormsg))
+        {
             $valid = false;
         }
         ini_restore('track_errors');
@@ -367,7 +412,8 @@ 
         global $prefs;
 
         $tz = $prefs->getValue('timezone');
-        if (!empty($tz)) {
+        if (!empty($tz))
+        {
             @putenv('TZ=' . $tz);
         }
     }
@@ -384,7 +430,8 @@ 
     {
         static $lc_info;
 
-        if (!isset($lc_info)) {
+        if (!isset($lc_info))
+        {
             $lc_info = localeconv();
         }
 
@@ -406,7 +453,8 @@ 
     {
         static $nl_info = array();
 
-        if (!isset($nl_info[$item])) {
+        if (!isset($nl_info[$item]))
+        {
             $nl_info[$item] = nl_langinfo($item);
         }
 
@@ -437,31 +485,37 @@ 
         );
 
         $checkHost = $host;
-        if (preg_match('/^\d+\.\d+\.\d+\.\d+$/', $host)) {
+        if (preg_match('/^\d+\.\d+\.\d+\.\d+$/', $host))
+        {
             $checkHost = @gethostbyaddr($host);
         }
 
         /* Get the TLD of the hostname. */
         $pos = strrpos($checkHost, '.');
-        if ($pos === false) {
+        if ($pos === false)
+        {
             return false;
         }
         $domain = String::lower(substr($checkHost, $pos + 1));
 
         /* Try lookup via TLD first. */
-        if (!in_array($domain, $generic)) {
+        if (!in_array($domain, $generic))
+        {
             require 'Horde/NLS/tld.php';
-            if (isset($tld[$domain])) {
+            if (isset($tld[$domain]))
+            {
                 return array('code' => $domain, 'name' => $tld[$domain]);
             }
         }
 
         /* Try GeoIP lookup next. */
-        if (!empty($conf['geoip']['datafile'])) {
+        if (!empty($conf['geoip']['datafile']))
+        {
             require_once 'Horde/NLS/GeoIP.php';
             $geoip = &NLS_GeoIP::singleton($conf['geoip']['datafile']);
             $id = $geoip->countryIdByName($checkHost);
-            if (!empty($id)) {
+            if (!empty($id))
+            {
                 return array('code' => String::lower($GLOBALS['GEOIP_COUNTRY_CODES'][$id]), 'name' => $GLOBALS['GEOIP_COUNTRY_NAMES'][$id]);
             }
         }
@@ -483,11 +537,15 @@ 
         global $registry;
 
         $data = NLS::getCountryByHost($host);
-        if ($data !== false) {
+        if ($data !== false)
+        {
             $img = $data['code'] . '.png';
-            if (file_exists($registry->get('themesfs', 'horde') . '/graphics/flags/' . $img)) {
+            if (file_exists($registry->get('themesfs', 'horde') . '/graphics/flags/' . $img))
+            {
                 return Horde::img($img, $data['name'], '', $registry->getImageDir('horde') . '/flags');
-            } else {
+            }
+            else
+            {
                 return '[' . $data['name'] . ']';
             }
         }
@@ -509,12 +567,16 @@ 
     function &getCountryISO($code = '')
     {
         static $countries = array();
-        if (empty($countries)) {
+        if (empty($countries))
+        {
             require_once 'Horde/NLS/countries.php';
         }
-        if (empty($code)) {
+        if (empty($code))
+        {
             return $countries;
-        } elseif (isset($countries[$code])) {
+        }
+        elseif (isset($countries[$code]))
+        {
             return $countries[$code];
         }
         return false;

phpgwapi/inc/horde/Horde/Registry.php

Doc Comments +4 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
      *
      * @param optional integer $session_flags  Any session flags.
      *
-     * @return object Registry  The Horde Registry instance.
+     * @return Registry Registry  The Horde Registry instance.
      */
     function &singleton($session_flags = 0)
     {
@@ -594,7 +594,7 @@ 
      * @param string $path          The application string.
      * @param optional string $app  The application being called.
      *
-     * @return  TODO
+     * @return  string
      *          Returns PEAR_Error on error.
      */
     function applicationWebPath($path, $app = null)
@@ -729,6 +729,7 @@ 
      *
      * @access public
      *
+     * @param integer $permission
      * @return boolean  Whether or not access is allowed.
      */
     function hasPermission($app, $permission = PERMS_READ)
@@ -921,6 +922,7 @@ 
      * @param optional string $app  The application for which to get the
      *                              image directory. If blank will default
      *                              to current application.
+     * @param string $app
      *
      * @return string  The image directory uri path.
      */

Indentation +919 added lines, -919 removed lines

@@ -28,160 +28,160 @@ 
  */
 class Registry {
 
-    /**
-     * Hash storing all of the known services and callbacks.
-     *
-     * @var array $_apiCache
-     */
-    var $_apiCache = array();
-
-    /**
-     * Hash storing all known data types.
-     *
-     * @var array $_typeCache
-     */
-    var $_typeCache = array();
-
-    /**
-     * Hash storing all of the registered interfaces that applications
-     * provide.
-     *
-     * @var array $_interfaces
-     */
-    var $_interfaces = array();
-
-    /**
-     * Hash storing information on each registry-aware application.
-     *
-     * @var array $applications
-     */
-    var $applications = array();
-
-    /**
-     * Stack of in-use applications.
-     *
-     * @var array $_appStack
-     */
-    var $_appStack = array();
-
-    /**
-     * Quick pointer to the current application.
-     *
-     * @var $_currentApp
-     */
-    var $_currentApp = null;
-
-    /**
-     * Cache of $prefs objects
-     *
-     * @var array $_prefsCache
-     */
-    var $_prefsCache = array();
-
-    /**
-     * Cache of application configurations.
-     *
-     * @var array $_confCache
-     */
-    var $_confCache = array();
-
-    /**
-     * Returns a reference to the global Registry object, only
-     * creating it if it doesn't already exist.
-     *
-     * This method must be invoked as: $registry = &Registry::singleton()
-     *
-     * @param optional integer $session_flags  Any session flags.
-     *
-     * @return object Registry  The Horde Registry instance.
-     */
-    function &singleton($session_flags = 0)
-    {
-        static $registry;
-
-        if (!isset($registry)) {
-            $registry = new Registry($session_flags);
-        }
-
-        return $registry;
-    }
-
-    /**
-     * Create a new registry instance. Should never be called except
-     * by &Registry::singleton().
-     *
-     * @param optional integer $session_flags  Any session flags.
-     *
-     * @access private
-     */
-    function Registry($session_flags = 0)
-    {
-        /* Import and global Horde's configuration values. */
-        $this->importConfig('horde');
-
-        /* Start a session. */
-        if ($session_flags & HORDE_SESSION_NONE) {
-            /* Never start a session if the session flags include
+	/**
+	 * Hash storing all of the known services and callbacks.
+	 *
+	 * @var array $_apiCache
+	 */
+	var $_apiCache = array();
+
+	/**
+	 * Hash storing all known data types.
+	 *
+	 * @var array $_typeCache
+	 */
+	var $_typeCache = array();
+
+	/**
+	 * Hash storing all of the registered interfaces that applications
+	 * provide.
+	 *
+	 * @var array $_interfaces
+	 */
+	var $_interfaces = array();
+
+	/**
+	 * Hash storing information on each registry-aware application.
+	 *
+	 * @var array $applications
+	 */
+	var $applications = array();
+
+	/**
+	 * Stack of in-use applications.
+	 *
+	 * @var array $_appStack
+	 */
+	var $_appStack = array();
+
+	/**
+	 * Quick pointer to the current application.
+	 *
+	 * @var $_currentApp
+	 */
+	var $_currentApp = null;
+
+	/**
+	 * Cache of $prefs objects
+	 *
+	 * @var array $_prefsCache
+	 */
+	var $_prefsCache = array();
+
+	/**
+	 * Cache of application configurations.
+	 *
+	 * @var array $_confCache
+	 */
+	var $_confCache = array();
+
+	/**
+	 * Returns a reference to the global Registry object, only
+	 * creating it if it doesn't already exist.
+	 *
+	 * This method must be invoked as: $registry = &Registry::singleton()
+	 *
+	 * @param optional integer $session_flags  Any session flags.
+	 *
+	 * @return object Registry  The Horde Registry instance.
+	 */
+	function &singleton($session_flags = 0)
+	{
+		static $registry;
+
+		if (!isset($registry)) {
+			$registry = new Registry($session_flags);
+		}
+
+		return $registry;
+	}
+
+	/**
+	 * Create a new registry instance. Should never be called except
+	 * by &Registry::singleton().
+	 *
+	 * @param optional integer $session_flags  Any session flags.
+	 *
+	 * @access private
+	 */
+	function Registry($session_flags = 0)
+	{
+		/* Import and global Horde's configuration values. */
+		$this->importConfig('horde');
+
+		/* Start a session. */
+		if ($session_flags & HORDE_SESSION_NONE) {
+			/* Never start a session if the session flags include
                HORDE_SESSION_NONE. */
-            $_SESSION = array();
-        } else {
-            Horde::setupSessionHandler();
-            @session_start();
-            if ($session_flags & HORDE_SESSION_READONLY) {
-                /* Close the session immediately so no changes can be
+			$_SESSION = array();
+		} else {
+			Horde::setupSessionHandler();
+			@session_start();
+			if ($session_flags & HORDE_SESSION_READONLY) {
+				/* Close the session immediately so no changes can be
                    made but values are still available. */
-                @session_write_close();
-            }
-        }
+				@session_write_close();
+			}
+		}
 
-        /* Read the registry configuration file. */
-        require_once HORDE_BASE . '/config/registry.php';
+		/* Read the registry configuration file. */
+		require_once HORDE_BASE . '/config/registry.php';
 
-        /* Initialize the localization routines and variables. */
+		/* Initialize the localization routines and variables. */
 #        NLS::setLang();
 #        NLS::setTextdomain('horde', HORDE_BASE . '/locale', NLS::getCharset());
 #        String::setDefaultCharset(NLS::getCharset());
 
-        /* Stop system if Horde is inactive. */
-        if ($this->applications['horde']['status'] == 'inactive') {
-            Horde::fatal(_("This system is currently deactivated."), __FILE__, __LINE__);
-        }
+		/* Stop system if Horde is inactive. */
+		if ($this->applications['horde']['status'] == 'inactive') {
+			Horde::fatal(_("This system is currently deactivated."), __FILE__, __LINE__);
+		}
 
-        /* Scan for all APIs provided by each app, and set other
+		/* Scan for all APIs provided by each app, and set other
          * common defaults like templates and graphics. */
-        $appList = array_keys($this->applications);
-        foreach ($appList as $appName) {
-            $app = &$this->applications[$appName];
-            if (($app['status'] == 'heading') ||
-                ($app['status'] == 'inactive') ||
-                ($app['status'] == 'admin' && !Auth::isAdmin())) {
-                continue;
-            }
-            if (isset($app['provides'])) {
-                if (is_array($app['provides'])) {
-                    foreach ($app['provides'] as $interface) {
-                        $this->_interfaces[$interface] = $appName;
-                    }
-                } else {
-                    $this->_interfaces[$app['provides']] = $appName;
-                }
-            }
-            if (!isset($app['templates']) && isset($app['fileroot'])) {
-                $app['templates'] = $app['fileroot'] . '/templates';
-            }
-            if (!isset($app['jsuri']) && isset($app['webroot'])) {
-                $app['jsuri'] = $app['webroot'] . '/js';
-            }
-            if (!isset($app['jsfs']) && isset($app['fileroot'])) {
-                $app['jsfs'] = $app['fileroot'] . '/js';
-            }
-            if (!isset($app['themesuri']) && isset($app['webroot'])) {
-                $app['themesuri'] = $app['webroot'] . '/themes';
-            }
-            if (!isset($app['themesfs']) && isset($app['fileroot'])) {
-                $app['themesfs'] = $app['fileroot'] . '/themes';
-            }
-        }
+		$appList = array_keys($this->applications);
+		foreach ($appList as $appName) {
+			$app = &$this->applications[$appName];
+			if (($app['status'] == 'heading') ||
+				($app['status'] == 'inactive') ||
+				($app['status'] == 'admin' && !Auth::isAdmin())) {
+				continue;
+			}
+			if (isset($app['provides'])) {
+				if (is_array($app['provides'])) {
+					foreach ($app['provides'] as $interface) {
+						$this->_interfaces[$interface] = $appName;
+					}
+				} else {
+					$this->_interfaces[$app['provides']] = $appName;
+				}
+			}
+			if (!isset($app['templates']) && isset($app['fileroot'])) {
+				$app['templates'] = $app['fileroot'] . '/templates';
+			}
+			if (!isset($app['jsuri']) && isset($app['webroot'])) {
+				$app['jsuri'] = $app['webroot'] . '/js';
+			}
+			if (!isset($app['jsfs']) && isset($app['fileroot'])) {
+				$app['jsfs'] = $app['fileroot'] . '/js';
+			}
+			if (!isset($app['themesuri']) && isset($app['webroot'])) {
+				$app['themesuri'] = $app['webroot'] . '/themes';
+			}
+			if (!isset($app['themesfs']) && isset($app['fileroot'])) {
+				$app['themesfs'] = $app['fileroot'] . '/themes';
+			}
+		}
 
 #        /* Create the global Perms object. */
 #        $GLOBALS['perms'] = &Perms::singleton();
@@ -190,639 +190,639 @@ 
 #        $notification = &Notification::singleton();
 #        $notification->attach('javascript');
 
-        /* Register access key logger for translators. */
-        if (@$GLOBALS['conf']['log_accesskeys']) {
-            register_shutdown_function(create_function('', 'Horde::getAccessKey(null, null, true);'));
-        }
-    }
-
-    /**
-     * Return a list of the installed and registered applications.
-     *
-     * @since Horde 2.2
-     *
-     * @access public
-     *
-     * @param array   $filter      (optional) An array of the statuses that
-     *                             should be returned. Defaults to non-hidden.
-     * @param boolean $assoc       (optional) Associative array with app names
-     *                             as keys.
-     * @param integer $permission  (optional) The permission level to check
-     *                             for in the list. Defaults to PERMS_SHOW.
-     *
-     * @return array  List of apps registered with Horde. If no
-     *                applications are defined returns an empty array.
-     */
-    function listApps($filter = null, $assoc = false, $permission = PERMS_SHOW)
-    {
-        $apps = array();
-        if (is_null($filter)) {
-            $filter = array('notoolbar', 'active');
-        }
-
-        foreach ($this->applications as $app => $params) {
-            if (in_array($params['status'], $filter) &&
-                (defined('AUTH_HANDLER') || $this->hasPermission($app, $permission))) {
-                $assoc ? $apps[$app] = $app : $apps[] = $app;
-            }
-        }
-
-        return $apps;
-    }
-
-    /**
-     * Returns all available registry APIs.
-     *
-     * @access public
-     *
-     * @return array  The API list.
-     */
-    function listAPIs()
-    {
-        $apis = array();
-
-        foreach (array_keys($this->_interfaces) as $interface) {
-            @list($api, ) = explode('/', $interface);
-            $apis[] = $api;
-        }
-
-        return array_unique($apis);
-    }
-
-    /**
-     * Returns all of the available registry methods, or alternately
-     * only those for a specified API.
-     *
-     * @access public
-     *
-     * @param optional string $api  Defines the API for which the methods
-     *                              shall be returned.
-     *
-     * @return array  The method list.
-     */
-    function listMethods($api = null)
-    {
-        $methods = array();
-
-        $this->_fillAPICache();
-
-        foreach (array_keys($this->applications) as $app) {
-            if (isset($this->applications[$app]['provides'])) {
-                $provides = $this->applications[$app]['provides'];
-                if (!is_array($provides)) {
-                    $provides = array($provides);
-                }
-            } else {
-                $provides = array();
-            }
-
-            foreach ($provides as $method) {
-                if (strpos($method, '/') !== false) {
-                    if (is_null($api) ||
-                        (substr($method, 0, strlen($api)) == $api)) {
-                        $methods[] = $method;
-                    }
-                } elseif (is_null($api) || ($method == $api)) {
-                    if (isset($this->_apiCache[$app])) {
-                        foreach (array_keys($this->_apiCache[$app]) as $service) {
-                            $methods[] = $method . '/' . $service;
-                        }
-                    }
-                }
-            }
-        }
-
-        return array_unique($methods);
-    }
-
-    /**
-     * Returns all of the available registry data types.
-     *
-     * @access public
-     *
-     * @return array  The data type list.
-     */
-    function listTypes()
-    {
-        $this->_fillAPICache();
-        return $this->_typeCache;
-    }
-
-    /**
-     * Returns a method's signature.
-     *
-     * @access public
-     *
-     * @param string $method  The full name of the method to check for.
-     *
-     * @return array  A two dimensional array. The first element contains an
-     *                array with the parameter names, the second one the return
-     *                type.
-     */
-    function getSignature($method)
-    {
-        if (!($app = $this->hasMethod($method))) {
-            return;
-        }
-
-        $this->_fillAPICache();
-
-        @list(, $function) = explode('/', $method);
-        if (isset($this->_apiCache[$app][$function]['type']) &&
-            isset($this->_apiCache[$app][$function]['args'])) {
-            return array($this->_apiCache[$app][$function]['args'], $this->_apiCache[$app][$function]['type']);
-        }
-    }
-
-    /**
-     * Determine if an interface is implemented by an active
-     * application.
-     *
-     * @access public
-     *
-     * @param string $interface  The interface to check for.
-     *
-     * @return mixed  The application implementing $interface if we have it,
-     *                false if the interface is not implemented.
-     */
-    function hasInterface($interface)
-    {
-        return !empty($this->_interfaces[$interface]) ?
-            $this->_interfaces[$interface] :
-            false;
-    }
-
-    /**
-     * Determine if a method has been registered with the registry.
-     *
-     * @access public
-     *
-     * @param string  $method      The full name of the method to check for.
-     * @param string  $app         (optional) Only check this application.
-     *
-     * @return mixed  The application implementing $method if we have it,
-     *                false if the method doesn't exist.
-     */
-    function hasMethod($method, $app = null)
-    {
-        if (is_null($app)) {
-            @list($interface, $call) = explode('/', $method);
-            if (!empty($this->_interfaces[$method])) {
-                $app = $this->_interfaces[$method];
-            } elseif (!empty($this->_interfaces[$interface])) {
-                $app = $this->_interfaces[$interface];
-            } else {
-                return false;
-            }
-        } else {
-            $call = $method;
-        }
-
-        $this->_fillAPICache();
-
-        return !empty($this->_apiCache[$app][$call]) ? $app : false;
-    }
-
-    /**
-     * Return the hook corresponding to the default package that
-     * provides the functionality requested by the $method
-     * parameter. $method is a string consisting of
-     * "packagetype/methodname".
-     *
-     * @access public
-     *
-     * @param string $method        The method to call.
-     * @param optional array $args  Arguments to the method.
-     *
-     * @return  TODO
-     *          Returns PEAR_Error on error.
-     */
-    function call($method, $args = array())
-    {
-        @list($interface, $call) = explode('/', $method);
-
-        if (!empty($this->_interfaces[$method])) {
-            $app = $this->_interfaces[$method];
-        } elseif (!empty($this->_interfaces[$interface])) {
-            $app = $this->_interfaces[$interface];
-        } else {
-            return PEAR::raiseError('The method "' . $method . '" is not defined in the Horde Registry.');
-        }
-
-        return $this->callByPackage($app, $call, $args);
-    }
-
-    /**
-     * Output the hook corresponding to the specific package named.
-     *
-     * @access public
-     *
-     * @param string $app           The application being called.
-     * @param string $call          The method to call.
-     * @param optional array $args  Arguments to the method.
-     *
-     * @return  TODO
-     *          Returns PEAR_Error on error.
-     */
-    function callByPackage($app, $call, $args = array())
-    {
-        /* Note: calling hasMethod() makes sure that we've cached
+		/* Register access key logger for translators. */
+		if (@$GLOBALS['conf']['log_accesskeys']) {
+			register_shutdown_function(create_function('', 'Horde::getAccessKey(null, null, true);'));
+		}
+	}
+
+	/**
+	 * Return a list of the installed and registered applications.
+	 *
+	 * @since Horde 2.2
+	 *
+	 * @access public
+	 *
+	 * @param array   $filter      (optional) An array of the statuses that
+	 *                             should be returned. Defaults to non-hidden.
+	 * @param boolean $assoc       (optional) Associative array with app names
+	 *                             as keys.
+	 * @param integer $permission  (optional) The permission level to check
+	 *                             for in the list. Defaults to PERMS_SHOW.
+	 *
+	 * @return array  List of apps registered with Horde. If no
+	 *                applications are defined returns an empty array.
+	 */
+	function listApps($filter = null, $assoc = false, $permission = PERMS_SHOW)
+	{
+		$apps = array();
+		if (is_null($filter)) {
+			$filter = array('notoolbar', 'active');
+		}
+
+		foreach ($this->applications as $app => $params) {
+			if (in_array($params['status'], $filter) &&
+				(defined('AUTH_HANDLER') || $this->hasPermission($app, $permission))) {
+				$assoc ? $apps[$app] = $app : $apps[] = $app;
+			}
+		}
+
+		return $apps;
+	}
+
+	/**
+	 * Returns all available registry APIs.
+	 *
+	 * @access public
+	 *
+	 * @return array  The API list.
+	 */
+	function listAPIs()
+	{
+		$apis = array();
+
+		foreach (array_keys($this->_interfaces) as $interface) {
+			@list($api, ) = explode('/', $interface);
+			$apis[] = $api;
+		}
+
+		return array_unique($apis);
+	}
+
+	/**
+	 * Returns all of the available registry methods, or alternately
+	 * only those for a specified API.
+	 *
+	 * @access public
+	 *
+	 * @param optional string $api  Defines the API for which the methods
+	 *                              shall be returned.
+	 *
+	 * @return array  The method list.
+	 */
+	function listMethods($api = null)
+	{
+		$methods = array();
+
+		$this->_fillAPICache();
+
+		foreach (array_keys($this->applications) as $app) {
+			if (isset($this->applications[$app]['provides'])) {
+				$provides = $this->applications[$app]['provides'];
+				if (!is_array($provides)) {
+					$provides = array($provides);
+				}
+			} else {
+				$provides = array();
+			}
+
+			foreach ($provides as $method) {
+				if (strpos($method, '/') !== false) {
+					if (is_null($api) ||
+						(substr($method, 0, strlen($api)) == $api)) {
+						$methods[] = $method;
+					}
+				} elseif (is_null($api) || ($method == $api)) {
+					if (isset($this->_apiCache[$app])) {
+						foreach (array_keys($this->_apiCache[$app]) as $service) {
+							$methods[] = $method . '/' . $service;
+						}
+					}
+				}
+			}
+		}
+
+		return array_unique($methods);
+	}
+
+	/**
+	 * Returns all of the available registry data types.
+	 *
+	 * @access public
+	 *
+	 * @return array  The data type list.
+	 */
+	function listTypes()
+	{
+		$this->_fillAPICache();
+		return $this->_typeCache;
+	}
+
+	/**
+	 * Returns a method's signature.
+	 *
+	 * @access public
+	 *
+	 * @param string $method  The full name of the method to check for.
+	 *
+	 * @return array  A two dimensional array. The first element contains an
+	 *                array with the parameter names, the second one the return
+	 *                type.
+	 */
+	function getSignature($method)
+	{
+		if (!($app = $this->hasMethod($method))) {
+			return;
+		}
+
+		$this->_fillAPICache();
+
+		@list(, $function) = explode('/', $method);
+		if (isset($this->_apiCache[$app][$function]['type']) &&
+			isset($this->_apiCache[$app][$function]['args'])) {
+			return array($this->_apiCache[$app][$function]['args'], $this->_apiCache[$app][$function]['type']);
+		}
+	}
+
+	/**
+	 * Determine if an interface is implemented by an active
+	 * application.
+	 *
+	 * @access public
+	 *
+	 * @param string $interface  The interface to check for.
+	 *
+	 * @return mixed  The application implementing $interface if we have it,
+	 *                false if the interface is not implemented.
+	 */
+	function hasInterface($interface)
+	{
+		return !empty($this->_interfaces[$interface]) ?
+			$this->_interfaces[$interface] :
+			false;
+	}
+
+	/**
+	 * Determine if a method has been registered with the registry.
+	 *
+	 * @access public
+	 *
+	 * @param string  $method      The full name of the method to check for.
+	 * @param string  $app         (optional) Only check this application.
+	 *
+	 * @return mixed  The application implementing $method if we have it,
+	 *                false if the method doesn't exist.
+	 */
+	function hasMethod($method, $app = null)
+	{
+		if (is_null($app)) {
+			@list($interface, $call) = explode('/', $method);
+			if (!empty($this->_interfaces[$method])) {
+				$app = $this->_interfaces[$method];
+			} elseif (!empty($this->_interfaces[$interface])) {
+				$app = $this->_interfaces[$interface];
+			} else {
+				return false;
+			}
+		} else {
+			$call = $method;
+		}
+
+		$this->_fillAPICache();
+
+		return !empty($this->_apiCache[$app][$call]) ? $app : false;
+	}
+
+	/**
+	 * Return the hook corresponding to the default package that
+	 * provides the functionality requested by the $method
+	 * parameter. $method is a string consisting of
+	 * "packagetype/methodname".
+	 *
+	 * @access public
+	 *
+	 * @param string $method        The method to call.
+	 * @param optional array $args  Arguments to the method.
+	 *
+	 * @return  TODO
+	 *          Returns PEAR_Error on error.
+	 */
+	function call($method, $args = array())
+	{
+		@list($interface, $call) = explode('/', $method);
+
+		if (!empty($this->_interfaces[$method])) {
+			$app = $this->_interfaces[$method];
+		} elseif (!empty($this->_interfaces[$interface])) {
+			$app = $this->_interfaces[$interface];
+		} else {
+			return PEAR::raiseError('The method "' . $method . '" is not defined in the Horde Registry.');
+		}
+
+		return $this->callByPackage($app, $call, $args);
+	}
+
+	/**
+	 * Output the hook corresponding to the specific package named.
+	 *
+	 * @access public
+	 *
+	 * @param string $app           The application being called.
+	 * @param string $call          The method to call.
+	 * @param optional array $args  Arguments to the method.
+	 *
+	 * @return  TODO
+	 *          Returns PEAR_Error on error.
+	 */
+	function callByPackage($app, $call, $args = array())
+	{
+		/* Note: calling hasMethod() makes sure that we've cached
          * $app's services and included the API file, so we don't try
          * to do it again explicitly in this method. */
-        if (!$this->hasMethod($call, $app)) {
-            return PEAR::raiseError(sprintf('The method "%s" is not defined in the API for %s.', $call, $app));
-        }
+		if (!$this->hasMethod($call, $app)) {
+			return PEAR::raiseError(sprintf('The method "%s" is not defined in the API for %s.', $call, $app));
+		}
 
-        /* Make sure that the function actually exists. */
-        $function = '_' . $app . '_' . $call;
-        if (!function_exists($function)) {
-            return PEAR::raiseError('The function implementing ' . $call . ' (' . $function . ') is not defined in ' . $app . '\'s API.');
-        }
+		/* Make sure that the function actually exists. */
+		$function = '_' . $app . '_' . $call;
+		if (!function_exists($function)) {
+			return PEAR::raiseError('The function implementing ' . $call . ' (' . $function . ') is not defined in ' . $app . '\'s API.');
+		}
 
-        $checkPerms = isset($this->_apiCache[$app][$call]['checkperms']) ?
-                      $this->_apiCache[$app][$call]['checkperms'] : true;
+		$checkPerms = isset($this->_apiCache[$app][$call]['checkperms']) ?
+					  $this->_apiCache[$app][$call]['checkperms'] : true;
 
-        /* Switch application contexts now, if necessary, before
+		/* Switch application contexts now, if necessary, before
          * including any files which might do it for us. Return an
          * error immediately if pushApp() fails. */
-        $pushed = $this->pushApp($app, $checkPerms);
-        if (is_a($pushed, 'PEAR_Error')) {
-            return $pushed;
-        }
+		$pushed = $this->pushApp($app, $checkPerms);
+		if (is_a($pushed, 'PEAR_Error')) {
+			return $pushed;
+		}
 
-        $res = call_user_func_array($function, $args);
+		$res = call_user_func_array($function, $args);
 
-        /* If we changed application context in the course of this
+		/* If we changed application context in the course of this
          * call, undo that change now. */
-        if ($pushed === true) {
-            $this->popApp();
-        }
-
-        return $res;
-    }
-
-    /**
-     * Return the hook corresponding to the default package that
-     * provides the functionality requested by the $method
-     * parameter. $method is a string consisting of
-     * "packagetype/methodname".
-     *
-     * @access public
-     *
-     * @param string $method         The method to link to.
-     * @param optional array $args   Arguments to the method.
-     * @param optional mixed $extra  Extra, non-standard arguments to the
-     *                               method.
-     *
-     * @return  TODO
-     *          Returns PEAR_Error on error.
-     */
-    function link($method, $args = array(), $extra = '')
-    {
-        @list($interface, $call) = explode('/', $method);
-
-        if (!empty($this->_interfaces[$method])) {
-            $app = $this->_interfaces[$method];
-        } elseif (!empty($this->_interfaces[$interface])) {
-            $app = $this->_interfaces[$interface];
-        } else {
-            return PEAR::raiseError('The method "' . $method . '" is not defined in the Horde Registry.');
-        }
-
-        return $this->linkByPackage($app, $call, $args, $extra);
-    }
-
-    /**
-     * Output the hook corresponding to the specific package named.
-     *
-     * @access public
-     *
-     * @param string $app            The application being called.
-     * @param string $call           The method to link to.
-     * @param optional array $args   Arguments to the method.
-     * @param optional mixed $extra  Extra, non-standard arguments to the
-     *                               method.
-     *
-     * @return  TODO
-     *          Returns PEAR_Error on error.
-     */
-    function linkByPackage($app, $call, $args = array(), $extra = '')
-    {
-        /* Note: calling hasMethod makes sure that we've cached $app's
+		if ($pushed === true) {
+			$this->popApp();
+		}
+
+		return $res;
+	}
+
+	/**
+	 * Return the hook corresponding to the default package that
+	 * provides the functionality requested by the $method
+	 * parameter. $method is a string consisting of
+	 * "packagetype/methodname".
+	 *
+	 * @access public
+	 *
+	 * @param string $method         The method to link to.
+	 * @param optional array $args   Arguments to the method.
+	 * @param optional mixed $extra  Extra, non-standard arguments to the
+	 *                               method.
+	 *
+	 * @return  TODO
+	 *          Returns PEAR_Error on error.
+	 */
+	function link($method, $args = array(), $extra = '')
+	{
+		@list($interface, $call) = explode('/', $method);
+
+		if (!empty($this->_interfaces[$method])) {
+			$app = $this->_interfaces[$method];
+		} elseif (!empty($this->_interfaces[$interface])) {
+			$app = $this->_interfaces[$interface];
+		} else {
+			return PEAR::raiseError('The method "' . $method . '" is not defined in the Horde Registry.');
+		}
+
+		return $this->linkByPackage($app, $call, $args, $extra);
+	}
+
+	/**
+	 * Output the hook corresponding to the specific package named.
+	 *
+	 * @access public
+	 *
+	 * @param string $app            The application being called.
+	 * @param string $call           The method to link to.
+	 * @param optional array $args   Arguments to the method.
+	 * @param optional mixed $extra  Extra, non-standard arguments to the
+	 *                               method.
+	 *
+	 * @return  TODO
+	 *          Returns PEAR_Error on error.
+	 */
+	function linkByPackage($app, $call, $args = array(), $extra = '')
+	{
+		/* Note: calling hasMethod makes sure that we've cached $app's
          * services and included the API file, so we don't try to do
          * it it again explicitly in this method. */
-        if (!$this->hasMethod($call, $app)) {
-            return PEAR::raiseError('The method "' . $call . '" is not defined in ' . $app . '\'s API.');
-        }
-
-        /* Make sure the link is defined. */
-        if (empty($this->_apiCache[$app][$call]['link'])) {
-            return PEAR::raiseError('The link ' . $call . ' is not defined in ' . $app . '\'s API.');
-        }
-
-        /* Initial link value. */
-        $link = $this->_apiCache[$app][$call]['link'];
-
-        /* Fill in html-encoded arguments. */
-        foreach ($args as $key => $val) {
-            $link = str_replace('%' . $key . '%', htmlentities($val), $link);
-        }
-        if (isset($this->applications[$app]['webroot'])) {
-            $link = str_replace('%application%', $this->get('webroot', $app), $link);
-        }
-
-        /* Replace htmlencoded arguments that haven't been specified with
+		if (!$this->hasMethod($call, $app)) {
+			return PEAR::raiseError('The method "' . $call . '" is not defined in ' . $app . '\'s API.');
+		}
+
+		/* Make sure the link is defined. */
+		if (empty($this->_apiCache[$app][$call]['link'])) {
+			return PEAR::raiseError('The link ' . $call . ' is not defined in ' . $app . '\'s API.');
+		}
+
+		/* Initial link value. */
+		$link = $this->_apiCache[$app][$call]['link'];
+
+		/* Fill in html-encoded arguments. */
+		foreach ($args as $key => $val) {
+			$link = str_replace('%' . $key . '%', htmlentities($val), $link);
+		}
+		if (isset($this->applications[$app]['webroot'])) {
+			$link = str_replace('%application%', $this->get('webroot', $app), $link);
+		}
+
+		/* Replace htmlencoded arguments that haven't been specified with
            an empty string (this is where the default would be substituted
            in a stricter registry implementation). */
-        $link = preg_replace('|%.+%|U', '', $link);
-
-        /* Fill in urlencoded arguments. */
-        foreach ($args as $key => $val) {
-            $link = str_replace('|' . String::lower($key) . '|', urlencode($val), $link);
-        }
-
-        /* Append any extra, non-standard arguments. */
-        if (is_array($extra)) {
-            $extra_args = '';
-            foreach ($extra as $key => $val) {
-                $extra_args .- '&' . urlencode($key) . '=' . urlencode($val);
-            }
-        } else {
-            $extra_args = $extra;
-        }
-        $link = str_replace('|extra|', $extra_args, $link);
-
-        /* Replace html-encoded arguments that haven't been specified with
+		$link = preg_replace('|%.+%|U', '', $link);
+
+		/* Fill in urlencoded arguments. */
+		foreach ($args as $key => $val) {
+			$link = str_replace('|' . String::lower($key) . '|', urlencode($val), $link);
+		}
+
+		/* Append any extra, non-standard arguments. */
+		if (is_array($extra)) {
+			$extra_args = '';
+			foreach ($extra as $key => $val) {
+				$extra_args .- '&' . urlencode($key) . '=' . urlencode($val);
+			}
+		} else {
+			$extra_args = $extra;
+		}
+		$link = str_replace('|extra|', $extra_args, $link);
+
+		/* Replace html-encoded arguments that haven't been specified with
            an empty string (this is where the default would be substituted
            in a stricter registry implementation). */
-        $link = preg_replace('|\|.+\||U', '', $link);
-
-        return $link;
-    }
-
-    /**
-     * Replace any %application% strings with the filesystem path to
-     * the application.
-     *
-     * @access public
-     *
-     * @param string $path          The application string.
-     * @param optional string $app  The application being called.
-     *
-     * @return  TODO
-     *          Returns PEAR_Error on error.
-     */
-    function applicationFilePath($path, $app = null)
-    {
-        if (is_null($app)) {
-            $app = $this->_currentApp;
-        }
-
-        if (!isset($this->applications[$app])) {
-            return PEAR::raiseError(sprintf(_("'%s' is not configured in the Horde Registry."), $app));
-        }
-
-        return str_replace('%application%', $this->applications[$app]['fileroot'], $path);
-    }
-
-    /**
-     * Replace any %application% strings with the web path to the
-     * application.
-     *
-     * @access public
-     *
-     * @param string $path          The application string.
-     * @param optional string $app  The application being called.
-     *
-     * @return  TODO
-     *          Returns PEAR_Error on error.
-     */
-    function applicationWebPath($path, $app = null)
-    {
-        if (!isset($app)) {
-            $app = $this->_currentApp;
-        }
-
-        return str_replace('%application%', $this->applications[$app]['webroot'], $path);
-    }
-
-    /**
-     * Set the current application, adding it to the top of the Horde
-     * application stack. If this is the first application to be
-     * pushed, retrieve session information as well.
-     *
-     * pushApp() also reads the application's configuration file and
-     * sets up its global $conf hash.
-     *
-     * @access public
-     *
-     * @param string  $app         The name of the application to push.
-     * @param boolean $checkPerms  (optional) Make sure that the current user
-     *                             has permissions to the application being
-     *                             loaded. Defaults to true. Should ONLY
-     *                             be disabled by system scripts (cron jobs,
-     *                             etc.) and scripts that handle login.
-     *
-     * @return boolean  Whether or not the _appStack was modified.
-     *                  Return PEAR_Error on error.
-     */
-    function pushApp($app, $checkPerms = true)
-    {
-        if ($app == $this->_currentApp) {
-            return false;
-        }
-
-        /* Bail out if application is not present or inactive. */
-        if (!isset($this->applications[$app]) ||
-            $this->applications[$app]['status'] == 'inactive' ||
-            ($this->applications[$app]['status'] == 'admin' && !Auth::isAdmin())) {
-            Horde::fatal($app . ' is not activated', __FILE__, __LINE__);
-        }
-
-        /* If permissions checking is requested, return an error if
+		$link = preg_replace('|\|.+\||U', '', $link);
+
+		return $link;
+	}
+
+	/**
+	 * Replace any %application% strings with the filesystem path to
+	 * the application.
+	 *
+	 * @access public
+	 *
+	 * @param string $path          The application string.
+	 * @param optional string $app  The application being called.
+	 *
+	 * @return  TODO
+	 *          Returns PEAR_Error on error.
+	 */
+	function applicationFilePath($path, $app = null)
+	{
+		if (is_null($app)) {
+			$app = $this->_currentApp;
+		}
+
+		if (!isset($this->applications[$app])) {
+			return PEAR::raiseError(sprintf(_("'%s' is not configured in the Horde Registry."), $app));
+		}
+
+		return str_replace('%application%', $this->applications[$app]['fileroot'], $path);
+	}
+
+	/**
+	 * Replace any %application% strings with the web path to the
+	 * application.
+	 *
+	 * @access public
+	 *
+	 * @param string $path          The application string.
+	 * @param optional string $app  The application being called.
+	 *
+	 * @return  TODO
+	 *          Returns PEAR_Error on error.
+	 */
+	function applicationWebPath($path, $app = null)
+	{
+		if (!isset($app)) {
+			$app = $this->_currentApp;
+		}
+
+		return str_replace('%application%', $this->applications[$app]['webroot'], $path);
+	}
+
+	/**
+	 * Set the current application, adding it to the top of the Horde
+	 * application stack. If this is the first application to be
+	 * pushed, retrieve session information as well.
+	 *
+	 * pushApp() also reads the application's configuration file and
+	 * sets up its global $conf hash.
+	 *
+	 * @access public
+	 *
+	 * @param string  $app         The name of the application to push.
+	 * @param boolean $checkPerms  (optional) Make sure that the current user
+	 *                             has permissions to the application being
+	 *                             loaded. Defaults to true. Should ONLY
+	 *                             be disabled by system scripts (cron jobs,
+	 *                             etc.) and scripts that handle login.
+	 *
+	 * @return boolean  Whether or not the _appStack was modified.
+	 *                  Return PEAR_Error on error.
+	 */
+	function pushApp($app, $checkPerms = true)
+	{
+		if ($app == $this->_currentApp) {
+			return false;
+		}
+
+		/* Bail out if application is not present or inactive. */
+		if (!isset($this->applications[$app]) ||
+			$this->applications[$app]['status'] == 'inactive' ||
+			($this->applications[$app]['status'] == 'admin' && !Auth::isAdmin())) {
+			Horde::fatal($app . ' is not activated', __FILE__, __LINE__);
+		}
+
+		/* If permissions checking is requested, return an error if
          * the current user does not have read perms to the
          * application being loaded. We allow access:
          *
          *  - To all admins.
          *  - To all authenticated users if no permission is set on $app.
          *  - To anyone who is allowed by an explicit ACL on $app. */
-        if ($checkPerms && !$this->hasPermission($app)) {
-            Horde::logMessage(sprintf('User %s does not have READ permission for %s', Auth::getAuth(), $app), __FILE__, __LINE__, PEAR_LOG_DEBUG);
-            return PEAR::raiseError(sprintf(_("User %s is not authorised for %s."), Auth::getAuth(), $this->applications[$app]['name']), 'permission_denied');
-        }
-
-        /* Import this application's configuration values. */
-        $success = $this->importConfig($app);
-        if (is_a($success, 'PEAR_Error')) {
-            return $success;
-        }
-
-        /* Load preferences after the configuration has been loaded to
+		if ($checkPerms && !$this->hasPermission($app)) {
+			Horde::logMessage(sprintf('User %s does not have READ permission for %s', Auth::getAuth(), $app), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+			return PEAR::raiseError(sprintf(_("User %s is not authorised for %s."), Auth::getAuth(), $this->applications[$app]['name']), 'permission_denied');
+		}
+
+		/* Import this application's configuration values. */
+		$success = $this->importConfig($app);
+		if (is_a($success, 'PEAR_Error')) {
+			return $success;
+		}
+
+		/* Load preferences after the configuration has been loaded to
          * make sure the prefs file has all the information it needs. */
-        $this->loadPrefs($app);
+		$this->loadPrefs($app);
 
-        /* Reset the language in case there is a different one
+		/* Reset the language in case there is a different one
          * selected in the preferences. */
-        $language = '';
-        if (isset($this->_prefsCache[$app]) &&
-            isset($this->_prefsCache[$app]->_prefs['language'])) {
-            $language = $this->_prefsCache[$app]->getValue('language');
-        }
-        NLS::setLang($language);
-        NLS::setTextdomain($app, $this->applications[$app]['fileroot'] . '/locale', NLS::getCharset());
-        String::setDefaultCharset(NLS::getCharset());
-
-        /* Once we know everything succeeded and is in a consistent
+		$language = '';
+		if (isset($this->_prefsCache[$app]) &&
+			isset($this->_prefsCache[$app]->_prefs['language'])) {
+			$language = $this->_prefsCache[$app]->getValue('language');
+		}
+		NLS::setLang($language);
+		NLS::setTextdomain($app, $this->applications[$app]['fileroot'] . '/locale', NLS::getCharset());
+		String::setDefaultCharset(NLS::getCharset());
+
+		/* Once we know everything succeeded and is in a consistent
          * state again, push the new application onto the stack. */
-        array_push($this->_appStack, $app);
-        $this->_currentApp = $app;
-
-        return true;
-    }
-
-    /**
-     * Remove the current app from the application stack, setting the
-     * current app to whichever app was current before this one took
-     * over.
-     *
-     * @access public
-     *
-     * @return string  The name of the application that was popped.
-     */
-    function popApp()
-    {
-        /* Pop the current application off of the stack. */
-        $previous = array_pop($this->_appStack);
-
-        /* Import the new active application's configuration values
+		array_push($this->_appStack, $app);
+		$this->_currentApp = $app;
+
+		return true;
+	}
+
+	/**
+	 * Remove the current app from the application stack, setting the
+	 * current app to whichever app was current before this one took
+	 * over.
+	 *
+	 * @access public
+	 *
+	 * @return string  The name of the application that was popped.
+	 */
+	function popApp()
+	{
+		/* Pop the current application off of the stack. */
+		$previous = array_pop($this->_appStack);
+
+		/* Import the new active application's configuration values
          * and set the gettext domain and the preferred language. */
-        $this->_currentApp = count($this->_appStack) ? end($this->_appStack) : null;
-        if ($this->_currentApp) {
-            $this->importConfig($this->_currentApp);
-            $this->loadPrefs($this->_currentApp);
-            #$language = $GLOBALS['prefs']->getValue('language');
-            #if (isset($language)) {
-            #    NLS::setLang($language);
-            #}
-            NLS::setTextdomain($this->_currentApp, $this->applications[$this->_currentApp]['fileroot'] . '/locale', NLS::getCharset());
-            String::setDefaultCharset(NLS::getCharset());
-        }
-
-        return $previous;
-    }
-
-    /**
-     * Return the current application - the app at the top of the
-     * application stack.
-     *
-     * @access public
-     *
-     * @return string  The current application.
-     */
-    function getApp()
-    {
-        return $this->_currentApp;
-    }
-
-    /**
-     * Check permissions on an application.
-     *
-     * @access public
-     *
-     * @return boolean  Whether or not access is allowed.
-     */
-    function hasPermission($app, $permission = PERMS_READ)
-    {
-    	return true;
-        #return Auth::isAdmin() || ($GLOBALS['perms']->exists($app) ?
-        #                           $GLOBALS['perms']->hasPermission($app, Auth::getAuth(), $permission) :
-        #                           (bool)Auth::getAuth());
-    }
-
-    /**
-     * Reads the configuration values for the given application and
-     * imports them into the global $conf variable.
-     *
-     * @access public
-     *
-     * @param string $app  The name of the application.
-     *
-     * @return boolean  True on success, PEAR_Error on error.
-     */
-    function importConfig($app)
-    {
-        /* Don't make config files global $registry themselves. */
-        global $registry;
-
-        /* Cache config values so that we don't re-read files on every
+		$this->_currentApp = count($this->_appStack) ? end($this->_appStack) : null;
+		if ($this->_currentApp) {
+			$this->importConfig($this->_currentApp);
+			$this->loadPrefs($this->_currentApp);
+			#$language = $GLOBALS['prefs']->getValue('language');
+			#if (isset($language)) {
+			#    NLS::setLang($language);
+			#}
+			NLS::setTextdomain($this->_currentApp, $this->applications[$this->_currentApp]['fileroot'] . '/locale', NLS::getCharset());
+			String::setDefaultCharset(NLS::getCharset());
+		}
+
+		return $previous;
+	}
+
+	/**
+	 * Return the current application - the app at the top of the
+	 * application stack.
+	 *
+	 * @access public
+	 *
+	 * @return string  The current application.
+	 */
+	function getApp()
+	{
+		return $this->_currentApp;
+	}
+
+	/**
+	 * Check permissions on an application.
+	 *
+	 * @access public
+	 *
+	 * @return boolean  Whether or not access is allowed.
+	 */
+	function hasPermission($app, $permission = PERMS_READ)
+	{
+		return true;
+		#return Auth::isAdmin() || ($GLOBALS['perms']->exists($app) ?
+		#                           $GLOBALS['perms']->hasPermission($app, Auth::getAuth(), $permission) :
+		#                           (bool)Auth::getAuth());
+	}
+
+	/**
+	 * Reads the configuration values for the given application and
+	 * imports them into the global $conf variable.
+	 *
+	 * @access public
+	 *
+	 * @param string $app  The name of the application.
+	 *
+	 * @return boolean  True on success, PEAR_Error on error.
+	 */
+	function importConfig($app)
+	{
+		/* Don't make config files global $registry themselves. */
+		global $registry;
+
+		/* Cache config values so that we don't re-read files on every
          * popApp() call. */
-        if (!isset($this->_confCache[$app])) {
-            if (!isset($this->_confCache['horde'])) {
-                $conf = array();
-                ob_start();
-                $success = include HORDE_BASE . '/config/conf.php';
-                $errors = ob_get_contents();
-                ob_end_clean();
-                if (!empty($errors)) {
-                    return PEAR::raiseError(sprintf('Failed to import Horde configuration: %s', strip_tags($errors)));
-                }
-                if (!$success) {
-                    return PEAR::raiseError('Failed to import Horde configuration.');
-                }
-
-                /* Initial Horde-wide settings. */
-
-                /* Set the error reporting level in accordance with
+		if (!isset($this->_confCache[$app])) {
+			if (!isset($this->_confCache['horde'])) {
+				$conf = array();
+				ob_start();
+				$success = include HORDE_BASE . '/config/conf.php';
+				$errors = ob_get_contents();
+				ob_end_clean();
+				if (!empty($errors)) {
+					return PEAR::raiseError(sprintf('Failed to import Horde configuration: %s', strip_tags($errors)));
+				}
+				if (!$success) {
+					return PEAR::raiseError('Failed to import Horde configuration.');
+				}
+
+				/* Initial Horde-wide settings. */
+
+				/* Set the error reporting level in accordance with
                  * the config settings. */
-                error_reporting($conf['debug_level']);
+				error_reporting($conf['debug_level']);
 
-                /* Set the maximum execution time in accordance with
+				/* Set the maximum execution time in accordance with
                  * the config settings. */
-                @set_time_limit($conf['max_exec_time']);
-
-                /* Set the umask according to config settings. */
-                if (isset($conf['umask'])) {
-                    umask($conf['umask']);
-                }
-            } else {
-                $conf = $this->_confCache['horde'];
-            }
-
-            if ($app !== 'horde') {
-                $success = @include $this->applications[$app]['fileroot'] . '/config/conf.php';
-                if (!$success) {
-                    return PEAR::raiseError('Failed to import application configuration for ' . $app);
-                }
-            }
-
-            $this->_confCache[$app] = &$conf;
-        }
-
-        $GLOBALS['conf'] = &$this->_confCache[$app];
-        return true;
-    }
-
-    /**
-     * Loads the preferences for the current user for the current
-     * application and imports them into the global $prefs variable.
-     *
-     * @access public
-     *
-     * @param string $app  The name of the application.
-     */
-    function loadPrefs($app = null)
-    {
-    	return array();
+				@set_time_limit($conf['max_exec_time']);
+
+				/* Set the umask according to config settings. */
+				if (isset($conf['umask'])) {
+					umask($conf['umask']);
+				}
+			} else {
+				$conf = $this->_confCache['horde'];
+			}
+
+			if ($app !== 'horde') {
+				$success = @include $this->applications[$app]['fileroot'] . '/config/conf.php';
+				if (!$success) {
+					return PEAR::raiseError('Failed to import application configuration for ' . $app);
+				}
+			}
+
+			$this->_confCache[$app] = &$conf;
+		}
+
+		$GLOBALS['conf'] = &$this->_confCache[$app];
+		return true;
+	}
+
+	/**
+	 * Loads the preferences for the current user for the current
+	 * application and imports them into the global $prefs variable.
+	 *
+	 * @access public
+	 *
+	 * @param string $app  The name of the application.
+	 */
+	function loadPrefs($app = null)
+	{
+		return array();
     	
-        static $prefs_default = false;
+		static $prefs_default = false;
 
-        require_once 'Horde/Prefs.php';
+		require_once 'Horde/Prefs.php';
 
-        if ($app === null) {
-            $app = $this->_currentApp;
-        }
+		if ($app === null) {
+			$app = $this->_currentApp;
+		}
 
-        /* If there is no logged in user, return an empty Prefs::
+		/* If there is no logged in user, return an empty Prefs::
          * object with just default preferences. */
 #        if (!Auth::getAuth()) {
 #            $prefs = &Prefs::factory('none', $app, '', '', null, false);
@@ -833,7 +833,7 @@ 
 #            return;
 #        }
 
-        /* Cache prefs objects so that we don't re-load them on every
+		/* Cache prefs objects so that we don't re-load them on every
          * popApp() call. */
 #        if (!isset($this->_prefsCache[$app]) ||
 #            !empty($prefs_default)) {
@@ -843,186 +843,186 @@ 
 #            $this->_prefsCache[$app] = &$prefs;
 #       }
 
-        $GLOBALS['prefs'] = &$this->_prefsCache[$app];
-    }
-
-    /**
-     * Unload preferences from an application or (if no application is
-     * specified) from ALL applications. Useful when a user has logged
-     * out but you need to continue on the same page, etc.
-     *
-     * After unloading, if there is an application on the app stack to
-     * load preferences from, then we reload a fresh set.
-     *
-     * @access public
-     *
-     * @param string $app  (optional) The application to unload prefrences for.
-     *                     If null, ALL preferences are reset.
-     */
-    function unloadPrefs($app = null)
-    {
-        if ($app === null) {
-            $this->_prefsCache = array();
-        } elseif (isset($this->_prefsCache[$app])) {
-            unset($this->_prefsCache[$app]);
-        } else {
-            return;
-        }
-
-        if ($this->_currentApp) {
-            $this->loadPrefs();
-        }
-    }
-
-    /**
-     * Return the requested configuration parameter for the specified
-     * application. If no application is specified, the value of
-     * $this->_currentApp (the current application) is used. However,
-     * if the parameter is not present for that application, the
-     * Horde-wide value is used instead. If that is not present, we
-     * return null.
-     *
-     * @access public
-     *
-     * @param string $parameter     The configuration value to retrieve.
-     * @param optional string $app  The application to get the value for.
-     *
-     * @return string  The requested parameter, or null if it is not set.
-     */
-    function get($parameter, $app = null)
-    {
-        if (is_null($app)) {
-            $app = $this->_currentApp;
-        }
-
-        if (isset($this->applications[$app][$parameter])) {
-            $pval = $this->applications[$app][$parameter];
-        } else {
-            if ($parameter == 'icon') {
-                $pval = $this->_getIcon($app);
-            } else {
-                $pval = isset($this->applications['horde'][$parameter]) ? $this->applications['horde'][$parameter] : null;
-            }
-        }
-
-        if ($parameter == 'name') {
-            return _($pval);
-        } else {
-            return $pval;
-        }
-    }
-
-    /**
-     * Function to work out an application's graphics URI, taking into
-     * account any themes directories that may be set up.
-     *
-     * @access public
-     *
-     * @param optional string $app  The application for which to get the
-     *                              image directory. If blank will default
-     *                              to current application.
-     *
-     * @return string  The image directory uri path.
-     */
-    function getImageDir($app = null)
-    {
-        if (empty($app)) {
-            $app = $this->_currentApp;
-        }
-
-        static $img_dir = array();
-        if (isset($img_dir[$app])) {
-            return $img_dir[$app];
-        }
-
-        /* This is the default location for the graphics. */
-        $img_dir[$app] = $this->get('themesuri', $app) . '/graphics';
-
-        /* Figure out if this is going to be overridden by any theme
+		$GLOBALS['prefs'] = &$this->_prefsCache[$app];
+	}
+
+	/**
+	 * Unload preferences from an application or (if no application is
+	 * specified) from ALL applications. Useful when a user has logged
+	 * out but you need to continue on the same page, etc.
+	 *
+	 * After unloading, if there is an application on the app stack to
+	 * load preferences from, then we reload a fresh set.
+	 *
+	 * @access public
+	 *
+	 * @param string $app  (optional) The application to unload prefrences for.
+	 *                     If null, ALL preferences are reset.
+	 */
+	function unloadPrefs($app = null)
+	{
+		if ($app === null) {
+			$this->_prefsCache = array();
+		} elseif (isset($this->_prefsCache[$app])) {
+			unset($this->_prefsCache[$app]);
+		} else {
+			return;
+		}
+
+		if ($this->_currentApp) {
+			$this->loadPrefs();
+		}
+	}
+
+	/**
+	 * Return the requested configuration parameter for the specified
+	 * application. If no application is specified, the value of
+	 * $this->_currentApp (the current application) is used. However,
+	 * if the parameter is not present for that application, the
+	 * Horde-wide value is used instead. If that is not present, we
+	 * return null.
+	 *
+	 * @access public
+	 *
+	 * @param string $parameter     The configuration value to retrieve.
+	 * @param optional string $app  The application to get the value for.
+	 *
+	 * @return string  The requested parameter, or null if it is not set.
+	 */
+	function get($parameter, $app = null)
+	{
+		if (is_null($app)) {
+			$app = $this->_currentApp;
+		}
+
+		if (isset($this->applications[$app][$parameter])) {
+			$pval = $this->applications[$app][$parameter];
+		} else {
+			if ($parameter == 'icon') {
+				$pval = $this->_getIcon($app);
+			} else {
+				$pval = isset($this->applications['horde'][$parameter]) ? $this->applications['horde'][$parameter] : null;
+			}
+		}
+
+		if ($parameter == 'name') {
+			return _($pval);
+		} else {
+			return $pval;
+		}
+	}
+
+	/**
+	 * Function to work out an application's graphics URI, taking into
+	 * account any themes directories that may be set up.
+	 *
+	 * @access public
+	 *
+	 * @param optional string $app  The application for which to get the
+	 *                              image directory. If blank will default
+	 *                              to current application.
+	 *
+	 * @return string  The image directory uri path.
+	 */
+	function getImageDir($app = null)
+	{
+		if (empty($app)) {
+			$app = $this->_currentApp;
+		}
+
+		static $img_dir = array();
+		if (isset($img_dir[$app])) {
+			return $img_dir[$app];
+		}
+
+		/* This is the default location for the graphics. */
+		$img_dir[$app] = $this->get('themesuri', $app) . '/graphics';
+
+		/* Figure out if this is going to be overridden by any theme
          * settings. */
-        if (isset($GLOBALS['prefs']) && ($theme = $GLOBALS['prefs']->getValue('theme')) &&
-            (@include $this->get('themesfs', 'horde') . '/' . $theme . '/info.php') &&
-            isset($theme_icons) &&
-            in_array($app, $theme_icons)) {
-            $img_dir[$app] = $this->get('themesuri', $app) . '/' . $theme . '/graphics';
-        }
-
-        return $img_dir[$app];
-    }
-
-    /**
-     * Returns the path to an application's icon, respecting whether the
-     * current theme has its own icons.
-     *
-     * @access private
-     *
-     * @param string $app  The application for which to get the icon.
-     */
-    function _getIcon($app)
-    {
-        return $this->getImageDir($app) . '/' . $app . '.png';
-    }
-
-    /**
-     * Query the initial page for an application - the webroot, if
-     * there is no initial_page set, and the initial_page, if it is
-     * set.
-     *
-     * @access public
-     *
-     * @param optional string $app  The name of the application.
-     *
-     * @return string  URL pointing to the inital page of the application.
-     *                 Returns PEAR_Error on error.
-     */
-    function getInitialPage($app = null)
-    {
-        if (is_null($app)) {
-            $app = $this->_currentApp;
-        }
-
-        if (!isset($this->applications[$app])) {
-            return PEAR::raiseError(sprintf(_("'%s' is not configured in the Horde Registry."), $app));
-        }
-        return $this->applications[$app]['webroot'] . '/' . (isset($this->applications[$app]['initial_page']) ? $this->applications[$app]['initial_page'] : '');
-    }
-
-    /**
-     * Fills the registry's API cache with the available services.
-     *
-     * @access private
-     */
-    function _fillAPICache()
-    {
-        if (!empty($this->_apiCache)) {
-            return;
-        }
-
-        $status = array('active', 'notoolbar', 'hidden');
+		if (isset($GLOBALS['prefs']) && ($theme = $GLOBALS['prefs']->getValue('theme')) &&
+			(@include $this->get('themesfs', 'horde') . '/' . $theme . '/info.php') &&
+			isset($theme_icons) &&
+			in_array($app, $theme_icons)) {
+			$img_dir[$app] = $this->get('themesuri', $app) . '/' . $theme . '/graphics';
+		}
+
+		return $img_dir[$app];
+	}
+
+	/**
+	 * Returns the path to an application's icon, respecting whether the
+	 * current theme has its own icons.
+	 *
+	 * @access private
+	 *
+	 * @param string $app  The application for which to get the icon.
+	 */
+	function _getIcon($app)
+	{
+		return $this->getImageDir($app) . '/' . $app . '.png';
+	}
+
+	/**
+	 * Query the initial page for an application - the webroot, if
+	 * there is no initial_page set, and the initial_page, if it is
+	 * set.
+	 *
+	 * @access public
+	 *
+	 * @param optional string $app  The name of the application.
+	 *
+	 * @return string  URL pointing to the inital page of the application.
+	 *                 Returns PEAR_Error on error.
+	 */
+	function getInitialPage($app = null)
+	{
+		if (is_null($app)) {
+			$app = $this->_currentApp;
+		}
+
+		if (!isset($this->applications[$app])) {
+			return PEAR::raiseError(sprintf(_("'%s' is not configured in the Horde Registry."), $app));
+		}
+		return $this->applications[$app]['webroot'] . '/' . (isset($this->applications[$app]['initial_page']) ? $this->applications[$app]['initial_page'] : '');
+	}
+
+	/**
+	 * Fills the registry's API cache with the available services.
+	 *
+	 * @access private
+	 */
+	function _fillAPICache()
+	{
+		if (!empty($this->_apiCache)) {
+			return;
+		}
+
+		$status = array('active', 'notoolbar', 'hidden');
 #        if (Auth::isAdmin()) {
 #            $status[] = 'admin';
 #        }
-        $apps = $this->listApps($status);
-        foreach ($apps as $app) {
-            $_services = $_types = null;
-            $api = $this->get('fileroot', $app) . '/lib/api.php';
-            if (is_readable($api)) {
-                include_once $api;
-            }
-            if (!isset($_services)) {
-                $this->_apiCache[$app] = array();
-            } else {
-                $this->_apiCache[$app] = $_services;
-            }
-            if (isset($_types)) {
-                foreach ($_types as $type => $params) {
-                    /* Prefix non-Horde types with the application
+		$apps = $this->listApps($status);
+		foreach ($apps as $app) {
+			$_services = $_types = null;
+			$api = $this->get('fileroot', $app) . '/lib/api.php';
+			if (is_readable($api)) {
+				include_once $api;
+			}
+			if (!isset($_services)) {
+				$this->_apiCache[$app] = array();
+			} else {
+				$this->_apiCache[$app] = $_services;
+			}
+			if (isset($_types)) {
+				foreach ($_types as $type => $params) {
+					/* Prefix non-Horde types with the application
                      * name. */
-                    $prefix = $app == 'horde' ? '' : "${app}_";
-                    $this->_typeCache[$prefix . $type] = $params;
-                }
-            }
-        }
-    }
+					$prefix = $app == 'horde' ? '' : "${app}_";
+					$this->_typeCache[$prefix . $type] = $params;
+				}
+			}
+		}
+	}
 
 }

Spacing +33 added lines, -34 removed lines

@@ -120,14 +120,14 @@ 
         $this->importConfig('horde');
 
         /* Start a session. */
-        if ($session_flags & HORDE_SESSION_NONE) {
+        if ($session_flags&HORDE_SESSION_NONE) {
             /* Never start a session if the session flags include
                HORDE_SESSION_NONE. */
             $_SESSION = array();
         } else {
             Horde::setupSessionHandler();
             @session_start();
-            if ($session_flags & HORDE_SESSION_READONLY) {
+            if ($session_flags&HORDE_SESSION_READONLY) {
                 /* Close the session immediately so no changes can be
                    made but values are still available. */
                 @session_write_close();
@@ -135,7 +135,7 @@ 
         }
 
         /* Read the registry configuration file. */
-        require_once HORDE_BASE . '/config/registry.php';
+        require_once HORDE_BASE.'/config/registry.php';
 
         /* Initialize the localization routines and variables. */
 #        NLS::setLang();
@@ -167,19 +167,19 @@ 
                 }
             }
             if (!isset($app['templates']) && isset($app['fileroot'])) {
-                $app['templates'] = $app['fileroot'] . '/templates';
+                $app['templates'] = $app['fileroot'].'/templates';
             }
             if (!isset($app['jsuri']) && isset($app['webroot'])) {
-                $app['jsuri'] = $app['webroot'] . '/js';
+                $app['jsuri'] = $app['webroot'].'/js';
             }
             if (!isset($app['jsfs']) && isset($app['fileroot'])) {
-                $app['jsfs'] = $app['fileroot'] . '/js';
+                $app['jsfs'] = $app['fileroot'].'/js';
             }
             if (!isset($app['themesuri']) && isset($app['webroot'])) {
-                $app['themesuri'] = $app['webroot'] . '/themes';
+                $app['themesuri'] = $app['webroot'].'/themes';
             }
             if (!isset($app['themesfs']) && isset($app['fileroot'])) {
-                $app['themesfs'] = $app['fileroot'] . '/themes';
+                $app['themesfs'] = $app['fileroot'].'/themes';
             }
         }
 
@@ -242,7 +242,7 @@ 
         $apis = array();
 
         foreach (array_keys($this->_interfaces) as $interface) {
-            @list($api, ) = explode('/', $interface);
+            @list($api,) = explode('/', $interface);
             $apis[] = $api;
         }
 
@@ -285,7 +285,7 @@ 
                 } elseif (is_null($api) || ($method == $api)) {
                     if (isset($this->_apiCache[$app])) {
                         foreach (array_keys($this->_apiCache[$app]) as $service) {
-                            $methods[] = $method . '/' . $service;
+                            $methods[] = $method.'/'.$service;
                         }
                     }
                 }
@@ -348,8 +348,7 @@ 
     function hasInterface($interface)
     {
         return !empty($this->_interfaces[$interface]) ?
-            $this->_interfaces[$interface] :
-            false;
+            $this->_interfaces[$interface] : false;
     }
 
     /**
@@ -406,7 +405,7 @@ 
         } elseif (!empty($this->_interfaces[$interface])) {
             $app = $this->_interfaces[$interface];
         } else {
-            return PEAR::raiseError('The method "' . $method . '" is not defined in the Horde Registry.');
+            return PEAR::raiseError('The method "'.$method.'" is not defined in the Horde Registry.');
         }
 
         return $this->callByPackage($app, $call, $args);
@@ -434,9 +433,9 @@ 
         }
 
         /* Make sure that the function actually exists. */
-        $function = '_' . $app . '_' . $call;
+        $function = '_'.$app.'_'.$call;
         if (!function_exists($function)) {
-            return PEAR::raiseError('The function implementing ' . $call . ' (' . $function . ') is not defined in ' . $app . '\'s API.');
+            return PEAR::raiseError('The function implementing '.$call.' ('.$function.') is not defined in '.$app.'\'s API.');
         }
 
         $checkPerms = isset($this->_apiCache[$app][$call]['checkperms']) ?
@@ -486,7 +485,7 @@ 
         } elseif (!empty($this->_interfaces[$interface])) {
             $app = $this->_interfaces[$interface];
         } else {
-            return PEAR::raiseError('The method "' . $method . '" is not defined in the Horde Registry.');
+            return PEAR::raiseError('The method "'.$method.'" is not defined in the Horde Registry.');
         }
 
         return $this->linkByPackage($app, $call, $args, $extra);
@@ -512,12 +511,12 @@ 
          * services and included the API file, so we don't try to do
          * it it again explicitly in this method. */
         if (!$this->hasMethod($call, $app)) {
-            return PEAR::raiseError('The method "' . $call . '" is not defined in ' . $app . '\'s API.');
+            return PEAR::raiseError('The method "'.$call.'" is not defined in '.$app.'\'s API.');
         }
 
         /* Make sure the link is defined. */
         if (empty($this->_apiCache[$app][$call]['link'])) {
-            return PEAR::raiseError('The link ' . $call . ' is not defined in ' . $app . '\'s API.');
+            return PEAR::raiseError('The link '.$call.' is not defined in '.$app.'\'s API.');
         }
 
         /* Initial link value. */
@@ -525,7 +524,7 @@ 
 
         /* Fill in html-encoded arguments. */
         foreach ($args as $key => $val) {
-            $link = str_replace('%' . $key . '%', htmlentities($val), $link);
+            $link = str_replace('%'.$key.'%', htmlentities($val), $link);
         }
         if (isset($this->applications[$app]['webroot'])) {
             $link = str_replace('%application%', $this->get('webroot', $app), $link);
@@ -538,14 +537,14 @@ 
 
         /* Fill in urlencoded arguments. */
         foreach ($args as $key => $val) {
-            $link = str_replace('|' . String::lower($key) . '|', urlencode($val), $link);
+            $link = str_replace('|'.String::lower($key).'|', urlencode($val), $link);
         }
 
         /* Append any extra, non-standard arguments. */
         if (is_array($extra)) {
             $extra_args = '';
             foreach ($extra as $key => $val) {
-                $extra_args .- '&' . urlencode($key) . '=' . urlencode($val);
+                $extra_args.- '&'.urlencode($key).'='.urlencode($val);
             }
         } else {
             $extra_args = $extra;
@@ -636,7 +635,7 @@ 
         if (!isset($this->applications[$app]) ||
             $this->applications[$app]['status'] == 'inactive' ||
             ($this->applications[$app]['status'] == 'admin' && !Auth::isAdmin())) {
-            Horde::fatal($app . ' is not activated', __FILE__, __LINE__);
+            Horde::fatal($app.' is not activated', __FILE__, __LINE__);
         }
 
         /* If permissions checking is requested, return an error if
@@ -669,7 +668,7 @@ 
             $language = $this->_prefsCache[$app]->getValue('language');
         }
         NLS::setLang($language);
-        NLS::setTextdomain($app, $this->applications[$app]['fileroot'] . '/locale', NLS::getCharset());
+        NLS::setTextdomain($app, $this->applications[$app]['fileroot'].'/locale', NLS::getCharset());
         String::setDefaultCharset(NLS::getCharset());
 
         /* Once we know everything succeeded and is in a consistent
@@ -704,7 +703,7 @@ 
             #if (isset($language)) {
             #    NLS::setLang($language);
             #}
-            NLS::setTextdomain($this->_currentApp, $this->applications[$this->_currentApp]['fileroot'] . '/locale', NLS::getCharset());
+            NLS::setTextdomain($this->_currentApp, $this->applications[$this->_currentApp]['fileroot'].'/locale', NLS::getCharset());
             String::setDefaultCharset(NLS::getCharset());
         }
 
@@ -760,7 +759,7 @@ 
             if (!isset($this->_confCache['horde'])) {
                 $conf = array();
                 ob_start();
-                $success = include HORDE_BASE . '/config/conf.php';
+                $success = include HORDE_BASE.'/config/conf.php';
                 $errors = ob_get_contents();
                 ob_end_clean();
                 if (!empty($errors)) {
@@ -789,9 +788,9 @@ 
             }
 
             if ($app !== 'horde') {
-                $success = @include $this->applications[$app]['fileroot'] . '/config/conf.php';
+                $success = @include $this->applications[$app]['fileroot'].'/config/conf.php';
                 if (!$success) {
-                    return PEAR::raiseError('Failed to import application configuration for ' . $app);
+                    return PEAR::raiseError('Failed to import application configuration for '.$app);
                 }
             }
 
@@ -936,15 +935,15 @@ 
         }
 
         /* This is the default location for the graphics. */
-        $img_dir[$app] = $this->get('themesuri', $app) . '/graphics';
+        $img_dir[$app] = $this->get('themesuri', $app).'/graphics';
 
         /* Figure out if this is going to be overridden by any theme
          * settings. */
         if (isset($GLOBALS['prefs']) && ($theme = $GLOBALS['prefs']->getValue('theme')) &&
-            (@include $this->get('themesfs', 'horde') . '/' . $theme . '/info.php') &&
+            (@include $this->get('themesfs', 'horde').'/'.$theme.'/info.php') &&
             isset($theme_icons) &&
             in_array($app, $theme_icons)) {
-            $img_dir[$app] = $this->get('themesuri', $app) . '/' . $theme . '/graphics';
+            $img_dir[$app] = $this->get('themesuri', $app).'/'.$theme.'/graphics';
         }
 
         return $img_dir[$app];
@@ -960,7 +959,7 @@ 
      */
     function _getIcon($app)
     {
-        return $this->getImageDir($app) . '/' . $app . '.png';
+        return $this->getImageDir($app).'/'.$app.'.png';
     }
 
     /**
@@ -984,7 +983,7 @@ 
         if (!isset($this->applications[$app])) {
             return PEAR::raiseError(sprintf(_("'%s' is not configured in the Horde Registry."), $app));
         }
-        return $this->applications[$app]['webroot'] . '/' . (isset($this->applications[$app]['initial_page']) ? $this->applications[$app]['initial_page'] : '');
+        return $this->applications[$app]['webroot'].'/'.(isset($this->applications[$app]['initial_page']) ? $this->applications[$app]['initial_page'] : '');
     }
 
     /**
@@ -1005,7 +1004,7 @@ 
         $apps = $this->listApps($status);
         foreach ($apps as $app) {
             $_services = $_types = null;
-            $api = $this->get('fileroot', $app) . '/lib/api.php';
+            $api = $this->get('fileroot', $app).'/lib/api.php';
             if (is_readable($api)) {
                 include_once $api;
             }
@@ -1019,7 +1018,7 @@ 
                     /* Prefix non-Horde types with the application
                      * name. */
                     $prefix = $app == 'horde' ? '' : "${app}_";
-                    $this->_typeCache[$prefix . $type] = $params;
+                    $this->_typeCache[$prefix.$type] = $params;
                 }
             }
         }

Braces +215 added lines, -98 removed lines

@@ -26,7 +26,8 @@ 
  * @since   Horde 1.3
  * @package Horde_Framework
  */
-class Registry {
+class Registry
+{
 
     /**
      * Hash storing all of the known services and callbacks.
@@ -99,7 +100,8 @@ 
     {
         static $registry;
 
-        if (!isset($registry)) {
+        if (!isset($registry))
+        {
             $registry = new Registry($session_flags);
         }
 
@@ -120,14 +122,18 @@ 
         $this->importConfig('horde');
 
         /* Start a session. */
-        if ($session_flags & HORDE_SESSION_NONE) {
+        if ($session_flags & HORDE_SESSION_NONE)
+        {
             /* Never start a session if the session flags include
                HORDE_SESSION_NONE. */
             $_SESSION = array();
-        } else {
+        }
+        else
+        {
             Horde::setupSessionHandler();
             @session_start();
-            if ($session_flags & HORDE_SESSION_READONLY) {
+            if ($session_flags & HORDE_SESSION_READONLY)
+            {
                 /* Close the session immediately so no changes can be
                    made but values are still available. */
                 @session_write_close();
@@ -143,42 +149,55 @@ 
 #        String::setDefaultCharset(NLS::getCharset());
 
         /* Stop system if Horde is inactive. */
-        if ($this->applications['horde']['status'] == 'inactive') {
+        if ($this->applications['horde']['status'] == 'inactive')
+        {
             Horde::fatal(_("This system is currently deactivated."), __FILE__, __LINE__);
         }
 
         /* Scan for all APIs provided by each app, and set other
          * common defaults like templates and graphics. */
         $appList = array_keys($this->applications);
-        foreach ($appList as $appName) {
+        foreach ($appList as $appName)
+        {
             $app = &$this->applications[$appName];
             if (($app['status'] == 'heading') ||
                 ($app['status'] == 'inactive') ||
-                ($app['status'] == 'admin' && !Auth::isAdmin())) {
+                ($app['status'] == 'admin' && !Auth::isAdmin()))
+            {
                 continue;
             }
-            if (isset($app['provides'])) {
-                if (is_array($app['provides'])) {
-                    foreach ($app['provides'] as $interface) {
+            if (isset($app['provides']))
+            {
+                if (is_array($app['provides']))
+                {
+                    foreach ($app['provides'] as $interface)
+                    {
                         $this->_interfaces[$interface] = $appName;
                     }
-                } else {
+                }
+                else
+                {
                     $this->_interfaces[$app['provides']] = $appName;
                 }
             }
-            if (!isset($app['templates']) && isset($app['fileroot'])) {
+            if (!isset($app['templates']) && isset($app['fileroot']))
+            {
                 $app['templates'] = $app['fileroot'] . '/templates';
             }
-            if (!isset($app['jsuri']) && isset($app['webroot'])) {
+            if (!isset($app['jsuri']) && isset($app['webroot']))
+            {
                 $app['jsuri'] = $app['webroot'] . '/js';
             }
-            if (!isset($app['jsfs']) && isset($app['fileroot'])) {
+            if (!isset($app['jsfs']) && isset($app['fileroot']))
+            {
                 $app['jsfs'] = $app['fileroot'] . '/js';
             }
-            if (!isset($app['themesuri']) && isset($app['webroot'])) {
+            if (!isset($app['themesuri']) && isset($app['webroot']))
+            {
                 $app['themesuri'] = $app['webroot'] . '/themes';
             }
-            if (!isset($app['themesfs']) && isset($app['fileroot'])) {
+            if (!isset($app['themesfs']) && isset($app['fileroot']))
+            {
                 $app['themesfs'] = $app['fileroot'] . '/themes';
             }
         }
@@ -191,7 +210,8 @@ 
 #        $notification->attach('javascript');
 
         /* Register access key logger for translators. */
-        if (@$GLOBALS['conf']['log_accesskeys']) {
+        if (@$GLOBALS['conf']['log_accesskeys'])
+        {
             register_shutdown_function(create_function('', 'Horde::getAccessKey(null, null, true);'));
         }
     }
@@ -216,13 +236,16 @@ 
     function listApps($filter = null, $assoc = false, $permission = PERMS_SHOW)
     {
         $apps = array();
-        if (is_null($filter)) {
+        if (is_null($filter))
+        {
             $filter = array('notoolbar', 'active');
         }
 
-        foreach ($this->applications as $app => $params) {
+        foreach ($this->applications as $app => $params)
+        {
             if (in_array($params['status'], $filter) &&
-                (defined('AUTH_HANDLER') || $this->hasPermission($app, $permission))) {
+                (defined('AUTH_HANDLER') || $this->hasPermission($app, $permission)))
+            {
                 $assoc ? $apps[$app] = $app : $apps[] = $app;
             }
         }
@@ -241,7 +264,8 @@ 
     {
         $apis = array();
 
-        foreach (array_keys($this->_interfaces) as $interface) {
+        foreach (array_keys($this->_interfaces) as $interface)
+        {
             @list($api, ) = explode('/', $interface);
             $apis[] = $api;
         }
@@ -266,25 +290,37 @@ 
 
         $this->_fillAPICache();
 
-        foreach (array_keys($this->applications) as $app) {
-            if (isset($this->applications[$app]['provides'])) {
+        foreach (array_keys($this->applications) as $app)
+        {
+            if (isset($this->applications[$app]['provides']))
+            {
                 $provides = $this->applications[$app]['provides'];
-                if (!is_array($provides)) {
+                if (!is_array($provides))
+                {
                     $provides = array($provides);
                 }
-            } else {
+            }
+            else
+            {
                 $provides = array();
             }
 
-            foreach ($provides as $method) {
-                if (strpos($method, '/') !== false) {
+            foreach ($provides as $method)
+            {
+                if (strpos($method, '/') !== false)
+                {
                     if (is_null($api) ||
-                        (substr($method, 0, strlen($api)) == $api)) {
+                        (substr($method, 0, strlen($api)) == $api))
+                    {
                         $methods[] = $method;
                     }
-                } elseif (is_null($api) || ($method == $api)) {
-                    if (isset($this->_apiCache[$app])) {
-                        foreach (array_keys($this->_apiCache[$app]) as $service) {
+                }
+                elseif (is_null($api) || ($method == $api))
+                {
+                    if (isset($this->_apiCache[$app]))
+                    {
+                        foreach (array_keys($this->_apiCache[$app]) as $service)
+                        {
                             $methods[] = $method . '/' . $service;
                         }
                     }
@@ -321,7 +357,8 @@ 
      */
     function getSignature($method)
     {
-        if (!($app = $this->hasMethod($method))) {
+        if (!($app = $this->hasMethod($method)))
+        {
             return;
         }
 
@@ -329,7 +366,8 @@ 
 
         @list(, $function) = explode('/', $method);
         if (isset($this->_apiCache[$app][$function]['type']) &&
-            isset($this->_apiCache[$app][$function]['args'])) {
+            isset($this->_apiCache[$app][$function]['args']))
+        {
             return array($this->_apiCache[$app][$function]['args'], $this->_apiCache[$app][$function]['type']);
         }
     }
@@ -365,16 +403,24 @@ 
      */
     function hasMethod($method, $app = null)
     {
-        if (is_null($app)) {
+        if (is_null($app))
+        {
             @list($interface, $call) = explode('/', $method);
-            if (!empty($this->_interfaces[$method])) {
+            if (!empty($this->_interfaces[$method]))
+            {
                 $app = $this->_interfaces[$method];
-            } elseif (!empty($this->_interfaces[$interface])) {
+            }
+            elseif (!empty($this->_interfaces[$interface]))
+            {
                 $app = $this->_interfaces[$interface];
-            } else {
+            }
+            else
+            {
                 return false;
             }
-        } else {
+        }
+        else
+        {
             $call = $method;
         }
 
@@ -401,11 +447,16 @@ 
     {
         @list($interface, $call) = explode('/', $method);
 
-        if (!empty($this->_interfaces[$method])) {
+        if (!empty($this->_interfaces[$method]))
+        {
             $app = $this->_interfaces[$method];
-        } elseif (!empty($this->_interfaces[$interface])) {
+        }
+        elseif (!empty($this->_interfaces[$interface]))
+        {
             $app = $this->_interfaces[$interface];
-        } else {
+        }
+        else
+        {
             return PEAR::raiseError('The method "' . $method . '" is not defined in the Horde Registry.');
         }
 
@@ -429,13 +480,15 @@ 
         /* Note: calling hasMethod() makes sure that we've cached
          * $app's services and included the API file, so we don't try
          * to do it again explicitly in this method. */
-        if (!$this->hasMethod($call, $app)) {
+        if (!$this->hasMethod($call, $app))
+        {
             return PEAR::raiseError(sprintf('The method "%s" is not defined in the API for %s.', $call, $app));
         }
 
         /* Make sure that the function actually exists. */
         $function = '_' . $app . '_' . $call;
-        if (!function_exists($function)) {
+        if (!function_exists($function))
+        {
             return PEAR::raiseError('The function implementing ' . $call . ' (' . $function . ') is not defined in ' . $app . '\'s API.');
         }
 
@@ -446,7 +499,8 @@ 
          * including any files which might do it for us. Return an
          * error immediately if pushApp() fails. */
         $pushed = $this->pushApp($app, $checkPerms);
-        if (is_a($pushed, 'PEAR_Error')) {
+        if (is_a($pushed, 'PEAR_Error'))
+        {
             return $pushed;
         }
 
@@ -454,7 +508,8 @@ 
 
         /* If we changed application context in the course of this
          * call, undo that change now. */
-        if ($pushed === true) {
+        if ($pushed === true)
+        {
             $this->popApp();
         }
 
@@ -481,11 +536,16 @@ 
     {
         @list($interface, $call) = explode('/', $method);
 
-        if (!empty($this->_interfaces[$method])) {
+        if (!empty($this->_interfaces[$method]))
+        {
             $app = $this->_interfaces[$method];
-        } elseif (!empty($this->_interfaces[$interface])) {
+        }
+        elseif (!empty($this->_interfaces[$interface]))
+        {
             $app = $this->_interfaces[$interface];
-        } else {
+        }
+        else
+        {
             return PEAR::raiseError('The method "' . $method . '" is not defined in the Horde Registry.');
         }
 
@@ -511,12 +571,14 @@ 
         /* Note: calling hasMethod makes sure that we've cached $app's
          * services and included the API file, so we don't try to do
          * it it again explicitly in this method. */
-        if (!$this->hasMethod($call, $app)) {
+        if (!$this->hasMethod($call, $app))
+        {
             return PEAR::raiseError('The method "' . $call . '" is not defined in ' . $app . '\'s API.');
         }
 
         /* Make sure the link is defined. */
-        if (empty($this->_apiCache[$app][$call]['link'])) {
+        if (empty($this->_apiCache[$app][$call]['link']))
+        {
             return PEAR::raiseError('The link ' . $call . ' is not defined in ' . $app . '\'s API.');
         }
 
@@ -524,10 +586,12 @@ 
         $link = $this->_apiCache[$app][$call]['link'];
 
         /* Fill in html-encoded arguments. */
-        foreach ($args as $key => $val) {
+        foreach ($args as $key => $val)
+        {
             $link = str_replace('%' . $key . '%', htmlentities($val), $link);
         }
-        if (isset($this->applications[$app]['webroot'])) {
+        if (isset($this->applications[$app]['webroot']))
+        {
             $link = str_replace('%application%', $this->get('webroot', $app), $link);
         }
 
@@ -537,17 +601,22 @@ 
         $link = preg_replace('|%.+%|U', '', $link);
 
         /* Fill in urlencoded arguments. */
-        foreach ($args as $key => $val) {
+        foreach ($args as $key => $val)
+        {
             $link = str_replace('|' . String::lower($key) . '|', urlencode($val), $link);
         }
 
         /* Append any extra, non-standard arguments. */
-        if (is_array($extra)) {
+        if (is_array($extra))
+        {
             $extra_args = '';
-            foreach ($extra as $key => $val) {
+            foreach ($extra as $key => $val)
+            {
                 $extra_args .- '&' . urlencode($key) . '=' . urlencode($val);
             }
-        } else {
+        }
+        else
+        {
             $extra_args = $extra;
         }
         $link = str_replace('|extra|', $extra_args, $link);
@@ -574,11 +643,13 @@ 
      */
     function applicationFilePath($path, $app = null)
     {
-        if (is_null($app)) {
+        if (is_null($app))
+        {
             $app = $this->_currentApp;
         }
 
-        if (!isset($this->applications[$app])) {
+        if (!isset($this->applications[$app]))
+        {
             return PEAR::raiseError(sprintf(_("'%s' is not configured in the Horde Registry."), $app));
         }
 
@@ -599,7 +670,8 @@ 
      */
     function applicationWebPath($path, $app = null)
     {
-        if (!isset($app)) {
+        if (!isset($app))
+        {
             $app = $this->_currentApp;
         }
 
@@ -628,14 +700,16 @@ 
      */
     function pushApp($app, $checkPerms = true)
     {
-        if ($app == $this->_currentApp) {
+        if ($app == $this->_currentApp)
+        {
             return false;
         }
 
         /* Bail out if application is not present or inactive. */
         if (!isset($this->applications[$app]) ||
             $this->applications[$app]['status'] == 'inactive' ||
-            ($this->applications[$app]['status'] == 'admin' && !Auth::isAdmin())) {
+            ($this->applications[$app]['status'] == 'admin' && !Auth::isAdmin()))
+        {
             Horde::fatal($app . ' is not activated', __FILE__, __LINE__);
         }
 
@@ -646,14 +720,16 @@ 
          *  - To all admins.
          *  - To all authenticated users if no permission is set on $app.
          *  - To anyone who is allowed by an explicit ACL on $app. */
-        if ($checkPerms && !$this->hasPermission($app)) {
+        if ($checkPerms && !$this->hasPermission($app))
+        {
             Horde::logMessage(sprintf('User %s does not have READ permission for %s', Auth::getAuth(), $app), __FILE__, __LINE__, PEAR_LOG_DEBUG);
             return PEAR::raiseError(sprintf(_("User %s is not authorised for %s."), Auth::getAuth(), $this->applications[$app]['name']), 'permission_denied');
         }
 
         /* Import this application's configuration values. */
         $success = $this->importConfig($app);
-        if (is_a($success, 'PEAR_Error')) {
+        if (is_a($success, 'PEAR_Error'))
+        {
             return $success;
         }
 
@@ -665,7 +741,8 @@ 
          * selected in the preferences. */
         $language = '';
         if (isset($this->_prefsCache[$app]) &&
-            isset($this->_prefsCache[$app]->_prefs['language'])) {
+            isset($this->_prefsCache[$app]->_prefs['language']))
+        {
             $language = $this->_prefsCache[$app]->getValue('language');
         }
         NLS::setLang($language);
@@ -697,7 +774,8 @@ 
         /* Import the new active application's configuration values
          * and set the gettext domain and the preferred language. */
         $this->_currentApp = count($this->_appStack) ? end($this->_appStack) : null;
-        if ($this->_currentApp) {
+        if ($this->_currentApp)
+        {
             $this->importConfig($this->_currentApp);
             $this->loadPrefs($this->_currentApp);
             #$language = $GLOBALS['prefs']->getValue('language');
@@ -756,17 +834,21 @@ 
 
         /* Cache config values so that we don't re-read files on every
          * popApp() call. */
-        if (!isset($this->_confCache[$app])) {
-            if (!isset($this->_confCache['horde'])) {
+        if (!isset($this->_confCache[$app]))
+        {
+            if (!isset($this->_confCache['horde']))
+            {
                 $conf = array();
                 ob_start();
                 $success = include HORDE_BASE . '/config/conf.php';
                 $errors = ob_get_contents();
                 ob_end_clean();
-                if (!empty($errors)) {
+                if (!empty($errors))
+                {
                     return PEAR::raiseError(sprintf('Failed to import Horde configuration: %s', strip_tags($errors)));
                 }
-                if (!$success) {
+                if (!$success)
+                {
                     return PEAR::raiseError('Failed to import Horde configuration.');
                 }
 
@@ -781,16 +863,21 @@ 
                 @set_time_limit($conf['max_exec_time']);
 
                 /* Set the umask according to config settings. */
-                if (isset($conf['umask'])) {
+                if (isset($conf['umask']))
+                {
                     umask($conf['umask']);
                 }
-            } else {
+            }
+            else
+            {
                 $conf = $this->_confCache['horde'];
             }
 
-            if ($app !== 'horde') {
+            if ($app !== 'horde')
+            {
                 $success = @include $this->applications[$app]['fileroot'] . '/config/conf.php';
-                if (!$success) {
+                if (!$success)
+                {
                     return PEAR::raiseError('Failed to import application configuration for ' . $app);
                 }
             }
@@ -818,7 +905,8 @@ 
 
         require_once 'Horde/Prefs.php';
 
-        if ($app === null) {
+        if ($app === null)
+        {
             $app = $this->_currentApp;
         }
 
@@ -861,15 +949,21 @@ 
      */
     function unloadPrefs($app = null)
     {
-        if ($app === null) {
+        if ($app === null)
+        {
             $this->_prefsCache = array();
-        } elseif (isset($this->_prefsCache[$app])) {
+        }
+        elseif (isset($this->_prefsCache[$app]))
+        {
             unset($this->_prefsCache[$app]);
-        } else {
+        }
+        else
+        {
             return;
         }
 
-        if ($this->_currentApp) {
+        if ($this->_currentApp)
+        {
             $this->loadPrefs();
         }
     }
@@ -891,23 +985,33 @@ 
      */
     function get($parameter, $app = null)
     {
-        if (is_null($app)) {
+        if (is_null($app))
+        {
             $app = $this->_currentApp;
         }
 
-        if (isset($this->applications[$app][$parameter])) {
+        if (isset($this->applications[$app][$parameter]))
+        {
             $pval = $this->applications[$app][$parameter];
-        } else {
-            if ($parameter == 'icon') {
+        }
+        else
+        {
+            if ($parameter == 'icon')
+            {
                 $pval = $this->_getIcon($app);
-            } else {
+            }
+            else
+            {
                 $pval = isset($this->applications['horde'][$parameter]) ? $this->applications['horde'][$parameter] : null;
             }
         }
 
-        if ($parameter == 'name') {
+        if ($parameter == 'name')
+        {
             return _($pval);
-        } else {
+        }
+        else
+        {
             return $pval;
         }
     }
@@ -926,12 +1030,14 @@ 
      */
     function getImageDir($app = null)
     {
-        if (empty($app)) {
+        if (empty($app))
+        {
             $app = $this->_currentApp;
         }
 
         static $img_dir = array();
-        if (isset($img_dir[$app])) {
+        if (isset($img_dir[$app]))
+        {
             return $img_dir[$app];
         }
 
@@ -943,7 +1049,8 @@ 
         if (isset($GLOBALS['prefs']) && ($theme = $GLOBALS['prefs']->getValue('theme')) &&
             (@include $this->get('themesfs', 'horde') . '/' . $theme . '/info.php') &&
             isset($theme_icons) &&
-            in_array($app, $theme_icons)) {
+            in_array($app, $theme_icons))
+        {
             $img_dir[$app] = $this->get('themesuri', $app) . '/' . $theme . '/graphics';
         }
 
@@ -977,11 +1084,13 @@ 
      */
     function getInitialPage($app = null)
     {
-        if (is_null($app)) {
+        if (is_null($app))
+        {
             $app = $this->_currentApp;
         }
 
-        if (!isset($this->applications[$app])) {
+        if (!isset($this->applications[$app]))
+        {
             return PEAR::raiseError(sprintf(_("'%s' is not configured in the Horde Registry."), $app));
         }
         return $this->applications[$app]['webroot'] . '/' . (isset($this->applications[$app]['initial_page']) ? $this->applications[$app]['initial_page'] : '');
@@ -994,7 +1103,8 @@ 
      */
     function _fillAPICache()
     {
-        if (!empty($this->_apiCache)) {
+        if (!empty($this->_apiCache))
+        {
             return;
         }
 
@@ -1003,19 +1113,26 @@ 
 #            $status[] = 'admin';
 #        }
         $apps = $this->listApps($status);
-        foreach ($apps as $app) {
+        foreach ($apps as $app)
+        {
             $_services = $_types = null;
             $api = $this->get('fileroot', $app) . '/lib/api.php';
-            if (is_readable($api)) {
+            if (is_readable($api))
+            {
                 include_once $api;
             }
-            if (!isset($_services)) {
+            if (!isset($_services))
+            {
                 $this->_apiCache[$app] = array();
-            } else {
+            }
+            else
+            {
                 $this->_apiCache[$app] = $_services;
             }
-            if (isset($_types)) {
-                foreach ($_types as $type => $params) {
+            if (isset($_types))
+            {
+                foreach ($_types as $type => $params)
+                {
                     /* Prefix non-Horde types with the application
                      * name. */
                     $prefix = $app == 'horde' ? '' : "${app}_";