EGroupware / egroupware

calendar/inc/class.calendar_ical.inc.php

Spacing +269 added lines, -270 removed lines

@@ -64,39 +64,39 @@ 
 	 * @var array $priority_egw2ical conversion of the priority egw => ical
 	 */
 	var $priority_egw2ical = array(
-		0 => 0,		// undefined
-		1 => 9,		// low
-		2 => 5,		// normal
-		3 => 1,		// high
+		0 => 0, // undefined
+		1 => 9, // low
+		2 => 5, // normal
+		3 => 1, // high
 	);
 
 	/**
 	 * @var array $priority_ical2egw conversion of the priority ical => egw
 	 */
 	var $priority_ical2egw = array(
-		0 => 0,		// undefined
-		9 => 1,	8 => 1, 7 => 1, 6 => 1,	// low
-		5 => 2,		// normal
-		4 => 3, 3 => 3, 2 => 3, 1 => 3,	// high
+		0 => 0, // undefined
+		9 => 1, 8 => 1, 7 => 1, 6 => 1, // low
+		5 => 2, // normal
+		4 => 3, 3 => 3, 2 => 3, 1 => 3, // high
 	);
 
 	/**
 	 * @var array $priority_egw2funambol conversion of the priority egw => funambol
 	 */
 	var $priority_egw2funambol = array(
-		0 => 1,		// undefined (mapped to normal since undefined does not exist)
-		1 => 0,		// low
-		2 => 1,		// normal
-		3 => 2,		// high
+		0 => 1, // undefined (mapped to normal since undefined does not exist)
+		1 => 0, // low
+		2 => 1, // normal
+		3 => 2, // high
 	);
 
 	/**
 	 * @var array $priority_funambol2egw conversion of the priority funambol => egw
 	 */
 	var $priority_funambol2egw = array(
-		0 => 1,		// low
-		1 => 2,		// normal
-		2 => 3,		// high
+		0 => 1, // low
+		1 => 2, // normal
+		2 => 3, // high
 	);
 
 	/**
@@ -166,7 +166,7 @@ 
 	 * @var boolean
 	 */
 	var $log = false;
-	var $logfile="/tmp/log-vcal";
+	var $logfile = "/tmp/log-vcal";
 
 	/**
 	 * Conflict callback
@@ -203,7 +203,7 @@ 
 	 * @param int|string $current_user =0 uid of current user to only export that one as participant for method=REPLY
 	 * @return string|boolean string with iCal or false on error (e.g. no permission to read the event)
 	 */
-	function &exportVCal($events, $version='1.0', $method='PUBLISH', $recur_date=0, $principalURL='', $charset='UTF-8', $current_user=0)
+	function &exportVCal($events, $version = '1.0', $method = 'PUBLISH', $recur_date = 0, $principalURL = '', $charset = 'UTF-8', $current_user = 0)
 	{
 		if ($this->log)
 		{
@@ -234,13 +234,13 @@ 
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
 
-		if ($this->productManufacturer == '' )
+		if ($this->productManufacturer == '')
 		{	// syncevolution is broken
 			$version = '2.0';
 		}
 
 		$vcal = new Horde_Icalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 		$vcal->setAttribute('VERSION', $version);
 		if ($method) $vcal->setAttribute('METHOD', $method);
@@ -270,15 +270,15 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								'() User does not have the permission to read event ' . $event['id']. "\n",
-								3,$this->logfile);
+								'() User does not have the permission to read event '.$event['id']."\n",
+								3, $this->logfile);
 						}
 						return -1; // Permission denied
 					}
 				}
 				else
 				{
-					$retval = false;  // Entry does not exist
+					$retval = false; // Entry does not exist
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
@@ -292,7 +292,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'() export event UID: ' . $event['uid'] . ".\n",
+					'() export event UID: '.$event['uid'].".\n",
 					3, $this->logfile);
 			}
 
@@ -317,8 +317,8 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'(' . $event['id']. ',' . $recurrence . ")\n" .
-					array2string($event)."\n",3,$this->logfile);
+					'('.$event['id'].','.$recurrence.")\n".
+					array2string($event)."\n", 3, $this->logfile);
 			}
 
 			if ($recurrence)
@@ -339,7 +339,7 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 								"(, $recurrence) Gratuitous pseudo exception, skipped ...\n",
-								3,$this->logfile);
+								3, $this->logfile);
 						}
 						continue; // unsupported status only exception
 					}
@@ -349,13 +349,13 @@ 
 					$days = $this->so->get_recurrence_exceptions($master, $tzid, 0, 0, 'rrule');
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-							array2string($days)."\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+							array2string($days)."\n", 3, $this->logfile);
 					}
 					$recurrence = $days[$recurrence]; // use remote representation
 				}
 				// force single event
-				foreach (array('recur_enddate','recur_interval','recur_exception','recur_data','recur_date','id','etag') as $name)
+				foreach (array('recur_enddate', 'recur_interval', 'recur_exception', 'recur_data', 'recur_date', 'id', 'etag') as $name)
 				{
 					unset($event[$name]);
 				}
@@ -363,7 +363,7 @@ 
 			}
 
 			// check if tzid of event (not only recuring ones) is already added to export
-			if ($tzid && $tzid != 'UTC' && !in_array($tzid,$vtimezones_added))
+			if ($tzid && $tzid != 'UTC' && !in_array($tzid, $vtimezones_added))
 			{
 				// check if we have vtimezone component data for tzid of event, if not default to user timezone (default to server tz)
 				if (calendar_timezones::add_vtimezone($vcal, $tzid) ||
@@ -381,7 +381,7 @@ 
 			{
 				// Append UID to DESCRIPTION
 				if (!preg_match('/\[UID:.+\]/m', $event['description'])) {
-					$event['description'] .= "\n[UID:" . $event['uid'] . "]";
+					$event['description'] .= "\n[UID:".$event['uid']."]";
 				}
 			}
 
@@ -402,14 +402,14 @@ 
 				$exceptions = array();
 
 				// dont use "virtual" exceptions created by participant status for GroupDAV or file export
-				if (!in_array($this->productManufacturer,array('file','groupdav')))
+				if (!in_array($this->productManufacturer, array('file', 'groupdav')))
 				{
 					$filter = isset($this->supportedFields['participants']) ? 'rrule' : 'tz_rrule';
 					$exceptions = $this->so->get_recurrence_exceptions($event, $tzid, 0, 0, $filter);
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n" .
-							array2string($exceptions)."\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n".
+							array2string($exceptions)."\n", 3, $this->logfile);
 					}
 				}
 				elseif (is_array($event['recur_exception']))
@@ -426,8 +426,8 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							'(' . $event['id'] . ") [$icalFieldName] not supported\n",
-							3,$this->logfile);
+							'('.$event['id'].") [$icalFieldName] not supported\n",
+							3, $this->logfile);
 					}
 					continue;
 				}
@@ -444,23 +444,23 @@ 
 
 							if (!($info = $this->resource_info($uid))) continue;
 
-							if (in_array($status, array('X','E'))) continue;	// dont include deleted participants
+							if (in_array($status, array('X', 'E'))) continue; // dont include deleted participants
 
 							if ($this->log)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									'()attendee:' . array2string($info) ."\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									'()attendee:'.array2string($info)."\n", 3, $this->logfile);
 							}
 							$participantCN = str_replace(array('\\', ',', ';', ':'),
 												array('\\\\', '\\,', '\\;', '\\:'),
 												trim(empty($info['cn']) ? $info['name'] : $info['cn']));
 							if ($version == '1.0')
 							{
-								$participantURL = trim('"' . $participantCN . '"' . (empty($info['email']) ? '' : ' <' . $info['email'] .'>'));
+								$participantURL = trim('"'.$participantCN.'"'.(empty($info['email']) ? '' : ' <'.$info['email'].'>'));
 							}
 							else
 							{
-								$participantURL = empty($info['email']) ? '' : 'mailto:' . $info['email'];
+								$participantURL = empty($info['email']) ? '' : 'mailto:'.$info['email'];
 							}
 							// RSVP={TRUE|FALSE}	// resonse expected, not set in eGW => status=U
 							$rsvp = $status == 'U' ? 'TRUE' : 'FALSE';
