EGroupware / egroupware

calendar/inc/class.calendar_zpush.inc.php

Indentation +6 added lines, -6 removed lines

@@ -178,7 +178,7 @@ 
 	 * @param int $cutoffdate =null
 	 * @param array $not_uids =null uids NOT to return for meeting requests
 	 * @return array
-  	 */
+	 */
 	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
@@ -1669,11 +1669,11 @@ 
 	}
 }
 
-    /**
- * Testcode for active sync timezone stuff
- *
- * You need to comment implements activesync_plugin_write
- */
+	/**
+	 * Testcode for active sync timezone stuff
+	 *
+	 * You need to comment implements activesync_plugin_write
+	 */
 if (isset($_SERVER['SCRIPT_FILENAME']) && realpath($_SERVER['SCRIPT_FILENAME']) == __FILE__)	// some tests
 {
 	$GLOBALS['egw_info'] = array(

Spacing +177 added lines, -178 removed lines

@@ -85,19 +85,19 @@ 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
 		$cals_pref = $GLOBALS['egw_info']['user']['preferences']['activesync']['calendar-cals'];
-		$cals = $cals_pref ? explode(',',$cals_pref) : array('P');	// implicit default of 'P'
+		$cals = $cals_pref ? explode(',', $cals_pref) : array('P'); // implicit default of 'P'
 		$folderlist = array();
 
 		foreach ($this->calendar->list_cals() as $entry)
 		{
 			$account_id = $entry['grantor'];
-			if (in_array('A',$cals) || in_array($account_id,$cals) ||
-				$account_id == $GLOBALS['egw_info']['user']['account_id'] ||	// always incl. own calendar!
-				$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G',$cals))
+			if (in_array('A', $cals) || in_array($account_id, $cals) ||
+				$account_id == $GLOBALS['egw_info']['user']['account_id'] || // always incl. own calendar!
+				$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G', $cals))
 			{
 				$folderlist[] = $f = array(
-					'id'	=>	$this->backend->createID('calendar',$account_id),
-					'mod'	=>	$GLOBALS['egw']->accounts->id2name($account_id,'account_fullname'),
+					'id'	=>	$this->backend->createID('calendar', $account_id),
+					'mod'	=>	$GLOBALS['egw']->accounts->id2name($account_id, 'account_fullname'),
 					'parent'=>	'0',
 				);
 			}
@@ -121,7 +121,7 @@ 
 		$folderObj = new SyncFolder();
 		$folderObj->serverid = $id;
 		$folderObj->parentid = '0';
-		$folderObj->displayname = $GLOBALS['egw']->accounts->id2name($owner,'account_fullname');
+		$folderObj->displayname = $GLOBALS['egw']->accounts->id2name($owner, 'account_fullname');
 		if ($owner == $GLOBALS['egw_info']['user']['account_id'])
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_APPOINTMENT;
@@ -155,7 +155,7 @@ 
 
 		$stat = array(
 			'id'	 => $id,
-			'mod'	=> $GLOBALS['egw']->accounts->id2name($owner,'account_fullname'),
+			'mod'	=> $GLOBALS['egw']->accounts->id2name($owner, 'account_fullname'),
 			'parent' => '0',
 		);
 		//error_log(__METHOD__."('$id') folderObj=".array2string($stat));
@@ -179,19 +179,19 @@ 
 	 * @param array $not_uids =null uids NOT to return for meeting requests
 	 * @return array
   	 */
-	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
+	function GetMessageList($id, $cutoffdate = NULL, array $not_uids = null)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$id',$cutoffdate)");
 		$type = $user = null;
-		$this->backend->splitID($id,$type,$user);
+		$this->backend->splitID($id, $type, $user);
 
-		if (!$cutoffdate) $cutoffdate = $this->bo->now - 100*24*3600;	// default three month back -30 breaks all sync recurrences
+		if (!$cutoffdate) $cutoffdate = $this->bo->now - 100 * 24 * 3600; // default three month back -30 breaks all sync recurrences
 
 		$filter = array(
 			'users' => $user,
-			'start' => $cutoffdate,	// default one month back -30 breaks all sync recurrences
+			'start' => $cutoffdate, // default one month back -30 breaks all sync recurrences
 			'enum_recuring' => false,
 			'daywise' => false,
 			'date_format' => 'server',
@@ -202,13 +202,13 @@ 
 			//'filter' => $user == $GLOBALS['egw_info']['user']['account_id'] ? (is_array($not_uids) ? 'unknown' : 'default') : 'default',
 			// @todo return only etag relevant information (seems not to work ...)
 			//'cols'		=> array('egw_cal.cal_id', 'cal_start',	'recur_type', 'cal_modified', 'cal_uid', 'cal_etag'),
-			'query' => array('cal_recurrence' => 0),	// do NOT return recurrence exceptions
+			'query' => array('cal_recurrence' => 0), // do NOT return recurrence exceptions
 		);
 
 		$messagelist = array();
 		// reading events in chunks of 100, to keep memory down for huge calendars
 		$num_rows = 100;
-		for($start=0; ($events = $this->calendar->search($filter+array(
+		for ($start = 0; ($events = $this->calendar->search($filter + array(
 			'offset'   => $start,
 			'num_rows' => $num_rows,
 		))); $start += $num_rows)
@@ -243,7 +243,7 @@ 
 	 * @param int $cutoffdate =null
 	 * @return array
 	 */
-	function GetMeetingRequests(array $not_uids, $cutoffdate=NULL)
+	function GetMeetingRequests(array $not_uids, $cutoffdate = NULL)
 	{
 		unset($not_uids, $cutoffdate);
 		return array();
@@ -269,7 +269,7 @@ 
 	 */
 	function StatMeetingRequest($id)
 	{
-		$folderid = $this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']);	// users personal calendar
+		$folderid = $this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']); // users personal calendar
 
 		$ret = $this->StatMessage($folderid, abs($id));
 		$ret['id'] = $id;
@@ -288,9 +288,9 @@ 
 	 * @param bool $mimesupport
 	 * @return SyncMail
 	 */
-	function GetMeetingRequest($id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
+	function GetMeetingRequest($id, $truncsize, $bodypreference = false, $optionbodypreference = false, $mimesupport = 0)
 	{
-		unset($truncsize, $optionbodypreference, $mimesupport);	// not used, but required by function signature
+		unset($truncsize, $optionbodypreference, $mimesupport); // not used, but required by function signature
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -303,13 +303,13 @@ 
 			$message = new SyncMail();
 			$message->read = false;
 			$message->subject = $event['title'];
-			$message->importance = 1;	// 0=Low, 1=Normal, 2=High
+			$message->importance = 1; // 0=Low, 1=Normal, 2=High
 			$message->datereceived = $event['created'];
 			$message->to = $message->displayto = $GLOBALS['egw_info']['user']['account_email'];
-			$message->from = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_fullname').
-				' <'.$GLOBALS['egw']->accounts->id2name($event['owner'],'account_email').'>';
+			$message->from = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_fullname').
+				' <'.$GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email').'>';
 			$message->internetcpid = 65001;
-			$message->contentclass="urn:content-classes:message";
+			$message->contentclass = "urn:content-classes:message";
 
 			$message->meetingrequest = self::meetingRequest($event);
 			$message->messageclass = "IPM.Schedule.Meeting.Request";
@@ -324,7 +324,7 @@ 
 			else
 			{
 				$message->airsyncbasebody = new SyncAirSyncBaseBody();
-				$message->airsyncbasenativebodytype=1;
+				$message->airsyncbasenativebodytype = 1;
 				$this->backend->note2messagenote($event['description'], $bodypreference, $message->airsyncbasebody);
 			}
 		}
@@ -359,12 +359,12 @@ 
 			$as_tz = self::tz2as($event['tzid']);
 			$message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz));
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			// ignore exception, simply set no timezone, as it is optional
 		}
 		// copying timestamps (they are already read in servertime, so non tz conversation)
-		foreach(array(
+		foreach (array(
 			'start' => 'starttime',
 			'end'   => 'endtime',
 			'created' => 'dtstamp',
@@ -374,10 +374,10 @@ 
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
-			++$message->endtime;	// EGw all-day-events are 1 sec shorter!
+			++$message->endtime; // EGw all-day-events are 1 sec shorter!
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'location' => 'location',
 		) as $key => $attr)
@@ -386,16 +386,16 @@ 
 		}
 		$message->organizer = $event['organizer'];
 
-		$message->sensitivity = !isset($event['public']) || $event['public'] ? 0 : 2;	// 0=normal, 1=personal, 2=private, 3=confidential
+		$message->sensitivity = !isset($event['public']) || $event['public'] ? 0 : 2; // 0=normal, 1=personal, 2=private, 3=confidential
 
 		// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
 		$message->busystatus = $event['non_blocking'] ? 0 : 2;
 
 		// ToDo: recurring events: InstanceType, RecurrenceId, Recurrences; ...
-		$message->instancetype = 0;	// 0=Single, 1=Master recurring, 2=Single recuring, 3=Exception
+		$message->instancetype = 0; // 0=Single, 1=Master recurring, 2=Single recuring, 3=Exception
 
-		$message->responserequested = 1;	//0=No, 1=Yes
-		$message->disallownewtimeproposal = 1;	//1=forbidden, 0=allowed
+		$message->responserequested = 1; //0=No, 1=Yes
+		$message->disallownewtimeproposal = 1; //1=forbidden, 0=allowed
 		//$message->messagemeetingtype;	// email2
 
 		// ToDo: alarme: Reminder
@@ -441,14 +441,14 @@ 
 			// check if event already exist (invitation of or already imported by other user)
 			if (!($event = $this->calendar->read($parsed_event['uid'], 0, false, 'server')))
 			{
-				$event = $parsed_event;	// create new event from external invitation
+				$event = $parsed_event; // create new event from external invitation
 			}
-			elseif(!isset($event['participants'][$uid]))
+			elseif (!isset($event['participants'][$uid]))
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($requestid).", $folderid, $response) current user ($uid) is NO participant of event ".array2string($event));
 				// maybe we should silently add him, as he might not have the rights to add him himself with calendar->update ...
 			}
-			elseif($event['deleted'])
+			elseif ($event['deleted'])
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($requestid).", $folderid, $response) event ($uid) deleted on server --> return false");
 				return false;
@@ -473,7 +473,7 @@ 
 		else
 		{
 			$event['participants'][$uid] = $status;
-			$ret = $this->calendar->update($event, true);	// true = ignore conflicts, as there seems no conflict handling in AS
+			$ret = $this->calendar->update($event, true); // true = ignore conflicts, as there seems no conflict handling in AS
 			$msg = $ret ? "new event #$ret created" : "could NOT create event";
 			ZLog::Write(LOGLEVEL_DEBUG, __LINE__.': '.__METHOD__.'('.array2string($requestid).", '$folderid', $response) $msg, returning ".array2string($ret));
 		}
@@ -486,10 +486,10 @@ 
 	 * @var array
 	 */
 	static $status2as = array(
-		'U' => 0,	// unknown
-		'T' => 2,	// tentative
-		'A' => 3,	// accepted
-		'R' => 4,	// decline
+		'U' => 0, // unknown
+		'T' => 2, // tentative
+		'A' => 3, // accepted
+		'R' => 4, // decline
 		// 5 = not responded
 	);
 	/**
@@ -498,9 +498,9 @@ 
 	 * @var array
 	 */
 	static $role2as = array(
-		'REQ-PARTICIPANT' => 1,	// required
-		'CHAIR' => 1,			// required
-		'OPT-PARTICIPANT' => 2,	// optional
+		'REQ-PARTICIPANT' => 1, // required
+		'CHAIR' => 1, // required
+		'OPT-PARTICIPANT' => 2, // optional
 		'NON-PARTICIPANT' => 2,
 		// 3 = ressource
 	);
@@ -512,8 +512,8 @@ 
 	static $recur_type2as = array(
 		calendar_rrule::DAILY => 0,
 		calendar_rrule::WEEKLY => 1,
-		calendar_rrule::MONTHLY_MDAY => 2,	// monthly
-		calendar_rrule::MONTHLY_WDAY => 3,	// monthly on nth day
+		calendar_rrule::MONTHLY_MDAY => 2, // monthly
+		calendar_rrule::MONTHLY_WDAY => 3, // monthly on nth day
 		calendar_rrule::YEARLY => 5,
 		// 6 = yearly on nth day (same as 5 on non-leapyears or before March on leapyears)
 	);
@@ -540,7 +540,7 @@ 
 	 */
 	public function ChangeMessage($folderid, $_id, $message, $contentParameters)
 	{
-		unset($contentParameters);	// unused, but required by function signature
+		unset($contentParameters); // unused, but required by function signature
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -550,7 +550,7 @@ 
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $_id, ".array2string($message).") type='$type', account=$account");
 
-		list($id,$recur_date) = explode(':', $_id);
+		list($id, $recur_date) = explode(':', $_id);
 
 		if ($type != 'calendar' || $id && !($old_event = $this->calendar->read($id, $recur_date, false, 'server')))
 		{
@@ -563,21 +563,21 @@ 
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
 			//error_log(__METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
 		}
-		if (!$this->calendar->check_perms($id ? Acl::EDIT : Acl::ADD, $old_event ? $old_event : 0,$account))
+		if (!$this->calendar->check_perms($id ? Acl::EDIT : Acl::ADD, $old_event ? $old_event : 0, $account))
 		{
 			// @todo: write in users calendar and make account only a participant
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id,...) no rights to add/edit event!");
 			//error_log(__METHOD__."('$folderid',$id,".array2string($message).") no rights to add/edit event!");
 			return false;
 		}
-		if (!$id) $old_event['owner'] = $account;	// we do NOT allow to change the owner of existing events
+		if (!$id) $old_event['owner'] = $account; // we do NOT allow to change the owner of existing events
 
 		$event = $this->message2event($message, $account, $old_event);
 
 		// store event, ignore conflicts and skip notifications, as AS clients do their own notifications
 		$skip_notification = false;
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']=='send')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'] == 'send')
 		{
 			$skip_notification = true; // to avoid double notification from client AND Server
 		}
@@ -590,16 +590,16 @@ 
 		// store non-delete exceptions
 		if ($message->exceptions)
 		{
-			foreach($message->exceptions as $exception)
+			foreach ($message->exceptions as $exception)
 			{
 				if (!$exception->deleted)
 				{
 					$ex_event = $event;
 					unset($ex_event['id']);
 					unset($ex_event['etag']);
-					foreach(array_keys($ex_event) as $name)
+					foreach (array_keys($ex_event) as $name)
 					{
-						if (substr($name,0,6) == 'recur_') unset($ex_event[$name]);
+						if (substr($name, 0, 6) == 'recur_') unset($ex_event[$name]);
 					}
 					$ex_event['recur_type'] = calendar_rrule::NONE;
 
@@ -607,10 +607,10 @@ 
 						'user' => $account,
 						'enum_recuring' => false,
 						'daywise' => false,
-						'filter' => 'owner',  // return all possible entries
+						'filter' => 'owner', // return all possible entries
 						'query' => array(
 							'cal_uid' => $event['uid'],
-							'cal_recurrence' => $exception->exceptionstarttime,	// in servertime
+							'cal_recurrence' => $exception->exceptionstarttime, // in servertime
 						),
 					))))
 					{
@@ -622,7 +622,7 @@ 
 						$participants = $event['participants'];
 					}
 					$save_event = $this->message2event($exception, $account, $ex_event);
-					$save_event['participants'] = $participants;	// not contained in $exception
+					$save_event['participants'] = $participants; // not contained in $exception
 					$save_event['reference'] = $event['id'];
 					$save_event['recurrence'] = Api\DateTime::server2user($exception->exceptionstarttime);
 					$ex_ok = $this->calendar->save($save_event);
@@ -644,10 +644,10 @@ 
 	 * @param array $event =array()
 	 * @return array
 	 */
-	private function message2event(SyncAppointment $message, $account, $event=array())
+	private function message2event(SyncAppointment $message, $account, $event = array())
 	{
 		// timestamps (created & modified are updated automatically)
-		foreach(array(
+		foreach (array(
 			'start' => 'starttime',
 			'end' => 'endtime',
 		) as $key => $attr)
@@ -655,7 +655,7 @@ 
 			if (isset($message->$attr)) $event[$key] = Api\DateTime::server2user($message->$attr);
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'uid'   => 'uid',
 			'location' => 'location',
@@ -670,7 +670,7 @@ 
 		{
 			$event['description'] = $description;
 		}
-		$event['public'] = (int)($message->sensitivity < 1);	// 0=normal, 1=personal, 2=private, 3=confidential
+		$event['public'] = (int)($message->sensitivity < 1); // 0=normal, 1=personal, 2=private, 3=confidential
 
 		// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
 		if (isset($message->busystatus))
@@ -680,21 +680,21 @@ 
 
 		if (($event['whole_day'] = $message->alldayevent))
 		{
-			if ($event['end'] == $event['start']) $event['end'] += 24*3600;	// some clients send equal start&end for 1day
-			$event['end']--;	// otherwise our whole-day event code in save makes it one more day!
+			if ($event['end'] == $event['start']) $event['end'] += 24 * 3600; // some clients send equal start&end for 1day
+			$event['end']--; // otherwise our whole-day event code in save makes it one more day!
 		}
 
 		$participants = array();
-		foreach((array)$message->attendees as $attendee)
+		foreach ((array)$message->attendees as $attendee)
 		{
-			if ($attendee->type == 3) continue;	// we can not identify resources and re-add them anyway later
+			if ($attendee->type == 3) continue; // we can not identify resources and re-add them anyway later
 
 			$matches = null;
-			if (preg_match('/^noreply-(.*)-uid@egroupware.org$/',$attendee->email,$matches))
+			if (preg_match('/^noreply-(.*)-uid@egroupware.org$/', $attendee->email, $matches))
 			{
 				$uid = $matches[1];
 			}
-			elseif (!($uid = $GLOBALS['egw']->accounts->name2id($attendee->email,'account_email')))
+			elseif (!($uid = $GLOBALS['egw']->accounts->name2id($attendee->email, 'account_email')))
 			{
 				$search = array(
 					'email' => $attendee->email,
@@ -704,13 +704,13 @@ 
 				// search addressbook for participant
 				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 				if ((list($data) = $this->addressbook->search($search,
-					array('id','egw_addressbook.account_id as account_id','n_fn'),
+					array('id', 'egw_addressbook.account_id as account_id', 'n_fn'),
 					'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
-					'','',false,'OR')))
+					'', '', false, 'OR')))
 				{
 					$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 				}
-				elseif($attendee->name === $attendee->email || empty($attendee->name))	// dont store empty or email as name
+				elseif ($attendee->name === $attendee->email || empty($attendee->name))	// dont store empty or email as name
 				{
 					$uid = 'e'.$attendee->email;
 				}
@@ -728,8 +728,8 @@ 
 				//ZLog::Write(LOGLEVEL_DEBUG, "old status for $uid is status=$status, quantity=$quantitiy, role=$role");
 			}
 			// check if just email is an existing attendee (iOS returns email as name too!), keep it to keep status/role if not set
-			elseif ($event['id'] && (isset($event['participants'][$u='e'.$attendee->email]) ||
-				(isset($event['participants'][$u='e'.$attendee->name.' <'.$attendee->email.'>']))))
+			elseif ($event['id'] && (isset($event['participants'][$u = 'e'.$attendee->email]) ||
+				(isset($event['participants'][$u = 'e'.$attendee->name.' <'.$attendee->email.'>']))))
 			{
 				$status = $event['participants'][$u];
 				calendar_so::split_status($status, $quantity, $role);
@@ -742,9 +742,9 @@ 
 				$role = 'REQ-PARTICIPANT';
 				//ZLog::Write(LOGLEVEL_DEBUG, "default status for $uid is status=$status, quantity=$quantitiy, role=$role");
 			}
-			if ($role == 'CHAIR') $chair_set = true;	// by role from existing participant
+			if ($role == 'CHAIR') $chair_set = true; // by role from existing participant
 
-			if (isset($attendee->attendeestatus) && ($s = array_search($attendee->attendeestatus,self::$status2as)))
+			if (isset($attendee->attendeestatus) && ($s = array_search($attendee->attendeestatus, self::$status2as)))
 			{
 				$status = $s;
 			}
@@ -754,29 +754,29 @@ 
 				$chair_set = true;
 			}
 			elseif (isset($attendee->attendeetype) &&
-				!($role == 'CHAIR' && !is_numeric($uid)) &&	// do not override our external ORGANIZER
-				($r = array_search($attendee->attendeetype,self::$role2as)) &&
+				!($role == 'CHAIR' && !is_numeric($uid)) && // do not override our external ORGANIZER
+				($r = array_search($attendee->attendeetype, self::$role2as)) &&
 				(int)self::$role2as[$role] != $attendee->attendeetype)	// if old role gives same type, use old role, as we have a lot more roles then AS
 			{
 				$role = $r;
 			}
 			//ZLog::Write(LOGLEVEL_DEBUG, "-> status for $uid is status=$status ($s), quantity=$quantitiy, role=$role ($r)");
-			$participants[$uid] = calendar_so::combine_status($status,$quantitiy,$role);
+			$participants[$uid] = calendar_so::combine_status($status, $quantitiy, $role);
 		}
 		// if organizer is not already participant, add him as chair
-		if (($uid = $GLOBALS['egw']->accounts->name2id($message->organizeremail,'account_email')) && !isset($participants[$uid]))
+		if (($uid = $GLOBALS['egw']->accounts->name2id($message->organizeremail, 'account_email')) && !isset($participants[$uid]))
 		{
 			$participants[$uid] = calendar_so::combine_status($uid == $GLOBALS['egw_info']['user']['account_id'] ?
-				'A' : 'U',1,'CHAIR');
+				'A' : 'U', 1, 'CHAIR');
 			$chair_set = true;
 		}
 		// preserve all resource types not account, contact or email (eg. resources) for existing events
 		// $account is also preserved, as AS does not add him as participant!
-		foreach((array)$event['participant_types'] as $type => $parts)
+		foreach ((array)$event['participant_types'] as $type => $parts)
 		{
-			if (in_array($type,array('c','e'))) continue;	// they are correctly representable in AS
+			if (in_array($type, array('c', 'e'))) continue; // they are correctly representable in AS
 
-			foreach($parts as $id => $status)
+			foreach ($parts as $id => $status)
 			{
 				// accounts are represented correctly, but the event owner which is no participant in AS
 				if ($type == 'u' && $id != $account) continue;
@@ -792,13 +792,13 @@ 
 		if (!$event['id'] || !$participants || !isset($participants[$account]))
 		{
 			$participants[$account] = calendar_so::combine_status($account == $GLOBALS['egw_info']['user']['account_id'] ?
-				'A' : 'U',1,!$chair_set ? 'CHAIR' : 'REQ-PARTICIPANT');
+				'A' : 'U', 1, !$chair_set ? 'CHAIR' : 'REQ-PARTICIPANT');
 		}
 		$event['participants'] = $participants;
 
 		if (isset($message->categories))
 		{
-			$event['category'] = implode(',', array_filter($this->calendar->find_or_add_categories($message->categories, $event),'strlen'));
+			$event['category'] = implode(',', array_filter($this->calendar->find_or_add_categories($message->categories, $event), 'strlen'));
 		}
 
 		// check if event is recurring and import recur information (incl. timezone)
@@ -808,8 +808,7 @@ 
 			{
 				$event['tzid'] = self::as2tz(self::_getTZFromSyncBlob(base64_decode($message->timezone)));
 			}
-			$event['recur_type'] = $message->recurrence->type == 6 ? calendar_rrule::YEARLY :
-				array_search($message->recurrence->type, self::$recur_type2as);
+			$event['recur_type'] = $message->recurrence->type == 6 ? calendar_rrule::YEARLY : array_search($message->recurrence->type, self::$recur_type2as);
 			$event['recur_interval'] = $message->recurrence->interval;
 
 			switch ($event['recur_type'])
@@ -818,7 +817,7 @@ 
 					// $message->recurrence->weekofmonth is not explicitly stored in egw, just taken from start date
 					// fall throught
 				case calendar_rrule::WEEKLY:
-					$event['recur_data'] = $message->recurrence->dayofweek;	// 1=Su, 2=Mo, 4=Tu, .., 64=Sa
+					$event['recur_data'] = $message->recurrence->dayofweek; // 1=Su, 2=Mo, 4=Tu, .., 64=Sa
 					break;
 				case calendar_rrule::MONTHLY_MDAY:
 					// $message->recurrence->dayofmonth is not explicitly stored in egw, just taken from start date
@@ -834,7 +833,7 @@ 
 			$event['recur_exception'] = array();
 			if ($message->exceptions)
 			{
-				foreach($message->exceptions as $exception)
+				foreach ($message->exceptions as $exception)
 				{
 					$event['recur_exception'][] = Api\DateTime::server2user($exception->exceptionstarttime);
 				}
@@ -844,7 +843,7 @@ 
 			{
 				// calculate enddate from occurences count, as we only support enddate
 				$count = $message->recurrence->occurrences;
-				foreach(calendar_rrule::event2rrule($event, true) as $rtime)	// true = timestamps are user time here, because of save!
+				foreach (calendar_rrule::event2rrule($event, true) as $rtime)	// true = timestamps are user time here, because of save!
 				{
 					if (--$count <= 0) break;
 				}
@@ -854,11 +853,11 @@ 
 		// only import alarms in own calendar
 		if ($message->reminder && $account == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			foreach((array)$event['alarm'] as $alarm)
+			foreach ((array)$event['alarm'] as $alarm)
 			{
-				if (($alarm['all'] || $alarm['owner'] == $account) && $alarm['offset'] == 60*$message->reminder)
+				if (($alarm['all'] || $alarm['owner'] == $account) && $alarm['offset'] == 60 * $message->reminder)
 				{
-					$alarm = true;	// alarm already exists --> do nothing
+					$alarm = true; // alarm already exists --> do nothing
 					break;
 				}
 			}
@@ -867,16 +866,16 @@ 
 				// delete all earlier alarms of that user
 				// user get's per AS only the earliest alarm, as AS only supports one alarm
 				// --> if a later alarm is returned, user probably modifed an existing alarm
-				foreach((array)$event['alarm'] as $key => $alarm)
+				foreach ((array)$event['alarm'] as $key => $alarm)
 				{
-					if ($alarm['owner'] == $account && $alarm['offset'] > 60*$message->reminder)
+					if ($alarm['owner'] == $account && $alarm['offset'] > 60 * $message->reminder)
 					{
 						unset($event['alarm'][$key]);
 					}
 				}
 				$event['alarm'][] = $alarm = array(
 					'owner' => $account,
-					'offset' => 60*$message->reminder,
+					'offset' => 60 * $message->reminder,
 				);
 			}
 		}
@@ -950,7 +949,7 @@ 
 	 */
 	public function DeleteMessage($folderid, $id, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 
 		if (!isset($this->caledar)) $this->calendar = new calendar_boupdate();
 
@@ -978,7 +977,7 @@ 
 	 */
 	function SetReadFlag($folderid, $id, $flags, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $id, ".array2string($flags)." NOT supported!");
 		return false;
@@ -1012,7 +1011,7 @@ 
 	 * @param string $class ='SyncAppointment' or 'SyncAppointmentException'
 	 * @return SyncAppointment|boolean false on error
 	 */
-	public function GetMessage($folderid, $id, $contentparameters, $class='SyncAppointment')
+	public function GetMessage($folderid, $id, $contentparameters, $class = 'SyncAppointment')
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 		//error_log(__METHOD__.__LINE__.array2string($contentparameters).function_backtrace());
@@ -1030,17 +1029,17 @@ 
 		}
 		else
 		{
-			list($id,$recur_date) = explode(':',$id);
-			if ($type != 'calendar' || !($event = $this->calendar->read($id,$recur_date,false,'server',$account)))
+			list($id, $recur_date) = explode(':', $id);
+			if ($type != 'calendar' || !($event = $this->calendar->read($id, $recur_date, false, 'server', $account)))
 			{
 				error_log(__METHOD__."('$folderid', $id, ...) read($id,null,false,'server',$account) returned false");
 				return false;
 			}
 		}
-		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid,$id,...) start=$event[start]=".date('Y-m-d H:i:s',$event['start']).", recurrence=$event[recurrence]=".date('Y-m-d H:i:s',$event['recurrence']));
-		foreach((array)$event['recur_exception'] as $ex)
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid,$id,...) start=$event[start]=".date('Y-m-d H:i:s', $event['start']).", recurrence=$event[recurrence]=".date('Y-m-d H:i:s', $event['recurrence']));
+		foreach ((array)$event['recur_exception'] as $ex)
 		{
-			ZLog::Write(LOGLEVEL_DEBUG, "exception=$ex=".date('Y-m-d H:i:s',$ex));
+			ZLog::Write(LOGLEVEL_DEBUG, "exception=$ex=".date('Y-m-d H:i:s', $ex));
 		}
 		$message = new $class();
 
@@ -1049,14 +1048,14 @@ 
 			$as_tz = self::tz2as($event['tzid']);
 			$message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz));
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			// z-push (2.3 at least) requires a timezone for recurring events
 			if ($event['recur_type']) $message->timezone = self::UTC_BLOB;
 		}
 
 		// copying timestamps (they are already read in servertime, so non tz conversation)
