EGroupware / egroupware

calendar/inc/class.calendar_so.inc.php

Spacing +391 added lines, -394 removed lines

@@ -19,40 +19,40 @@ 
 /**
  * some necessary defines used by the calendar
  */
-if(!extension_loaded('mcal'))
+if (!extension_loaded('mcal'))
 {
-	define('MCAL_RECUR_NONE',0);
-	define('MCAL_RECUR_DAILY',1);
-	define('MCAL_RECUR_WEEKLY',2);
-	define('MCAL_RECUR_MONTHLY_MDAY',3);
-	define('MCAL_RECUR_MONTHLY_WDAY',4);
-	define('MCAL_RECUR_YEARLY',5);
-	define('MCAL_RECUR_SECONDLY',6);
-	define('MCAL_RECUR_MINUTELY',7);
-	define('MCAL_RECUR_HOURLY',8);
-
-	define('MCAL_M_SUNDAY',1);
-	define('MCAL_M_MONDAY',2);
-	define('MCAL_M_TUESDAY',4);
-	define('MCAL_M_WEDNESDAY',8);
-	define('MCAL_M_THURSDAY',16);
-	define('MCAL_M_FRIDAY',32);
-	define('MCAL_M_SATURDAY',64);
-
-	define('MCAL_M_WEEKDAYS',62);
-	define('MCAL_M_WEEKEND',65);
-	define('MCAL_M_ALLDAYS',127);
+	define('MCAL_RECUR_NONE', 0);
+	define('MCAL_RECUR_DAILY', 1);
+	define('MCAL_RECUR_WEEKLY', 2);
+	define('MCAL_RECUR_MONTHLY_MDAY', 3);
+	define('MCAL_RECUR_MONTHLY_WDAY', 4);
+	define('MCAL_RECUR_YEARLY', 5);
+	define('MCAL_RECUR_SECONDLY', 6);
+	define('MCAL_RECUR_MINUTELY', 7);
+	define('MCAL_RECUR_HOURLY', 8);
+
+	define('MCAL_M_SUNDAY', 1);
+	define('MCAL_M_MONDAY', 2);
+	define('MCAL_M_TUESDAY', 4);
+	define('MCAL_M_WEDNESDAY', 8);
+	define('MCAL_M_THURSDAY', 16);
+	define('MCAL_M_FRIDAY', 32);
+	define('MCAL_M_SATURDAY', 64);
+
+	define('MCAL_M_WEEKDAYS', 62);
+	define('MCAL_M_WEEKEND', 65);
+	define('MCAL_M_ALLDAYS', 127);
 }
 
-define('REJECTED',0);
-define('NO_RESPONSE',1);
-define('TENTATIVE',2);
-define('ACCEPTED',3);
-define('DELEGATED',4);
+define('REJECTED', 0);
+define('NO_RESPONSE', 1);
+define('TENTATIVE', 2);
+define('ACCEPTED', 3);
+define('DELEGATED', 4);
 
-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);
 
 /**
  * Class to store all calendar data (storage object)
@@ -100,7 +100,7 @@ 
 	 * name of the main calendar table and prefix for all other calendar tables
 	 */
 	var $cal_table = 'egw_cal';
-	var $extra_table,$repeats_table,$user_table,$dates_table,$all_tables;
+	var $extra_table, $repeats_table, $user_table, $dates_table, $all_tables;
 
 	/**
 	 * reference to global db-object
@@ -136,7 +136,7 @@ 
 		$this->db = $GLOBALS['egw']->db;
 
 		$this->all_tables = array($this->cal_table);
-		foreach(array('extra','repeats','user','dates') as $name)
+		foreach (array('extra', 'repeats', 'user', 'dates') as $name)
 		{
 			$vname = $name.'_table';
 			$this->all_tables[] = $this->$vname = $this->cal_table.'_'.$name;
@@ -152,11 +152,11 @@ 
 	 * @param boolean $deleted =false
 	 * @return string
 	 */
-	protected function cal_range_view($start, $end, array $_where=null, $deleted=false)
+	protected function cal_range_view($start, $end, array $_where = null, $deleted = false)
 	{
 		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)	// using view without start-date is slower!
 		{
-			return $this->cal_table;	// no need / use for a view
+			return $this->cal_table; // no need / use for a view
 		}
 
 		$where = array();
@@ -182,11 +182,11 @@ 
 	 * @param boolean $deleted =false
 	 * @return string
 	 */
-	protected function dates_range_view($start, $end, array $_where=null, $deleted=false)
+	protected function dates_range_view($start, $end, array $_where = null, $deleted = false)
 	{
 		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)	// using view without start- AND end-date is slower!
 		{
-			return $this->dates_table;	// no need / use for a view
+			return $this->dates_table; // no need / use for a view
 		}
 
 		$where = array();
@@ -231,14 +231,14 @@ 
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return array of events
 	 */
-	function &events($start,$end,$users,$cat_id=0,$filter='all',$offset=False,$num_rows=0,array $params=array(),$remove_rejected_by_user=null)
+	function &events($start, $end, $users, $cat_id = 0, $filter = 'all', $offset = False, $num_rows = 0, array $params = array(), $remove_rejected_by_user = null)
 	{
-		error_log(__METHOD__.'('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
+		error_log(__METHOD__.'('.($start ? date('Y-m-d H:i', $start) : '').','.($end ? date('Y-m-d H:i', $end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
 		$start_time = microtime(true);
 		// not everything is supported by now
 		if (!$start || !$end || is_string($params['query']) ||
 			//in_array($filter,array('owner','deleted')) ||
-			$params['enum_recuring']===false)
+			$params['enum_recuring'] === false)
 		{
 			throw new Api\Exception\AssertionFailed("Unsupported value for parameters!");
 		}
@@ -265,7 +265,7 @@ 
 		{
 			// fix $users to also prefix system users and groups (with 'u')
 			if (!is_array($users)) $users = $users ? (array)$users : array();
-			foreach($users as &$uid)
+			foreach ($users as &$uid)
 			{
 				$user_type = $user_id = null;
 				self::split_user($uid, $user_type, $user_id, true);
@@ -286,7 +286,7 @@ 
 
 		if ($params['order'])	// only order if requested
 		{
-			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+			if (!preg_match('/^[a-z_ ,c]+$/i', $params['order'])) $params['order'] = 'cal_start'; // gard against SQL injection
 			$sql .= "\nORDER BY ".$params['order'];
 		}
 
@@ -295,8 +295,8 @@ 
 			$offset = 0;
 			$num_rows = -1;
 		}
-		$events =& $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
-		error_log(__METHOD__."(...) $sql --> ".number_format(microtime(true)-$start_time, 3));
+		$events = & $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
+		error_log(__METHOD__."(...) $sql --> ".number_format(microtime(true) - $start_time, 3));
 		return $events;
 	}
 
@@ -309,12 +309,12 @@ 
 	 * @param int $recur_date =0 if set read the next recurrence at or after the timestamp, default 0 = read the initital one
 	 * @return array|boolean array with cal_id => event array pairs or false if entry not found
 	 */
-	function read($ids,$recur_date=0)
+	function read($ids, $recur_date = 0)
 	{
 		//error_log(__METHOD__.'('.array2string($ids).",$recur_date) ".function_backtrace());
 		$cols = self::get_columns('calendar', $this->cal_table);
 		$cols[0] = $this->db->to_varchar($this->cal_table.'.cal_id');
-		$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".implode(',',$cols);
+		$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".implode(',', $cols);
 		$join = "LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id";
 
 		$where = array();
@@ -324,23 +324,23 @@ 
 			$where['cal_uid'] = $ids;
 			$where['cal_reference'] = 0;
 		}
-		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))	// one or more cal_id's
+		elseif (is_array($ids) && isset($ids[count($ids) - 1]) || is_scalar($ids))	// one or more cal_id's
 		{
 			$where['cal_id'] = $ids;
 		}
 		else	// array with column => value pairs
 		{
 			$where = $ids;
-			unset($ids);	// otherwise users get not read!
+			unset($ids); // otherwise users get not read!
 		}
 		if (isset($where['cal_id']))	// prevent non-unique column-name cal_id
 		{
-			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.',array(
+			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.', array(
 				'cal_id' => $where['cal_id'],
 			));
 			unset($where['cal_id']);
 		}
-		if ((int) $recur_date)
+		if ((int)$recur_date)
 		{
 			$where[] = 'cal_start >= '.(int)$recur_date;
 			$group_by = 'GROUP BY '.$cols;
@@ -353,7 +353,7 @@ 
 		}
 		$cols .= ',range_end-1 AS recur_enddate';
 
-		$events =& $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date);
+		$events = & $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date);
 
 		return $events ? $events : false;
 	}
@@ -365,7 +365,7 @@ 
 	 * @param int $recur_date =0
 	 * @return array
 	 */
-	protected function &get_events($rs, $recur_date=0)
+	protected function &get_events($rs, $recur_date = 0)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
@@ -377,7 +377,7 @@ 
 		}
 
 		$events = array();
-		foreach($rs as $row)
+		foreach ($rs as $row)
 		{
 			if (!$row['recur_type'])
 			{
@@ -385,7 +385,7 @@ 
 				unset($row['recur_enddate']);
 			}
 			$row['recur_exception'] = $row['alarm'] = array();
-			$events[$row['cal_id']] = Api\Db::strip_array_keys($row,'cal_');
+			$events[$row['cal_id']] = Api\Db::strip_array_keys($row, 'cal_');
 		}
 		if (!$events) return $events;
 
@@ -397,26 +397,26 @@ 
 			if (!isset($event['uid']) || strlen($event['uid']) < $minimum_uid_length)
 			{
 				// event (without uid), not strong enough uid => create new uid
-				$event['uid'] = Api\CalDAV::generate_uid('calendar',$event['id']);
+				$event['uid'] = Api\CalDAV::generate_uid('calendar', $event['id']);
 				$this->db->update($this->cal_table, array('cal_uid' => $event['uid']),
-					array('cal_id' => $event['id']),__LINE__,__FILE__,'calendar');
+					array('cal_id' => $event['id']), __LINE__, __FILE__, 'calendar');
 			}
 			if (!(int)$recur_date && $event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $ids,
 					'recur_exception' => true,
 				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_start', 'calendar') as $row)
 				{
 					$events[$row['cal_id']]['recur_exception'][] = $row['cal_start'];
 				}
-				break;	// as above select read all exceptions (and I dont think too short uid problem still exists)
+				break; // as above select read all exceptions (and I dont think too short uid problem still exists)
 			}
 			// make sure we fetch only real exceptions (deleted occurrences of a series should not show up)
-			if (($recur_date &&	$event['recur_type'] != MCAL_RECUR_NONE))
+			if (($recur_date && $event['recur_type'] != MCAL_RECUR_NONE))
 			{
 				//_debug_array(__METHOD__.__LINE__.' recur_date:'.$recur_date.' check cal_start:'.$event['start']);
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $event['id'],
 					'cal_start' => $event['start'],
 					'recur_exception' => true,
@@ -432,7 +432,7 @@ 
 						'cal_deleted' => NULL
 					), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn())
 					{
-						$e = $this->read($event['id'],$event['start']+1);
+						$e = $this->read($event['id'], $event['start'] + 1);
 						$event = $e[$event['id']];
 						break;
 					}
@@ -454,21 +454,21 @@ 
 			if ($recur_date)
 			{
 				// also remember recur_date, maybe we need it later, duno now
-				$recur_date = array(0,$events[$ids]['recur_date'] = $events[$ids]['start']);
+				$recur_date = array(0, $events[$ids]['recur_date'] = $events[$ids]['start']);
 			}
 		}
 
 		// participants, if a recur_date give, we read that recurance, plus the one users from the default entry with recur_date=0
 		// sorting by cal_recur_date ASC makes sure recurence status always overwrites series status