@@ -488,7 +488,7 @@ 
 										($members = $GLOBALS['egw']->accounts->members($uid, true)) && in_array($this->user, $members))
 									{
 										$user = $this->resource_info($this->user);
-										$attributes['ATTENDEE'][] = 'mailto:' . $user['email'];
+										$attributes['ATTENDEE'][] = 'mailto:'.$user['email'];
 			    						$parameters['ATTENDEE'][] = array(
 			    							'CN'		=>	$user['name'],
 			    							'ROLE'		=> 'REQ-PARTICIPANT',
@@ -530,7 +530,7 @@ 
 							if (!empty($rsvp)) $options['RSVP'] = $rsvp;
 							if (!empty($info['email']) && $participantURL != 'mailto:'.$info['email'])
 							{
-								$options['EMAIL'] = $info['email'];	// only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
+								$options['EMAIL'] = $info['email']; // only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
 							}
 							if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = (string)$uid;
 							if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
@@ -540,7 +540,7 @@ 
 						break;
 
 					case 'CLASS':
-						if ($event['public']) continue;	// public is default, no need to export, fails CalDAVTester if added as default
+						if ($event['public']) continue; // public is default, no need to export, fails CalDAVTester if added as default
 						$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE';
 						// Apple iCal on OS X uses X-CALENDARSERVER-ACCESS: CONFIDENTIAL on VCALANDAR (not VEVENT!)
 						if (!$event['public'] && $this->productManufacturer == 'groupdav')
@@ -552,16 +552,16 @@ 
     				case 'ORGANIZER':
 	    				if (!$organizerURL)
 	    				{
-	    					$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
-			    				. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
-			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
+	    					$organizerCN = '"'.trim($GLOBALS['egw']->accounts->id2name($event['owner'], 'account_firstname')
+			    				. ' '.$GLOBALS['egw']->accounts->id2name($event['owner'], 'account_lastname')).'"';
+			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email');
 			    			if ($version == '1.0')
 			    			{
-		    					$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
+		    					$organizerURL = trim($organizerCN.(empty($organizerURL) ? '' : ' <'.$organizerURL.'>'));
 			    			}
 			    			else
 			    			{
-		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
+		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:'.$organizerEMail;
 			    			}
 			    			$organizerUID = $event['owner'];
 		    				if (!isset($event['participants'][$event['owner']]))
@@ -594,7 +594,7 @@ 
 					case 'DTSTART':
 						if (empty($event['whole_day']))
 						{
-							$attributes['DTSTART'] = self::getDateTime($event['start'],$tzid,$parameters['DTSTART']);
+							$attributes['DTSTART'] = self::getDateTime($event['start'], $tzid, $parameters['DTSTART']);
 						}
 						break;
 
@@ -605,27 +605,27 @@ 
 							if ($tzid == 'UTC' && $event['end'] - $event['start'] <= 86400)
 								$attributes['duration'] = $event['end'] - $event['start'];
 							else
-								$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
+								$attributes['DTEND'] = self::getDateTime($event['end'], $tzid, $parameters['DTEND']);
 						}
 						else
 						{
 							// write start + end of whole day events as dates
-							$event['end-nextday'] = $event['end'] + 12*3600;	// we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
-							foreach (array('start' => 'DTSTART','end-nextday' => 'DTEND') as $f => $t)
+							$event['end-nextday'] = $event['end'] + 12 * 3600; // we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
+							foreach (array('start' => 'DTSTART', 'end-nextday' => 'DTEND') as $f => $t)
 							{
-								$time = new Api\DateTime($event[$f],Api\DateTime::$server_timezone);
-								$arr = Api\DateTime::to($time,'array');
-								$vevent->setAttribute($t, array('year' => $arr['year'],'month' => $arr['month'],'mday' => $arr['day']),
+								$time = new Api\DateTime($event[$f], Api\DateTime::$server_timezone);
+								$arr = Api\DateTime::to($time, 'array');
+								$vevent->setAttribute($t, array('year' => $arr['year'], 'month' => $arr['month'], 'mday' => $arr['day']),
 									array('VALUE' => 'DATE'));
 							}
 							unset($attributes['DTSTART']);
 							// Outlook does NOT care about type of DTSTART/END, only setting X-MICROSOFT-CDO-ALLDAYEVENT is used to determine an event is a whole-day event
-							$vevent->setAttribute('X-MICROSOFT-CDO-ALLDAYEVENT','TRUE');
+							$vevent->setAttribute('X-MICROSOFT-CDO-ALLDAYEVENT', 'TRUE');
 						}
 						break;
 
 					case 'RRULE':
-						if ($event['recur_type'] == MCAL_RECUR_NONE) break;		// no recuring event
+						if ($event['recur_type'] == MCAL_RECUR_NONE) break; // no recuring event
 						$rriter = calendar_rrule::event2rrule($event, false, $tzid);
 						$rrule = $rriter->generate_rrule($version);
 						if ($event['recur_enddate'])
@@ -652,16 +652,16 @@ 
 						{
 							if ($event['recur_enddate'] && $tzid)
 							{
-								$rrule['UNTIL'] = self::getDateTime($rrule['UNTIL'],$tzid);
+								$rrule['UNTIL'] = self::getDateTime($rrule['UNTIL'], $tzid);
 							}
 							$attributes['RRULE'] = $rrule['FREQ'].' '.$rrule['UNTIL'];
 						}
 						else // $version == '2.0'
 						{
 							$attributes['RRULE'] = '';
-							foreach($rrule as $n => $v)
+							foreach ($rrule as $n => $v)
 							{
-								$attributes['RRULE'] .= ($attributes['RRULE']?';':'').$n.'='.$v;
+								$attributes['RRULE'] .= ($attributes['RRULE'] ? ';' : '').$n.'='.$v;
 							}
 						}
 						break;
@@ -676,7 +676,7 @@ 
 								{
 									// current Horde_Icalendar 2.1.4 exports EXDATE always in UTC, so we should not set a timezone here
 									// Apple calendar on OS X 10.11.4 uses a timezone, so does Horde eg. for Recurrence-ID
-									$event['recur_exception'][$key] = self::getDateTime($timestamp,$tzid);//,$parameters['EXDATE']);
+									$event['recur_exception'][$key] = self::getDateTime($timestamp, $tzid); //,$parameters['EXDATE']);
 								}
 							}
 							else
@@ -684,9 +684,9 @@ 
 								// use 'DATE' instead of 'DATE-TIME' on whole day events
 								foreach ($event['recur_exception'] as $id => $timestamp)
 								{
-									$time = new Api\DateTime($timestamp,Api\DateTime::$server_timezone);
+									$time = new Api\DateTime($timestamp, Api\DateTime::$server_timezone);
 									$time->setTimezone(self::$tz_cache[$event['tzid']]);
-									$arr = Api\DateTime::to($time,'array');
+									$arr = Api\DateTime::to($time, 'array');
 									$days[$id] = array(
 										'year'  => $arr['year'],
 										'month' => $arr['month'],
@@ -701,21 +701,21 @@ 
 						break;
 
 					case 'PRIORITY':
-						if (!$event['priority']) continue;	// 0=undefined is default, no need to export, fails CalDAVTester if our default is added
+						if (!$event['priority']) continue; // 0=undefined is default, no need to export, fails CalDAVTester if our default is added
 						if ($this->productManufacturer == 'funambol' &&
 							(strpos($this->productName, 'outlook') !== false
 								|| strpos($this->productName, 'pocket pc') !== false))
 						{
-							$attributes['PRIORITY'] = (int) $this->priority_egw2funambol[$event['priority']];
+							$attributes['PRIORITY'] = (int)$this->priority_egw2funambol[$event['priority']];
 						}
 						else
 						{
-							$attributes['PRIORITY'] = (int) $this->priority_egw2ical[$event['priority']];
+							$attributes['PRIORITY'] = (int)$this->priority_egw2ical[$event['priority']];
 						}
 						break;
 
 					case 'TRANSP':
-						if (!$event['non_blocking']) continue;	// OPAQUE is default, no need to export, fails CalDAVTester if added as default
+						if (!$event['non_blocking']) continue; // OPAQUE is default, no need to export, fails CalDAVTester if added as default
 						if ($version == '1.0')
 						{
 							$attributes['TRANSP'] = ($event['non_blocking'] ? 1 : 0);
@@ -754,13 +754,13 @@ 
 							// We handle a pseudo exception
 							if (empty($event['whole_day']))
 							{
-								$attributes[$icalFieldName] = self::getDateTime($recur_date,$tzid,$parameters[$icalFieldName]);
+								$attributes[$icalFieldName] = self::getDateTime($recur_date, $tzid, $parameters[$icalFieldName]);
 							}
 							else
 							{
-								$time = new Api\DateTime($recur_date,Api\DateTime::$server_timezone);
+								$time = new Api\DateTime($recur_date, Api\DateTime::$server_timezone);
 								$time->setTimezone(self::$tz_cache[$event['tzid']]);
-								$arr = Api\DateTime::to($time,'array');
+								$arr = Api\DateTime::to($time, 'array');
 								$vevent->setAttribute($icalFieldName, array(
 									'year' => $arr['year'],
 									'month' => $arr['month'],
@@ -772,17 +772,17 @@ 
 						elseif ($event['recurrence'] && $event['reference'])
 						{
 							// $event['reference'] is a calendar_id, not a timestamp
-							if (!($revent = $this->read($event['reference']))) break;	// referenced event does not exist
+							if (!($revent = $this->read($event['reference']))) break; // referenced event does not exist
 
 							if (empty($revent['whole_day']))
 							{
-								$attributes[$icalFieldName] = self::getDateTime($event['recurrence'],$tzid,$parameters[$icalFieldName]);
+								$attributes[$icalFieldName] = self::getDateTime($event['recurrence'], $tzid, $parameters[$icalFieldName]);
 							}
 							else
 							{
-								$time = new Api\DateTime($event['recurrence'],Api\DateTime::$server_timezone);
+								$time = new Api\DateTime($event['recurrence'], Api\DateTime::$server_timezone);
 								$time->setTimezone(self::$tz_cache[$event['tzid']]);
-								$arr = Api\DateTime::to($time,'array');
+								$arr = Api\DateTime::to($time, 'array');
 								$vevent->setAttribute($icalFieldName, array(
 									'year' => $arr['year'],
 									'month' => $arr['month'],
@@ -806,9 +806,9 @@ 
 							$noTruncate = $this->clientProperties[$icalFieldName]['NoTruncate'];
 							if ($this->log && $size > 0)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									"() $icalFieldName Size: $size, NoTruncate: " .
-									($noTruncate ? 'TRUE' : 'FALSE') . "\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									"() $icalFieldName Size: $size, NoTruncate: ".
+									($noTruncate ? 'TRUE' : 'FALSE')."\n", 3, $this->logfile);
 							}
 							//Horde::logMessage("vCalendar $icalFieldName Size: $size, NoTruncate: " .
 							//	($noTruncate ? 'TRUE' : 'FALSE'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -826,8 +826,8 @@ 
 							{
 								if ($this->log)
 								{
-									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-										"() $icalFieldName omitted due to maximum size $size\n",3,$this->logfile);
+									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+										"() $icalFieldName omitted due to maximum size $size\n", 3, $this->logfile);
 								}
 								//Horde::logMessage("vCalendar $icalFieldName omitted due to maximum size $size",
 								//	__FILE__, __LINE__, PEAR_LOG_WARNING);
@@ -837,8 +837,8 @@ 
 							$value = substr($value, 0, $size - 1);
 							if ($this->log)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									"() $icalFieldName truncated to maximum size $size\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									"() $icalFieldName truncated to maximum size $size\n", 3, $this->logfile);
 							}
 							//Horde::logMessage("vCalendar $icalFieldName truncated to maximum size $size",
 							//	__FILE__, __LINE__, PEAR_LOG_INFO);
@@ -853,7 +853,7 @@ 
 			// for CalDAV add all X-Properties previously parsed
 			if ($this->productManufacturer == 'groupdav' || $this->productManufacturer == 'file')
 			{
-				foreach($event as $name => $value)
+				foreach ($event as $name => $value)
 				{
 					if (substr($name, 0, 2) == '##')
 					{
@@ -925,8 +925,8 @@ 
 						$values['AALARM']['repeat count'] = '';
 						$values['AALARM']['display text'] = $description;
 					}
-					$attributes['DALARM'] = self::getDateTime($alarmData['time'],$tzid,$parameters['DALARM']);
-					$attributes['AALARM'] = self::getDateTime($alarmData['time'],$tzid,$parameters['AALARM']);
+					$attributes['DALARM'] = self::getDateTime($alarmData['time'], $tzid, $parameters['DALARM']);
+					$attributes['AALARM'] = self::getDateTime($alarmData['time'], $tzid, $parameters['AALARM']);
 					// lets take only the first alarm
 					break;
 				}
@@ -963,7 +963,7 @@ 
 						$alarmData['offset'] = false;
 					}
 
-					$valarm = Horde_Icalendar::newComponent('VALARM',$vevent);
+					$valarm = Horde_Icalendar::newComponent('VALARM', $vevent);
 					if ($alarmData['offset'] !== false)
 					{
 						$valarm->setAttribute('TRIGGER', -$alarmData['offset'],
@@ -972,7 +972,7 @@ 
 					else
 					{
 						$params = array('VALUE' => 'DATE-TIME');
-						$value = self::getDateTime($alarmData['time'],$tzid,$params);
+						$value = self::getDateTime($alarmData['time'], $tzid, $params);
 						$valarm->setAttribute('TRIGGER', $value, $params);
 					}
 					if (!empty($alarmData['uid']))
@@ -983,7 +983,7 @@ 
 					// set evtl. existing attributes set by iCal clients not used by EGroupware
 					if (isset($alarmData['attrs']))
 					{
-						foreach($alarmData['attrs'] as $attr => $data)
+						foreach ($alarmData['attrs'] as $attr => $data)
 						{
 							$valarm->setAttribute($attr, $data['value'], $data['params']);
 						}
@@ -991,11 +991,11 @@ 
 					// set default ACTION and DESCRIPTION, if not set by a client
 					if (!isset($alarmData['attrs']) || !isset($alarmData['attrs']['ACTION']))
 					{
-						$valarm->setAttribute('ACTION','DISPLAY');
+						$valarm->setAttribute('ACTION', 'DISPLAY');
 					}
 					if (!isset($alarmData['attrs']) || !isset($alarmData['attrs']['DESCRIPTION']))
 					{
-						$valarm->setAttribute('DESCRIPTION',$event['title'] ? $event['title'] : $description);
+						$valarm->setAttribute('DESCRIPTION', $event['title'] ? $event['title'] : $description);
 					}
 					$vevent->addComponent($valarm);
 				}
@@ -1003,15 +1003,15 @@ 
 
 			foreach ($attributes as $key => $value)
 			{
-				foreach (is_array($value) && $parameters[$key]['VALUE']!='DATE' ? $value : array($value) as $valueID => $valueData)
+				foreach (is_array($value) && $parameters[$key]['VALUE'] != 'DATE' ? $value : array($value) as $valueID => $valueData)
 				{
-					$valueData = Api\Translation::convert($valueData,Api\Translation::charset(),$charset);
-                    $paramData = (array) Api\Translation::convert(is_array($value) ?
+					$valueData = Api\Translation::convert($valueData, Api\Translation::charset(), $charset);
+                    $paramData = (array)Api\Translation::convert(is_array($value) ?
                     		$parameters[$key][$valueID] : $parameters[$key],
-                            Api\Translation::charset(),$charset);
-                    $valuesData = (array) Api\Translation::convert($values[$key],
-                    		Api\Translation::charset(),$charset);
-                    $content = $valueData . implode(';', $valuesData);
+                            Api\Translation::charset(), $charset);
+                    $valuesData = (array)Api\Translation::convert($values[$key],
+                    		Api\Translation::charset(), $charset);
+                    $content = $valueData.implode(';', $valuesData);
 
 					if ($version == '1.0' && (preg_match('/[^\x20-\x7F]/', $content) ||
 						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN']))))
@@ -1061,10 +1061,10 @@ 
 		$retval = $events_exported ? $vcal->exportvCalendar() : false;
  		if ($this->log)
  		{
- 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"() '$this->productManufacturer','$this->productName'\n",3,$this->logfile);
- 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"()\n".array2string($retval)."\n",3,$this->logfile);
+ 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"() '$this->productManufacturer','$this->productName'\n", 3, $this->logfile);
+ 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"()\n".array2string($retval)."\n", 3, $this->logfile);
  		}
 		return $retval;
 	}
@@ -1077,15 +1077,15 @@ 
 	 * @param array &$params=null parameter array to set TZID
 	 * @return mixed attribute value to set: integer timestamp if $tzid == 'UTC' otherwise Ymd\THis string IN $tzid
 	 */
-	static function getDateTime($time,$tzid,array &$params=null)
+	static function getDateTime($time, $tzid, array &$params = null)
 	{
 		if (empty($tzid) || $tzid == 'UTC')
 		{
-			return Api\DateTime::to($time,'ts');
+			return Api\DateTime::to($time, 'ts');
 		}
-		if (!is_a($time,'DateTime'))
+		if (!is_a($time, 'DateTime'))
 		{
-			$time = new Api\DateTime($time,Api\DateTime::$server_timezone);
+			$time = new Api\DateTime($time, Api\DateTime::$server_timezone);
 		}
 		if (!isset(self::$tz_cache[$tzid]))
 		{
@@ -1120,11 +1120,11 @@ 
 	 * @param string $caldav_name=null name from CalDAV client or null (to use default)
 	 * @return int|boolean|null cal_id > 0 on success, false on failure or 0 for a failed etag|permission denied or null for "403 Forbidden"
 	 */
-	function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0, $principalURL='', $user=null, $charset=null, $caldav_name=null,$skip_notification=false)
+	function importVCal($_vcalData, $cal_id = -1, $etag = null, $merge = false, $recur_date = 0, $principalURL = '', $user = null, $charset = null, $caldav_name = null, $skip_notification = false)
 	{
 		//error_log(__METHOD__."(, $cal_id, $etag, $merge, $recur_date, $principalURL, $user, $charset, $caldav_name)");
 		$this->events_imported = 0;
-		$replace = $delete_exceptions= false;
+		$replace = $delete_exceptions = false;
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
 
@@ -1132,7 +1132,7 @@ 
 		{
 			return false;
 		}
-		if (!is_array($events)) $cal_id = -1;	// just to be sure, as iterator does NOT allow array access (eg. $events[0])
+		if (!is_array($events)) $cal_id = -1; // just to be sure, as iterator does NOT allow array access (eg. $events[0])
 
 		if ($cal_id > 0)
 		{
@@ -1140,7 +1140,7 @@ 
 			{
 				$replace = $recur_date == 0;
 				$events[0]['id'] = $cal_id;
-				if (!is_null($etag)) $events[0]['etag'] = (int) $etag;
+				if (!is_null($etag)) $events[0]['etag'] = (int)$etag;
 				if ($recur_date) $events[0]['recurrence'] = $recur_date;
 			}
 			elseif (($foundEvent = $this->find_event(array('id' => $cal_id), 'exact')) &&
@@ -1192,7 +1192,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					."($cal_id, $etag, $recur_date, $principalURL, $user, $charset)\n"
-					. array2string($event)."\n",3,$this->logfile);
+					. array2string($event)."\n", 3, $this->logfile);
 			}
 
 			$updated_id = false;
@@ -1215,14 +1215,14 @@ 
 					{
 						if ($delete_exceptions)
 						{
-							$this->delete($id,0,false,$skip_notification);
+							$this->delete($id, 0, false, $skip_notification);
 						}
 						else
 						{
 							if (!($exception = $this->read($id))) continue;
 							$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
 							$exception['reference'] = $exception['recurrence'] = 0;
-							$this->update($exception, true,true,false,true,$msg,$skip_notification);
+							$this->update($exception, true, true, false, true, $msg, $skip_notification);
 						}
 					}
 				}
@@ -1239,7 +1239,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. "(UPDATE Event)\n"
-						. array2string($event_info['stored_event'])."\n",3,$this->logfile);
+						. array2string($event_info['stored_event'])."\n", 3, $this->logfile);
 				}
 				if (empty($event['uid']))
 				{
@@ -1261,7 +1261,7 @@ 
 								if ($this->log)
 								{
 									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-										"() Restore status for $uid\n",3,$this->logfile);
+										"() Restore status for $uid\n", 3, $this->logfile);
 								}
 								$event['participants'][$uid] = $event_info['stored_event']['participants'][$uid];
 							}
@@ -1285,7 +1285,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"()[MERGE]\n",3,$this->logfile);
+							"()[MERGE]\n", 3, $this->logfile);
 					}
 					// overwrite with server data for merge
 					foreach ($event_info['stored_event'] as $key => $value)
@@ -1315,7 +1315,7 @@ 
 				else
 				{
 					// no merge
-					if(!isset($this->supportedFields['category']) || !isset($event['category']))
+					if (!isset($this->supportedFields['category']) || !isset($event['category']))
 					{
 						$event['category'] = $event_info['stored_event']['category'];
 					}
@@ -1327,7 +1327,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() No participants\n",3,$this->logfile);
+							"() No participants\n", 3, $this->logfile);
 						}
 
 						// If this is an updated meeting, and the client doesn't support
