EGroupware / egroupware

calendar/inc/class.calendar_groupdav.inc.php

Spacing +144 added lines, -144 removed lines

@@ -153,7 +153,7 @@ 
 	 * @param string $id =''
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function propfind($path,&$options,&$files,$user,$id='')
+	function propfind($path, &$options, &$files, $user, $id = '')
 	{
 		if ($this->debug)
 		{
@@ -179,10 +179,10 @@ 
 			'enum_recuring' => false,
 			'daywise' => false,
 			'date_format' => 'server',
-			'no_total' => true,	// we need no total number of rows (saves extra query)
-			'cfs' => array(),	// return custom-fields, as we use them to store X- attributes
+			'no_total' => true, // we need no total number of rows (saves extra query)
+			'cfs' => array(), // return custom-fields, as we use them to store X- attributes
 		);
-		foreach(array(
+		foreach (array(
 			'start' => $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-past-limit'],
 			'end' => $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-future-limit'],
 		) as $name => $value)
@@ -191,7 +191,7 @@ 
 			{
 				$value = $name == 'start' ? self::PAST_LIMIT : self::FUTURE_LIMIT;
 			}
-			$filter[$name] = $this->bo->now + 24*3600*($name == 'start' ? -1 : 1)*abs($value);
+			$filter[$name] = $this->bo->now + 24 * 3600 * ($name == 'start' ? -1 : 1) * abs($value);
 		}
 		if ($this->client_shared_uid_exceptions)	// do NOT return (non-virtual) exceptions
 		{
@@ -203,13 +203,13 @@ 
 			$filter['filter'] = 'owner';
 		}
 		// scheduling inbox, shows only not yet accepted or rejected events
-		elseif (substr($path,-7) == '/inbox/')
+		elseif (substr($path, -7) == '/inbox/')
 		{
 			$filter['filter'] = 'unknown';
-			$filter['start'] = $this->bo->now;	// only return future invitations
+			$filter['start'] = $this->bo->now; // only return future invitations
 		}
 		// ToDo: not sure what scheduling outbox is supposed to show, leave it empty for now
-		elseif (substr($path,-8) == '/outbox/')
+		elseif (substr($path, -8) == '/outbox/')
 		{
 			return true;
 		}
@@ -226,7 +226,7 @@ 
 			// when trying to request not supported components, eg. VTODO on a calendar collection
 			return true;
 		}
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id) $path = dirname($path).'/'; // caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -243,7 +243,7 @@ 
 
 			$this->sync_collection_token = null;
 
-			$filter['order'] = 'cal_modified ASC';	// return oldest modifications first
+			$filter['order'] = 'cal_modified ASC'; // return oldest modifications first
 			$filter['sync-collection'] = true;
 			// no end-date / limit into the future, as unchanged entries would never be transferted later on
 			unset($filter['end']);
@@ -251,7 +251,7 @@ 
 
 		if (isset($nresults))
 		{
-			unset($filter['no_total']);	// we need the total!
+			unset($filter['no_total']); // we need the total!
 			$files['files'] = $this->propfind_callback($path, $filter, array(0, (int)$nresults));
 
 			// hack to support limit with sync-collection report: events are returned in modified ASC order (oldest first)
@@ -260,13 +260,13 @@ 
 			if ($options['root']['name'] == 'sync-collection' && $this->bo->total > $nresults)
 			{
 				--$this->sync_collection_token;
-				$files['sync-token-params'][] = true;	// tel get_sync_collection_token that we have more entries
+				$files['sync-token-params'][] = true; // tel get_sync_collection_token that we have more entries
 			}
 		}
 		else
 		{
 			// return iterator, calling ourself to return result in chunks
-			$files['files'] = new Api\CalDAV\PropfindIterator($this,$path,$filter,$files['files']);
+			$files['files'] = new Api\CalDAV\PropfindIterator($this, $path, $filter, $files['files']);
 		}
 		if (isset($_GET['download']))
 		{
@@ -286,9 +286,9 @@ 
 		Api\Header\Content::type('calendar.ics', 'text/calendar');
 
 		$n = 0;
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if (!$n++) continue;	// first entry is collection itself
+			if (!$n++) continue; // first entry is collection itself
 
 			$icalendar = $file['props']['calendar-data']['val'];
 			if (($start = strpos($icalendar, 'BEGIN:VEVENT')) !== false &&
@@ -312,7 +312,7 @@ 
 						echo substr($icalendar, 0, $start);
 					}
 				}
-				echo substr($icalendar, $start, $end-$start);
+				echo substr($icalendar, $start, $end - $start);
 			}
 		}
 		if ($icalendar && $end)
@@ -330,12 +330,12 @@ 
 	 * @param array|boolean $start =false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
-	function &propfind_callback($path,array $filter,$start=false)
+	function &propfind_callback($path, array $filter, $start = false)
 	{
 		if ($this->debug) $starttime = microtime(true);
 
 		$calendar_data = $this->caldav->prop_requested('calendar-data', Api\CalDAV::CALDAV, true);
-		if (!is_array($calendar_data)) $calendar_data = false;	// not in allprop or autoindex
+		if (!is_array($calendar_data)) $calendar_data = false; // not in allprop or autoindex
 
 		$files = array();
 
@@ -347,11 +347,11 @@ 
 		$requested_multiget_ids = (array)$filter['query'][self::$path_attr];
 		$sync_collection = $filter['sync-collection'];
 
-		$events =& $this->bo->search($filter);
+		$events = & $this->bo->search($filter);
 
 		if ($events)
 		{
-			foreach($events as $event)
+			foreach ($events as $event)
 			{
 				// remove event from requested multiget ids, to be able to report not found urls
 				if ($requested_multiget_ids && ($k = array_search($event[self::$path_attr], $requested_multiget_ids)) !== false)
@@ -359,7 +359,7 @@ 
 					unset($requested_multiget_ids[$k]);
 				}
 				// sync-collection report: deleted entries need to be reported without properties, same for rejected or deleted invitations
-				if ($sync_collection && ($event['deleted'] && !$event['cal_reference'] || in_array($event['participants'][$filter['users']][0], array('R','X'))))
+				if ($sync_collection && ($event['deleted'] && !$event['cal_reference'] || in_array($event['participants'][$filter['users']][0], array('R', 'X'))))
 				{
 					$files[] = array('path' => $path.urldecode($this->get_path($event)));
 					continue;
@@ -390,7 +390,7 @@ 
 						!isset($calendar_data['children']['expand']) ? false :
 							($calendar_data['children']['expand']['attrs'] ? $calendar_data['children']['expand']['attrs'] : true));
 					$props['getcontentlength'] = bytes($content);
-					$props['calendar-data'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-data',$content);
+					$props['calendar-data'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-data', $content);
 				}
 				/* Calendarserver reports new events with schedule-changes: action: create, which iCal request
 				 * adding it, unfortunately does not lead to showing the new event in the users inbox
@@ -409,7 +409,7 @@ 
 		// report not found multiget urls
 		if ($requested_multiget_ids)
 		{
-			foreach($requested_multiget_ids as $id)
+			foreach ($requested_multiget_ids as $id)
 			{
 				$files[] = array('path' => $path.$id.self::$path_extension);
 			}
@@ -445,7 +445,7 @@ 
 	private function _created_updated_by_prop($user, $time)
 	{
 		$props = array();
-		foreach(array(
+		foreach (array(
 			'first-name' => 'account_firstname',
 			'last-name' => 'account_lastname',
 			'href' => 'account_email',
@@ -488,23 +488,23 @@ 
 			$cal_end = $cal_filters['end']; unset($cal_filters['end']);
 			$num_filters = count($cal_filters);
 
-			foreach($options['filters'] as $filter)
+			foreach ($options['filters'] as $filter)
 			{
-				switch($filter['name'])
+				switch ($filter['name'])
 				{
 					case 'comp-filter':
 						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
 
-						switch($filter['attrs']['name'])
+						switch ($filter['attrs']['name'])
 						{
 							case 'VTODO':
-								return false;	// return nothing for now, todo: check if we can pass it on to the infolog handler
+								return false; // return nothing for now, todo: check if we can pass it on to the infolog handler
 								// todos are handled by the infolog handler
 								//$infolog_handler = new groupdav_infolog();
 								//return $infolog_handler->propfind($options['path'],$options,$options['files'],$user,$method);
 							case 'VCALENDAR':
 							case 'VEVENT':
-								break;			// that's our default anyway
+								break; // that's our default anyway
 						}
 						break;
 					case 'prop-filter':
@@ -527,14 +527,14 @@ 
 						if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
 						break;
 					case 'time-range':
-				 		if ($this->debug > 1) error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
+				 		if ($this->debug > 1) error_log(__FILE__.__METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
 				 		if (!empty($filter['attrs']['start']))
 				 		{
 					 		$cal_filters['start'] = $this->vCalendar->_parseDateTime($filter['attrs']['start']);
 				 		}
 				 		if (!empty($filter['attrs']['end']))
 				 		{
-					 		$cal_filters['end']   = $this->vCalendar->_parseDateTime($filter['attrs']['end']);
+					 		$cal_filters['end'] = $this->vCalendar->_parseDateTime($filter['attrs']['end']);
 				 		}
 						break;
 					default:
@@ -555,9 +555,9 @@ 
 		    <B:nresults>10</B:nresults>
 		  </B:limit>
 		*/
-		foreach((array)$options['other'] as $option)
+		foreach ((array)$options['other'] as $option)
 		{
-			switch($option['name'])
+			switch ($option['name'])
 			{
 				case 'nresults':
 					$nresults = (int)$option['data'];
@@ -566,7 +566,7 @@ 
 				case 'limit':
 					break;
 				case 'href':
-					break;	// from addressbook-multiget, handled below
+					break; // from addressbook-multiget, handled below
 				// rfc 6578 sync-report
 				case 'sync-token':
 					if (!empty($option['data']))
@@ -574,7 +574,7 @@ 
 						$parts = explode('/', $option['data']);
 						$sync_token = array_pop($parts);
 						$cal_filters['query'][] = 'cal_modified>'.(int)$sync_token;
-						$cal_filters['filter'] = 'everything';	// to return deleted entries too
+						$cal_filters['filter'] = 'everything'; // to return deleted entries too
 						// no standard time-range!
 						unset($cal_filters['start']);
 					}
@@ -603,25 +603,25 @@ 
 			if ($id)
 			{
 				$cal_filters['query'][self::$path_attr] = self::$path_extension ?
-					basename($id,self::$path_extension) : $id;
+					basename($id, self::$path_extension) : $id;
 			}
 			else	// fetch all given url's
 			{
-				foreach($options['other'] as $option)
+				foreach ($options['other'] as $option)
 				{
 					if ($option['name'] == 'href')
 					{
-						$parts = explode('/',$option['data']);
+						$parts = explode('/', $option['data']);
 						if (($id = urldecode(array_pop($parts))))
 						{
 							$cal_filters['query'][self::$path_attr][] = self::$path_extension ?
-								basename($id,self::$path_extension) : $id;
+								basename($id, self::$path_extension) : $id;
 						}
 					}
 				}
 			}
 
-			if ($this->debug > 1) error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids).', cal_filters='.array2string($cal_filters));
+			if ($this->debug > 1) error_log(__FILE__.__METHOD__."($options[path],...,$id) calendar-multiget: ids=".implode(',', $ids).', cal_filters='.array2string($cal_filters));
 		}
 		return true;
 	}