-		foreach(array(
+		foreach (array(
 			'start' => 'starttime',
 			'end'   => 'endtime',
 			'created' => 'dtstamp',
@@ -1067,10 +1066,10 @@ 
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
-			++$message->endtime;	// EGw all-day-events are 1 sec shorter!
+			++$message->endtime; // EGw all-day-events are 1 sec shorter!
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'uid'   => 'uid',
 			'location' => 'location',
@@ -1092,21 +1091,21 @@ 
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, "airsyncbasebody!");
 				$message->asbody = new SyncBaseBody();
-				$message->nativebodytype=1;
+				$message->nativebodytype = 1;
 				$this->backend->note2messagenote($event['description'], $bodypreference, $message->asbody);
 			}
 		}
-		$message->organizername  = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_fullname');
+		$message->organizername  = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_fullname');
 		// at least iOS calendar crashes, if organizer has no email address (true = generate an email, if user has none)
 		$message->organizeremail = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email', true);
 
-		$message->sensitivity = $event['public'] ? 0 : 2;	// 0=normal, 1=personal, 2=private, 3=confidential
+		$message->sensitivity = $event['public'] ? 0 : 2; // 0=normal, 1=personal, 2=private, 3=confidential
 
 		// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
 		$message->busystatus = $event['non_blocking'] ? 0 : 2;
 
 		$message->attendees = array();
-		foreach($event['participants'] as $uid => $status)
+		foreach ($event['participants'] as $uid => $status)
 		{
 			// we send all participants (incl. organizer), as this is what Exchange also does
 			$quantity = $role = null;
@@ -1117,13 +1116,13 @@ 
 			$attendee->attendeetype = (int)self::$role2as[$role];
 			if (is_numeric($uid))
 			{
-				$attendee->name = $GLOBALS['egw']->accounts->id2name($uid,'account_fullname');
+				$attendee->name = $GLOBALS['egw']->accounts->id2name($uid, 'account_fullname');
 				$attendee->email = $GLOBALS['egw']->accounts->id2name($uid, 'account_email', true);
 			}
 			else
 			{
 				list($info) = $i = $this->calendar->resources[$uid[0]]['info'] ?
-					ExecMethod($this->calendar->resources[$uid[0]]['info'],substr($uid,1)) : array(false);
+					ExecMethod($this->calendar->resources[$uid[0]]['info'], substr($uid, 1)) : array(false);
 
 				if (!$info) continue;
 
@@ -1141,7 +1140,7 @@ 
 					$message->organizeremail = $attendee->email;
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, $id, ...) external organizer detected (role=$role, uid=$uid), set as AS organizer: $message->organizername <$message->organizeremail>");
 				}
-				if ($uid[0] == 'r') $attendee->type = 3;	// 3 = resource
+				if ($uid[0] == 'r') $attendee->type = 3; // 3 = resource
 			}
 			// email must NOT be empty, but MAY be an arbitrary text
 			if (empty($attendee->email)) $attendee->email = 'noreply-'.$uid.'-uid@egroupware.org';
@@ -1149,7 +1148,7 @@ 
 			$message->attendees[] = $attendee;
 		}
 		$message->categories = array();
-		foreach($event['category'] ? explode(',',$event['category']) : array() as $cat_id)
+		foreach ($event['category'] ? explode(',', $event['category']) : array() as $cat_id)
 		{
 			$message->categories[] = Api\Categories::id2name($cat_id);
 		}