@@ -1346,7 +1346,7 @@ 
 								if ($this->log)
 								{
 									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-										"() Restore resource $uid to status $status\n",3,$this->logfile);
+										"() Restore resource $uid to status $status\n", 3, $this->logfile);
 								}
 								// Add it back in
 								$event['participants'][$uid] = $status;
@@ -1434,8 +1434,7 @@ 
 						}
 						// for resources check which new-status to give (eg. with direct booking permision 'A' instead 'U')
 						$event['participants'][$user] = calendar_so::combine_status(
-							$user < 0 || !isset($this->resources[$user[0]]['new_status']) ? 'U' :
-							ExecMethod($this->resources[$user[0]]['new_status'], substr($user, 1)));
+							$user < 0 || !isset($this->resources[$user[0]]['new_status']) ? 'U' : ExecMethod($this->resources[$user[0]]['new_status'], substr($user, 1)));
 					}
 				}
 				// check if an owner is set and the current user has add rights
@@ -1500,9 +1499,9 @@ 
 
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ . '('
-					. $event_info['type'] . ")\n"
-					. array2string($event)."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'('
+					. $event_info['type'].")\n"
+					. array2string($event)."\n", 3, $this->logfile);
 			}
 
 			// Android (any maybe others) delete recurrences by setting STATUS: CANCELLED
@@ -1510,10 +1509,10 @@ 
 			if (in_array($event_info['type'], array('SERIES-EXCEPTION', 'SERIES-EXCEPTION-PROPAGATE', 'SERIES-PSEUDO-EXCEPTION')) &&
 				$event['status'] == 'CANCELLED')
 			{
-				if (!$this->delete($event['id'] ? $event['id'] : $cal_id, $event['recurrence'],false,$skip_notification))
+				if (!$this->delete($event['id'] ? $event['id'] : $cal_id, $event['recurrence'], false, $skip_notification))
 				{
 					// delete fails (because no rights), reject recurrence
-					$this->set_status($event['id'] ? $event['id'] : $cal_id, $this->user, 'R', $event['recurrence'],false,true,$skip_notification);
+					$this->set_status($event['id'] ? $event['id'] : $cal_id, $this->user, 'R', $event['recurrence'], false, true, $skip_notification);
 				}
 				continue;
 			}
@@ -1525,7 +1524,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SINGLE\n",3,$this->logfile);
+							"(): event SINGLE\n", 3, $this->logfile);
 					}
 
 					// update the event
@@ -1535,7 +1534,7 @@ 
 						$event['reference'] = 0;
 						$event_to_store = $event; // prevent $event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1544,7 +1543,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-MASTER\n",3,$this->logfile);
+							"(): event SERIES-MASTER\n", 3, $this->logfile);
 					}
 
 					// remove all known pseudo exceptions and update the event
@@ -1554,8 +1553,8 @@ 
 						$days = $this->so->get_recurrence_exceptions($event_info['stored_event'], $this->tzid, 0, 0, $filter);
 						if ($this->log)
 						{
-							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS MAPPING):\n" .
-								array2string($days)."\n",3,$this->logfile);
+							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS MAPPING):\n".
+								array2string($days)."\n", 3, $this->logfile);
 						}
 						if (is_array($days))
 						{
@@ -1573,7 +1572,7 @@ 
 
 						$event_to_store = $event; // prevent $event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1583,7 +1582,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-EXCEPTION\n",3,$this->logfile);
+							"(): event SERIES-EXCEPTION\n", 3, $this->logfile);
 					}
 
 					// update event
@@ -1639,13 +1638,13 @@ 
 							$event['owner'] = $event_info['master_event']['owner'];
 							$event_to_store = $event_info['master_event']; // prevent the master_event from being changed by the update method
 							$this->server2usertime($event_to_store);
-							$this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+							$this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 							unset($event_to_store);
 						}
 
 						$event_to_store = $event; // prevent $event from being changed by update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1654,7 +1653,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-PSEUDO-EXCEPTION\n",3,$this->logfile);
+							"(): event SERIES-PSEUDO-EXCEPTION\n", 3, $this->logfile);
 					}
 					//Horde::logMessage('importVCAL event SERIES-PSEUDO-EXCEPTION',
 					//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -1675,7 +1674,7 @@ 
 						// save the series master with the adjusted exceptions
 						$event_to_store = $event_info['master_event']; // prevent the master_event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true, true, false, false,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, false, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 
@@ -1702,13 +1701,13 @@ 
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
-								$this->update_status($event, $event_info['stored_event'],0,$skip_notification);
+								$this->update_status($event, $event_info['stored_event'], 0, $skip_notification);
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['stored_event']['participants'][$this->user]))
 							{
 								// update the users status only
 								$this->set_status($event_info['stored_event']['id'], $this->user,
-									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), 0, true,true,$skip_notification);
+									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), 0, true, true, $skip_notification);
 							}
 						}
 						break;
@@ -1720,13 +1719,13 @@ 
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
-								$this->update_status($event, $event_info['stored_event'], $recurrence,$skip_notification);
+								$this->update_status($event, $event_info['stored_event'], $recurrence, $skip_notification);
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['master_event']['participants'][$this->user]))
 							{
 								// update the users status only
 								$this->set_status($event_info['master_event']['id'], $this->user,
-									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), $recurrence, true,true,$skip_notification);
+									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), $recurrence, true, true, $skip_notification);
 							}
 						}
 						break;
