EGroupware / egroupware

api/src/Framework/Extra.php

Spacing +10 added lines, -10 removed lines

@@ -54,12 +54,12 @@ 
 	 * @param string $with =null
 	 * @param string $msg_type =null 'error', 'warning' or 'success' (default)
 	 */
-	public static function refresh_opener($msg, $app, $id=null, $type=null, $targetapp=null, $replace=null, $with=null, $msg_type=null)
+	public static function refresh_opener($msg, $app, $id = null, $type = null, $targetapp = null, $replace = null, $with = null, $msg_type = null)
 	{
 		//error_log(__METHOD__.'('.array2string(func_get_args()).')');
 		self::$extra['refresh-opener'] = func_get_args();
 
-		unset($msg, $app, $id, $type, $targetapp, $replace, $with, $msg_type);	// used only via func_get_args();
+		unset($msg, $app, $id, $type, $targetapp, $replace, $with, $msg_type); // used only via func_get_args();
 	}
 
 	/**
@@ -70,11 +70,11 @@ 
 	 * @param string $msg message to show
 	 * @param string $type ='success' 'error', 'warning' or 'success' (default)
 	 */
-	public static function message($msg, $type='success')
+	public static function message($msg, $type = 'success')
 	{
 		self::$extra['message'] = func_get_args();
 
-		unset($msg, $type);	// used only via func_get_args();
+		unset($msg, $type); // used only via func_get_args();
 	}
 
 	/**
@@ -84,12 +84,12 @@ 
 	 * @param string $target
 	 * @param string $popup
 	 */