@@ -1158,25 +1157,25 @@ 
 		if ($event['recur_type'] != calendar_rrule::NONE && !$recur_date)
 		{
 			$message->recurrence = $recurrence = new SyncRecurrence();
-			$rrule = calendar_rrule::event2rrule($event,false);	// false = timestamps in $event are servertime
+			$rrule = calendar_rrule::event2rrule($event, false); // false = timestamps in $event are servertime
 			$recurrence->type = (int)self::$recur_type2as[$rrule->type];
 			$recurrence->interval = $rrule->interval;
 			switch ($rrule->type)
 			{
 				case calendar_rrule::MONTHLY_WDAY:
 					$recurrence->weekofmonth = $rrule->monthly_byday_num >= 1 ?
-						$rrule->monthly_byday_num : 5;	// 1..5=last week of month, not -1
+						$rrule->monthly_byday_num : 5; // 1..5=last week of month, not -1
 					// fall throught
 				case calendar_rrule::WEEKLY:
-					$recurrence->dayofweek = $rrule->weekdays;	// 1=Su, 2=Mo, 4=Tu, .., 64=Sa
+					$recurrence->dayofweek = $rrule->weekdays; // 1=Su, 2=Mo, 4=Tu, .., 64=Sa
 					break;
 				case calendar_rrule::MONTHLY_MDAY:
-					$recurrence->dayofmonth = $rrule->monthly_bymonthday >= 1 ?	// 1..31
-						$rrule->monthly_bymonthday : 31;	// not -1 for last day of month!
+					$recurrence->dayofmonth = $rrule->monthly_bymonthday >= 1 ? // 1..31
+						$rrule->monthly_bymonthday : 31; // not -1 for last day of month!
 					break;
 				case calendar_rrule::YEARLY:
-					$recurrence->dayofmonth = (int)$rrule->time->format('d');	// 1..31
-					$recurrence->monthofyear = (int)$rrule->time->format('m');	// 1..12
+					$recurrence->dayofmonth = (int)$rrule->time->format('d'); // 1..31
+					$recurrence->monthofyear = (int)$rrule->time->format('m'); // 1..12
 					break;
 			}
 			if ($rrule->enddate)	// enddate is only a date, but AS needs a time incl. correct starttime!
@@ -1192,9 +1191,9 @@ 
 				// search real / non-virtual exceptions
 				if (!empty($event['uid']))
 				{
-					$ex_events =& $this->calendar->search(array(
+					$ex_events = & $this->calendar->search(array(
 						'query' => array('cal_uid' => $event['uid']),
-						'filter' => 'owner',  // return all possible entries
+						'filter' => 'owner', // return all possible entries
 						'daywise' => false,
 						'date_format' => 'server',
 					));
@@ -1203,36 +1202,36 @@ 
 				{
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." Exceptions found but no UID given for Event:".$event['id'].' Exceptions:'.array2string($event['recur_exception']));
 				}
-				if (count($ex_events)>=1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
+				if (count($ex_events) >= 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
 
 				$message->exceptions = array();
-				foreach($ex_events as $ex_event)
+				foreach ($ex_events as $ex_event)
 				{
-					if ($ex_event['id'] == $event['id']) continue;	// ignore series master
+					if ($ex_event['id'] == $event['id']) continue; // ignore series master
 					$exception = $this->GetMessage($folderid, $ex_event, $contentparameters, 'SyncAppointmentException');
 					$exception->exceptionstarttime = $exception_time = $ex_event['recurrence'];
-					foreach(array('attendees','recurrence','uid','timezone','organizername','organizeremail') as $not_supported)
+					foreach (array('attendees', 'recurrence', 'uid', 'timezone', 'organizername', 'organizeremail') as $not_supported)
 					{
-						$exception->$not_supported = null;	// not allowed in exceptions :-(
+						$exception->$not_supported = null; // not allowed in exceptions :-(
 					}
 					$exception->deleted = 0;
-					if (($key = array_search($exception_time,$event['recur_exception'])) !== false)
+					if (($key = array_search($exception_time, $event['recur_exception'])) !== false)
 					{
 						unset($event['recur_exception'][$key]);
 					}
-					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added exception ".date('Y-m-d H:i:s',$exception_time).' '.array2string($exception));
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added exception ".date('Y-m-d H:i:s', $exception_time).' '.array2string($exception));
 					$message->exceptions[] = $exception;
 				}
 				// add rest of exceptions as deleted
-				foreach($event['recur_exception'] as $exception_time)
+				foreach ($event['recur_exception'] as $exception_time)
 				{
 					if (!empty($exception_time))
 					{
 						if (empty($event['uid'])) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
-						$exception = new SyncAppointmentException();	// exceptions seems to be full SyncAppointments, with only starttime required
+						$exception = new SyncAppointmentException(); // exceptions seems to be full SyncAppointments, with only starttime required
 						$exception->deleted = 1;
 						$exception->exceptionstarttime = $exception_time;
-						ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added deleted exception ".date('Y-m-d H:i:s',$exception_time).' '.array2string($exception));
+						ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added deleted exception ".date('Y-m-d H:i:s', $exception_time).' '.array2string($exception));
 						$message->exceptions[] = $exception;
 					}
 				}
@@ -1254,12 +1253,12 @@ 
 		// only return alarms if in own calendar
 		if ($account == $GLOBALS['egw_info']['user']['account_id'] && $event['alarm'])
 		{
-			foreach($event['alarm'] as $alarm)
+			foreach ($event['alarm'] as $alarm)
 			{
 				if ($alarm['all'] || $alarm['owner'] == $account)
 				{
-					$message->reminder = $alarm['offset']/60;	// is in minutes, not seconds as in EGw
-					break;	// AS supports only one alarm! (we use the next/earliest one)
+					$message->reminder = $alarm['offset'] / 60; // is in minutes, not seconds as in EGw
+					break; // AS supports only one alarm! (we use the next/earliest one)
 				}
 			}
 		}
@@ -1282,7 +1281,7 @@ 
 	 */
 	public function StatMessage($folderid, $id)
 	{
-		unset($folderid);	// not used ($id is unique), but required by function signature
+		unset($folderid); // not used ($id is unique), but required by function signature
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -1293,7 +1292,7 @@ 
 			// error_log why access is denied (should never happen for everything returned by calendar_bo::search)
 			$backup = $this->calendar->debug;
 			//$this->calendar->debug = 2;
-			list($id) = explode(':',$id);
+			list($id) = explode(':', $id);
 			$this->calendar->check_perms(calendar_bo::ACL_FREEBUSY, $id, 0, 'server');
 			$this->calendar->debug = $backup;
 		}
@@ -1327,7 +1326,7 @@ 
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 		//$ctag = $this->calendar->get_ctag($owner,'owner',true);	// true only consider recurrence master
-		$syncstate = $this->calendar->get_ctag($owner,false,true); // we only want to fetch the owners events, where he is a participant too
+		$syncstate = $this->calendar->get_ctag($owner, false, true); // we only want to fetch the owners events, where he is a participant too
 		// workaround for syncstate = 0 when calendar is empty causes synctate to not return 0 but array resulting in foldersync loop
 		if ($syncstate == 0) $syncstate = 1;
 
@@ -1407,8 +1406,8 @@ 
 
 		if ($tz === 'UTC') return $data;
 
-		$name = $component = is_a($tz,'DateTimeZone') ? $tz->getName() : $tz;
-		if (strpos($component, 'VTIMEZONE') === false) $component = calendar_timezones::tz2id($name,'component');
+		$name = $component = is_a($tz, 'DateTimeZone') ? $tz->getName() : $tz;
+		if (strpos($component, 'VTIMEZONE') === false) $component = calendar_timezones::tz2id($name, 'component');
 		// parse ical timezone defintion
 		$ical = self::ical2array($component);
 		$standard = $ical['VTIMEZONE']['STANDARD'];
@@ -1417,11 +1416,11 @@ 
 		if (!isset($standard))
 		{
 			$matches = null;
-			if (preg_match('/^etc\/gmt([+-])([0-9]+)$/i',$name,$matches))
+			if (preg_match('/^etc\/gmt([+-])([0-9]+)$/i', $name, $matches))
 			{
 				$standard = array(
-					'TZOFFSETTO'   => sprintf('%s%02d00',$matches[1],$matches[2]),
-					'TZOFFSETFROM' => sprintf('%s%02d00',$matches[1],$matches[2]),
+					'TZOFFSETTO'   => sprintf('%s%02d00', $matches[1], $matches[2]),
+					'TZOFFSETFROM' => sprintf('%s%02d00', $matches[1], $matches[2]),
 				);
 				unset($daylight);
 			}
@@ -1432,19 +1431,19 @@ 
 		}
 		// get bias and dstbias from standard component, which is present in all tz's
 		// (dstbias is relative to bias and almost always 60 or 0)
-		$data['bias'] = -(60 * substr($standard['TZOFFSETTO'],0,-2) + substr($standard['TZOFFSETTO'],-2));
-		$data['dstbias'] = -(60 * substr($standard['TZOFFSETFROM'],0,-2) + substr($standard['TZOFFSETFROM'],-2) + $data['bias']);
+		$data['bias'] = -(60 * substr($standard['TZOFFSETTO'], 0, -2) + substr($standard['TZOFFSETTO'], -2));
+		$data['dstbias'] = -(60 * substr($standard['TZOFFSETFROM'], 0, -2) + substr($standard['TZOFFSETFROM'], -2) + $data['bias']);
 
 		// check if we have an additional DAYLIGHT component and both have a RRULE component --> tz uses daylight saving
 		if (isset($standard['RRULE']) && isset($daylight) && isset($daylight['RRULE']))
 		{
-			foreach(array('dststart' => $daylight,'dstend' => $standard) as $prefix => $comp)
+			foreach (array('dststart' => $daylight, 'dstend' => $standard) as $prefix => $comp)
 			{
 				// fix RRULE order
 				$comp['RRULE'] = preg_replace('/FREQ=YEARLY;BYMONTH=(\d+);BYDAY=(.*)/',
 					'FREQ=YEARLY;BYDAY=$2;BYMONTH=$1', $comp['RRULE']);
 
-				if (preg_match('/FREQ=YEARLY;BYDAY=(.*);BYMONTH=(\d+)/',$comp['RRULE'],$matches))
+				if (preg_match('/FREQ=YEARLY;BYDAY=(.*);BYMONTH=(\d+)/', $comp['RRULE'], $matches))
 				{
 					$data[$prefix.'month'] = (int)$matches[2];
 					$data[$prefix.'week'] = (int)$matches[1];
@@ -1461,20 +1460,20 @@ 
 						$data[$prefix.'week'] = 5;
 						if ($prefix == 'dstend') $data[$prefix.'month'] -= 1;
 					}
-					static $day2int = array('SU'=>0,'MO'=>1,'TU'=>2,'WE'=>3,'TH'=>4,'FR'=>5,'SA'=>6);
-					$data[$prefix.'day'] = (int)$day2int[substr($matches[1],-2)];
+					static $day2int = array('SU'=>0, 'MO'=>1, 'TU'=>2, 'WE'=>3, 'TH'=>4, 'FR'=>5, 'SA'=>6);
+					$data[$prefix.'day'] = (int)$day2int[substr($matches[1], -2)];
 				}
-				if (preg_match('/^\d{8}T(\d{6})$/',$comp['DTSTART'],$matches))
+				if (preg_match('/^\d{8}T(\d{6})$/', $comp['DTSTART'], $matches))
 				{
-					$data[$prefix.'hour'] = (int)substr($matches[1],0,2)+($prefix=='dststart'?-1:1)*$data['dstbias']/60;
-					$data[$prefix.'minute'] = (int)substr($matches[1],2,2)+($prefix=='dststart'?-1:1)*$data['dstbias']%60;
-					$data[$prefix.'second'] = (int)substr($matches[1],4,2);
+					$data[$prefix.'hour'] = (int)substr($matches[1], 0, 2) + ($prefix == 'dststart' ?-1 : 1) * $data['dstbias'] / 60;
+					$data[$prefix.'minute'] = (int)substr($matches[1], 2, 2) + ($prefix == 'dststart' ?-1 : 1) * $data['dstbias'] % 60;
+					$data[$prefix.'second'] = (int)substr($matches[1], 4, 2);
 				}
 			}
 			// for southern hermisphere, were DST is in January, we have to swap start- and end-hour/-minute
 			if ($data['dststartmonth'] > $data['dstendmonth'])
 			{
-				$start = $data['dststarthour'];   $data['dststarthour'] = $data['dstendhour'];     $data['dstendhour'] = $start;
+				$start = $data['dststarthour']; $data['dststarthour'] = $data['dstendhour']; $data['dstendhour'] = $start;
 				$end = $data['dststartminute']; $data['dststartminute'] = $data['dstendminute']; $data['dstendminute'] = $end;
 			}
 		}
@@ -1532,20 +1531,20 @@ 
 	 * @param string|array $ical lines of ical file
 	 * @return array with parsed ical components
 	 */
-	static public function ical2array(&$ical,$section=null)
+	static public function ical2array(&$ical, $section = null)
 	{
 		$arr = array();
 		if (!is_array($ical)) $ical = preg_split("/[\r\n]+/m", $ical);
 		while (($line = array_shift($ical)))
 		{
-			list($name,$value) = explode(':',$line,2);
+			list($name, $value) = explode(':', $line, 2);
 			if ($name == 'BEGIN')
 			{
-				$arr[$value] = self::ical2array($ical,$value);
+				$arr[$value] = self::ical2array($ical, $value);
 			}
-			elseif($name == 'END')
+			elseif ($name == 'END')
 			{
-				if ($section && $section==$value) return $arr;
+				if ($section && $section == $value) return $arr;
 				break;
 			}
 			else
@@ -1568,13 +1567,13 @@ 
 	 */
 	public static function as2tz(array $data)
 	{
-		static $cache=null;	// some caching withing the request
+		static $cache = null; // some caching withing the request
 
-		unset($data['name']);	// not used, but can stall the match
+		unset($data['name']); // not used, but can stall the match
 
 		$key = serialize($data);
 
-		for($n = 0; !isset($cache[$key]); ++$n)
+		for ($n = 0; !isset($cache[$key]); ++$n)
 		{
 			if (!$n)	// check users timezone first
 			{
@@ -1593,7 +1592,7 @@ 
 					break;
 				}
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				unset($e);
 				// simpy ignore that, as it only means $tz can NOT be converted, because it has no VTIMEZONE component
 			}
@@ -1608,8 +1607,8 @@ 
 	 */
 	static public function _getTZFromSyncBlob($data)
 	{
-		$tz = unpack(	"lbias/a64name/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/" .
-						"lstdbias/a64name/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/" .
+		$tz = unpack("lbias/a64name/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/".
+						"lstdbias/a64name/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/".
 						"ldstbias", $data);
 
 		return $tz;
@@ -1622,7 +1621,7 @@ 
 	 */
 	static public function _getSyncBlobFromTZ($tz)
 	{
-		$packed = pack("la64vvvvvvvv" . "la64vvvvvvvv" . "l",
+		$packed = pack("la64vvvvvvvv"."la64vvvvvvvv"."l",
 				$tz["bias"], "", 0, $tz["dstendmonth"], $tz["dstendday"], $tz["dstendweek"], $tz["dstendhour"], $tz["dstendminute"], $tz["dstendsecond"], $tz["dstendmillis"],
 				$tz["stdbias"], "", 0, $tz["dststartmonth"], $tz["dststartday"], $tz["dststartweek"], $tz["dststarthour"], $tz["dststartminute"], $tz["dststartsecond"], $tz["dststartmillis"],
 				$tz["dstbias"]);
@@ -1646,7 +1645,7 @@ 
 				$account_id = $entry['grantor'];
 				$cals[$account_id] = $entry['name'];
 			}
-			if ($hook_data['account_id'] > 0) unset($cals[$hook_data['account_id']]);	// skip current user
+			if ($hook_data['account_id'] > 0) unset($cals[$hook_data['account_id']]); // skip current user
 		}
 		$cals['G'] = lang('Primary group');
 		$cals['A'] = lang('All');
@@ -1682,7 +1681,7 @@ 
 		)
 	);
 	require_once('../../header.inc.php');
-	ini_set('display_errors',1);
+	ini_set('display_errors', 1);
 	error_reporting(E_ALL & ~E_NOTICE);
 
 	echo "<html><head><title>Conversation of ActiveSync Timezone Blobs to TZID's</title></head>\n<body>\n";
@@ -1697,7 +1696,7 @@ 
 	</script>\n";
 
 	// TZID => AS timezone blobs reported by various devices
-	foreach(array(
+	foreach (array(
 		// Exchange 2016 Europe/Berlin
 		'Europe/Berlin'    => 'xP///1cALgAgAEUAdQByAG8AcABlACAAUwB0AGEAbgBkAGEAcgBkACAAVABpAG0AZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAMAAAAAAAAAAAAAACgAVQBUAEMAKwAwADEAOgAwADAAKQAgAEEAbQBzAHQAZQByAGQAYQBtACwAIABCAGUAcgBsAGkAbgAsACAAQgAAAAMAAAAFAAIAAAAAAAAAxP///w==',
 		//'Europe/Berlin'    => 'xP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAMAAAAAAAAAxP///w==',
@@ -1713,7 +1712,7 @@ 
 	) as $tz => $sync_blob)
 	{
 		// get as timezone data for a given timezone
-		$ical = calendar_timezones::tz2id($tz,'component');
+		$ical = calendar_timezones::tz2id($tz, 'component');
 		//echo "<pre>".print_r($ical,true)."</pre>\n";
 		$ical_tz = $ical;
 		$ical_arr = calendar_zpush::ical2array($ical_tz);
@@ -1722,7 +1721,7 @@ 
 		//echo "$tz=<pre>".print_r($as_tz,true)."</pre>\n";
 
 		$as_tz_org = calendar_zpush::_getTZFromSyncBlob(base64_decode($sync_blob));
-		echo "sync_blob=<pre>".print_r($as_tz_org,true)."</pre>\n";
+		echo "sync_blob=<pre>".print_r($as_tz_org, true)."</pre>\n";
 
 		// find matching timezone from as data
 		// this returns the FIRST match, which is in case of Pacific/Auckland eg. Antarctica/McMurdo ;-)
@@ -1730,24 +1729,24 @@ 
 		//echo array2string($matched);
 
 		echo "<tr><td><b onclick='toggle_display(this.nextSibling);' style='cursor:pointer;'>$tz</b><pre style='margin:0; font-size: 90%; display:none;'>$ical</pre></td><td>$as_tz_org[bias]<br/>$as_tz[bias]</td><td>$as_tz_org[dstbias]<br/>$as_tz[dstbias]</td>\n";
-		foreach(array('dststart','dstend') as $prefix)
+		foreach (array('dststart', 'dstend') as $prefix)
 		{
 			echo "<td>\n";
-			foreach(array($as_tz_org,$as_tz) as $n => $arr)
+			foreach (array($as_tz_org, $as_tz) as $n => $arr)
 			{
 				$parts = array();
-				foreach(array('year','month','day','week','hour','minute','second') as $postfix)
+				foreach (array('year', 'month', 'day', 'week', 'hour', 'minute', 'second') as $postfix)
 				{
 					$failed = $n && $as_tz_org[$prefix.$postfix] !== $as_tz[$prefix.$postfix];
-					$parts[] = ($failed?'<font color="red">':'').
+					$parts[] = ($failed ? '<font color="red">' : '').
 						"<span title='$postfix'>".$arr[$prefix.$postfix].'</span>'.
-						($failed?'</font>':'');
+						($failed ? '</font>' : '');
 				}
-				echo implode(' ', $parts).(!$n?'<br/>':'');
+				echo implode(' ', $parts).(!$n ? '<br/>' : '');
 			}
 			echo "</td>\n";
 		}
-		echo "<td>&nbsp;<br/>".($matched=='UTC'?'<font color="red">':'').$matched.($matched=='UTC'?'</font>':'')."</td></tr>\n";
+		echo "<td>&nbsp;<br/>".($matched == 'UTC' ? '<font color="red">' : '').$matched.($matched == 'UTC' ? '</font>' : '')."</td></tr>\n";
 	}
 	echo "</tbody></table>\n";
 	echo "</body></html>\n";

Braces +236 added lines, -57 removed lines

@@ -20,9 +20,17 @@ 
  */
 if (isset($_SERVER['SCRIPT_FILENAME']) && realpath($_SERVER['SCRIPT_FILENAME']) == __FILE__)
 {
-	interface activesync_plugin_write {}
-	interface activesync_plugin_meeting_requests {}
-	class ZLog { static function Write($level, $msg) { unset($level, $msg); }}
+	interface activesync_plugin_write
+	{
+}
+	interface activesync_plugin_meeting_requests
+	{
+}
+	class ZLog
+	{
+static function Write($level, $msg)
+	{
+unset($level, $msg); }}
 }
 
 /**
@@ -82,7 +90,10 @@ 
 	 */
 	public function GetFolderList()
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$cals_pref = $GLOBALS['egw_info']['user']['preferences']['activesync']['calendar-cals'];
 		$cals = $cals_pref ? explode(',',$cals_pref) : array('P');	// implicit default of 'P'
@@ -181,13 +192,20 @@ 
   	 */
 	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$id',$cutoffdate)");
 		$type = $user = null;
 		$this->backend->splitID($id,$type,$user);
 
-		if (!$cutoffdate) $cutoffdate = $this->bo->now - 100*24*3600;	// default three month back -30 breaks all sync recurrences
+		if (!$cutoffdate)
+		{
+			$cutoffdate = $this->bo->now - 100*24*3600;
+		}
+		// default three month back -30 breaks all sync recurrences
 
 		$filter = array(
 			'users' => $user,
@@ -215,7 +233,10 @@ 
 		{
 			foreach ($events as $event)
 			{
-				if ($not_uids && in_array($event['uid'], $not_uids)) continue;
+				if ($not_uids && in_array($event['uid'], $not_uids))
+				{
+					continue;
+				}
 				$messagelist[] = $this->StatMessage($id, $event);
 
 				// add virtual exceptions for recuring events too
@@ -230,7 +251,10 @@ 
 					}
 				}*/
 			}
-			if (count($events) < $num_rows) break;
+			if (count($events) < $num_rows)
+			{
+				break;
+			}
 		}
 		//error_log(__METHOD__."($id, $cutoffdate, ".array2string($not_uids).") type=$type, user=$user returning ".count($messagelist)." messages ".function_backtrace());
 		return $messagelist;
@@ -292,7 +316,10 @@ 
 	{
 		unset($truncsize, $optionbodypreference, $mimesupport);	// not used, but required by function signature
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		if (!($event = $this->calendar->read(abs($id), 0, false, 'server')))
 		{
@@ -370,7 +397,10 @@ 
 			'created' => 'dtstamp',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
@@ -382,7 +412,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 		$message->organizer = $event['organizer'];
 
@@ -417,7 +450,10 @@ 
 	 */
 	function MeetingResponse($folderid, $requestid, $response)
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		static $as2status = array(	// different from self::$status2as!
 			1 => 'A',
@@ -427,9 +463,12 @@ 
 		$status_in = isset($as2status[$response]) ? $as2status[$response] : 'U';
 		$uid = $GLOBALS['egw_info']['user']['account_id'];
 
-		if (!is_numeric($requestid))	// iCal from fmail
+		if (!is_numeric($requestid))
+		{
+			// iCal from fmail
 		{
 			$ical = new calendar_ical();
+		}
 			if (!($events = $ical->icaltoegw($requestid, '', 'utf-8')) || count($events) != 1)
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, '$requestid') error parsing iCal!");
@@ -542,7 +581,10 @@ 
 	{
 		unset($contentParameters);	// unused, but required by function signature
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$old_event = array();
 		$type = $account = null;
@@ -557,10 +599,13 @@ 
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id,...) Folder wrong or event does not existing");
 			return false;
 		}
-		if ($recur_date)	// virtual exception
+		if ($recur_date)
+		{
+			// virtual exception
 		{
 			// @todo check if virtual exception needs to be saved as real exception, or only stati need to be changed
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
+		}
 			//error_log(__METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
 		}
 		if (!$this->calendar->check_perms($id ? Acl::EDIT : Acl::ADD, $old_event ? $old_event : 0,$account))
@@ -570,7 +615,11 @@ 
 			//error_log(__METHOD__."('$folderid',$id,".array2string($message).") no rights to add/edit event!");
 			return false;
 		}
-		if (!$id) $old_event['owner'] = $account;	// we do NOT allow to change the owner of existing events
+		if (!$id)
+		{
+			$old_event['owner'] = $account;
+		}
+		// we do NOT allow to change the owner of existing events
 
 		$event = $this->message2event($message, $account, $old_event);
 
@@ -599,7 +648,10 @@ 
 					unset($ex_event['etag']);
 					foreach(array_keys($ex_event) as $name)
 					{
-						if (substr($name,0,6) == 'recur_') unset($ex_event[$name]);
+						if (substr($name,0,6) == 'recur_')
+						{
+							unset($ex_event[$name]);
+						}
 					}
 					$ex_event['recur_type'] = calendar_rrule::NONE;
 
@@ -652,7 +704,10 @@ 
 			'end' => 'endtime',
 		) as $key => $attr)
 		{
-			if (isset($message->$attr)) $event[$key] = Api\DateTime::server2user($message->$attr);
+			if (isset($message->$attr))
+			{
+				$event[$key] = Api\DateTime::server2user($message->$attr);
+			}
 		}
 		// copying strings
 		foreach(array(
@@ -661,7 +716,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (isset($message->$attr)) $event[$key] = $message->$attr;
+			if (isset($message->$attr))
+			{
+				$event[$key] = $message->$attr;
+			}
 		}
 
 		// only change description, if one given, as iOS5 skips description in ChangeMessage after MeetingResponse
@@ -680,14 +738,22 @@ 
 
 		if (($event['whole_day'] = $message->alldayevent))
 		{
-			if ($event['end'] == $event['start']) $event['end'] += 24*3600;	// some clients send equal start&end for 1day
+			if ($event['end'] == $event['start'])
+			{
+				$event['end'] += 24*3600;
+			}
+			// some clients send equal start&end for 1day
 			$event['end']--;	// otherwise our whole-day event code in save makes it one more day!
 		}
 
 		$participants = array();
 		foreach((array)$message->attendees as $attendee)
 		{
-			if ($attendee->type == 3) continue;	// we can not identify resources and re-add them anyway later
+			if ($attendee->type == 3)
+			{
+				continue;
+			}
+			// we can not identify resources and re-add them anyway later
 
 			$matches = null;
 			if (preg_match('/^noreply-(.*)-uid@egroupware.org$/',$attendee->email,$matches))
@@ -702,7 +768,10 @@ 
 					//'n_fn' => $attendee->name,	// not sure if we want matches without email
 				);
 				// search addressbook for participant
-				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+				if (!isset($this->addressbook))
+				{
+					$this->addressbook = new Api\Contacts();
+				}
 				if ((list($data) = $this->addressbook->search($search,
 					array('id','egw_addressbook.account_id as account_id','n_fn'),
 					'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
@@ -710,10 +779,13 @@ 
 				{
 					$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 				}
-				elseif($attendee->name === $attendee->email || empty($attendee->name))	// dont store empty or email as name
+				elseif($attendee->name === $attendee->email || empty($attendee->name))
+				{
+					// dont store empty or email as name
 				{
 					$uid = 'e'.$attendee->email;
 				}
+				}
 				else	// store just the email
 				{
 					$uid = 'e'.$attendee->name.' <'.$attendee->email.'>';
@@ -742,7 +814,11 @@ 
 				$role = 'REQ-PARTICIPANT';
 				//ZLog::Write(LOGLEVEL_DEBUG, "default status for $uid is status=$status, quantity=$quantitiy, role=$role");
 			}
-			if ($role == 'CHAIR') $chair_set = true;	// by role from existing participant
+			if ($role == 'CHAIR')
+			{
+				$chair_set = true;
+			}
+			// by role from existing participant
 
 			if (isset($attendee->attendeestatus) && ($s = array_search($attendee->attendeestatus,self::$status2as)))
 			{
@@ -756,10 +832,13 @@ 
 			elseif (isset($attendee->attendeetype) &&
 				!($role == 'CHAIR' && !is_numeric($uid)) &&	// do not override our external ORGANIZER
 				($r = array_search($attendee->attendeetype,self::$role2as)) &&
-				(int)self::$role2as[$role] != $attendee->attendeetype)	// if old role gives same type, use old role, as we have a lot more roles then AS
+				(int)self::$role2as[$role] != $attendee->attendeetype)
+			{
+				// if old role gives same type, use old role, as we have a lot more roles then AS
 			{
 				$role = $r;
 			}
+			}
 			//ZLog::Write(LOGLEVEL_DEBUG, "-> status for $uid is status=$status ($s), quantity=$quantitiy, role=$role ($r)");
 			$participants[$uid] = calendar_so::combine_status($status,$quantitiy,$role);
 		}
@@ -774,12 +853,19 @@ 
 		// $account is also preserved, as AS does not add him as participant!
 		foreach((array)$event['participant_types'] as $type => $parts)
 		{
-			if (in_array($type,array('c','e'))) continue;	// they are correctly representable in AS
+			if (in_array($type,array('c','e')))
+			{
+				continue;
+			}
+			// they are correctly representable in AS
 
 			foreach($parts as $id => $status)
 			{
 				// accounts are represented correctly, but the event owner which is no participant in AS
-				if ($type == 'u' && $id != $account) continue;
+				if ($type == 'u' && $id != $account)
+				{
+					continue;
+				}
 
 				$uid = calendar_so::combine_user($type, $id);
 				if (!isset($participants[$uid]))
@@ -804,10 +890,13 @@ 
 		// check if event is recurring and import recur information (incl. timezone)
 		if ($message->recurrence)
 		{
-			if ($message->timezone && !$event['id'])	// dont care for timezone, if no new and recurring event
+			if ($message->timezone && !$event['id'])
+			{
+				// dont care for timezone, if no new and recurring event
 			{
 				$event['tzid'] = self::as2tz(self::_getTZFromSyncBlob(base64_decode($message->timezone)));
 			}
+			}
 			$event['recur_type'] = $message->recurrence->type == 6 ? calendar_rrule::YEARLY :
 				array_search($message->recurrence->type, self::$recur_type2as);
 			$event['recur_interval'] = $message->recurrence->interval;
@@ -844,10 +933,13 @@ 
 			{
 				// calculate enddate from occurences count, as we only support enddate
 				$count = $message->recurrence->occurrences;
-				foreach(calendar_rrule::event2rrule($event, true) as $rtime)	// true = timestamps are user time here, because of save!
+				foreach(calendar_rrule::event2rrule($event, true) as $rtime)
+				{
+					// true = timestamps are user time here, because of save!
 				{
 					if (--$count <= 0) break;
 				}
+				}
 				$event['recur_enddate'] = $rtime->format('ts');
 			}
 		}
@@ -862,7 +954,9 @@ 
 					break;
 				}
 			}
-			if ($alarm !== true)	// new alarm
+			if ($alarm !== true)
+			{
+				// new alarm
 			{
 				// delete all earlier alarms of that user
 				// user get's per AS only the earliest alarm, as AS only supports one alarm
@@ -872,6 +966,7 @@ 
 					if ($alarm['owner'] == $account && $alarm['offset'] > 60*$message->reminder)
 					{
 						unset($event['alarm'][$key]);
+			}
 					}
 				}
 				$event['alarm'][] = $alarm = array(
@@ -952,7 +1047,10 @@ 
 	{
 		unset($contentParameters);	// not used, but required by function signature
 
-		if (!isset($this->caledar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->caledar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$ret = $this->calendar->delete($id);
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $id) delete($id) returned ".array2string($ret));
@@ -1014,7 +1112,10 @@ 
 	 */
 	public function GetMessage($folderid, $id, $contentparameters, $class='SyncAppointment')
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 		//error_log(__METHOD__.__LINE__.array2string($contentparameters).function_backtrace());
 		$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
 		$mimesupport = $contentparameters->GetMimeSupport();
@@ -1052,7 +1153,10 @@ 
 		catch(Exception $e) {
 			unset($e);
 			// z-push (2.3 at least) requires a timezone for recurring events
-			if ($event['recur_type']) $message->timezone = self::UTC_BLOB;
+			if ($event['recur_type'])
+			{
+				$message->timezone = self::UTC_BLOB;
+			}
 		}
 
 		// copying timestamps (they are already read in servertime, so non tz conversation)
@@ -1063,7 +1167,10 @@ 
 			'modified' => 'dtstamp',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
@@ -1076,7 +1183,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 
 		// appoint description
@@ -1125,7 +1235,10 @@ 
 				list($info) = $i = $this->calendar->resources[$uid[0]]['info'] ?
 					ExecMethod($this->calendar->resources[$uid[0]]['info'],substr($uid,1)) : array(false);
 
-				if (!$info) continue;
+				if (!$info)
+				{
+					continue;
+				}
 
 				if (!$info['email'] && $info['responsible'])
 				{
@@ -1141,10 +1254,17 @@ 
 					$message->organizeremail = $attendee->email;
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, $id, ...) external organizer detected (role=$role, uid=$uid), set as AS organizer: $message->organizername <$message->organizeremail>");
 				}
-				if ($uid[0] == 'r') $attendee->type = 3;	// 3 = resource
+				if ($uid[0] == 'r')
+				{
+					$attendee->type = 3;
+				}
+				// 3 = resource
 			}
 			// email must NOT be empty, but MAY be an arbitrary text
-			if (empty($attendee->email)) $attendee->email = 'noreply-'.$uid.'-uid@egroupware.org';
+			if (empty($attendee->email))
+			{
+				$attendee->email = 'noreply-'.$uid.'-uid@egroupware.org';
+			}
 
 			$message->attendees[] = $attendee;
 		}
@@ -1179,9 +1299,12 @@ 
 					$recurrence->monthofyear = (int)$rrule->time->format('m');	// 1..12
 					break;
 			}
-			if ($rrule->enddate)	// enddate is only a date, but AS needs a time incl. correct starttime!
+			if ($rrule->enddate)
+			{
+				// enddate is only a date, but AS needs a time incl. correct starttime!
 			{
 				$enddate = clone $rrule->time;
+			}
 				$enddate->setDate($rrule->enddate->format('Y'), $rrule->enddate->format('m'),
 					$rrule->enddate->format('d'));
 				$recurrence->until = $enddate->format('server');
@@ -1203,12 +1326,19 @@ 
 				{
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." Exceptions found but no UID given for Event:".$event['id'].' Exceptions:'.array2string($event['recur_exception']));
 				}
-				if (count($ex_events)>=1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
+				if (count($ex_events)>=1)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
+				}
 
 				$message->exceptions = array();
 				foreach($ex_events as $ex_event)
 				{
-					if ($ex_event['id'] == $event['id']) continue;	// ignore series master
+					if ($ex_event['id'] == $event['id'])
+					{
+						continue;
+					}
+					// ignore series master
 					$exception = $this->GetMessage($folderid, $ex_event, $contentparameters, 'SyncAppointmentException');
 					$exception->exceptionstarttime = $exception_time = $ex_event['recurrence'];
 					foreach(array('attendees','recurrence','uid','timezone','organizername','organizeremail') as $not_supported)
@@ -1228,7 +1358,10 @@ 
 				{
 					if (!empty($exception_time))
 					{
-						if (empty($event['uid'])) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
+						if (empty($event['uid']))
+						{
+							ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
+						}
 						$exception = new SyncAppointmentException();	// exceptions seems to be full SyncAppointments, with only starttime required
 						$exception->deleted = 1;
 						$exception->exceptionstarttime = $exception_time;
@@ -1284,12 +1417,18 @@ 
 	{
 		unset($folderid);	// not used ($id is unique), but required by function signature
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$nul = null;
-		if (!($etag = $this->calendar->get_etag($id, $nul, true, true)))	// last true: $only_master=true
+		if (!($etag = $this->calendar->get_etag($id, $nul, true, true)))
+		{
+			// last true: $only_master=true
 		{
 			$stat = false;
+		}
 			// error_log why access is denied (should never happen for everything returned by calendar_bo::search)
 			$backup = $this->calendar->debug;
 			//$this->calendar->debug = 2;
@@ -1323,13 +1462,22 @@ 
 		$type = $owner = null;
 		$this->backend->splitID($folderid, $type, $owner);
 
-		if ($type != 'calendar') return false;
+		if ($type != 'calendar')
+		{
+			return false;
+		}
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 		//$ctag = $this->calendar->get_ctag($owner,'owner',true);	// true only consider recurrence master
 		$syncstate = $this->calendar->get_ctag($owner,false,true); // we only want to fetch the owners events, where he is a participant too
 		// workaround for syncstate = 0 when calendar is empty causes synctate to not return 0 but array resulting in foldersync loop
-		if ($syncstate == 0) $syncstate = 1;
+		if ($syncstate == 0)
+		{
+			$syncstate = 1;
+		}
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', ...) type='$type', owner=$owner --> syncstate='$syncstate'");
 	}
@@ -1405,10 +1553,16 @@ 
 			'dstendhour' => 0, 'dstendminute' => 0, 'dstendsecond' => 0, 'dstendmillis' => 0,
 		);
 
-		if ($tz === 'UTC') return $data;
+		if ($tz === 'UTC')
+		{
+			return $data;
+		}
 
 		$name = $component = is_a($tz,'DateTimeZone') ? $tz->getName() : $tz;
-		if (strpos($component, 'VTIMEZONE') === false) $component = calendar_timezones::tz2id($name,'component');
+		if (strpos($component, 'VTIMEZONE') === false)
+		{
+			$component = calendar_timezones::tz2id($name,'component');
+		}
 		// parse ical timezone defintion
 		$ical = self::ical2array($component);
 		$standard = $ical['VTIMEZONE']['STANDARD'];
@@ -1455,11 +1609,17 @@ 
 						$data[$prefix.'week'] = 5;
 					}
 					// if both start and end use 1SU use week=5 and decrement month
-					if ($prefix == 'dststart') $start_byday = $matches[1];
+					if ($prefix == 'dststart')
+					{
+						$start_byday = $matches[1];
+					}
 					if ($prefix == 'dstend' && $matches[1] == '1SU' && $start_byday == '1SU')
 					{
 						$data[$prefix.'week'] = 5;
-						if ($prefix == 'dstend') $data[$prefix.'month'] -= 1;
+						if ($prefix == 'dstend')
+						{
+							$data[$prefix.'month'] -= 1;
+						}
 					}
 					static $day2int = array('SU'=>0,'MO'=>1,'TU'=>2,'WE'=>3,'TH'=>4,'FR'=>5,'SA'=>6);
 					$data[$prefix.'day'] = (int)$day2int[substr($matches[1],-2)];
@@ -1535,7 +1695,10 @@ 
 	static public function ical2array(&$ical,$section=null)
 	{
 		$arr = array();
-		if (!is_array($ical)) $ical = preg_split("/[\r\n]+/m", $ical);
+		if (!is_array($ical))
+		{
+			$ical = preg_split("/[\r\n]+/m", $ical);
+		}
 		while (($line = array_shift($ical)))
 		{
 			list($name,$value) = explode(':',$line,2);
@@ -1545,7 +1708,10 @@ 
 			}
 			elseif($name == 'END')
 			{
-				if ($section && $section==$value) return $arr;
+				if ($section && $section==$value)
+				{
+					return $arr;
+				}
 				break;
 			}
 			else
@@ -1576,13 +1742,19 @@ 
 
 		for($n = 0; !isset($cache[$key]); ++$n)
 		{
-			if (!$n)	// check users timezone first
+			if (!$n)
+			{
+				// check users timezone first
 			{
 				$tz = Api\DateTime::$user_timezone->getName();
 			}
-			elseif (!($tz = calendar_timezones::id2tz($n)))	// no further timezones to check
+			}
+			elseif (!($tz = calendar_timezones::id2tz($n)))
+			{
+				// no further timezones to check
 			{
 				$cache[$key] = 'UTC';
+			}
 				error_log(__METHOD__.'('.array2string($data).') NO matching timezone found --> using UTC now!');
 				break;
 			}
@@ -1646,7 +1818,11 @@ 
 				$account_id = $entry['grantor'];
 				$cals[$account_id] = $entry['name'];
 			}
-			if ($hook_data['account_id'] > 0) unset($cals[$hook_data['account_id']]);	// skip current user
+			if ($hook_data['account_id'] > 0)
+			{
+				unset($cals[$hook_data['account_id']]);
+			}
+			// skip current user
 		}
 		$cals['G'] = lang('Primary group');
 		$cals['A'] = lang('All');
@@ -1674,13 +1850,16 @@ 
  *
  * You need to comment implements activesync_plugin_write
  */
-if (isset($_SERVER['SCRIPT_FILENAME']) && realpath($_SERVER['SCRIPT_FILENAME']) == __FILE__)	// some tests
+if (isset($_SERVER['SCRIPT_FILENAME']) && realpath($_SERVER['SCRIPT_FILENAME']) == __FILE__)
+{
+	// some tests
 {
 	$GLOBALS['egw_info'] = array(
 		'flags' => array(
 			'currentapp' => 'login'
 		)
 	);
+}
 	require_once('../../header.inc.php');
 	ini_set('display_errors',1);
 	error_reporting(E_ALL & ~E_NOTICE);

calendar/inc/class.calendar_ical.inc.php

Spacing +258 added lines, -259 removed lines

@@ -54,39 +54,39 @@ 
 	 * @var array $priority_egw2ical conversion of the priority egw => ical
 	 */
 	var $priority_egw2ical = array(
-		0 => 0,		// undefined
-		1 => 9,		// low
-		2 => 5,		// normal
-		3 => 1,		// high
+		0 => 0, // undefined
+		1 => 9, // low
+		2 => 5, // normal
+		3 => 1, // high
 	);
 
 	/**
 	 * @var array $priority_ical2egw conversion of the priority ical => egw
 	 */
 	var $priority_ical2egw = array(
-		0 => 0,		// undefined
-		9 => 1,	8 => 1, 7 => 1, 6 => 1,	// low
-		5 => 2,		// normal
-		4 => 3, 3 => 3, 2 => 3, 1 => 3,	// high
+		0 => 0, // undefined
+		9 => 1, 8 => 1, 7 => 1, 6 => 1, // low
+		5 => 2, // normal
+		4 => 3, 3 => 3, 2 => 3, 1 => 3, // high
 	);
 
 	/**
 	 * @var array $priority_egw2funambol conversion of the priority egw => funambol
 	 */
 	var $priority_egw2funambol = array(
-		0 => 1,		// undefined (mapped to normal since undefined does not exist)
-		1 => 0,		// low
-		2 => 1,		// normal
-		3 => 2,		// high
+		0 => 1, // undefined (mapped to normal since undefined does not exist)
+		1 => 0, // low
+		2 => 1, // normal
+		3 => 2, // high
 	);
 
 	/**
 	 * @var array $priority_funambol2egw conversion of the priority funambol => egw
 	 */
 	var $priority_funambol2egw = array(
-		0 => 1,		// low
-		1 => 2,		// normal
-		2 => 3,		// high
+		0 => 1, // low
+		1 => 2, // normal
+		2 => 3, // high
 	);
 
 	/**
@@ -156,7 +156,7 @@ 
 	 * @var boolean
 	 */
 	var $log = false;
-	var $logfile="/tmp/log-vcal";
+	var $logfile = "/tmp/log-vcal";
 
 	/**
 	 * Event callback
@@ -203,7 +203,7 @@ 
 	 * @param int|string $current_user =0 uid of current user to only export that one as participant for method=REPLY
 	 * @return string|boolean string with iCal or false on error (e.g. no permission to read the event)
 	 */
-	function &exportVCal($events, $version='1.0', $method='PUBLISH', $recur_date=0, $principalURL='', $charset='UTF-8', $current_user=0)
+	function &exportVCal($events, $version = '1.0', $method = 'PUBLISH', $recur_date = 0, $principalURL = '', $charset = 'UTF-8', $current_user = 0)
 	{
 		if ($this->log)
 		{
@@ -234,13 +234,13 @@ 
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
 
-		if ($this->productManufacturer == '' )
+		if ($this->productManufacturer == '')
 		{	// syncevolution is broken
 			$version = '2.0';
 		}
 
 		$vcal = new Horde_Icalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 		$vcal->setAttribute('VERSION', $version);
 		if ($method) $vcal->setAttribute('METHOD', $method);
@@ -270,15 +270,15 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								'() User does not have the permission to read event ' . $event['id']. "\n",
-								3,$this->logfile);
+								'() User does not have the permission to read event '.$event['id']."\n",
+								3, $this->logfile);
 						}
 						return -1; // Permission denied
 					}
 				}
 				else
 				{
-					$retval = false;  // Entry does not exist
+					$retval = false; // Entry does not exist
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
@@ -292,7 +292,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'() export event UID: ' . $event['uid'] . ".\n",
+					'() export event UID: '.$event['uid'].".\n",
 					3, $this->logfile);
 			}
 
@@ -325,8 +325,8 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'(' . $event['id']. ',' . $recurrence . ")\n" .
-					array2string($event)."\n",3,$this->logfile);
+					'('.$event['id'].','.$recurrence.")\n".
+					array2string($event)."\n", 3, $this->logfile);
 			}
 
 			if ($recurrence)
@@ -347,7 +347,7 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 								"(, $recurrence) Gratuitous pseudo exception, skipped ...\n",
-								3,$this->logfile);
+								3, $this->logfile);
 						}
 						continue; // unsupported status only exception
 					}
@@ -357,13 +357,13 @@ 
 					$days = $this->so->get_recurrence_exceptions($master, $tzid, 0, 0, 'rrule');
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-							array2string($days)."\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+							array2string($days)."\n", 3, $this->logfile);
 					}
 					$recurrence = $days[$recurrence]; // use remote representation
 				}
 				// force single event