@@ -1743,7 +1742,7 @@ 
 					break;
 
 				case 'SERIES-PSEUDO-EXCEPTION':
-					$return_id = is_array($event_info['master_event']) ? $event_info['master_event']['id'] . ':' . $event['recurrence'] : false;
+					$return_id = is_array($event_info['master_event']) ? $event_info['master_event']['id'].':'.$event['recurrence'] : false;
 					break;
 
 				case 'SERIES-EXCEPTION-PROPAGATE':
@@ -1756,7 +1755,7 @@ 
 					{
 						// we did not have sufficient rights to propagate the status only exception to a real one
 						// we have to keep the SERIES-PSEUDO-EXCEPTION id and keep the event untouched
-						$return_id = $event_info['master_event']['id'] . ':' . $event['recurrence'];
+						$return_id = $event_info['master_event']['id'].':'.$event['recurrence'];
 					}
 					break;
 			}
@@ -1770,8 +1769,8 @@ 
 			if ($this->log)
 			{
 				$event_info['stored_event'] = $this->read($event_info['stored_event']['id']);
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()[$updated_id]\n" .
-					array2string($event_info['stored_event'])."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()[$updated_id]\n".
+					array2string($event_info['stored_event'])."\n", 3, $this->logfile);
 			}
 		}
 		date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
@@ -1793,19 +1792,19 @@ 
 	 * @return mixed on success: int $cal_id > 0, on error or conflicts false.
 	 *	Conflicts are passed to $this->conflict_callback
 	 */
-	public function update(&$event,$ignore_conflicts=false,$touch_modified=true,$ignore_acl=false,$updateTS=true,&$messages=null, $skip_notification=false)
+	public function update(&$event, $ignore_conflicts = false, $touch_modified = true, $ignore_acl = false, $updateTS = true, &$messages = null, $skip_notification = false)
 	{
-		if($this->conflict_callback !== null)
+		if ($this->conflict_callback !== null)
 		{
 			// calendar_ical overrides search(), which breaks conflict checking
 			// so we make sure to use the original from parent
 			static $bo = null;
-			if(!$bo)
+			if (!$bo)
 			{
 				$bo = new calendar_boupdate();
 			}
 			$conflicts = $bo->conflicts($event);
-			if(is_array($conflicts) && count($conflicts) > 0)
+			if (is_array($conflicts) && count($conflicts) > 0)
 			{
 				call_user_func_array($this->conflict_callback, array(&$event, &$conflicts));
 				return false;
@@ -1826,11 +1825,11 @@ 
 	{
 		if ($this->debug) error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
 		$modified = 0;
-		foreach($event['alarm'] as &$alarm)
+		foreach ($event['alarm'] as &$alarm)
 		{
 			// check if alarm is already stored or from other users
 			$found = false;
-			foreach($old_alarms as $id => $old_alarm)
+			foreach ($old_alarms as $id => $old_alarm)
 			{
 				// not current users alarm --> ignore
 				if (!$old_alarm['all'] && $old_alarm['owner'] != $user)
@@ -1846,7 +1845,7 @@ 
 					break;
 				}
 			}
-			if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) processing ".($found?'existing':'new')." alarm ".array2string($alarm));
+			if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) processing ".($found ? 'existing' : 'new')." alarm ".array2string($alarm));
 			if (!empty($alarm['attrs']['X-LIC-ERROR']))
 			{
 				if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) ignored X-LIC-ERROR=".array2string($alarm['X-LIC-ERROR']));
@@ -1874,7 +1873,7 @@ 
 			}
 		}
 		// remove all old alarms left from current user
-		foreach($old_alarms as $id => $old_alarm)
+		foreach ($old_alarms as $id => $old_alarm)
 		{
 			// not current users alarm --> ignore
 			if (!$old_alarm['all'] && $old_alarm['owner'] != $user)
@@ -1897,7 +1896,7 @@ 
 	 * @param string $what ='value'
 	 * @return mixed
 	 */
-	static function _get_attribute($components,$name,$what='value')
+	static function _get_attribute($components, $name, $what = 'value')
 	{
 		foreach ($components as $attribute)
 		{
@@ -1932,7 +1931,7 @@ 
 						case 'DURATION':
 							if (isset($vattr['params']['RELATED']) && $vattr['params']['RELATED'] == 'END')
 							{
-								$alarm['offset'] = $duration -$vattr['value'];
+								$alarm['offset'] = $duration - $vattr['value'];
 							}
 							elseif (isset($vattr['params']['RELATED']) && $vattr['params']['RELATED'] != 'START')
 							{
@@ -1948,7 +1947,7 @@ 
 							$alarm['time'] = $vattr['value'];
 							break;
 						default:
-							error_log('VALARM/TRIGGER: unsupported value type:' . $vtype);
+							error_log('VALARM/TRIGGER: unsupported value type:'.$vtype);
 					}
 					break;
 
@@ -1973,9 +1972,9 @@ 
 		return 0;
 	}
 
-	function setSupportedFields($_productManufacturer='', $_productName='')
+	function setSupportedFields($_productManufacturer = '', $_productName = '')
 	{
-		$state =& $_SESSION['SyncML.state'];
+		$state = & $_SESSION['SyncML.state'];
 		if (isset($state))
 		{
 			$deviceInfo = $state->getClientDeviceInfo();
@@ -2272,10 +2271,10 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'(' . $this->productManufacturer .
-				', '. $this->productName .', ' .
-				($this->tzid ? $this->tzid : Api\DateTime::$user_timezone->getName()) .
-				', ' . $this->calendarOwner . ")\n" , 3, $this->logfile);
+				'('.$this->productManufacturer.
+				', '.$this->productName.', '.
+				($this->tzid ? $this->tzid : Api\DateTime::$user_timezone->getName()).
+				', '.$this->calendarOwner.")\n", 3, $this->logfile);
 		}
 
 		//Horde::logMessage('setSupportedFields(' . $this->productManufacturer . ', '
@@ -2293,12 +2292,12 @@ 
      *                         utf-8 for new format, iso-8859-1 for old format.
 	 * @return Iterator|array|boolean Iterator if resource given or array of events on success, false on failure
 	 */
-	function icaltoegw($_vcalData, $principalURL='', $charset=null)
+	function icaltoegw($_vcalData, $principalURL = '', $charset = null)
 	{
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($principalURL, $charset)\n" .
-				array2string($_vcalData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($principalURL, $charset)\n".
+				array2string($_vcalData)."\n", 3, $this->logfile);
 		}
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
@@ -2333,14 +2332,14 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"(): No vCalendar Container found!\n",3,$this->logfile);
+					"(): No vCalendar Container found!\n", 3, $this->logfile);
 			}
 			date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
 			return false;
 		}
 		foreach ($vcal->getComponents() as $component)
 		{
-			if (($event = $this->_ical2egw_callback($component,$this->tzid,$principalURL,$vcal)))
+			if (($event = $this->_ical2egw_callback($component, $this->tzid, $principalURL, $vcal)))
 			{
 				$events[] = $event;
 			}
@@ -2385,13 +2384,13 @@ 
 	 * @param Horde_Icalendar $container =null container to access attributes on container
 	 * @return array|boolean event array or false if $component is no Horde_Icalendar_Vevent
 	 */
-	function _ical2egw_callback(Horde_Icalendar $component, $tzid, $principalURL='', Horde_Icalendar $container=null)
+	function _ical2egw_callback(Horde_Icalendar $component, $tzid, $principalURL = '', Horde_Icalendar $container = null)
 	{
 		//unset($component->_container); _debug_array($component);
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'() '.get_class($component)." found\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'() '.get_class($component)." found\n", 3, $this->logfile);
 		}
 
 		// eg. Mozilla holiday calendars contain only a X-WR-TIMEZONE on vCalendar component
@@ -2451,16 +2450,16 @@ 
 	 * @param Horde_Icalendar $container =null container to access attributes on container
 	 * @return array|boolean			event on success, false on failure
 	 */
-	function vevent2egw($component, $version, $supportedFields, $principalURL='', $check_component='Horde_Icalendar_Vevent', Horde_Icalendar $container=null)
+	function vevent2egw($component, $version, $supportedFields, $principalURL = '', $check_component = 'Horde_Icalendar_Vevent', Horde_Icalendar $container = null)
 	{
-		unset($principalURL);	// not longer used, but required in function signature
+		unset($principalURL); // not longer used, but required in function signature
 
 		if ($check_component && !is_a($component, $check_component))
 		{
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'()' .
-					get_class($component)." found\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'()'.
+					get_class($component)." found\n", 3, $this->logfile);
 			}
 			return false;
 		}
@@ -2476,11 +2475,11 @@ 
 
 		$isDate = false;
 		$event		= array();
-		$alarms		= array();
-		$vcardData	= array(
+		$alarms = array();
+		$vcardData = array(
 			'recur_type'		=> MCAL_RECUR_NONE,
 			'recur_exception'	=> array(),
-			'priority'          => 0,	// iCalendar default is 0=undefined, not EGroupware 5=normal
+			'priority'          => 0, // iCalendar default is 0=undefined, not EGroupware 5=normal
 		);
 		// we need to parse DTSTART, DTEND or DURATION (in that order!) first
 		foreach (array_merge(
@@ -2497,7 +2496,7 @@ 
 						$isDate = true;
 					}
 					$dtstart_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-					$vcardData['start']	= $dtstart_ts;
+					$vcardData['start'] = $dtstart_ts;
 
 					// set event timezone from dtstart, if specified there
 					if (!empty($attributes['params']['TZID']))
@@ -2515,18 +2514,18 @@ 
 							}
 							else
 							{
-								error_log(__METHOD__ . '() unknown TZID='
-									. $attributes['params']['TZID'] . ', defaulting to timezone "'
-									. date_default_timezone_get() . '".'.array2string($tz));
-								$event['tzid'] = date_default_timezone_get();	// default to current timezone
+								error_log(__METHOD__.'() unknown TZID='
+									. $attributes['params']['TZID'].', defaulting to timezone "'
+									. date_default_timezone_get().'".'.array2string($tz));
+								$event['tzid'] = date_default_timezone_get(); // default to current timezone
 							}
 						}
-						catch(Exception $e)
+						catch (Exception $e)
 						{
-							error_log(__METHOD__ . '() unknown TZID='
-								. $attributes['params']['TZID'] . ', defaulting to timezone "'
-								. date_default_timezone_get() . '".'.$e->getMessage());
-							$event['tzid'] = date_default_timezone_get();	// default to current timezone
+							error_log(__METHOD__.'() unknown TZID='
+								. $attributes['params']['TZID'].', defaulting to timezone "'
+								. date_default_timezone_get().'".'.$e->getMessage());
+							$event['tzid'] = date_default_timezone_get(); // default to current timezone
 						}
 					}
 					// if no timezone given and one is specified in class (never the case for CalDAV)
@@ -2550,11 +2549,11 @@ 
 
 				case 'DTEND':
 					$dtend_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-					if (date('H:i:s',$dtend_ts) == '00:00:00')
+					if (date('H:i:s', $dtend_ts) == '00:00:00')
 					{
 						$dtend_ts -= 1;
 					}
-					$vcardData['end']	= $dtend_ts;
+					$vcardData['end'] = $dtend_ts;
 					break;
 
 				case 'DURATION':	// clients can use DTSTART+DURATION, instead of DTSTART+DTEND
@@ -2574,7 +2573,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. "() DTSTART missing!\n",3,$this->logfile);
+					. "() DTSTART missing!\n", 3, $this->logfile);
 			}
 			return false; // not a valid entry
 		}