-	public static function popup($link, $target='_blank', $popup='640x480')
+	public static function popup($link, $target = '_blank', $popup = '640x480')
 	{
 		// default params are not returned by func_get_args!
-		$args = func_get_args()+array(null, '_blank', '640x480');
+		$args = func_get_args() + array(null, '_blank', '640x480');
 
-		unset($link, $target, $popup);	// used only via func_get_args()
+		unset($link, $target, $popup); // used only via func_get_args()
 
 		if (Json\Request::isJSONRequest())
 		{
@@ -106,7 +106,7 @@ 
 	 *
 	 * @param string $alert_msg ='' optional message to display as alert, before closing the window
 	 */
-	public static function window_close($alert_msg='')
+	public static function window_close($alert_msg = '')
 	{
 		//error_log(__METHOD__."()");
 		self::$extra['window-close'] = $alert_msg ? $alert_msg : true;
@@ -163,12 +163,12 @@ 
 	public static function get_extra()
 	{
 		// adding links of refreshed entry, to give others apps more information about necessity to refresh
-		if (isset(self::$extra['refresh-opener']) && count(self::$extra['refresh-opener']) <= 8 &&	// do not run twice
+		if (isset(self::$extra['refresh-opener']) && count(self::$extra['refresh-opener']) <= 8 && // do not run twice
 			!empty(self::$extra['refresh-opener'][1]) && !empty(self::$extra['refresh-opener'][2]))	// app/id given
 		{
 			$links = Link::get_links(self::$extra['refresh-opener'][1], self::$extra['refresh-opener'][2]);
 			$apps = array();
-			foreach($links as $link)
+			foreach ($links as $link)
 			{
 				$apps[$link['app']][] = $link['id'];
 			}

api/src/Framework/Minimal.php

Spacing +13 added lines, -13 removed lines

@@ -33,9 +33,9 @@ 
 	* @param string $template ='default' name of the template
 	* @return idots_framework
 	*/
-	function __construct($template='default')
+	function __construct($template = 'default')
 	{
-		parent::__construct($template);		// call the constructor of the extended class
+		parent::__construct($template); // call the constructor of the extended class
 	}
 
 	/**
@@ -44,7 +44,7 @@ 
 	* @param array $extra =array() extra attributes passed as data-attribute to egw.js
 	* @return string with html
 	*/
-	function header(array $extra=array())
+	function header(array $extra = array())
 	{
 		// make sure header is output only once
 		if (self::$header_done) return '';
@@ -66,11 +66,11 @@ 
 		// as the old Template class has problems if restored from the session (php-restore)
 		$this->tpl = new Template(EGW_SERVER_ROOT.$this->template_dir, 'keep');
 		$this->tpl->set_file(array('_head' => 'head.tpl'));
-		$this->tpl->set_block('_head','head');
+		$this->tpl->set_block('_head', 'head');
 
 		$this->tpl->set_var($this->_get_header($extra));
 
-		$content .= $this->tpl->fp('out','head');
+		$content .= $this->tpl->fp('out', 'head');
 
 		return $content;
 	}
@@ -93,7 +93,7 @@ 
 	 * @return boolean $consider_navbar_not_yet_called_as_true=true
 	 * @return boolean
 	 */
-	public function isTop($consider_navbar_not_yet_called_as_true=true)
+	public function isTop($consider_navbar_not_yet_called_as_true = true)
 	{
 		unset($consider_navbar_not_yet_called_as_true);
 
@@ -109,7 +109,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	function _add_topmenu_item(array $app_data,$alt_label=null)
+	function _add_topmenu_item(array $app_data, $alt_label = null)
 	{
 		unset($app_data, $alt_label);
 	}
@@ -122,7 +122,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	function _add_topmenu_info_item($content, $id=null)
+	function _add_topmenu_info_item($content, $id = null)
 	{
 		unset($content, $id);
 	}
@@ -134,10 +134,10 @@ 
 	*/
 	function footer()
 	{
-		static $footer_done=0;
-		if ($footer_done++) return;	// prevent multiple footers, not sure we still need this (RalfBecker)
+		static $footer_done = 0;
+		if ($footer_done++) return; // prevent multiple footers, not sure we still need this (RalfBecker)
 
-		return "</body>\n</html>\n";	// close body and html tag, eg. for popups
+		return "</body>\n</html>\n"; // close body and html tag, eg. for popups
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	* @param array $file
 	* @param string $type =null 'admin', 'preferences', 'favorites', ...
 	*/
-	function sidebox($appname,$menu_title,$file,$type=null)
+	function sidebox($appname, $menu_title, $file, $type = null)
 	{
 		unset($appname, $menu_title, $file, $type);
 	}
@@ -164,7 +164,7 @@ 
 	* @access public
 	* @return void
 	*/
-	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
+	function topmenu_info_icon($id, $icon_src, $iconlink, $blink = false, $tooltip = null)
 	{
 		unset($id, $icon_src, $iconlink, $blink, $tooltip);
 	}

api/src/Ldap/ServerInfo.php

Spacing +19 added lines, -19 removed lines

@@ -146,7 +146,7 @@ 
 	*/
 	function supportsObjectClass($_objectClass)
 	{
-		if($this->supportedObjectClasses[strtolower($_objectClass)])
+		if ($this->supportedObjectClasses[strtolower($_objectClass)])
 		{
 			return true;
 		}
@@ -161,21 +161,21 @@ 
 	 * @param int $version 2 or 3
 	 * @return ldapserverinfo
 	 */
-	public static function get($ds, $host, $version=3)
+	public static function get($ds, $host, $version = 3)
 	{
-		$filter='(objectclass=*)';
-		$justthese = array('structuralObjectClass','namingContexts','supportedLDAPVersion','subschemaSubentry','vendorname');
-		if(($sr = @ldap_read($ds, '', $filter, $justthese)))
+		$filter = '(objectclass=*)';
+		$justthese = array('structuralObjectClass', 'namingContexts', 'supportedLDAPVersion', 'subschemaSubentry', 'vendorname');
+		if (($sr = @ldap_read($ds, '', $filter, $justthese)))
 		{
-			if(($info = ldap_get_entries($ds, $sr)))
+			if (($info = ldap_get_entries($ds, $sr)))
 			{
 				$ldapServerInfo = new ServerInfo($host);
 				$ldapServerInfo->setVersion($version);
 
 				// check for naming contexts
-				if($info[0]['namingcontexts'])
+				if ($info[0]['namingcontexts'])
 				{
-					for($i=0; $i<$info[0]['namingcontexts']['count']; $i++)
+					for ($i = 0; $i < $info[0]['namingcontexts']['count']; $i++)
 					{
 						$namingcontexts[] = $info[0]['namingcontexts'][$i];
 					}
@@ -183,9 +183,9 @@ 
 				}
 
 				// check for ldap server type
-				if($info[0]['structuralobjectclass'])
+				if ($info[0]['structuralobjectclass'])
 				{
-					switch($info[0]['structuralobjectclass'][0])
+					switch ($info[0]['structuralobjectclass'][0])
 					{
 						case 'OpenLDAProotDSE':
 							$ldapServerType = OPENLDAP_LDAPSERVER;
@@ -202,30 +202,30 @@ 
 				}
 
 				// check for subschema entry dn
-				if($info[0]['subschemasubentry'])
+				if ($info[0]['subschemasubentry'])
 				{
 					$subschemasubentry = $info[0]['subschemasubentry'][0];
 					$ldapServerInfo->setSubSchemaEntry($subschemasubentry);
 				}
 
 				// create list of supported objetclasses
-				if(!empty($subschemasubentry))
+				if (!empty($subschemasubentry))
 				{
-					$filter='(objectclass=*)';
+					$filter = '(objectclass=*)';
 					$justthese = array('objectClasses');
 
-					if(($sr = ldap_read($ds, $subschemasubentry, $filter, $justthese)))
+					if (($sr = ldap_read($ds, $subschemasubentry, $filter, $justthese)))
 					{
-						if(($info = ldap_get_entries($ds, $sr)))
+						if (($info = ldap_get_entries($ds, $sr)))
 						{
-							if($info[0]['objectclasses']) {
-								for($i=0; $i<$info[0]['objectclasses']['count']; $i++)
+							if ($info[0]['objectclasses']) {
+								for ($i = 0; $i < $info[0]['objectclasses']['count']; $i++)
 								{
 									$matches = null;
-									if(preg_match('/^\( (.*) NAME \'(\w*)\' /', $info[0]['objectclasses'][$i], $matches))
+									if (preg_match('/^\( (.*) NAME \'(\w*)\' /', $info[0]['objectclasses'][$i], $matches))
 									{
 										#_debug_array($matches);
-										if(count($matches) == 3)
+										if (count($matches) == 3)
 										{
 											$supportedObjectClasses[$matches[1]] = strtolower($matches[2]);
 										}

api/src/Json/Push.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	{
 		if (!isset(self::$backend))
 		{
-			foreach(self::$backends as $class)
+			foreach (self::$backends as $class)
 			{
 				if (class_exists($class))
 				{

api/src/Json/Msg.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 	 * @param string $function name of the global (window) javascript function to call
 	 * @param array $parameters =array()
 	 */
-	public function apply($function,array $parameters=array())
+	public function apply($function, array $parameters = array())
 	{
 		if (is_string($function))
 		{
@@ -88,7 +88,7 @@ 
 	public function call($function)
 	{
 		$parameters = func_get_args();
-		array_shift($parameters);	// shift off $function
+		array_shift($parameters); // shift off $function
 
 		if (is_string($function))
 		{
@@ -110,7 +110,7 @@ 
 	 * @param string $method name of the jquery to call
 	 * @param array $parameters =array()
 	 */
-	public function jquery($selector,$method,array $parameters=array())
+	public function jquery($selector, $method, array $parameters = array())
 	{
 		if (is_string($selector) && is_string($method))
 		{
@@ -169,7 +169,7 @@ 
 	 * @param string $app =null default current app from flags
 	 * or only the current application
 	 */
-	public function redirect($url, $global = false, $app=null)
+	public function redirect($url, $global = false, $app = null)
 	{
 		if (is_string($url) && is_bool($global))
 		{

api/src/Json/Request.php

Spacing +16 added lines, -16 removed lines

@@ -39,7 +39,7 @@ 
 	 * @param boolean $set =null
 	 * @return boolean
 	 */
-	public static function isJSONRequest($set=null)
+	public static function isJSONRequest($set = null)
 	{
 		$ret = self::$_hadJSONRequest;
 		if (isset($set)) self::$_hadJSONRequest = $set;
@@ -62,11 +62,11 @@ 
 
 		if (get_magic_quotes_gpc()) $input_data = stripslashes($input_data);
 
-		$json_data = json_decode($input_data,true);
+		$json_data = json_decode($input_data, true);
 		if (is_array($json_data) && isset($json_data['request']) && isset($json_data['request']['parameters']) && is_array($json_data['request']['parameters']))
 		{
 			//error_log(__METHOD__.__LINE__.array2string($json_data['request']).function_backtrace());
-			$parameters =& $json_data['request']['parameters'];
+			$parameters = & $json_data['request']['parameters'];
 		}
 		else
 		{
@@ -77,14 +77,14 @@ 
 		{
 			$responses = array();
 			$response = Response::get();
-			foreach($parameters[0] as $uid => $data)
+			foreach ($parameters[0] as $uid => $data)
 			{
 				//error_log("$uid: menuaction=$data[menuaction], parameters=".array2string($data['parameters']));
 				$this->handleRequest($data['menuaction'], (array)$data['parameters']);
 				$responses[$uid] = $response->initResponseArray();
 				//error_log("responses[$uid]=".array2string($responses[$uid]));
 			}
-			$response->data($responses);	// send all responses as data
+			$response->data($responses); // send all responses as data
 		}
 		else
 		{
@@ -100,32 +100,32 @@ 
 	 */
 	public function handleRequest($menuaction, array $parameters)
 	{
-		if (strpos($menuaction,'::') !== false && strpos($menuaction,'.') === false)	// static method name app_something::method
+		if (strpos($menuaction, '::') !== false && strpos($menuaction, '.') === false)	// static method name app_something::method
 		{
-			@list($className,$functionName,$handler) = explode('::',$menuaction);
+			@list($className, $functionName, $handler) = explode('::', $menuaction);
 			if (substr($className, 0, 11) == 'EGroupware\\')
 			{
 				list(,$appName) = explode('\\', strtolower($className));
 			}
 			else
 			{
-				list($appName) = explode('_',$className);
+				list($appName) = explode('_', $className);
 			}
 
 			// Check for a real static method, avoid instanciation if it is
 			$m = new ReflectionMethod($menuaction);
-			if($m->isStatic())
+			if ($m->isStatic())
 			{
 				$ajaxClass = $className;
 			}
 		}
 		else
 		{
-			@list($appName, $className, $functionName, $handler) = explode('.',$menuaction);
+			@list($appName, $className, $functionName, $handler) = explode('.', $menuaction);
 		}
 		//error_log("json.php: appName=$appName, className=$className, functionName=$functionName, handler=$handler");
 
-		switch($handler)
+		switch ($handler)
 		{
 			case '/etemplate/process_exec':
 				$_GET['menuaction'] = $appName.'.'.$className.'.'.$functionName;
@@ -151,15 +151,15 @@ 
 				break;
 		}
 
-		if(substr($className,0,4) != 'ajax' && substr($className,-4) != 'ajax' &&
-			$menuaction != 'etemplate.etemplate.process_exec' && substr($functionName,0,4) != 'ajax' ||
-			!preg_match('/^[A-Za-z0-9_\\\\-]+(\.[A-Za-z0-9_\\\\]+\.|::)[A-Za-z0-9_]+$/',$menuaction))
+		if (substr($className, 0, 4) != 'ajax' && substr($className, -4) != 'ajax' &&
+			$menuaction != 'etemplate.etemplate.process_exec' && substr($functionName, 0, 4) != 'ajax' ||
+			!preg_match('/^[A-Za-z0-9_\\\\-]+(\.[A-Za-z0-9_\\\\]+\.|::)[A-Za-z0-9_]+$/', $menuaction))
 		{
 			// stopped for security reasons
 			error_log("className='$className', functionName='$functionName', menuaction='$menuaction'");
-			error_log($_SERVER['PHP_SELF']. ' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
+			error_log($_SERVER['PHP_SELF'].' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
 			// send message also to the user
-			throw new Exception\InvalidName($_SERVER['PHP_SELF']. ' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
+			throw new Exception\InvalidName($_SERVER['PHP_SELF'].' stopped for security reason. '.$menuaction.' is not valid. class- or function-name must start with ajax!!!');
 		}
 
 		if (isset($template))

api/src/Json/Tail.php

Spacing +18 added lines, -18 removed lines

@@ -68,15 +68,15 @@ 
 	 *
 	 * @param string $filename =null if not starting with as slash relative to EGw files dir (this is strongly prefered for security reasons)
 	 */
-	public function __construct($filename=null)
+	public function __construct($filename = null)
 	{
-		$this->filenames =& Api\Cache::getSession('phpgwapi', __CLASS__);
+		$this->filenames = & Api\Cache::getSession('phpgwapi', __CLASS__);
 
 		if ($filename)
 		{
 			$this->filename = $filename;
 
-			if (!$this->filenames || !in_array($filename,$this->filenames)) $this->filenames[] = $filename;
+			if (!$this->filenames || !in_array($filename, $this->filenames)) $this->filenames[] = $filename;
 		}
 	}
 
@@ -87,9 +87,9 @@ 
 	 * @param int $start =0 last position in log-file
 	 * @throws Api\Exception\WrongParameter
 	 */
-	public function ajax_chunk($filename,$start=0)
+	public function ajax_chunk($filename, $start = 0)
 	{
-		if (!in_array($filename,$this->filenames))
+		if (!in_array($filename, $this->filenames))
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to view '$filename'!");
 		}
@@ -98,9 +98,9 @@ 
 		if (file_exists($filename))
 		{
 			$size = filesize($filename);
-			if (!$start || $start < 0 || $start > $size || $size-$start > 4*self::MAX_CHUNK_SIZE)
+			if (!$start || $start < 0 || $start > $size || $size - $start > 4 * self::MAX_CHUNK_SIZE)
 			{
-				$start = $size - 4*self::MAX_CHUNK_SIZE;
+				$start = $size - 4 * self::MAX_CHUNK_SIZE;
 				if ($start < 0) $start = 0;
 			}
 			$hsize = Api\Vfs::hsize($size);
@@ -131,9 +131,9 @@ 
 	 * @param boolean $truncate =false true: truncate file, false: delete file
 	 * @throws Api\Exception\WrongParameter
 	 */
-	public function ajax_delete($filename,$truncate=false)
+	public function ajax_delete($filename, $truncate = false)
 	{
-		if (!in_array($filename,$this->filenames))
+		if (!in_array($filename, $this->filenames))
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to view '$filename'!");
 		}
@@ -155,7 +155,7 @@ 
 	 * @return string
 	 * @throws Api\Exception\WrongParameter
 	 */
-	public function show($header=null)
+	public function show($header = null)
 	{
 		if (!isset($this->filename))
 		{
@@ -167,11 +167,11 @@ 
 <p style="float: left; margin: 5px"><b>'.htmlspecialchars($header).'</b></p>
 <div style="float: right; margin: 2px; margin-right: 5px">
 	'.Api\Html::form(
-		Api\Html::input('clear_log',lang('Clear window'),'button','id="clear_log"')."\n".
-		Api\Html::input('delete_log',lang('Delete file'),'button','id="purge_log"')."\n".
-		Api\Html::input('empty_log',lang('Empty file'),'button','id="empty_log"')."\n".
-		Api\Html::input('download_log',lang('Download'),'submit','id="download_log"'),
-		'','/index.php',array(
+		Api\Html::input('clear_log', lang('Clear window'), 'button', 'id="clear_log"')."\n".
+		Api\Html::input('delete_log', lang('Delete file'), 'button', 'id="purge_log"')."\n".
+		Api\Html::input('empty_log', lang('Empty file'), 'button', 'id="empty_log"')."\n".
+		Api\Html::input('download_log', lang('Download'), 'submit', 'id="download_log"'),
+		'', '/index.php', array(
 		'menuaction' => 'api.'.__CLASS__.'.download',
 		'filename' => $this->filename,
 	)).'
@@ -187,15 +187,15 @@ 
 	public function download()
 	{
 		$filename = $_GET['filename'];
-		if (!in_array($filename,$this->filenames))
+		if (!in_array($filename, $this->filenames))
 		{
 			throw new Api\Exception\WrongParameter("Not allowed to download '$filename'!");
 		}
 		Api\Header\Content::type(basename($filename), 'text/plain');
 		if ($filename[0] != '/') $filename = $GLOBALS['egw_info']['server']['files_dir'].'/'.$filename;
-		for($n=ob_get_level(); $n > 0; --$n)
+		for ($n = ob_get_level(); $n > 0; --$n)
 		{
-			ob_end_clean();	// stop all output buffering, to NOT run into memory_limit
+			ob_end_clean(); // stop all output buffering, to NOT run into memory_limit
 		}
 		readfile($filename);
 		exit;

api/src/CalDAV/PropfindIterator.php

Spacing +7 added lines, -7 removed lines

@@ -71,7 +71,7 @@ 
 	 *
 	 * @var int
 	 */
-	protected $start=0;
+	protected $start = 0;
 
 	/**
 	 * Number of entries queried from callback in one call
@@ -95,7 +95,7 @@ 
 	 * @param array $filter filter for propfind call
 	 * @param array $files =array() extra files/responses to return too
 	 */
-	public function __construct(Handler $handler, $path, array $filter,array &$files=array())
+	public function __construct(Handler $handler, $path, array $filter, array &$files = array())
 	{
 		if ($this->debug) error_log(__METHOD__."('$path', ".array2string($filter).",)");
 		$this->path    = $path;
@@ -126,7 +126,7 @@ 
 		$current = current($this->files);
 
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string($current['path']));
-		return $current['path'];	// we return path as key
+		return $current['path']; // we return path as key
 	}
 
 	/**
@@ -146,11 +146,11 @@ 
 			return false;
 		}
 		// try query further files via propfind callback of handler and store result in $this->files
-		$this->files = $this->handler->propfind_callback($this->path,$this->filter,array($this->start,self::CHUNK_SIZE));
+		$this->files = $this->handler->propfind_callback($this->path, $this->filter, array($this->start, self::CHUNK_SIZE));
 		if (!is_array($this->files) || !($entries = count($this->files)))
 		{
 			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
-			return false;	// no further entries
+			return false; // no further entries
 		}
 		$this->start += self::CHUNK_SIZE;
 		reset($this->files);
@@ -169,7 +169,7 @@ 
 
 		$this->start = 0;
 		$this->files = $this->common_files;
-		if (!$this->files) $this->next();	// otherwise valid will return false and nothing get returned
+		if (!$this->files) $this->next(); // otherwise valid will return false and nothing get returned
 		reset($this->files);
 	}
 
@@ -178,7 +178,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
 		return current($this->files) !== false;

api/src/CalDAV/IcalIterator.php

Spacing +22 added lines, -22 removed lines

@@ -106,7 +106,7 @@ 
 	 * @param array $callback_params =array() further parameters for the callback, 1. parameter is component
 	 * @param boolean $add_container =false true, add container / $this as last parameter to callback
 	 */
-	public function __construct($ical_file,$base='VCALENDAR',$charset=null,$callback=null,array $callback_params=array(), $add_container=false)
+	public function __construct($ical_file, $base = 'VCALENDAR', $charset = null, $callback = null, array $callback_params = array(), $add_container = false)
 	{
 		// call parent constructor
 		parent::__construct();
@@ -131,7 +131,7 @@ 
 		}
 		if (!is_resource($this->ical_file))
 		{
-			throw new Api\Exception\WrongParameter(__METHOD__.'($ical_file, ...) NO resource! $ical_file='.substr(array2string($ical_file),0,100));
+			throw new Api\Exception\WrongParameter(__METHOD__.'($ical_file, ...) NO resource! $ical_file='.substr(array2string($ical_file), 0, 100));
 		}
 	}
 
@@ -155,7 +155,7 @@ 
 		{
 			$line = array_shift($this->unread_lines);
 		}
-		elseif(feof($this->ical_file))
+		elseif (feof($this->ical_file))
 		{
 			$line = false;
 		}
@@ -164,9 +164,9 @@ 
 			$line = fgets($this->ical_file);
 		}
 		// check if end of container reached
-		if ($this->container && $line && substr($line,0,4+strlen($this->base)) === 'END:'.$this->base)
+		if ($this->container && $line && substr($line, 0, 4 + strlen($this->base)) === 'END:'.$this->base)
 		{
-			$this->unread_line($line);	// put back end-of-container, to continue to return false
+			$this->unread_line($line); // put back end-of-container, to continue to return false
 			$line = false;
 		}
 		//error_log(__METHOD__."() returning ".($line === false ? 'FALSE' : "'$line'"));
@@ -182,7 +182,7 @@ 
 	protected function unread_line($line)
 	{
 		//error_log(__METHOD__."('$line')");
-		array_unshift($this->unread_lines,$line);
+		array_unshift($this->unread_lines, $line);
 	}
 
 	/**
@@ -195,14 +195,14 @@ 
 		//error_log(__METHOD__."() returning a ".gettype($this->component));
 		if ($this->callback)
 		{
-			$ret = is_a($this->component,'Horde_Icalendar');
+			$ret = is_a($this->component, 'Horde_Icalendar');
 			do {
 				if ($ret === false) $this->next();
-				if (!is_a($this->component,'Horde_Icalendar')) return false;
+				if (!is_a($this->component, 'Horde_Icalendar')) return false;
 				$params = $this->callback_params;
-				array_unshift($params,$this->component);
+				array_unshift($params, $this->component);
 			}
-			while(($ret = call_user_func_array($this->callback,$params)) === false);
+			while (($ret = call_user_func_array($this->callback, $params)) === false);
 
 			return $ret;
 		}
@@ -227,7 +227,7 @@ 
 	{
 		unset($this->component);
 
-		while (($line = $this->read_line()) && substr($line,0,6) !== 'BEGIN:')
+		while (($line = $this->read_line()) && substr($line, 0, 6) !== 'BEGIN:')
 		{
 			// ignore it
 		}
@@ -236,12 +236,12 @@ 
 			$this->component = false;
 			return;
 		}
-		$type = substr(trim($line),6);
+		$type = substr(trim($line), 6);
 
 		//error_log(__METHOD__."() found $type component");
 
 		$data = $line;
-		while (($line = $this->read_line()) && substr($line,0,4+strlen($type)) !== 'END:'.$type)
+		while (($line = $this->read_line()) && substr($line, 0, 4 + strlen($type)) !== 'END:'.$type)
 		{
 			$data .= $line;
 		}
@@ -276,23 +276,23 @@ 
 	 */
 	public function rewind()
 	{
-		@fseek($this->ical_file,0,SEEK_SET);
+		@fseek($this->ical_file, 0, SEEK_SET);
 
 		// advance to begin of container
-		while(($line = $this->read_line()) && substr($line,0,6+strlen($this->base)) !== 'BEGIN:'.$this->base)
+		while (($line = $this->read_line()) && substr($line, 0, 6 + strlen($this->base)) !== 'BEGIN:'.$this->base)
 		{
 
 		}
 		// if no container start found --> use whole file (rewind) and set container marker
 		if (!($this->container = $line !== false))
 		{
-			fseek($this->ical_file,0,SEEK_SET);
+			fseek($this->ical_file, 0, SEEK_SET);
 		}
 		//error_log(__METHOD__."() $this->base container ".($this->container ? 'found' : 'NOT found'));
 
 		$data = $line;
 		// advance to first component
-		while (($line = $this->read_line()) && substr($line,0,6) !== 'BEGIN:')
+		while (($line = $this->read_line()) && substr($line, 0, 6) !== 'BEGIN:')
 		{
 			$matches = null;
 			if (preg_match('/^VERSION:(\d\.\d)\s*$/ism', $line, $matches))
@@ -307,7 +307,7 @@ 
 		{
 			$data .= "END:$this->base\n";
 			//error_log(__METHOD__."() about to call this->parsevCalendar('$data','$this->base','$this->charset')");
-			$this->parsevCalendar($data,$this->base,$this->charset);
+			$this->parsevCalendar($data, $this->base, $this->charset);
 		}
 		if ($line) $this->unread_line($line);
 
@@ -320,10 +320,10 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		//error_log(__METHOD__."() returning ".(is_a($this->component,'Horde_Icalendar') ? 'TRUE' : 'FALSE').' get_class($this->component)='.get_class($this->component));
-		return is_a($this->component,'Horde_Icalendar');
+		return is_a($this->component, 'Horde_Icalendar');
 	}
 }
 
@@ -441,8 +441,8 @@ 
 	if (!is_resource($ical_file)) echo "<pre>$ical_file</pre>\n";
 	//$calendar_ical = new calendar_ical();
 	//$calendar_ical->setSupportedFields('file');
-	$ical_it = new IcalIterator($ical_file);//,'VCALENDAR','iso-8859-1',array($calendar_ical,'_ical2egw_callback'),array('Europe/Berlin'));
-	foreach($ical_it as $uid => $vevent)
+	$ical_it = new IcalIterator($ical_file); //,'VCALENDAR','iso-8859-1',array($calendar_ical,'_ical2egw_callback'),array('Europe/Berlin'));
+	foreach ($ical_it as $uid => $vevent)
 	{
 		echo "$uid<pre>".print_r($vevent->toHash(), true)."</pre>\n";
 	}