@@ -634,9 +634,9 @@ 
 	 * @param int $user =null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function get(&$options,$id,$user=null)
+	function get(&$options, $id, $user = null)
 	{
-		if (!is_array($event = $this->_common_get_put_delete('GET',$options,$id)))
+		if (!is_array($event = $this->_common_get_put_delete('GET', $options, $id)))
 		{
 			return $event;
 		}
@@ -664,7 +664,7 @@ 
 	 * @param boolean|array $expand =false true or array with values for 'start', 'end' to expand recurrences
 	 * @return string
 	 */
-	private function iCal(array $event,$user=null, $method=null, $expand=false)
+	private function iCal(array $event, $user = null, $method = null, $expand = false)
 	{
 		static $handler = null;
 		if (is_null($handler)) $handler = $this->_get_handler();
@@ -688,13 +688,13 @@ 
 				if (isset($expand['start'])) $expand['start'] = $this->vCalendar->_parseDateTime($expand['start']);
 				if (isset($expand['end'])) $expand['end'] = $this->vCalendar->_parseDateTime($expand['end']);
 			}
-			$events =& self::get_series($event['uid'], $this->bo, $expand, $user);
+			$events = & self::get_series($event['uid'], $this->bo, $expand, $user);
 			// as alarm is now only on next recurrence, set alarm from original event on master
 			if ($event['alarm']) $events[0]['alarm'] = $event['alarm'];
 		}
-		elseif(!$this->client_shared_uid_exceptions && $event['reference'])
+		elseif (!$this->client_shared_uid_exceptions && $event['reference'])
 		{
-			$events[0]['uid'] .= '-'.$event['id'];	// force a different uid
+			$events[0]['uid'] .= '-'.$event['id']; // force a different uid
 		}
 		return $handler->exportVCal($events, '2.0', $method);
 	}
@@ -710,20 +710,20 @@ 
 	 * @param int $user =null account_id of calendar to display, to remove master, if current user does not participate in
 	 * @return array
 	 */
-	private static function &get_series($uid,calendar_bo $bo=null, $expand=false, $user=null)
+	private static function &get_series($uid, calendar_bo $bo = null, $expand = false, $user = null)
 	{
 		if (is_null($bo)) $bo = new calendar_bopdate();
 
 		$params = array(
 			'query' => array('cal_uid' => $uid),
-			'filter' => 'owner',  // return all possible entries
+			'filter' => 'owner', // return all possible entries
 			'daywise' => false,
 			'date_format' => 'server',
-			'cfs' => array(),	// read cfs as we use them to store X- attributes
+			'cfs' => array(), // read cfs as we use them to store X- attributes
 		);
 		if (is_array($expand)) $params += $expand;
 
-		if (!($events =& $bo->search($params)))
+		if (!($events = & $bo->search($params)))
 		{
 			return array();
 		}
@@ -731,12 +731,12 @@ 
 		// find master, which is not always first event, eg. when first event is an exception
 		$master = null;
 		$exceptions = array();
-		foreach($events as $k => &$recurrence)
+		foreach ($events as $k => &$recurrence)
 		{
 			if ($recurrence['recur_type'])
 			{
 				$master = $recurrence;
-				$exceptions =& $master['recur_exception'];
+				$exceptions = & $master['recur_exception'];
 				unset($events[$k]);
 				break;
 			}
@@ -744,13 +744,13 @@ 
 		// if recurring event starts in future behind horizont, nothing will be returned by bo::search()
 		if (!isset($master)) $master = $bo->read($uid);
 
-		foreach($events as $k => &$recurrence)
+		foreach ($events as $k => &$recurrence)
 		{
 			//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($uid)[$k]:" . array2string($recurrence));
 			if ($master && $recurrence['reference'] != $master['id'])
 			{
 				unset($events[$k]);
-				continue;	// same uid, but references a different event or is own master
+				continue; // same uid, but references a different event or is own master
 			}
 			if (!$master || $recurrence['id'] != $master['id'])	// real exception
 			{
@@ -771,11 +771,11 @@ 
 				// at least Lightning "understands" EXDATE as exception from what's included
 				// in the whole resource / VCALENDAR component
 				// not removing it causes Lightning to remove the exception itself
-				if (($e = array_search($recurrence['recurrence'],$exceptions)) !== false)
+				if (($e = array_search($recurrence['recurrence'], $exceptions)) !== false)
 				{
 					unset($exceptions[$e]);
 				}
-				continue;	// nothing to change
+				continue; // nothing to change
 			}
 			// add alarms from master to recurrences, as clients otherwise have no alarms on virtual exceptions
 			if ($master && $master['alarm'])
@@ -786,14 +786,14 @@ 
 			if (!$expand && $master && $master['participants'] == $recurrence['participants'])
 			{
 				//error_log('NO exception: '.array2string($recurrence));
-				unset($events[$k]);	// no exception --> remove it
+				unset($events[$k]); // no exception --> remove it
 				continue;
 			}
 			// this is a virtual exception now (no extra event/cal_id in DB)
 			//error_log('virtual exception: '.array2string($recurrence));
 			$recurrence['recurrence'] = $recurrence['start'];
 			if ($master) $recurrence['reference'] = $master['id'];
-			$recurrence['recur_type'] = MCAL_RECUR_NONE;	// is set, as this is a copy of the master
+			$recurrence['recur_type'] = MCAL_RECUR_NONE; // is set, as this is a copy of the master
 			// not for included exceptions (Lightning): $master['recur_exception'][] = $recurrence['start'];
 		}
 		// only add master if we are not expanding and current user participates in master (and not just some exceptions)
@@ -829,11 +829,11 @@ 
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options,$id,$user=null,$prefix=null)
+	function put(&$options, $id, $user = null, $prefix = null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options, true));
 
-		if (!$prefix) $user = null;	// /infolog/ does not imply setting the current user (for new entries it's done anyway)
+		if (!$prefix) $user = null; // /infolog/ does not imply setting the current user (for new entries it's done anyway)
 
 		// work around missing handling / racecondition in Lightning, if event already exists on server,
 		// but Lightning has not yet synced with the server: Lightning just retries the PUT, not GETing the event
@@ -850,12 +850,12 @@ 
 		{
 			$_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH'] = $_SERVER['HTTP_IF_SCHEDULE'];
 		}