-		foreach($this->db->select($this->user_table,'*',array(
+		foreach ($this->db->select($this->user_table, '*', array(
 			'cal_id'      => $ids,
 			'cal_recur_date' => $recur_date,
 			"cal_status NOT IN ('X','E')",
-		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)	// DESC puts users before resources and contacts
+		), __LINE__, __FILE__, false, 'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT, 'calendar') as $row)	// DESC puts users before resources and contacts
 		{
 			// combine all participant data in uid and status values
 			$uid    = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
-			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+			$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 
 			$events[$row['cal_id']]['participants'][$uid] = $status;
 			$events[$row['cal_id']]['participant_types'][$row['cal_user_type']][is_numeric($uid) ? $uid : substr($uid, 1)] = $status;
@@ -477,7 +477,7 @@ 
 		}
 
 		// custom fields
-		foreach($this->db->select($this->extra_table,'*',array('cal_id'=>$ids),__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->extra_table, '*', array('cal_id'=>$ids), __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			$events[$row['cal_id']]['#'.$row['cal_extra_name']] = $row['cal_extra_value'];
 		}
@@ -485,7 +485,7 @@ 
 		// alarms
 		if (is_array($ids))
 		{
-			foreach($this->read_alarms((array)$ids) as $cal_id => $alarms)
+			foreach ($this->read_alarms((array)$ids) as $cal_id => $alarms)
 			{
 				$events[$cal_id]['alarm'] = $alarms;
 			}
@@ -514,11 +514,11 @@ 
 	 * @param boolean $master_only =false only check recurance master (egw_cal_user.recur_date=0)
 	 * @return int maximum modification timestamp
 	 */
-	function get_ctag($users, $owner_too=false,$master_only=false)
+	function get_ctag($users, $owner_too = false, $master_only = false)
 	{
-		static $ctags = array();	// some per-request caching
+		static $ctags = array(); // some per-request caching
 		static $last_request = null;
-		if (!isset($last_request) || time()-$last_request > self::MAX_CTAG_CACHE_TIME)
+		if (!isset($last_request) || time() - $last_request > self::MAX_CTAG_CACHE_TIME)
 		{
 			$ctags = array();
 			$last_request = time();
@@ -527,13 +527,13 @@ 
 		if (isset($ctags[$signature])) return $ctags[$signature];
 
 		$types = array();
-		foreach((array)$users as $uid)
+		foreach ((array)$users as $uid)
 		{
 			$type = $id = null;
 			self::split_user($uid, $type, $id, true);
 			$types[$type][] = $id;
 		}
-		foreach($types as $type => $ids)
+		foreach ($types as $type => $ids)
 		{
 			$where = array(
 				'cal_user_type' => $type,
@@ -555,17 +555,17 @@ 
 		if ($owner_too)
 		{
 			// owner can only by users, no groups or resources
-			foreach($users as $key => $user)
+			foreach ($users as $key => $user)
 			{
 				if (!($user > 0)) unset($users[$key]);
 			}
 			$where = $this->db->expression($this->user_table, '(', $where, ' OR ').
 				$this->db->expression($this->cal_table, array(
 					'cal_owner' => $users,
-				),')');
+				), ')');
 		}
-		return $ctags[$signature] = $this->db->select($this->user_table,'MAX(cal_modified)',
-			$where,__LINE__,__FILE__,false,'','calendar',0,'JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id')->fetchColumn();
+		return $ctags[$signature] = $this->db->select($this->user_table, 'MAX(cal_modified)',
+			$where, __LINE__, __FILE__, false, '', 'calendar', 0, 'JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id')->fetchColumn();
 	}
 
 	/**
@@ -577,7 +577,7 @@ 
 	 * @param string|array $cols ='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified' cols to query
 	 * @return Iterator as Api\Db::select
 	 */
-	function get_cal_data(array $query, $cols='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
+	function get_cal_data(array $query, $cols = 'cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
 	{
 		if (!is_array($cols)) $cols = explode(',', $cols);
 
@@ -603,12 +603,12 @@ 
 		if ($cat_id)
 		{
 			$cats = $GLOBALS['egw']->categories->return_all_children($cat_id);
-			array_walk($cats,create_function('&$val,$key','$val = (int) $val;'));
-			if (is_array($cat_id) && count($cat_id)==1) $cat_id = $cat_id[0];
-			$sql = '(cal_category'.(count($cats) > 1 ? " IN ('".implode("','",$cats)."')" : '='.$this->db->quote((int)$cat_id));
-			foreach($cats as $cat)
+			array_walk($cats, create_function('&$val,$key', '$val = (int) $val;'));
+			if (is_array($cat_id) && count($cat_id) == 1) $cat_id = $cat_id[0];
+			$sql = '(cal_category'.(count($cats) > 1 ? " IN ('".implode("','", $cats)."')" : '='.$this->db->quote((int)$cat_id));
+			foreach ($cats as $cat)
 			{
-				$sql .= ' OR '.$this->db->concat("','",'cal_category',"','").' LIKE '.$this->db->quote('%,'.$cat.',%');
+				$sql .= ' OR '.$this->db->concat("','", 'cal_category', "','").' LIKE '.$this->db->quote('%,'.$cat.',%');
 			}
 			$sql .= ') ';
 		}
@@ -623,13 +623,13 @@ 
 	 * @param array $where =array() array to add filters too
 	 * @return array
 	 */
-	protected function status_filter($filter, $enum_recuring=true, array $where=array())
+	protected function status_filter($filter, $enum_recuring = true, array $where = array())
 	{
-		if($filter != 'deleted' && $filter != 'everything')
+		if ($filter != 'deleted' && $filter != 'everything')
 		{
 			$where[] = 'cal_deleted IS NULL';
 		}
-		switch($filter)
+		switch ($filter)
 		{
 			case 'everything':	// no filter at all
 				break;
@@ -703,7 +703,7 @@ 
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return Iterator|array of events
 	 */
-	function &search($start,$end,$users,$cat_id=0,$filter='all',$offset=False,$num_rows=0,array $params=array(),$remove_rejected_by_user=null)
+	function &search($start, $end, $users, $cat_id = 0, $filter = 'all', $offset = False, $num_rows = 0, array $params = array(), $remove_rejected_by_user = null)
 	{
 		//error_log(__METHOD__.'('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
 
@@ -726,7 +726,7 @@ 
 		{
 			$all_cols = self::get_columns('calendar', $this->cal_table);
 			$all_cols[0] = $this->db->to_varchar($this->cal_table.'.cal_id');
-			$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,range_end - 1 AS recur_enddate,".implode(',',$all_cols).",cal_start,cal_end,$this->user_table.cal_recur_date";
+			$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,range_end - 1 AS recur_enddate,".implode(',', $all_cols).",cal_start,cal_end,$this->user_table.cal_recur_date";
 		}
 		$where = array();
 		if (is_array($params['query']))
@@ -735,26 +735,26 @@ 
 		}
 		elseif ($params['query'])
 		{
-			if(is_numeric($params['query']))
+			if (is_numeric($params['query']))
 			{
-				$where[] = $this->cal_table.'.cal_id = ' . (int)$params['query'];
+				$where[] = $this->cal_table.'.cal_id = '.(int)$params['query'];
 			}
 			else
 			{
-				foreach(array('cal_title','cal_description','cal_location') as $col)
+				foreach (array('cal_title', 'cal_description', 'cal_location') as $col)
 				{
 					$to_or[] = $col.' '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%'.$params['query'].'%');
 				}
-				$where[] = '('.implode(' OR ',$to_or).')';
+				$where[] = '('.implode(' OR ', $to_or).')';
 			}
 
 			// Searching - restrict private to own or private grant
 			if (!isset($params['private_grants']))
 			{
 				$params['private_grants'] = $GLOBALS['egw']->acl->get_ids_for_location($GLOBALS['egw_info']['user']['account_id'], Acl::PRIVAT, 'calendar');
-				$params['private_grants'][] = $GLOBALS['egw_info']['user']['account_id'];	// db query does NOT return current user
+				$params['private_grants'][] = $GLOBALS['egw_info']['user']['account_id']; // db query does NOT return current user
 			}
-			$private_filter = '(cal_public=1 OR cal_public=0 AND '.$this->db->expression($this->cal_table, array('cal_owner' => $params['private_grants'])) . ')';
+			$private_filter = '(cal_public=1 OR cal_public=0 AND '.$this->db->expression($this->cal_table, array('cal_owner' => $params['private_grants'])).')';
 			$where[] = $private_filter;
 		}
 		if (!empty($params['sql_filter']))
@@ -763,7 +763,7 @@ 
 			{
 				$where[] = $params['sql_filter'];
 			}
-			elseif(is_array($params['sql_filter']))
+			elseif (is_array($params['sql_filter']))
 			{
 				$where = array_merge($where, $params['sql_filter']);
 			}
@@ -772,11 +772,11 @@ 
 		if ($users)
 		{
 			$users_by_type = array();
-			foreach((array)$users as $user)
+			foreach ((array)$users as $user)
 			{
 				if (is_numeric($user))
 				{
-					$users_by_type['u'][] = (int) $user;
+					$users_by_type['u'][] = (int)$user;
 				}
 				else
 				{
@@ -787,45 +787,45 @@ 
 			}
 			$to_or = $user_or = array();
 			$owner_or = null;
-			$table_def = $this->db->get_table_definitions('calendar',$this->user_table);
-			foreach($users_by_type as $type => $ids)
+			$table_def = $this->db->get_table_definitions('calendar', $this->user_table);
+			foreach ($users_by_type as $type => $ids)
 			{
 				// when we are able to use Union Querys, we do not OR our query, we save the needed parts for later construction of the union
 				if ($useUnionQuery)
 				{
-					$user_or[] = $this->db->expression($table_def,$this->user_table.'.',array(
+					$user_or[] = $this->db->expression($table_def, $this->user_table.'.', array(
 						'cal_user_type' => $type,
-					),' AND '.$this->user_table.'.',array(
+					), ' AND '.$this->user_table.'.', array(
 						'cal_user_id'   => $ids,
 					));
 					if ($type == 'u' && $filter == 'owner')
 					{
-						$cal_table_def = $this->db->get_table_definitions('calendar',$this->cal_table);
+						$cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table);
 						// only users can be owners, no need to add groups
 						$user_ids = array();
-						foreach($ids as $user_id)
+						foreach ($ids as $user_id)
 						{
 							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u') $user_ids[] = $user_id;
 						}
-						$owner_or = $this->db->expression($cal_table_def,array('cal_owner' => $user_ids));
+						$owner_or = $this->db->expression($cal_table_def, array('cal_owner' => $user_ids));
 					}
 				}
 				else
 				{
-					$to_or[] = $this->db->expression($table_def,$this->user_table.'.',array(
+					$to_or[] = $this->db->expression($table_def, $this->user_table.'.', array(
 						'cal_user_type' => $type,
-					),' AND '.$this->user_table.'.',array(
+					), ' AND '.$this->user_table.'.', array(
 						'cal_user_id'   => $ids,
 					));
 					if ($type == 'u' && $filter == 'owner')
 					{
-						$cal_table_def = $this->db->get_table_definitions('calendar',$this->cal_table);
-						$to_or[] = $this->db->expression($cal_table_def,array('cal_owner' => $ids));
+						$cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table);
+						$to_or[] = $this->db->expression($cal_table_def, array('cal_owner' => $ids));
 					}
 				}
 			}
 			// this is only used, when we cannot use UNIONS
-			if (!$useUnionQuery) $where[] = '('.implode(' OR ',$to_or).')';
+			if (!$useUnionQuery) $where[] = '('.implode(' OR ', $to_or).')';
 
 			$where = $this->status_filter($filter, $params['enum_recuring'], $where);
 		}
@@ -844,15 +844,15 @@ 
 				$where[] = '('.((int)$start).' < range_end OR range_end IS NULL)';
 			}
 		}
-		if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+		if (!preg_match('/^[a-z_ ,c]+$/i', $params['order'])) $params['order'] = 'cal_start'; // gard against SQL injection
 
 		// if not enum recuring events, we have to use minimum start- AND end-dates, otherwise we get more then one event per cal_id!
 		if (!$params['enum_recuring'])
 		{
 			$where[] = "$this->user_table.cal_recur_date=0";
-			$cols = str_replace(array('cal_start','cal_end'),array('range_start AS cal_start','(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id) AS cal_end'),$cols);
+			$cols = str_replace(array('cal_start', 'cal_end'), array('range_start AS cal_start', '(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id) AS cal_end'), $cols);
 			// in case cal_start is used in a query, eg. calendar_ical::find_event
-			$where = str_replace(array('cal_start','cal_end'), array('range_start','(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id)'), $where);
+			$where = str_replace(array('cal_start', 'cal_end'), array('range_start', '(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id)'), $where);
 			$params['order'] = str_replace('cal_start', 'range_start', $params['order']);
 			if ($end) $where[] = (int)$end.' > range_start';
   		}
@@ -864,14 +864,13 @@ 
 				" ON $this->cal_table.cal_id=rejected_by_user.cal_id".
 				" AND rejected_by_user.cal_user_type='u'".
 				" AND rejected_by_user.cal_user_id=".$this->db->quote($remove_rejected_by_user).
-				" AND ".(!$params['enum_recuring'] ? 'rejected_by_user.cal_recur_date=0' :
-					'(recur_type IS NULL AND rejected_by_user.cal_recur_date=0 OR cal_start=rejected_by_user.cal_recur_date)');
+				" AND ".(!$params['enum_recuring'] ? 'rejected_by_user.cal_recur_date=0' : '(recur_type IS NULL AND rejected_by_user.cal_recur_date=0 OR cal_start=rejected_by_user.cal_recur_date)');
 			$or_required = array(
 				'rejected_by_user.cal_status IS NULL',
 				"rejected_by_user.cal_status NOT IN ('R','X')",
 			);
 			if ($filter == 'owner') $or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
-			$where[] = '('.implode(' OR ',$or_required).')';
+			$where[] = '('.implode(' OR ', $or_required).')';
 		}
 		// using a time-range and deleted attribute limited view instead of full table
 		$cal_table = $this->cal_range_view($start, $end, null, $filter == 'everything' ? null : $filter != 'deleted');
@@ -883,18 +882,18 @@ 
 		// dates table join only needed to enum recuring events, we use a time-range limited view here too
 		if ($params['enum_recuring'])
 		{
-			$join = "JOIN ".$this->dates_table.	// using dates_table direct seems quicker then an other view
+			$join = "JOIN ".$this->dates_table.// using dates_table direct seems quicker then an other view
 				//$this->dates_range_view($start, $end, null, $filter == 'everything' ? null : $filter == 'deleted').
 				" ON $this->cal_table.cal_id=$this->dates_table.cal_id ".$join;
 		}
 
 		// Check for some special sorting, used by planner views
-		if($params['order'] == 'participants , cal_non_blocking DESC')
+		if ($params['order'] == 'participants , cal_non_blocking DESC')
 		{
 			$order = ($GLOBALS['egw_info']['user']['preferences']['common']['account_display'] == 'lastname' ? 'n_family' : 'n_fileas');
 			$cols .= ",egw_addressbook.{$order}";
 			$join .= "LEFT JOIN egw_addressbook ON ".
-					($this->db->Type == 'pgsql'? "egw_addressbook.account_id::varchar = ":"egw_addressbook.account_id = ").
+					($this->db->Type == 'pgsql' ? "egw_addressbook.account_id::varchar = " : "egw_addressbook.account_id = ").
 					"{$this->user_table}.cal_user_id";
 			$params['order'] = "$order, cal_non_blocking DESC";
 		}
@@ -927,29 +926,29 @@ 
 			// as replace the OR by construction of a suitable UNION for performance reasons
 			if ($owner_or || $user_or)
 			{
-				foreach($user_or as $user_sql)
+				foreach ($user_or as $user_sql)
 				{
 					$selects[] = $select;
-					$selects[count($selects)-1]['where'][] = $user_sql;
+					$selects[count($selects) - 1]['where'][] = $user_sql;
 					if ($params['enum_recuring'])
 					{
-						$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
+						$selects[count($selects) - 1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
 						$selects[] = $select;
-						$selects[count($selects)-1]['where'][] = $user_sql;
-						$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
+						$selects[count($selects) - 1]['where'][] = $user_sql;
+						$selects[count($selects) - 1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 					}
 				}
 				// if the query is to be filtered by owner we need to add more selects for the union
 				if ($owner_or)
 				{
 					$selects[] = $select;
-					$selects[count($selects)-1]['where'][] = $owner_or;
+					$selects[count($selects) - 1]['where'][] = $owner_or;
 					if ($params['enum_recuring'])
 					{
-						$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
+						$selects[count($selects) - 1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
 						$selects[] = $select;
-						$selects[count($selects)-1]['where'][] = $owner_or;
-						$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
+						$selects[count($selects) - 1]['where'][] = $owner_or;
+						$selects[count($selects) - 1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 					}
 				}
 			}
@@ -959,34 +958,34 @@ 
 				$selects[] = $select;
 				if ($params['enum_recuring'])
 				{
-					$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
+					$selects[count($selects) - 1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
 					$selects[] = $select;
-					$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
+					$selects[count($selects) - 1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 				}
 			}
 			if (is_numeric($offset) && !$params['no_total'])	// get the total too
 			{
 				$save_selects = $selects;
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
-				foreach(array_keys($selects) as $key)
+				foreach (array_keys($selects) as $key)
 				{
 					$selects[$key]['cols'] = "$this->repeats_table.recur_type,range_end AS recur_enddate,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".$this->db->to_varchar($this->cal_table.'.cal_id').",cal_start,cal_end,$this->user_table.cal_recur_date";
 					if (!$params['enum_recuring'])
 					{
-						$selects[$key]['cols'] = str_replace(array('cal_start','cal_end'),
-							array('range_start AS cal_start','range_end AS cal_end'), $selects[$key]['cols']);
+						$selects[$key]['cols'] = str_replace(array('cal_start', 'cal_end'),
+							array('range_start AS cal_start', 'range_end AS cal_end'), $selects[$key]['cols']);
 					}
 				}
-				if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 
-				$this->total = $this->db->union($selects,__LINE__,__FILE__)->NumRows();
+				$this->total = $this->db->union($selects, __LINE__, __FILE__)->NumRows();
 
 				// restore original cols / selects
 				$selects = $save_selects; unset($save_selects);
 			}
-			if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+			if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 
-			$rs = $this->db->union($selects,__LINE__,__FILE__,$params['order'],$offset,$num_rows);
+			$rs = $this->db->union($selects, __LINE__, __FILE__, $params['order'], $offset, $num_rows);
 		}
 		else	// MsSQL oder MySQL 3.23
 		{
@@ -1009,27 +1008,27 @@ 
 				$selects[0]['cols'] = "$this->cal_table.cal_id,cal_start";
 				if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
 				{
-					self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+					self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 				}
 				$this->total = $this->db->union($selects, __LINE__, __FILE__)->NumRows();
 				$selects = $save_selects;
 			}
 			if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
 			{
-				self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 			}
-			$rs = $this->db->union($selects,__LINE__,__FILE__,$params['order'],$offset,$num_rows);
+			$rs = $this->db->union($selects, __LINE__, __FILE__, $params['order'], $offset, $num_rows);
 		}
 		//error_log(__METHOD__."() useUnionQuery=$useUnionQuery --> query took ".(microtime(true)-$starttime).'s '.$rs->sql);
 
 		if (isset($params['cols']))
 		{
-			return $rs;	// if colums are specified we return the recordset / iterator
+			return $rs; // if colums are specified we return the recordset / iterator
 		}
 		// Todo: return $this->get_events($rs);
 
 		$events = $ids = $recur_dates = $recur_ids = array();
-		foreach($rs as $row)
+		foreach ($rs as $row)
 		{
 			$id = $row['cal_id'];
 			if (is_numeric($id)) $ids[] = $id;
@@ -1041,9 +1040,9 @@ 
 			}
 			if ($row['participants'])
 			{
-				$row['participants'] = explode(',',$row['participants']);
+				$row['participants'] = explode(',', $row['participants']);
 				$row['participants'] = array_combine($row['participants'],
-					array_fill(0,count($row['participants']),''));
+					array_fill(0, count($row['participants']), ''));
 			}
 			else
 			{
@@ -1052,9 +1051,9 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 
 			// compile a list of recurrences per cal_id
-			if (!in_array($id,(array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
+			if (!in_array($id, (array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
 
-			$events[$id] = Api\Db::strip_array_keys($row,'cal_');
+			$events[$id] = Api\Db::strip_array_keys($row, 'cal_');
 		}
 		//_debug_array($events);
 		if (count($ids))
@@ -1064,26 +1063,26 @@ 
 			// now ready all users with the given cal_id AND (cal_recur_date=0 or the fitting recur-date)
 			// This will always read the first entry of each recuring event too, we eliminate it later
 			$recur_dates[] = 0;
-			$utcal_id_view = " (SELECT * FROM ".$this->user_table." WHERE cal_id IN (".implode(',',$ids).")".
+			$utcal_id_view = " (SELECT * FROM ".$this->user_table." WHERE cal_id IN (".implode(',', $ids).")".
 				($filter != 'everything' ? " AND cal_status NOT IN ('X','E')" : '').") utcalid ";
 			//$utrecurdate_view = " (select * from ".$this->user_table." where cal_recur_date in (".implode(',',array_unique($recur_dates)).")) utrecurdates ";
-			foreach($this->db->select($utcal_id_view,'*',array(
+			foreach ($this->db->select($utcal_id_view, '*', array(
 					//'cal_id' => array_unique($ids),
 					'cal_recur_date' => $recur_dates,
-				),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT,'calendar',-1,$join='',
-				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)	// DESC puts users before resources and contacts
+				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT, 'calendar', -1, $join = '',
+				$this->db->get_table_definitions('calendar', $this->user_table)) as $row)	// DESC puts users before resources and contacts
 			{
 				$id = $row['cal_id'];
 				if ($row['cal_recur_date']) $id .= '-'.$row['cal_recur_date'];
 
 				// combine all participant data in uid and status values
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
-				$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+				$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 
 				// set accept/reject/tentative of series for all recurrences
 				if (!$row['cal_recur_date'])
 				{
-					foreach((array)$recur_ids[$row['cal_id']] as $i)
+					foreach ((array)$recur_ids[$row['cal_id']] as $i)
 					{
 						if (isset($events[$i]) && !isset($events[$i]['participants'][$uid]))
 						{
@@ -1098,16 +1097,16 @@ 
 			// query recurrance exceptions, if needed: enum_recuring && !daywise is used in calendar_groupdav::get_series($uid,...)
 			if (!$params['enum_recuring'] || !$params['daywise'])
 			{
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $ids,
 					'recur_exception' => true,
 				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_start', 'calendar') as $row)
 				{
 					// for enum_recurring events are not indexed by cal_id, but $cal_id.'-'.$cal_start
 					// find master, which is first recurrence
-					if (!isset($events[$id=$row['cal_id']]))
+					if (!isset($events[$id = $row['cal_id']]))
 					{
-						foreach($events as $id => $event)
+						foreach ($events as $id => $event)
 						{
 							if ($event['id'] == $row['cal_id']) break;
 						}
@@ -1120,10 +1119,10 @@ 
 			{
 				$where = array('cal_id' => $ids);
 				if ($params['cfs']) $where['cal_extra_name'] = $params['cfs'];
-				foreach($this->db->select($this->extra_table,'*',$where,
-					__LINE__,__FILE__,false,'','calendar') as $row)
+				foreach ($this->db->select($this->extra_table, '*', $where,
+					__LINE__, __FILE__, false, '', 'calendar') as $row)
 				{
-					foreach((array)$recur_ids[$row['cal_id']] as $id)
+					foreach ((array)$recur_ids[$row['cal_id']] as $id)
 					{
 						if (isset($events[$id]))
 						{
@@ -1133,9 +1132,9 @@ 
 				}
 			}
 			// alarms
-			foreach($this->read_alarms($ids) as $cal_id => $alarms)
+			foreach ($this->read_alarms($ids) as $cal_id => $alarms)
 			{
-				foreach($alarms as $id => $alarm)
+				foreach ($alarms as $id => $alarm)
 				{
 					$event_start = $alarm['time'] + $alarm['offset'];
 
@@ -1172,16 +1171,16 @@ 
 	 * @param $query
 	 * @param $users_raw as passed to calendar_bo::search (no members and memberships added)
 	 */
-	private static function get_union_selects(array &$selects,$start,$end,$users,$cat_id,$filter,$query,$users_raw)
+	private static function get_union_selects(array &$selects, $start, $end, $users, $cat_id, $filter, $query, $users_raw)
 	{
-		if (in_array(basename($_SERVER['SCRIPT_FILENAME']),array('groupdav.php','rpc.php','xmlrpc.php','/activesync/index.php')) ||
-			!in_array($GLOBALS['egw_info']['flags']['currentapp'],array('calendar','home')))
+		if (in_array(basename($_SERVER['SCRIPT_FILENAME']), array('groupdav.php', 'rpc.php', 'xmlrpc.php', '/activesync/index.php')) ||
+			!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('calendar', 'home')))
 		{
-			return;    // disable integration for GroupDAV, SyncML, ...
+			return; // disable integration for GroupDAV, SyncML, ...
 		}
 		self::$integration_data = Api\Hooks::process(array(
 			'location' => 'calendar_search_union',
-			'cols'  => $selects[0]['cols'],    // cols to return
+			'cols'  => $selects[0]['cols'], // cols to return
 			'start' => $start,
 			'end'   => $end,
 			'users' => $users,
@@ -1190,12 +1189,12 @@ 
 			'filter'=> $filter,
 			'query' => $query,
 		));
-		foreach(self::$integration_data as $data)
+		foreach (self::$integration_data as $data)
 		{
 			if (is_array($data['selects']))
 			{
 				//echo $app; _debug_array($data);
-				$selects = array_merge($selects,$data['selects']);
+				$selects = array_merge($selects, $data['selects']);
 			}
 		}
 	}
@@ -1220,35 +1219,35 @@ 
 	 * @param string $required_app ='calendar'
 	 * @return string cols for union query to match ones supplied in $required
 	 */
-	public static function union_cols(array $app_cols,$required,$required_app='calendar')
+	public static function union_cols(array $app_cols, $required, $required_app = 'calendar')
 	{
 		// remove evtl. used DISTINCT, we currently dont need it
-		if (($distinct = substr($required,0,9) == 'DISTINCT '))
+		if (($distinct = substr($required, 0, 9) == 'DISTINCT '))
 		{
-			$required = substr($required,9);
+			$required = substr($required, 9);
 		}
 		$return_cols = array();
-		foreach(is_array($required) ? $required : explode(',',$required) as $cols)
+		foreach (is_array($required) ? $required : explode(',', $required) as $cols)
 		{
 			$matches = null;
-			if (substr($cols,-2) == '.*')
+			if (substr($cols, -2) == '.*')
 			{
-				$cols = self::get_columns($required_app,substr($cols,0,-2));
+				$cols = self::get_columns($required_app, substr($cols, 0, -2));
 			}
 			// remove CAST added for PostgreSQL from eg. "CAST(egw_cal.cal_id AS varchar)"
 			elseif (preg_match('/CAST\(([a-z0-9_.]+) AS [a-z0-9_]+\)/i', $cols, $matches))
 			{
 				$cols = $matches[1];
 			}
-			elseif (strpos($cols,' AS ') !== false)
+			elseif (strpos($cols, ' AS ') !== false)
 			{
-				list(,$cols) = explode(' AS ',$cols);
+				list(,$cols) = explode(' AS ', $cols);
 			}
-			foreach((array)$cols as $col)
+			foreach ((array)$cols as $col)
 			{
-				if (substr($col,0,7) == 'egw_cal')	// remove table name
+				if (substr($col, 0, 7) == 'egw_cal')	// remove table name
 				{
-					$col = preg_replace('/^egw_cal[a-z_]*\./','',$col);
+					$col = preg_replace('/^egw_cal[a-z_]*\./', '', $col);
 				}
 				if (isset($app_cols[$col]))
 				{
@@ -1261,7 +1260,7 @@ 
 			}
 		}
 		//error_log(__METHOD__."(".array2string($app_cols).", ".array2string($required).", '$required_app') returning ".array2string(implode(',',$return_cols)));
-		return implode(',',$return_cols);
+		return implode(',', $return_cols);
 	}
 
 	/**
@@ -1271,21 +1270,21 @@ 
 	 * @param string $table
 	 * @return array of column names
 	 */
-	static private function get_columns($app,$table)
+	static private function get_columns($app, $table)
 	{
 		if ($table != 'egw_cal')
 		{
-			$table_def = $GLOBALS['egw']->db->get_table_definitions($app,$table);
+			$table_def = $GLOBALS['egw']->db->get_table_definitions($app, $table);
 			$cols = array_keys($table_def['fd']);
 		}
 		else
 		{
 			// special handling for egw_cal, as old databases have a different column order!!!
-			$cols =& Api\Cache::getSession(__CLASS__,$table);
+			$cols = & Api\Cache::getSession(__CLASS__, $table);
 
 			if (is_null($cols))
 			{
-				$meta = $GLOBALS['egw']->db->metadata($table,true);
+				$meta = $GLOBALS['egw']->db->metadata($table, true);
 				$cols = array_keys($meta['meta']);
 			}
 		}
@@ -1338,12 +1337,12 @@ 
 	 * @param int &$etag etag=null etag to check or null, on return new etag
 	 * @return boolean|int false on error, 0 if etag does not match, cal_id otherwise
 	 */
-	function save($event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null)
+	function save($event, &$set_recurrences, &$set_recurrences_start = 0, $change_since = 0, &$etag = null)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-			if (empty($minimum_uid_length) || $minimum_uid_length<=1) $minimum_uid_length = 8; // we just do not accept no uid, or uid way to short!
+			if (empty($minimum_uid_length) || $minimum_uid_length <= 1) $minimum_uid_length = 8; // we just do not accept no uid, or uid way to short!
 		}
 		else
 		{
@@ -1354,7 +1353,7 @@ 
 
 		//error_log(__METHOD__.'('.array2string($event).",$set_recurrences,$change_since,$etag) ".function_backtrace());
 
-		$cal_id = (int) $event['id'];
+		$cal_id = (int)$event['id'];
 		unset($event['id']);
 		$set_recurrences = $set_recurrences || !$cal_id && $event['recur_type'] != MCAL_RECUR_NONE;
 
@@ -1365,9 +1364,9 @@ 
 		}
 
 		// add colum prefix 'cal_' if there's not already a 'recur_' prefix
-		foreach($event as $col => $val)
+		foreach ($event as $col => $val)
 		{
-			if ($col[0] != '#' && substr($col,0,6) != 'recur_' && substr($col,0,6) != 'range_' && $col != 'alarm' && $col != 'tz_id' && $col != 'caldav_name')
+			if ($col[0] != '#' && substr($col, 0, 6) != 'recur_' && substr($col, 0, 6) != 'range_' && $col != 'alarm' && $col != 'tz_id' && $col != 'caldav_name')
 			{
 				$event['cal_'.$col] = $val;
 				unset($event[$col]);
@@ -1377,13 +1376,12 @@ 
 		if (isset($event['cal_start'])) $event['range_start'] = $event['cal_start'];
 		if (isset($event['cal_end']))
 		{
-			$event['range_end'] = $event['recur_type'] == MCAL_RECUR_NONE ? $event['cal_end'] :
-				($event['recur_enddate'] ? $event['recur_enddate'] : null);
+			$event['range_end'] = $event['recur_type'] == MCAL_RECUR_NONE ? $event['cal_end'] : ($event['recur_enddate'] ? $event['recur_enddate'] : null);
 		}
 		// ensure that we find mathing entries later on
 		if (!is_array($event['cal_category']))
 		{
-			$categories = array_unique(explode(',',$event['cal_category']));
+			$categories = array_unique(explode(',', $event['cal_category']));
 			sort($categories);
 		}
 		else
@@ -1392,7 +1390,7 @@ 
 		}
 		sort($categories, SORT_NUMERIC);
 
-		$event['cal_category'] = implode(',',$categories);
+		$event['cal_category'] = implode(',', $categories);
 
 		// make sure recurring events never reference to an other recurrent event
 		if ($event['recur_type'] != MCAL_RECUR_NONE) $event['cal_reference'] = 0;
@@ -1410,18 +1408,18 @@ 
 			// read only timezone id, to check if it is changed
 			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$old_tz_id = $this->db->select($this->cal_table,'tz_id',$where,__LINE__,__FILE__,'calendar')->fetchColumn();
+				$old_tz_id = $this->db->select($this->cal_table, 'tz_id', $where, __LINE__, __FILE__, 'calendar')->fetchColumn();
 			}
 			if (!is_null($etag)) $where['cal_etag'] = $etag;
 
 			unset($event['cal_etag']);
-			$event[] = 'cal_etag=cal_etag+1';	// always update the etag, even if none given to check
+			$event[] = 'cal_etag=cal_etag+1'; // always update the etag, even if none given to check
 
-			$this->db->update($this->cal_table,$event,$where,__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, $event, $where, __LINE__, __FILE__, 'calendar');
 
 			if (!is_null($etag) && $this->db->affected_rows() < 1)
 			{
-				return 0;	// wrong etag, someone else updated the entry
+				return 0; // wrong etag, someone else updated the entry
 			}
 			if (!is_null($etag)) ++$etag;
 		}
@@ -1430,10 +1428,10 @@ 
 			// new event
 			if (!$event['cal_owner']) $event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
 
-			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = '';	// uid is NOT NULL!
+			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = ''; // uid is NOT NULL!
 
-			$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__,'calendar');
-			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table,'cal_id')))
+			$this->db->insert($this->cal_table, $event, false, __LINE__, __FILE__, 'calendar');
+			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table, 'cal_id')))
 			{
 				return false;
 			}
@@ -1443,7 +1441,7 @@ 
 		// event without uid or not strong enough uid
 		if (!isset($event['cal_uid']) || strlen($event['cal_uid']) < $minimum_uid_length)
 		{
-			$update['cal_uid'] = $event['cal_uid'] = Api\CalDAV::generate_uid('calendar',$cal_id);
+			$update['cal_uid'] = $event['cal_uid'] = Api\CalDAV::generate_uid('calendar', $cal_id);
 		}
 		// set caldav_name, if not given by caller
 		if (empty($event['caldav_name']) && version_compare($GLOBALS['egw_info']['apps']['calendar']['version'], '1.9.003', '>='))
@@ -1452,37 +1450,37 @@ 
 		}
 		if ($update)
 		{
-			$this->db->update($this->cal_table, $update, array('cal_id' => $cal_id),__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, $update, array('cal_id' => $cal_id), __LINE__, __FILE__, 'calendar');
 		}
 
 		if ($event['recur_type'] == MCAL_RECUR_NONE)
 		{
-			$this->db->delete($this->dates_table,array(
+			$this->db->delete($this->dates_table, array(
 				'cal_id' => $cal_id),
-				__LINE__,__FILE__,'calendar');
+				__LINE__, __FILE__, 'calendar');
 
 			// delete all user-records, with recur-date != 0
-			$this->db->delete($this->user_table,array(
+			$this->db->delete($this->user_table, array(
 				'cal_id' => $cal_id, 'cal_recur_date != 0'),
-				__LINE__,__FILE__,'calendar');
+				__LINE__, __FILE__, 'calendar');
 
-			$this->db->delete($this->repeats_table,array(
+			$this->db->delete($this->repeats_table, array(
 				'cal_id' => $cal_id),
-				__LINE__,__FILE__,'calendar');
+				__LINE__, __FILE__, 'calendar');
 
 			// add exception marker to master, so participants added to exceptions *only* get found
 			if ($event['cal_reference'])
 			{
 				$master_participants = array();
-				foreach($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee', array(
+				foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee', array(
 					'cal_id' => $event['cal_reference'],
 					'cal_recur_date' => 0,
-					"cal_status != 'X'",	// deleted need to be replaced with exception marker too
+					"cal_status != 'X'", // deleted need to be replaced with exception marker too
 				), __LINE__, __FILE__, 'calendar') as $row)
 				{
 					$master_participants[] = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 				}
-				foreach(array_diff(array_keys((array)$event['cal_participants']), $master_participants) as $uid)
+				foreach (array_diff(array_keys((array)$event['cal_participants']), $master_participants) as $uid)
 				{
 					$user_type = $user_id = null;
 					self::split_user($uid, $user_type, $user_id, true);
@@ -1501,10 +1499,10 @@ 
 		else // write information about recuring event, if recur_type is present in the array
 		{
 			// fetch information about the currently saved (old) event
-			$old_min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
-			$old_duration = (int) $this->db->select($this->dates_table,'MIN(cal_end)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn() - $old_min;
+			$old_min = (int)$this->db->select($this->dates_table, 'MIN(cal_start)', array('cal_id'=>$cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn();
+			$old_duration = (int)$this->db->select($this->dates_table, 'MIN(cal_end)', array('cal_id'=>$cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn() - $old_min;
 			$old_exceptions = array();
-			foreach($this->db->select($this->dates_table, 'cal_start', array(
+			foreach ($this->db->select($this->dates_table, 'cal_start', array(
 				'cal_id' => $cal_id,
 				'recur_exception' => true
 			), __LINE__, __FILE__, false, 'ORDER BY cal_start', 'calendar') as $row)
@@ -1523,8 +1521,8 @@ 
 				'cal_recur_date' => 0,
 			);
 			$old_participants = array();
-			foreach ($this->db->select($this->user_table,'cal_user_type,cal_user_id,cal_user_attendee,cal_status,cal_quantity,cal_role', $where,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+			foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee,cal_status,cal_quantity,cal_role', $where,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 				$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
@@ -1534,7 +1532,7 @@ 
 			// re-check: did so much recurrence data change that we have to rebuild it from scratch?
 			if (!$set_recurrences)
 			{
-				$set_recurrences = (isset($event['cal_start']) && (int)$old_min != (int) $event['cal_start']) ||
+				$set_recurrences = (isset($event['cal_start']) && (int)$old_min != (int)$event['cal_start']) ||
 				    $event['recur_type'] != $old_repeats['recur_type'] || $event['recur_data'] != $old_repeats['recur_data'] ||
 					(int)$event['recur_interval'] != (int)$old_repeats['recur_interval'] || $event['tz_id'] != $old_tz_id;
 			}
@@ -1543,22 +1541,22 @@ 
 			{
 				// too much recurrence data has changed, we have to do a rebuild from scratch
 				// delete all, but the lowest dates record
-				$this->db->delete($this->dates_table,array(
+				$this->db->delete($this->dates_table, array(
 					'cal_id' => $cal_id,
 					'cal_start > '.(int)$old_min,
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 
 				// delete all user-records, with recur-date != 0
-				$this->db->delete($this->user_table,array(
+				$this->db->delete($this->user_table, array(
 					'cal_id' => $cal_id,
 					'cal_recur_date != 0',
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 			}
 			else
 			{
 				// we adjust some possibly changed recurrences manually
 				// deleted exceptions: re-insert recurrences into the user and dates table
-				if (count($deleted_exceptions = array_diff($old_exceptions,$event['recur_exception'])))
+				if (count($deleted_exceptions = array_diff($old_exceptions, $event['recur_exception'])))
 				{
 					if (isset($event['cal_participants']))
 					{
@@ -1569,7 +1567,7 @@ 
 						// use old default
 						$participants = $old_participants;
 					}
-					foreach($deleted_exceptions as $id => $deleted_exception)
+					foreach ($deleted_exceptions as $id => $deleted_exception)
 					{
 						// rebuild participants for the re-inserted recurrence
 						$this->recurrence($cal_id, $deleted_exception, $deleted_exception + $old_duration, $participants);
@@ -1577,24 +1575,24 @@ 
 				}
 
 				// check if recurrence enddate was adjusted
-				if(isset($event['recur_enddate']))
+				if (isset($event['recur_enddate']))
 				{
 					// recurrences need to be truncated
-					if((int)$event['recur_enddate'] > 0 &&
+					if ((int)$event['recur_enddate'] > 0 &&
 						((int)$old_repeats['recur_enddate'] == 0 || (int)$old_repeats['recur_enddate'] > (int)$event['recur_enddate'])
 					)
 					{
-						$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
-						$this->db->delete($this->dates_table,array('cal_id' => $cal_id,'cal_start >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
+						$this->db->delete($this->user_table, array('cal_id' => $cal_id, 'cal_recur_date >= '.($event['recur_enddate'] + 1 * DAY_s)), __LINE__, __FILE__, 'calendar');
+						$this->db->delete($this->dates_table, array('cal_id' => $cal_id, 'cal_start >= '.($event['recur_enddate'] + 1 * DAY_s)), __LINE__, __FILE__, 'calendar');
 					}
 
 					// recurrences need to be expanded
-					if(((int)$event['recur_enddate'] == 0 && (int)$old_repeats['recur_enddate'] > 0)
+					if (((int)$event['recur_enddate'] == 0 && (int)$old_repeats['recur_enddate'] > 0)
 						|| ((int)$event['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] < (int)$event['recur_enddate'])
 					)
 					{
 						$set_recurrences = true;
-						$set_recurrences_start = ($old_repeats['recur_enddate'] + 1*DAY_s);
+						$set_recurrences_start = ($old_repeats['recur_enddate'] + 1 * DAY_s);
 					}
 					//error_log(__METHOD__."() event[recur_enddate]=$event[recur_enddate], old_repeats[recur_enddate]=$old_repeats[recur_enddate] --> set_recurrences=".array2string($set_recurrences).", set_recurrences_start=$set_recurrences_start");
 				}
@@ -1603,9 +1601,9 @@ 
 				if (count($event['recur_exception']))
 				{
 					// added and existing exceptions: delete the execeptions from the user table, it could be the first time
-					$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date' => $event['recur_exception']),__LINE__,__FILE__,'calendar');
+					$this->db->delete($this->user_table, array('cal_id' => $cal_id, 'cal_recur_date' => $event['recur_exception']), __LINE__, __FILE__, 'calendar');
 					// update recur_exception flag based on current exceptions
-					$this->db->update($this->dates_table, 'recur_exception='.$this->db->expression($this->dates_table,array(
+					$this->db->update($this->dates_table, 'recur_exception='.$this->db->expression($this->dates_table, array(
 						'cal_start' => $event['recur_exception'],
 					)), array(
 						'cal_id' => $cal_id,
@@ -1614,27 +1612,27 @@ 
 			}
 
 			// write the repeats table
-			unset($event[0]);	// unset the 'etag=etag+1', as it's not in the repeats table
-			$this->db->insert($this->repeats_table,$event,array('cal_id' => $cal_id),__LINE__,__FILE__,'calendar');
+			unset($event[0]); // unset the 'etag=etag+1', as it's not in the repeats table
+			$this->db->insert($this->repeats_table, $event, array('cal_id' => $cal_id), __LINE__, __FILE__, 'calendar');
 		}
 		// update start- and endtime if present in the event-array, evtl. we need to move all recurrences
 		if (isset($event['cal_start']) && isset($event['cal_end']))
 		{
-			$this->move($cal_id,$event['cal_start'],$event['cal_end'],!$cal_id ? false : $change_since, $old_min, $old_min +  $old_duration);
+			$this->move($cal_id, $event['cal_start'], $event['cal_end'], !$cal_id ? false : $change_since, $old_min, $old_min + $old_duration);
 		}
 		// update participants if present in the event-array
 		if (isset($event['cal_participants']))
 		{
-			$this->participants($cal_id,$event['cal_participants'],!$cal_id ? false : $change_since);
+			$this->participants($cal_id, $event['cal_participants'], !$cal_id ? false : $change_since);
 		}
 		// Custom fields
 		Api\Storage\Customfields::handle_files('calendar', $cal_id, $event);
 
-		foreach($event as $name => $value)
+		foreach ($event as $name => $value)
 		{
 			if ($name[0] == '#')
 			{
-				if (is_array($value) && array_key_exists('id',$value))
+				if (is_array($value) && array_key_exists('id', $value))
 				{
 					//error_log(__METHOD__.__LINE__."$name => ".array2string($value).function_backtrace());
 					$value = $value['id'];
@@ -1642,19 +1640,19 @@ 
 				}
 				if ($value)
 				{
-					$this->db->insert($this->extra_table,array(
-						'cal_extra_value'	=> is_array($value) ? implode(',',$value) : $value,
-					),array(
+					$this->db->insert($this->extra_table, array(
+						'cal_extra_value'	=> is_array($value) ? implode(',', $value) : $value,
+					), array(
 						'cal_id'			=> $cal_id,
-						'cal_extra_name'	=> substr($name,1),
-					),__LINE__,__FILE__,'calendar');
+						'cal_extra_name'	=> substr($name, 1),
+					), __LINE__, __FILE__, 'calendar');
 				}
 				else
 				{
-					$this->db->delete($this->extra_table,array(
+					$this->db->delete($this->extra_table, array(
 						'cal_id'			=> $cal_id,
-						'cal_extra_name'	=> substr($name,1),
-					),__LINE__,__FILE__,'calendar');
+						'cal_extra_name'	=> substr($name, 1),
+					), __LINE__, __FILE__, 'calendar');
 				}
 			}
 		}
@@ -1665,9 +1663,9 @@ 
 			{
 				if ($alarm['id'] && strpos($alarm['id'], 'cal:'.$cal_id.':') !== 0)
 				{
-					unset($alarm['id']);	// unset the temporary id to add the alarm
+					unset($alarm['id']); // unset the temporary id to add the alarm
 				}
-				if(!isset($alarm['offset']))
+				if (!isset($alarm['offset']))
 				{
 					$alarm['offset'] = $event['cal_start'] - $alarm['time'];
 				}
@@ -1678,14 +1676,14 @@ 
 
 				if ($alarm['time'] < time() && !self::shift_alarm($event, $alarm))
 				{
-					continue;	// pgoerzen: don't add alarm in the past
+					continue; // pgoerzen: don't add alarm in the past
 				}
-				$this->save_alarm($cal_id, $alarm, false);	// false: not update modified, we do it anyway
+				$this->save_alarm($cal_id, $alarm, false); // false: not update modified, we do it anyway
 			}
 		}
 		if (is_null($etag))
 		{
-			$etag = $this->db->select($this->cal_table,'cal_etag',array('cal_id' => $cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
+			$etag = $this->db->select($this->cal_table, 'cal_etag', array('cal_id' => $cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn();
 		}
 
 		// if event is an exception: update modified of master, to force etag, ctag and sync-token change
@@ -1705,7 +1703,7 @@ 
 	 *	are dealing with, default is now.
 	 * @return boolean true if alarm could be shifted, false if not
 	 */
-	public static function shift_alarm(array $_event, array &$alarm, $timestamp=null)
+	public static function shift_alarm(array $_event, array &$alarm, $timestamp = null)
 	{
 		if ($_event['recur_type'] == MCAL_RECUR_NONE)
 		{
@@ -1716,7 +1714,7 @@ 
 		$rrule = calendar_rrule::event2rrule($event, false);
 		foreach ($rrule as $time)
 		{
-			if ($start < ($ts = Api\DateTime::to($time,'server')))
+			if ($start < ($ts = Api\DateTime::to($time, 'server')))
 			{
 				$alarm['time'] = $ts - $alarm['offset'];
 				return true;
@@ -1737,34 +1735,34 @@ 
 	 * @todo Recalculate recurrences, if timezone changes
 	 * @return int|boolean number of moved recurrences or false on error
 	 */
-	function move($cal_id,$start,$end,$change_since=0,$old_start=0,$old_end=0)
+	function move($cal_id, $start, $end, $change_since = 0, $old_start = 0, $old_end = 0)
 	{
 		//echo "<p>socal::move($cal_id,$start,$end,$change_since,$old_start,$old_end)</p>\n";
 
-		if (!(int) $cal_id) return false;
+		if (!(int)$cal_id) return false;
 
 		if (!$old_start)
 		{
-			if ($change_since !== false) $row = $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
-				array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetch();
+			if ($change_since !== false) $row = $this->db->select($this->dates_table, 'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
+				array('cal_id'=>$cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetch();
 			// if no recurrence found, create one with the new dates
 			if ($change_since === false || !$row || !$row['cal_start'] || !$row['cal_end'])
 			{
-				$this->db->insert($this->dates_table,array(
+				$this->db->insert($this->dates_table, array(
 					'cal_id'    => $cal_id,
 					'cal_start' => $start,
 					'cal_end'   => $end,
-				),false,__LINE__,__FILE__,'calendar');
+				), false, __LINE__, __FILE__, 'calendar');
 
 				return 1;
 			}
-			$move_start = (int) ($start-$row['cal_start']);
-			$move_end   = (int) ($end-$row['cal_end']);
+			$move_start = (int)($start - $row['cal_start']);
+			$move_end   = (int)($end - $row['cal_end']);
 		}
 		else
 		{
-			$move_start = (int) ($start-$old_start);
-			$move_end   = (int) ($end-$old_end);
+			$move_start = (int)($start - $old_start);
+			$move_end   = (int)($end - $old_end);
 		}
 		$where = 'cal_id='.(int)$cal_id;
 
@@ -1772,13 +1770,13 @@ 
 		{
 			// move the recur-date of the participants
 			$this->db->query("UPDATE $this->user_table SET cal_recur_date=cal_recur_date+$move_start WHERE $where AND cal_recur_date ".
-				((int)$change_since ? '>= '.(int)$change_since : '!= 0'),__LINE__,__FILE__);
+				((int)$change_since ? '>= '.(int)$change_since : '!= 0'), __LINE__, __FILE__);
 		}
 		if ($move_start || $move_end)
 		{
 			// move the event and it's recurrences
 			$this->db->query("UPDATE $this->dates_table SET cal_start=cal_start+$move_start,cal_end=cal_end+$move_end WHERE $where".
-				((int) $change_since ? ' AND cal_start >= '.(int) $change_since : ''),__LINE__,__FILE__);
+				((int)$change_since ? ' AND cal_start >= '.(int)$change_since : ''), __LINE__, __FILE__);
 		}
 		return $this->db->affected_rows();
 	}
@@ -1797,8 +1795,7 @@ 
 		}
 		if (is_array($attendee))
 		{
-			$email = !empty($attendee['email']) ? $user_attendee['email'] :
-				(strtolower(substr($attendee['url'], 0, 7)) == 'mailto:' ? substr($user_attendee['url'], 7) : $attendee['url']);
+			$email = !empty($attendee['email']) ? $user_attendee['email'] : (strtolower(substr($attendee['url'], 0, 7)) == 'mailto:' ? substr($user_attendee['url'], 7) : $attendee['url']);
 			$attendee = !empty($attendee['cn']) ? $attendee['cn'].' <'.$email.'>' : $email;
 		}
 		return $attendee;
@@ -1811,11 +1808,11 @@ 
 	 * @param string|array $attendee attendee information: email, json or array with attr cn and url
 	 * @return string|int combined id
 	 */
-	static function combine_user($user_type, $user_id, $attendee=null)
+	static function combine_user($user_type, $user_id, $attendee = null)
 	{
 		if (!$user_type || $user_type == 'u')
 		{
-			return (int) $user_id;
+			return (int)$user_id;
 		}
 		if ($user_type == 'e' && $attendee)
 		{
@@ -1835,12 +1832,12 @@ 
 	 * @param string|int &$user_id id
 	 * @param boolean $md5_email =false md5 hash user_id for email / user_type=="e"
 	 */
-	static function split_user($uid, &$user_type, &$user_id, $md5_email=false)
+	static function split_user($uid, &$user_type, &$user_id, $md5_email = false)
 	{
 		if (is_numeric($uid))
 		{
 			$user_type = 'u';
-			$user_id = (int) $uid;
+			$user_id = (int)$uid;
 		}
 		// create md5 hash from lowercased and trimed raw email ("rb@stylite.de", not "Ralf Becker <rb@stylite.de>")
 		elseif ($md5_email && $uid[0] == 'e')
@@ -1854,7 +1851,7 @@ 
 		else
 		{
 			$user_type = $uid[0];
-			$user_id = substr($uid,1);
+			$user_id = substr($uid, 1);
 		}
 	}
 
@@ -1866,7 +1863,7 @@ 
 	 * @param string $role ='REQ-PARTICIPANT'
 	 * @return string
 	 */
-	static function combine_status($status,$quantity=1,$role='REQ-PARTICIPANT')
+	static function combine_status($status, $quantity = 1, $role = 'REQ-PARTICIPANT')
 	{
 		if ((int)$quantity > 1) $status .= (int)$quantity;
 		if ($role != 'REQ-PARTICIPANT') $status .= $role;
@@ -1882,13 +1879,13 @@ 
 	 * @param string &$role=null only O: role
 	 * @return string status U, T, A or R, same as $status parameter on return
 	 */
-	static function split_status(&$status,&$quantity=null,&$role=null)
+	static function split_status(&$status, &$quantity = null, &$role = null)
 	{
 		$quantity = 1;
 		$role = 'REQ-PARTICIPANT';
 		//error_log(__METHOD__.__LINE__.array2string($status));
 		$matches = null;
-		if (is_string($status) && strlen($status) > 1 && preg_match('/^.([0-9]*)(.*)$/',$status,$matches))
+		if (is_string($status) && strlen($status) > 1 && preg_match('/^.([0-9]*)(.*)$/', $status, $matches))
 		{
 			if ((int)$matches[1] > 0) $quantity = (int)$matches[1];
 			if ($matches[2]) $role = $matches[2];
@@ -1915,14 +1912,14 @@ 
 	 *		true = only add participants if needed, no participant will be deleted (participants to check/add required in $participants)
 	 * @return int|boolean number of updated recurrences or false on error
 	 */
-	function participants($cal_id,$participants,$change_since=0,$add_only=false)
+	function participants($cal_id, $participants, $change_since = 0, $add_only = false)
 	{
 		//error_log(__METHOD__."($cal_id,".array2string($participants).",$change_since,$add_only");
 
 		$recurrences = array();
 
 		// remove group-invitations, they are NOT stored in the db
-		foreach($participants as $uid => $status)
+		foreach ($participants as $uid => $status)
 		{
 			if ($status[0] == 'G')
 			{
@@ -1931,7 +1928,7 @@ 
 		}
 		$where = array('cal_id' => $cal_id);
 
-		if ((int) $change_since)
+		if ((int)$change_since)
 		{
 			$where[] = '(cal_recur_date=0 OR cal_recur_date >= '.(int)$change_since.')';
 		}
@@ -1939,31 +1936,31 @@ 
 		if ($change_since !== false)
 		{
 			// find all existing recurrences
-			foreach($this->db->select($this->user_table,'DISTINCT cal_recur_date',$where,__LINE__,__FILE__,false,'','calendar') as $row)
+			foreach ($this->db->select($this->user_table, 'DISTINCT cal_recur_date', $where, __LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				$recurrences[] = $row['cal_recur_date'];
 			}
 
 			// update existing entries
-			$existing_entries = $this->db->select($this->user_table,'*',$where,__LINE__,__FILE__,false,'ORDER BY cal_recur_date DESC','calendar');
+			$existing_entries = $this->db->select($this->user_table, '*', $where, __LINE__, __FILE__, false, 'ORDER BY cal_recur_date DESC', 'calendar');
 
 			// create a full list of participants which already exist in the db
 			// with status, quantity and role of the earliest recurence
 			$old_participants = array();
-			foreach($existing_entries as $row)
+			foreach ($existing_entries as $row)
 			{
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 				if ($row['cal_recur_date'] || !isset($old_participants[$uid]))
 				{
-					$old_participants[$uid] = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+					$old_participants[$uid] = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 				}
 			}
 
 			// tag participants which should be deleted
-			if($add_only === false)
+			if ($add_only === false)
 			{
 				$deleted = array();
-				foreach($existing_entries as $row)
+				foreach ($existing_entries as $row)
 				{
 					$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 					// delete not longer set participants
@@ -1976,7 +1973,7 @@ 
 
 			// only keep added OR status (incl. quantity!) changed participants for further steps
 			// we do not touch unchanged (!) existing ones
-			foreach($participants as $uid => $status)
+			foreach ($participants as $uid => $status)
 			{
 				if ($old_participants[$uid] === $status)
 				{
@@ -1988,46 +1985,46 @@ 
 			if ($add_only === false && count($deleted))
 			{
 				$to_or = array();
-				$table_def = $this->db->get_table_definitions('calendar',$this->user_table);
-				foreach($deleted as $type => $ids)
+				$table_def = $this->db->get_table_definitions('calendar', $this->user_table);
+				foreach ($deleted as $type => $ids)
 				{
-					$to_or[] = $this->db->expression($table_def,array(
+					$to_or[] = $this->db->expression($table_def, array(
 						'cal_user_type' => $type,
 						'cal_user_id'   => $ids,
 					));
 				}
-				$where[] = '('.implode(' OR ',$to_or).')';
-				$where[] = "cal_status!='E'";	// do NOT delete exception marker
-				$this->db->update($this->user_table,array('cal_status'=>'X'),$where,__LINE__,__FILE__,'calendar');
+				$where[] = '('.implode(' OR ', $to_or).')';
+				$where[] = "cal_status!='E'"; // do NOT delete exception marker
+				$this->db->update($this->user_table, array('cal_status'=>'X'), $where, __LINE__, __FILE__, 'calendar');
 			}
 		}
 
 		if (count($participants))	// participants which need to be added
 		{
-			if (!count($recurrences)) $recurrences[] = 0;   // insert the default recurrence
+			if (!count($recurrences)) $recurrences[] = 0; // insert the default recurrence
 
 			$delete_deleted = array();
 
 			// update participants
-			foreach($participants as $uid => $status)
+			foreach ($participants as $uid => $status)
 			{
 				$type = $id = $quantity = $role = null;
 				self::split_user($uid, $type, $id, true);
-				self::split_status($status,$quantity,$role);
+				self::split_status($status, $quantity, $role);
 				$set = array(
 					'cal_status'	  => $status,
 					'cal_quantity'	  => $quantity,
 					'cal_role'        => $role,
 					'cal_user_attendee' => $type == 'e' ? substr($uid, 1) : null,
 				);
-				foreach($recurrences as $recur_date)
+				foreach ($recurrences as $recur_date)
 				{
-					$this->db->insert($this->user_table,$set,array(
+					$this->db->insert($this->user_table, $set, array(
 						'cal_id'	      => $cal_id,
 						'cal_recur_date'  => $recur_date,
 						'cal_user_type'   => $type,
 						'cal_user_id' 	  => $id,
-					),__LINE__,__FILE__,'calendar');
+					), __LINE__, __FILE__, 'calendar');
 				}
 				// for new or changed group-invitations, remove previously deleted members, so they show up again
 				if ($uid < 0)
@@ -2037,13 +2034,13 @@ 
 			}
 			if ($delete_deleted)
 			{
-				$this->db->delete($this->user_table, $where=array(
+				$this->db->delete($this->user_table, $where = array(
 					'cal_id' => $cal_id,
 					'cal_recur_date' => $recurrences,
 					'cal_user_type' => 'u',
 					'cal_user_id' => array_unique($delete_deleted),
 					'cal_status' => 'X',
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 				//error_log(__METHOD__."($cal_id, ".array2string($participants).", since=$change_since, add_only=$add_only) db->delete('$this->user_table', ".array2string($where).") affected ".$this->db->affected_rows().' rows');
 			}
 		}
@@ -2062,7 +2059,7 @@ 
 	 * @param string $attendee =null extra attendee information to set for all types (incl. accounts!)
 	 * @return int number of changed recurrences
 	 */
-	function set_status($cal_id,$user_type,$user_id,$status,$recur_date=0,$role=null,$attendee=null)
+	function set_status($cal_id, $user_type, $user_id, $status, $recur_date = 0, $role = null, $attendee = null)
 	{
 		static $status_code_short = array(
 			REJECTED 	=> 'R',
@@ -2087,7 +2084,7 @@ 
 			'cal_user_type'	=> $user_type,
 			'cal_user_id'   => $user_id_md5,
 		);
-		if ((int) $recur_date)
+		if ((int)$recur_date)
 		{
 			$where['cal_recur_date'] = $recur_date;
 		}
@@ -2098,7 +2095,7 @@ 
 
 		if ($status == 'G')		// remove group invitations, as we dont store them in the db
 		{
-			$this->db->delete($this->user_table,$where,__LINE__,__FILE__,'calendar');
+			$this->db->delete($this->user_table, $where, __LINE__, __FILE__, 'calendar');
 			$ret = $this->db->affected_rows();
 		}
 		else
@@ -2106,7 +2103,7 @@ 
 			$set = array('cal_status' => $status);
 			if ($user_type == 'e' || $attendee) $set['cal_user_attendee'] = $attendee ? $attendee : $user_id;
 			if (!is_null($role) && $role != 'REQ-PARTICIPANT') $set['cal_role'] = $role;
-			$this->db->insert($this->user_table,$set,$where,__LINE__,__FILE__,'calendar');
+			$this->db->insert($this->user_table, $set, $where, __LINE__, __FILE__, 'calendar');
 			// for new or changed group-invitations, remove previously deleted members, so they show up again
 			if (($ret = $this->db->affected_rows()) && $user_type == 'u' && $user_id < 0)
 			{
@@ -2119,7 +2116,7 @@ 
 		// update modified and modifier in main table
 		if ($ret)
 		{
-			$this->updateModified($cal_id, true);	// true = update series master too
+			$this->updateModified($cal_id, true); // true = update series master too
 		}
 		//error_log(__METHOD__."($cal_id,$user_type,$user_id,$status,$recur_date) = $ret");
 		return $ret;
@@ -2134,7 +2131,7 @@ 
 	 * @param array $participants uid => status pairs
 	 * @param boolean $exception =null true or false to set recure_exception flag, null leave it unchanged (new are by default no exception)
 	 */
-	function recurrence($cal_id,$start,$end,$participants,$exception=null)
+	function recurrence($cal_id, $start, $end, $participants, $exception = null)
 	{
 		//error_log(__METHOD__."($cal_id, $start, $end, ".array2string($participants).", ".array2string($exception));
 		$update = array('cal_end' => $end);
@@ -2143,7 +2140,7 @@ 
 		$this->db->insert($this->dates_table, $update, array(
 			'cal_id' => $cal_id,
 			'cal_start'  => $start,
-		),__LINE__,__FILE__,'calendar');
+		), __LINE__, __FILE__, 'calendar');
 
 		if (!is_array($participants))
 		{
@@ -2151,26 +2148,26 @@ 
 		}
 		if ($exception !== true)
 		{
-			foreach($participants as $uid => $status)
+			foreach ($participants as $uid => $status)
 			{
-				if ($status == 'G') continue;	// dont save group-invitations
+				if ($status == 'G') continue; // dont save group-invitations
 
 				$type = '';
 				$id = null;
 				self::split_user($uid, $type, $id, true);
 				$quantity = $role = null;
-				self::split_status($status,$quantity,$role);
-				$this->db->insert($this->user_table,array(
+				self::split_status($status, $quantity, $role);
+				$this->db->insert($this->user_table, array(
 					'cal_status'	=> $status,
 					'cal_quantity'	=> $quantity,
 					'cal_role'		=> $role,
 					'cal_user_attendee' => $type == 'e' ? substr($uid, 1) : null,
-				),array(
+				), array(
 					'cal_id'		 => $cal_id,
 					'cal_recur_date' => $start,
 					'cal_user_type'  => $type,
 					'cal_user_id' 	 => $id,
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 			}
 		}
 	}
@@ -2184,7 +2181,7 @@ 
 	function unfinished_recuring($time)
 	{
 		$ids = array();
-		foreach($rs=$this->db->select($this->repeats_table, "$this->repeats_table.cal_id,MAX(cal_start) AS cal_start",
+		foreach ($rs = $this->db->select($this->repeats_table, "$this->repeats_table.cal_id,MAX(cal_start) AS cal_start",
 			'(range_end IS NULL OR range_end > '.(int)$time.')',
 			__LINE__, __FILE__, false, "GROUP BY $this->repeats_table.cal_id,range_end", 'calendar', 0,
 			" JOIN $this->cal_table ON $this->repeats_table.cal_id=$this->cal_table.cal_id".
@@ -2210,9 +2207,9 @@ 
 		// update timestamp of series master, updates own timestamp too, which does not hurt ;-)
 		$this->updateModified($cal_id, true);
 
-		foreach($this->all_tables as $table)
+		foreach ($this->all_tables as $table)
 		{
-			$this->db->delete($table,array('cal_id'=>$cal_id),__LINE__,__FILE__,'calendar');
+			$this->db->delete($table, array('cal_id'=>$cal_id), __LINE__, __FILE__, 'calendar');
 		}
 	}
 
@@ -2228,19 +2225,19 @@ 
 	function purge($date)
 	{
 		// with new range_end we simple delete all with range_end < $date (range_end NULL is never returned)
-		foreach($this->db->select($this->cal_table, 'cal_id', 'range_end < '.(int)$date, __LINE__, __FILE__, false, '', 'calendar') as $row)
+		foreach ($this->db->select($this->cal_table, 'cal_id', 'range_end < '.(int)$date, __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			//echo __METHOD__." About to delete".$row['cal_id']."\r\n";
-			foreach($this->all_tables as $table)
+			foreach ($this->all_tables as $table)
 			{
 				$this->db->delete($table, array('cal_id'=>$row['cal_id']), __LINE__, __FILE__, 'calendar');
 			}
 			// handle sync
-			$this->db->update('egw_api_content_history',array(
+			$this->db->update('egw_api_content_history', array(
 				'sync_deleted' => time(),
-			),array(
+			), array(
 				'sync_appname' => 'calendar',
-				'sync_contentid' => $row['cal_id'],	// sync_contentid is varchar(60)!
+				'sync_contentid' => $row['cal_id'], // sync_contentid is varchar(60)!
 			), __LINE__, __FILE__, 'calendar');
 			// handle links
 			Link::unlink('', 'calendar', $row['cal_id']);
@@ -2263,23 +2260,23 @@ 
 	 * @param boolean $update_cache =null true: re-read given $cal_id, false: delete given $cal_id
 	 * @return array of (cal_id => array of) alarms with alarm-id as key
 	 */
-	function read_alarms($cal_id, $update_cache=null)
+	function read_alarms($cal_id, $update_cache = null)
 	{
 		if (!isset(self::$alarm_cache) && is_array($cal_id))
 		{
 			self::$alarm_cache = array();
 			if (($jobs = $this->async->read('cal:%')))
 			{
-				foreach($jobs as $id => $job)
+				foreach ($jobs as $id => $job)
 				{
-					$alarm         = $job['data'];	// text, enabled
+					$alarm         = $job['data']; // text, enabled
 					$alarm['id']   = $id;
 					$alarm['time'] = $job['next'];
 
 					self::$alarm_cache[$alarm['cal_id']][$id] = $alarm;
 				}
 			}
-			unset($update_cache);	// just done
+			unset($update_cache); // just done
 		}
 		$alarms = array();
 
@@ -2287,13 +2284,13 @@ 
 		{
 			if (isset($update_cache))
 			{
-				foreach((array)$cal_id as $id)
+				foreach ((array)$cal_id as $id)
 				{
 					if ($update_cache === false)
 					{
 						unset(self::$alarm_cache[$cal_id]);
 					}
-					elseif($update_cache === true)
+					elseif ($update_cache === true)
 					{
 						self::$alarm_cache[$cal_id] = $this->read_alarms_nocache($cal_id);
 					}
@@ -2305,7 +2302,7 @@ 
 			}
 			else
 			{
-				foreach($cal_id as $id)
+				foreach ($cal_id as $id)
 				{
 					$alarms[$id] = (array)self::$alarm_cache[$id];
 				}
@@ -2320,9 +2317,9 @@ 
 	{
 		if (($jobs = $this->async->read('cal:'.(int)$cal_id.':%')))
 		{
-			foreach($jobs as $id => $job)
+			foreach ($jobs as $id => $job)
 			{
-				$alarm         = $job['data'];	// text, enabled
+				$alarm         = $job['data']; // text, enabled
 				$alarm['id']   = $id;
 				$alarm['time'] = $job['next'];
 
@@ -2345,8 +2342,8 @@ 
 		{
 			return False;
 		}
-		list($alarm_id,$job) = each($jobs);
-		$alarm         = $job['data'];	// text, enabled
+		list($alarm_id, $job) = each($jobs);
+		$alarm         = $job['data']; // text, enabled
 		$alarm['id']   = $alarm_id;
 		$alarm['time'] = $job['next'];
 
@@ -2362,12 +2359,12 @@ 
 	 * @param boolean $update_modified =true call update modified, default true
 	 * @return string id of the alarm
 	 */
-	function save_alarm($cal_id, $alarm, $update_modified=true)
+	function save_alarm($cal_id, $alarm, $update_modified = true)
 	{
 		//error_log(__METHOD__."($cal_id, ".array2string($alarm).', '.array2string($update_modified).') '.function_backtrace());
 		if (!($id = $alarm['id']))
 		{
-			$alarms = $this->read_alarms($cal_id);	// find a free alarm#
+			$alarms = $this->read_alarms($cal_id); // find a free alarm#
 			$n = count($alarms);
 			do
 			{
@@ -2380,12 +2377,12 @@ 
 		{
 			$this->async->cancel_timer($id);
 		}
-		$alarm['cal_id'] = $cal_id;		// we need the back-reference
+		$alarm['cal_id'] = $cal_id; // we need the back-reference
 		// add an alarm uid, if none is given
 		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid')) $alarm['uid'] = (string)new Horde_Support_Uuid;
 		//error_log(__METHOD__.__LINE__.' Save Alarm for CalID:'.$cal_id.'->'.array2string($alarm).'-->'.$id.'#'.function_backtrace());
 		// allways store job with the alarm owner as job-owner to get eg. the correct from address
-		if (!$this->async->set_timer($alarm['time'],$id,'calendar.calendar_boupdate.send_alarm',$alarm,$alarm['owner']))
+		if (!$this->async->set_timer($alarm['time'], $id, 'calendar.calendar_boupdate.send_alarm', $alarm, $alarm['owner']))
 		{
 			return False;
 		}
@@ -2412,7 +2409,7 @@ 
 		//error_log(__METHOD__."($cal_id) ".function_backtrace());
 		if (($alarms = $this->read_alarms($cal_id)))
 		{
-			foreach(array_keys($alarms) as $id)
+			foreach (array_keys($alarms) as $id)
 			{
 				$this->async->cancel_timer($id);
 			}
@@ -2432,7 +2429,7 @@ 
 	{
 		//error_log(__METHOD__."('$id') ".function_backtrace());
 		// update the modification information of the related event
-		list(,$cal_id) = explode(':',$id);
+		list(,$cal_id) = explode(':', $id);
 		if ($cal_id)
 		{
 			$this->updateModified($cal_id, true);
@@ -2451,7 +2448,7 @@ 
 	 * @param array|int $old_user integer old user or array with keys 'account_id' and 'new_owner' as the deleteaccount hook uses it
 	 * @param int $new_user =null
 	 */
-	function deleteaccount($old_user, $new_user=null)
+	function deleteaccount($old_user, $new_user = null)
 	{
 		if (is_array($old_user))
 		{
@@ -2462,52 +2459,52 @@ 
 		{
 			$user_type = '';
 			$user_id = null;
-			self::split_user($old_user,$user_type,$user_id);
+			self::split_user($old_user, $user_type, $user_id);
 
 			if ($user_type == 'u')	// only accounts can be owners of events
 			{
-				foreach($this->db->select($this->cal_table,'cal_id',array('cal_owner' => $old_user),__LINE__,__FILE__,false,'','calendar') as $row)
+				foreach ($this->db->select($this->cal_table, 'cal_id', array('cal_owner' => $old_user), __LINE__, __FILE__, false, '', 'calendar') as $row)
 				{
 					$this->delete($row['cal_id']);
 				}
 			}
-			$this->db->delete($this->user_table,array(
+			$this->db->delete($this->user_table, array(
 				'cal_user_type' => $user_type,
 				'cal_user_id'   => $user_id,
-			),__LINE__,__FILE__,'calendar');
+			), __LINE__, __FILE__, 'calendar');
 
 			// delete calendar entries without participants (can happen if the deleted user is the only participants, but not the owner)
-			foreach($this->db->select($this->cal_table,"DISTINCT $this->cal_table.cal_id",'cal_user_id IS NULL',__LINE__,__FILE__,
-				False,'','calendar',0,"LEFT JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id") as $row)
+			foreach ($this->db->select($this->cal_table, "DISTINCT $this->cal_table.cal_id", 'cal_user_id IS NULL', __LINE__, __FILE__,
+				False, '', 'calendar', 0, "LEFT JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id") as $row)
 			{
 				$this->delete($row['cal_id']);
 			}
 		}
 		else
 		{
-			$this->db->update($this->cal_table,array('cal_owner' => $new_user),array('cal_owner' => $old_user),__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, array('cal_owner' => $new_user), array('cal_owner' => $old_user), __LINE__, __FILE__, 'calendar');
 			// delete participation of old user, if new user is already a participant
 			$ids = array();
-			foreach($this->db->select($this->user_table,'cal_id',array(		// MySQL does NOT allow to run this as delete!
+			foreach ($this->db->select($this->user_table, 'cal_id', array(		// MySQL does NOT allow to run this as delete!
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
 				"cal_id IN (SELECT cal_id FROM $this->user_table other WHERE other.cal_id=cal_id AND other.cal_user_id=".$this->db->quote($new_user)." AND cal_user_type='u')",
-			),__LINE__,__FILE__,false,'','calendar') as $row)
+			), __LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				$ids[] = $row['cal_id'];
 			}
-			if ($ids) $this->db->delete($this->user_table,array(
+			if ($ids) $this->db->delete($this->user_table, array(
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
 				'cal_id' => $ids,
-			),__LINE__,__FILE__,'calendar');
+			), __LINE__, __FILE__, 'calendar');
 			// now change participant in the rest to contain new user instead of old user
-			$this->db->update($this->user_table,array(
+			$this->db->update($this->user_table, array(
 				'cal_user_id' => $new_user,
-			),array(
+			), array(
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
-			),__LINE__,__FILE__,'calendar');
+			), __LINE__, __FILE__, 'calendar');
 		}
 	}
 
@@ -2521,18 +2518,18 @@ 
 	 *
 	 * @return array recur_date => status pairs (index 0 => main status)
 	 */
-	function get_recurrences($cal_id, $uid=null, $start=0, $end=0)
+	function get_recurrences($cal_id, $uid = null, $start = 0, $end = 0)
 	{
 		$participant_status = array();
 		$where = array('cal_id' => $cal_id);
-		if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= '.(int)$start.')';
+		if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= '.(int)$end.')';
 		if ($start != 0 && $end != 0)
 		{
-			$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
-						' AND cal_recur_date <= ' . (int)$end . '))';
+			$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= '.(int)$start.
+						' AND cal_recur_date <= '.(int)$end.'))';
 		}
-		foreach($this->db->select($this->user_table,'DISTINCT cal_recur_date',$where,__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->user_table, 'DISTINCT cal_recur_date', $where, __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			// inititalize the array
 			$participant_status[$row['cal_recur_date']] = null;
@@ -2546,17 +2543,17 @@ 
 			'cal_user_type'	=> $user_type ? $user_type : 'u',
 			'cal_user_id'   => $user_id,
 		);
-		if ($start != 0 && $end == 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date >= '.(int)$start.')';
+		if ($start == 0 && $end != 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date <= '.(int)$end.')';
 		if ($start != 0 && $end != 0)
 		{
-			$where2[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
-						' AND cal_recur_date <= ' . (int)$end . '))';
+			$where2[] = '(cal_recur_date = 0 OR (cal_recur_date >= '.(int)$start.
+						' AND cal_recur_date <= '.(int)$end.'))';
 		}
-		foreach ($this->db->select($this->user_table,'cal_recur_date,cal_status,cal_quantity,cal_role',$where2,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->user_table, 'cal_recur_date,cal_status,cal_quantity,cal_role', $where2,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
-			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+			$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 			$participant_status[$row['cal_recur_date']] = $status;
 		}
 		return $participant_status;
@@ -2605,8 +2602,8 @@ 
 			'cal_uid'		=> $uid,
 		);
 		$related = array();
-		foreach ($this->db->select($this->cal_table,'cal_id,cal_reference',$where,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->cal_table, 'cal_id,cal_reference', $where,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			if ($row['cal_reference'] != 0)
 			{
@@ -2635,10 +2632,10 @@ 
 	 *
 	 * @return array		Array of exception days (false for non-recurring events).
 	 */
-	function get_recurrence_exceptions($event, $tz_id=null, $start=0, $end=0, $filter='all')
+	function get_recurrence_exceptions($event, $tz_id = null, $start = 0, $end = 0, $filter = 'all')
 	{
 		if (!is_array($event)) return false;
-		$cal_id = (int) $event['id'];
+		$cal_id = (int)$event['id'];
 		//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 		//		"($cal_id, $tz_id, $filter): " . $event['tzid']);
 		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE) return false;
@@ -2662,27 +2659,27 @@ 
 		while ($egw_rrule->valid())
 		{
 			while ($egw_rrule->exceptions &&
-				in_array($egw_rrule->current->format('Ymd'),$egw_rrule->exceptions))
+				in_array($egw_rrule->current->format('Ymd'), $egw_rrule->exceptions))
 			{
-				if (in_array($filter, array('map','tz_map','rrule','tz_rrule')))
+				if (in_array($filter, array('map', 'tz_map', 'rrule', 'tz_rrule')))
 				{
 					 // real exception
-					$locts = (int)Api\DateTime::to($egw_rrule->current(),'server');
+					$locts = (int)Api\DateTime::to($egw_rrule->current(), 'server');
 					if ($expand_all)
 					{
-						$remts = (int)Api\DateTime::to($remote_rrule->current(),'server');
+						$remts = (int)Api\DateTime::to($remote_rrule->current(), 'server');
 						if ($remote)
 						{
-							$days[$locts]= $remts;
+							$days[$locts] = $remts;
 						}
 						else
 						{
-							$days[$remts]= $locts;
+							$days[$remts] = $locts;
 						}
 					}
 					else
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 				if ($expand_all)
@@ -2693,14 +2690,14 @@ 
 				if (!$egw_rrule->valid()) return $days;
 			}
 			$day = $egw_rrule->current();
-			$locts = (int)Api\DateTime::to($day,'server');
+			$locts = (int)Api\DateTime::to($day, 'server');
 			$tz_exception = ($filter == 'tz_rrule');
 			//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 			//	'()[EVENT Server]: ' . $day->format('Ymd\THis') . " ($locts)");
 			if ($expand_all)
 			{
 				$remote_day = $remote_rrule->current();
-				$remts = (int)Api\DateTime::to($remote_day,'server');
+				$remts = (int)Api\DateTime::to($remote_day, 'server');
 			//	error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 			//	'()[EVENT Device]: ' . $remote_day->format('Ymd\THis') . " ($remts)");
 			}
@@ -2719,11 +2716,11 @@ 
 						//	'() tz exception: ' . $day->format('Ymd\THis'));
 						if ($remote)
 						{
-							$days[$locts]= $remts;
+							$days[$locts] = $remts;
 						}
 						else
 						{
-							$days[$remts]= $locts;
+							$days[$remts] = $locts;
 						}
 					}
 				}
@@ -2745,18 +2742,18 @@ 
 							{
 								if ($remote)
 								{
-									$days[$locts]= $remts;
+									$days[$locts] = $remts;
 								}
 								else
 								{
-									$days[$remts]= $locts;
+									$days[$remts] = $locts;
 								}
 							}
 						}
 					}
 					elseif ($filter != 'map')
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 				elseif (($filter == 'map' || filter == 'tz_map') &&
@@ -2766,11 +2763,11 @@ 
 					if ($expand_all)
 					{
 
-						$days[$remts]= $locts;
+						$days[$remts] = $locts;
 					}
 					else
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 			}
@@ -2794,9 +2791,9 @@ 
 	 */
 	function status_pseudo_exception($cal_id, $recur_date, $filter)
 	{
-		static $recurrence_zero=null;
-		static $cached_id=null;
-		static $user=null;
+		static $recurrence_zero = null;
+		static $cached_id = null;
+		static $user = null;
 
 		if (!isset($cached_id) || $cached_id != $cal_id)
 		{
@@ -2807,8 +2804,8 @@ 
 				'cal_id' => $cal_id,
 				'cal_recur_date' => 0,
 			);
-			foreach ($this->db->select($this->user_table,'cal_user_type,cal_user_id,cal_user_attendee,cal_status',$where,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+			foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee,cal_status', $where,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				switch ($row['cal_user_type'])
 				{
@@ -2831,8 +2828,8 @@ 
 			'cal_id' => $cal_id,
 			'cal_recur_date' => $recur_date,
 		);
-		foreach ($this->db->select($this->user_table,'cal_user_type,cal_user_id,cal_user_attendee,cal_status',$where,
-			__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee,cal_status', $where,
+			__LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			switch ($row['cal_user_type'])
 			{
@@ -2929,14 +2926,14 @@ 
 			}
 			$timezone = self::$tz_cache[$event['tzid']];
 		}
-		$start_time = new Api\DateTime($event['start'],Api\DateTime::$server_timezone);
+		$start_time = new Api\DateTime($event['start'], Api\DateTime::$server_timezone);
 		$start_time->setTimezone($timezone);
-		$end_time = new Api\DateTime($event['end'],Api\DateTime::$server_timezone);
+		$end_time = new Api\DateTime($event['end'], Api\DateTime::$server_timezone);
 		$end_time->setTimezone($timezone);
 		//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 		//	'(): ' . $start . '-' . $end);
-		$start = Api\DateTime::to($start_time,'array');
-		$end = Api\DateTime::to($end_time,'array');
+		$start = Api\DateTime::to($start_time, 'array');
+		$end = Api\DateTime::to($end_time, 'array');
 
 
 		return !$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59;
@@ -2950,7 +2947,7 @@ 
 	 *
 	 * @return DateTime
 	 */
-	function &startOfDay(Api\DateTime $time, $tz_id=null)
+	function &startOfDay(Api\DateTime $time, $tz_id = null)
 	{
 		if (empty($tz_id))
 		{
@@ -2975,14 +2972,14 @@ 
 	 * @param int $time =null new timestamp, default current (server-)time
 	 * @param int $modifier =null uid of the modifier, default current user
 	 */
-	function updateModified($id, $update_master=false, $time=null, $modifier=null)
+	function updateModified($id, $update_master = false, $time = null, $modifier = null)
 	{
 		if (is_null($time) || !$time) $time = time();
 		if (is_null($modifier)) $modifier = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->db->update($this->cal_table,
 			array('cal_modified' => $time, 'cal_modifier' => $modifier),
-			array('cal_id' => $id), __LINE__,__FILE__, 'calendar');
+			array('cal_id' => $id), __LINE__, __FILE__, 'calendar');
 
 		// if event is an exception: update modified of master, to force etag, ctag and sync-token change
 		if ($update_master)