@@ -2593,7 +2592,7 @@ 
 				case 'X-MICROSOFT-CDO-ALLDAYEVENT':
 					if (isset($supportedFields['whole_day']))
 					{
-						$event['whole_day'] = (isset($attributes['value'])?strtoupper($attributes['value'])=='TRUE':true);
+						$event['whole_day'] = (isset($attributes['value']) ? strtoupper($attributes['value']) == 'TRUE' : true);
 					}
 					break;
 				case 'AALARM':
@@ -2623,18 +2622,18 @@ 
 					$vcardData['recurrence'] = $attributes['value'];
 					break;
 				case 'LOCATION':
-					$vcardData['location']	= str_replace("\r\n", "\n", $attributes['value']);
+					$vcardData['location'] = str_replace("\r\n", "\n", $attributes['value']);
 					break;
 				case 'RRULE':
 					$recurence = $attributes['value'];
 					$vcardData['recur_interval'] = 1;
-					$type = preg_match('/FREQ=([^;: ]+)/i',$recurence,$matches) ? $matches[1] : $recurence[0];
+					$type = preg_match('/FREQ=([^;: ]+)/i', $recurence, $matches) ? $matches[1] : $recurence[0];
 					// vCard 2.0 values for all types
-					if (preg_match('/UNTIL=([0-9TZ]+)/',$recurence,$matches))
+					if (preg_match('/UNTIL=([0-9TZ]+)/', $recurence, $matches))
 					{
 						$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($matches[1]);
 						// If it couldn't be parsed, treat it as not set
-						if(is_string($vcardData['recur_enddate']))
+						if (is_string($vcardData['recur_enddate']))
 						{
 							unset($vcardData['recur_enddate']);
 						}
@@ -2644,16 +2643,16 @@ 
 							self::check_fix_endate($vcardData);
 						}
 					}
-					elseif (preg_match('/COUNT=([0-9]+)/',$recurence,$matches))
+					elseif (preg_match('/COUNT=([0-9]+)/', $recurence, $matches))
 					{
 						$vcardData['recur_count'] = (int)$matches[1];
 					}
-					if (preg_match('/INTERVAL=([0-9]+)/',$recurence,$matches))
+					if (preg_match('/INTERVAL=([0-9]+)/', $recurence, $matches))
 					{
-						$vcardData['recur_interval'] = (int) $matches[1] ? (int) $matches[1] : 1;
+						$vcardData['recur_interval'] = (int)$matches[1] ? (int)$matches[1] : 1;
 					}
 					$vcardData['recur_data'] = 0;
-					switch($type)
+					switch ($type)
 					{
 						case 'D':	// 1.0
 							$recurenceMatches = null;
@@ -2677,20 +2676,20 @@ 
 						case 'W':
 						case 'WEEKLY':
 							$days = array();
-							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/',$recurence, $recurenceMatches))		// 1.0
+							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/', $recurence, $recurenceMatches))		// 1.0
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								if (empty($recurenceMatches[2]))
 								{
-									$days[0] = strtoupper(substr(date('D', $vcardData['start']),0,2));
+									$days[0] = strtoupper(substr(date('D', $vcardData['start']), 0, 2));
 								}
 								else
 								{
-									$days = explode(' ',trim($recurenceMatches[2]));
+									$days = explode(' ', trim($recurenceMatches[2]));
 								}
 
 								$repeatMatches = null;
-								if (preg_match('/#(\d+)/',$recurenceMatches[4],$repeatMatches))
+								if (preg_match('/#(\d+)/', $recurenceMatches[4], $repeatMatches))
 								{
 									if ($repeatMatches[1]) $vcardData['recur_count'] = $repeatMatches[1];
 								}
@@ -2701,21 +2700,21 @@ 
 
 								$recur_days = $this->recur_days_1_0;
 							}
-							elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
+							elseif (preg_match('/BYDAY=([^;: ]+)/', $recurence, $recurenceMatches))	// 2.0
 							{
-								$days = explode(',',$recurenceMatches[1]);
+								$days = explode(',', $recurenceMatches[1]);
 								$recur_days = $this->recur_days;
 							}
 							else	// no day given, use the day of dtstart
 							{
-								$vcardData['recur_data'] |= 1 << (int)date('w',$vcardData['start']);
+								$vcardData['recur_data'] |= 1 << (int)date('w', $vcardData['start']);
 								$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
 							}
 							if ($days)
 							{
 								foreach ($recur_days as $id => $day)
 								{
-									if (in_array(strtoupper(substr($day,0,2)),$days))
+									if (in_array(strtoupper(substr($day, 0, 2)), $days))
 									{
 										$vcardData['recur_data'] |= $id;
 									}
@@ -2731,17 +2730,17 @@ 
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_count'] = $recurenceMatches[2];
 							}
-							elseif (preg_match('/MD(\d+)(?: [^ ]+)? ([0-9TZ]+)/',$recurence, $recurenceMatches))
+							elseif (preg_match('/MD(\d+)(?: [^ ]+)? ([0-9TZ]+)/', $recurence, $recurenceMatches))
 							{
 								$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
 							}
-							elseif (preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches))
+							elseif (preg_match('/MP(\d+) (.*) (.*) (.*)/', $recurence, $recurenceMatches))
 							{
 								$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
 								$vcardData['recur_interval'] = $recurenceMatches[1];
-								if (preg_match('/#(\d+)/',$recurenceMatches[4],$recurenceMatches))
+								if (preg_match('/#(\d+)/', $recurenceMatches[4], $recurenceMatches))
 								{
 									$vcardData['recur_count'] = $recurenceMatches[1];
 								}
@@ -2758,7 +2757,7 @@ 
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_count'] = $recurenceMatches[2];
 							}
-							elseif (preg_match('/YM(\d+)(?: [^ ]+)? ([0-9TZ]+)/',$recurence, $recurenceMatches))
+							elseif (preg_match('/YM(\d+)(?: [^ ]+)? ([0-9TZ]+)/', $recurence, $recurenceMatches))
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
@@ -2772,11 +2771,11 @@ 
 							}
 							// handle FREQ=YEARLY;BYDAY= as FREQ=MONTHLY;BYDAY= with 12*INTERVAL
 							$vcardData['recur_interval'] = $vcardData['recur_interval'] ?
-								12*$vcardData['recur_interval'] : 12;
+								12 * $vcardData['recur_interval'] : 12;
 							// fall-through
 						case 'MONTHLY':
 							// does currently NOT parse BYDAY or BYMONTH, it has to be specified/identical to DTSTART
-							$vcardData['recur_type'] = strpos($recurence,'BYDAY') !== false ?
+							$vcardData['recur_type'] = strpos($recurence, 'BYDAY') !== false ?
 								MCAL_RECUR_MONTHLY_WDAY : MCAL_RECUR_MONTHLY_MDAY;
 							break;
 					}
@@ -2832,11 +2831,11 @@ 
 						(strpos($this->productName, 'outlook') !== false
 							|| strpos($this->productName, 'pocket pc') !== false))
 					{
-						$vcardData['priority'] = (int) $this->priority_funambol2egw[$attributes['value']];
+						$vcardData['priority'] = (int)$this->priority_funambol2egw[$attributes['value']];
 					}
 					else
 					{
-						$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
+						$vcardData['priority'] = (int)$this->priority_ical2egw[$attributes['value']];
 					}
 					break;
 				case 'CATEGORIES':
@@ -2850,10 +2849,10 @@ 
 					}
 					break;
 				case 'ORGANIZER':
-					$event['organizer'] = $attributes['value'];	// no egw field, but needed in AS
-					if (strtolower(substr($event['organizer'],0,7)) == 'mailto:')
+					$event['organizer'] = $attributes['value']; // no egw field, but needed in AS
+					if (strtolower(substr($event['organizer'], 0, 7)) == 'mailto:')
 					{
-						$event['organizer'] = substr($event['organizer'],7);
+						$event['organizer'] = substr($event['organizer'], 7);
 					}
 					if (!empty($attributes['params']['CN']))
 					{
@@ -2890,19 +2889,19 @@ 
 					}
 					// try parsing email and cn from attendee
 					elseif (preg_match('/mailto:([@.a-z0-9_-]+)|mailto:"?([.a-z0-9_ -]*)"?[ ]*<([@.a-z0-9_-]*)>/i',
-						$attributes['value'],$matches))
+						$attributes['value'], $matches))
 					{
 						$email = $matches[1] ? $matches[1] : $matches[3];
-						$cn = isset($matches[2]) ? $matches[2]: '';
+						$cn = isset($matches[2]) ? $matches[2] : '';
 					}
 					elseif (!empty($attributes['value']) &&
 						preg_match('/"?([.a-z0-9_ -]*)"?[ ]*<([@.a-z0-9_-]*)>/i',
-						$attributes['value'],$matches))
+						$attributes['value'], $matches))
 					{
 						$cn = $matches[1];
 						$email = $matches[2];
 					}
-					elseif (strpos($attributes['value'],'@') !== false)
+					elseif (strpos($attributes['value'], '@') !== false)
 					{
 						$email = $attributes['value'];
 					}
@@ -2919,7 +2918,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "(): Found X-EGROUPWARE-UID: '$uid'\n",3,$this->logfile);
+								. "(): Found X-EGROUPWARE-UID: '$uid'\n", 3, $this->logfile);
 						}
 					}
 					elseif ($attributes['value'] == 'Unknown')
@@ -2937,7 +2936,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "() Found account: '$uid', '$cn', '$email'\n",3,$this->logfile);
+								. "() Found account: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 						}
 					}
 					if (!$uid)
@@ -2954,9 +2953,9 @@ 
 							$cn = str_replace(array('\\,', '\\;', '\\:', '\\\\'),
 										array(',', ';', ':', '\\'),
 										$attributes['params']['CN']);
-							if ($cn[0] == '"' && substr($cn,-1) == '"')
+							if ($cn[0] == '"' && substr($cn, -1) == '"')
 							{
-								$cn = substr($cn,1,-1);
+								$cn = substr($cn, 1, -1);
 							}
 							// not searching for $cn, as match can be not unique or without an email address
 							// --> notification will fail, better store just as email
@@ -2965,19 +2964,19 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "() Search participant: '$cn', '$email'\n",3,$this->logfile);
+								. "() Search participant: '$cn', '$email'\n", 3, $this->logfile);
 						}
 
 						//elseif (//$attributes['params']['CUTYPE'] == 'GROUP'
-						if (preg_match('/(.*) '. lang('Group') . '/', $cn, $matches))
+						if (preg_match('/(.*) '.lang('Group').'/', $cn, $matches))
 						{
 							// we found a group
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Found group: '$matches[1]', '$cn', '$email'\n",3,$this->logfile);
+									. "() Found group: '$matches[1]', '$cn', '$email'\n", 3, $this->logfile);
 							}