-		$return_no_access = true;	// as handled by importVCal anyway and allows it to set the status for participants
-		$oldEvent = $this->_common_get_put_delete('PUT',$options,$id,$return_no_access,
-			isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']));	// dont fail with 412 Precondition Failed in that case
+		$return_no_access = true; // as handled by importVCal anyway and allows it to set the status for participants
+		$oldEvent = $this->_common_get_put_delete('PUT', $options, $id, $return_no_access,
+			isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH'])); // dont fail with 412 Precondition Failed in that case
 		if (!is_null($oldEvent) && !is_array($oldEvent))
 		{
-			if ($this->debug) error_log(__METHOD__.': '.print_r($oldEvent,true).function_backtrace());
+			if ($this->debug) error_log(__METHOD__.': '.print_r($oldEvent, true).function_backtrace());
 			return $oldEvent;
 		}
 
@@ -947,7 +947,7 @@ 
 				if (($events = $handler->icaltoegw($vCalendar)))
 				{
 					$modified = 0;
-					foreach($events as $n => $event)
+					foreach ($events as $n => $event)
 					{
 						// for recurrances of event series, we need to read correct recurrence (or if series master is no first event)
 						if ($event['recurrence'] || $n && !$event['recurrence'] || isset($series))
@@ -958,7 +958,7 @@ 
 								$series = self::get_series($event['uid'], $this->bo);
 								//foreach($series as $s => $sEvent) error_log("series[$s]: ".array2string($sEvent));
 							}
-							foreach($series as $oldEvent)
+							foreach ($series as $oldEvent)
 							{
 								if ($oldEvent['recurrence'] == $event['recurrence']) break;
 							}
@@ -1023,9 +1023,9 @@ 
 					isset($oldEvent['participants'][$GLOBALS['egw_info']['user']['account_id']]))
 				{
 					// just update etag in database
-					$GLOBALS['egw']->db->update($this->bo->so->cal_table,'cal_etag=cal_etag+1',array(
+					$GLOBALS['egw']->db->update($this->bo->so->cal_table, 'cal_etag=cal_etag+1', array(
 						'cal_id' => $eventId,
-					),__LINE__,__FILE__,'calendar');
+					), __LINE__, __FILE__, 'calendar');
 				}
 			}
 		}
@@ -1077,9 +1077,9 @@ 
 	 * @param int $user =null account_id of owner, default null
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function post(&$options,$id,$user=null)
+	function post(&$options, $id, $user = null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options, true));
 
 		$vCalendar = htmlspecialchars_decode($options['content']);
 		$charset = null;
@@ -1101,7 +1101,7 @@ 
 			}
 		}
 
-		if (substr($options['path'],-8) == '/outbox/')
+		if (substr($options['path'], -8) == '/outbox/')
 		{
 			if (preg_match('/^METHOD:REQUEST(\r\n|\r|\n)(.*)^BEGIN:VFREEBUSY/ism', $vCalendar))
 			{
@@ -1152,7 +1152,7 @@ 
 	 */
 	protected function outbox_freebusy_request($ical, $charset, $user, array &$options)
 	{
-		unset($options);	// not used, but required by function signature
+		unset($options); // not used, but required by function signature
 
 		$vcal = new Horde_Icalendar();
 		if (!$vcal->parsevCalendar($ical, 'VCALENDAR', $charset))
@@ -1165,7 +1165,7 @@ 
 
 		$handler = $this->_get_handler();
 		$handler->setSupportedFields('groupdav');
-		$handler->calendarOwner = $handler->user = 0;	// to NOT default owner/organizer to something
+		$handler->calendarOwner = $handler->user = 0; // to NOT default owner/organizer to something
 		if (!($component = $vcal->getComponent(0)) ||
 			!($event = $handler->vevent2egw($component, $version, $handler->supportedFields, $this->caldav->current_user_principal, 'Horde_Icalendar_Vfreebusy')))
 		{
@@ -1190,13 +1190,13 @@ 
 		$xml->startDocument('1.0', 'UTF-8');
 		$xml->startElementNs('C', 'schedule-response', Api\CalDAV::CALDAV);
 
-		foreach(array_keys($event['participants']) as $uid)
+		foreach (array_keys($event['participants']) as $uid)
 		{
 			$xml->startElementNs('C', 'response', null);
 
 			$xml->startElementNs('C', 'recipient', null);
-			$xml->writeElementNs('D', 'href', 'DAV:', $attendee=array_shift($attendees));
-			$xml->endElement();	// recipient
+			$xml->writeElementNs('D', 'href', 'DAV:', $attendee = array_shift($attendees));
+			$xml->endElement(); // recipient
 
 			$xml->writeElementNs('C', 'request-status', null, '2.0;Success');
 			$xml->writeElementNs('C', 'calendar-data', null,
@@ -1204,13 +1204,13 @@ 
 					'UID' => $event['uid'],
 					'ORGANIZER' => $organizer,
 					'ATTENDEE' => $attendee,
-				)+(empty($mask_uid) || !is_string($mask_uid) ? array() : array(
+				) + (empty($mask_uid) || !is_string($mask_uid) ? array() : array(
 					'X-CALENDARSERVER-MASK-UID' => $mask_uid,
 				))));
 
-			$xml->endElement();	// response
+			$xml->endElement(); // response
 		}
-		$xml->endElement();	// schedule-response
+		$xml->endElement(); // schedule-response
 		$xml->endDocument();
 		echo $xml->outputMemory();
 
@@ -1225,14 +1225,14 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function free_busy_report($path,$options,$user)
+	function free_busy_report($path, $options, $user)
 	{
-		unset($path);	// unused, but required by function signature
+		unset($path); // unused, but required by function signature
 		if (!$this->bo->check_perms(calendar_bo::ACL_FREEBUSY, 0, $user))
 		{
 			return '403 Forbidden';
 		}
-		foreach($options['other'] as $filter)
+		foreach ($options['other'] as $filter)
 		{
 			if ($filter['name'] == 'time-range')
 			{
@@ -1244,7 +1244,7 @@ 
 		header('Content-Type: text/calendar');
 		echo $handler->freebusy($user, $end, true, 'utf-8', $start, 'REPLY', array());
 
-		exit();	// otherwise we get a 207 multistatus, not 200 Ok
+		exit(); // otherwise we get a 207 multistatus, not 200 Ok
 	}
 
 	/**
@@ -1256,7 +1256,7 @@ 
 	 * @param int $user =null owner of the collection, default current user
 	 * @return array with privileges
 	 */
-	public function current_user_privileges($path, $user=null)
+	public function current_user_privileges($path, $user = null)
 	{
 		$privileges = parent::current_user_privileges($path, $user);
 		//error_log(__METHOD__."('$path', $user) parent gave ".array2string($privileges));
@@ -1299,7 +1299,7 @@ 
 
 		// get array with orginal recurrences indexed by recurrence-id
 		$org_recurrences = $exceptions = array();
-		foreach(self::get_series($events[0]['uid'],$bo) as $k => $event)
+		foreach (self::get_series($events[0]['uid'], $bo) as $k => $event)
 		{
 			if (!$k) $master = $event;
 			if ($event['recurrence'])
@@ -1309,13 +1309,13 @@ 
 		}
 
 		// assign cal_id's to already existing recurrences and evtl. re-add recur_exception to master
-		foreach($events as $k => &$recurrence)
+		foreach ($events as $k => &$recurrence)
 		{
 			if (!$recurrence['recurrence'])
 			{
 				// master
 				$recurrence['id'] = $master['id'];
-				$master =& $events[$k];
+				$master = & $events[$k];
 				continue;
 			}
 
@@ -1339,12 +1339,12 @@ 
 		$master['recur_exception'] = array_merge($exceptions, $master['recur_exception']);
 
 		// delete not longer existing recurrences
-		foreach($org_recurrences as $org_recurrence)
+		foreach ($org_recurrences as $org_recurrence)
 		{
 			if ($org_recurrence['id'] != $master['id'])	// non-virtual recurrence
 			{
 				//error_log(__METHOD__.'() deleting #'.$org_recurrence['id']);
-				$bo->delete($org_recurrence['id']);	// might fail because of permissions
+				$bo->delete($org_recurrence['id']); // might fail because of permissions
 			}
 			else	// virtual recurrence
 			{
@@ -1366,14 +1366,14 @@ 
 	 * @param int $user account_id of collection owner
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function delete(&$options,$id,$user)
+	function delete(&$options, $id, $user)
 	{
 		if (strpos($options['path'], '/inbox/') !== false)
 		{
-			return true;	// simply ignore DELETE in inbox for now
+			return true; // simply ignore DELETE in inbox for now
 		}
-		$return_no_access = true;	// to allow to check if current use is a participant and reject the event for him
-		if (!is_array($event = $this->_common_get_put_delete('DELETE',$options,$id,$return_no_access)) || !$return_no_access ||
+		$return_no_access = true; // to allow to check if current use is a participant and reject the event for him
+		if (!is_array($event = $this->_common_get_put_delete('DELETE', $options, $id, $return_no_access)) || !$return_no_access ||
 			// Work around problems with Outlook CalDAV Synchroniser (https://caldavsynchronizer.org/)
 			// - sends a DELETE to reject a meeting request --> deletes event for all participants, if user has delete rights on the calendar
 			// --> only set status for everyone else but the organizer
@@ -1384,11 +1384,11 @@ 
 				// check if user is a participant or one of the groups he is a member of --> reject the meeting request
 				$ret = '403 Forbidden';
 				$memberships = $GLOBALS['egw']->accounts->memberships($this->bo->user, true);
-				foreach(array_keys($event['participants']) as $uid)
+				foreach (array_keys($event['participants']) as $uid)
 				{
 					if ($this->bo->user == $uid || in_array($uid, $memberships))
 					{
-						$this->bo->set_status($event,$this->bo->user, 'R');
+						$this->bo->set_status($event, $this->bo->user, 'R');
 						$ret = true;
 						break;
 					}
@@ -1403,7 +1403,7 @@ 
 		{
 			$ret = $this->bo->delete($event['id']);
 		}
-		if ($this->debug) error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event)?$event['participants']:null).", user={$this->bo->user} --> return ".array2string($ret));
+		if ($this->debug) error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event) ? $event['participants'] : null).", user={$this->bo->user} --> return ".array2string($ret));
 		return $ret;
 	}
 
@@ -1418,12 +1418,12 @@ 
 	 */
 	function read($id)
 	{
-		if (strpos($column=self::$path_attr,'_') === false) $column = 'cal_'.$column;
+		if (strpos($column = self::$path_attr, '_') === false) $column = 'cal_'.$column;
 
 		$event = $this->bo->read(array($column => $id, 'cal_deleted IS NULL', 'cal_reference=0'), null, true, 'server');
-		if ($event) $event = array_shift($event);	// read with array as 1. param, returns an array of events!
+		if ($event) $event = array_shift($event); // read with array as 1. param, returns an array of events!
 
-		if (!($retval = $this->bo->check_perms(calendar_bo::ACL_FREEBUSY,$event, 0, 'server')) &&
+		if (!($retval = $this->bo->check_perms(calendar_bo::ACL_FREEBUSY, $event, 0, 'server')) &&
 			// above can be true, if current user is not in master but just a recurrence
 			(!$event['recur_type'] || !($events = self::get_series($event['uid'], $this->bo))))
 		{
@@ -1459,11 +1459,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function getctag($path,$user)
+	public function getctag($path, $user)
 	{
-		$ctag = $this->bo->get_ctag($user,$path == '/calendar/' ? 'owner' : 'default'); // default = not rejected
+		$ctag = $this->bo->get_ctag($user, $path == '/calendar/' ? 'owner' : 'default'); // default = not rejected
 
-		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
+		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($path)[$user] = $ctag");
 
 		return $ctag;
 	}
@@ -1475,7 +1475,7 @@ 
 	 * @param string $schedule_tag =null on return schedule-tag
 	 * @return string|boolean string with etag or false
 	 */
-	function get_etag($entry, &$schedule_tag=null)
+	function get_etag($entry, &$schedule_tag = null)
 	{
 		$etag = $this->bo->get_etag($entry, $schedule_tag, $this->client_shared_uid_exceptions);
 
@@ -1493,7 +1493,7 @@ 
 	 * @param int|string $retval
 	 * @param boolean $path_attr_is_name =true true: path_attr is ca(l|rd)dav_name, false: id (GroupDAV needs Location header)
 	 */
-	function put_response_headers($entry, $path, $retval, $path_attr_is_name=true)
+	function put_response_headers($entry, $path, $retval, $path_attr_is_name = true)
 	{
 		$schedule_tag = null;
 		$etag = $this->get_etag($entry, $schedule_tag);
@@ -1512,14 +1512,14 @@ 
 	 * @param array|int $event event-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	function check_access($acl,$event)
+	function check_access($acl, $event)
 	{
 		if ($acl == Acl::READ)
 		{
 			// we need at least calendar_bo::ACL_FREEBUSY to get some information
 			$acl = calendar_bo::ACL_FREEBUSY;
 		}
-		return $this->bo->check_perms($acl,$event,0,'server');
+		return $this->bo->check_perms($acl, $event, 0, 'server');
 	}
 
 	/**
@@ -1532,52 +1532,52 @@ 
 	 * @param string $path =null path of the collection
 	 * @return array
 	 */
-	public function extra_properties(array $props, $displayname, $base_uri=null, $user=null, $path=null)
+	public function extra_properties(array $props, $displayname, $base_uri = null, $user = null, $path = null)
 	{
-		unset($base_uri);	// unused, but required by function signature
+		unset($base_uri); // unused, but required by function signature
 		if (!isset($props['calendar-description']))
 		{
 			// default calendar description: can be overwritten via PROPPATCH, in which case it's already set
-			$props['calendar-description'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-description',$displayname);
+			$props['calendar-description'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-description', $displayname);
 		}
 		$supported_components = array(
-			Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'comp',array('name' => 'VEVENT')),
+			Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'comp', array('name' => 'VEVENT')),
 		);
 		// outbox supports VFREEBUSY too, it is required from OS X iCal to autocomplete locations
-		if (substr($path,-8) == '/outbox/')
+		if (substr($path, -8) == '/outbox/')
 		{
-			$supported_components[] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'comp',array('name' => 'VFREEBUSY'));
+			$supported_components[] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'comp', array('name' => 'VFREEBUSY'));
 		}
 		$props['supported-calendar-component-set'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,
-			'supported-calendar-component-set',$supported_components);
+			'supported-calendar-component-set', $supported_components);
 		// supported reports
 		$props['supported-report-set'] = array(
-			'calendar-query' => Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-query',''))))),
-			'calendar-multiget' => Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-multiget',''))))),
-			'free-busy-query' => Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'free-busy-query',''))))),
+			'calendar-query' => Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-query', ''))))),
+			'calendar-multiget' => Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-multiget', ''))))),
+			'free-busy-query' => Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'free-busy-query', ''))))),
 		);
 		// rfc 6578 sync-collection report for everything but outbox
 		// only if "delete-prevention" is switched on (deleted entries get marked deleted but not actualy deleted
 		if (strpos($path, '/outbox/') === false && $GLOBALS['egw_info']['server']['calendar_delete_history'])
 		{
-			$props['supported-report-set']['sync-collection'] = Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop('sync-collection','')))));
+			$props['supported-report-set']['sync-collection'] = Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop('sync-collection', '')))));
 		}