-				foreach (array('recur_enddate','recur_interval','recur_exception','recur_data','recur_date','id','etag') as $name)
+				foreach (array('recur_enddate', 'recur_interval', 'recur_exception', 'recur_data', 'recur_date', 'id', 'etag') as $name)
 				{
 					unset($event[$name]);
 				}
@@ -371,7 +371,7 @@ 
 			}
 
 			// check if tzid of event (not only recuring ones) is already added to export
-			if ($tzid && $tzid != 'UTC' && !in_array($tzid,$vtimezones_added))
+			if ($tzid && $tzid != 'UTC' && !in_array($tzid, $vtimezones_added))
 			{
 				// check if we have vtimezone component data for tzid of event, if not default to user timezone (default to server tz)
 				if (calendar_timezones::add_vtimezone($vcal, $tzid) ||
@@ -389,7 +389,7 @@ 
 			{
 				// Append UID to DESCRIPTION
 				if (!preg_match('/\[UID:.+\]/m', $event['description'])) {
-					$event['description'] .= "\n[UID:" . $event['uid'] . "]";
+					$event['description'] .= "\n[UID:".$event['uid']."]";
 				}
 			}
 
@@ -410,14 +410,14 @@ 
 				$exceptions = array();
 
 				// dont use "virtual" exceptions created by participant status for GroupDAV or file export
-				if (!in_array($this->productManufacturer,array('file','groupdav')))
+				if (!in_array($this->productManufacturer, array('file', 'groupdav')))
 				{
 					$filter = isset($this->supportedFields['participants']) ? 'rrule' : 'tz_rrule';
 					$exceptions = $this->so->get_recurrence_exceptions($event, $tzid, 0, 0, $filter);
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n" .
-							array2string($exceptions)."\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n".
+							array2string($exceptions)."\n", 3, $this->logfile);
 					}
 				}
 				elseif (is_array($event['recur_exception']))