-							if (($uid =  $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g')))
+							if (($uid = $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g')))
 							{
 								//Horde::logMessage("vevent2egw: group participant $uid",
 								//			__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -2991,7 +2990,7 @@ 
 										//Horde::logMessage("vevent2egw: set status to " . $status,
 										//		__FILE__, __LINE__, PEAR_LOG_DEBUG);
 										$vcardData['participants'][$this->user] =
-											calendar_so::combine_status($status,$quantity,$role);
+											calendar_so::combine_status($status, $quantity, $role);
 									}
 								}
 								$status = 'U'; // keep the group
@@ -3000,36 +2999,36 @@ 
 						}
 						elseif (empty($searcharray))
 						{
-							continue;	// participants without email AND CN --> ignore it
+							continue; // participants without email AND CN --> ignore it
 						}
 						elseif ((list($data) = $this->addressbook->search($searcharray,
-							array('id','egw_addressbook.account_id as account_id','n_fn'),
+							array('id', 'egw_addressbook.account_id as account_id', 'n_fn'),
 							'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
-							'','',false,'OR')))
+							'', '', false, 'OR')))
 						{
 							// found an addressbook entry
 							$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Found addressbook entry: '$uid', '$cn', '$email'\n",3,$this->logfile);
+									. "() Found addressbook entry: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 							}
 						}
 						else
 						{
 							if (!$email)
 							{
-								$email = 'no-email@egroupware.org';	// set dummy email to store the CN
+								$email = 'no-email@egroupware.org'; // set dummy email to store the CN
 							}
-							$uid = 'e'. ($cn ? $cn . ' <' . $email . '>' : $email);
+							$uid = 'e'.($cn ? $cn.' <'.$email.'>' : $email);
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Not Found, create dummy: '$uid', '$cn', '$email'\n",3,$this->logfile);
+									. "() Not Found, create dummy: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 							}
 						}
 					}
-					switch($attributes['name'])
+					switch ($attributes['name'])
 					{
 						case 'ATTENDEE':
 							if (!isset($attributes['params']['ROLE']) &&
@@ -3043,7 +3042,7 @@ 
 								// keep role 'CHAIR' from an external organizer, even if he is a regular participant with a different role
 								// as this is currently the only way to store an external organizer and send him iMip responses
 								$q = $r = null;
-								if (isset($vcardData['participants'][$uid]) && ($s=$vcardData['participants'][$uid]) &&
+								if (isset($vcardData['participants'][$uid]) && ($s = $vcardData['participants'][$uid]) &&
 									calendar_so::split_status($s, $q, $r) && $r == 'CHAIR')
 								{
 									$role = 'CHAIR';
@@ -3057,7 +3056,7 @@ 
 									if (!$this->calendarOwner && is_numeric($uid) && $role == 'CHAIR')
 										$component->getAttribute('ORGANIZER');
 								}
-								catch(Horde_Icalendar_Exception $e)
+								catch (Horde_Icalendar_Exception $e)
 								{
 									// we can store the ORGANIZER as event owner
 									$event['owner'] = $uid;
@@ -3113,7 +3112,7 @@ 
 					break;
 
 				case 'ATTACH':
-					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break;	// handeled by managed attachment code
+					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break; // handeled by managed attachment code
 					// fall throught to store external attachment url
 				default:	// X- attribute or other by EGroupware unsupported property
 					//error_log(__METHOD__."() $attributes[name] = ".array2string($attributes));
@@ -3171,7 +3170,7 @@ 
 					if ($event['recur_type'] != MCAL_RECUR_NONE)
 					{
 						$event['reference'] = 0;
-						foreach (array('recur_interval','recur_enddate','recur_data','recur_exception','recur_count') as $r)
+						foreach (array('recur_interval', 'recur_enddate', 'recur_data', 'recur_exception', 'recur_count') as $r)
 						{
 							if (isset($vcardData[$r]))
 							{
@@ -3194,12 +3193,12 @@ 
 			// reset recure_enddate to 00:00:00 on the last day
 			$rriter = calendar_rrule::event2rrule($event, false);
 			$last = $rriter->normalize_enddate();
-			if(!is_object($last))
+			if (!is_object($last))
 			{
-				if($this->log)
+				if ($this->log)
 				{
-					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-					" Unable to determine recurrence end date.  \n".array2string($event),3, $this->logfile);
+					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+					" Unable to determine recurrence end date.  \n".array2string($event), 3, $this->logfile);
 				}
 				return false;
 			}
@@ -3208,16 +3207,16 @@ 
 			$event['recur_enddate'] = Api\DateTime::to($last, 'server');
 		}
 		// translate COUNT into an enddate, as we only store enddates
-		elseif($event['recur_count'])
+		elseif ($event['recur_count'])
 		{
 			$rriter = calendar_rrule::event2rrule($event, false);
 			$last = $rriter->count2date($event['recur_count']);
-			if(!is_object($last))
+			if (!is_object($last))
 			{
-				if($this->log)
+				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__,
-					" Unable to determine recurrence end date.  \n".array2string($event),3, $this->logfile);
+					" Unable to determine recurrence end date.  \n".array2string($event), 3, $this->logfile);
 				}
 				return false;
 			}
@@ -3231,7 +3230,7 @@ 
 			if ($this->productManufacturer == 'groupdav' && $container &&
 				($x_calendarserver_access = $container->getAttribute('X-CALENDARSERVER-ACCESS')))
 			{
-				$event['public'] =  (int)(strtoupper($x_calendarserver_access) == 'PUBLIC');
+				$event['public'] = (int)(strtoupper($x_calendarserver_access) == 'PUBLIC');
 			}
 			//error_log(__METHOD__."() X-CALENDARSERVER-ACCESS=".array2string($x_calendarserver_access).' --> public='.array2string($event['public']));
 		}
@@ -3252,15 +3251,15 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($event)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($event)."\n", 3, $this->logfile);
 		}
 		//Horde::logMessage("vevent2egw:\n" . print_r($event, true),
         //    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		return $event;
 	}
 
-	function search($_vcalData, $contentID=null, $relax=false, $charset=null)
+	function search($_vcalData, $contentID = null, $relax = false, $charset = null)
 	{
 		if (($events = $this->icaltoegw($_vcalData, $charset)))
 		{
@@ -3281,8 +3280,8 @@ 
 			}
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."() found:\n" .
-					array2string($events)."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."() found:\n".
+					array2string($events)."\n", 3, $this->logfile);
 			}
 		}
 		return array();
@@ -3321,23 +3320,23 @@ 
 	 * @param array $extra =null extra attributes to add
 	 * 	X-CALENDARSERVER-MASK-UID can be used to not include an event specified by this uid as busy
 	 */
-	function freebusy($user,$end=null,$utc=true, $charset='UTF-8', $start=null, $method='PUBLISH', array $extra=null)
+	function freebusy($user, $end = null, $utc = true, $charset = 'UTF-8', $start = null, $method = 'PUBLISH', array $extra = null)
 	{
-		if (!$start) $start = time();	// default now
-		if (!$end) $end = time() + 100*DAY_s;	// default next 100 days
+		if (!$start) $start = time(); // default now
+		if (!$end) $end = time() + 100 * DAY_s; // default next 100 days
 
 		$vcal = new Horde_Icalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
-		$vcal->setAttribute('VERSION','2.0');
-		$vcal->setAttribute('METHOD',$method);
+		$vcal->setAttribute('VERSION', '2.0');
+		$vcal->setAttribute('METHOD', $method);
 
-		$vfreebusy = Horde_Icalendar::newComponent('VFREEBUSY',$vcal);
+		$vfreebusy = Horde_Icalendar::newComponent('VFREEBUSY', $vcal);
 
 		$attributes = array(
 			'DTSTAMP' => time(),
-			'DTSTART' => $this->date2ts($start,true),	// true = server-time
-			'DTEND' => $this->date2ts($end,true),	// true = server-time
+			'DTSTART' => $this->date2ts($start, true), // true = server-time
+			'DTEND' => $this->date2ts($end, true), // true = server-time
 		);
 		if (!$utc)
 		{
@@ -3348,9 +3347,9 @@ 
 		}
 		if (is_null($extra)) $extra = array(
 			'URL' => $this->freebusy_url($user),
-			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user,'account_email'),
+			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user, 'account_email'),
 		);
-		foreach($attributes+$extra as $attr => $value)
+		foreach ($attributes + $extra as $attr => $value)
 		{
 			$vfreebusy->setAttribute($attr, $value);
 		}
