EGroupware / egroupware

calendar/inc/class.calendar_groupdav.inc.php

Spacing +145 added lines, -145 removed lines

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

Braces +235 added lines, -58 removed lines

@@ -132,7 +132,10 @@ 
 		}
 		else
 		{
-			if (!is_array($event)) $event = $this->bo->read($event);
+			if (!is_array($event))
+			{
+				$event = $this->bo->read($event);
+			}
 			$name = $event[self::$path_attr];
 		}
 		$name .= self::$path_extension;
@@ -193,10 +196,13 @@ 
 			}
 			$filter[$name] = $this->bo->now + 24*3600*($name == 'start' ? -1 : 1)*abs($value);
 		}
-		if ($this->client_shared_uid_exceptions)	// do NOT return (non-virtual) exceptions
+		if ($this->client_shared_uid_exceptions)
+		{
+			// do NOT return (non-virtual) exceptions
 		{
 			$filter['query'] = array('cal_reference' => 0);
 		}
+		}
 
 		if ($path == '/calendar/')
 		{
@@ -226,7 +232,11 @@ 
 			// when trying to request not supported components, eg. VTODO on a calendar collection
 			return true;
 		}
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id)
+		{
+			$path = dirname($path).'/';
+		}
+		// caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -288,7 +298,11 @@ 
 		$n = 0;
 		foreach($files as $file)
 		{
-			if (!$n++) continue;	// first entry is collection itself
+			if (!$n++)
+			{
+				continue;
+			}
+			// first entry is collection itself
 
 			$icalendar = $file['props']['calendar-data']['val'];
 			if (($start = strpos($icalendar, 'BEGIN:VEVENT')) !== false &&
@@ -332,10 +346,17 @@ 
 	 */
 	function &propfind_callback($path,array $filter,$start=false)
 	{
-		if ($this->debug) $starttime = microtime(true);
+		if ($this->debug)
+		{
+			$starttime = microtime(true);
+		}
 
 		$calendar_data = $this->caldav->prop_requested('calendar-data', Api\CalDAV::CALDAV, true);
-		if (!is_array($calendar_data)) $calendar_data = false;	// not in allprop or autoindex
+		if (!is_array($calendar_data))
+		{
+			$calendar_data = false;
+		}
+		// not in allprop or autoindex
 
 		$files = array();
 
@@ -493,7 +514,10 @@ 
 				switch($filter['name'])
 				{
 					case 'comp-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						}
 
 						switch($filter['attrs']['name'])
 						{
@@ -508,14 +532,23 @@ 
 						}
 						break;
 					case 'prop-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						}
 						$prop_filter = $filter['attrs']['name'];
 						break;
 					case 'text-match':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						}
 						if (!isset($this->filter_prop2cal[strtoupper($prop_filter)]))
 						{
-							if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							if ($this->debug)
+							{
+								error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							}
 						}
 						else
 						{
@@ -524,10 +557,16 @@ 
 						unset($prop_filter);
 						break;
 					case 'param-filter':
-						if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						}
 						break;
 					case 'time-range':
-				 		if ($this->debug > 1) error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
+				 		if ($this->debug > 1)
+				 		{
+				 			error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
+				 		}
 				 		if (!empty($filter['attrs']['start']))
 				 		{
 					 		$cal_filters['start'] = $this->vCalendar->_parseDateTime($filter['attrs']['start']);
@@ -538,13 +577,19 @@ 
 				 		}
 						break;
 					default:
-						if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						}
 						break;
 				}
 			}
-			if (count($cal_filters) == $num_filters)	// no filters set --> restore default start and end time
+			if (count($cal_filters) == $num_filters)
+			{
+				// no filters set --> restore default start and end time
 			{
 				$cal_filters['start'] = $cal_start;
+			}
 				$cal_filters['end']   = $cal_end;
 			}
 		}
@@ -621,7 +666,10 @@ 
 				}
 			}
 
-			if ($this->debug > 1) error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids).', cal_filters='.array2string($cal_filters));
+			if ($this->debug > 1)
+			{
+				error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids).', cal_filters='.array2string($cal_filters));
+			}
 		}
 		return true;
 	}
@@ -667,9 +715,15 @@ 
 	private function iCal(array $event,$user=null, $method=null, $expand=false)
 	{
 		static $handler = null;
-		if (is_null($handler)) $handler = $this->_get_handler();
+		if (is_null($handler))
+		{
+			$handler = $this->_get_handler();
+		}
 
-		if (!$user) $user = $GLOBALS['egw_info']['user']['account_id'];
+		if (!$user)
+		{
+			$user = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		// only return alarms in own calendar, not other users calendars
 		if ($user != $GLOBALS['egw_info']['user']['account_id'])
@@ -685,14 +739,23 @@ 
 		{
 			if (is_array($expand))
 			{
-				if (isset($expand['start'])) $expand['start'] = $this->vCalendar->_parseDateTime($expand['start']);
-				if (isset($expand['end'])) $expand['end'] = $this->vCalendar->_parseDateTime($expand['end']);
+				if (isset($expand['start']))
+				{
+					$expand['start'] = $this->vCalendar->_parseDateTime($expand['start']);
+				}
+				if (isset($expand['end']))
+				{
+					$expand['end'] = $this->vCalendar->_parseDateTime($expand['end']);
+				}
 			}
 			// pass in original event as master, as it has correct start-date even if first recurrence is an exception
 			$events =& self::get_series($event['uid'], $this->bo, $expand, $user, $event);
 
 			// as alarm is now only on next recurrence, set alarm from original event on master
-			if ($event['alarm']) $events[0]['alarm'] = $event['alarm'];
+			if ($event['alarm'])
+			{
+				$events[0]['alarm'] = $event['alarm'];
+			}
 		}
 		elseif(!$this->client_shared_uid_exceptions && $event['reference'])
 		{
@@ -715,7 +778,10 @@ 
 	 */
 	private static function &get_series($uid,calendar_bo $bo=null, $expand=false, $user=null, $master=null)
 	{
-		if (is_null($bo)) $bo = new calendar_bopdate();
+		if (is_null($bo))
+		{
+			$bo = new calendar_bopdate();
+		}
 
 		$params = array(
 			'query' => array('cal_uid' => $uid),
@@ -724,7 +790,10 @@ 
 			'date_format' => 'server',
 			'cfs' => array(),	// read cfs as we use them to store X- attributes
 		);
-		if (is_array($expand)) $params += $expand;
+		if (is_array($expand))
+		{
+			$params += $expand;
+		}
 
 		if (!($events =& $bo->search($params)))
 		{
@@ -737,14 +806,20 @@ 
 		{
 			if ($recurrence['recur_type'])
 			{
-				if (!isset($master)) $master = $recurrence;
+				if (!isset($master))
+				{
+					$master = $recurrence;
+				}
 				$exceptions =& $master['recur_exception'];
 				unset($events[$k]);
 				break;
 			}
 		}
 		// if recurring event starts in future behind horizont, nothing will be returned by bo::search()
-		if (!isset($master)) $master = $bo->read($uid);
+		if (!isset($master))
+		{
+			$master = $bo->read($uid);
+		}
 
 		foreach($events as $k => &$recurrence)
 		{
@@ -754,7 +829,9 @@ 
 				unset($events[$k]);
 				continue;	// same uid, but references a different event or is own master
 			}
-			if (!$master || $recurrence['id'] != $master['id'])	// real exception
+			if (!$master || $recurrence['id'] != $master['id'])
+			{
+				// real exception
 			{
 				// user is NOT participating in this exception
 				if ($user && !self::isParticipant($recurrence, $user))
@@ -763,6 +840,7 @@ 
 					if (!$master || !self::isParticipant($master, $user))
 					{
 						unset($events[$k]);
+			}
 						continue;
 					}
 					// otherwise mark him in this exception as rejected
@@ -794,7 +872,10 @@ 
 			// this is a virtual exception now (no extra event/cal_id in DB)
 			//error_log('virtual exception: '.array2string($recurrence));
 			$recurrence['recurrence'] = $recurrence['start'];
-			if ($master) $recurrence['reference'] = $master['id'];
+			if ($master)
+			{
+				$recurrence['reference'] = $master['id'];
+			}
 			$recurrence['recur_type'] = MCAL_RECUR_NONE;	// is set, as this is a copy of the master
 			// not for included exceptions (Lightning): $master['recur_exception'][] = $recurrence['start'];
 		}
@@ -833,9 +914,16 @@ 
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($id, $user)".print_r($options,true));
+		}
 
-		if (!$prefix) $user = null;	// /infolog/ does not imply setting the current user (for new entries it's done anyway)
+		if (!$prefix)
+		{
+			$user = null;
+		}
+		// /infolog/ does not imply setting the current user (for new entries it's done anyway)
 
 		// work around missing handling / racecondition in Lightning, if event already exists on server,
 		// but Lightning has not yet synced with the server: Lightning just retries the PUT, not GETing the event
@@ -857,7 +945,10 @@ 
 			isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']));	// dont fail with 412 Precondition Failed in that case
 		if (!is_null($oldEvent) && !is_array($oldEvent))
 		{
-			if ($this->debug) error_log(__METHOD__.': '.print_r($oldEvent,true).function_backtrace());
+			if ($this->debug)
+			{
+				error_log(__METHOD__.': '.print_r($oldEvent,true).function_backtrace());
+			}
 			return $oldEvent;
 		}
 
@@ -868,7 +959,10 @@ 
 		{
 			// we have no add permission on this user's calendar
 			// ToDo: create event in current users calendar and invite only $user
-			if ($this->debug) error_log(__METHOD__."(,,$user) we have not enough rights on this calendar");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,,$user) we have not enough rights on this calendar");
+			}
 			return '403 Forbidden';
 		}
 
@@ -915,13 +1009,19 @@ 
 			if ($this->use_schedule_tag && isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']))
 			{
 				$schedule_tag_match = $_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH'];
-				if ($schedule_tag_match[0] == '"') $schedule_tag_match = substr($schedule_tag_match, 1, -1);
+				if ($schedule_tag_match[0] == '"')
+				{
+					$schedule_tag_match = substr($schedule_tag_match, 1, -1);
+				}
 				$schedule_tag = null;
 				$this->get_etag($oldEvent, $schedule_tag);
 
 				if ($schedule_tag_match !== $schedule_tag)
 				{
-					if ($this->debug) error_log(__METHOD__."(,,$user) schedule_tag missmatch: given '$schedule_tag_match' != '$schedule_tag'");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."(,,$user) schedule_tag missmatch: given '$schedule_tag_match' != '$schedule_tag'");
+					}
 					// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 					$this->check_return_representation($options, $id, $user);
 					return '412 Precondition Failed';
@@ -942,7 +1042,10 @@ 
 					// above can be true, if current user is not in master but just a recurrence
 					(!$oldEvent['recur_type'] || !($series = self::get_series($oldEvent['uid'], $this->bo))))
 				{
-					if ($this->debug) error_log(__METHOD__."(,,$user) user $user is NOT an attendee!");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."(,,$user) user $user is NOT an attendee!");
+					}
 					return '403 Forbidden';
 				}
 				// update only participant status and alarms of current user
@@ -962,7 +1065,10 @@ 
 							}
 							foreach($series as $oldEvent)
 							{
-								if ($oldEvent['recurrence'] == $event['recurrence']) break;
+								if ($oldEvent['recurrence'] == $event['recurrence'])
+								{
+									break;
+								}
 							}
 							// if no exception found, check if it might be just a recurrence (no exception)
 							if ($event['recurrence'] && $oldEvent['recurrence'] != $event['recurrence'])
@@ -977,7 +1083,10 @@ 
 								}
 							}
 						}
-						if ($this->debug) error_log(__METHOD__."(, $id, $user, '$prefix') eventId=$eventId ($oldEvent[id]), user=$user, old-status='{$oldEvent['participants'][$user]}', new-status='{$event['participants'][$user]}', recurrence=$event[recurrence]=".Api\DateTime::to($event['recurrence']).", event=".array2string($event));
+						if ($this->debug)
+						{
+							error_log(__METHOD__."(, $id, $user, '$prefix') eventId=$eventId ($oldEvent[id]), user=$user, old-status='{$oldEvent['participants'][$user]}', new-status='{$event['participants'][$user]}', recurrence=$event[recurrence]=".Api\DateTime::to($event['recurrence']).", event=".array2string($event));
+						}
 						if (isset($event['participants']) && isset($event['participants'][$user]) &&
 							$event['participants'][$user] !== $oldEvent['participants'][$user])
 						{
@@ -985,13 +1094,19 @@ 
 								// real (not virtual) exceptions use recurrence 0 in egw_cal_user.cal_recurrence!
 								$recurrence = $eventId == $oldEvent['id'] ? $event['recurrence'] : 0))
 							{
-								if ($this->debug) error_log(__METHOD__."(,,$user) failed to set_status($oldEvent[id], $user, '{$event['participants'][$user]}', $recurrence=".Api\DateTime::to($recurrence).')');
+								if ($this->debug)
+								{
+									error_log(__METHOD__."(,,$user) failed to set_status($oldEvent[id], $user, '{$event['participants'][$user]}', $recurrence=".Api\DateTime::to($recurrence).')');
+								}
 								return '403 Forbidden';
 							}
 							else
 							{
 								++$modified;
-								if ($this->debug) error_log(__METHOD__."() set_status($oldEvent[id], $user, {$event['participants'][$user]} , $recurrence=".Api\DateTime::to($recurrence).')');
+								if ($this->debug)
+								{
+									error_log(__METHOD__."() set_status($oldEvent[id], $user, {$event['participants'][$user]} , $recurrence=".Api\DateTime::to($recurrence).')');
+								}
 							}
 						}
 						// import alarms, if given and changed