-		$props['supported-calendar-data'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'supported-calendar-data',array(
-			Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-data', array('content-type' => 'text/calendar', 'version'=> '2.0')),
-			Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-data', array('content-type' => 'text/x-calendar', 'version'=> '1.0'))));
+		$props['supported-calendar-data'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'supported-calendar-data', array(
+			Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-data', array('content-type' => 'text/calendar', 'version'=> '2.0')),
+			Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-data', array('content-type' => 'text/x-calendar', 'version'=> '1.0'))));
 
 		// get timezone of calendar
 		if ($this->caldav->prop_requested('calendar-timezone'))
 		{
-			$props['calendar-timezone'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-timezone',
+			$props['calendar-timezone'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-timezone',
 				calendar_timezones::user_timezone($user));
 		}
 		return $props;
@@ -1591,9 +1591,9 @@ 
 	private function _get_handler()
 	{
 		$handler = new calendar_ical();
-		$handler->setSupportedFields('GroupDAV',$this->agent);
-		$handler->supportedFields['attachments'] = true;	// enabling attachments
-		if ($this->debug > 1) error_log("ical Handler called: " . $this->agent);
+		$handler->setSupportedFields('GroupDAV', $this->agent);
+		$handler->supportedFields['attachments'] = true; // enabling attachments
+		if ($this->debug > 1) error_log("ical Handler called: ".$this->agent);
 		return $handler;
 	}
 
@@ -1608,7 +1608,7 @@ 
 		$pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-home-set'];
 		$calendar_home_set = $pref ? explode(',', $pref) : array();
 		// replace symbolic id's with real nummeric id's
-		foreach(array(
+		foreach (array(
 			'G' => $GLOBALS['egw_info']['user']['account_primary_group'],
 		) as $sym => $id)
 		{
@@ -1617,11 +1617,11 @@ 
 				$calendar_home_set[$key] = $id;
 			}
 		}
-		foreach(ExecMethod('calendar.calendar_bo.list_cals') as $entry)
+		foreach (ExecMethod('calendar.calendar_bo.list_cals') as $entry)
 		{
 			$id = $entry['grantor'];
-			if ($id && $GLOBALS['egw_info']['user']['account_id'] != $id &&	// no current user
-				(in_array('A',$calendar_home_set) || in_array((string)$id,$calendar_home_set)) &&
+			if ($id && $GLOBALS['egw_info']['user']['account_id'] != $id && // no current user
+				(in_array('A', $calendar_home_set) || in_array((string)$id, $calendar_home_set)) &&
 				is_numeric($id) && ($owner = $this->accounts->id2name($id)))
 			{
 				$shared[$id] = 'calendar-'.$owner;
@@ -1630,11 +1630,11 @@ 
 		// shared locations and resources
 		if ($GLOBALS['egw_info']['user']['apps']['resources'])
 		{
-			foreach(array('locations','resources') as $res)
+			foreach (array('locations', 'resources') as $res)
 			{
 				if (($pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-home-set-'.$res]))
 				{
-					foreach(explode(',', $pref) as $res_id)
+					foreach (explode(',', $pref) as $res_id)
 					{
 						$is_location = $res == 'locations';
 						$shared['r'.$res_id] = str_replace('s/', '-', Api\CalDAV\Principals::resource2name($res_id, $is_location));
@@ -1664,7 +1664,7 @@ 
 			{
 				$calendars[$entry['grantor']] = $entry['name'];
 			}
-			if ($user > 0) unset($calendars[$user]);	// skip current user
+			if ($user > 0) unset($calendars[$user]); // skip current user
 		}
 
 		$settings = array();
@@ -1672,7 +1672,7 @@ 
 			'type'   => 'multiselect',
 			'label'  => 'Calendars to sync in addition to personal calendar',
 			'name'   => 'calendar-home-set',
-			'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likly not be suppored!').'<br/>'.lang('They will be sub-folders in users home (%1 attribute).','CalDAV "calendar-home-set"'),
+			'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likly not be suppored!').'<br/>'.lang('They will be sub-folders in users home (%1 attribute).', 'CalDAV "calendar-home-set"'),
 			'values' => $calendars,
 			'xmlrpc' => True,
 			'admin'  => False,
@@ -1698,7 +1698,7 @@ 
 		if ($GLOBALS['egw_info']['user']['apps']['resources'] && ($all_resources = Api\CalDAV\Principals::get_resources()))
 		{
 			$resources = $locations = array();
-			foreach($all_resources as $resource)
+			foreach ($all_resources as $resource)
 			{
 				if (Api\CalDAV\Principals::resource_is_location($resource))
 				{
@@ -1709,7 +1709,7 @@ 
 					$resources[$resource['res_id']] = $resource['name'];
 				}
 			}
-			foreach(array(
+			foreach (array(
 				'locations' => $locations,
 				'resources' => $resources,
 			) as $name => $options)
@@ -1722,7 +1722,7 @@ 
 						'label'  => lang('%1 to sync', lang($name == 'locations' ? 'Location calendars' : 'Resource calendars')),
 						'no_lang'=> true,
 						'name'   => 'calendar-home-set-'.$name,
-						'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likly not be suppored!').'<br/>'.lang('They will be sub-folders in users home (%1 attribute).','CalDAV "calendar-home-set"'),
+						'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likly not be suppored!').'<br/>'.lang('They will be sub-folders in users home (%1 attribute).', 'CalDAV "calendar-home-set"'),
 						'values' => $options,
 						'xmlrpc' => True,
 						'admin'  => False,

Braces +229 added lines, -57 removed lines

@@ -132,7 +132,10 @@ 
 		}
 		else
 		{
-			if (!is_array($event)) $event = $this->bo->read($event);
+			if (!is_array($event))
+			{
+				$event = $this->bo->read($event);
+			}
 			$name = $event[self::$path_attr];
 		}
 		$name .= self::$path_extension;
@@ -193,10 +196,13 @@ 
 			}
 			$filter[$name] = $this->bo->now + 24*3600*($name == 'start' ? -1 : 1)*abs($value);
 		}
-		if ($this->client_shared_uid_exceptions)	// do NOT return (non-virtual) exceptions
+		if ($this->client_shared_uid_exceptions)
+		{
+			// do NOT return (non-virtual) exceptions
 		{
 			$filter['query'] = array('cal_reference' => 0);
 		}
+		}
 
 		if ($path == '/calendar/')
 		{
@@ -226,7 +232,11 @@ 
 			// when trying to request not supported components, eg. VTODO on a calendar collection
 			return true;
 		}
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id)
+		{
+			$path = dirname($path).'/';
+		}
+		// caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -288,7 +298,11 @@ 
 		$n = 0;
 		foreach($files as $file)
 		{
-			if (!$n++) continue;	// first entry is collection itself
+			if (!$n++)
+			{
+				continue;
+			}
+			// first entry is collection itself
 
 			$icalendar = $file['props']['calendar-data']['val'];
 			if (($start = strpos($icalendar, 'BEGIN:VEVENT')) !== false &&
@@ -332,10 +346,17 @@ 
 	 */
 	function &propfind_callback($path,array $filter,$start=false)
 	{
-		if ($this->debug) $starttime = microtime(true);
+		if ($this->debug)
+		{
+			$starttime = microtime(true);
+		}
 
 		$calendar_data = $this->caldav->prop_requested('calendar-data', Api\CalDAV::CALDAV, true);
-		if (!is_array($calendar_data)) $calendar_data = false;	// not in allprop or autoindex
+		if (!is_array($calendar_data))
+		{
+			$calendar_data = false;
+		}
+		// not in allprop or autoindex
 
 		$files = array();
 
@@ -493,7 +514,10 @@ 
 				switch($filter['name'])
 				{
 					case 'comp-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						}
 
 						switch($filter['attrs']['name'])
 						{
@@ -508,14 +532,23 @@ 
 						}
 						break;
 					case 'prop-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						}
 						$prop_filter = $filter['attrs']['name'];
 						break;
 					case 'text-match':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						}
 						if (!isset($this->filter_prop2cal[strtoupper($prop_filter)]))
 						{
-							if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							if ($this->debug)
+							{
+								error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							}
 						}
 						else
 						{
@@ -524,10 +557,16 @@ 
 						unset($prop_filter);
 						break;
 					case 'param-filter':
-						if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						}
 						break;
 					case 'time-range':
-				 		if ($this->debug > 1) error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
+				 		if ($this->debug > 1)
+				 		{
+				 			error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
+				 		}
 				 		if (!empty($filter['attrs']['start']))
 				 		{
 					 		$cal_filters['start'] = $this->vCalendar->_parseDateTime($filter['attrs']['start']);
@@ -538,13 +577,19 @@ 
 				 		}
 						break;
 					default:
-						if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						}
 						break;
 				}
 			}
-			if (count($cal_filters) == $num_filters)	// no filters set --> restore default start and end time
+			if (count($cal_filters) == $num_filters)
+			{
+				// no filters set --> restore default start and end time
 			{
 				$cal_filters['start'] = $cal_start;
+			}
 				$cal_filters['end']   = $cal_end;
 			}
 		}
@@ -621,7 +666,10 @@ 
 				}
 			}
 
-			if ($this->debug > 1) error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids).', cal_filters='.array2string($cal_filters));
+			if ($this->debug > 1)
+			{
+				error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids).', cal_filters='.array2string($cal_filters));
+			}
 		}
 		return true;
 	}