@@ -3373,16 +3372,16 @@ 
 
 				if ($utc)
 				{
-					$vfreebusy->setAttribute('FREEBUSY',array(array(
+					$vfreebusy->setAttribute('FREEBUSY', array(array(
 						'start' => $event['start'],
 						'end' => $event['end'],
 					)), array('FBTYPE' => $fbtype));
 				}
 				else
 				{
-					$vfreebusy->setAttribute('FREEBUSY',array(array(
-						'start' => date('Ymd\THis',$event['start']),
-						'end' => date('Ymd\THis',$event['end']),
+					$vfreebusy->setAttribute('FREEBUSY', array(array(
+						'start' => date('Ymd\THis', $event['start']),
+						'end' => date('Ymd\THis', $event['end']),
 					)), array('FBTYPE' => $fbtype));
 				}
 			}

Braces +325 added lines, -83 removed lines

@@ -183,7 +183,10 @@ 
 	function __construct(&$_clientProperties = array())
 	{
 		parent::__construct();
-		if ($this->log) $this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-vcal";
+		if ($this->log)
+		{
+			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-vcal";
+		}
 		$this->clientProperties = $_clientProperties;
 		$this->vCalendar = new Horde_Icalendar;
 		$this->addressbook = new Api\Contacts;
@@ -232,10 +235,14 @@ 
 			'ATTACH'        => 'attachments',
 		);
 
-		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+		if (!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
 
 		if ($this->productManufacturer == '' )
-		{	// syncevolution is broken
+		{
+// syncevolution is broken
 			$version = '2.0';
 		}
 
@@ -243,10 +250,16 @@ 
 		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 		$vcal->setAttribute('VERSION', $version);
-		if ($method) $vcal->setAttribute('METHOD', $method);
+		if ($method)
+		{
+			$vcal->setAttribute('METHOD', $method);
+		}
 		$events_exported = false;
 
-		if (!is_array($events)) $events = array($events);
+		if (!is_array($events))
+		{
+			$events = array($events);
+		}
 
 		$vtimezones_added = array();
 		foreach ($events as $event)
@@ -312,7 +325,10 @@ 
 				self::$tz_cache[$event['tzid']] = calendar_timezones::DateTimeZone($event['tzid']);
 			}
 
-			if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+			if ($this->so->isWholeDay($event))
+			{
+				$event['whole_day'] = true;
+			}
 
 			if ($this->log)
 			{
@@ -323,7 +339,10 @@ 
 
 			if ($recurrence)
 			{
-				if (!($master = $this->read($event['id'], 0, true, 'server'))) continue;
+				if (!($master = $this->read($event['id'], 0, true, 'server')))
+				{
+					continue;
+				}
 
 				if (!isset($this->supportedFields['participants']))
 				{
@@ -380,7 +399,8 @@ 
 			if ($this->productManufacturer != 'file' && $this->uidExtension)
 			{
 				// Append UID to DESCRIPTION
-				if (!preg_match('/\[UID:.+\]/m', $event['description'])) {
+				if (!preg_match('/\[UID:.+\]/m', $event['description']))
+				{
 					$event['description'] .= "\n[UID:" . $event['uid'] . "]";
 				}
 			}
@@ -440,11 +460,21 @@ 
 							$quantity = $role = null;
 							calendar_so::split_status($status, $quantity, $role);
 							// do not include event owner/ORGANIZER as participant in his own calendar, if he is only participant
-							if (count($event['participants']) == 1 && $event['owner'] == $uid) continue;
+							if (count($event['participants']) == 1 && $event['owner'] == $uid)
+							{
+								continue;
+							}
 
-							if (!($info = $this->resource_info($uid))) continue;
+							if (!($info = $this->resource_info($uid)))
+							{
+								continue;
+							}
 
-							if (in_array($status, array('X','E'))) continue;	// dont include deleted participants
+							if (in_array($status, array('X','E')))
+							{
+								continue;
+							}
+							// dont include deleted participants
 
 							if ($this->log)
 							{
@@ -523,24 +553,49 @@ 
 							}
 							// ROLE={CHAIR|REQ-PARTICIPANT|OPT-PARTICIPANT|NON-PARTICIPANT|X-*}
 							$options = array();
-							if (!empty($participantCN)) $options['CN'] = $participantCN;
-							if (!empty($role)) $options['ROLE'] = $role;
-							if (!empty($status)) $options['PARTSTAT'] = $status;
-							if (!empty($cutype)) $options['CUTYPE'] = $cutype;
-							if (!empty($rsvp)) $options['RSVP'] = $rsvp;
+							if (!empty($participantCN))
+							{
+								$options['CN'] = $participantCN;
+							}
+							if (!empty($role))
+							{
+								$options['ROLE'] = $role;
+							}
+							if (!empty($status))
+							{
+								$options['PARTSTAT'] = $status;
+							}
+							if (!empty($cutype))
+							{
+								$options['CUTYPE'] = $cutype;
+							}
+							if (!empty($rsvp))
+							{
+								$options['RSVP'] = $rsvp;
+							}
 							if (!empty($info['email']) && $participantURL != 'mailto:'.$info['email'])
 							{
 								$options['EMAIL'] = $info['email'];	// only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
 							}
-							if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = (string)$uid;
-							if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
+							if ($info['type'] != 'e')
+							{
+								$options['X-EGROUPWARE-UID'] = (string)$uid;
+							}
+							if ($quantity > 1)
+							{
+								$options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
+							}
 							$attributes['ATTENDEE'][] = $participantURL;
 							$parameters['ATTENDEE'][] = $options;
 						}
 						break;
 
 					case 'CLASS':
-						if ($event['public']) continue;	// public is default, no need to export, fails CalDAVTester if added as default
+						if ($event['public'])
+						{
+							continue;
+						}
+						// public is default, no need to export, fails CalDAVTester if added as default
 						$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE';
 						// Apple iCal on OS X uses X-CALENDARSERVER-ACCESS: CONFIDENTIAL on VCALANDAR (not VEVENT!)
 						if (!$event['public'] && $this->productManufacturer == 'groupdav')
@@ -572,9 +627,18 @@ 
 									'CUTYPE'   => 'INDIVIDUAL',
 									//'RSVP'     => 'FALSE',
 									);
-								if (!empty($organizerCN)) $options['CN'] = $organizerCN;
-								if (!empty($organizerEMail)) $options['EMAIL'] = $organizerEMail;
-								if (!empty($event['owner'])) $options['X-EGROUPWARE-UID'] = $event['owner'];
+								if (!empty($organizerCN))
+								{
+									$options['CN'] = $organizerCN;
+								}
+								if (!empty($organizerEMail))
+								{
+									$options['EMAIL'] = $organizerEMail;
+								}
+								if (!empty($event['owner']))
+								{
+									$options['X-EGROUPWARE-UID'] = $event['owner'];
+								}
 								$attributes['ATTENDEE'][] = $organizerURL;
 			    				$parameters['ATTENDEE'][] = $options;
 		    				}
@@ -603,9 +667,12 @@ 
 						{
 							// Hack for CalDAVTester to export duration instead of endtime
 							if ($tzid == 'UTC' && $event['end'] - $event['start'] <= 86400)
-								$attributes['duration'] = $event['end'] - $event['start'];
-							else
-								$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
+							{
+															$attributes['duration'] = $event['end'] - $event['start'];
+							}
+							else {
+															$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
+							}
 						}
 						else
 						{
@@ -625,7 +692,11 @@ 
 						break;
 
 					case 'RRULE':
-						if ($event['recur_type'] == MCAL_RECUR_NONE) break;		// no recuring event
+						if ($event['recur_type'] == MCAL_RECUR_NONE)
+						{
+							break;
+						}
+						// no recuring event
 						$rriter = calendar_rrule::event2rrule($event, false, $tzid);
 						$rrule = $rriter->generate_rrule($version);
 						if ($event['recur_enddate'])
@@ -667,7 +738,10 @@ 
 						break;
 
 					case 'EXDATE':
-						if ($event['recur_type'] == MCAL_RECUR_NONE) break;
+						if ($event['recur_type'] == MCAL_RECUR_NONE)
+						{
+							break;
+						}
 						if (!empty($event['recur_exception']))
 						{
 							if (empty($event['whole_day']))
@@ -694,14 +768,21 @@ 
 									);
 								}
 								$event['recur_exception'] = $days;
-								if ($version != '1.0') $parameters['EXDATE']['VALUE'] = 'DATE';
+								if ($version != '1.0')
+								{
+									$parameters['EXDATE']['VALUE'] = 'DATE';
+								}
 							}
 							$vevent->setAttribute('EXDATE', $event['recur_exception'], $parameters['EXDATE']);
 						}
 						break;
 
 					case 'PRIORITY':
-						if (!$event['priority']) continue;	// 0=undefined is default, no need to export, fails CalDAVTester if our default is added
+						if (!$event['priority'])
+						{
+							continue;
+						}
+						// 0=undefined is default, no need to export, fails CalDAVTester if our default is added
 						if ($this->productManufacturer == 'funambol' &&
 							(strpos($this->productName, 'outlook') !== false
 								|| strpos($this->productName, 'pocket pc') !== false))
@@ -715,7 +796,11 @@ 
 						break;
 
 					case 'TRANSP':
-						if (!$event['non_blocking']) continue;	// OPAQUE is default, no need to export, fails CalDAVTester if added as default
+						if (!$event['non_blocking'])
+						{
+							continue;
+						}
+						// OPAQUE is default, no need to export, fails CalDAVTester if added as default
 						if ($version == '1.0')
 						{
 							$attributes['TRANSP'] = ($event['non_blocking'] ? 1 : 0);
@@ -772,7 +857,11 @@ 
 						elseif ($event['recurrence'] && $event['reference'])
 						{
 							// $event['reference'] is a calendar_id, not a timestamp
-							if (!($revent = $this->read($event['reference']))) break;	// referenced event does not exist
+							if (!($revent = $this->read($event['reference'])))
+							{
+								break;
+							}
+							// referenced event does not exist
 
 							if (empty($revent['whole_day']))
 							{
@@ -898,7 +987,10 @@ 
 			foreach ((array)$event['alarm'] as $alarmData)
 			{
 				// skip over alarms that don't have the minimum required info
-				if (!isset($alarmData['offset']) && !isset($alarmData['time'])) continue;
+				if (!isset($alarmData['offset']) && !isset($alarmData['time']))
+				{
+					continue;
+				}
 
 				// skip alarms not being set for all users and alarms owned by other users
 				if ($alarmData['all'] != true && $alarmData['owner'] != $this->user)
@@ -915,7 +1007,10 @@ 
 
 				if ($version == '1.0')
 				{
-					if ($event['title']) $description = $event['title'];
+					if ($event['title'])
+					{
+						$description = $event['title'];
+					}
 					if ($description)
 					{
 						$values['DALARM']['snooze_time'] = '';
@@ -935,7 +1030,10 @@ 
 					// VCalendar 2.0 / RFC 2445
 
 					// RFC requires DESCRIPTION for DISPLAY
-					if (!$event['title'] && !$description) $description = 'Alarm';
+					if (!$event['title'] && !$description)
+					{
+						$description = 'Alarm';
+					}
 
 					/* Disabling for now
 					// Lightning infinitly pops up alarms for recuring events, if the only use an offset
@@ -1126,13 +1224,20 @@ 
 		$this->events_imported = 0;
 		$replace = $delete_exceptions= false;
 
-		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+		if (!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
 
 		if (!($events = $this->icaltoegw($_vcalData, $principalURL, $charset)))
 		{
 			return false;
 		}
-		if (!is_array($events)) $cal_id = -1;	// just to be sure, as iterator does NOT allow array access (eg. $events[0])
+		if (!is_array($events))
+		{
+			$cal_id = -1;
+		}
+		// just to be sure, as iterator does NOT allow array access (eg. $events[0])
 
 		if ($cal_id > 0)
 		{
@@ -1140,8 +1245,14 @@ 
 			{
 				$replace = $recur_date == 0;
 				$events[0]['id'] = $cal_id;
-				if (!is_null($etag)) $events[0]['etag'] = (int) $etag;
-				if ($recur_date) $events[0]['recurrence'] = $recur_date;
+				if (!is_null($etag))
+				{
+					$events[0]['etag'] = (int) $etag;
+				}
+				if ($recur_date)
+				{
+					$events[0]['recurrence'] = $recur_date;
+				}
 			}
 			elseif (($foundEvent = $this->find_event(array('id' => $cal_id), 'exact')) &&
 					($eventId = array_shift($foundEvent)) &&
@@ -1149,7 +1260,10 @@ 
 			{
 				foreach ($events as $k => $event)
 				{
-					if (!isset($event['uid'])) $events[$k]['uid'] = $egwEvent['uid'];
+					if (!isset($event['uid']))
+					{
+						$events[$k]['uid'] = $egwEvent['uid'];
+					}
 				}
 			}
 		}
@@ -1179,10 +1293,17 @@ 
 		$msg = null;
 		foreach ($events as $event)
 		{
-			if (!is_array($event)) continue; // the iterator may return false
+			if (!is_array($event))
+			{
+				continue;
+			}
+			// the iterator may return false
 			++$this->events_imported;
 
-			if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+			if ($this->so->isWholeDay($event))
+			{
+				$event['whole_day'] = true;
+			}
 			if (is_array($event['category']))
 			{
 				$event['category'] = $this->find_or_add_categories($event['category'],
@@ -1219,7 +1340,10 @@ 
 						}
 						else
 						{
-							if (!($exception = $this->read($id))) continue;
+							if (!($exception = $this->read($id)))
+							{
+								continue;
+							}
 							$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
 							$exception['reference'] = $exception['recurrence'] = 0;
 							$this->update($exception, true,true,false,true,$msg,$skip_notification);
@@ -1308,7 +1432,10 @@ 
 								break;
 
 							default:
-								if (!empty($value)) $event[$key] = $value;
+								if (!empty($value))
+								{
+									$event[$key] = $value;
+								}
 						}
 					}
 				}
@@ -1406,7 +1533,10 @@ 
 			else // common adjustments for new events
 			{
 				unset($event['id']);
-				if ($caldav_name) $event['caldav_name'] = $caldav_name;
+				if ($caldav_name)
+				{
+					$event['caldav_name'] = $caldav_name;
+				}
 				// set non blocking all day depending on the user setting
 				if (!empty($event['whole_day']) && $this->nonBlockingAllday)
 				{
@@ -1454,7 +1584,10 @@ 
 					|| !isset($event['participants'][$event['owner']]))
 				{
 					$status = calendar_so::combine_status($event['owner'] == $this->user ? 'A' : 'U', 1, 'CHAIR');
-					if (!is_array($event['participants'])) $event['participants'] = array();
+					if (!is_array($event['participants']))
+					{
+						$event['participants'] = array();
+					}
 					$event['participants'][$event['owner']] = $status;
 				}
 				else
@@ -1607,7 +1740,10 @@ 
 								$occurence = $exception = false;
 								foreach ($event_info['master_event']['recur_exception'] as $exception)
 								{
-									if ($exception > $event['start']) break;
+									if ($exception > $event['start'])
+									{
+										break;
+									}
 									$occurence = $exception;
 								}
 								if (!$occurence)
@@ -1697,12 +1833,15 @@ 
 					case 'SERIES-MASTER':
 					case 'SERIES-EXCEPTION':
 					case 'SERIES-EXCEPTION-PROPAGATE':
-						if (is_array($event_info['stored_event'])) // status update requires a stored event
+						if (is_array($event_info['stored_event']))
+						{
+							// status update requires a stored event
 						{
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
 								$this->update_status($event, $event_info['stored_event'],0,$skip_notification);
+						}
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['stored_event']['participants'][$this->user]))
 							{
@@ -1714,9 +1853,12 @@ 
 						break;
 
 					case 'SERIES-PSEUDO-EXCEPTION':
-						if (is_array($event_info['master_event'])) // status update requires a stored master event
+						if (is_array($event_info['master_event']))
+						{
+							// status update requires a stored master event
 						{
 							$recurrence = $this->date2usertime($event['recurrence']);
+						}
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
@@ -1824,7 +1966,10 @@ 
 	 */
 	public function sync_alarms(array &$event, array $old_alarms, $user)
 	{
-		if ($this->debug) error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
+		}
 		$modified = 0;
 		foreach($event['alarm'] as &$alarm)
 		{
@@ -1846,29 +1991,56 @@ 
 					break;
 				}
 			}
-			if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) processing ".($found?'existing':'new')." alarm ".array2string($alarm));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) processing ".($found?'existing':'new')." alarm ".array2string($alarm));
+			}
 			if (!empty($alarm['attrs']['X-LIC-ERROR']))
 			{
-				if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) ignored X-LIC-ERROR=".array2string($alarm['X-LIC-ERROR']));
+				if ($this->debug)
+				{
+					error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) ignored X-LIC-ERROR=".array2string($alarm['X-LIC-ERROR']));
+				}
 				unset($alarm['attrs']['X-LIC-ERROR']);
 			}
 			// alarm not found --> add it
 			if (!$found)
 			{
 				$alarm['owner'] = $user;
-				if (!isset($alarm['time'])) $alarm['time'] = $event['start'] - $alarm['offset'];
-				if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
-				if ($this->debug) error_log(__METHOD__."() adding new alarm from client ".array2string($alarm));
-				if ($event['id']) $alarm['id'] = $this->save_alarm($event['id'], $alarm);
+				if (!isset($alarm['time']))
+				{
+					$alarm['time'] = $event['start'] - $alarm['offset'];
+				}
+				if ($alarm['time'] < time())
+				{
+					calendar_so::shift_alarm($event, $alarm);
+				}
+				if ($this->debug)
+				{
+					error_log(__METHOD__."() adding new alarm from client ".array2string($alarm));
+				}
+				if ($event['id'])
+				{
+					$alarm['id'] = $this->save_alarm($event['id'], $alarm);
+				}
 				++$modified;
 			}
 			// existing alarm --> update it
 			else
 			{
-				if (!isset($alarm['time'])) $alarm['time'] = $event['start'] - $alarm['offset'];
-				if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
+				if (!isset($alarm['time']))
+				{
+					$alarm['time'] = $event['start'] - $alarm['offset'];
+				}
+				if ($alarm['time'] < time())
+				{
+					calendar_so::shift_alarm($event, $alarm);
+				}
 				$alarm = array_merge($old_alarm, $alarm);
-				if ($this->debug) error_log(__METHOD__."() updating existing alarm from client ".array2string($alarm));
+				if ($this->debug)
+				{
+					error_log(__METHOD__."() updating existing alarm from client ".array2string($alarm));
+				}
 				$alarm['id'] = $this->save_alarm($event['id'], $alarm);
 				++$modified;
 			}
@@ -1882,7 +2054,10 @@ 
 				unset($old_alarm[$id]);
 				continue;
 			}
-			if ($this->debug) error_log(__METHOD__."() deleting alarm '$id' deleted on client ".array2string($old_alarm));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() deleting alarm '$id' deleted on client ".array2string($old_alarm));
+			}
 			$this->delete_alarm($id);
 			++$modified;
 		}
@@ -2301,7 +2476,10 @@ 
 				array2string($_vcalData)."\n",3,$this->logfile);
 		}
 