@@ -1001,15 +1116,21 @@ 
 							$modified += $handler->sync_alarms($event, (array)$oldEvent['alarm'], $user);
 						}
 					}
-					if (!$modified)	// NO modififictions, or none we understood --> log it and return Ok: "204 No Content"
+					if (!$modified)
+					{
+						// NO modififictions, or none we understood --> log it and return Ok: "204 No Content"
 					{
 						$this->caldav->log(__METHOD__."(,,$user) NO changes for current user events=".array2string($events).', old-event='.array2string($oldEvent));
 					}
+					}
 					$this->put_response_headers($eventId, $options['path'], '204 No Content', self::$path_attr == 'caldav_name');
 
 					return '204 No Content';
 				}
-				if ($this->debug && !isset($events)) error_log(__METHOD__."(,,$user) only schedule-tag given for event without participants (only calendar owner) --> handle as regular PUT");
+				if ($this->debug && !isset($events))
+				{
+					error_log(__METHOD__."(,,$user) only schedule-tag given for event without participants (only calendar owner) --> handle as regular PUT");
+				}
 			}
 			if ($return_no_access)
 			{
@@ -1046,17 +1167,23 @@ 
 		if (!($cal_id = $handler->importVCal($vCalendar, $eventId,
 			self::etag2value($this->http_if_match), false, 0, $this->caldav->current_user_principal, $user, $charset, $id)))
 		{
-			if ($this->debug) error_log(__METHOD__."(,$id) eventId=$eventId: importVCal('$options[content]') returned ".array2string($cal_id));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,$id) eventId=$eventId: importVCal('$options[content]') returned ".array2string($cal_id));
+			}
 			if ($eventId && $cal_id === false)
 			{
 				// ignore import failures
 				$cal_id = $eventId;
 				$retval = true;
 			}
-			elseif ($cal_id === 0)	// etag failure
+			elseif ($cal_id === 0)
+			{
+				// etag failure
 			{
 				// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 				$this->check_return_representation($options, $id, $user);
+			}
 				return '412 Precondition Failed';
 			}
 			else
@@ -1081,7 +1208,10 @@ 
 	 */
 	function post(&$options,$id,$user=null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($id, $user)".print_r($options,true));
+		}
 
 		$vCalendar = htmlspecialchars_decode($options['content']);
 		$charset = null;
@@ -1135,7 +1265,10 @@ 
 				if (!($cal_id = $handler->importVCal($vCalendar, $eventId, null,
 					false, 0, $this->caldav->current_user_principal, $user, $charset)))
 				{
-					if ($this->debug) error_log(__METHOD__."() importVCal($eventId) returned false");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."() importVCal($eventId) returned false");
+					}
 				}
 				header('ETag: "'.$this->get_etag($eventId).'"');
 			}
@@ -1303,7 +1436,10 @@ 
 		$org_recurrences = $exceptions = array();
 		foreach(self::get_series($events[0]['uid'],$bo) as $k => $event)
 		{
-			if (!$k) $master = $event;
+			if (!$k)
+			{
+				$master = $event;
+			}
 			if ($event['recurrence'])
 			{
 				$org_recurrences[$event['recurrence']] = $event;
@@ -1323,10 +1459,13 @@ 
 
 			// from now on we deal with exceptions
 			$org_recurrence = $org_recurrences[$recurrence['recurrence']];
-			if (isset($org_recurrence))	// already existing recurrence
+			if (isset($org_recurrence))
+			{
+				// already existing recurrence
 			{
 				//error_log(__METHOD__.'() setting id #'.$org_recurrence['id']).' for '.$recurrence['recurrence'].' = '.date('Y-m-d H:i:s',$recurrence['recurrence']);
 				$recurrence['id'] = $org_recurrence['id'];
+			}
 
 				// re-add (non-virtual) exceptions to master's recur_exception
 				if ($recurrence['id'] != $master['id'])
@@ -1343,10 +1482,14 @@ 
 		// delete not longer existing recurrences
 		foreach($org_recurrences as $org_recurrence)
 		{
-			if ($org_recurrence['id'] != $master['id'])	// non-virtual recurrence
+			if ($org_recurrence['id'] != $master['id'])
+			{
+				// non-virtual recurrence
 			{
 				//error_log(__METHOD__.'() deleting #'.$org_recurrence['id']);
-				$bo->delete($org_recurrence['id']);	// might fail because of permissions
+				$bo->delete($org_recurrence['id']);
+			}
+			// might fail because of permissions
 			}
 			else	// virtual recurrence
 			{
@@ -1424,9 +1567,14 @@ 
 		else
 		{
 			$ret = $this->bo->delete($event['id']);
-			if (!$ret) { error_log("delete($event[id]) returned FALSE"); $ret = '400 Failed to delete event';}
+			if (!$ret)
+			{
+error_log("delete($event[id]) returned FALSE"); $ret = '400 Failed to delete event';}
+		}
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event)?$event['participants']:null).", user={$this->bo->user} --> return ".array2string($ret));
 		}
-		if ($this->debug) error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event)?$event['participants']:null).", user={$this->bo->user} --> return ".array2string($ret));
 		return $ret;
 	}
 
@@ -1441,16 +1589,26 @@ 
 	 */
 	function read($id)
 	{
-		if (strpos($column=self::$path_attr,'_') === false) $column = 'cal_'.$column;
+		if (strpos($column=self::$path_attr,'_') === false)
+		{
+			$column = 'cal_'.$column;
+		}
 
 		$event = $this->bo->read(array($column => $id, 'cal_deleted IS NULL', 'cal_reference=0'), null, true, 'server');
-		if ($event) $event = array_shift($event);	// read with array as 1. param, returns an array of events!
+		if ($event)
+		{
+			$event = array_shift($event);
+		}
+		// read with array as 1. param, returns an array of events!
 
 		if (!($retval = $this->bo->check_perms(calendar_bo::ACL_FREEBUSY,$event, 0, 'server')) &&
 			// above can be true, if current user is not in master but just a recurrence
 			(!$event['recur_type'] || !($events = self::get_series($event['uid'], $this->bo))))
 		{
-			if ($this->debug > 0) error_log(__METHOD__."($id) no READ or FREEBUSY rights returning ".array2string($retval));
+			if ($this->debug > 0)
+			{
+				error_log(__METHOD__."($id) no READ or FREEBUSY rights returning ".array2string($retval));
+			}
 			return $retval;
 		}
 		if (!$this->bo->check_perms(Acl::READ, $event, 0, 'server'))
@@ -1458,9 +1616,15 @@ 
 			$this->bo->clear_private_infos($event, array($this->bo->user, $event['owner']));
 		}
 		// handle deleted events, as not existing
-		if ($event['deleted']) $event = null;
+		if ($event['deleted'])
+		{
+			$event = null;
+		}
 
-		if ($this->debug > 1) error_log(__METHOD__."($id) returning ".array2string($event));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."($id) returning ".array2string($event));
+		}
 
 		return $event;
 	}
@@ -1472,7 +1636,10 @@ 
 	 */
 	public function update_tags($entry)
 	{
-		if (!is_array($entry)) $entry = $this->read($entry);
+		if (!is_array($entry))
+		{
+			$entry = $this->read($entry);
+		}
 
 		$this->bo->update($entry, true);
 	}
@@ -1486,7 +1653,10 @@ 
 	{
 		$ctag = $this->bo->get_ctag($user,$path == '/calendar/' ? 'owner' : 'default'); // default = not rejected
 
-		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
+		if ($this->debug > 1)
+		{
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
+		}
 
 		return $ctag;
 	}
@@ -1616,7 +1786,10 @@ 
 		$handler = new calendar_ical();
 		$handler->setSupportedFields('GroupDAV',$this->agent);
 		$handler->supportedFields['attachments'] = true;	// enabling attachments
-		if ($this->debug > 1) error_log("ical Handler called: " . $this->agent);
+		if ($this->debug > 1)
+		{
+			error_log("ical Handler called: " . $this->agent);
+		}
 		return $handler;
 	}
 
@@ -1687,7 +1860,11 @@ 
 			{
 				$calendars[$entry['grantor']] = $entry['name'];
 			}
-			if ($user > 0) unset($calendars[$user]);	// skip current user
+			if ($user > 0)
+			{
+				unset($calendars[$user]);
+			}
+			// skip current user
 		}
 
 		$settings = array();

calendar/inc/class.calendar_bo.inc.php

Spacing +308 added lines, -310 removed lines

@@ -17,12 +17,12 @@ 
 
 if (!defined('ACL_TYPE_IDENTIFER'))	// used to mark ACL-values for the debug_message methode
 {
-	define('ACL_TYPE_IDENTIFER','***ACL***');
+	define('ACL_TYPE_IDENTIFER', '***ACL***');
 }
 
-define('HOUR_s',60*60);
-define('DAY_s',24*HOUR_s);
-define('WEEK_s',7*DAY_s);
+define('HOUR_s', 60 * 60);
+define('DAY_s', 24 * HOUR_s);
+define('WEEK_s', 7 * DAY_s);
 
 /**
  * Required (!) include, as we use the MCAL_* constants, BEFORE instanciating (and therefore autoloading) the class
@@ -71,7 +71,7 @@ 
 	 *	4 = function-calls to exported conversation-functions like date2ts, date2array, ...
 	 *	5 = function-calls to private functions
 	 */
-	var $debug=false;
+	var $debug = false;
 
 	/**
 	 * @var int $now timestamp in server-time
@@ -101,12 +101,12 @@ 
 	/**
 	 * @var int $user nummerical id of the current user-id
 	 */
-	var $user=0;
+	var $user = 0;
 
 	/**
 	 * @var array $grants grants of the current user, array with user-id / ored-ACL-rights pairs
 	 */