@@ -667,9 +715,15 @@ 
 	private function iCal(array $event,$user=null, $method=null, $expand=false)
 	{
 		static $handler = null;
-		if (is_null($handler)) $handler = $this->_get_handler();
+		if (is_null($handler))
+		{
+			$handler = $this->_get_handler();
+		}
 
-		if (!$user) $user = $GLOBALS['egw_info']['user']['account_id'];
+		if (!$user)
+		{
+			$user = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		// only return alarms in own calendar, not other users calendars
 		if ($user != $GLOBALS['egw_info']['user']['account_id'])
@@ -685,12 +739,21 @@ 
 		{
 			if (is_array($expand))
 			{
-				if (isset($expand['start'])) $expand['start'] = $this->vCalendar->_parseDateTime($expand['start']);
-				if (isset($expand['end'])) $expand['end'] = $this->vCalendar->_parseDateTime($expand['end']);
+				if (isset($expand['start']))
+				{
+					$expand['start'] = $this->vCalendar->_parseDateTime($expand['start']);
+				}
+				if (isset($expand['end']))
+				{
+					$expand['end'] = $this->vCalendar->_parseDateTime($expand['end']);
+				}
 			}
 			$events =& self::get_series($event['uid'], $this->bo, $expand, $user);
 			// as alarm is now only on next recurrence, set alarm from original event on master
-			if ($event['alarm']) $events[0]['alarm'] = $event['alarm'];
+			if ($event['alarm'])
+			{
+				$events[0]['alarm'] = $event['alarm'];
+			}
 		}
 		elseif(!$this->client_shared_uid_exceptions && $event['reference'])
 		{
@@ -712,7 +775,10 @@ 
 	 */
 	private static function &get_series($uid,calendar_bo $bo=null, $expand=false, $user=null)
 	{
-		if (is_null($bo)) $bo = new calendar_bopdate();
+		if (is_null($bo))
+		{
+			$bo = new calendar_bopdate();
+		}
 
 		$params = array(
 			'query' => array('cal_uid' => $uid),
@@ -721,7 +787,10 @@ 
 			'date_format' => 'server',
 			'cfs' => array(),	// read cfs as we use them to store X- attributes
 		);
-		if (is_array($expand)) $params += $expand;
+		if (is_array($expand))
+		{
+			$params += $expand;
+		}
 
 		if (!($events =& $bo->search($params)))
 		{
@@ -742,7 +811,10 @@ 
 			}
 		}
 		// if recurring event starts in future behind horizont, nothing will be returned by bo::search()
-		if (!isset($master)) $master = $bo->read($uid);
+		if (!isset($master))
+		{
+			$master = $bo->read($uid);
+		}
 
 		foreach($events as $k => &$recurrence)
 		{
@@ -752,7 +824,9 @@ 
 				unset($events[$k]);
 				continue;	// same uid, but references a different event or is own master
 			}
-			if (!$master || $recurrence['id'] != $master['id'])	// real exception
+			if (!$master || $recurrence['id'] != $master['id'])
+			{
+				// real exception
 			{
 				// user is NOT participating in this exception
 				if ($user && !self::isParticipant($recurrence, $user))
@@ -761,6 +835,7 @@ 
 					if (!$master || !self::isParticipant($master, $user))
 					{
 						unset($events[$k]);
+			}
 						continue;
 					}
 					// otherwise mark him in this exception as rejected
@@ -792,7 +867,10 @@ 
 			// this is a virtual exception now (no extra event/cal_id in DB)
 			//error_log('virtual exception: '.array2string($recurrence));
 			$recurrence['recurrence'] = $recurrence['start'];
-			if ($master) $recurrence['reference'] = $master['id'];
+			if ($master)
+			{
+				$recurrence['reference'] = $master['id'];
+			}
 			$recurrence['recur_type'] = MCAL_RECUR_NONE;	// is set, as this is a copy of the master
 			// not for included exceptions (Lightning): $master['recur_exception'][] = $recurrence['start'];
 		}
@@ -831,9 +909,16 @@ 
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($id, $user)".print_r($options,true));
+		}
 
-		if (!$prefix) $user = null;	// /infolog/ does not imply setting the current user (for new entries it's done anyway)
+		if (!$prefix)
+		{
+			$user = null;
+		}
+		// /infolog/ does not imply setting the current user (for new entries it's done anyway)
 
 		// work around missing handling / racecondition in Lightning, if event already exists on server,
 		// but Lightning has not yet synced with the server: Lightning just retries the PUT, not GETing the event
@@ -855,7 +940,10 @@ 
 			isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']));	// dont fail with 412 Precondition Failed in that case
 		if (!is_null($oldEvent) && !is_array($oldEvent))
 		{
-			if ($this->debug) error_log(__METHOD__.': '.print_r($oldEvent,true).function_backtrace());
+			if ($this->debug)
+			{
+				error_log(__METHOD__.': '.print_r($oldEvent,true).function_backtrace());
+			}
 			return $oldEvent;
 		}
 
@@ -866,7 +954,10 @@ 
 		{
 			// we have no add permission on this user's calendar
 			// ToDo: create event in current users calendar and invite only $user
-			if ($this->debug) error_log(__METHOD__."(,,$user) we have not enough rights on this calendar");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,,$user) we have not enough rights on this calendar");
+			}
 			return '403 Forbidden';
 		}
 