-		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+		if (!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
 
 		// we use Api\CalDAV\IcalIterator only on resources, as calling importVCal() accesses single events like an array (eg. $events[0])
 		if (is_resource($_vcalData))
@@ -2667,19 +2845,27 @@ 
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime(trim($recurenceMatches[2]));
 							}
-							else break;
+							else {
+								break;
+							}
 							// fall-through
 						case 'DAILY':	// 2.0
 							$vcardData['recur_type'] = MCAL_RECUR_DAILY;
-							if (stripos($recurence, 'BYDAY') === false) break;
+							if (stripos($recurence, 'BYDAY') === false)
+							{
+								break;
+							}
 							// hack to handle TYPE=DAILY;BYDAY= as WEEKLY, which is true as long as there's no interval
 							// fall-through
 						case 'W':
 						case 'WEEKLY':
 							$days = array();
-							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/',$recurence, $recurenceMatches))		// 1.0
+							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/',$recurence, $recurenceMatches))
+							{
+								// 1.0
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
+							}
 								if (empty($recurenceMatches[2]))
 								{
 									$days[0] = strtoupper(substr(date('D', $vcardData['start']),0,2));
@@ -2692,7 +2878,10 @@ 
 								$repeatMatches = null;
 								if (preg_match('/#(\d+)/',$recurenceMatches[4],$repeatMatches))
 								{
-									if ($repeatMatches[1]) $vcardData['recur_count'] = $repeatMatches[1];
+									if ($repeatMatches[1])
+									{
+										$vcardData['recur_count'] = $repeatMatches[1];
+									}
 								}
 								else
 								{
@@ -2701,9 +2890,12 @@ 
 
 								$recur_days = $this->recur_days_1_0;
 							}
-							elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
+							elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))
+							{
+								// 2.0
 							{
 								$days = explode(',',$recurenceMatches[1]);
+							}
 								$recur_days = $this->recur_days;
 							}
 							else	// no day given, use the day of dtstart
@@ -2762,7 +2954,10 @@ 
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
-							} else break;
+							}
+							else {
+								break;
+							}
 							// fall-through
 						case 'YEARLY':	// 2.0
 							if (strpos($recurence, 'BYDAY') === false)
@@ -2782,7 +2977,10 @@ 
 					}
 					break;
 				case 'EXDATE':
-					if (!$attributes['value']) break;
+					if (!$attributes['value'])
+					{
+						break;
+					}
 					if ((isset($attributes['params']['VALUE'])
 							&& $attributes['params']['VALUE'] == 'DATE') ||
 						(!isset($attributes['params']['VALUE']) && $isDate))
@@ -2862,13 +3060,16 @@ 
 					// fall throught
 				case 'ATTENDEE':
 					if (isset($attributes['params']['PARTSTAT']))
-				    {
+					{
 				    	$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
 				    }
 				    if (isset($attributes['params']['STATUS']))
-					{
+				    {
 						$status = $this->status_ical2egw[strtoupper($attributes['params']['STATUS'])];
-						if (empty($status)) $status = 'X';
+						if (empty($status))
+						{
+							$status = 'X';
+						}
 					}
 					else
 					{
@@ -2928,7 +3129,10 @@ 
 							$uid = $this->user;
 					}
 					// check principal url from CalDAV here after X-EGROUPWARE-UID and to get optional X-EGROUPWARE-QUANTITY
-					if (!$uid) $uid = Api\CalDAV\Principals::url2uid($attributes['value'], null, $cn);
+					if (!$uid)
+					{
+						$uid = Api\CalDAV\Principals::url2uid($attributes['value'], null, $cn);
+					}
 
 					// try to find an email address
 					if (!$uid && $email && ($uid = $GLOBALS['egw']->accounts->name2id($email, 'account_email')))
@@ -2996,7 +3200,10 @@ 
 								}
 								$status = 'U'; // keep the group
 							}
-							else continue; // can't find this group
+							else {
+								continue;
+							}
+							// can't find this group
 						}
 						elseif (empty($searcharray))
 						{
@@ -3055,7 +3262,9 @@ 
 
 								try {
 									if (!$this->calendarOwner && is_numeric($uid) && $role == 'CHAIR')
-										$component->getAttribute('ORGANIZER');
+									{
+																			$component->getAttribute('ORGANIZER');
+									}
 								}
 								catch(Horde_Icalendar_Exception $e)
 								{
@@ -3092,7 +3301,10 @@ 
 					}
 					break;
 				case 'CREATED':		// will be written direct to the event
-					if ($event['modified']) break;
+					if ($event['modified'])
+					{
+						break;
+					}
 					// fall through
 				case 'LAST-MODIFIED':	// will be written direct to the event
 					$event['modified'] = $attributes['value'];
@@ -3113,7 +3325,11 @@ 
 					break;
 
 				case 'ATTACH':
-					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break;	// handeled by managed attachment code
+					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE']))
+					{
+						break;
+					}
+					// handeled by managed attachment code
 					// fall throught to store external attachment url
 				default:	// X- attribute or other by EGroupware unsupported property
 					//error_log(__METHOD__."() $attributes[name] = ".array2string($attributes));
@@ -3244,7 +3460,10 @@ 
 			$event['end'] = $event['start'] + 60 * $this->cal_prefs['defaultlength'];
 		}
 
-		if ($this->calendarOwner) $event['owner'] = $this->calendarOwner;
+		if ($this->calendarOwner)
+		{
+			$event['owner'] = $this->calendarOwner;
+		}
 
 		// parsing ATTACH attributes for managed attachments
 		$event['attach-delete-by-put'] = $component->getAttributeDefault('X-EGROUPWARE-ATTACH-INCLUDED', null) === 'TRUE';
@@ -3270,7 +3489,10 @@ 
 				$filter = $relax ? 'relax' : 'check';
 				$event = array_shift($events);
 				$eventId = -1;
-				if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+				if ($this->so->isWholeDay($event))
+				{
+					$event['whole_day'] = true;
+				}
 				if ($contentID)
 				{
 					$parts = preg_split('/:/', $contentID);
@@ -3323,8 +3545,16 @@ 
 	 */
 	function freebusy($user,$end=null,$utc=true, $charset='UTF-8', $start=null, $method='PUBLISH', array $extra=null)
 	{
-		if (!$start) $start = time();	// default now
-		if (!$end) $end = time() + 100*DAY_s;	// default next 100 days
+		if (!$start)
+		{
+			$start = time();
+		}
+		// default now
+		if (!$end)
+		{
+			$end = time() + 100*DAY_s;
+		}
+		// default next 100 days
 
 		$vcal = new Horde_Icalendar;
 		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
@@ -3346,10 +3576,13 @@ 
 				$attributes[$attr] = date('Ymd\THis', $value);
 			}
 		}
-		if (is_null($extra)) $extra = array(
+		if (is_null($extra))
+		{
+			$extra = array(
 			'URL' => $this->freebusy_url($user),
 			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user,'account_email'),
 		);
+		}
 		foreach($attributes+$extra as $attr => $value)
 		{
 			$vfreebusy->setAttribute($attr, $value);
@@ -3365,9 +3598,18 @@ 
 		{
 			foreach ($fbdata as $event)
 			{
-				if ($event['non_blocking']) continue;
-				if ($event['uid'] === $extra['X-CALENDARSERVER-MASK-UID']) continue;
-				if ($event['participants'][$user] == 'R') continue;
+				if ($event['non_blocking'])
+				{
+					continue;
+				}
+				if ($event['uid'] === $extra['X-CALENDARSERVER-MASK-UID'])
+				{
+					continue;
+				}
+				if ($event['participants'][$user] == 'R')
+				{
+					continue;
+				}
 
 				$fbtype = $event['participants'][$user] == 'T' ? 'BUSY-TENTATIVE' : 'BUSY';