@@ -434,8 +434,8 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							'(' . $event['id'] . ") [$icalFieldName] not supported\n",
-							3,$this->logfile);
+							'('.$event['id'].") [$icalFieldName] not supported\n",
+							3, $this->logfile);
 					}
 					continue;
 				}
@@ -452,23 +452,23 @@ 
 
 							if (!($info = $this->resource_info($uid))) continue;
 
-							if (in_array($status, array('X','E'))) continue;	// dont include deleted participants
+							if (in_array($status, array('X', 'E'))) continue; // dont include deleted participants
 
 							if ($this->log)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									'()attendee:' . array2string($info) ."\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									'()attendee:'.array2string($info)."\n", 3, $this->logfile);
 							}
 							$participantCN = str_replace(array('\\', ',', ';', ':'),
 												array('\\\\', '\\,', '\\;', '\\:'),
 												trim(empty($info['cn']) ? $info['name'] : $info['cn']));
 							if ($version == '1.0')
 							{
-								$participantURL = trim('"' . $participantCN . '"' . (empty($info['email']) ? '' : ' <' . $info['email'] .'>'));
+								$participantURL = trim('"'.$participantCN.'"'.(empty($info['email']) ? '' : ' <'.$info['email'].'>'));
 							}
 							else
 							{
-								$participantURL = empty($info['email']) ? '' : 'mailto:' . $info['email'];
+								$participantURL = empty($info['email']) ? '' : 'mailto:'.$info['email'];
 							}
 							// RSVP={TRUE|FALSE}	// resonse expected, not set in eGW => status=U
 							$rsvp = $status == 'U' ? 'TRUE' : 'FALSE';