@@ -913,13 +1004,19 @@ 
 			if ($this->use_schedule_tag && isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']))
 			{
 				$schedule_tag_match = $_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH'];
-				if ($schedule_tag_match[0] == '"') $schedule_tag_match = substr($schedule_tag_match, 1, -1);
+				if ($schedule_tag_match[0] == '"')
+				{
+					$schedule_tag_match = substr($schedule_tag_match, 1, -1);
+				}
 				$schedule_tag = null;
 				$this->get_etag($oldEvent, $schedule_tag);
 
 				if ($schedule_tag_match !== $schedule_tag)
 				{
-					if ($this->debug) error_log(__METHOD__."(,,$user) schedule_tag missmatch: given '$schedule_tag_match' != '$schedule_tag'");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."(,,$user) schedule_tag missmatch: given '$schedule_tag_match' != '$schedule_tag'");
+					}
 					// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 					$this->check_return_representation($options, $id, $user);
 					return '412 Precondition Failed';
@@ -940,7 +1037,10 @@ 
 					// above can be true, if current user is not in master but just a recurrence
 					(!$oldEvent['recur_type'] || !($series = self::get_series($oldEvent['uid'], $this->bo))))
 				{
-					if ($this->debug) error_log(__METHOD__."(,,$user) user $user is NOT an attendee!");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."(,,$user) user $user is NOT an attendee!");
+					}
 					return '403 Forbidden';
 				}
 				// update only participant status and alarms of current user
@@ -960,7 +1060,10 @@ 
 							}
 							foreach($series as $oldEvent)
 							{
-								if ($oldEvent['recurrence'] == $event['recurrence']) break;
+								if ($oldEvent['recurrence'] == $event['recurrence'])
+								{
+									break;
+								}
 							}
 							// if no exception found, check if it might be just a recurrence (no exception)
 							if ($event['recurrence'] && $oldEvent['recurrence'] != $event['recurrence'])
@@ -975,7 +1078,10 @@ 
 								}
 							}
 						}
-						if ($this->debug) error_log(__METHOD__."(, $id, $user, '$prefix') eventId=$eventId ($oldEvent[id]), user=$user, old-status='{$oldEvent['participants'][$user]}', new-status='{$event['participants'][$user]}', recurrence=$event[recurrence]=".Api\DateTime::to($event['recurrence']).", event=".array2string($event));
+						if ($this->debug)
+						{
+							error_log(__METHOD__."(, $id, $user, '$prefix') eventId=$eventId ($oldEvent[id]), user=$user, old-status='{$oldEvent['participants'][$user]}', new-status='{$event['participants'][$user]}', recurrence=$event[recurrence]=".Api\DateTime::to($event['recurrence']).", event=".array2string($event));
+						}
 						if (isset($event['participants']) && isset($event['participants'][$user]) &&
 							$event['participants'][$user] !== $oldEvent['participants'][$user])
 						{
@@ -983,13 +1089,19 @@ 
 								// real (not virtual) exceptions use recurrence 0 in egw_cal_user.cal_recurrence!
 								$recurrence = $eventId == $oldEvent['id'] ? $event['recurrence'] : 0))
 							{
-								if ($this->debug) error_log(__METHOD__."(,,$user) failed to set_status($oldEvent[id], $user, '{$event['participants'][$user]}', $recurrence=".Api\DateTime::to($recurrence).')');
+								if ($this->debug)
+								{
+									error_log(__METHOD__."(,,$user) failed to set_status($oldEvent[id], $user, '{$event['participants'][$user]}', $recurrence=".Api\DateTime::to($recurrence).')');
+								}
 								return '403 Forbidden';
 							}
 							else
 							{
 								++$modified;
-								if ($this->debug) error_log(__METHOD__."() set_status($oldEvent[id], $user, {$event['participants'][$user]} , $recurrence=".Api\DateTime::to($recurrence).')');
+								if ($this->debug)
+								{
+									error_log(__METHOD__."() set_status($oldEvent[id], $user, {$event['participants'][$user]} , $recurrence=".Api\DateTime::to($recurrence).')');
+								}
 							}
 						}
 						// import alarms, if given and changed
@@ -999,15 +1111,21 @@ 
 							$modified += $handler->sync_alarms($event, (array)$oldEvent['alarm'], $user);
 						}
 					}
-					if (!$modified)	// NO modififictions, or none we understood --> log it and return Ok: "204 No Content"
+					if (!$modified)
+					{
+						// NO modififictions, or none we understood --> log it and return Ok: "204 No Content"
 					{
 						$this->caldav->log(__METHOD__."(,,$user) NO changes for current user events=".array2string($events).', old-event='.array2string($oldEvent));
 					}
+					}
 					$this->put_response_headers($eventId, $options['path'], '204 No Content', self::$path_attr == 'caldav_name');
 
 					return '204 No Content';
 				}
-				if ($this->debug && !isset($events)) error_log(__METHOD__."(,,$user) only schedule-tag given for event without participants (only calendar owner) --> handle as regular PUT");
+				if ($this->debug && !isset($events))
+				{
+					error_log(__METHOD__."(,,$user) only schedule-tag given for event without participants (only calendar owner) --> handle as regular PUT");
+				}
 			}
 			if ($return_no_access)
 			{
@@ -1044,17 +1162,23 @@ 
 		if (!($cal_id = $handler->importVCal($vCalendar, $eventId,
 			self::etag2value($this->http_if_match), false, 0, $this->caldav->current_user_principal, $user, $charset, $id)))
 		{
-			if ($this->debug) error_log(__METHOD__."(,$id) eventId=$eventId: importVCal('$options[content]') returned ".array2string($cal_id));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,$id) eventId=$eventId: importVCal('$options[content]') returned ".array2string($cal_id));
+			}
 			if ($eventId && $cal_id === false)
 			{
 				// ignore import failures
 				$cal_id = $eventId;
 				$retval = true;
 			}