-	var $grants=array();
+	var $grants = array();
 
 	/**
 	 * @var array $verbose_status translated 1-char status values to a verbose name, run through lang() by the constructor
@@ -219,15 +219,15 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_bo::bocal() started',True);
+		if ($this->debug > 0) $this->debug_message('calendar_bo::bocal() started', True);
 
 		$this->so = new calendar_so();
 
-		$this->common_prefs =& $GLOBALS['egw_info']['user']['preferences']['common'];
-		$this->cal_prefs =& $GLOBALS['egw_info']['user']['preferences']['calendar'];
+		$this->common_prefs = & $GLOBALS['egw_info']['user']['preferences']['common'];
+		$this->cal_prefs = & $GLOBALS['egw_info']['user']['preferences']['calendar'];
 
 		$this->now = time();
-		$this->now_su = Api\DateTime::server2user($this->now,'ts');
+		$this->now_su = Api\DateTime::server2user($this->now, 'ts');
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
@@ -236,7 +236,7 @@ 
 		if (!is_array($this->resources = Api\Cache::getSession('calendar', 'resources')))
 		{
 			$this->resources = array();
-			foreach(Api\Hooks::process('calendar_resources') as $app => $data)
+			foreach (Api\Hooks::process('calendar_resources') as $app => $data)
 			{
 				if ($data && $data['type'])
 				{
@@ -249,8 +249,8 @@ 
 				'app'  => 'email',
 			);
 			$this->resources['l'] = array(
-				'type' => 'l',// one char type-identifier for this resources
-				'info' => __CLASS__ .'::mailing_lists',// info method, returns array with id, type & name for a given id
+				'type' => 'l', // one char type-identifier for this resources
+				'info' => __CLASS__.'::mailing_lists', // info method, returns array with id, type & name for a given id
 				'app' => 'Distribution list'
 			);
 			$this->resources[''] = array(
@@ -261,14 +261,14 @@ 
 		}
 		//error_log(__METHOD__ . " registered resources=". array2string($this->resources));
 
-		$this->config = Api\Config::read('calendar');	// only used for horizont, regular calendar config is under phpgwapi
+		$this->config = Api\Config::read('calendar'); // only used for horizont, regular calendar config is under phpgwapi
 		$this->require_acl_invite = $GLOBALS['egw_info']['server']['require_acl_invite'];
 
-		$this->categories = new Api\Categories($this->user,'calendar');
+		$this->categories = new Api\Categories($this->user, 'calendar');
 
 		$this->customfields = Api\Storage\Customfields::get('calendar');
 
-		foreach($this->alarms as $secs => &$label)
+		foreach ($this->alarms as $secs => &$label)
 		{
 			$label = self::secs2label($secs);
 		}
@@ -284,15 +284,15 @@ 
 	{
 		if ($secs <= 3600)
 		{
-			$label = lang('%1 minutes', $secs/60);
+			$label = lang('%1 minutes', $secs / 60);
 		}
-		elseif($secs <= 86400)
+		elseif ($secs <= 86400)
 		{
-			$label = lang('%1 hours', $secs/3600);
+			$label = lang('%1 hours', $secs / 3600);
 		}
 		else
 		{
-			$label = lang('%1 days', $secs/86400);
+			$label = lang('%1 days', $secs / 86400);
 		}
 		return $label;
 	}
@@ -308,12 +308,12 @@ 
 		if (!$ids) return null;
 
 		$data = array();
-		foreach((array)$ids as $id)
+		foreach ((array)$ids as $id)
 		{
 			$email = $id;
 			$name = '';
 			$matches = null;
-			if (preg_match('/^(.*) *<([a-z0-9_.@-]{8,})>$/iU',$email,$matches))
+			if (preg_match('/^(.*) *<([a-z0-9_.@-]{8,})>$/iU', $email, $matches))
 			{
 				$name = $matches[1];
 				$email = $matches[2];
@@ -321,7 +321,7 @@ 
 			$data[] = array(
 				'res_id' => $id,
 				'email' => $email,
-				'rights' => self::ACL_READ_FOR_PARTICIPANTS | self::ACL_INVITE,
+				'rights' => self::ACL_READ_FOR_PARTICIPANTS|self::ACL_INVITE,
 				'name' => $name,
 			);
 		}
@@ -337,7 +337,7 @@ 
 	 */
 	static function mailing_lists($ids)
 	{
-		if(!is_array($ids))
+		if (!is_array($ids))
 		{
 			$ids = array($ids);
 		}
@@ -346,7 +346,7 @@ 
 		// Email list
 		$contacts_obj = new Api\Contacts();
 		$bo = new calendar_bo();
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			$list = $contacts_obj->read_list((int)$id);
 
@@ -373,22 +373,22 @@ 
 	 *
 	 * @return array
 	 */
-	public function enum_mailing_list($id, $ignore_acl= false, $use_freebusy = true)
+	public function enum_mailing_list($id, $ignore_acl = false, $use_freebusy = true)
 	{
 		$contact_list = array();
 		$contacts = new Api\Contacts();
-		if($contacts->check_list((int)substr($id,1), ACL::READ) || (int)substr($id,1) < 0)
+		if ($contacts->check_list((int)substr($id, 1), ACL::READ) || (int)substr($id, 1) < 0)
 		{
-			$options = array('list' => substr($id,1));
-			$lists = $contacts->search('',true,'','','',false,'AND',false,$options);
-			if(!$lists)
+			$options = array('list' => substr($id, 1));
+			$lists = $contacts->search('', true, '', '', '', false, 'AND', false, $options);
+			if (!$lists)
 			{
 				return $contact_list;
 			}
-			foreach($lists as &$contact)
+			foreach ($lists as &$contact)
 			{
 				// Check for user account
-				if (($account_id = $GLOBALS['egw']->accounts->name2id($contact['id'],'person_id')))
+				if (($account_id = $GLOBALS['egw']->accounts->name2id($contact['id'], 'person_id')))
 				{
 					$contact = ''.$account_id;
 				}
@@ -396,9 +396,9 @@ 
 				{
 					$contact = 'c'.$contact['id'];
 				}
-				if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$contact))
+				if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy ?self::ACL_FREEBUSY : 0), 0, $contact))
 				{
-					if ($contact && !in_array($contact,$contact_list))	// already added?
+					if ($contact && !in_array($contact, $contact_list))	// already added?
 					{
 						$contact_list[] = $contact;
 					}
@@ -417,12 +417,12 @@ 
 	function enum_groups(&$event)
 	{
 		$added = 0;
-		foreach(array_keys($event['participants']) as $uid)
+		foreach (array_keys($event['participants']) as $uid)
 		{
 			if (is_numeric($uid) && $GLOBALS['egw']->accounts->get_type($uid) == 'g' &&
 				($members = $GLOBALS['egw']->accounts->members($uid, true)))
 			{
-				foreach($members as $member)
+				foreach ($members as $member)
 				{
 					if (!isset($event['participants'][$member]))
 					{
@@ -444,7 +444,7 @@ 
 	 * @param boolean $use_freebusy =true should freebusy rights are taken into account, default true, can be set to false eg. for a search
 	 * @return array of user-ids
 	 */
-	private function resolve_users($_users, $no_enum_groups=true, $ignore_acl=false, $use_freebusy=true)
+	private function resolve_users($_users, $no_enum_groups = true, $ignore_acl = false, $use_freebusy = true)
 	{
 		if (!is_array($_users))
 		{
@@ -452,35 +452,35 @@ 
 		}
 		// only query calendars of users, we have READ-grants from
 		$users = array();
-		foreach($_users as $user)
+		foreach ($_users as $user)
 		{
 			$user = trim($user);
 
 			// Handle email lists
-			if(!is_numeric($user) && $user[0] == 'l')
+			if (!is_numeric($user) && $user[0] == 'l')
 			{
-				foreach($this->enum_mailing_list($user, $ignore_acl, $use_freebusy) as $contact)
+				foreach ($this->enum_mailing_list($user, $ignore_acl, $use_freebusy) as $contact)
 				{
-					if ($contact && !in_array($contact,$users))	// already added?
+					if ($contact && !in_array($contact, $users))	// already added?
 					{
 						$users[] = $contact;
 					}
 				}
 				continue;
 			}
-			if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy?self::ACL_FREEBUSY:0),0,$user))
+			if ($ignore_acl || $this->check_perms(ACL::READ|self::ACL_READ_FOR_PARTICIPANTS|($use_freebusy ?self::ACL_FREEBUSY : 0), 0, $user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user, $users))	// already added?
 				{
 					// General expansion check
 					if (!is_numeric($user) && $this->resources[$user[0]]['info'])
 					{
 						$info = $this->resource_info($user);
-						if($info && $info['resources'])
+						if ($info && $info['resources'])
 						{
-							foreach($info['resources'] as $_user)
+							foreach ($info['resources'] as $_user)
 							{
-								if($_user && !in_array($_user, $users))
+								if ($_user && !in_array($_user, $users))
 								{
 									$users[] = $_user;
 								}
@@ -493,7 +493,7 @@ 
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
-				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
+				continue; // for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
 			if (!is_numeric($user)) continue;
@@ -506,11 +506,11 @@ 
 				$members = $GLOBALS['egw']->accounts->members($user, true);
 				if (is_array($members))
 				{
-					foreach($members as $member)
+					foreach ($members as $member)
 					{
 						// use only members which gave the user a read-grant
 						if (!in_array($member, $users) &&
-							($ignore_acl || $this->check_perms(Acl::READ|($use_freebusy?self::ACL_FREEBUSY:0),0,$member)))
+							($ignore_acl || $this->check_perms(Acl::READ|($use_freebusy ?self::ACL_FREEBUSY : 0), 0, $member)))
 						{
 							$users[] = $member;
 						}
@@ -522,9 +522,9 @@ 
 				$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 				if (is_array($memberships))
 				{
-					foreach($memberships as $group)
+					foreach ($memberships as $group)
 					{
-						if (!in_array($group,$users))
+						if (!in_array($group, $users))
 						{
 							$users[] = $group;
 						}
@@ -567,18 +567,18 @@ 
 	 * @return iterator|array|boolean array of events or array with YYYYMMDD strings / array of events pairs (depending on $daywise param)
 	 *	or false if there are no read-grants from _any_ of the requested users or iterator/recordset if cols are given
 	 */
-	function &search($params,$sql_filter=null)
+	function &search($params, $sql_filter = null)
 	{
 		$params_in = $params;
 
-		$params['sql_filter'] = $sql_filter;	// dont allow to set it via UI or xmlrpc
+		$params['sql_filter'] = $sql_filter; // dont allow to set it via UI or xmlrpc
 
 		// check if any resource wants to hook into
-		foreach($this->resources as $data)
+		foreach ($this->resources as $data)
 		{
 			if (isset($data['search_filter']))
 			{
-				$params = ExecMethod($data['search_filter'],$params);
+				$params = ExecMethod($data['search_filter'], $params);
 			}
 		}
 
@@ -591,18 +591,18 @@ 
 		// resolve users to add memberships for users and members for groups
 		// for search, do NOT use freebusy rights, as it would allow to probe the content of event entries
 		$users = $this->resolve_users($params['users'], $params['filter'] == 'no-enum-groups', $params['ignore_acl'], empty($params['query']));
-		if($params['private_allowed'])
+		if ($params['private_allowed'])
 		{
-			$params['private_allowed'] = $this->resolve_users($params['private_allowed'],$params['filter'] == 'no-enum-groups',$params['ignore_acl'], empty($params['query']));
+			$params['private_allowed'] = $this->resolve_users($params['private_allowed'], $params['filter'] == 'no-enum-groups', $params['ignore_acl'], empty($params['query']));
 		}
 
 		// supply so with private_grants, to not query them again from the database
 		if (!empty($params['query']))
 		{
 			$params['private_grants'] = array();
-			foreach($this->grants as $user => $rights)
+			foreach ($this->grants as $user => $rights)
 			{
-				if ($rights & Acl::PRIVAT) $params['private_grants'][] = $user;
+				if ($rights&Acl::PRIVAT) $params['private_grants'][] = $user;
 			}
 		}
 
@@ -628,49 +628,49 @@ 
 		$params['enum_recuring'] = $enum_recuring = $daywise || !isset($params['enum_recuring']) || !!$params['enum_recuring'];
 		$cat_id = isset($params['cat_id']) ? $params['cat_id'] : 0;
 		$filter = isset($params['filter']) ? $params['filter'] : 'all';
-		$offset = isset($params['offset']) && $params['offset'] !== false ? (int) $params['offset'] : false;
+		$offset = isset($params['offset']) && $params['offset'] !== false ? (int)$params['offset'] : false;
 		// socal::search() returns rejected group-invitations, as only the user not also the group is rejected
 		// as we cant remove them efficiantly in SQL, we kick them out here, but only if just one user is displayed
 		$users_in = (array)$params_in['users'];
-		$remove_rejected_by_user = !in_array($filter,array('all','rejected','everything')) &&
+		$remove_rejected_by_user = !in_array($filter, array('all', 'rejected', 'everything')) &&
 			count($users_in) == 1 && $users_in[0] > 0 ? $users_in[0] : null;
 		//error_log(__METHOD__.'('.array2string($params_in).", $sql_filter) params[users]=".array2string($params['users']).' --> remove_rejected_by_user='.array2string($remove_rejected_by_user));
 
 		if ($this->debug && ($this->debug > 1 || $this->debug == 'search'))
 		{
 			$this->debug_message('calendar_bo::search(%1) start=%2, end=%3, daywise=%4, cat_id=%5, filter=%6, query=%7, offset=%8, num_rows=%9, order=%10, sql_filter=%11)',
-				True,$params,$start,$end,$daywise,$cat_id,$filter,$params['query'],$offset,(int)$params['num_rows'],$params['order'],$params['sql_filter']);
+				True, $params, $start, $end, $daywise, $cat_id, $filter, $params['query'], $offset, (int)$params['num_rows'], $params['order'], $params['sql_filter']);
 		}
 		// date2ts(,true) converts to server time, db2data converts again to user-time
-		$events =& $this->so->search(isset($start) ? $this->date2ts($start,true) : null,isset($end) ? $this->date2ts($end,true) : null,
-			$users,$cat_id,$filter,$offset,(int)$params['num_rows'],$params,$remove_rejected_by_user);
+		$events = & $this->so->search(isset($start) ? $this->date2ts($start, true) : null, isset($end) ? $this->date2ts($end, true) : null,
+			$users, $cat_id, $filter, $offset, (int)$params['num_rows'], $params, $remove_rejected_by_user);
 
 		if (isset($params['cols']))
 		{
 			return $events;
 		}
 		$this->total = $this->so->total;
-		$this->db2data($events,isset($params['date_format']) ? $params['date_format'] : 'ts');
+		$this->db2data($events, isset($params['date_format']) ? $params['date_format'] : 'ts');
 
 		//echo "<p align=right>remove_rejected_by_user=$remove_rejected_by_user, filter=$filter, params[users]=".print_r($param['users'])."</p>\n";
-		foreach($events as $id => $event)
+		foreach ($events as $id => $event)
 		{
 			if ($params['enum_groups'] && $this->enum_groups($event))
 			{
 				$events[$id] = $event;
 			}
 			$matches = null;
-			if (!(int)$event['id'] && preg_match('/^([a-z_]+)([0-9]+)$/',$event['id'],$matches))
+			if (!(int)$event['id'] && preg_match('/^([a-z_]+)([0-9]+)$/', $event['id'], $matches))
 			{
-				$is_private = self::integration_get_private($matches[1],$matches[2],$event);
+				$is_private = self::integration_get_private($matches[1], $matches[2], $event);
 			}
 			else
 			{
-				$is_private = !$this->check_perms(Acl::READ,$event);
+				$is_private = !$this->check_perms(Acl::READ, $event);
 			}
 			if (!$params['ignore_acl'] && ($is_private || (!$event['public'] && $filter == 'hideprivate')))
 			{
-				$this->clear_private_infos($events[$id],$params['private_allowed'] ? $params['private_allowed'] : $users);
+				$this->clear_private_infos($events[$id], $params['private_allowed'] ? $params['private_allowed'] : $users);
 			}
 		}
 
@@ -678,18 +678,18 @@ 
 		{
 			if ($this->debug && ($this->debug > 2 || $this->debug == 'search'))
 			{
-				$this->debug_message('socalendar::search daywise sorting from %1 to %2 of %3',False,$start,$end,$events);
+				$this->debug_message('socalendar::search daywise sorting from %1 to %2 of %3', False, $start, $end, $events);
 			}
 			// create empty entries for each day in the reported time
-			for($ts = $start; $ts <= $end; $ts += DAY_s) // good enough for array creation, but see while loop below.
+			for ($ts = $start; $ts <= $end; $ts += DAY_s) // good enough for array creation, but see while loop below.
 			{
 				$daysEvents[$this->date2string($ts)] = array();
 			}
-			foreach($events as $k => $event)
+			foreach ($events as $k => $event)
 			{
-				$e_start = max($this->date2ts($event['start']),$start);
+				$e_start = max($this->date2ts($event['start']), $start);
 				// $event['end']['raw']-1 to allow events to end on a full hour/day without the need to enter it as minute=59
-				$e_end   = min($this->date2ts($event['end'])-1,$end);
+				$e_end   = min($this->date2ts($event['end']) - 1, $end);
 
 				// add event to each day in the reported time
 				$ts = $e_start;
@@ -698,23 +698,23 @@ 
 				$ymd = null;
 				while ($ts <= $e_end)
 				{
-					$daysEvents[$ymd = $this->date2string($ts)][] =& $events[$k];
-					$ts = strtotime("+1 day",$ts);
+					$daysEvents[$ymd = $this->date2string($ts)][] = & $events[$k];
+					$ts = strtotime("+1 day", $ts);
 				}
 				if ($ymd != ($last = $this->date2string($e_end)))
 				{
-					$daysEvents[$last][] =& $events[$k];
+					$daysEvents[$last][] = & $events[$k];
 				}
 			}
-			$events =& $daysEvents;
+			$events = & $daysEvents;
 			if ($this->debug && ($this->debug > 2 || $this->debug == 'search'))
 			{
-				$this->debug_message('socalendar::search daywise events=%1',False,$events);
+				$this->debug_message('socalendar::search daywise events=%1', False, $events);
 			}
 		}
 		if ($this->debug && ($this->debug > 0 || $this->debug == 'search'))
 		{
-			$this->debug_message('calendar_bo::search(%1)=%2',True,$params,$events);
+			$this->debug_message('calendar_bo::search(%1)=%2', True, $params, $events);
 		}
 		//error_log(__METHOD__."() returning ".count($events)." entries, total=$this->total ".function_backtrace());
 		return $events;
@@ -727,9 +727,9 @@ 
 	 * @param string $part
 	 * @return array
 	 */
-	static function integration_get_data($app,$part=null)
+	static function integration_get_data($app, $part = null)
 	{
-		static $integration_data=null;
+		static $integration_data = null;
 
 		if (!isset($integration_data))
 		{
@@ -751,14 +751,14 @@ 
 	 * @param int|string $id
 	 * @return string
 	 */
-	static function integration_get_private($app,$id,$event)
+	static function integration_get_private($app, $id, $event)
 	{
-		$app_data = self::integration_get_data($app,'is_private');
+		$app_data = self::integration_get_data($app, 'is_private');
 
 		// no method, fall back to link title
 		if (is_null($app_data))
 		{
-			$is_private = !Link::title($app,$id);
+			$is_private = !Link::title($app, $id);
 		}
 		// boolean value to make all events of $app public (false) or private (true)
 		elseif (is_bool($app_data))
@@ -767,7 +767,7 @@ 
 		}
 		else
 		{
-			$is_private = (bool)ExecMethod2($app_data,$id,$event);
+			$is_private = (bool)ExecMethod2($app_data, $id, $event);
 		}
 		//echo '<p>'.__METHOD__."($app,$id,) app_data=".array2string($app_data).' returning '.array2string($is_private)."</p>\n";
 		return $is_private;
@@ -781,7 +781,7 @@ 
 	 * @param array &$event
 	 * @param array $allowed_participants ids of the allowed participants, eg. the ones the search is over or eg. the owner of the calendar
 	 */
-	function clear_private_infos(&$event,$allowed_participants = array())
+	function clear_private_infos(&$event, $allowed_participants = array())
 	{
 		if ($event == false) return;
 		if (!is_array($event['participants'])) error_log(__METHOD__.'('.array2string($event).', '.array2string($allowed_participants).') NO PARTICIPANTS '.function_backtrace());
@@ -797,19 +797,19 @@ 
 			'owner'		=> $event['owner'],
 			'uid'	=> $event['uid'],
 			'etag'	=> $event['etag'],
-			'participants' => array_intersect_key($event['participants'],array_flip($allowed_participants)),
+			'participants' => array_intersect_key($event['participants'], array_flip($allowed_participants)),
 			'public'=> 0,
-			'category' => $event['category'],	// category is visible anyway, eg. by using planner by cat
+			'category' => $event['category'], // category is visible anyway, eg. by using planner by cat
 			'non_blocking' => $event['non_blocking'],
 			'caldav_name' => $event['caldav_name'],
 		// we need full recurrence information, as they are relevant free/busy information
-		)+($event['recur_type'] ? array(
+		) + ($event['recur_type'] ? array(
 			'recur_type'     => $event['recur_type'],
 			'recur_interval' => $event['recur_interval'],
 			'recur_data'     => $event['recur_data'],
 			'recur_enddate'  => $event['recur_enddate'],
 			'recur_exception'=> $event['recur_exception'],
-		):array(
+		) : array(
 			'reference'      => $event['reference'],
 			'recurrence'     => $event['recurrence'],
 		));
@@ -823,15 +823,15 @@ 
 	 */
 	function check_move_horizont($_new_horizont)
 	{
-		if ((int) $this->debug >= 2 || $this->debug == 'check_move_horizont')
+		if ((int)$this->debug >= 2 || $this->debug == 'check_move_horizont')
 		{
-			$this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2',true,$_new_horizont,(int)$this->config['horizont']);
+			$this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2', true, $_new_horizont, (int)$this->config['horizont']);
 		}
-		$new_horizont = $this->date2ts($_new_horizont,true);	// now we are in server-time, where this function operates
+		$new_horizont = $this->date2ts($_new_horizont, true); // now we are in server-time, where this function operates
 
 		if ($new_horizont <= $this->config['horizont'])	// no move necessary
 		{
-			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 is bigger ==> nothing to do',true,$new_horizont,(int)$this->config['horizont']);
+			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 is bigger ==> nothing to do', true, $new_horizont, (int)$this->config['horizont']);
 			return;
 		}
 		if (!empty($GLOBALS['egw_info']['server']['calendar_horizont']))
@@ -839,15 +839,15 @@ 
 			$maxdays = abs($GLOBALS['egw_info']['server']['calendar_horizont']);
 		}
 		if (empty($maxdays)) $maxdays = 1000; // old default
-		if ($new_horizont > time()+$maxdays*DAY_s)		// some user tries to "look" more then the maximum number of days in the future
+		if ($new_horizont > time() + $maxdays * DAY_s)		// some user tries to "look" more then the maximum number of days in the future
 		{
-			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 new horizont more then %3 days from now --> ignoring it',true,$new_horizont,(int)$this->config['horizont'],$maxdays);
-			$this->warnings['horizont'] = lang('Requested date %1 outside allowed range of %2 days: recurring events obmitted!', Api\DateTime::to($new_horizont,true), $maxdays);
+			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 new horizont more then %3 days from now --> ignoring it', true, $new_horizont, (int)$this->config['horizont'], $maxdays);
+			$this->warnings['horizont'] = lang('Requested date %1 outside allowed range of %2 days: recurring events obmitted!', Api\DateTime::to($new_horizont, true), $maxdays);
 			return;
 		}
-		if ($new_horizont < time()+31*DAY_s)
+		if ($new_horizont < time() + 31 * DAY_s)
 		{
-			$new_horizont = time()+31*DAY_s;
+			$new_horizont = time() + 31 * DAY_s;
 		}
 		$old_horizont = $this->config['horizont'];
 		$this->config['horizont'] = $new_horizont;
@@ -855,21 +855,21 @@ 
 		// create further recurrences for all recurring and not yet (at the old horizont) ended events
 		if (($recuring = $this->so->unfinished_recuring($old_horizont)))
 		{
-			@set_time_limit(0);	// disable time-limit, in case it takes longer to calculate the recurrences
-			foreach($this->read(array_keys($recuring)) as $cal_id => $event)
+			@set_time_limit(0); // disable time-limit, in case it takes longer to calculate the recurrences
+			foreach ($this->read(array_keys($recuring)) as $cal_id => $event)
 			{
 				if ($this->debug == 'check_move_horizont')
 				{
-					$this->debug_message('calendar_bo::check_move_horizont(%1): calling set_recurrences(%2,%3)',true,$new_horizont,$event,$old_horizont);
+					$this->debug_message('calendar_bo::check_move_horizont(%1): calling set_recurrences(%2,%3)', true, $new_horizont, $event, $old_horizont);
 				}
 				// insert everything behind max(cal_start), which can be less then $old_horizont because of bugs in the past
-				$this->set_recurrences($event,Api\DateTime::server2user($recuring[$cal_id]+1));	// set_recurences operates in user-time!
+				$this->set_recurrences($event, Api\DateTime::server2user($recuring[$cal_id] + 1)); // set_recurences operates in user-time!
 			}
 		}
 		// update the horizont
-		Api\Config::save_value('horizont',$this->config['horizont'],'calendar');
+		Api\Config::save_value('horizont', $this->config['horizont'], 'calendar');
 
-		if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,(int)$this->config['horizont']);
+		if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting', true, $new_horizont, (int)$this->config['horizont']);
 	}
 
 	/**
@@ -880,11 +880,11 @@ 
 	 * @param array $event
 	 * @param mixed $start =0 minimum start-time for new recurrences or !$start = since the start of the event
 	 */
-	function set_recurrences($event,$start=0)
+	function set_recurrences($event, $start = 0)
 	{
-		if ($this->debug && ((int) $this->debug >= 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont'))
+		if ($this->debug && ((int)$this->debug >= 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont'))
 		{
-			$this->debug_message('calendar_bo::set_recurrences(%1,%2)',true,$event,$start);
+			$this->debug_message('calendar_bo::set_recurrences(%1,%2)', true, $event, $start);
 		}
 		// check if the caller gave us enough information and if not read it from the DB
 		if (!isset($event['participants']) || !isset($event['start']) || !isset($event['end']))
@@ -904,29 +904,29 @@ 
 
 		$events = array();
 
-		$this->insert_all_recurrences($event,$start,$this->date2usertime($this->config['horizont']),$events);
+		$this->insert_all_recurrences($event, $start, $this->date2usertime($this->config['horizont']), $events);
 
 		$exceptions = array();
-		foreach((array)$event['recur_exception'] as $exception)
+		foreach ((array)$event['recur_exception'] as $exception)
 		{
-			$exceptions[] = Api\DateTime::to($exception, true);	// true = date
+			$exceptions[] = Api\DateTime::to($exception, true); // true = date
 		}
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
 			$is_exception = in_array(Api\DateTime::to($event['start'], true), $exceptions);
-			$start = $this->date2ts($event['start'],true);
+			$start = $this->date2ts($event['start'], true);
 			if ($event['whole_day'])
 			{
 				$start = new Api\DateTime($event['start'], Api\DateTime::$server_timezone);
-				$start->setTime(0,0,0);
+				$start->setTime(0, 0, 0);
 				$start = $start->format('ts');
 				$time = $this->so->startOfDay(new Api\DateTime($event['end'], Api\DateTime::$user_timezone));
 				$time->setTime(23, 59, 59);
-				$end = $this->date2ts($time,true);
+				$end = $this->date2ts($time, true);
 			}
 			else
 			{
-				$end = $this->date2ts($event['end'],true);
+				$end = $this->date2ts($event['end'], true);
 			}
 			//error_log(__METHOD__."() start=".Api\DateTime::to($start).", is_exception=".array2string($is_exception));
 			$this->so->recurrence($event['id'], $start, $end, $event['participants'], $is_exception);
@@ -942,7 +942,7 @@ 
 	 * @param array &$events array of event-arrays (reference)
 	 * @param $date_format ='ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
 	 */
-	function db2data(&$events,$date_format='ts')
+	function db2data(&$events, $date_format = 'ts')
 	{
 		if (!is_array($events)) echo "<p>calendar_bo::db2data(\$events,$date_format) \$events is no array<br />\n".function_backtrace()."</p>\n";
 		foreach ($events as &$event)
@@ -955,65 +955,65 @@ 
 			// database returns timestamps as string, convert them to integer
 			// to avoid misinterpretation by Api\DateTime as Ymd string
 			// (this will fail on 32bit systems for times > 2038!)
-			$event['start'] = (int)$event['start'];	// this is for isWholeDay(), which also calls Api\DateTime
+			$event['start'] = (int)$event['start']; // this is for isWholeDay(), which also calls Api\DateTime
 			$event['end'] = (int)$event['end'];
 			$event['whole_day'] = self::isWholeDay($event);
 			if ($event['whole_day'] && $date_format != 'server')
 			{
 				// Adjust dates to user TZ
-				$stime =& $this->so->startOfDay(new Api\DateTime((int)$event['start'], Api\DateTime::$server_timezone), $event['tzid']);
+				$stime = & $this->so->startOfDay(new Api\DateTime((int)$event['start'], Api\DateTime::$server_timezone), $event['tzid']);
 				$event['start'] = Api\DateTime::to($stime, $date_format);
-				$time =& $this->so->startOfDay(new Api\DateTime((int)$event['end'], Api\DateTime::$server_timezone), $event['tzid']);
+				$time = & $this->so->startOfDay(new Api\DateTime((int)$event['end'], Api\DateTime::$server_timezone), $event['tzid']);
 				$time->setTime(23, 59, 59);
 				$event['end'] = Api\DateTime::to($time, $date_format);
 				if (!empty($event['recurrence']))
 				{
-					$time =& $this->so->startOfDay(new Api\DateTime((int)$event['recurrence'], Api\DateTime::$server_timezone), $event['tzid']);
+					$time = & $this->so->startOfDay(new Api\DateTime((int)$event['recurrence'], Api\DateTime::$server_timezone), $event['tzid']);
 					$event['recurrence'] = Api\DateTime::to($time, $date_format);
 				}
 				if (!empty($event['recur_enddate']))
 				{
-					$time =& $this->so->startOfDay(new Api\DateTime((int)$event['recur_enddate'], Api\DateTime::$server_timezone), $event['tzid']);
+					$time = & $this->so->startOfDay(new Api\DateTime((int)$event['recur_enddate'], Api\DateTime::$server_timezone), $event['tzid']);
 					$time->setTime(23, 59, 59);
 					$event['recur_enddate'] = Api\DateTime::to($time, $date_format);
 				}
-				$timestamps = array('modified','created','deleted');
+				$timestamps = array('modified', 'created', 'deleted');
 			}
 			else
 			{
-				$timestamps = array('start','end','modified','created','recur_enddate','recurrence','recur_date','deleted');
+				$timestamps = array('start', 'end', 'modified', 'created', 'recur_enddate', 'recurrence', 'recur_date', 'deleted');
 			}
 			// we convert here from the server-time timestamps to user-time and (optional) to a different date-format!
 			foreach ($timestamps as $ts)
 			{
 				if (!empty($event[$ts]))
 				{
-					$event[$ts] = $this->date2usertime((int)$event[$ts],$date_format);
+					$event[$ts] = $this->date2usertime((int)$event[$ts], $date_format);
 				}
 			}
 			// same with the recur exceptions
 			if (isset($event['recur_exception']) && is_array($event['recur_exception']))
 			{
-				foreach($event['recur_exception'] as &$date)
+				foreach ($event['recur_exception'] as &$date)
 				{
 					if ($event['whole_day'] && $date_format != 'server')
 					{
 						// Adjust dates to user TZ
-						$time =& $this->so->startOfDay(new Api\DateTime((int)$date, Api\DateTime::$server_timezone), $event['tzid']);
+						$time = & $this->so->startOfDay(new Api\DateTime((int)$date, Api\DateTime::$server_timezone), $event['tzid']);
 						$date = Api\DateTime::to($time, $date_format);
 					}
 					else
 					{
-						$date = $this->date2usertime((int)$date,$date_format);
+						$date = $this->date2usertime((int)$date, $date_format);
 					}
 				}
 			}
 			// same with the alarms
 			if (isset($event['alarm']) && is_array($event['alarm']))
 			{
-				foreach($event['alarm'] as &$alarm)
+				foreach ($event['alarm'] as &$alarm)
 				{
-					$alarm['time'] = $this->date2usertime((int)$alarm['time'],$date_format);
+					$alarm['time'] = $this->date2usertime((int)$alarm['time'], $date_format);
 				}
 			}
 		}
@@ -1026,11 +1026,11 @@ 
 	 * @param string $date_format ='ts' date-formats: 'ts'=timestamp, 'server'=timestamp in server-time, 'array'=array or string with date-format
 	 * @return mixed depending of $date_format
 	 */
-	function date2usertime($ts,$date_format='ts')
+	function date2usertime($ts, $date_format = 'ts')
 	{
 		if (empty($ts) || $date_format == 'server') return $ts;
 
-		return Api\DateTime::server2user($ts,$date_format);
+		return Api\DateTime::server2user($ts, $date_format);
 	}
 
 	/**
@@ -1045,7 +1045,7 @@ 
 	 * @param boolean $read_recurrence =false true: read the exception, not the series master (only for recur_date && $ids='<uid>'!)
 	 * @return boolean|array event or array of id => event pairs, false if the acl-check went wrong, null if $ids not found
 	 */
-	function read($ids,$date=null, $ignore_acl=False, $date_format='ts', $clear_private_infos_users=null, $read_recurrence=false)
+	function read($ids, $date = null, $ignore_acl = False, $date_format = 'ts', $clear_private_infos_users = null, $read_recurrence = false)
 	{
 		if (!$ids) return false;
 
@@ -1054,21 +1054,21 @@ 
 		$return = null;
 
 		$check = $clear_private_infos_users ? self::ACL_FREEBUSY : Acl::READ;
-		if ($ignore_acl || is_array($ids) || ($return = $this->check_perms($check,$ids,0,$date_format,$date)))
+		if ($ignore_acl || is_array($ids) || ($return = $this->check_perms($check, $ids, 0, $date_format, $date)))
 		{
 			if (is_array($ids) || !isset(self::$cached_event['id']) || self::$cached_event['id'] != $ids ||
 				self::$cached_event_date_format != $date_format || $read_recurrence ||
 				self::$cached_event['recur_type'] != MCAL_RECUR_NONE && self::$cached_event_date != $date)
 			{
-				$events = $this->so->read($ids,$date ? $this->date2ts($date,true) : 0, $read_recurrence);
+				$events = $this->so->read($ids, $date ? $this->date2ts($date, true) : 0, $read_recurrence);
 
 				if ($events)
 				{
-					$this->db2data($events,$date_format);
+					$this->db2data($events, $date_format);
 
 					if (is_array($ids))
 					{
-						$return =& $events;
+						$return = & $events;
 					}
 					else
 					{
@@ -1084,13 +1084,13 @@ 
 				$return = self::$cached_event;
 			}
 		}
-		if ($clear_private_infos_users && !is_array($ids) && !$this->check_perms(Acl::READ,$return))
+		if ($clear_private_infos_users && !is_array($ids) && !$this->check_perms(Acl::READ, $return))
 		{
 			$this->clear_private_infos($return, (array)$clear_private_infos_users);
 		}
 		if ($this->debug && ($this->debug > 1 || $this->debug == 'read'))
 		{
-			$this->debug_message('calendar_bo::read(%1,%2,%3,%4,%5)=%6',True,$ids,$date,$ignore_acl,$date_format,$clear_private_infos_users,$return);
+			$this->debug_message('calendar_bo::read(%1,%2,%3,%4,%5)=%6', True, $ids, $date, $ignore_acl, $date_format, $clear_private_infos_users, $return);
 		}
 		return $return;
 	}
@@ -1108,17 +1108,17 @@ 
 	 * @param array $events where the repetions get inserted
 	 * @param array $recur_exceptions with date (in Ymd) as key (and True as values), seems not to be used anymore
 	 */
-	function insert_all_recurrences($event,$_start,$end,&$events)
+	function insert_all_recurrences($event, $_start, $end, &$events)
 	{
-		if ((int) $this->debug >= 3 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences')
+		if ((int)$this->debug >= 3 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences')
 		{
-			$this->debug_message(__METHOD__.'(%1,%2,%3,&$events)',true,$event,$_start,$end);
+			$this->debug_message(__METHOD__.'(%1,%2,%3,&$events)', true, $event, $_start, $end);
 		}
 		$end_in = $end;
 
 		$start = $this->date2ts($_start);
 		$event_start_ts = $this->date2ts($event['start']);
-		$event_length = $this->date2ts($event['end']) - $event_start_ts;	// we use a constant event-length, NOT a constant end-time!
+		$event_length = $this->date2ts($event['end']) - $event_start_ts; // we use a constant event-length, NOT a constant end-time!
 
 		// if $end is before recur_enddate, use it instead
 		if (!$event['recur_enddate'] || $this->date2ts($event['recur_enddate']) > $this->date2ts($end))
@@ -1127,40 +1127,39 @@ 
 			// insert at least the event itself, if it's behind the horizont
 			$event['recur_enddate'] = $this->date2ts($end) < $this->date2ts($event['end']) ? $event['end'] : $end;
 		}
-		$event['recur_enddate'] = is_a($event['recur_enddate'],'DateTime') ?
-				$event['recur_enddate'] :
-				new Api\DateTime($event['recur_enddate'], calendar_timezones::DateTimeZone($event['tzid']));
+		$event['recur_enddate'] = is_a($event['recur_enddate'], 'DateTime') ?
+				$event['recur_enddate'] : new Api\DateTime($event['recur_enddate'], calendar_timezones::DateTimeZone($event['tzid']));
 
 		// unset exceptions, as we need to add them as recurrence too, but marked as exception
 		unset($event['recur_exception']);
 		// loop over all recurrences and insert them, if they are after $start
- 		$rrule = calendar_rrule::event2rrule($event, !$event['whole_day'], Api\DateTime::$user_timezone->getName());	// true = we operate in usertime, like the rest of calendar_bo
-		foreach($rrule as $time)
+ 		$rrule = calendar_rrule::event2rrule($event, !$event['whole_day'], Api\DateTime::$user_timezone->getName()); // true = we operate in usertime, like the rest of calendar_bo
+		foreach ($rrule as $time)
 		{
-			$time->setUser();	// $time is in timezone of event, convert it to usertime used here
-			if($event['whole_day'])
+			$time->setUser(); // $time is in timezone of event, convert it to usertime used here
+			if ($event['whole_day'])
 			{
 				// All day events are processed in server timezone
 				$time->setServer();
-				$time->setTime(0,0,0);
+				$time->setTime(0, 0, 0);
 			}
-			if (($ts = $this->date2ts($time)) < $start-$event_length)
+			if (($ts = $this->date2ts($time)) < $start - $event_length)
 			{
 				//echo "<p>".$time." --> ignored as $ts < $start-$event_length</p>\n";
-				continue;	// to early or original event (returned by interator too)
+				continue; // to early or original event (returned by interator too)
 			}
 
 			$ts_end = $ts + $event_length;
 			// adjust ts_end for whole day events in case it does not fit due to
 			// spans over summer/wintertime adjusted days
-			if($event['whole_day'] && ($arr_end = $this->date2array($ts_end)) &&
+			if ($event['whole_day'] && ($arr_end = $this->date2array($ts_end)) &&
 				!($arr_end['hour'] == 23 && $arr_end['minute'] == 59 && $arr_end['second'] == 59))
 			{
 				$arr_end['hour'] = 23;
 				$arr_end['minute'] = 59;
 				$arr_end['second'] = 59;
 				$ts_end_guess = $this->date2ts($arr_end);
-				if($ts_end_guess - $ts_end > DAY_s/2)
+				if ($ts_end_guess - $ts_end > DAY_s / 2)
 				{
 					$ts_end = $ts_end_guess - DAY_s; // $ts_end_guess was one day too far in the future
 				}
@@ -1174,11 +1173,11 @@ 
 			$event['end'] = $ts_end;
 			$events[] = $event;
 		}
-		if ($this->debug && ((int) $this->debug > 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences'))
+		if ($this->debug && ((int)$this->debug > 2 || $this->debug == 'set_recurrences' || $this->debug == 'check_move_horizont' || $this->debug == 'insert_all_recurrences'))
 		{
 			$event['start'] = $event_start_ts;
 			$event['end'] = $event_start_ts + $event_length;
-			$this->debug_message(__METHOD__.'(%1,start=%2,end=%3,events) events=%5',True,$event,$_start,$end_in,$events);
+			$this->debug_message(__METHOD__.'(%1,start=%2,end=%3,events) events=%5', True, $event, $_start, $end_in, $events);
 		}
 	}
 
@@ -1189,18 +1188,18 @@ 
 	 * @param array $event event to insert, it has start- and end-date of the first recurrence, not of $date_ymd
 	 * @param int|string $date_ymd of the date of the event
 	 */
-	function add_adjusted_event(&$events,$event,$date_ymd)
+	function add_adjusted_event(&$events, $event, $date_ymd)
 	{
 		$event_in = $event;
 		// calculate the new start- and end-time
 		$length_s = $this->date2ts($event['end']) - $this->date2ts($event['start']);
 		$event_start_arr = $this->date2array($event['start']);
 
-		$date_arr = $this->date2array((string) $date_ymd);
+		$date_arr = $this->date2array((string)$date_ymd);
 		$date_arr['hour'] = $event_start_arr['hour'];
 		$date_arr['minute'] = $event_start_arr['minute'];
 		$date_arr['second'] = $event_start_arr['second'];
-		unset($date_arr['raw']);	// else date2ts would use it
+		unset($date_arr['raw']); // else date2ts would use it
 		$event['start'] = $this->date2ts($date_arr);
 		$event['end'] = $event['start'] + $length_s;
 
@@ -1208,7 +1207,7 @@ 
 
 		if ($this->debug && ($this->debug > 2 || $this->debug == 'add_adjust_event'))
 		{
-			$this->debug_message('calendar_bo::add_adjust_event(,%1,%2) as %3',True,$event_in,$date_ymd,$event);
+			$this->debug_message('calendar_bo::add_adjust_event(,%1,%2) as %3', True, $event_in, $date_ymd, $event);
 		}
 	}
 
@@ -1232,22 +1231,22 @@ 
 			{
 				$info = array(
 					'res_id'    => $uid,
-					'email' => $GLOBALS['egw']->accounts->id2name($uid,'account_email'),
-					'name'  => trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' .
-					$GLOBALS['egw']->accounts->id2name($uid,'account_lastname')),
+					'email' => $GLOBALS['egw']->accounts->id2name($uid, 'account_email'),
+					'name'  => trim($GLOBALS['egw']->accounts->id2name($uid, 'account_firstname').' '.
+					$GLOBALS['egw']->accounts->id2name($uid, 'account_lastname')),
 					'type'  => $GLOBALS['egw']->accounts->get_type($uid),
 					'app'   => 'accounts',
 				);
 			}
 			else
 			{
-				list($info) = $this->resources[$uid[0]]['info'] ? ExecMethod($this->resources[$uid[0]]['info'],substr($uid,1)) : false;
+				list($info) = $this->resources[$uid[0]]['info'] ? ExecMethod($this->resources[$uid[0]]['info'], substr($uid, 1)) : false;
 				if ($info)
 				{
 					$info['type'] = $uid[0];
 					if (!$info['email'] && $info['responsible'])
 					{
-						$info['email'] = $GLOBALS['egw']->accounts->id2name($info['responsible'],'account_email');
+						$info['email'] = $GLOBALS['egw']->accounts->id2name($info['responsible'], 'account_email');
 					}
 					$info['app'] = $this->resources[$uid[0]]['app'];
 				}
@@ -1256,7 +1255,7 @@ 
 		}
 		if ($this->debug && ($this->debug > 2 || $this->debug == 'resource_info'))
 		{
-			$this->debug_message('calendar_bo::resource_info(%1) = %2',True,$uid,$res_info_cache[$uid]);
+			$this->debug_message('calendar_bo::resource_info(%1) = %2', True, $uid, $res_info_cache[$uid]);
 		}
 		return $res_info_cache[$uid];
 	}
@@ -1277,7 +1276,7 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true permission granted, false for permission denied or null if event not found
 	 */
-	function check_perms($needed,$event=0,$other=0,$date_format='ts',$date_to_read=null,$user=null)
+	function check_perms($needed, $event = 0, $other = 0, $date_format = 'ts', $date_to_read = null, $user = null)
 	{
 		if (!$user) $user = $this->user;
 		if ($user == $this->user)
@@ -1286,13 +1285,13 @@ 
 		}
 		else
 		{
-			$grants = $GLOBALS['egw']->acl->get_grants('calendar',true,$user);
+			$grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
 		}
 
 		if ($other && !is_numeric($other))
 		{
 			$resource = $this->resource_info($other);
-			return $needed & $resource['rights'];
+			return $needed&$resource['rights'];
 		}
 		if (is_int($event) && $event == 0)
 		{
@@ -1302,15 +1301,15 @@ 
 		{
 			if (!is_array($event))
 			{
-				$event = $this->read($event,$date_to_read,true,$date_format);	// = no ACL check !!!
+				$event = $this->read($event, $date_to_read, true, $date_format); // = no ACL check !!!
 			}
 			if (!is_array($event))
 			{
 				if ($this->xmlrpc)
 				{
-					$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['not_exist'],$GLOBALS['xmlrpcstr']['not_exist']);
+					$GLOBALS['server']->xmlrpc_error($GLOBALS['xmlrpcerr']['not_exist'], $GLOBALS['xmlrpcstr']['not_exist']);
 				}
-				return null;	// event not found
+				return null; // event not found
 			}
 			$owner = $event['owner'];
 			$private = !$event['public'];
@@ -1318,7 +1317,7 @@ 
 		$grant = $grants[$owner];
 
 		// now any ACL rights (but invite rights!) implicate FREEBUSY rights (at least READ has to include FREEBUSY)
-		if ($grant & ~self::ACL_INVITE) $grant |= self::ACL_FREEBUSY;
+		if ($grant&~self::ACL_INVITE) $grant |= self::ACL_FREEBUSY;
 
 		if (is_array($event) && ($needed == Acl::READ || $needed == self::ACL_FREEBUSY))
 		{
@@ -1327,18 +1326,18 @@ 
 			//
 			if ($event['participants'] && is_array($event['participants']))
 			{
-				foreach(array_keys($event['participants']) as $uid)
+				foreach (array_keys($event['participants']) as $uid)
 				{
-					if ($uid == $user || $uid < 0 && in_array($user, (array)$GLOBALS['egw']->accounts->members($uid,true)))
+					if ($uid == $user || $uid < 0 && in_array($user, (array)$GLOBALS['egw']->accounts->members($uid, true)))
 					{
 						// if we are a participant, we have an implicite FREEBUSY, READ and PRIVAT grant
-						$grant |= self::ACL_FREEBUSY | Acl::READ | Acl::PRIVAT;
+						$grant |= self::ACL_FREEBUSY|Acl::READ|Acl::PRIVAT;
 						break;
 					}
-					elseif ($grants[$uid] & Acl::READ)
+					elseif ($grants[$uid]&Acl::READ)
 					{
 						// if we have a READ grant from a participant, we dont give an implicit privat grant too
-						$grant |= self::ACL_FREEBUSY | Acl::READ;
+						$grant |= self::ACL_FREEBUSY|Acl::READ;
 						// we cant break here, as we might be a participant too, and would miss the privat grant
 					}
 					elseif (!is_numeric($uid))
@@ -1354,12 +1353,12 @@ 
 		}
 		if ($GLOBALS['egw']->accounts->get_type($owner) == 'g' && $needed == Acl::ADD)
 		{
-			$access = False;	// a group can't be the owner of an event
+			$access = False; // a group can't be the owner of an event
 		}
 		else
 		{
-			$access = $user == $owner || $grant & $needed
-				&& ($needed == self::ACL_FREEBUSY || !$private || $grant & Acl::PRIVAT);
+			$access = $user == $owner || $grant&$needed
+				&& ($needed == self::ACL_FREEBUSY || !$private || $grant&Acl::PRIVAT);
 		}
 		// do NOT allow users to purge deleted events, if we dont have 'userpurge' enabled
 		if ($access && $needed == Acl::DELETE && $event['deleted'] &&
@@ -1370,7 +1369,7 @@ 
 		}
 		if ($this->debug && ($this->debug > 2 || $this->debug == 'check_perms'))
 		{
-			$this->debug_message('calendar_bo::check_perms(%1,%2,other=%3,%4,%5,user=%6)=%7',True,ACL_TYPE_IDENTIFER.$needed,$event,$other,$date_format,$date_to_read,$user,$access);
+			$this->debug_message('calendar_bo::check_perms(%1,%2,other=%3,%4,%5,user=%6)=%7', True, ACL_TYPE_IDENTIFER.$needed, $event, $other, $date_format, $date_to_read, $user, $access);
 		}
 		//error_log(__METHOD__."($needed,".array2string($event).",$other,...,$user) returning ".array2string($access));
 		return $access;
@@ -1385,9 +1384,9 @@ 
 	 *	array with keys 'second', 'minute', 'hour', 'day' or 'mday' (depricated !), 'month' and 'year'
 	 * @param boolean $user2server =False conversion between user- and server-time; default False == Off
 	 */
-	static function date2ts($date,$user2server=False)
+	static function date2ts($date, $user2server = False)
 	{
-		return $user2server ? Api\DateTime::user2server($date,'ts') : Api\DateTime::to($date,'ts');
+		return $user2server ? Api\DateTime::user2server($date, 'ts') : Api\DateTime::to($date, 'ts');
 	}
 
 	/**
@@ -1397,9 +1396,9 @@ 
 	 * @param boolean $server2user conversation between user- and server-time default False == Off
 	 * @return array with keys 'second', 'minute', 'hour', 'day', 'month', 'year', 'raw' (timestamp) and 'full' (Ymd-string)
 	 */
-	static function date2array($date,$server2user=False)
+	static function date2array($date, $server2user = False)
 	{
-		return $server2user ? Api\DateTime::server2user($date,'array') : Api\DateTime::to($date,'array');
+		return $server2user ? Api\DateTime::server2user($date, 'array') : Api\DateTime::to($date, 'array');
 	}
 
 	/**
@@ -1410,9 +1409,9 @@ 
 	 * @param string $format ='Ymd' format of the date to return, eg. 'Y-m-d\TH:i:sO' (2005-11-01T15:30:00+0100)
 	 * @return string date formatted according to $format
 	 */
-	static function date2string($date,$server2user=False,$format='Ymd')
+	static function date2string($date, $server2user = False, $format = 'Ymd')
 	{
-		return $server2user ? Api\DateTime::server2user($date,$format) : Api\DateTime::to($date,$format);
+		return $server2user ? Api\DateTime::server2user($date, $format) : Api\DateTime::to($date, $format);
 	}
 
 	/**
@@ -1422,9 +1421,9 @@ 
 	 * @param string|boolean $format ='' default common_prefs[dateformat], common_prefs[timeformat], false=time only, true=date only
 	 * @return string the formated date (incl. time)
 	 */
-	static function format_date($date,$format='')
+	static function format_date($date, $format = '')
 	{
-		return Api\DateTime::to($date,$format);
+		return Api\DateTime::to($date, $format);
 	}
 
 	/**
@@ -1446,7 +1445,7 @@ 
 	 * @param mixed $param a variable number of parameters, to be inserted in $msg
 	 *	arrays get serialized with print_r() !
 	 */
-	static function debug_message($msg,$backtrace=True)
+	static function debug_message($msg, $backtrace = True)
 	{
 		static $acl2string = array(
 			0               => 'ACL-UNKNOWN',
@@ -1457,22 +1456,22 @@ 
 			Acl::PRIVAT => 'ACL_PRIVATE',
 			self::ACL_FREEBUSY => 'ACL_FREEBUSY',
 		);
-		for($i = 2; $i < func_num_args(); ++$i)
+		for ($i = 2; $i < func_num_args(); ++$i)
 		{
 			$param = func_get_arg($i);
 
 			if (is_null($param))
 			{
-				$param='NULL';
+				$param = 'NULL';
 			}
 			else
 			{
-				switch(gettype($param))
+				switch (gettype($param))
 				{
 					case 'string':
-						if (substr($param,0,strlen(ACL_TYPE_IDENTIFER))== ACL_TYPE_IDENTIFER)
+						if (substr($param, 0, strlen(ACL_TYPE_IDENTIFER)) == ACL_TYPE_IDENTIFER)
 						{
-							$param = (int) substr($param,strlen(ACL_TYPE_IDENTIFER));
+							$param = (int)substr($param, strlen(ACL_TYPE_IDENTIFER));
 							$param = (isset($acl2string[$param]) ? $acl2string[$param] : $acl2string[0])." ($param)";
 						}
 						else
@@ -1495,11 +1494,11 @@ 
 						$param = $param ? 'True' : 'False';
 						break;
 					case 'integer':
-						if ($param >= mktime(0,0,0,1,1,2000)) $param = adodb_date('Y-m-d H:i:s',$param)." ($param)";
+						if ($param >= mktime(0, 0, 0, 1, 1, 2000)) $param = adodb_date('Y-m-d H:i:s', $param)." ($param)";
 						break;
 				}
 			}
-			$msg = str_replace('%'.($i-1),$param,$msg);
+			$msg = str_replace('%'.($i - 1), $param, $msg);
 		}
 		error_log($msg);
 		if ($backtrace) error_log(function_backtrace(1));
@@ -1514,7 +1513,7 @@ 
 	 * @param boolean $display_day =false should a day-name prefix the date, eg. monday June 20, 2006
 	 * @return string with formated date
 	 */
-	function long_date($_first,$last=0,$display_time=false,$display_day=false)
+	function long_date($_first, $last = 0, $display_time = false, $display_day = false)
 	{
 		$first = $this->date2array($_first);
 		if ($last)
@@ -1529,27 +1528,27 @@ 
 
 		if ($display_day)
 		{
-			$range = lang(adodb_date('l',$first['raw'])).($this->common_prefs['dateformat'][0] != 'd' ? ' ' : ', ');
+			$range = lang(adodb_date('l', $first['raw'])).($this->common_prefs['dateformat'][0] != 'd' ? ' ' : ', ');
 		}
 		for ($i = 0; $i < 5; $i += 2)
 		{
-			switch($datefmt[$i])
+			switch ($datefmt[$i])
 			{
 				case 'd':
-					$range .= $first['day'] . ($datefmt[1] == '.' ? '.' : '');
+					$range .= $first['day'].($datefmt[1] == '.' ? '.' : '');
 					if ($first['month'] != $last['month'] || $first['year'] != $last['year'])
 					{
 						if (!$month_before_day)
 						{
-							$range .= ' '.lang(strftime('%B',$first['raw']));
+							$range .= ' '.lang(strftime('%B', $first['raw']));
 						}
 						if ($first['year'] != $last['year'] && $datefmt[0] != 'Y')
 						{
-							$range .= ($datefmt[0] != 'd' ? ', ' : ' ') . $first['year'];
+							$range .= ($datefmt[0] != 'd' ? ', ' : ' ').$first['year'];
 						}
 						if ($display_time)
 						{
-							$range .= ' '.adodb_date($timefmt,$first['raw']);
+							$range .= ' '.adodb_date($timefmt, $first['raw']);
 						}
 						if (!$last)
 						{
@@ -1559,43 +1558,43 @@ 
 
 						if ($first['year'] != $last['year'] && $datefmt[0] == 'Y')
 						{
-							$range .= $last['year'] . ', ';
+							$range .= $last['year'].', ';
 						}
 
 						if ($month_before_day)
 						{
-							$range .= lang(strftime('%B',$last['raw']));
+							$range .= lang(strftime('%B', $last['raw']));
 						}
 					}
 					else
 					{
 						if ($display_time)
 						{
-							$range .= ' '.adodb_date($timefmt,$first['raw']);
+							$range .= ' '.adodb_date($timefmt, $first['raw']);
 						}
 						$range .= ' - ';
 					}
-					$range .= ' ' . $last['day'] . ($datefmt[1] == '.' ? '.' : '');
+					$range .= ' '.$last['day'].($datefmt[1] == '.' ? '.' : '');
 					break;
 				case 'm':
 				case 'M':
-					$range .= ' '.lang(strftime('%B',$month_before_day ? $first['raw'] : $last['raw'])) . ' ';
+					$range .= ' '.lang(strftime('%B', $month_before_day ? $first['raw'] : $last['raw'])).' ';
 					break;
 				case 'Y':
 					if ($datefmt[0] != 'm')
 					{
-						$range .= ' ' . ($datefmt[0] == 'Y' ? $first['year'].($datefmt[2] == 'd' ? ', ' : ' ') : $last['year'].' ');
+						$range .= ' '.($datefmt[0] == 'Y' ? $first['year'].($datefmt[2] == 'd' ? ', ' : ' ') : $last['year'].' ');
 					}
 					break;
 			}
 		}
 		if ($display_time && $last)
 		{
-			$range .= ' '.adodb_date($timefmt,$last['raw']);
+			$range .= ' '.adodb_date($timefmt, $last['raw']);
 		}
 		if ($datefmt[4] == 'Y' && $datefmt[0] == 'm')
 		{
-			$range .= ', ' . $last['year'];
+			$range .= ', '.$last['year'];
 		}
 		return $range;
 	}
@@ -1607,25 +1606,25 @@ 
 	 * @param int $end_m end time in minutes since 0h
 	 * @param boolean $both =false display the end-time too, duration is always displayed
 	 */
-	function timespan($start_m,$end_m,$both=false)
+	function timespan($start_m, $end_m, $both = false)
 	{
 		$duration = $end_m - $start_m;
-		if ($end_m == 24*60-1) ++$duration;
-		$duration = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
+		if ($end_m == 24 * 60 - 1) ++$duration;
+		$duration = floor($duration / 60).lang('h').($duration % 60 ? $duration % 60 : '');
 
-		$timespan = $t = Api\DateTime::to('20000101T'.sprintf('%02d',$start_m/60).sprintf('%02d',$start_m%60).'00', false);
+		$timespan = $t = Api\DateTime::to('20000101T'.sprintf('%02d', $start_m / 60).sprintf('%02d', $start_m % 60).'00', false);
 
 		if ($both)	// end-time too
 		{
-			$timespan .= ' - '.Api\DateTime::to('20000101T'.sprintf('%02d',$end_m/60).sprintf('%02d',$end_m%60).'00', false);
+			$timespan .= ' - '.Api\DateTime::to('20000101T'.sprintf('%02d', $end_m / 60).sprintf('%02d', $end_m % 60).'00', false);
 			// dont double am/pm if they are the same in both times
-			if ($this->common_prefs['timeformat'] == 12 && substr($timespan,-2) == substr($t,-2))
+			if ($this->common_prefs['timeformat'] == 12 && substr($timespan, -2) == substr($t, -2))
 			{
-				$timespan = str_replace($t,substr($t,0,-3),$timespan);
+				$timespan = str_replace($t, substr($t, 0, -3), $timespan);
 			}
 			$timespan .= ':';
 		}
-		return $timespan . ' ' . $duration;
+		return $timespan.' '.$duration;
 	}
 
 	/**
@@ -1636,7 +1635,7 @@ 
 	* @param boolean $append_email =false append email (Name <email>)
 	* @return string with name
 	*/
-	function participant_name($id,$use_type=false, $append_email=false)
+	function participant_name($id, $use_type = false, $append_email = false)
 	{
 		static $id2lid = array();
 		static $id2email = array();
@@ -1657,7 +1656,7 @@ 
 			else
 			{
 				$id2lid[$id] = Api\Accounts::username($id);
-				$id2email[$id] = $GLOBALS['egw']->accounts->id2name($id,'account_email');
+				$id2email[$id] = $GLOBALS['egw']->accounts->id2name($id, 'account_email');
 			}
 		}
 		return $id2lid[$id].(($append_email || $id[0] == 'e') && $id2email[$id] ? ' <'.$id2email[$id].'>' : '');
@@ -1671,37 +1670,37 @@ 
 	* @param boolean $show_group_invitation =false show group-invitations (status == 'G') or not (default)
 	* @return array with id / names with status pairs
 	*/
-	function participants($event,$long_status=false,$show_group_invitation=false)
+	function participants($event, $long_status = false, $show_group_invitation = false)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($event['participants']));
 		$names = array();
-		foreach((array)$event['participants'] as $id => $status)
+		foreach ((array)$event['participants'] as $id => $status)
 		{
 			if (!is_string($status)) continue;
 			$quantity = $role = null;
-			calendar_so::split_status($status,$quantity,$role);
+			calendar_so::split_status($status, $quantity, $role);
 
-			if ($status == 'G' && !$show_group_invitation) continue;	// dont show group-invitation
+			if ($status == 'G' && !$show_group_invitation) continue; // dont show group-invitation
 
 			$lang_status = lang($this->verbose_status[$status]);
 			if (!$long_status)
 			{
-				switch($status[0])
+				switch ($status[0])
 				{
 					case 'A':	// accepted
-						$status = Api\Html::image('calendar','accepted',$lang_status);
+						$status = Api\Html::image('calendar', 'accepted', $lang_status);
 						break;
 					case 'R':	// rejected
-						$status = Api\Html::image('calendar','rejected',$lang_status);
+						$status = Api\Html::image('calendar', 'rejected', $lang_status);
 						break;
 					case 'T':	// tentative
-						$status = Api\Html::image('calendar','tentative',$lang_status);
+						$status = Api\Html::image('calendar', 'tentative', $lang_status);
 						break;
 					case 'U':	// no response = unknown
-						$status = Api\Html::image('calendar','needs-action',$lang_status);
+						$status = Api\Html::image('calendar', 'needs-action', $lang_status);
 						break;
 					case 'D':	// delegated
-						$status = Api\Html::image('calendar','forward',$lang_status);
+						$status = Api\Html::image('calendar', 'forward', $lang_status);
 						break;
 					case 'G':	// group invitation
 						// Todo: Image, seems not to be used
@@ -1723,13 +1722,13 @@ 
 					$role = lang($this->roles[$role]);
 				}
 				// allow to use cats as roles (beside regular iCal ones)
-				elseif (substr($role,0,6) == 'X-CAT-' && ($cat_id = (int)substr($role,6)) > 0)
+				elseif (substr($role, 0, 6) == 'X-CAT-' && ($cat_id = (int)substr($role, 6)) > 0)
 				{
 					$role = $GLOBALS['egw']->categories->id2name($cat_id);
 				}
 				else
 				{
-					$role = lang(str_replace('X-','',$role));
+					$role = lang(str_replace('X-', '', $role));
 				}
 				$names[$id] .= ' '.$role;
 			}
@@ -1746,13 +1745,13 @@ 
 	* @param int $color color of the category, if multiple cats, the color of the last one with color is returned
 	* @return array with id / names
 	*/
-	function categories($category,&$color)
+	function categories($category, &$color)
 	{
 		static $id2cat = array();
 		$cats = array();
 		$color = 0;
 
-		foreach(explode(',',$category) as $cat_id)
+		foreach (explode(',', $category) as $cat_id)
 		{
 			if (!$cat_id) continue;
 
@@ -1767,7 +1766,7 @@ 
 			{
 				$color = $cat['data']['color'];
 			}
-			elseif(preg_match('/(#[0-9A-Fa-f]{6})/', $cat['description'], $parts))
+			elseif (preg_match('/(#[0-9A-Fa-f]{6})/', $cat['description'], $parts))
 			{
 				$color = $parts[1];
 			}
@@ -1779,12 +1778,12 @@ 
 	/**
 	 *  This is called only by list_cals().  It was moved here to remove fatal error in php5 beta4
 	 */
-	private static function _list_cals_add($id,&$users,&$groups)
+	private static function _list_cals_add($id, &$users, &$groups)
 	{
 		$name = Api\Accounts::username($id);
 		if (!($egw_name = $GLOBALS['egw']->accounts->id2name($id)))
 		{
-			return;	// do not return no longer existing accounts which eg. still mentioned in acl
+			return; // do not return no longer existing accounts which eg. still mentioned in acl
 		}
 		if (($type = $GLOBALS['egw']->accounts->get_type($id)) == 'g')
 		{
@@ -1796,7 +1795,7 @@ 
 		}
 		$arr[$id] = array(
 			'grantor' => $id,
-			'value'   => ($type == 'g' ? 'g_' : '') . $id,
+			'value'   => ($type == 'g' ? 'g_' : '').$id,
 			'name'    => $name,
 			'sname'	  => $egw_name
 		);
@@ -1818,26 +1817,26 @@ 
 	 * @param int $user account_id of user to generate list for
 	 * @param array $grants =null calendar grants from user, or null to query them from acl class
 	 */
-	public static function list_calendars($user, array $grants=null)
+	public static function list_calendars($user, array $grants = null)
 	{
 		if (is_null($grants)) $grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
 
 		$users = $groups = array();
-		foreach(array_keys($grants) as $id)
+		foreach (array_keys($grants) as $id)
 		{
-			self::_list_cals_add($id,$users,$groups);
+			self::_list_cals_add($id, $users, $groups);
 		}
 		if (($memberships = $GLOBALS['egw']->accounts->memberships($user, true)))
 		{
-			foreach($memberships as $group)
+			foreach ($memberships as $group)
 			{
-				self::_list_cals_add($group,$users,$groups);
+				self::_list_cals_add($group, $users, $groups);
 
-				if (($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group,Acl::READ,'calendar')))
+				if (($account_perms = $GLOBALS['egw']->acl->get_ids_for_location($group, Acl::READ, 'calendar')))
 				{
-					foreach($account_perms as $id)
+					foreach ($account_perms as $id)
 					{
-						self::_list_cals_add($id,$users,$groups);
+						self::_list_cals_add($id, $users, $groups);
 					}
 				}
 			}
@@ -1845,7 +1844,7 @@ 
 		usort($users, array(__CLASS__, 'name_cmp'));
 		usort($groups, array(__CLASS__, 'name_cmp'));
 
-		return array_merge($users, $groups);	// users first and then groups, both alphabeticaly
+		return array_merge($users, $groups); // users first and then groups, both alphabeticaly
 	}
 
 	/**
@@ -1885,43 +1884,42 @@ 
 	 *	month: numerical month
 	 *	occurence: numerical year or 0 for every year
 	 */
-	function read_holidays($year=0)
+	function read_holidays($year = 0)
 	{
-		if (!$year) $year = (int) date('Y',$this->now_su);
+		if (!$year) $year = (int)date('Y', $this->now_su);
 
 		$holidays = calendar_holidays::read(
 				!empty($GLOBALS['egw_info']['server']['ical_holiday_url']) ?
-				$GLOBALS['egw_info']['server']['ical_holiday_url'] :
-				$GLOBALS['egw_info']['user']['preferences']['common']['country'], $year);
+				$GLOBALS['egw_info']['server']['ical_holiday_url'] : $GLOBALS['egw_info']['user']['preferences']['common']['country'], $year);
 
 		// search for birthdays
 		if ($GLOBALS['egw_info']['server']['hide_birthdays'] != 'yes')
 		{
 			$contacts = new Api\Contacts();
-			foreach($contacts->get_addressbooks() as $owner => $name)
+			foreach ($contacts->get_addressbooks() as $owner => $name)
 			{
 				$birthdays = $contacts->read_birthdays($owner, $year);
 
 				// Add them in, being careful not to override any existing
-				foreach($birthdays as $date => $bdays)
+				foreach ($birthdays as $date => $bdays)
 				{
-					if(!array_key_exists($date, $holidays))
+					if (!array_key_exists($date, $holidays))
 					{
 						$holidays[$date] = array();
 					}
-					foreach($bdays as $birthday)
+					foreach ($bdays as $birthday)
 					{
 						// Skip if name / date are already there - duplicate contacts
-						if(in_array($birthday['name'], array_column($holidays[$date], 'name'))) continue;
+						if (in_array($birthday['name'], array_column($holidays[$date], 'name'))) continue;
 						$holidays[$date][] = $birthday;
 					}
 				}
 			}
 		}
 
-		if ((int) $this->debug >= 2 || $this->debug == 'read_holidays')
+		if ((int)$this->debug >= 2 || $this->debug == 'read_holidays')
 		{
-			$this->debug_message('calendar_bo::read_holidays(%1)=%2',true,$year,$holidays);
+			$this->debug_message('calendar_bo::read_holidays(%1)=%2', true, $year, $holidays);
 		}
 		return $holidays;
 	}
@@ -1932,10 +1930,10 @@ 
 	 * @param type $event
 	 * @return array array of selected calendar fields
 	 */
-	public static function get_link_options ($event = array())
+	public static function get_link_options($event = array())
 	{
-		unset($event);	// not used, but required by function signature
-		$options = array (
+		unset($event); // not used, but required by function signature
+		$options = array(
 			'end' => lang('End date'),
 			'id' => lang('ID'),
 			'owner' => lang('Owner'),
@@ -1962,7 +1960,7 @@ 
 			list($id, $recur) = explode('-', $event, 2);
 			$event = $this->read($id, $recur);
 		}
-		else if (!is_array($event) && (int) $event > 0)
+		else if (!is_array($event) && (int)$event > 0)
 		{
 			$event = $this->read($event);
 		}
@@ -1970,7 +1968,7 @@ 
 		{
 			return $event;
 		}
-		$type = explode(',',$this->cal_prefs['link_title']);
+		$type = explode(',', $this->cal_prefs['link_title']);
 		if (is_array($type))
 		{
 			foreach ($type as &$val)
@@ -1999,10 +1997,10 @@ 
 						$extra_fields [] = $event[$val];
 				}
 			}
-			$str_fields = implode(', ',$extra_fields);
-			if (is_array($extra_fields)) return $this->format_date($event['start']) . ': ' . $event['title'] . ($str_fields? ', ' . $str_fields:'');
+			$str_fields = implode(', ', $extra_fields);
+			if (is_array($extra_fields)) return $this->format_date($event['start']).': '.$event['title'].($str_fields ? ', '.$str_fields : '');
 		}
-		return $this->format_date($event['start']) . ': ' . $event['title'];
+		return $this->format_date($event['start']).': '.$event['title'];
 	}
 
 	/**
@@ -2021,10 +2019,10 @@ 
 			'offset' =>	$options['start'],
 			'order' => 'cal_start DESC',
 		);
-		if($options['num_rows']) {
+		if ($options['num_rows']) {
 			$query['num_rows'] = $options['num_rows'];
 		}
-		foreach((array) $this->search($query) as $event)
+		foreach ((array)$this->search($query) as $event)
 		{
 			$result[$event['id']] = $this->link_title($event);
 		}
@@ -2041,11 +2039,11 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path,$user=null)
+	function file_access($id, $check, $rel_path, $user = null)
 	{
-		unset($rel_path);	// not used, but required by function signature
+		unset($rel_path); // not used, but required by function signature
 
-		return $this->check_perms($check,$id,0,'ts',null,$user);
+		return $this->check_perms($check, $id, 0, 'ts', null, $user);
 	}
 
 	/**
@@ -2061,36 +2059,36 @@ 
 		}
 		Api\Cache::setSession('calendar', 'default_prefs_set', 'set');
 
-		$default_prefs =& $GLOBALS['egw']->preferences->default['calendar'];
-		$forced_prefs  =& $GLOBALS['egw']->preferences->forced['calendar'];
+		$default_prefs = & $GLOBALS['egw']->preferences->default['calendar'];
+		$forced_prefs  = & $GLOBALS['egw']->preferences->forced['calendar'];
 
-		$subject = lang('Calendar Event') . ' - $$action$$: $$startdate$$ $$title$$'."\n";
+		$subject = lang('Calendar Event').' - $$action$$: $$startdate$$ $$title$$'."\n";
 		$values = array(
-			'notifyAdded'     => $subject . lang ('You have a meeting scheduled for %1','$$startdate$$'),
-			'notifyCanceled'  => $subject . lang ('Your meeting scheduled for %1 has been canceled','$$startdate$$'),
-			'notifyModified'  => $subject . lang ('Your meeting that had been scheduled for %1 has been rescheduled to %2','$$olddate$$','$$startdate$$'),
-			'notifyDisinvited'=> $subject . lang ('You have been uninvited from the meeting at %1','$$startdate$$'),
-			'notifyResponse'  => $subject . lang ('On %1 %2 %3 your meeting request for %4','$$date$$','$$fullname$$','$$action$$','$$startdate$$'),
-			'notifyAlarm'     => lang('Alarm for %1 at %2 in %3','$$title$$','$$startdate$$','$$location$$')."\n".lang ('Here is your requested alarm.'),
+			'notifyAdded'     => $subject.lang('You have a meeting scheduled for %1', '$$startdate$$'),
+			'notifyCanceled'  => $subject.lang('Your meeting scheduled for %1 has been canceled', '$$startdate$$'),
+			'notifyModified'  => $subject.lang('Your meeting that had been scheduled for %1 has been rescheduled to %2', '$$olddate$$', '$$startdate$$'),
+			'notifyDisinvited'=> $subject.lang('You have been uninvited from the meeting at %1', '$$startdate$$'),
+			'notifyResponse'  => $subject.lang('On %1 %2 %3 your meeting request for %4', '$$date$$', '$$fullname$$', '$$action$$', '$$startdate$$'),
+			'notifyAlarm'     => lang('Alarm for %1 at %2 in %3', '$$title$$', '$$startdate$$', '$$location$$')."\n".lang('Here is your requested alarm.'),
 			'interval'        => 30,
 		);
-		foreach($values as $var => $default)
+		foreach ($values as $var => $default)
 		{
-			$type = substr($var,0,6) == 'notify' ? 'forced' : 'default';
+			$type = substr($var, 0, 6) == 'notify' ? 'forced' : 'default';
 
 			// only set, if neither default nor forced pref exists
 			if ((!isset($default_prefs[$var]) || (string)$default_prefs[$var] === '') && (!isset($forced_prefs[$var]) || (string)$forced_prefs[$var] === ''))
 			{
-				$GLOBALS['egw']->preferences->add('calendar',$var,$default,'default');	// always store default, even if we have a forced too
-				if ($type == 'forced') $GLOBALS['egw']->preferences->add('calendar',$var,$default,'forced');
+				$GLOBALS['egw']->preferences->add('calendar', $var, $default, 'default'); // always store default, even if we have a forced too
+				if ($type == 'forced') $GLOBALS['egw']->preferences->add('calendar', $var, $default, 'forced');
 				$this->cal_prefs[$var] = $default;
 				$need_save = True;
 			}
 		}
 		if ($need_save)
 		{
-			$GLOBALS['egw']->preferences->save_repository(False,'default');
-			$GLOBALS['egw']->preferences->save_repository(False,'forced');
+			$GLOBALS['egw']->preferences->save_repository(False, 'default');
+			$GLOBALS['egw']->preferences->save_repository(False, 'forced');
 		}
 	}
 
@@ -2100,7 +2098,7 @@ 
 	 * @param int|string $user account_id or account_lid
 	 * @param string $pw =null password
 	 */
-	static function freebusy_url($user='',$pw=null)
+	static function freebusy_url($user = '', $pw = null)
 	{
 		if (is_numeric($user)) $user = $GLOBALS['egw']->accounts->id2name($user);
 
@@ -2113,8 +2111,8 @@ 
 		elseif ($GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy'] == 2)
 		{
 			$credentials = $GLOBALS['egw_info']['user']['account_lid']
-				. ':' . $GLOBALS['egw_info']['user']['passwd'];
-			$credentials = '&cred=' . base64_encode($credentials);
+				. ':'.$GLOBALS['egw_info']['user']['passwd'];
+			$credentials = '&cred='.base64_encode($credentials);
 		}
 		return Api\Framework::getUrl($GLOBALS['egw_info']['server']['webserver_url']).
 			'/calendar/freebusy.php/?user='.urlencode($user).$credentials;
@@ -2145,11 +2143,11 @@ 
 	 * @param string &$schedule_tag=null on return schedule-tag (egw_cal.cal_id:egw_cal.cal_etag, no participant modifications!)
 	 * @return string|boolean string with etag or false
 	 */
-	function get_etag($entry, &$schedule_tag=null)
+	function get_etag($entry, &$schedule_tag = null)
 	{
 		if (!is_array($entry))
 		{
-			list($id,$recur_date) = explode(':',$entry);
+			list($id, $recur_date) = explode(':', $entry);
 			$entry = $this->read($id, $recur_date, true, 'server');
 		}
 		$etag = $schedule_tag = $entry['id'].':'.$entry['etag'];
@@ -2167,15 +2165,15 @@ 
 	 * @param boolean $master_only =false only check recurance master (egw_cal_user.recur_date=0)
 	 * @return integer
 	 */
-	public function get_ctag($user, $filter='owner', $master_only=false)
+	public function get_ctag($user, $filter = 'owner', $master_only = false)
 	{
 		if ($this->debug > 1) $startime = microtime(true);
 
 		// resolve users to add memberships for users and members for groups
 		$users = $this->resolve_users($user);
-		$ctag = $users ? $this->so->get_ctag($users, $filter == 'owner', $master_only) : 0;	// no rights, return 0 as ctag (otherwise we get SQL error!)
+		$ctag = $users ? $this->so->get_ctag($users, $filter == 'owner', $master_only) : 0; // no rights, return 0 as ctag (otherwise we get SQL error!)
 
-		if ($this->debug > 1) error_log(__METHOD__. "($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		if ($this->debug > 1) error_log(__METHOD__."($user, '$filter', $master_only) = $ctag = ".date('Y-m-d H:i:s', $ctag)." took ".(microtime(true) - $startime)." secs");
 		return $ctag;
 	}
 
@@ -2195,7 +2193,7 @@ 
 
 		$content = array(
 			'info_cat'       => $GLOBALS['egw']->categories->check_list(Acl::READ, $calendar['category']),
-			'info_priority'  => $calendar['priority'] ,
+			'info_priority'  => $calendar['priority'],
 			'info_public'    => $calendar['public'] != 'private',
 			'info_subject'   => $calendar['title'],
 			'info_des'       => $calendar['description'],
@@ -2210,7 +2208,7 @@ 
 		$content['link_app'][] = $calendar['info_link']['app'];
 		$content['link_id'][]  = $calendar['info_link']['id'];
 		// Copy claendar's links
-		foreach(Link::get_links('calendar',$calendar['id'],'','link_lastmod DESC',true) as $link)
+		foreach (Link::get_links('calendar', $calendar['id'], '', 'link_lastmod DESC', true) as $link)
 		{
 			if ($link['app'] != Link::VFS_APPNAME)
 			{
@@ -2223,7 +2221,7 @@ 
 			}
 		}
 		// Copy same custom fields
-		foreach(array_keys(Api\Storage\Customfields::get('infolog')) as $name)
+		foreach (array_keys(Api\Storage\Customfields::get('infolog')) as $name)
 		{
 			if ($this->customfields[$name]) $content['#'.$name] = $calendar['#'.$name];
 		}
@@ -2241,20 +2239,20 @@ 
 	function timesheet_set($data)
 	{
 		$set = array();
-		list($id,$recurrence) = explode(':',$data['id']);
-		if ((int)$id && ($event = $this->read($id,$recurrence)))
+		list($id, $recurrence) = explode(':', $data['id']);
+		if ((int)$id && ($event = $this->read($id, $recurrence)))
 		{
 			$set['ts_start'] = $event['start'];
 			$set['ts_title'] = $this->link_title($event);
-			$set['start_time'] = Api\DateTime::to($event['start'],'H:i');
+			$set['start_time'] = Api\DateTime::to($event['start'], 'H:i');
 			$set['ts_description'] = $event['description'];
-			if ($this->isWholeDay($event)) $event['end']++;	// whole day events are 1sec short
+			if ($this->isWholeDay($event)) $event['end']++; // whole day events are 1sec short
 			$set['ts_duration']	= ($event['end'] - $event['start']) / 60;
 			$set['ts_quantity'] = ($event['end'] - $event['start']) / 3600;
-			$set['end_time'] = null;	// unset end-time
+			$set['end_time'] = null; // unset end-time
 			$set['cat_id'] = (int)$event['category'];
 
-			foreach(Link::get_links('calendar',$id,'','link_lastmod DESC',true) as $link)
+			foreach (Link::get_links('calendar', $id, '', 'link_lastmod DESC', true) as $link)
 			{
 				if ($link['app'] != 'timesheet' && $link['app'] != Link::VFS_APPNAME)
 				{