@@ -496,7 +496,7 @@ 
 										($members = $GLOBALS['egw']->accounts->members($uid, true)) && in_array($this->user, $members))
 									{
 										$user = $this->resource_info($this->user);
-										$attributes['ATTENDEE'][] = 'mailto:' . $user['email'];
+										$attributes['ATTENDEE'][] = 'mailto:'.$user['email'];
 			    						$parameters['ATTENDEE'][] = array(
 			    							'CN'		=>	$user['name'],
 			    							'ROLE'		=> 'REQ-PARTICIPANT',
@@ -538,7 +538,7 @@ 
 							if (!empty($rsvp)) $options['RSVP'] = $rsvp;
 							if (!empty($info['email']) && $participantURL != 'mailto:'.$info['email'])
 							{
-								$options['EMAIL'] = $info['email'];	// only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
+								$options['EMAIL'] = $info['email']; // only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
 							}
 							if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = (string)$uid;
 							if ($quantity > 1)
@@ -552,7 +552,7 @@ 
 						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')
@@ -564,16 +564,16 @@ 
     				case 'ORGANIZER':
 	    				if (!$organizerURL)
 	    				{
-	    					$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
-			    				. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
-			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
+	    					$organizerCN = '"'.trim($GLOBALS['egw']->accounts->id2name($event['owner'], 'account_firstname')
+			    				. ' '.$GLOBALS['egw']->accounts->id2name($event['owner'], 'account_lastname')).'"';
+			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email');
 			    			if ($version == '1.0')
 			    			{
-		    					$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
+		    					$organizerURL = trim($organizerCN.(empty($organizerURL) ? '' : ' <'.$organizerURL.'>'));
 			    			}
 			    			else
 			    			{
-		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
+		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:'.$organizerEMail;
 			    			}
 			    			$organizerUID = $event['owner'];
 	    				}
@@ -592,7 +592,7 @@ 
 					case 'DTSTART':
 						if (empty($event['whole_day']))
 						{
-							$attributes['DTSTART'] = self::getDateTime($event['start'],$tzid,$parameters['DTSTART']);
+							$attributes['DTSTART'] = self::getDateTime($event['start'], $tzid, $parameters['DTSTART']);
 						}
 						break;
 
@@ -603,27 +603,27 @@ 
 							if ($tzid == 'UTC' && $event['end'] - $event['start'] <= 86400)
 								$attributes['duration'] = $event['end'] - $event['start'];
 							else
-								$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
+								$attributes['DTEND'] = self::getDateTime($event['end'], $tzid, $parameters['DTEND']);
 						}
 						else
 						{
 							// write start + end of whole day events as dates
-							$event['end-nextday'] = $event['end'] + 12*3600;	// we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
-							foreach (array('start' => 'DTSTART','end-nextday' => 'DTEND') as $f => $t)
+							$event['end-nextday'] = $event['end'] + 12 * 3600; // we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
+							foreach (array('start' => 'DTSTART', 'end-nextday' => 'DTEND') as $f => $t)
 							{
-								$time = new Api\DateTime($event[$f],Api\DateTime::$server_timezone);
-								$arr = Api\DateTime::to($time,'array');
-								$vevent->setAttribute($t, array('year' => $arr['year'],'month' => $arr['month'],'mday' => $arr['day']),
+								$time = new Api\DateTime($event[$f], Api\DateTime::$server_timezone);
+								$arr = Api\DateTime::to($time, 'array');
+								$vevent->setAttribute($t, array('year' => $arr['year'], 'month' => $arr['month'], 'mday' => $arr['day']),
 									array('VALUE' => 'DATE'));
 							}
 							unset($attributes['DTSTART']);
 							// Outlook does NOT care about type of DTSTART/END, only setting X-MICROSOFT-CDO-ALLDAYEVENT is used to determine an event is a whole-day event
-							$vevent->setAttribute('X-MICROSOFT-CDO-ALLDAYEVENT','TRUE');
+							$vevent->setAttribute('X-MICROSOFT-CDO-ALLDAYEVENT', 'TRUE');
 						}
 						break;
 
 					case 'RRULE':
-						if ($event['recur_type'] == MCAL_RECUR_NONE) break;		// no recuring event
+						if ($event['recur_type'] == MCAL_RECUR_NONE) break; // no recuring event
 						$rriter = calendar_rrule::event2rrule($event, false, $tzid);
 						$rrule = $rriter->generate_rrule($version);
 						if ($event['recur_enddate'])
@@ -650,16 +650,16 @@ 
 						{
 							if ($event['recur_enddate'] && $tzid)
 							{
-								$rrule['UNTIL'] = self::getDateTime($rrule['UNTIL'],$tzid);
+								$rrule['UNTIL'] = self::getDateTime($rrule['UNTIL'], $tzid);
 							}
 							$attributes['RRULE'] = $rrule['FREQ'].' '.$rrule['UNTIL'];
 						}
 						else // $version == '2.0'
 						{
 							$attributes['RRULE'] = '';
-							foreach($rrule as $n => $v)
+							foreach ($rrule as $n => $v)
 							{
-								$attributes['RRULE'] .= ($attributes['RRULE']?';':'').$n.'='.$v;
+								$attributes['RRULE'] .= ($attributes['RRULE'] ? ';' : '').$n.'='.$v;
 							}
 						}
 						break;
@@ -674,7 +674,7 @@ 
 								{
 									// current Horde_Icalendar 2.1.4 exports EXDATE always in UTC, so we should not set a timezone here
 									// Apple calendar on OS X 10.11.4 uses a timezone, so does Horde eg. for Recurrence-ID
-									$event['recur_exception'][$key] = self::getDateTime($timestamp,$tzid);//,$parameters['EXDATE']);
+									$event['recur_exception'][$key] = self::getDateTime($timestamp, $tzid); //,$parameters['EXDATE']);
 								}
 							}
 							else
@@ -682,9 +682,9 @@ 
 								// use 'DATE' instead of 'DATE-TIME' on whole day events
 								foreach ($event['recur_exception'] as $id => $timestamp)
 								{
-									$time = new Api\DateTime($timestamp,Api\DateTime::$server_timezone);
+									$time = new Api\DateTime($timestamp, Api\DateTime::$server_timezone);
 									$time->setTimezone(self::$tz_cache[$event['tzid']]);
-									$arr = Api\DateTime::to($time,'array');
+									$arr = Api\DateTime::to($time, 'array');
 									$days[$id] = array(
 										'year'  => $arr['year'],
 										'month' => $arr['month'],
@@ -699,21 +699,21 @@ 
 						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))
 						{
-							$attributes['PRIORITY'] = (int) $this->priority_egw2funambol[$event['priority']];
+							$attributes['PRIORITY'] = (int)$this->priority_egw2funambol[$event['priority']];
 						}
 						else
 						{
-							$attributes['PRIORITY'] = (int) $this->priority_egw2ical[$event['priority']];
+							$attributes['PRIORITY'] = (int)$this->priority_egw2ical[$event['priority']];
 						}
 						break;
 
 					case 'TRANSP':
-						if (!$event['non_blocking']) continue 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);
@@ -752,13 +752,13 @@ 
 							// We handle a pseudo exception
 							if (empty($event['whole_day']))
 							{
-								$attributes[$icalFieldName] = self::getDateTime($recur_date,$tzid,$parameters[$icalFieldName]);
+								$attributes[$icalFieldName] = self::getDateTime($recur_date, $tzid, $parameters[$icalFieldName]);
 							}
 							else
 							{
-								$time = new Api\DateTime($recur_date,Api\DateTime::$server_timezone);
+								$time = new Api\DateTime($recur_date, Api\DateTime::$server_timezone);
 								$time->setTimezone(self::$tz_cache[$event['tzid']]);
-								$arr = Api\DateTime::to($time,'array');
+								$arr = Api\DateTime::to($time, 'array');
 								$vevent->setAttribute($icalFieldName, array(
 									'year' => $arr['year'],
 									'month' => $arr['month'],
@@ -770,17 +770,17 @@ 
 						elseif ($event['recurrence'] && $event['reference'])
 						{
 							// $event['reference'] is a calendar_id, not a timestamp
-							if (!($revent = $this->read($event['reference']))) break;	// referenced event does not exist
+							if (!($revent = $this->read($event['reference']))) break; // referenced event does not exist
 
 							if (empty($revent['whole_day']))
 							{
-								$attributes[$icalFieldName] = self::getDateTime($event['recurrence'],$tzid,$parameters[$icalFieldName]);
+								$attributes[$icalFieldName] = self::getDateTime($event['recurrence'], $tzid, $parameters[$icalFieldName]);
 							}
 							else
 							{
-								$time = new Api\DateTime($event['recurrence'],Api\DateTime::$server_timezone);
+								$time = new Api\DateTime($event['recurrence'], Api\DateTime::$server_timezone);
 								$time->setTimezone(self::$tz_cache[$event['tzid']]);
-								$arr = Api\DateTime::to($time,'array');
+								$arr = Api\DateTime::to($time, 'array');
 								$vevent->setAttribute($icalFieldName, array(
 									'year' => $arr['year'],
 									'month' => $arr['month'],
@@ -807,9 +807,9 @@ 
 							$noTruncate = $this->clientProperties[$icalFieldName]['NoTruncate'];
 							if ($this->log && $size > 0)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									"() $icalFieldName Size: $size, NoTruncate: " .
-									($noTruncate ? 'TRUE' : 'FALSE') . "\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									"() $icalFieldName Size: $size, NoTruncate: ".
+									($noTruncate ? 'TRUE' : 'FALSE')."\n", 3, $this->logfile);
 							}
 							//Horde::logMessage("vCalendar $icalFieldName Size: $size, NoTruncate: " .
 							//	($noTruncate ? 'TRUE' : 'FALSE'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -827,8 +827,8 @@ 
 							{
 								if ($this->log)
 								{
-									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-										"() $icalFieldName omitted due to maximum size $size\n",3,$this->logfile);
+									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+										"() $icalFieldName omitted due to maximum size $size\n", 3, $this->logfile);
 								}
 								//Horde::logMessage("vCalendar $icalFieldName omitted due to maximum size $size",
 								//	__FILE__, __LINE__, PEAR_LOG_WARNING);
@@ -838,8 +838,8 @@ 
 							$value = substr($value, 0, $size - 1);
 							if ($this->log)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									"() $icalFieldName truncated to maximum size $size\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									"() $icalFieldName truncated to maximum size $size\n", 3, $this->logfile);
 							}
 							//Horde::logMessage("vCalendar $icalFieldName truncated to maximum size $size",
 							//	__FILE__, __LINE__, PEAR_LOG_INFO);
@@ -854,7 +854,7 @@ 
 			// for CalDAV add all X-Properties previously parsed
 			if ($this->productManufacturer == 'groupdav' || $this->productManufacturer == 'file')
 			{
-				foreach($event as $name => $value)
+				foreach ($event as $name => $value)
 				{
 					if (substr($name, 0, 2) == '##')
 					{
@@ -932,8 +932,8 @@ 
 						$values['AALARM']['repeat count'] = '';
 						$values['AALARM']['display text'] = $description;
 					}
-					$attributes['DALARM'] = self::getDateTime($alarmData['time'],$tzid,$parameters['DALARM']);
-					$attributes['AALARM'] = self::getDateTime($alarmData['time'],$tzid,$parameters['AALARM']);
+					$attributes['DALARM'] = self::getDateTime($alarmData['time'], $tzid, $parameters['DALARM']);
+					$attributes['AALARM'] = self::getDateTime($alarmData['time'], $tzid, $parameters['AALARM']);
 					// lets take only the first alarm
 					break;
 				}
@@ -970,7 +970,7 @@ 
 						$alarmData['offset'] = false;
 					}
 
-					$valarm = Horde_Icalendar::newComponent('VALARM',$vevent);
+					$valarm = Horde_Icalendar::newComponent('VALARM', $vevent);
 					if ($alarmData['offset'] !== false)
 					{
 						$valarm->setAttribute('TRIGGER', -$alarmData['offset'],
@@ -979,7 +979,7 @@ 
 					else
 					{
 						$params = array('VALUE' => 'DATE-TIME');
-						$value = self::getDateTime($alarmData['time'],$tzid,$params);
+						$value = self::getDateTime($alarmData['time'], $tzid, $params);
 						$valarm->setAttribute('TRIGGER', $value, $params);
 					}
 					if (!empty($alarmData['uid']))
@@ -990,7 +990,7 @@ 
 					// set evtl. existing attributes set by iCal clients not used by EGroupware
 					if (isset($alarmData['attrs']))
 					{
-						foreach($alarmData['attrs'] as $attr => $data)
+						foreach ($alarmData['attrs'] as $attr => $data)
 						{
 							$valarm->setAttribute($attr, $data['value'], $data['params']);
 						}
@@ -998,11 +998,11 @@ 
 					// set default ACTION and DESCRIPTION, if not set by a client
 					if (!isset($alarmData['attrs']) || !isset($alarmData['attrs']['ACTION']))
 					{
-						$valarm->setAttribute('ACTION','DISPLAY');
+						$valarm->setAttribute('ACTION', 'DISPLAY');
 					}
 					if (!isset($alarmData['attrs']) || !isset($alarmData['attrs']['DESCRIPTION']))
 					{
-						$valarm->setAttribute('DESCRIPTION',$event['title'] ? $event['title'] : $description);
+						$valarm->setAttribute('DESCRIPTION', $event['title'] ? $event['title'] : $description);
 					}
 					$vevent->addComponent($valarm);
 				}
@@ -1010,15 +1010,15 @@ 
 
 			foreach ($attributes as $key => $value)
 			{
-				foreach (is_array($value) && $parameters[$key]['VALUE']!='DATE' ? $value : array($value) as $valueID => $valueData)
+				foreach (is_array($value) && $parameters[$key]['VALUE'] != 'DATE' ? $value : array($value) as $valueID => $valueData)
 				{
-					$valueData = Api\Translation::convert($valueData,Api\Translation::charset(),$charset);
-                    $paramData = (array) Api\Translation::convert(is_array($value) ?
+					$valueData = Api\Translation::convert($valueData, Api\Translation::charset(), $charset);
+                    $paramData = (array)Api\Translation::convert(is_array($value) ?
                     		$parameters[$key][$valueID] : $parameters[$key],
-                            Api\Translation::charset(),$charset);
-                    $valuesData = (array) Api\Translation::convert($values[$key],
-                    		Api\Translation::charset(),$charset);
-                    $content = $valueData . implode(';', $valuesData);
+                            Api\Translation::charset(), $charset);
+                    $valuesData = (array)Api\Translation::convert($values[$key],
+                    		Api\Translation::charset(), $charset);
+                    $content = $valueData.implode(';', $valuesData);
 
 					if ($version == '1.0' && (preg_match('/[^\x20-\x7F]/', $content) ||
 						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN']))))
@@ -1068,10 +1068,10 @@ 
 		$retval = $events_exported ? $vcal->exportvCalendar() : false;
  		if ($this->log)
  		{
- 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"() '$this->productManufacturer','$this->productName'\n",3,$this->logfile);
- 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"()\n".array2string($retval)."\n",3,$this->logfile);
+ 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"() '$this->productManufacturer','$this->productName'\n", 3, $this->logfile);
+ 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"()\n".array2string($retval)."\n", 3, $this->logfile);
  		}
 		return $retval;
 	}
@@ -1084,15 +1084,15 @@ 
 	 * @param array &$params=null parameter array to set TZID
 	 * @return mixed attribute value to set: integer timestamp if $tzid == 'UTC' otherwise Ymd\THis string IN $tzid
 	 */
-	static function getDateTime($time,$tzid,array &$params=null)
+	static function getDateTime($time, $tzid, array &$params = null)
 	{
 		if (empty($tzid) || $tzid == 'UTC')
 		{
-			return Api\DateTime::to($time,'ts');
+			return Api\DateTime::to($time, 'ts');
 		}
-		if (!is_a($time,'DateTime'))
+		if (!is_a($time, 'DateTime'))
 		{
-			$time = new Api\DateTime($time,Api\DateTime::$server_timezone);
+			$time = new Api\DateTime($time, Api\DateTime::$server_timezone);
 		}
 		if (!isset(self::$tz_cache[$tzid]))
 		{
@@ -1127,11 +1127,11 @@ 
 	 * @param string $caldav_name=null name from CalDAV client or null (to use default)
 	 * @return int|boolean|null cal_id > 0 on success, false on failure or 0 for a failed etag|permission denied or null for "403 Forbidden"
 	 */
-	function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0, $principalURL='', $user=null, $charset=null, $caldav_name=null,$skip_notification=false)
+	function importVCal($_vcalData, $cal_id = -1, $etag = null, $merge = false, $recur_date = 0, $principalURL = '', $user = null, $charset = null, $caldav_name = null, $skip_notification = false)
 	{
 		//error_log(__METHOD__."(, $cal_id, $etag, $merge, $recur_date, $principalURL, $user, $charset, $caldav_name)");
 		$this->events_imported = 0;
-		$replace = $delete_exceptions= false;
+		$replace = $delete_exceptions = false;
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
 
@@ -1139,7 +1139,7 @@ 
 		{
 			return false;
 		}
-		if (!is_array($events)) $cal_id = -1;	// just to be sure, as iterator does NOT allow array access (eg. $events[0])
+		if (!is_array($events)) $cal_id = -1; // just to be sure, as iterator does NOT allow array access (eg. $events[0])
 
 		if ($cal_id > 0)
 		{
@@ -1147,7 +1147,7 @@ 
 			{
 				$replace = $recur_date == 0;
 				$events[0]['id'] = $cal_id;
-				if (!is_null($etag)) $events[0]['etag'] = (int) $etag;
+				if (!is_null($etag)) $events[0]['etag'] = (int)$etag;
 				if ($recur_date) $events[0]['recurrence'] = $recur_date;
 			}
 			elseif (($foundEvent = $this->find_event(array('id' => $cal_id), 'exact')) &&
@@ -1189,9 +1189,9 @@ 
 			if (!is_array($event)) continue; // the iterator may return false
 
 			// Run event through callback
-			if($this->event_callback && is_callable($this->event_callback))
+			if ($this->event_callback && is_callable($this->event_callback))
 			{
-				if(!call_user_func_array($this->event_callback, array(&$event)))
+				if (!call_user_func_array($this->event_callback, array(&$event)))
 				{
 					// Callback cancelled event
 					continue;
@@ -1209,7 +1209,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					."($cal_id, $etag, $recur_date, $principalURL, $user, $charset)\n"
-					. array2string($event)."\n",3,$this->logfile);
+					. array2string($event)."\n", 3, $this->logfile);
 			}
 
 			$updated_id = false;
@@ -1232,14 +1232,14 @@ 
 					{
 						if ($delete_exceptions)
 						{
-							$this->delete($id,0,false,$skip_notification);
+							$this->delete($id, 0, false, $skip_notification);
 						}
 						else
 						{
 							if (!($exception = $this->read($id))) continue;
 							$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
 							$exception['reference'] = $exception['recurrence'] = 0;
-							$this->update($exception, true,true,false,true,$msg,$skip_notification);
+							$this->update($exception, true, true, false, true, $msg, $skip_notification);
 						}
 					}
 				}
@@ -1256,7 +1256,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. "(UPDATE Event)\n"
-						. array2string($event_info['stored_event'])."\n",3,$this->logfile);
+						. array2string($event_info['stored_event'])."\n", 3, $this->logfile);
 				}
 				if (empty($event['uid']))
 				{
@@ -1278,7 +1278,7 @@ 
 								if ($this->log)
 								{
 									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-										"() Restore status for $uid\n",3,$this->logfile);
+										"() Restore status for $uid\n", 3, $this->logfile);
 								}
 								$event['participants'][$uid] = $event_info['stored_event']['participants'][$uid];
 							}
@@ -1313,7 +1313,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"()[MERGE]\n",3,$this->logfile);
+							"()[MERGE]\n", 3, $this->logfile);
 					}
 					// overwrite with server data for merge
 					foreach ($event_info['stored_event'] as $key => $value)