-			elseif ($cal_id === 0)	// etag failure
+			elseif ($cal_id === 0)
+			{
+				// etag failure
 			{
 				// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 				$this->check_return_representation($options, $id, $user);
+			}
 				return '412 Precondition Failed';
 			}
 			else
@@ -1079,7 +1203,10 @@ 
 	 */
 	function post(&$options,$id,$user=null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($id, $user)".print_r($options,true));
+		}
 
 		$vCalendar = htmlspecialchars_decode($options['content']);
 		$charset = null;
@@ -1133,7 +1260,10 @@ 
 				if (!($cal_id = $handler->importVCal($vCalendar, $eventId, null,
 					false, 0, $this->caldav->current_user_principal, $user, $charset)))
 				{
-					if ($this->debug) error_log(__METHOD__."() importVCal($eventId) returned false");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."() importVCal($eventId) returned false");
+					}
 				}
 				header('ETag: "'.$this->get_etag($eventId).'"');
 			}
@@ -1301,7 +1431,10 @@ 
 		$org_recurrences = $exceptions = array();
 		foreach(self::get_series($events[0]['uid'],$bo) as $k => $event)
 		{
-			if (!$k) $master = $event;
+			if (!$k)
+			{
+				$master = $event;
+			}
 			if ($event['recurrence'])
 			{
 				$org_recurrences[$event['recurrence']] = $event;
@@ -1321,10 +1454,13 @@ 
 
 			// from now on we deal with exceptions
 			$org_recurrence = $org_recurrences[$recurrence['recurrence']];
-			if (isset($org_recurrence))	// already existing recurrence
+			if (isset($org_recurrence))
+			{
+				// already existing recurrence
 			{
 				//error_log(__METHOD__.'() setting id #'.$org_recurrence['id']).' for '.$recurrence['recurrence'].' = '.date('Y-m-d H:i:s',$recurrence['recurrence']);
 				$recurrence['id'] = $org_recurrence['id'];
+			}
 
 				// re-add (non-virtual) exceptions to master's recur_exception
 				if ($recurrence['id'] != $master['id'])
@@ -1341,10 +1477,14 @@ 
 		// delete not longer existing recurrences
 		foreach($org_recurrences as $org_recurrence)
 		{
-			if ($org_recurrence['id'] != $master['id'])	// non-virtual recurrence
+			if ($org_recurrence['id'] != $master['id'])
+			{
+				// non-virtual recurrence
 			{
 				//error_log(__METHOD__.'() deleting #'.$org_recurrence['id']);
-				$bo->delete($org_recurrence['id']);	// might fail because of permissions
+				$bo->delete($org_recurrence['id']);
+			}
+			// might fail because of permissions
 			}
 			else	// virtual recurrence
 			{
@@ -1380,7 +1520,7 @@ 
 			self::get_agent() == 'caldavsynchronizer' && is_array($event) && $event['owner'] != $user)
 		{
  			if (is_array($event) && (!$return_no_access || $event['owner'] != $user))
-			{
+ 			{
 				// check if user is a participant or one of the groups he is a member of --> reject the meeting request
 				$ret = '403 Forbidden';
 				$memberships = $GLOBALS['egw']->accounts->memberships($this->bo->user, true);
@@ -1403,7 +1543,10 @@ 
 		{
 			$ret = $this->bo->delete($event['id']);
 		}
-		if ($this->debug) error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event)?$event['participants']:null).", user={$this->bo->user} --> return ".array2string($ret));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event)?$event['participants']:null).", user={$this->bo->user} --> return ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -1418,16 +1561,26 @@ 
 	 */
 	function read($id)
 	{
-		if (strpos($column=self::$path_attr,'_') === false) $column = 'cal_'.$column;
+		if (strpos($column=self::$path_attr,'_') === false)
+		{
+			$column = 'cal_'.$column;
+		}
 
 		$event = $this->bo->read(array($column => $id, 'cal_deleted IS NULL', 'cal_reference=0'), null, true, 'server');
-		if ($event) $event = array_shift($event);	// read with array as 1. param, returns an array of events!
+		if ($event)
+		{
+			$event = array_shift($event);
+		}
+		// read with array as 1. param, returns an array of events!
 
 		if (!($retval = $this->bo->check_perms(calendar_bo::ACL_FREEBUSY,$event, 0, 'server')) &&
 			// above can be true, if current user is not in master but just a recurrence
 			(!$event['recur_type'] || !($events = self::get_series($event['uid'], $this->bo))))
 		{
-			if ($this->debug > 0) error_log(__METHOD__."($id) no READ or FREEBUSY rights returning ".array2string($retval));
+			if ($this->debug > 0)
+			{
+				error_log(__METHOD__."($id) no READ or FREEBUSY rights returning ".array2string($retval));
+			}
 			return $retval;
 		}
 		if (!$this->bo->check_perms(Acl::READ, $event, 0, 'server'))
@@ -1435,9 +1588,15 @@ 
 			$this->bo->clear_private_infos($event, array($this->bo->user, $event['owner']));
 		}
 		// handle deleted events, as not existing
-		if ($event['deleted']) $event = null;
+		if ($event['deleted'])
+		{
+			$event = null;
+		}
 
-		if ($this->debug > 1) error_log(__METHOD__."($id) returning ".array2string($event));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."($id) returning ".array2string($event));
+		}
 
 		return $event;
 	}
@@ -1449,7 +1608,10 @@ 
 	 */
 	public function update_tags($entry)
 	{
-		if (!is_array($entry)) $entry = $this->read($entry);
+		if (!is_array($entry))
+		{
+			$entry = $this->read($entry);
+		}
 
 		$this->bo->update($entry, true);
 	}
@@ -1463,7 +1625,10 @@ 
 	{
 		$ctag = $this->bo->get_ctag($user,$path == '/calendar/' ? 'owner' : 'default'); // default = not rejected
 
-		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
+		if ($this->debug > 1)
+		{
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
+		}
 
 		return $ctag;
 	}
@@ -1593,7 +1758,10 @@ 
 		$handler = new calendar_ical();
 		$handler->setSupportedFields('GroupDAV',$this->agent);
 		$handler->supportedFields['attachments'] = true;	// enabling attachments
-		if ($this->debug > 1) error_log("ical Handler called: " . $this->agent);
+		if ($this->debug > 1)
+		{
+			error_log("ical Handler called: " . $this->agent);
+		}
 		return $handler;
 	}
 
@@ -1664,7 +1832,11 @@ 
 			{
 				$calendars[$entry['grantor']] = $entry['name'];
 			}
-			if ($user > 0) unset($calendars[$user]);	// skip current user
+			if ($user > 0)
+			{
+				unset($calendars[$user]);
+			}
+			// skip current user
 		}
 
 		$settings = array();

calendar/inc/class.calendar_ical.inc.php

Indentation +44 added lines, -44 removed lines

@@ -487,15 +487,15 @@ 
 									{
 										$user = $this->resource_info($this->user);
 										$attributes['ATTENDEE'][] = 'mailto:' . $user['email'];
-			    						$parameters['ATTENDEE'][] = array(
-			    							'CN'		=>	$user['name'],
-			    							'ROLE'		=> 'REQ-PARTICIPANT',
+										$parameters['ATTENDEE'][] = array(
+											'CN'		=>	$user['name'],
+											'ROLE'		=> 'REQ-PARTICIPANT',
 											'PARTSTAT'	=> 'NEEDS-ACTION',
 											'CUTYPE'	=> 'INDIVIDUAL',
 											'RSVP'		=> 'TRUE',
 											'X-EGROUPWARE-UID'	=> (string)$this->user,
-			    						);
-			    						$event['participants'][$this->user] = true;
+										);
+										$event['participants'][$this->user] = true;
 									}
 									break;
 								case 'r':
@@ -551,33 +551,33 @@ 
 						}
 						break;
 
-    				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');
-			    			if ($version == '1.0')
-			    			{
-		    					$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
-			    			}
-			    			else
-			    			{
-		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
-			    			}
-			    			$organizerUID = $event['owner'];
-	    				}
-    					// do NOT use ORGANIZER for events without further participants or a different organizer
-	    				if (count($event['participants']) > 1 || !isset($event['participants'][$event['owner']]))
-	    				{
-		    				$attributes['ORGANIZER'] = $organizerURL;
-		    				$parameters['ORGANIZER']['CN'] = $organizerCN;
-		    				if (!empty($organizerUID))
-		    				{
-			    				$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
-		    				}
-	    				}
-	    				break;
+					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');
+							if ($version == '1.0')
+							{
+								$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
+							}
+							else
+							{
+								$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
+							}
+							$organizerUID = $event['owner'];
+						}
+						// do NOT use ORGANIZER for events without further participants or a different organizer
+						if (count($event['participants']) > 1 || !isset($event['participants'][$event['owner']]))
+						{
+							$attributes['ORGANIZER'] = $organizerURL;
+							$parameters['ORGANIZER']['CN'] = $organizerCN;
+							if (!empty($organizerUID))
+							{
+								$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
+							}
+						}
+						break;
 
 					case 'DTSTART':
 						if (empty($event['whole_day']))