@@ -1321,7 +1321,7 @@ 
 						switch ($key)
 						{
 							case 'participants_types':
-								continue 2;	// +1 for switch
+								continue 2; // +1 for switch
 
 							case 'participants':
 								foreach ($event_info['stored_event']['participants'] as $uid => $status)
@@ -1343,7 +1343,7 @@ 
 				else
 				{
 					// no merge
-					if(!isset($this->supportedFields['category']))
+					if (!isset($this->supportedFields['category']))
 					{
 						$event['category'] = $event_info['stored_event']['category'];
 					}
@@ -1355,7 +1355,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() No participants\n",3,$this->logfile);
+							"() No participants\n", 3, $this->logfile);
 						}
 
 						// If this is an updated meeting, and the client doesn't support
@@ -1374,7 +1374,7 @@ 
 								if ($this->log)
 								{
 									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-										"() Restore resource $uid to status $status\n",3,$this->logfile);
+										"() Restore resource $uid to status $status\n", 3, $this->logfile);
 								}
 								// Add it back in
 								$event['participants'][$uid] = $status;
@@ -1462,8 +1462,7 @@ 
 						}
 						// for resources check which new-status to give (eg. with direct booking permision 'A' instead 'U')
 						$event['participants'][$user] = calendar_so::combine_status(
-							$user < 0 || !isset($this->resources[$user[0]]['new_status']) ? 'U' :
-							ExecMethod($this->resources[$user[0]]['new_status'], substr($user, 1)));
+							$user < 0 || !isset($this->resources[$user[0]]['new_status']) ? 'U' : ExecMethod($this->resources[$user[0]]['new_status'], substr($user, 1)));
 					}
 				}
 				// check if an owner is set and the current user has add rights
@@ -1528,9 +1527,9 @@ 
 
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ . '('
-					. $event_info['type'] . ")\n"
-					. array2string($event)."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'('
+					. $event_info['type'].")\n"
+					. array2string($event)."\n", 3, $this->logfile);
 			}
 
 			// Android (any maybe others) delete recurrences by setting STATUS: CANCELLED
@@ -1538,10 +1537,10 @@ 
 			if (in_array($event_info['type'], array('SERIES-EXCEPTION', 'SERIES-EXCEPTION-PROPAGATE', 'SERIES-PSEUDO-EXCEPTION')) &&
 				$event['status'] == 'CANCELLED')
 			{
-				if (!$this->delete($event['id'] ? $event['id'] : $cal_id, $event['recurrence'],false,$skip_notification))
+				if (!$this->delete($event['id'] ? $event['id'] : $cal_id, $event['recurrence'], false, $skip_notification))
 				{
 					// delete fails (because no rights), reject recurrence
-					$this->set_status($event['id'] ? $event['id'] : $cal_id, $this->user, 'R', $event['recurrence'],false,true,$skip_notification);
+					$this->set_status($event['id'] ? $event['id'] : $cal_id, $this->user, 'R', $event['recurrence'], false, true, $skip_notification);
 				}
 				continue;
 			}
@@ -1553,7 +1552,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SINGLE\n",3,$this->logfile);
+							"(): event SINGLE\n", 3, $this->logfile);
 					}
 
 					// update the event
@@ -1563,7 +1562,7 @@ 
 						$event['reference'] = 0;
 						$event_to_store = $event; // prevent $event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1572,7 +1571,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-MASTER\n",3,$this->logfile);
+							"(): event SERIES-MASTER\n", 3, $this->logfile);
 					}
 
 					// remove all known pseudo exceptions and update the event
@@ -1582,8 +1581,8 @@ 
 						$days = $this->so->get_recurrence_exceptions($event_info['stored_event'], $this->tzid, 0, 0, $filter);
 						if ($this->log)
 						{
-							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS MAPPING):\n" .
-								array2string($days)."\n",3,$this->logfile);
+							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS MAPPING):\n".
+								array2string($days)."\n", 3, $this->logfile);
 						}
 						if (is_array($days))
 						{
@@ -1601,7 +1600,7 @@ 
 
 						$event_to_store = $event; // prevent $event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1611,7 +1610,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-EXCEPTION\n",3,$this->logfile);
+							"(): event SERIES-EXCEPTION\n", 3, $this->logfile);
 					}
 
 					// update event
@@ -1667,13 +1666,13 @@ 
 							$event['owner'] = $event_info['master_event']['owner'];
 							$event_to_store = $event_info['master_event']; // prevent the master_event from being changed by the update method
 							$this->server2usertime($event_to_store);
-							$this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+							$this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 							unset($event_to_store);
 						}
 
 						$event_to_store = $event; // prevent $event from being changed by update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1682,7 +1681,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-PSEUDO-EXCEPTION\n",3,$this->logfile);
+							"(): event SERIES-PSEUDO-EXCEPTION\n", 3, $this->logfile);
 					}
 					//Horde::logMessage('importVCAL event SERIES-PSEUDO-EXCEPTION',
 					//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -1703,7 +1702,7 @@ 
 						// save the series master with the adjusted exceptions
 						$event_to_store = $event_info['master_event']; // prevent the master_event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true, true, false, false,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, false, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 
@@ -1730,13 +1729,13 @@ 
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
-								$this->update_status($event, $event_info['stored_event'],0,$skip_notification);
+								$this->update_status($event, $event_info['stored_event'], 0, $skip_notification);
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['stored_event']['participants'][$this->user]))
 							{
 								// update the users status only
 								$this->set_status($event_info['stored_event']['id'], $this->user,
-									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), 0, true,true,$skip_notification);
+									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), 0, true, true, $skip_notification);
 							}
 						}
 						break;
@@ -1748,13 +1747,13 @@ 
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
-								$this->update_status($event, $event_info['stored_event'], $recurrence,$skip_notification);
+								$this->update_status($event, $event_info['stored_event'], $recurrence, $skip_notification);
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['master_event']['participants'][$this->user]))
 							{
 								// update the users status only
 								$this->set_status($event_info['master_event']['id'], $this->user,
-									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), $recurrence, true,true,$skip_notification);
+									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), $recurrence, true, true, $skip_notification);
 							}
 						}
 						break;
@@ -1771,7 +1770,7 @@ 
 					break;
 
 				case 'SERIES-PSEUDO-EXCEPTION':
-					$return_id = is_array($event_info['master_event']) ? $event_info['master_event']['id'] . ':' . $event['recurrence'] : false;
+					$return_id = is_array($event_info['master_event']) ? $event_info['master_event']['id'].':'.$event['recurrence'] : false;
 					break;
 
 				case 'SERIES-EXCEPTION-PROPAGATE':
@@ -1784,7 +1783,7 @@ 
 					{
 						// we did not have sufficient rights to propagate the status only exception to a real one
 						// we have to keep the SERIES-PSEUDO-EXCEPTION id and keep the event untouched
-						$return_id = $event_info['master_event']['id'] . ':' . $event['recurrence'];
+						$return_id = $event_info['master_event']['id'].':'.$event['recurrence'];
 					}
 					break;
 			}
@@ -1798,8 +1797,8 @@ 
 			if ($this->log)
 			{
 				$event_info['stored_event'] = $this->read($event_info['stored_event']['id']);
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()[$updated_id]\n" .
-					array2string($event_info['stored_event'])."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()[$updated_id]\n".
+					array2string($event_info['stored_event'])."\n", 3, $this->logfile);
 			}
 		}
 		date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
@@ -1821,19 +1820,19 @@ 
 	 * @return mixed on success: int $cal_id > 0, on error or conflicts false.
 	 *	Conflicts are passed to $this->conflict_callback
 	 */
-	public function update(&$event,$ignore_conflicts=false,$touch_modified=true,$ignore_acl=false,$updateTS=true,&$messages=null, $skip_notification=false)
+	public function update(&$event, $ignore_conflicts = false, $touch_modified = true, $ignore_acl = false, $updateTS = true, &$messages = null, $skip_notification = false)
 	{
-		if($this->conflict_callback !== null)
+		if ($this->conflict_callback !== null)
 		{
 			// calendar_ical overrides search(), which breaks conflict checking
 			// so we make sure to use the original from parent
 			static $bo = null;
-			if(!$bo)
+			if (!$bo)
 			{
 				$bo = new calendar_boupdate();
 			}
 			$conflicts = $bo->conflicts($event);
-			if(is_array($conflicts) && count($conflicts) > 0)
+			if (is_array($conflicts) && count($conflicts) > 0)
 			{
 				call_user_func_array($this->conflict_callback, array(&$event, &$conflicts));
 				return false;
@@ -1854,11 +1853,11 @@ 
 	{
 		if ($this->debug) error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
 		$modified = 0;
-		foreach($event['alarm'] as &$alarm)
+		foreach ($event['alarm'] as &$alarm)
 		{
 			// check if alarm is already stored or from other users
 			$found = false;
-			foreach($old_alarms as $id => $old_alarm)
+			foreach ($old_alarms as $id => $old_alarm)
 			{
 				// not current users alarm --> ignore
 				if (!$old_alarm['all'] && $old_alarm['owner'] != $user)
@@ -1874,7 +1873,7 @@ 
 					break;
 				}
 			}
-			if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) processing ".($found?'existing':'new')." alarm ".array2string($alarm));
+			if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) processing ".($found ? 'existing' : 'new')." alarm ".array2string($alarm));
 			if (!empty($alarm['attrs']['X-LIC-ERROR']))
 			{
 				if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) ignored X-LIC-ERROR=".array2string($alarm['X-LIC-ERROR']));
@@ -1902,7 +1901,7 @@ 
 			}
 		}
 		// remove all old alarms left from current user
-		foreach($old_alarms as $id => $old_alarm)
+		foreach ($old_alarms as $id => $old_alarm)
 		{
 			// not current users alarm --> ignore
 			if (!$old_alarm['all'] && $old_alarm['owner'] != $user)
@@ -1925,7 +1924,7 @@ 
 	 * @param string $what ='value'
 	 * @return mixed
 	 */
-	static function _get_attribute($components,$name,$what='value')
+	static function _get_attribute($components, $name, $what = 'value')
 	{
 		foreach ($components as $attribute)
 		{
@@ -1960,7 +1959,7 @@ 
 						case 'DURATION':
 							if (isset($vattr['params']['RELATED']) && $vattr['params']['RELATED'] == 'END')
 							{
-								$alarm['offset'] = $duration -$vattr['value'];
+								$alarm['offset'] = $duration - $vattr['value'];
 							}
 							elseif (isset($vattr['params']['RELATED']) && $vattr['params']['RELATED'] != 'START')
 							{
@@ -1976,7 +1975,7 @@ 
 							$alarm['time'] = $vattr['value'];
 							break;
 						default:
-							error_log('VALARM/TRIGGER: unsupported value type:' . $vtype);
+							error_log('VALARM/TRIGGER: unsupported value type:'.$vtype);
 					}
 					break;
 
@@ -2001,9 +2000,9 @@ 
 		return 0;
 	}
 
-	function setSupportedFields($_productManufacturer='', $_productName='')
+	function setSupportedFields($_productManufacturer = '', $_productName = '')
 	{
-		$state =& $_SESSION['SyncML.state'];
+		$state = & $_SESSION['SyncML.state'];
 		if (isset($state))
 		{
 			$deviceInfo = $state->getClientDeviceInfo();
@@ -2300,10 +2299,10 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'(' . $this->productManufacturer .
-				', '. $this->productName .', ' .
-				($this->tzid ? $this->tzid : Api\DateTime::$user_timezone->getName()) .
-				', ' . $this->calendarOwner . ")\n" , 3, $this->logfile);
+				'('.$this->productManufacturer.
+				', '.$this->productName.', '.
+				($this->tzid ? $this->tzid : Api\DateTime::$user_timezone->getName()).
+				', '.$this->calendarOwner.")\n", 3, $this->logfile);
 		}
 
 		//Horde::logMessage('setSupportedFields(' . $this->productManufacturer . ', '
@@ -2321,12 +2320,12 @@ 
      *                         utf-8 for new format, iso-8859-1 for old format.
 	 * @return Iterator|array|boolean Iterator if resource given or array of events on success, false on failure
 	 */
-	function icaltoegw($_vcalData, $principalURL='', $charset=null)
+	function icaltoegw($_vcalData, $principalURL = '', $charset = null)
 	{
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($principalURL, $charset)\n" .
-				array2string($_vcalData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($principalURL, $charset)\n".
+				array2string($_vcalData)."\n", 3, $this->logfile);
 		}
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
@@ -2361,14 +2360,14 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"(): No vCalendar Container found!\n",3,$this->logfile);
+					"(): No vCalendar Container found!\n", 3, $this->logfile);
 			}
 			date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
 			return false;
 		}
 		foreach ($vcal->getComponents() as $component)
 		{
-			if (($event = $this->_ical2egw_callback($component,$this->tzid,$principalURL,$vcal)))
+			if (($event = $this->_ical2egw_callback($component, $this->tzid, $principalURL, $vcal)))
 			{
 				$events[] = $event;
 			}
@@ -2413,13 +2412,13 @@ 
 	 * @param Horde_Icalendar $container =null container to access attributes on container
 	 * @return array|boolean event array or false if $component is no Horde_Icalendar_Vevent
 	 */
-	function _ical2egw_callback(Horde_Icalendar $component, $tzid, $principalURL='', Horde_Icalendar $container=null)
+	function _ical2egw_callback(Horde_Icalendar $component, $tzid, $principalURL = '', Horde_Icalendar $container = null)
 	{
 		//unset($component->_container); _debug_array($component);
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'() '.get_class($component)." found\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'() '.get_class($component)." found\n", 3, $this->logfile);
 		}
 
 		// eg. Mozilla holiday calendars contain only a X-WR-TIMEZONE on vCalendar component
@@ -2479,16 +2478,16 @@ 
 	 * @param Horde_Icalendar $container =null container to access attributes on container
 	 * @return array|boolean			event on success, false on failure
 	 */
-	function vevent2egw($component, $version, $supportedFields, $principalURL='', $check_component='Horde_Icalendar_Vevent', Horde_Icalendar $container=null)
+	function vevent2egw($component, $version, $supportedFields, $principalURL = '', $check_component = 'Horde_Icalendar_Vevent', Horde_Icalendar $container = null)
 	{
-		unset($principalURL);	// not longer used, but required in function signature
+		unset($principalURL); // not longer used, but required in function signature
 
 		if ($check_component && !is_a($component, $check_component))
 		{
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'()' .
-					get_class($component)." found\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'()'.
+					get_class($component)." found\n", 3, $this->logfile);
 			}
 			return false;
 		}
@@ -2504,12 +2503,12 @@ 
 
 		$isDate = false;
 		$event		= array();
-		$alarms		= array();
+		$alarms = array();
 		$organizer_status = $organizer_uid = null;
-		$vcardData	= array(
+		$vcardData = array(
 			'recur_type'		=> MCAL_RECUR_NONE,
 			'recur_exception'	=> array(),
-			'priority'          => 0,	// iCalendar default is 0=undefined, not EGroupware 5=normal
+			'priority'          => 0, // iCalendar default is 0=undefined, not EGroupware 5=normal
 			'public'            => 1,
 		);
 		// we need to parse DTSTART, DTEND or DURATION (in that order!) first
@@ -2528,7 +2527,7 @@ 
 						$isDate = true;
 					}
 					$dtstart_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-					$vcardData['start']	= $dtstart_ts;
+					$vcardData['start'] = $dtstart_ts;
 
 					// set event timezone from dtstart, if specified there
 					if (!empty($attributes['params']['TZID']))
@@ -2546,18 +2545,18 @@ 
 							}
 							else
 							{
-								error_log(__METHOD__ . '() unknown TZID='
-									. $attributes['params']['TZID'] . ', defaulting to timezone "'
-									. date_default_timezone_get() . '".'.array2string($tz));
-								$event['tzid'] = date_default_timezone_get();	// default to current timezone
+								error_log(__METHOD__.'() unknown TZID='
+									. $attributes['params']['TZID'].', defaulting to timezone "'
+									. date_default_timezone_get().'".'.array2string($tz));
+								$event['tzid'] = date_default_timezone_get(); // default to current timezone
 							}
 						}