@@ -1003,12 +1003,12 @@ 
 				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) ?
-                    		$parameters[$key][$valueID] : $parameters[$key],
-                            Api\Translation::charset(),$charset);
-                    $valuesData = (array) Api\Translation::convert($values[$key],
-                    		Api\Translation::charset(),$charset);
-                    $content = $valueData . implode(';', $valuesData);
+					$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);
 
 					if ($version == '1.0' && (preg_match('/[^\x20-\x7F]/', $content) ||
 						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN']))))
@@ -2298,7 +2298,7 @@ 
 	 * @param string|resource $_vcalData
 	 * @param string $principalURL ='' Used for CalDAV imports
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
+	 *                         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)
@@ -2716,10 +2716,10 @@ 
 					// work around Ligthning sending @ as %40
 					$attributes['value'] = str_replace('%40', '@', $attributes['value']);
 					if (isset($attributes['params']['PARTSTAT']))
-				    {
-				    	$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
-				    }
-				    if (isset($attributes['params']['STATUS']))
+					{
+						$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
+					}
+					if (isset($attributes['params']['STATUS']))
 					{
 						$status = $this->status_ical2egw[strtoupper($attributes['params']['STATUS'])];
 						if (empty($status)) $status = 'X';
@@ -3137,7 +3137,7 @@ 
 				array2string($event)."\n",3,$this->logfile);
 		}
 		//Horde::logMessage("vevent2egw:\n" . print_r($event, true),
-        //    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
+		//    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		return $event;
 	}
 

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)
@@ -314,13 +327,19 @@ 
 				}
 				catch (Exception $e) {
 					// log unknown timezones
-					if (!empty($event['tzid'])) _egw_log_exception($e);
+					if (!empty($event['tzid']))
+					{
+						_egw_log_exception($e);
+					}
 					// default for no timezone and unkown to user timezone
 					self::$tz_cache[$event['tzid']] = Api\DateTime::$user_timezone;
 				}
 			}
 
-			if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+			if ($this->so->isWholeDay($event))
+			{
+				$event['whole_day'] = true;
+			}
 
 			if ($this->log)
 			{
@@ -331,7 +350,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']))
 				{
@@ -388,7 +410,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'] . "]";
 				}
 			}
@@ -448,11 +471,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)
 							{
@@ -531,16 +564,34 @@ 
 							}
 							// 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 ($info['type'] != 'e')
+							{
+								$options['X-EGROUPWARE-UID'] = (string)$uid;
+							}
 							if ($quantity > 1)
 							{
 								$options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
@@ -552,7 +603,11 @@ 
 						break;
 
 					case 'CLASS':
-						if ($event['public']) continue 2;	// public is default, no need to export, fails CalDAVTester if added as default
+						if ($event['public'])
+						{
+							continue 2;
+						}
+						// 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')
@@ -601,9 +656,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
 						{
@@ -623,7 +681,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'])
@@ -665,7 +727,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']))
@@ -692,14 +757,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 2;	// 0=undefined is default, no need to export, fails CalDAVTester if our default is added
+						if (!$event['priority'])
+						{
+							continue 2;
+						}
+						// 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))
@@ -713,7 +785,11 @@ 
 						break;
 
 					case 'TRANSP':
-						if (!$event['non_blocking']) continue 2;	// OPAQUE is default, no need to export, fails CalDAVTester if added as default
+						if (!$event['non_blocking'])
+						{
+							continue 2;
+						}
+						// OPAQUE is default, no need to export, fails CalDAVTester if added as default
 						if ($version == '1.0')
 						{
 							$attributes['TRANSP'] = ($event['non_blocking'] ? 1 : 0);
@@ -770,7 +846,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']))
 							{
@@ -864,7 +944,10 @@ 
 							if (count($attr) === 1 && !empty($attr['gzcompress']))
 							{
 								$attr = json_decode(gzuncompress(base64_decode($attr['gzcompress'])), true);
-								if (!is_array($attr)) continue;
+								if (!is_array($attr))
+								{
+									continue;
+								}
 							}
 							$vevent->setAttribute(substr($name, 2), $attr['value'], $attr['params'], true, $attr['values']);
 						}
@@ -905,7 +988,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)
@@ -922,7 +1008,10 @@ 
 
 				if ($version == '1.0')
 				{
-					if ($event['title']) $description = $event['title'];
+					if ($event['title'])
+					{
+						$description = $event['title'];
+					}
 					if ($description)
 					{
 						$values['DALARM']['snooze_time'] = '';
@@ -942,7 +1031,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
@@ -1133,13 +1225,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)
 		{
@@ -1147,8 +1246,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)) &&
@@ -1156,7 +1261,10 @@ 
 			{
 				foreach ($events as $k => $event)
 				{
-					if (!isset($event['uid'])) $events[$k]['uid'] = $egwEvent['uid'];
+					if (!isset($event['uid']))
+					{
+						$events[$k]['uid'] = $egwEvent['uid'];
+					}
 				}
 			}
 		}
@@ -1186,10 +1294,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'],
@@ -1226,7 +1341,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);
@@ -1326,7 +1444,10 @@ 
 								break;
 
 							default:
-								if (!empty($value)) $event[$key] = $value;
+								if (!empty($value))
+								{
+									$event[$key] = $value;
+								}
 						}
 					}
 				}
@@ -1424,7 +1545,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)
 				{
@@ -1472,7 +1596,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
@@ -1625,7 +1752,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)
@@ -1715,12 +1845,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]))
 							{
@@ -1732,9 +1865,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
@@ -1842,7 +1978,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)
 		{
@@ -1864,29 +2003,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;
 			}
@@ -1900,7 +2066,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;
 		}
@@ -2319,7 +2488,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))
@@ -2687,19 +2859,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));
@@ -2712,7 +2892,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
 								{
@@ -2721,9 +2904,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
@@ -2782,7 +2968,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)
@@ -2877,13 +3066,16 @@ 
 					// work around Ligthning sending @ as %40
 					$attributes['value'] = str_replace('%40', '@', $attributes['value']);
 					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
 					{
@@ -2943,7 +3135,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')))
@@ -3011,7 +3206,10 @@ 
 								}
 								$status = 'U'; // keep the group
 							}
-							else continue 2; // can't find this group
+							else {
+								continue 2;
+							}
+							// can't find this group
 						}
 						elseif (empty($searcharray))
 						{
@@ -3074,7 +3272,9 @@ 
 
 								try {
 									if (!$this->calendarOwner && is_numeric($uid) && $role == 'CHAIR')
-										$component->getAttribute('ORGANIZER');
+									{
+																			$component->getAttribute('ORGANIZER');
+									}
 								}
 								catch(Horde_Icalendar_Exception $e)
 								{
@@ -3114,7 +3314,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'];
@@ -3135,7 +3338,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));
@@ -3286,7 +3493,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';
@@ -3312,7 +3522,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);
@@ -3365,8 +3578,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'].'//'.
@@ -3388,10 +3609,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);
@@ -3409,18 +3633,30 @@ 
 
 			foreach ($events as $event)
 			{
-				if ($event['non_blocking']) continue;
-				if ($event['uid'] === $extra['X-CALENDARSERVER-MASK-UID']) continue;
+				if ($event['non_blocking'])
+				{
+					continue;
+				}
+				if ($event['uid'] === $extra['X-CALENDARSERVER-MASK-UID'])
+				{
+					continue;
+				}
 				$status = $event['participants'][$user];
 				$quantity = $role = null;
 				calendar_so::split_status($status, $quantity, $role);
-				if ($status == 'R' || $role == 'NON-PARTICIPANT') continue;
+				if ($status == 'R' || $role == 'NON-PARTICIPANT')
+				{
+					continue;
+				}
 
 				$fbtype = $status == 'T' ? 'BUSY-TENTATIVE' : 'BUSY';
 
 				// hack to fix end-time to be non-inclusive
 				// all-day events end in our data-model at 23:59:59 (of given TZ)
-				if (date('is', $event['end']) == '5959') ++$event['end'];
+				if (date('is', $event['end']) == '5959')
+				{
+					++$event['end'];
+				}
 
 				$fbdata[$fbtype][] = $event;
 			}
@@ -3472,7 +3708,10 @@ 
 		foreach($events as $event)
 		{
 			error_log(__METHOD__."(..., $start, $end) event[start]=$event[start], event[end]=$event[end], fbdata=".array2string($fbdata));
-			if ($event['end'] <= $start || $event['start'] >= $end) continue;
+			if ($event['end'] <= $start || $event['start'] >= $end)
+			{
+				continue;
+			}
 
 			if (!$fbdata)
 			{
@@ -3501,7 +3740,10 @@ 
 		}
 		$last =& $fbdata[count($fbdata)-1];
 
-		if ($last['end'] > $end) $last['end'] = $end;
+		if ($last['end'] > $end)
+		{
+			$last['end'] = $end;
+		}
 
 		error_log(__METHOD__."(..., $start, $end) returning ".array2string($fbdata));
 		return $fbdata;