-						catch(Exception $e)
+						catch (Exception $e)
 						{
-							error_log(__METHOD__ . '() unknown TZID='
-								. $attributes['params']['TZID'] . ', defaulting to timezone "'
-								. date_default_timezone_get() . '".'.$e->getMessage());
-							$event['tzid'] = date_default_timezone_get();	// default to current timezone
+							error_log(__METHOD__.'() unknown TZID='
+								. $attributes['params']['TZID'].', defaulting to timezone "'
+								. date_default_timezone_get().'".'.$e->getMessage());
+							$event['tzid'] = date_default_timezone_get(); // default to current timezone
 						}
 					}
 					// if no timezone given and one is specified in class (never the case for CalDAV)
@@ -2581,11 +2580,11 @@ 
 
 				case 'DTEND':
 					$dtend_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-					if (date('H:i:s',$dtend_ts) == '00:00:00')
+					if (date('H:i:s', $dtend_ts) == '00:00:00')
 					{
 						$dtend_ts -= 1;
 					}
-					$vcardData['end']	= $dtend_ts;
+					$vcardData['end'] = $dtend_ts;
 					break;
 
 				case 'DURATION':	// clients can use DTSTART+DURATION, instead of DTSTART+DTEND
@@ -2605,7 +2604,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. "() DTSTART missing!\n",3,$this->logfile);
+					. "() DTSTART missing!\n", 3, $this->logfile);
 			}
 			return false; // not a valid entry
 		}
@@ -2624,7 +2623,7 @@ 
 				case 'X-MICROSOFT-CDO-ALLDAYEVENT':
 					if (isset($supportedFields['whole_day']))
 					{
-						$event['whole_day'] = (isset($attributes['value'])?strtoupper($attributes['value'])=='TRUE':true);
+						$event['whole_day'] = (isset($attributes['value']) ?strtoupper($attributes['value']) == 'TRUE' : true);
 					}
 					break;
 				case 'AALARM':
@@ -2654,12 +2653,12 @@ 
 					$vcardData['recurrence'] = $attributes['value'];
 					break;
 				case 'LOCATION':
-					$vcardData['location']	= str_replace("\r\n", "\n", $attributes['value']);
+					$vcardData['location'] = str_replace("\r\n", "\n", $attributes['value']);
 					break;
 				case 'RRULE':
-					unset($vcardData['recur_type']);	// it wont be set by +=
+					unset($vcardData['recur_type']); // it wont be set by +=
 					$vcardData += calendar_rrule::parseRrule($attributes['value']);
-					if (!empty($vcardData['recur_enddate'])) self::check_fix_endate ($vcardData);
+					if (!empty($vcardData['recur_enddate'])) self::check_fix_endate($vcardData);
 					break;
 				case 'EXDATE':	// current Horde_Icalendar returns dates, no timestamps
 					if ($attributes['values'])
@@ -2705,11 +2704,11 @@ 
 						(strpos($this->productName, 'outlook') !== false
 							|| strpos($this->productName, 'pocket pc') !== false))
 					{
-						$vcardData['priority'] = (int) $this->priority_funambol2egw[$attributes['value']];
+						$vcardData['priority'] = (int)$this->priority_funambol2egw[$attributes['value']];
 					}
 					else
 					{
-						$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
+						$vcardData['priority'] = (int)$this->priority_ical2egw[$attributes['value']];
 					}
 					break;
 				case 'CATEGORIES':
@@ -2723,10 +2722,10 @@ 
 					}
 					break;
 				case 'ORGANIZER':
-					$event['organizer'] = $attributes['value'];	// no egw field, but needed in AS
-					if (strtolower(substr($event['organizer'],0,7)) == 'mailto:')
+					$event['organizer'] = $attributes['value']; // no egw field, but needed in AS
+					if (strtolower(substr($event['organizer'], 0, 7)) == 'mailto:')
 					{
-						$event['organizer'] = substr($event['organizer'],7);
+						$event['organizer'] = substr($event['organizer'], 7);
 					}
 					if (!empty($attributes['params']['CN']))
 					{
@@ -2765,19 +2764,19 @@ 
 					}
 					// try parsing email and cn from attendee
 					elseif (preg_match('/mailto:([@.a-z0-9_-]+)|mailto:"?([.a-z0-9_ -]*)"?[ ]*<([@.a-z0-9_-]*)>/i',
-						$attributes['value'],$matches))
+						$attributes['value'], $matches))
 					{
 						$email = $matches[1] ? $matches[1] : $matches[3];
-						$cn = isset($matches[2]) ? $matches[2]: '';
+						$cn = isset($matches[2]) ? $matches[2] : '';
 					}
 					elseif (!empty($attributes['value']) &&
 						preg_match('/"?([.a-z0-9_ -]*)"?[ ]*<([@.a-z0-9_-]*)>/i',
-						$attributes['value'],$matches))
+						$attributes['value'], $matches))
 					{
 						$cn = $matches[1];
 						$email = $matches[2];
 					}
-					elseif (strpos($attributes['value'],'@') !== false)
+					elseif (strpos($attributes['value'], '@') !== false)
 					{
 						$email = $attributes['value'];
 					}
@@ -2794,7 +2793,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "(): Found X-EGROUPWARE-UID: '$uid'\n",3,$this->logfile);
+								. "(): Found X-EGROUPWARE-UID: '$uid'\n", 3, $this->logfile);
 						}
 					}
 					elseif ($attributes['value'] == 'Unknown')
@@ -2812,7 +2811,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "() Found account: '$uid', '$cn', '$email'\n",3,$this->logfile);
+								. "() Found account: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 						}
 					}
 					if (!$uid)
@@ -2829,9 +2828,9 @@ 
 							$cn = str_replace(array('\\,', '\\;', '\\:', '\\\\'),
 										array(',', ';', ':', '\\'),
 										$attributes['params']['CN']);
-							if ($cn[0] == '"' && substr($cn,-1) == '"')
+							if ($cn[0] == '"' && substr($cn, -1) == '"')
 							{
-								$cn = substr($cn,1,-1);
+								$cn = substr($cn, 1, -1);
 							}
 							// not searching for $cn, as match can be not unique or without an email address
 							// --> notification will fail, better store just as email
@@ -2840,19 +2839,19 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "() Search participant: '$cn', '$email'\n",3,$this->logfile);
+								. "() Search participant: '$cn', '$email'\n", 3, $this->logfile);
 						}
 
 						//elseif (//$attributes['params']['CUTYPE'] == 'GROUP'
-						if (preg_match('/(.*) '. lang('Group') . '/', $cn, $matches))
+						if (preg_match('/(.*) '.lang('Group').'/', $cn, $matches))
 						{
 							// we found a group
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Found group: '$matches[1]', '$cn', '$email'\n",3,$this->logfile);
+									. "() Found group: '$matches[1]', '$cn', '$email'\n", 3, $this->logfile);
 							}
-							if (($uid =  $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g')))
+							if (($uid = $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g')))
 							{
 								//Horde::logMessage("vevent2egw: group participant $uid",
 								//			__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -2866,7 +2865,7 @@ 
 										//Horde::logMessage("vevent2egw: set status to " . $status,
 										//		__FILE__, __LINE__, PEAR_LOG_DEBUG);
 										$vcardData['participants'][$this->user] =
-											calendar_so::combine_status($status,$quantity,$role);
+											calendar_so::combine_status($status, $quantity, $role);
 									}
 								}
 								$status = 'U'; // keep the group
@@ -2875,36 +2874,36 @@ 
 						}
 						elseif (empty($searcharray))
 						{
-							continue 2;	// participants without email AND CN --> ignore it
+							continue 2; // participants without email AND CN --> ignore it
 						}
 						elseif ((list($data) = $this->addressbook->search($searcharray,
-							array('id','egw_addressbook.account_id as account_id','n_fn'),
+							array('id', 'egw_addressbook.account_id as account_id', 'n_fn'),
 							'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
-							'','',false,'OR')))
+							'', '', false, 'OR')))
 						{
 							// found an addressbook entry
 							$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Found addressbook entry: '$uid', '$cn', '$email'\n",3,$this->logfile);
+									. "() Found addressbook entry: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 							}
 						}
 						else
 						{
 							if (!$email)
 							{
-								$email = 'no-email@egroupware.org';	// set dummy email to store the CN
+								$email = 'no-email@egroupware.org'; // set dummy email to store the CN
 							}
-							$uid = 'e'. ($cn ? $cn . ' <' . $email . '>' : $email);
+							$uid = 'e'.($cn ? $cn.' <'.$email.'>' : $email);
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Not Found, create dummy: '$uid', '$cn', '$email'\n",3,$this->logfile);
+									. "() Not Found, create dummy: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 							}
 						}
 					}
-					switch($attributes['name'])
+					switch ($attributes['name'])
 					{
 						case 'ATTENDEE':
 							if (!isset($attributes['params']['ROLE']) &&
@@ -2918,7 +2917,7 @@ 
 								// keep role 'CHAIR' from an external organizer, even if he is a regular participant with a different role
 								// as this is currently the only way to store an external organizer and send him iMip responses
 								$q = $r = null;
-								if (isset($vcardData['participants'][$uid]) && ($s=$vcardData['participants'][$uid]) &&
+								if (isset($vcardData['participants'][$uid]) && ($s = $vcardData['participants'][$uid]) &&
 									calendar_so::split_status($s, $q, $r) && $r == 'CHAIR')
 								{
 									$role = 'CHAIR';
@@ -2936,7 +2935,7 @@ 
 									if (!$this->calendarOwner && is_numeric($uid) && $role == 'CHAIR')
 										$component->getAttribute('ORGANIZER');
 								}
-								catch(Horde_Icalendar_Exception $e)
+								catch (Horde_Icalendar_Exception $e)
 								{
 									// we can store the ORGANIZER as event owner
 									$event['owner'] = $uid;
@@ -2995,7 +2994,7 @@ 
 					break;
 
 				case 'ATTACH':
-					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break;	// handeled by managed attachment code
+					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break; // handeled by managed attachment code
 					// fall throught to store external attachment url
 				default:	// X- attribute or other by EGroupware unsupported property
 					//error_log(__METHOD__."() $attributes[name] = ".array2string($attributes));
@@ -3073,7 +3072,7 @@ 
 					if ($event['recur_type'] != MCAL_RECUR_NONE)
 					{
 						$event['reference'] = 0;
-						foreach (array('recur_interval','recur_enddate','recur_data','recur_exception','recur_count') as $r)
+						foreach (array('recur_interval', 'recur_enddate', 'recur_data', 'recur_exception', 'recur_count') as $r)
 						{
 							if (isset($vcardData[$r]))
 							{
@@ -3096,12 +3095,12 @@ 
 			// reset recure_enddate to 00:00:00 on the last day
 			$rriter = calendar_rrule::event2rrule($event, false);
 			$last = $rriter->normalize_enddate();
-			if(!is_object($last))
+			if (!is_object($last))
 			{
-				if($this->log)
+				if ($this->log)
 				{
-					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-					" Unable to determine recurrence end date.  \n".array2string($event),3, $this->logfile);
+					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+					" Unable to determine recurrence end date.  \n".array2string($event), 3, $this->logfile);
 				}
 				return false;
 			}
@@ -3110,16 +3109,16 @@ 
 			$event['recur_enddate'] = Api\DateTime::to($last, 'server');
 		}
 		// translate COUNT into an enddate, as we only store enddates
-		elseif($event['recur_count'])
+		elseif ($event['recur_count'])
 		{
 			$rriter = calendar_rrule::event2rrule($event, false);
 			$last = $rriter->count2date($event['recur_count']);
-			if(!is_object($last))
+			if (!is_object($last))
 			{
-				if($this->log)
+				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__,
-					" Unable to determine recurrence end date.  \n".array2string($event),3, $this->logfile);
+					" Unable to determine recurrence end date.  \n".array2string($event), 3, $this->logfile);
 				}
 				return false;
 			}
@@ -3133,7 +3132,7 @@ 
 			if ($this->productManufacturer == 'groupdav' && $container &&
 				($x_calendarserver_access = $container->getAttribute('X-CALENDARSERVER-ACCESS')))
 			{
-				$event['public'] =  (int)(strtoupper($x_calendarserver_access) == 'PUBLIC');
+				$event['public'] = (int)(strtoupper($x_calendarserver_access) == 'PUBLIC');
 			}
 			//error_log(__METHOD__."() X-CALENDARSERVER-ACCESS=".array2string($x_calendarserver_access).' --> public='.array2string($event['public']));
 		}
@@ -3154,15 +3153,15 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($event)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($event)."\n", 3, $this->logfile);
 		}
 		//Horde::logMessage("vevent2egw:\n" . print_r($event, true),
         //    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		return $event;
 	}
 
-	function search($_vcalData, $contentID=null, $relax=false, $charset=null)
+	function search($_vcalData, $contentID = null, $relax = false, $charset = null)
 	{
 		if (($events = $this->icaltoegw($_vcalData, $charset)))
 		{
@@ -3183,8 +3182,8 @@ 
 			}
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."() found:\n" .
-					array2string($events)."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."() found:\n".
+					array2string($events)."\n", 3, $this->logfile);
 			}
 		}
 		return array();
@@ -3223,23 +3222,23 @@ 
 	 * @param array $extra =null extra attributes to add
 	 * 	X-CALENDARSERVER-MASK-UID can be used to not include an event specified by this uid as busy
 	 */
-	function freebusy($user,$end=null,$utc=true, $charset='UTF-8', $start=null, $method='PUBLISH', array $extra=null)
+	function freebusy($user, $end = null, $utc = true, $charset = 'UTF-8', $start = null, $method = 'PUBLISH', array $extra = null)
 	{
-		if (!$start) $start = time();	// default now
-		if (!$end) $end = time() + 100*DAY_s;	// default next 100 days
+		if (!$start) $start = time(); // default now
+		if (!$end) $end = time() + 100 * DAY_s; // default next 100 days
 
 		$vcal = new Horde_Icalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
-		$vcal->setAttribute('VERSION','2.0');
-		$vcal->setAttribute('METHOD',$method);
+		$vcal->setAttribute('VERSION', '2.0');
+		$vcal->setAttribute('METHOD', $method);
 
-		$vfreebusy = Horde_Icalendar::newComponent('VFREEBUSY',$vcal);
+		$vfreebusy = Horde_Icalendar::newComponent('VFREEBUSY', $vcal);
 
 		$attributes = array(
 			'DTSTAMP' => time(),
-			'DTSTART' => $this->date2ts($start,true),	// true = server-time
-			'DTEND' => $this->date2ts($end,true),	// true = server-time
+			'DTSTART' => $this->date2ts($start, true), // true = server-time
+			'DTEND' => $this->date2ts($end, true), // true = server-time
 		);
 		if (!$utc)
 		{
@@ -3250,9 +3249,9 @@ 
 		}
 		if (is_null($extra)) $extra = array(
 			'URL' => $this->freebusy_url($user),
-			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user,'account_email'),
+			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user, 'account_email'),
 		);
-		foreach($attributes+$extra as $attr => $value)
+		foreach ($attributes + $extra as $attr => $value)
 		{
 			$vfreebusy->setAttribute($attr, $value);
 		}
@@ -3284,22 +3283,22 @@ 
 
 				$fbdata[$fbtype][] = $event;
 			}
-			foreach($fbdata as $fbtype => $events)
+			foreach ($fbdata as $fbtype => $events)
 			{
-				foreach($this->aggregate_periods($events, $start, $end) as $event)
+				foreach ($this->aggregate_periods($events, $start, $end) as $event)
 				{
 					if ($utc)
 					{
-						$vfreebusy->setAttribute('FREEBUSY',array(array(
+						$vfreebusy->setAttribute('FREEBUSY', array(array(
 							'start' => $event['start'],
 							'end' => $event['end'],
 						)), array('FBTYPE' => $fbtype));
 					}
 					else
 					{
-						$vfreebusy->setAttribute('FREEBUSY',array(array(
-							'start' => date('Ymd\THis',$event['start']),
-							'end' => date('Ymd\THis',$event['end']),
+						$vfreebusy->setAttribute('FREEBUSY', array(array(
+							'start' => date('Ymd\THis', $event['start']),
+							'end' => date('Ymd\THis', $event['end']),
 						)), array('FBTYPE' => $fbtype));
 					}
 				}
@@ -3329,7 +3328,7 @@ 
 		});
 
 		$fbdata = array();
-		foreach($events as $event)
+		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;
@@ -3342,7 +3341,7 @@ 
 				);
 				continue;
 			}
-			$last =& $fbdata[count($fbdata)-1];
+			$last = & $fbdata[count($fbdata) - 1];
 
 			if ($last['end'] >= $event['start'])
 			{
@@ -3359,7 +3358,7 @@ 
 				);
 			}
 		}
-		$last =& $fbdata[count($fbdata)-1];
+		$last = & $fbdata[count($fbdata) - 1];
 
 		if ($last['end'] > $end) $last['end'] = $end;