EGroupware / egroupware

calendar/inc/class.calendar_so.inc.php

Indentation +1 added lines, -1 removed lines

@@ -1528,7 +1528,7 @@
 			if (!$set_recurrences)
 			{
 				$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'] ||
+					$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;
 			}
 

Doc Comments +12 added lines, -36 removed lines

@@ -211,23 +211,11 @@ 
 	 * @param int $start startdate of the search/list (servertime)
 	 * @param int $end enddate of the search/list (servertime)
 	 * @param int|array $users user-id or array of user-id's, !$users means all entries regardless of users
-	 * @param int|array $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
+	 * @param integer $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
 	 * @param string $filter ='default' string filter-name: all (not rejected), accepted, unknown, tentative, rejected or everything (incl. rejected, deleted)
 	 * @param int|boolean $offset =False offset for a limited query or False (default)
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @param array $params =array()
-	 * @param string|array $params['query'] string: pattern so search for, if unset or empty all matching entries are returned (no search)
-	 *		Please Note: a search never returns repeating events more then once AND does not honor start+end date !!!
-	 *      array: everything is directly used as $where
-	 * @param string $params['order'] ='cal_start' column-names plus optional DESC|ASC separted by comma
-	 * @param string $params['sql_filter'] sql to be and'ed into query (fully quoted)
-	 * @param string|array $params['cols'] what to select, default "$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date",
-	 * 						if specified and not false an iterator for the rows is returned
-	 * @param string $params['append'] SQL to append to the query before $order, eg. for a GROUP BY clause
-	 * @param array $params['cfs'] custom fields to query, null = none, array() = all, or array with cfs names
-	 * @param array $params['users'] raw parameter as passed to calendar_bo::search() no memberships resolved!
-	 * @param boolean $params['master_only'] =false, true only take into account participants/status from master (for AS)
-	 * @param boolean $params['enum_recuring'] =true enumerate recuring events
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return array of events
 	 */
@@ -594,7 +582,7 @@ 
 	/**
 	 * generate SQL to filter after a given category (incl. subcategories)
 	 *
-	 * @param array|int $cat_id cat-id or array of cat-ids, or !$cat_id for none
+	 * @param integer $cat_id cat-id or array of cat-ids, or !$cat_id for none
 	 * @return string SQL to include in the query
 	 */
 	function cat_filter($cat_id)
@@ -686,24 +674,11 @@ 
 	 * @param int $start startdate of the search/list (servertime)
 	 * @param int $end enddate of the search/list (servertime)
 	 * @param int|array $users user-id or array of user-id's, !$users means all entries regardless of users
-	 * @param int|array $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
+	 * @param integer $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
 	 * @param string $filter ='all' string filter-name: all (not rejected), accepted, unknown, tentative, rejected or everything (incl. rejected, deleted)
 	 * @param int|boolean $offset =False offset for a limited query or False (default)
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @param array $params =array()
-	 * @param string|array $params['query'] string: pattern so search for, if unset or empty all matching entries are returned (no search)
-	 *		Please Note: a search never returns repeating events more then once AND does not honor start+end date !!!
-	 *      array: everything is directly used as $where
-	 * @param string $params['order'] ='cal_start' column-names plus optional DESC|ASC separted by comma
-	 * @param string|array $params['sql_filter'] sql to be and'ed into query (fully quoted), or usual filter array
-	 * @param string|array $params['cols'] what to select, default "$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date",
-	 * 						if specified and not false an iterator for the rows is returned
-	 * @param string $params['append'] SQL to append to the query before $order, eg. for a GROUP BY clause
-	 * @param array $params['cfs'] custom fields to query, null = none, array() = all, or array with cfs names
-	 * @param array $params['users'] raw parameter as passed to calendar_bo::search() no memberships resolved!
-	 * @param boolean $params['master_only'] =false, true only take into account participants/status from master (for AS)
-	 * @param boolean $params['enum_recuring'] =true enumerate recuring events
-	 * @param boolean $params['use_so_events'] =false, true return result of new $this->events()
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return Iterator|array of events
 	 */
@@ -1168,11 +1143,11 @@ 
 	 * Ask other apps if they want to participate in calendar search / display
 	 *
 	 * @param &$selects parts of union query
-	 * @param $start see search()
-	 * @param $end
+	 * @param integer $start see search()
+	 * @param integer $end
 	 * @param $users as used in calendar_so ($users_raw plus all members and memberships added by calendar_bo)
-	 * @param $cat_id
-	 * @param $filter
+	 * @param integer $cat_id
+	 * @param string $filter
 	 * @param $query
 	 * @param $users_raw as passed to calendar_bo::search (no members and memberships added)
 	 */
@@ -1340,6 +1315,7 @@ 
 	 * @param int &$set_recurrences_start=0 on return: time from which on the recurrences should be rebuilt, default 0=all
 	 * @param int $change_since =0 time from which on the repetitions should be changed, default 0=all
 	 * @param int &$etag etag=null etag to check or null, on return new etag
+	 * @param boolean $set_recurrences
 	 * @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)
@@ -1735,7 +1711,7 @@ 
 	 * @param int $cal_id
 	 * @param int $start new starttime
 	 * @param int $end new endtime
-	 * @param int|boolean $change_since =0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
+	 * @param integer $change_since =0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
 	 * @param int $old_start =0 old starttime or (default) 0, to query it from the db
 	 * @param int $old_end =0 old starttime or (default) 0
 	 * @todo Recalculate recurrences, if timezone changes
@@ -1912,7 +1888,7 @@ 
 	 *
 	 * @param int $cal_id
 	 * @param array $participants uid => status pairs
-	 * @param int|boolean $change_since =0, false=new event,
+	 * @param integer $change_since =0, false=new event,
 	 * 		0=all, > 0 time from which on the repetitions should be changed
 	 * @param boolean $add_only =false
 	 *		false = add AND delete participants if needed (full list of participants required in $participants)
@@ -2058,7 +2034,7 @@ 
 	 * set the status of one participant for a given recurrence or for all recurrences since now (includes recur_date=0)
 	 *
 	 * @param int $cal_id
-	 * @param char $user_type 'u' regular user, 'r' resource, 'c' contact
+	 * @param string $user_type 'u' regular user, 'r' resource, 'c' contact
 	 * @param int|string $user_id
 	 * @param int|char $status numeric status (defines) or 1-char code: 'R', 'U', 'T' or 'A'
 	 * @param int $recur_date =0 date to change, or 0 = all since now
@@ -2975,7 +2951,7 @@ 
 	 * Updates the modification timestamp to force an etag, ctag and sync-token change
 	 *
 	 * @param int $id event id
-	 * @param int|boolean $update_master =false id of series master or true, to update series master too
+	 * @param boolean $update_master =false id of series master or true, to update series master too
 	 * @param int $time =null new timestamp, default current (server-)time
 	 * @param int $modifier =null uid of the modifier, default current user
 	 */

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -252,7 +252,7 @@ 
 			"	CASE WHEN recur_type IS NULL THEN egw_cal.range_start ELSE cal_start END AS cal_start,\n".
 			"	CASE WHEN recur_type IS NULL THEN egw_cal.range_end ELSE cal_end END AS cal_end\n".
 			// using time-limited range view, instead of complete table, give a big performance plus
-			"FROM $egw_cal\n".
+			"from $egw_cal\n".
 			"JOIN egw_cal_user ON egw_cal_user.cal_id=egw_cal.cal_id\n".
 			// need to left join dates, as egw_cal_user.recur_date is null for non-recuring event
 			"LEFT JOIN egw_cal_dates ON egw_cal_user.cal_id=egw_cal_dates.cal_id AND egw_cal_dates.cal_start=egw_cal_user.cal_recur_date\n".
@@ -345,7 +345,7 @@ 
 			$where[] = 'cal_start >= '.(int)$recur_date;
 			$group_by = 'GROUP BY '.$cols;
 			$cols .= ',MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end';
-			$join = "JOIN $this->dates_table ON $this->cal_table.cal_id=$this->dates_table.cal_id $join";
+			$join = "join $this->dates_table ON $this->cal_table.cal_id=$this->dates_table.cal_id $join";
 		}
 		else
 		{
@@ -884,7 +884,7 @@ 
 		$cal_table = $this->cal_range_view($start, $end, null, $filter == 'everything' ? null : $filter != 'deleted');
 		$cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table);
 
-		$u_join = "JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id ".
+		$u_join = "join $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id ".
 			"LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id ".
 			$rejected_by_user_join;
 		// dates table join only needed to enum recuring events, we use a time-range limited view here too
@@ -1415,7 +1415,7 @@ 
 			{
 				$old_repeats = $this->db->select($this->repeats_table, "$this->repeats_table.*,range_end AS recur_enddate",
 					"$this->repeats_table.cal_id=".(int)$cal_id, __LINE__, __FILE__,
-					false, '', 'calendar', 0, "JOIN $this->cal_table ON $this->repeats_table.cal_id=$this->cal_table.cal_id")->fetch();
+					false, '', 'calendar', 0, "join $this->cal_table ON $this->repeats_table.cal_id=$this->cal_table.cal_id")->fetch();
 			}
 			$where = array('cal_id' => $cal_id);
 			// read only timezone id, to check if it is changed
@@ -1782,13 +1782,13 @@ 
 		if ($move_start)
 		{
 			// 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 ".
+			$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__);
 		}
 		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".
+			$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__);
 		}
 		return $this->db->affected_rows();
@@ -2488,7 +2488,7 @@ 
 			),__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__,
+			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']);

Spacing +394 added lines, -397 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
@@ -141,7 +141,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;
@@ -157,11 +157,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();
@@ -187,11 +187,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();
@@ -236,14 +236,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!");
 		}
@@ -270,7 +270,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);
@@ -291,7 +291,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'];
 		}
 
@@ -300,8 +300,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;
 	}
 
@@ -315,12 +315,12 @@ 
 	 * @param boolean $read_recurrence =false true: read the exception, not the series master (only for recur_date && $ids='<uid>'!)
 	 * @return array|boolean array with cal_id => event array pairs or false if entry not found
 	 */
-	function read($ids, $recur_date=0, $read_recurrence=false)
+	function read($ids, $recur_date = 0, $read_recurrence = false)
 	{
 		//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();
@@ -338,23 +338,23 @@ 
 				$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 && !$read_recurrence)
+		if ((int)$recur_date && !$read_recurrence)
 		{
 			$where[] = 'cal_start >= '.(int)$recur_date;
 			$group_by = 'GROUP BY '.$cols;
@@ -367,7 +367,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);
 
 		// if we wanted to read the real recurrence, but we have eg. only a virtual one, we need to try again without $read_recurrence
 		if ((!$events || ($e = current($events)) && $e['deleted']) && $recur_date && $read_recurrence)
@@ -385,7 +385,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']))
 		{
@@ -397,7 +397,7 @@ 
 		}
 
 		$events = array();
-		foreach($rs as $row)
+		foreach ($rs as $row)
 		{
 			if (!$row['recur_type'])
 			{
@@ -405,7 +405,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;
 
@@ -417,26 +417,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,
@@ -452,7 +452,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;
 					}
@@ -474,21 +474,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;
@@ -497,7 +497,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'];
 		}
@@ -505,7 +505,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;
 			}
@@ -534,11 +534,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();
@@ -547,13 +547,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,
@@ -575,17 +575,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();
 	}
 
 	/**
@@ -597,7 +597,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);
 
@@ -625,14 +625,14 @@ 
 			$cats = $GLOBALS['egw']->categories->return_all_children($cat_id);
 			array_walk($cats, function(&$val, $key)
 			{
-				unset($key);	// not used, but required by function signature
-				$val = (int) $val;
+				unset($key); // not used, but required by function signature
+				$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)
+			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 .= ') ';
 		}
@@ -647,13 +647,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;
@@ -727,7 +727,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());
 
@@ -750,7 +750,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();
 		$join = '';
@@ -760,13 +760,13 @@ 
 		}
 		elseif ($params['query'])
 		{
-			$columns = array('cal_title','cal_description','cal_location');
+			$columns = array('cal_title', 'cal_description', 'cal_location');
 
 			$wildcard = $op = null;
-			if(!is_null($params['cfs']))
+			if (!is_null($params['cfs']))
 			{
 				$custom = Api\Storage\Customfields::get('calendar');
-				if($custom)
+				if ($custom)
 				{
 					$columns[] = 'cal_extra_value';
 					$join .= " LEFT JOIN {$this->extra_table} ON {$this->extra_table}.cal_id = {$this->cal_table}.cal_id ";
@@ -779,9 +779,9 @@ 
 			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']))
@@ -790,7 +790,7 @@ 
 			{
 				$where[] = $params['sql_filter'];
 			}
-			elseif(is_array($params['sql_filter']))
+			elseif (is_array($params['sql_filter']))
 			{
 				$where = array_merge($where, $params['sql_filter']);
 			}
@@ -799,11 +799,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
 				{
@@ -814,45 +814,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);
 		}
@@ -871,15 +871,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';
   		}
@@ -891,14 +891,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');
@@ -910,7 +909,7 @@ 
 		// 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 ".$u_join;
 		}
@@ -920,12 +919,12 @@ 
 		}
 
 		// 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";
 		}
@@ -958,29 +957,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";
 					}
 				}
 			}
@@ -990,34 +989,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
 		{
@@ -1040,27 +1039,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;
@@ -1072,9 +1071,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
 			{
@@ -1083,9 +1082,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))
@@ -1095,26 +1094,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]))
 						{
@@ -1129,16 +1128,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;
 						}
@@ -1151,10 +1150,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]))
 						{
@@ -1164,9 +1163,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'];
 
@@ -1203,16 +1202,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,
@@ -1221,12 +1220,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']);
 			}
 		}
 	}
@@ -1251,35 +1250,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]))
 				{
@@ -1292,7 +1291,7 @@ 
 			}
 		}
 		//error_log(__METHOD__."(".array2string($app_cols).", ".array2string($required).", '$required_app') returning ".array2string(implode(',',$return_cols)));
-		return implode(',',$return_cols);
+		return implode(',', $return_cols);
 	}
 
 	/**
@@ -1302,21 +1301,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']);
 			}
 		}
@@ -1369,12 +1368,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
 		{
@@ -1385,7 +1384,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;
 
@@ -1396,9 +1395,9 @@ 
 		}
 
 		// add colum prefix 'cal_' if there's not already a 'recur_' prefix
-		foreach(array_keys($event) as $col)
+		foreach (array_keys($event) as $col)
 		{
-			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] = $event[$col];
 				unset($event[$col]);
@@ -1408,13 +1407,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
@@ -1423,7 +1421,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;
@@ -1441,18 +1439,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=COALESCE(cal_etag,0)+1';	// always update the etag, even if none given to check
+			$event[] = 'cal_etag=COALESCE(cal_etag,0)+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;
 		}
@@ -1461,11 +1459,11 @@ 
 			// 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!
 
 			$event['cal_etag'] = $etag = 0;
-			$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;
 			}
@@ -1474,7 +1472,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', '>='))
@@ -1483,37 +1481,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);
@@ -1532,10 +1530,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)
@@ -1554,8 +1552,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']);
@@ -1565,7 +1563,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;
 			}
@@ -1574,22 +1572,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']))
 					{
@@ -1600,7 +1598,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);
@@ -1608,24 +1606,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");
 				}
@@ -1634,9 +1632,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,
@@ -1645,27 +1643,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'];
@@ -1673,19 +1671,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');
 				}
 			}
 		}
@@ -1696,9 +1694,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'];
 				}
@@ -1709,14 +1707,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
@@ -1736,7 +1734,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)
 		{
@@ -1747,7 +1745,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;
@@ -1768,34 +1766,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;
 
@@ -1803,13 +1801,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();
 	}
@@ -1828,8 +1826,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;
@@ -1842,11 +1839,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)
 		{
@@ -1866,12 +1863,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')
@@ -1885,7 +1882,7 @@ 
 		else
 		{
 			$user_type = $uid[0];
-			$user_id = substr($uid,1);
+			$user_id = substr($uid, 1);
 		}
 	}
 
@@ -1897,7 +1894,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;
@@ -1913,13 +1910,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];
@@ -1946,14 +1943,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')
 			{
@@ -1962,7 +1959,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.')';
 		}
@@ -1970,31 +1967,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
@@ -2007,7 +2004,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)
 				{
@@ -2019,46 +2016,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)
@@ -2068,13 +2065,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');
 			}
 		}
@@ -2093,7 +2090,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',
@@ -2118,7 +2115,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;
 		}
@@ -2129,7 +2126,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
@@ -2137,7 +2134,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)
 			{
@@ -2150,7 +2147,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;
@@ -2165,7 +2162,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);
@@ -2174,7 +2171,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))
 		{
@@ -2182,26 +2179,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');
 			}
 		}
 	}
@@ -2215,7 +2212,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".
@@ -2241,9 +2238,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');
 		}
 	}
 
@@ -2259,10 +2256,10 @@ 
 	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');
 			}
@@ -2287,23 +2284,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();
 
@@ -2311,13 +2308,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);
 					}
@@ -2329,7 +2326,7 @@ 
 			}
 			else
 			{
-				foreach($cal_id as $id)
+				foreach ($cal_id as $id)
 				{
 					$alarms[$id] = (array)self::$alarm_cache[$id];
 				}
@@ -2344,9 +2341,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'];
 
@@ -2369,8 +2366,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'];
 
@@ -2386,12 +2383,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
 			{
@@ -2404,13 +2401,13 @@ 
 		{
 			$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
 		// do not deleted async-job, as we need it for alarm snozzing
 		$alarm['keep'] = self::ALARM_KEEP_TIME;
 		// past alarms need NOT to be triggered, but kept around for a while to allow alarm snozzing
 		if ($alarm['time'] < time())
 		{
-			$alarm['time'] = $alarm['keep_time'] = time()+self::ALARM_KEEP_TIME;
+			$alarm['time'] = $alarm['keep_time'] = time() + self::ALARM_KEEP_TIME;
 		}
 		// add an alarm uid, if none is given
 		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid')) $alarm['uid'] = (string)new Horde_Support_Uuid;
@@ -2443,7 +2440,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);
 			}
@@ -2463,7 +2460,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);
@@ -2482,7 +2479,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))
 		{
@@ -2493,52 +2490,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');
 		}
 	}
 
@@ -2552,18 +2549,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;
@@ -2577,17 +2574,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;
@@ -2636,8 +2633,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)
 			{
@@ -2666,10 +2663,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;
@@ -2693,27 +2690,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)
@@ -2724,14 +2721,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)");
 			}
@@ -2750,11 +2747,11 @@ 
 						//	'() tz exception: ' . $day->format('Ymd\THis'));
 						if ($remote)
 						{
-							$days[$locts]= $remts;
+							$days[$locts] = $remts;
 						}
 						else
 						{
-							$days[$remts]= $locts;
+							$days[$remts] = $locts;
 						}
 					}
 				}
@@ -2776,18 +2773,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') &&
@@ -2797,11 +2794,11 @@ 
 					if ($expand_all)
 					{
 
-						$days[$remts]= $locts;
+						$days[$remts] = $locts;
 					}
 					else
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 			}
@@ -2825,9 +2822,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)
 		{
@@ -2838,8 +2835,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'])
 				{
@@ -2862,8 +2859,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'])
 			{
@@ -2888,42 +2885,42 @@ 
 						if ($status != 'U')
 						{
 							unset($participants[$uid]);
-							continue 2;	// +1 for switch
+							continue 2; // +1 for switch
 						}
 						break;
 					case 'accepted':
 						if ($status != 'A')
 						{
 							unset($participants[$uid]);
-							continue 2;	// +1 for switch
+							continue 2; // +1 for switch
 						}
 						break;
 					case 'tentative':
 						if ($status != 'T')
 						{
 							unset($participants[$uid]);
-							continue 2;	// +1 for switch
+							continue 2; // +1 for switch
 						}
 						break;
 					case 'rejected':
 						if ($status != 'R')
 						{
 							unset($participants[$uid]);
-							continue 2;	// +1 for switch
+							continue 2; // +1 for switch
 						}
 						break;
 					case 'delegated':
 						if ($status != 'D')
 						{
 							unset($participants[$uid]);
-							continue 2;	// +1 for switch
+							continue 2; // +1 for switch
 						}
 						break;
 					case 'default':
 						if ($status == 'R')
 						{
 							unset($participants[$uid]);
-							continue 2;	// +1 for switch
+							continue 2; // +1 for switch
 						}
 						break;
 					default:
@@ -2960,14 +2957,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;
@@ -2981,7 +2978,7 @@ 
 	 *
 	 * @return DateTime
 	 */
-	function &startOfDay(Api\DateTime $time, $tz_id=null)
+	function &startOfDay(Api\DateTime $time, $tz_id = null)
 	{
 		if (empty($tz_id))
 		{
@@ -3006,14 +3003,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)

Braces +366 added lines, -96 removed lines

@@ -159,16 +159,32 @@ 
 	 */
 	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!
+		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)
 		{
-			return $this->cal_table;	// no need / use for a view
+			// using view without start-date is slower!
+		{
+			return $this->cal_table;
+		}
+		// no need / use for a view
 		}
 
 		$where = array();
-		if (isset($deleted)) $where[] = "cal_deleted IS ".($deleted ? '' : 'NOT').' NULL';
-		if ($end) $where[] = "range_start<".(int)$end;
-		if ($start) $where[] = "(range_end IS NULL OR range_end>".(int)$start.")";
-		if ($_where) $where = array_merge($where, $_where);
+		if (isset($deleted))
+		{
+			$where[] = "cal_deleted IS ".($deleted ? '' : 'NOT').' NULL';
+		}
+		if ($end)
+		{
+			$where[] = "range_start<".(int)$end;
+		}
+		if ($start)
+		{
+			$where[] = "(range_end IS NULL OR range_end>".(int)$start.")";
+		}
+		if ($_where)
+		{
+			$where = array_merge($where, $_where);
+		}
 
 		$sql = "(SELECT * FROM $this->cal_table WHERE ".$this->db->expression($this->cal_table, $where).") $this->cal_table";
 
@@ -189,16 +205,32 @@ 
 	 */
 	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!
+		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();
-		if (isset($deleted)) $where['recur_exception'] = $deleted;
-		if ($end) $where[] = "cal_start<".(int)$end;
-		if ($start) $where[] = "cal_end>".(int)$start;
-		if ($_where) $where = array_merge($where, $_where);
+		if (isset($deleted))
+		{
+			$where['recur_exception'] = $deleted;
+		}
+		if ($end)
+		{
+			$where[] = "cal_start<".(int)$end;
+		}
+		if ($start)
+		{
+			$where[] = "cal_end>".(int)$start;
+		}
+		if ($_where)
+		{
+			$where = array_merge($where, $_where);
+		}
 
 		// Api\Db::union uses Api\Db::select which check if join contains "WHERE"
 		// to support old join syntax like ", other_table WHERE ...",
@@ -248,7 +280,10 @@ 
 			throw new Api\Exception\AssertionFailed("Unsupported value for parameters!");
 		}
 		$where = is_array($params['query']) ? $params['query'] : array();
-		if ($cat_id) $where[] = $this->cat_filter($cat_id);
+		if ($cat_id)
+		{
+			$where[] = $this->cat_filter($cat_id);
+		}
 		$egw_cal = $this->cal_range_view($start, $end, $where, $filter == 'everything' ? null : $filter != 'deleted');
 
 		$status_filter = $this->status_filter($filter, $params['enum_recuring']);
@@ -269,7 +304,10 @@ 
 		if ($users)
 		{
 			// fix $users to also prefix system users and groups (with 'u')
-			if (!is_array($users)) $users = $users ? (array)$users : array();
+			if (!is_array($users))
+			{
+				$users = $users ? (array)$users : array();
+			}
 			foreach($users as &$uid)
 			{
 				$user_type = $user_id = null;
@@ -289,15 +327,22 @@ 
 			$sql .= " AND\n	".$params['sql_filter'];
 		}
 
-		if ($params['order'])	// only order if requested
+		if ($params['order'])
 		{
-			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+			// only order if requested
+		{
+			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';
+		}
+		// gard against SQL injection
 			$sql .= "\nORDER BY ".$params['order'];
 		}
 
-		if ($offset === false)	// return all rows --> Api\Db::query wants offset=0, num_rows=-1
+		if ($offset === false)
+		{
+			// return all rows --> Api\Db::query wants offset=0, num_rows=-1
 		{
 			$offset = 0;
+		}
 			$num_rows = -1;
 		}
 		$events =& $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
@@ -324,10 +369,13 @@ 
 		$join = "LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id";
 
 		$where = array();
-		if (is_scalar($ids) && !is_numeric($ids))	// a single uid
+		if (is_scalar($ids) && !is_numeric($ids))
+		{
+			// a single uid
 		{
 			// We want only the parents to match
 			$where['cal_uid'] = $ids;
+		}
 			if ($read_recurrence)
 			{
 				$where['cal_recurrence'] = $recur_date;
@@ -337,20 +385,26 @@ 
 				$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!
 		}
-		if (isset($where['cal_id']))	// prevent non-unique column-name cal_id
+		if (isset($where['cal_id']))
+		{
+			// prevent non-unique column-name cal_id
 		{
 			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.',array(
 				'cal_id' => $where['cal_id'],
 			));
+		}
 			unset($where['cal_id']);
 		}
 		if ((int) $recur_date && !$read_recurrence)
@@ -406,10 +460,16 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 			$events[$row['cal_id']] = Api\Db::strip_array_keys($row,'cal_');
 		}
-		if (!$events) return $events;
+		if (!$events)
+		{
+			return $events;
+		}
 
 		$ids = array_keys($events);
-		if (count($ids) == 1) $ids = $ids[0];
+		if (count($ids) == 1)
+		{
+			$ids = $ids[0];
+		}
 
 		foreach ($events as &$event)
 		{
@@ -483,10 +543,13 @@ 
 			'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']);
 
 			$events[$row['cal_id']]['participants'][$uid] = $status;
@@ -543,7 +606,10 @@ 
 			$last_request = time();
 		}
 		$signature = serialize(func_get_args());
-		if (isset($ctags[$signature])) return $ctags[$signature];
+		if (isset($ctags[$signature]))
+		{
+			return $ctags[$signature];
+		}
 
 		$types = array();
 		foreach((array)$users as $uid)
@@ -576,7 +642,10 @@ 
 			// owner can only by users, no groups or resources
 			foreach($users as $key => $user)
 			{
-				if (!($user > 0)) unset($users[$key]);
+				if (!($user > 0))
+				{
+					unset($users[$key]);
+				}
 			}
 			$where = $this->db->expression($this->user_table, '(', $where, ' OR ').
 				$this->db->expression($this->cal_table, array(
@@ -598,7 +667,10 @@ 
 	 */
 	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);
+		if (!is_array($cols))
+		{
+			$cols = explode(',', $cols);
+		}
 
 		// special handling of cal_user_modified "pseudo" column
 		if (($key = array_search('cal_user_modified', $cols)) !== false)
@@ -627,7 +699,10 @@ 
 				unset($key);	// not used, but required by function signature
 				$val = (int) $val;
 			});
-			if (is_array($cat_id) && count($cat_id)==1) $cat_id = $cat_id[0];
+			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)
 			{
@@ -686,10 +761,13 @@ 
 				$where[] = "$this->user_table.cal_status NOT IN ('X','E')";
 				break;
 			default:
-				if ($enum_recuring)	// regular UI
+				if ($enum_recuring)
+				{
+					// regular UI
 				{
 					$where[] = "$this->user_table.cal_status NOT IN ('R','X','E')";
 				}
+				}
 				else	// CalDAV / eSync / iCal need to include 'E' = exceptions
 				{
 					$where[] = "$this->user_table.cal_status NOT IN ('R','X')";
@@ -831,7 +909,10 @@ 
 						$user_ids = array();
 						foreach($ids as $user_id)
 						{
-							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u') $user_ids[] = $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));
 					}
@@ -851,7 +932,10 @@ 
 				}
 			}
 			// 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);
 		}
@@ -870,7 +954,11 @@ 
 				$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'])
@@ -880,9 +968,15 @@ 
 			// 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);
 			$params['order'] = str_replace('cal_start', 'range_start', $params['order']);
-			if ($end) $where[] = (int)$end.' > range_start';
+			if ($end)
+			{
+				$where[] = (int)$end.' > range_start';
+			}
   		}
-		elseif ($end) $where[] = (int)$end.' > cal_start';
+  		elseif ($end)
+		{
+			$where[] = (int)$end.' > cal_start';
+		}
 
 		if ($remove_rejected_by_user && $filter != 'everything')
 		{
@@ -896,7 +990,10 @@ 
 				'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;
+			if ($filter == 'owner')
+			{
+				$or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
+			}
 			$where[] = '('.implode(' OR ',$or_required).')';
 		}
 		// using a time-range and deleted attribute limited view instead of full table
@@ -939,7 +1036,10 @@ 
 		if ($useUnionQuery)
 		{
 			// allow apps to supply participants and/or icons
-			if (!isset($params['cols'])) $cols .= ',NULL AS participants,NULL AS icons';
+			if (!isset($params['cols']))
+			{
+				$cols .= ',NULL AS participants,NULL AS icons';
+			}
 
 			// changed the original OR in the query into a union, to speed up the query execution under MySQL 5
 			// with time-range views benefit is now at best slim for huge tables or none at all!
@@ -994,9 +1094,12 @@ 
 					$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 				}
 			}
-			if (is_numeric($offset) && !$params['no_total'])	// get the total too
+			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)
 				{
@@ -1007,14 +1110,20 @@ 
 							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();
 
 				// 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);
 		}
@@ -1032,9 +1141,12 @@ 
 				'table_def' => $cal_table_def,
 			));
 
-			if (is_numeric($offset) && !$params['no_total'])	// get the total too
+			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)
 				$selects[0]['cols'] = "$this->cal_table.cal_id,cal_start";
 				if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
@@ -1062,7 +1174,10 @@ 
 		foreach($rs as $row)
 		{
 			$id = $row['cal_id'];
-			if (is_numeric($id)) $ids[] = $id;
+			if (is_numeric($id))
+			{
+				$ids[] = $id;
+			}
 
 			if ($row['cal_recur_date'])
 			{
@@ -1082,7 +1197,10 @@ 
 			$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_');
 		}
@@ -1101,10 +1219,16 @@ 
 					//'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
+				$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'];
+			}
+				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']);
@@ -1123,7 +1247,10 @@ 
 				}
 
 				// set data, if recurrence is requested
-				if (isset($events[$id])) $events[$id]['participants'][$uid] = $status;
+				if (isset($events[$id]))
+				{
+					$events[$id]['participants'][$uid] = $status;
+				}
 			}
 			// query recurrance exceptions, if needed: enum_recuring && !daywise is used in calendar_groupdav::get_series($uid,...)
 			if (!$params['enum_recuring'] || !$params['daywise'])
@@ -1139,7 +1266,10 @@ 
 					{
 						foreach($events as $id => $event)
 						{
-							if ($event['id'] == $row['cal_id']) break;
+							if ($event['id'] == $row['cal_id'])
+							{
+								break;
+							}
 						}
 					}
 					$events[$id]['recur_exception'][] = $row['cal_start'];
@@ -1149,7 +1279,10 @@ 
 			if (!is_null($params['cfs']))
 			{
 				$where = array('cal_id' => $ids);
-				if ($params['cfs']) $where['cal_extra_name'] = $params['cfs'];
+				if ($params['cfs'])
+				{
+					$where['cal_extra_name'] = $params['cfs'];
+				}
 				foreach($this->db->select($this->extra_table,'*',$where,
 					__LINE__,__FILE__,false,'','calendar') as $row)
 				{
@@ -1169,14 +1302,20 @@ 
 				{
 					$event_start = $alarm['time'] + $alarm['offset'];
 
-					if (isset($events[$cal_id]))	// none recuring event
+					if (isset($events[$cal_id]))
+					{
+						// none recuring event
 					{
 						$events[$cal_id]['alarm'][$id] = $alarm;
 					}
-					elseif (isset($events[$cal_id.'-'.$event_start]))	// recuring event
+					}
+					elseif (isset($events[$cal_id.'-'.$event_start]))
+					{
+						// recuring event
 					{
 						$events[$cal_id.'-'.$event_start]['alarm'][$id] = $alarm;
 					}
+					}
 				}
 			}
 		}
@@ -1276,10 +1415,13 @@ 
 			}
 			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);
 				}
+				}
 				if (isset($app_cols[$col]))
 				{
 					$return_cols[] = $app_cols[$col];
@@ -1373,7 +1515,11 @@ 
 		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
 		{
@@ -1404,7 +1550,10 @@ 
 			}
 		}
 		// set range_start/_end, but only if we have cal_start/_end, as otherwise we destroy present values!
-		if (isset($event['cal_start'])) $event['range_start'] = $event['cal_start'];
+		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'] :
@@ -1425,7 +1574,10 @@ 
 		$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;
+		if ($event['recur_type'] != MCAL_RECUR_NONE)
+		{
+			$event['cal_reference'] = 0;
+		}
 
 		if ($cal_id)
 		{
@@ -1442,7 +1594,10 @@ 
 			{
 				$old_tz_id = $this->db->select($this->cal_table,'tz_id',$where,__LINE__,__FILE__,'calendar')->fetchColumn();
 			}
-			if (!is_null($etag)) $where['cal_etag'] = $etag;
+			if (!is_null($etag))
+			{
+				$where['cal_etag'] = $etag;
+			}
 
 			unset($event['cal_etag']);
 			$event[] = 'cal_etag=COALESCE(cal_etag,0)+1';	// always update the etag, even if none given to check
@@ -1453,14 +1608,24 @@ 
 			{
 				return 0;	// wrong etag, someone else updated the entry
 			}
-			if (!is_null($etag)) ++$etag;
+			if (!is_null($etag))
+			{
+				++$etag;
+			}
 		}
 		else
 		{
 			// new event
-			if (!$event['cal_owner']) $event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			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!
 
 			$event['cal_etag'] = $etag = 0;
 			$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__,'calendar');
@@ -1612,8 +1777,7 @@ 
 					// recurrences need to be truncated
 					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');
 					}
@@ -1621,8 +1785,7 @@ 
 					// recurrences need to be expanded
 					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);
 					}
@@ -1771,12 +1934,18 @@ 
 	{
 		//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',
+			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'])
 			{
@@ -1878,7 +2047,10 @@ 
 			$user_type = $uid[0];
 			$email = substr($uid, 1);
 			$matches = null;
-			if (preg_match('/<([^<>]+)>$/', $email, $matches)) $email = $matches[1];
+			if (preg_match('/<([^<>]+)>$/', $email, $matches))
+			{
+				$email = $matches[1];
+			}
 			$user_id = md5(trim(strtolower($email)));
 		}
 		else
@@ -1898,8 +2070,14 @@ 
 	 */
 	static function combine_status($status,$quantity=1,$role='REQ-PARTICIPANT')
 	{
-		if ((int)$quantity > 1) $status .= (int)$quantity;
-		if ($role != 'REQ-PARTICIPANT') $status .= $role;
+		if ((int)$quantity > 1)
+		{
+			$status .= (int)$quantity;
+		}
+		if ($role != 'REQ-PARTICIPANT')
+		{
+			$status .= $role;
+		}
 
 		return $status;
 	}
@@ -1920,8 +2098,14 @@ 
 		$matches = null;
 		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];
+			if ((int)$matches[1] > 0)
+			{
+				$quantity = (int)$matches[1];
+			}
+			if ($matches[2])
+			{
+				$role = $matches[2];
+			}
 			$status = $status[0];
 		}
 		elseif ($status === true)
@@ -2032,9 +2216,13 @@ 
 			}
 		}
 
-		if (count($participants))	// participants which need to be added
+		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();
 
@@ -2106,7 +2294,10 @@ 
 			return false;
 		}
 
-		if (is_numeric($status)) $status = $status_code_short[$status];
+		if (is_numeric($status))
+		{
+			$status = $status_code_short[$status];
+		}
 
 		$uid = self::combine_user($user_type, $user_id);
 		$user_id_md5 = null;
@@ -2126,16 +2317,25 @@ 
 			$where[] = '(cal_recur_date=0 OR cal_recur_date >= '.time().')';
 		}
 
-		if ($status == 'G')		// remove group invitations, as we dont store them in the db
+		if ($status == 'G')
+		{
+			// remove group invitations, as we dont store them in the db
 		{
 			$this->db->delete($this->user_table,$where,__LINE__,__FILE__,'calendar');
+		}
 			$ret = $this->db->affected_rows();
 		}
 		else
 		{
 			$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;
+			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');
 			// 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)
@@ -2168,7 +2368,10 @@ 
 	{
 		//error_log(__METHOD__."($cal_id, $start, $end, ".array2string($participants).", ".array2string($exception));
 		$update = array('cal_end' => $end);
-		if (isset($exception)) $update['recur_exception'] = $exception;
+		if (isset($exception))
+		{
+			$update['recur_exception'] = $exception;
+		}
 
 		$this->db->insert($this->dates_table, $update, array(
 			'cal_id' => $cal_id,
@@ -2183,7 +2386,11 @@ 
 		{
 			foreach($participants as $uid => $status)
 			{
-				if ($status == 'G') continue;	// dont save group-invitations
+				if ($status == 'G')
+				{
+					continue;
+				}
+				// dont save group-invitations
 
 				$type = '';
 				$id = null;
@@ -2412,7 +2619,10 @@ 
 			$alarm['time'] = $alarm['keep_time'] = time()+self::ALARM_KEEP_TIME;
 		}
 		// add an alarm uid, if none is given
-		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid')) $alarm['uid'] = (string)new Horde_Support_Uuid;
+		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'], false, true))
@@ -2421,10 +2631,16 @@ 
 		}
 
 		// update the modification information of the related event
-		if ($update_modified) $this->updateModified($cal_id, true);
+		if ($update_modified)
+		{
+			$this->updateModified($cal_id, true);
+		}
 
 		// update cache, if used
-		if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, true);
+		if (isset(self::$alarm_cache))
+		{
+			$this->read_alarms($cal_id, true);
+		}
 
 		return $id;
 	}
@@ -2447,7 +2663,10 @@ 
 				$this->async->cancel_timer($id);
 			}
 			// update cache, if used
-			if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, false);
+			if (isset(self::$alarm_cache))
+			{
+				$this->read_alarms($cal_id, false);
+			}
 		}
 		return count($alarms);
 	}
@@ -2470,7 +2689,10 @@ 
 		$ret = $this->async->cancel_timer($id);
 
 		// update cache, if used
-		if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, true);
+		if (isset(self::$alarm_cache))
+		{
+			$this->read_alarms($cal_id, true);
+		}
 
 		return $ret;
 	}
@@ -2494,11 +2716,14 @@ 
 			$user_id = null;
 			self::split_user($old_user,$user_type,$user_id);
 
-			if ($user_type == 'u')	// only accounts can be owners of events
+			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)
 				{
 					$this->delete($row['cal_id']);
+			}
 				}
 			}
 			$this->db->delete($this->user_table,array(
@@ -2526,11 +2751,14 @@ 
 			{
 				$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');
+			}
 			// now change participant in the rest to contain new user instead of old user
 			$this->db->update($this->user_table,array(
 				'cal_user_id' => $new_user,
@@ -2555,8 +2783,14 @@ 
 	{
 		$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 .
@@ -2567,7 +2801,10 @@ 
 			// inititalize the array
 			$participant_status[$row['cal_recur_date']] = null;
 		}
-		if (is_null($uid)) return $participant_status;
+		if (is_null($uid))
+		{
+			return $participant_status;
+		}
 		$user_type = $user_id = null;
 		self::split_user($uid, $user_type, $user_id, true);
 
@@ -2576,8 +2813,14 @@ 
 			'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 .
@@ -2667,17 +2910,26 @@ 
 	 */
 	function get_recurrence_exceptions($event, $tz_id=null, $start=0, $end=0, $filter='all')
 	{
-		if (!is_array($event)) return false;
+		if (!is_array($event))
+		{
+			return false;
+		}
 		$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;
+		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE)
+		{
+			return false;
+		}
 
 		$days = array();
 
 		$expand_all = (!$this->isWholeDay($event) && $tz_id && $tz_id != $event['tzid']);
 
-		if ($filter == 'tz_only' && !$expand_all) return $days;
+		if ($filter == 'tz_only' && !$expand_all)
+		{
+			return $days;
+		}
 
 		$remote = in_array($filter, array('tz_rrule', 'rrule'));
 
@@ -2720,7 +2972,10 @@ 
 					$remote_rrule->next_no_exception();
 				}
 				$egw_rrule->next_no_exception();
-				if (!$egw_rrule->valid()) return $days;
+				if (!$egw_rrule->valid())
+				{
+					return $days;
+				}
 			}
 			$day = $egw_rrule->current();
 			$locts = (int)Api\DateTime::to($day,'server');
@@ -2874,7 +3129,11 @@ 
 			}
 		}
 
-		if (empty($participants)) return false; // occurrence does not exist at all yet
+		if (empty($participants))
+		{
+			return false;
+		}
+		// occurrence does not exist at all yet
 
 		foreach ($recurrence_zero as $uid => $status)
 		{
@@ -2931,7 +3190,9 @@ 
 			}
 			if (!isset($participants[$uid])
 				|| $participants[$uid] != $status)
-				return true;
+			{
+							return true;
+			}
 			unset($participants[$uid]);
 		}
 		return (!empty($participants));
@@ -2945,7 +3206,10 @@ 
 	 */
 	function isWholeDay($event)
 	{
-		if (!isset($event['start']) || !isset($event['end'])) return false;
+		if (!isset($event['start']) || !isset($event['end']))
+		{
+			return false;
+		}
 
 		if (empty($event['tzid']))
 		{
@@ -3007,8 +3271,14 @@ 
 	 */
 	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'];
+		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),

api/asyncservices.php

Spacing +10 added lines, -11 removed lines

@@ -15,7 +15,7 @@ 
 use EGroupware\Api\Asyncservice;
 
 if (!isset($_REQUEST['domain'])) $_REQUEST['domain'] = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'default';
-$path_to_egroupware = realpath(__DIR__.'/..');	//  need to be adapted if this script is moved somewhere else
+$path_to_egroupware = realpath(__DIR__.'/..'); //  need to be adapted if this script is moved somewhere else
 
 // remove the comment from one of the following lines to enable loging
 // define('ASYNC_LOG','C:\\async.log');		// Windows
@@ -25,8 +25,8 @@ 
 if (defined('ASYNC_LOG'))
 {
 	$msg = date('Y/m/d H:i:s ').$_REQUEST['domain'].": asyncservice started\n";
-	$f = fopen(ASYNC_LOG,'a+');
-	fwrite($f,$msg);
+	$f = fopen(ASYNC_LOG, 'a+');
+	fwrite($f, $msg);
 	fclose($f);
 }
 $GLOBALS['egw_info']['flags'] = array(
@@ -43,8 +43,8 @@ 
 	}
 	if (defined('ASYNC_LOG'))
 	{
-		$f = fopen(ASYNC_LOG,'a+');
-		fwrite($f,$msg);
+		$f = fopen(ASYNC_LOG, 'a+');
+		fwrite($f, $msg);
 		fclose($f);
 	}
 	die($msg);
@@ -63,8 +63,8 @@ 
 	}
 	if (defined('ASYNC_LOG'))
 	{
-		$f = fopen(ASYNC_LOG,'a+');
-		fwrite($f,$msg);
+		$f = fopen(ASYNC_LOG, 'a+');
+		fwrite($f, $msg);
 		fclose($f);
 	}
 	die($msg);
@@ -75,8 +75,7 @@ 
 $async = new Asyncservice();
 $num = $async->check_run(isset($_REQUEST['run_by']) ? $_REQUEST['run_by'] : 'crontab');
 
-$msg = date('Y/m/d H:i:s ').$_REQUEST['domain'].': '.($num === false ? 'An error occured: can not obtain semaphore!' :
-	($num ? "$num job(s) executed" : 'Nothing to execute'))."\n\n";
+$msg = date('Y/m/d H:i:s ').$_REQUEST['domain'].': '.($num === false ? 'An error occured: can not obtain semaphore!' : ($num ? "$num job(s) executed" : 'Nothing to execute'))."\n\n";
 
 if (isset($_SERVER['HTTP_HOST']))
 {
@@ -87,7 +86,7 @@ 
 
 if (defined('ASYNC_LOG'))
 {
-	$f = fopen(ASYNC_LOG,'a+');
-	fwrite($f,$msg);
+	$f = fopen(ASYNC_LOG, 'a+');
+	fwrite($f, $msg);
 	fclose($f);
 }

Braces +4 added lines, -1 removed lines

@@ -14,7 +14,10 @@
 
 use EGroupware\Api\Asyncservice;
 
-if (!isset($_REQUEST['domain'])) $_REQUEST['domain'] = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'default';
+if (!isset($_REQUEST['domain']))
+{
+	$_REQUEST['domain'] = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'default';
+}
 $path_to_egroupware = realpath(__DIR__.'/..');	//  need to be adapted if this script is moved somewhere else
 
 // remove the comment from one of the following lines to enable loging

api/images.php

Spacing +6 added lines, -6 removed lines

@@ -28,17 +28,17 @@ 
 
 include '../header.inc.php';
 
-$content = json_encode(Api\Image::map(preg_match('/^[a-z0-9_-]+$/i',$_GET['template']) ? $_GET['template'] : null, $_GET['svg']),
-	JSON_FORCE_OBJECT |	// export empty php-arrays as empty objects, not empty arrays
-	JSON_UNESCAPED_SLASHES | // do not escape slashes, smaller and better readable
+$content = json_encode(Api\Image::map(preg_match('/^[a-z0-9_-]+$/i', $_GET['template']) ? $_GET['template'] : null, $_GET['svg']),
+	JSON_FORCE_OBJECT|// export empty php-arrays as empty objects, not empty arrays
+	JSON_UNESCAPED_SLASHES|// do not escape slashes, smaller and better readable
 	(!empty($_GET['debug']) ? JSON_PRETTY_PRINT : 0));
 
 // use an etag over the image mapp
 $etag = '"'.md5($content).'"';
 
 // headers to allow caching, egw_framework specifies etag on url to force reload, even with Expires header
-Api\Session::cache_control(86400);	// cache for one day
-Header('Content-Type: '.(empty($_GET['debug'])?'text/javascript':'application/json').'; charset=utf-8');
+Api\Session::cache_control(86400); // cache for one day
+Header('Content-Type: '.(empty($_GET['debug']) ? 'text/javascript' : 'application/json').'; charset=utf-8');
 Header('ETag: '.$etag);
 
 // if servers send a If-None-Match header, response with 304 Not Modified, if etag matches
@@ -51,7 +51,7 @@ 
 if (empty($_GET['debug'])) $content = 'egw.set_images('.$content.", egw && egw.window !== window);\n";
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
-if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
+if (in_array('gzip', explode(',', $_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
 {
 	$content = gzencode($content);
 	header('Content-Encoding: gzip');

Braces +4 added lines, -1 removed lines

@@ -48,7 +48,10 @@
 	exit;
 }
 
-if (empty($_GET['debug'])) $content = 'egw.set_images('.$content.", egw && egw.window !== window);\n";
+if (empty($_GET['debug']))
+{
+	$content = 'egw.set_images('.$content.", egw && egw.window !== window);\n";
+}
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
 if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))

api/src/Framework/Template.php

Spacing +34 added lines, -34 removed lines

@@ -32,7 +32,7 @@ 
 	 *	- function-name like set_var to get eg. all assignments or
 	 *	- handle- / variable-names - if you are only interested in some variables ;-)
 	 */
-	var $debug = False;	// array('cat_list','cat_list_t');
+	var $debug = False; // array('cat_list','cat_list_t');
 
 	/**
 	 * $file[handle] = 'filename';
@@ -128,9 +128,9 @@ 
 	 */
 	function set_file($handle, $filename = '')
 	{
-		if ($this->debug && $this->check_debug('set_file',$handle,$filename))
+		if ($this->debug && $this->check_debug('set_file', $handle, $filename))
 		{
-			echo "<p>Template::set_file('".print_r($handle,true)."','$filename')</p>\n";
+			echo "<p>Template::set_file('".print_r($handle, true)."','$filename')</p>\n";
 		}
 		if (!is_array($handle))
 		{
@@ -143,7 +143,7 @@ 
 		}
 		else
 		{
-			foreach($handle as $h => $f)
+			foreach ($handle as $h => $f)
 			{
 				$this->file[$h] = $this->filename($f);
 			}
@@ -160,7 +160,7 @@ 
 	 */
 	function set_block($parent, $handle, $name = '')
 	{
-		if ($this->debug && $this->check_debug('set_block',$parent,$handle,$name))
+		if ($this->debug && $this->check_debug('set_block', $parent, $handle, $name))
 		{
 			echo "<p>Template::set_block('$parent','$handle','$name')</p>\n";
 		}
@@ -177,14 +177,14 @@ 
 		$qhandle = preg_quote($handle);
 		$reg = "/<!--\\s+BEGIN $qhandle\\s+-->(.*)\n\\s*<!--\\s+END $qhandle\\s+-->/s";
 		$match = null;
-		if (!preg_match($reg,$str,$match))
+		if (!preg_match($reg, $str, $match))
 		{
 			// unfortunaly some apps set non-existing blocks, therefor I have to disable this diagnostics again for now
 			$this->halt("set_block: unable to find block '$handle' in '$parent'=<pre>".htmlspecialchars($str)."</pre> this->root=$this->root");
 			// return False;
 		}
-		$this->set_var($handle,$match[1]);
-		$this->set_var($parent,preg_replace($reg, '{' . "$name}",$str));
+		$this->set_var($handle, $match[1]);
+		$this->set_var($parent, preg_replace($reg, '{'."$name}", $str));
 	}
 
 	/* public: set_var(array $values)
@@ -205,18 +205,18 @@ 
 				$varname => $value
 			);
 		}
-		foreach($varname as $k => $v)
+		foreach ($varname as $k => $v)
 		{
 			if (!empty($k))
 			{
-				if ($this->debug && $this->check_debug('set_var',$k))
+				if ($this->debug && $this->check_debug('set_var', $k))
 				{
 					echo "<p>Template::set_var('$k','$v')</p>\n";
 				}
 				$this->varkeys[$k] = $this->varname($k);
 				$this->varvals[$k] = $this->egroupware_hack ? str_replace(
-					array('phpGroupWare','www.phpgroupware.org'),
-					array('eGroupWare','www.eGroupWare.org'),$v
+					array('phpGroupWare', 'www.phpgroupware.org'),
+					array('eGroupWare', 'www.eGroupWare.org'), $v
 				) : $v;
 			}
 		}
@@ -230,7 +230,7 @@ 
 	 */
 	function subst($handle)
 	{
-		if ($this->debug && $this->check_debug('subst',$handle))
+		if ($this->debug && $this->check_debug('subst', $handle))
 		{
 			echo "<p>Template::subst('$handle')</p>\n";
 		}
@@ -241,7 +241,7 @@ 
 		}
 
 		$str = $this->get_var($handle);
-		foreach($this->varkeys as $k => $v)
+		foreach ($this->varkeys as $k => $v)
 		{
 			$str = str_replace($v, $this->varvals[$k], $str);
 		}
@@ -276,7 +276,7 @@ 
 			$str = $this->subst($handle);
 			if ($append)
 			{
-				$this->set_var($target, $this->get_var($target) . $str);
+				$this->set_var($target, $this->get_var($target).$str);
 			}
 			else
 			{
@@ -285,7 +285,7 @@ 
 		}
 		else
 		{
-			foreach($handle as $h)
+			foreach ($handle as $h)
 			{
 				$str = $this->subst($h);
 				$this->set_var($target, $str);
@@ -332,7 +332,7 @@ 
 	 */
 	function get_vars()
 	{
-		foreach(array_keys($this->varkeys) as $k)
+		foreach (array_keys($this->varkeys) as $k)
 		{
 			$result[$k] = $this->varvals[$k];
 		}
@@ -353,7 +353,7 @@ 
 		}
 		else
 		{
-			foreach(array_keys($varname) as $k)
+			foreach (array_keys($varname) as $k)
 			{
 				$result[$k] = $this->varvals[$k];
 			}
@@ -382,7 +382,7 @@ 
 		{
 			return false;
 		}
-		foreach($m as $v)
+		foreach ($m as $v)
 		{
 			if (!isset($this->varkeys[$v]))
 			{
@@ -448,15 +448,15 @@ 
 	 * @param string $root ='' default $this->root
 	 * @param int $time =1
 	 */
-	protected function filename($filename,$root='',$time=1)
+	protected function filename($filename, $root = '', $time = 1)
 	{
-		if($root == '')
+		if ($root == '')
 		{
 			$root = $this->root;
 		}
-		if(substr($filename, 0, 1) != '/')
+		if (substr($filename, 0, 1) != '/')
 		{
-			$new_filename = $root . '/' . $filename;
+			$new_filename = $root.'/'.$filename;
 		}
 		else
 		{
@@ -465,14 +465,14 @@ 
 
 		if (!file_exists($new_filename))
 		{
-			if($time==2)
+			if ($time == 2)
 			{
 				$this->halt("filename: file $new_filename does not exist.");
 			}
 			else
 			{
-				$new_root = dirname($root) . DIRECTORY_SEPARATOR . 'default';
-				$new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2);
+				$new_root = dirname($root).DIRECTORY_SEPARATOR.'default';
+				$new_filename = $this->filename(str_replace($root.'/', '', $new_filename), $new_root, 2);
 			}
 		}
 		return $new_filename;
@@ -491,9 +491,9 @@ 
 	 */
 	function loadfile($handle)
 	{
-		if ($this->debug && $this->check_debug('loadfile',$handle))
+		if ($this->debug && $this->check_debug('loadfile', $handle))
 		{
-			echo "<p>Template::loadfile('$handle') file=<pre>\n".print_r($this->file,True)."</pre>\n";
+			echo "<p>Template::loadfile('$handle') file=<pre>\n".print_r($this->file, True)."</pre>\n";
 			echo "<p>backtrace: ".function_backtrace()."</p>\n";
 		}
 		if (isset($this->varkeys[$handle]) && !empty($this->varvals[$handle]))
@@ -502,9 +502,9 @@ 
 		}
 		if (!isset($this->file[$handle]))
 		{
-			if ($this->debug && $this->check_debug('loadfile',$handle))
+			if ($this->debug && $this->check_debug('loadfile', $handle))
 			{
-				echo "varkeys =<pre>".print_r($this->varkeys,True)."</pre>varvals =<pre>".print_r($this->varvals,True)."</pre>\n";
+				echo "varkeys =<pre>".print_r($this->varkeys, True)."</pre>varvals =<pre>".print_r($this->varvals, True)."</pre>\n";
 			}
 			$this->halt("loadfile: $handle is not a valid handle.");
 			return false;
@@ -549,10 +549,10 @@ 
 	{
 		if (!$this->debug) return False;
 
-		foreach(func_get_args() as $arg)
+		foreach (func_get_args() as $arg)
 		{
 			if (!is_array($this->debug) && $this->debug === $arg ||
-				(is_array($this->debug) && (@$this->debug[$arg] || in_array($arg,$this->debug,True))))
+				(is_array($this->debug) && (@$this->debug[$arg] || in_array($arg, $this->debug, True))))
 			{
 				return True;
 			}
@@ -601,8 +601,8 @@ 
 		{
 			$GLOBALS['egw_info']['server']['template_set'] = 'idots';
 		}
-		$tpldir         = EGW_SERVER_ROOT . '/' . $appname . '/templates/' . $GLOBALS['egw_info']['server']['template_set'];
-		$tpldir_default = EGW_SERVER_ROOT . '/' . $appname . '/templates/default';
+		$tpldir         = EGW_SERVER_ROOT.'/'.$appname.'/templates/'.$GLOBALS['egw_info']['server']['template_set'];
+		$tpldir_default = EGW_SERVER_ROOT.'/'.$appname.'/templates/default';
 
 		if (@is_dir($tpldir))
 		{

Braces +4 added lines, -1 removed lines

@@ -547,7 +547,10 @@
 
 	function check_debug()
 	{
-		if (!$this->debug) return False;
+		if (!$this->debug)
+		{
+			return False;
+		}
 
 		foreach(func_get_args() as $arg)
 		{

Doc Comments +6 added lines, -1 removed lines

@@ -156,7 +156,7 @@ 
 	 * @param string $parent name of tempalte containing $handle
 	 * @param string $handle name of part
 	 * @param string $name name of variable/placeholder
-	 * @return boolean
+	 * @return false|null
 	 */
 	function set_block($parent, $handle, $name = '')
 	{
@@ -311,6 +311,8 @@ 
 
 	/**
 	 * This is short for finish parse
+	 * @param string $target
+	 * @param string $handle
 	 */
 	function fp($target, $handle, $append = False)
 	{
@@ -319,6 +321,8 @@ 
 
 	/**
 	 * This is a short cut for print finish parse
+	 * @param string $target
+	 * @param string $handle
 	 */
 	function pfp($target, $handle, $append = False)
 	{
@@ -365,6 +369,7 @@ 
 	 * Return undefined variables/placeholders of a handle
 	 *
 	 * @param string handle handle of a template
+	 * @param string $handle
 	 * @return array|boolean array with undefined variables as key and value, or false if none
 	 */
 	function get_undefined($handle)

api/src/Framework/Tutorial.php

Spacing +7 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param array $content
 	 */
-	function popup ($content=null)
+	function popup($content = null)
 	{
 		// check and if not done register tutorial_menu hook
 		if (!Api\Hooks::exists('sidebox_all', 'api') ||
@@ -48,7 +48,7 @@ 
 		if (!is_array($content))
 		{
 			// Get tutorial object id
-			$tuid_indx = explode('-',$_GET['tuid']);
+			$tuid_indx = explode('-', $_GET['tuid']);
 			$appName = $tuid_indx[0];
 			$lang = $tuid_indx[1];
 			$id = $tuid_indx[2];
@@ -57,7 +57,7 @@ 
 		{
 			$appName = $content['list']['apps'];
 			$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
-			$id ="0";
+			$id = "0";
 		}
 		// read tutorials json file to fetch data
 		$tutorials = json_decode(self::getJsonData(), true);
@@ -74,8 +74,7 @@ 
 		if (in_array($appName, array_keys($GLOBALS['egw_info']['user']['apps'])) || $appName === "introduction")
 		{
 			// fallback to english video
-			$tutorial = $tutorials[$appName][$lang][$id]? $tutorials[$appName][$lang][$id]:
-				$tutorials[$appName]['en'][$id];
+			$tutorial = $tutorials[$appName][$lang][$id] ? $tutorials[$appName][$lang][$id] : $tutorials[$appName]['en'][$id];
 
 			$list = array(
 				'apps' => $appName,
@@ -86,7 +85,7 @@ 
 				$v ['onclick'] = 'app[egw.app_name()].tutorial_videoOnClick("'.$v['src'].'")';
 				array_push($list, $v);
 			}
-			$content = array (
+			$content = array(
 				'src' => $tutorial['src'],
 				'title' => $tutorial['title'],
 				'desc' => $tutorial['desc'],
@@ -137,13 +136,13 @@ 
 	public static function tutorial_menu()
 	{
 		if (Api\Header\UserAgent::mobile()) return;
-		$tutorials = json_decode(self::getJsonData(),true);
+		$tutorials = json_decode(self::getJsonData(), true);
 		$appname = $GLOBALS['egw_info']['flags']['currentapp'];
 		if (!is_array($tutorials[$appname])) return false;
 		if (!$GLOBALS['egw_info']['server']['egw_tutorial_disable']
 			|| $GLOBALS['egw_info']['server']['egw_tutorial_disable'] == 'intro')
 		{
-			$file = Array (
+			$file = Array(
 				array(
 					'text'    => '<div id="egw_tutorial_'.$appname.'_sidebox" class="egwTutorial"/>',
 					'no_lang' => true,

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 		if (!$GLOBALS['egw_info']['server']['egw_tutorial_disable']
 			|| $GLOBALS['egw_info']['server']['egw_tutorial_disable'] == 'intro')
 		{
-			$file = Array (
+			$file = array (
 				array(
 					'text'    => '<div id="egw_tutorial_'.$appname.'_sidebox" class="egwTutorial"/>',
 					'no_lang' => true,

Braces +16 added lines, -4 removed lines

@@ -65,7 +65,10 @@ 
 		foreach (array_keys($tutorials) as $app)
 		{
 			// show only apps user has access to them
-			if (in_array($app, array_keys($GLOBALS['egw_info']['user']['apps']))) $apps [$app] = $app;
+			if (in_array($app, array_keys($GLOBALS['egw_info']['user']['apps'])))
+			{
+				$apps [$app] = $app;
+			}
 		}
 		$sel_options = array(
 			'apps' => $apps,
@@ -123,7 +126,10 @@ 
 			$json = file_get_contents('https://www.egroupware.org/videos/tutorials.json',
 				false, Api\Framework::proxy_context());
 			// Fallback tutorials.json
-			if (!$json) $json = file_get_contents('api/setup/tutorials.json');
+			if (!$json)
+			{
+				$json = file_get_contents('api/setup/tutorials.json');
+			}
 			// Cache the json object for two hours
 			Api\Cache::setCache(Api\Cache::TREE, __CLASS__, 'egw_tutorial_json', $json, 7200);
 		}
@@ -137,10 +143,16 @@ 
 	 */
 	public static function tutorial_menu()
 	{
-		if (Api\Header\UserAgent::mobile()) return;
+		if (Api\Header\UserAgent::mobile())
+		{
+			return;
+		}
 		$tutorials = json_decode(self::getJsonData(),true);
 		$appname = $GLOBALS['egw_info']['flags']['currentapp'];
-		if (!is_array($tutorials[$appname])) return false;
+		if (!is_array($tutorials[$appname]))
+		{
+			return false;
+		}
 		if (!$GLOBALS['egw_info']['server']['egw_tutorial_disable']
 			|| $GLOBALS['egw_info']['server']['egw_tutorial_disable'] == 'intro')
 		{

api/src/Framework/Bundle.php

Spacing +15 added lines, -15 removed lines

@@ -51,7 +51,7 @@ 
 			$bundles = Cache::getTree(__CLASS__, 'bundles', array(__CLASS__, 'all'), array(), 7200);
 			$bundles_ts = $bundles['.ts'];
 			unset($bundles['.ts']);
-			foreach($bundles as $name => $files)
+			foreach ($bundles as $name => $files)
 			{
 				// to facilitate move to new api/et2 location, can be removed after 16.1 release
 				if ($name == 'et21' && !in_array('/api/js/etemplate/etemplate2.js', $files) ||
@@ -72,9 +72,9 @@ 
 		}
 		$to_include = $included_bundles = array();
 		$query = null;
-		foreach($js_includes as $file)
+		foreach ($js_includes as $file)
 		{
-			if ($file == '/api/js/jsapi/egw.js') continue;	// loaded via own tag, and we must not load it twice!
+			if ($file == '/api/js/jsapi/egw.js') continue; // loaded via own tag, and we must not load it twice!
 
 			if (!isset($to_include[$file]))
 			{
@@ -129,7 +129,7 @@ 
 	 * @param string $minurl =null url of minified bundle, to be used, if existing and recent
 	 * @return array js-files (can be more then one, if one of given files can not be bundeled)
 	 */
-	protected static function urls(array $js_includes, &$max_modified=null, $minurl=null)
+	protected static function urls(array $js_includes, &$max_modified = null, $minurl = null)
 	{
 		$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 		// ignore not existing minurl
@@ -137,28 +137,28 @@ 
 		$to_include_first = $to_include = $to_minify = array();
 		$max_modified = 0;
 		$query = null;
-		foreach($js_includes as $path)
+		foreach ($js_includes as $path)
 		{
 			if ($path == '/api/js/jsapi/egw.js') continue; // Leave egw.js out of bundle
 			unset($query);
-			list($path,$query) = explode('?',$path,2);
+			list($path, $query) = explode('?', $path, 2);
 			$mod = filemtime(EGW_SERVER_ROOT.$path);
 			if ($mod > $max_modified) $max_modified = $mod;
 
 			// ckeditor must be included before bundled files, as they depend on it!
-			if (strpos($path,'/ckeditor/ckeditor.js') !== false)
+			if (strpos($path, '/ckeditor/ckeditor.js') !== false)
 			{
-				$to_include_first[] = $path . '?' . $mod;
+				$to_include_first[] = $path.'?'.$mod;
 			}
 			// for now minify does NOT support query parameters, nor php files generating javascript
 			elseif ($debug_minify || $query || substr($path, -3) != '.js' || empty($minurl))
 			{
-				$path .= '?'. $mod.($query ? '&'.$query : '');
+				$path .= '?'.$mod.($query ? '&'.$query : '');
 				$to_include[] = $path;
 			}
 			else
 			{
-				$to_minify[] = substr($path,1);
+				$to_minify[] = substr($path, 1);
 			}
 		}
 		if (!$debug_minify && $to_minify)
@@ -246,7 +246,7 @@ 
 		$stock_files = call_user_func_array('array_merge', $bundles);
 
 		// generate template and app bundles, if installed
-		foreach(array(
+		foreach (array(
 			'jdots' => '/jdots/js/fw_jdots.js',
 			'mobile' => '/pixelegg/js/fw_mobile.js',
 			'pixelegg' => '/pixelegg/js/fw_pixelegg.js',
@@ -257,7 +257,7 @@ 
 		{
 			if (@file_exists(EGW_SERVER_ROOT.$file))
 			{
-				$inc_mgr = new IncludeMgr($stock_files);	// reset loaded files to stock files
+				$inc_mgr = new IncludeMgr($stock_files); // reset loaded files to stock files
 				$inc_mgr->include_js_file($file);
 				$bundles[$bundle] = array_diff($inc_mgr->get_included_files(), $stock_files);
 				self::urls($bundles[$bundle], $max_mod[$bundle]);
@@ -265,12 +265,12 @@ 
 		}
 
 		// automatic split bundles with more then MAX_BUNDLE_FILES (=50) files
-		foreach($bundles as $name => $files)
+		foreach ($bundles as $name => $files)
 		{
 			$n = '';
-			while (count($files) > self::MAX_BUNDLE_FILES*(int)$n)
+			while (count($files) > self::MAX_BUNDLE_FILES * (int)$n)
 			{
-				$files80 = array_slice($files, self::MAX_BUNDLE_FILES*(int)$n, self::MAX_BUNDLE_FILES, true);
+				$files80 = array_slice($files, self::MAX_BUNDLE_FILES * (int)$n, self::MAX_BUNDLE_FILES, true);
 				$bundles[$name.$n++] = $files80;
 			}
 		}

Braces +22 added lines, -5 removed lines

@@ -74,7 +74,11 @@ 
 		$query = null;
 		foreach($js_includes as $file)
 		{
-			if ($file == '/api/js/jsapi/egw.js') continue;	// loaded via own tag, and we must not load it twice!
+			if ($file == '/api/js/jsapi/egw.js')
+			{
+				continue;
+			}
+			// loaded via own tag, and we must not load it twice!
 
 			if (!isset($to_include[$file]))
 			{
@@ -133,17 +137,27 @@ 
 	{
 		$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 		// ignore not existing minurl
-		if (!empty($minurl) && !file_exists(EGW_SERVER_ROOT.$minurl)) $minurl = null;
+		if (!empty($minurl) && !file_exists(EGW_SERVER_ROOT.$minurl))
+		{
+			$minurl = null;
+		}
 		$to_include_first = $to_include = $to_minify = array();
 		$max_modified = 0;
 		$query = null;
 		foreach($js_includes as $path)
 		{
-			if ($path == '/api/js/jsapi/egw.js') continue; // Leave egw.js out of bundle
+			if ($path == '/api/js/jsapi/egw.js')
+			{
+				continue;
+			}
+			// Leave egw.js out of bundle
 			unset($query);
 			list($path,$query) = explode('?',$path,2);
 			$mod = filemtime(EGW_SERVER_ROOT.$path);
-			if ($mod > $max_modified) $max_modified = $mod;
+			if ($mod > $max_modified)
+			{
+				$max_modified = $mod;
+			}
 
 			// ckeditor must be included before bundled files, as they depend on it!
 			if (strpos($path,'/ckeditor/ckeditor.js') !== false)
@@ -182,7 +196,10 @@ 
 			// need to include minified javascript before not minified stuff like jscalendar-setup, as it might depend on it
 			array_unshift($to_include, $path);
 		}
-		if ($to_include_first) $to_include = array_merge($to_include_first, $to_include);
+		if ($to_include_first)
+		{
+			$to_include = array_merge($to_include_first, $to_include);
+		}
 		//error_log(__METHOD__."("./*array2string($js_includes).*/", $max_modified, $minurl) returning ".array2string($to_include));
 		return $to_include;
 	}

api/src/Framework/Extra.php

Spacing +10 added lines, -10 removed lines

@@ -54,12 +54,12 @@ 
 	 * @param string $with =null
 	 * @param string $msg_type =null 'error', 'warning' or 'success' (default)
 	 */
-	public static function refresh_opener($msg, $app, $id=null, $type=null, $targetapp=null, $replace=null, $with=null, $msg_type=null)
+	public static function refresh_opener($msg, $app, $id = null, $type = null, $targetapp = null, $replace = null, $with = null, $msg_type = null)
 	{
 		//error_log(__METHOD__.'('.array2string(func_get_args()).')');
 		self::$extra['refresh-opener'] = func_get_args();
 
-		unset($msg, $app, $id, $type, $targetapp, $replace, $with, $msg_type);	// used only via func_get_args();
+		unset($msg, $app, $id, $type, $targetapp, $replace, $with, $msg_type); // used only via func_get_args();
 	}
 
 	/**
@@ -70,11 +70,11 @@ 
 	 * @param string $msg message to show
 	 * @param string $type ='success' 'error', 'warning' or 'success' (default)
 	 */
-	public static function message($msg, $type='success')
+	public static function message($msg, $type = 'success')
 	{
 		self::$extra['message'] = func_get_args();
 
-		unset($msg, $type);	// used only via func_get_args();
+		unset($msg, $type); // used only via func_get_args();
 	}
 
 	/**
@@ -84,12 +84,12 @@ 
 	 * @param string $target
 	 * @param string $popup
 	 */
-	public static function popup($link, $target='_blank', $popup='640x480')
+	public static function popup($link, $target = '_blank', $popup = '640x480')
 	{
 		// default params are not returned by func_get_args!
-		$args = func_get_args()+array(null, '_blank', '640x480');
+		$args = func_get_args() + array(null, '_blank', '640x480');
 
-		unset($link, $target, $popup);	// used only via func_get_args()
+		unset($link, $target, $popup); // used only via func_get_args()
 
 		if (Json\Request::isJSONRequest())
 		{
@@ -106,7 +106,7 @@ 
 	 *
 	 * @param string $alert_msg ='' optional message to display as alert, before closing the window
 	 */
-	public static function window_close($alert_msg='')
+	public static function window_close($alert_msg = '')
 	{
 		//error_log(__METHOD__."()");
 		self::$extra['window-close'] = $alert_msg ? $alert_msg : true;
@@ -163,12 +163,12 @@ 
 	public static function get_extra()
 	{
 		// adding links of refreshed entry, to give others apps more information about necessity to refresh
-		if (isset(self::$extra['refresh-opener']) && count(self::$extra['refresh-opener']) <= 8 &&	// do not run twice
+		if (isset(self::$extra['refresh-opener']) && count(self::$extra['refresh-opener']) <= 8 && // do not run twice
 			!empty(self::$extra['refresh-opener'][1]) && !empty(self::$extra['refresh-opener'][2]))	// app/id given
 		{
 			$links = Link::get_links(self::$extra['refresh-opener'][1], self::$extra['refresh-opener'][2]);
 			$apps = array();
-			foreach($links as $link)
+			foreach ($links as $link)
 			{
 				$apps[$link['app']][] = $link['id'];
 			}

Braces +4 added lines, -1 removed lines

@@ -164,9 +164,12 @@
 	{
 		// adding links of refreshed entry, to give others apps more information about necessity to refresh
 		if (isset(self::$extra['refresh-opener']) && count(self::$extra['refresh-opener']) <= 8 &&	// do not run twice
-			!empty(self::$extra['refresh-opener'][1]) && !empty(self::$extra['refresh-opener'][2]))	// app/id given
+			!empty(self::$extra['refresh-opener'][1]) && !empty(self::$extra['refresh-opener'][2]))
+		{
+			// app/id given
 		{
 			$links = Link::get_links(self::$extra['refresh-opener'][1], self::$extra['refresh-opener'][2]);
+		}
 			$apps = array();
 			foreach($links as $link)
 			{

api/src/Framework/Login.php

Indentation +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 	 *
 	 * @param string $extra_vars for login url
 	 * @param string $change_passwd =null string with message to render input fields for password change
-	*/
+	 */
 	function screen($extra_vars, $change_passwd=null)
 	{
 		Api\Header\ContentSecurityPolicy::add('frame-src', array());	// array() no external frame-sources
@@ -226,8 +226,8 @@ 
 	}
 
 	/**
-	* displays a login denied message
-	*/
+	 * displays a login denied message
+	 */
 	function denylogin_screen()
 	{
 		try {

Spacing +52 added lines, -52 removed lines

@@ -44,29 +44,29 @@ 
 	 * @param string $extra_vars for login url
 	 * @param string $change_passwd =null string with message to render input fields for password change
 	*/
-	function screen($extra_vars, $change_passwd=null)
+	function screen($extra_vars, $change_passwd = null)
 	{
-		Api\Header\ContentSecurityPolicy::add('frame-src', array());	// array() no external frame-sources
+		Api\Header\ContentSecurityPolicy::add('frame-src', array()); // array() no external frame-sources
 
 		//error_log(__METHOD__."() this->template=$this->framework->template, this->template_dir=$this->framework->template_dir, get_class(this)=".get_class($this));
 		try {
 			$tmpl = new Template(EGW_SERVER_ROOT.$this->framework->template_dir);
-			$tmpl->set_file(array('login_form' => Api\Header\UserAgent::mobile()?'login_mobile.tpl':'login.tpl'));
+			$tmpl->set_file(array('login_form' => Api\Header\UserAgent::mobile() ? 'login_mobile.tpl' : 'login.tpl'));
 		}
-		catch(Api\Exception\WrongParameter $e) {
+		catch (Api\Exception\WrongParameter $e) {
 			unset($e);
 			$tmpl = new Template(EGW_SERVER_ROOT.'/api/templates/default');
-			$tmpl->set_file(array('login_form' => Api\Header\UserAgent::mobile()?'login_mobile.tpl':'login.tpl'));
+			$tmpl->set_file(array('login_form' => Api\Header\UserAgent::mobile() ? 'login_mobile.tpl' : 'login.tpl'));
 		}
 
-		$tmpl->set_var('lang_message',$GLOBALS['loginscreenmessage']);
+		$tmpl->set_var('lang_message', $GLOBALS['loginscreenmessage']);
 
 		// hide change-password fields, if not requested
 		if (!$change_passwd)
 		{
-			$tmpl->set_block('login_form','change_password');
+			$tmpl->set_block('login_form', 'change_password');
 			$tmpl->set_var('change_password', '');
-			$tmpl->set_var('lang_password',lang('password'));
+			$tmpl->set_var('lang_password', lang('password'));
 
 			// display login-message depending on $_GET[cd] and what's in database/header for "login_message"
 			$cd_msg = self::check_logoutcode($_GET['cd']);
@@ -87,9 +87,9 @@ 
 		}
 		else
 		{
-			$tmpl->set_var('lang_password',lang('Old password'));
-			$tmpl->set_var('lang_new_password',lang('New password'));
-			$tmpl->set_var('lang_repeat_password',lang('Repeat password'));
+			$tmpl->set_var('lang_password', lang('Old password'));
+			$tmpl->set_var('lang_new_password', lang('New password'));
+			$tmpl->set_var('lang_repeat_password', lang('Repeat password'));
 			$tmpl->set_var('cd', $change_passwd);
 			$tmpl->set_var('cd_class', 'error');
 			$last_loginid = $_POST['login'];
@@ -98,56 +98,56 @@ 
 			$tmpl->set_var('autofocus_login', '');
 			$tmpl->set_var('autofocus_new_passwd', 'autofocus');
 		}
-		if($GLOBALS['egw_info']['server']['show_domain_selectbox'])
+		if ($GLOBALS['egw_info']['server']['show_domain_selectbox'])
 		{
-			foreach(array_keys($GLOBALS['egw_domain']) as $domain)
+			foreach (array_keys($GLOBALS['egw_domain']) as $domain)
 			{
 				$domains[$domain] = $domain;
 			}
 			$tmpl->set_var(array(
 				'lang_domain'   => lang('domain'),
-				'select_domain' => Api\Html::select('logindomain',$last_domain,$domains,true,'tabindex="2"',0,false),
+				'select_domain' => Api\Html::select('logindomain', $last_domain, $domains, true, 'tabindex="2"', 0, false),
 			));
 		}
 		else
 		{
 			/* trick to make domain section disapear */
-			$tmpl->set_block('login_form','domain_selection');
-			$tmpl->set_var('domain_selection',$GLOBALS['egw_info']['user']['domain'] ?
-			Api\Html::input_hidden('logindomain',$GLOBALS['egw_info']['user']['domain']) : '');
+			$tmpl->set_block('login_form', 'domain_selection');
+			$tmpl->set_var('domain_selection', $GLOBALS['egw_info']['user']['domain'] ?
+			Api\Html::input_hidden('logindomain', $GLOBALS['egw_info']['user']['domain']) : '');
 
-			if($last_loginid !== '')
+			if ($last_loginid !== '')
 			{
 				reset($GLOBALS['egw_domain']);
 				list($default_domain) = each($GLOBALS['egw_domain']);
 
-				if(!empty ($last_domain) && $last_domain != $default_domain)
+				if (!empty ($last_domain) && $last_domain != $default_domain)
 				{
-					$last_loginid .= '@' . $last_domain;
+					$last_loginid .= '@'.$last_domain;
 				}
 			}
 		}
 
 		$config_reg = Api\Config::read('registration');
 
-		if($config_reg['enable_registration'])
+		if ($config_reg['enable_registration'])
 		{
 			$lang = $_GET['lang'] ? $_GET['lang'] : $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 			if ($config_reg['register_link'])
 			{
-				$reg_link='&nbsp;<a href="'. $this->framework->link('/registration/index.php','lang_code='.$lang). '">'.lang('Sigup').'</a>';
+				$reg_link = '&nbsp;<a href="'.$this->framework->link('/registration/index.php', 'lang_code='.$lang).'">'.lang('Sigup').'</a>';
 			}
 			if ($config_reg['lostpassword_link'])
 			{
-				$lostpw_link='&nbsp;<a href="'. $this->framework->link('/registration/index.php','menuaction=registration.registration_ui.lost_password&lang_code='.$lang). '">'.lang('Lost password').'</a>';
+				$lostpw_link = '&nbsp;<a href="'.$this->framework->link('/registration/index.php', 'menuaction=registration.registration_ui.lost_password&lang_code='.$lang).'">'.lang('Lost password').'</a>';
 			}
 			if ($config_reg['lostid_link'])
 			{
-				$lostid_link='&nbsp;<a href="'. $this->framework->link('/registration/index.php','menuaction=registration.registration_ui.lost_username&lang_code='.$lang). '">'.lang('Lost Login Id').'</a>';
+				$lostid_link = '&nbsp;<a href="'.$this->framework->link('/registration/index.php', 'menuaction=registration.registration_ui.lost_username&lang_code='.$lang).'">'.lang('Lost Login Id').'</a>';
 			}
 
 			/* if at least one option of "registration" is activated display the registration section */
-			if($config_reg['register_link'] || $config_reg['lostpassword_link'] || $config_reg['lostid_link'] )
+			if ($config_reg['register_link'] || $config_reg['lostpassword_link'] || $config_reg['lostid_link'])
 			{
 				$tmpl->set_var(array(
 				'register_link'     => $reg_link,
@@ -158,31 +158,31 @@ 
 			else
 			{
 				/* trick to make registration section disapear */
-				$tmpl->set_block('login_form','registration');
-				$tmpl->set_var('registration','');
+				$tmpl->set_block('login_form', 'registration');
+				$tmpl->set_var('registration', '');
 			}
 		}
 
-		$tmpl->set_var('login_url', $GLOBALS['egw_info']['server']['webserver_url'] . '/login.php' . $extra_vars);
+		$tmpl->set_var('login_url', $GLOBALS['egw_info']['server']['webserver_url'].'/login.php'.$extra_vars);
 		$tmpl->set_var('version', $GLOBALS['egw_info']['server']['versions']['phpgwapi']);
 		$tmpl->set_var('login', htmlspecialchars($last_loginid));
 
-		$tmpl->set_var('lang_username',lang('username'));
-		$tmpl->set_var('lang_login',lang('login'));
+		$tmpl->set_var('lang_username', lang('username'));
+		$tmpl->set_var('lang_login', lang('login'));
 
 		$tmpl->set_var('website_title', $GLOBALS['egw_info']['server']['site_title']);
-		$tmpl->set_var('template_set',$this->framework->template);
+		$tmpl->set_var('template_set', $this->framework->template);
 
 		$var['background_file'] = self::pick_login_background($GLOBALS['egw_info']['server']['login_background_file']);
 
 		$var['logo_file'] = \EGroupware\Api\Framework::get_login_logo_or_bg_url('login_logo_file', 'login_logo');
 
-		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url']?$GLOBALS['egw_info']['server']['login_logo_url']:'http://www.egroupware.org';
-		if (substr($var['logo_url'],0,4) != 'http')
+		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url'] ? $GLOBALS['egw_info']['server']['login_logo_url'] : 'http://www.egroupware.org';
+		if (substr($var['logo_url'], 0, 4) != 'http')
 		{
 			$var['logo_url'] = 'http://'.$var['logo_url'];
 		}
-		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title']?$GLOBALS['egw_info']['server']['login_logo_title']:'www.eGroupWare.org';
+		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title'] ? $GLOBALS['egw_info']['server']['login_logo_title'] : 'www.eGroupWare.org';
 		$tmpl->set_var($var);
 
 		/* language section if activated in site Config */
@@ -190,14 +190,14 @@ 
 		{
 			$tmpl->set_var(array(
 				'lang_language' => lang('Language'),
-				'select_language' => Api\Html::select('lang',$GLOBALS['egw_info']['user']['preferences']['common']['lang'],
-				Api\Translation::get_installed_langs(),true,'tabindex="1"',0,false),
+				'select_language' => Api\Html::select('lang', $GLOBALS['egw_info']['user']['preferences']['common']['lang'],
+				Api\Translation::get_installed_langs(), true, 'tabindex="1"', 0, false),
 			));
 		}
 		else
 		{
-			$tmpl->set_block('login_form','language_select');
-			$tmpl->set_var('language_select','');
+			$tmpl->set_block('login_form', 'language_select');
+			$tmpl->set_var('language_select', '');
 		}
 
 		/********************************************************\
@@ -205,36 +205,36 @@ 
 		* and place a time selectbox, how long cookie is valid   *
 		\********************************************************/
 
-		if($GLOBALS['egw_info']['server']['allow_cookie_auth'])
+		if ($GLOBALS['egw_info']['server']['allow_cookie_auth'])
 		{
-			$tmpl->set_block('login_form','remember_me_selection');
-			$tmpl->set_var('lang_remember_me',lang('Remember me'));
-			$tmpl->set_var('select_remember_me',Api\Html::select('remember_me', '', array(
+			$tmpl->set_block('login_form', 'remember_me_selection');
+			$tmpl->set_var('lang_remember_me', lang('Remember me'));
+			$tmpl->set_var('select_remember_me', Api\Html::select('remember_me', '', array(
 				'' => lang('not'),
 				'1hour' => lang('1 Hour'),
 				'1day' => lang('1 Day'),
 				'1week'=> lang('1 Week'),
 				'1month' => lang('1 Month'),
 				'forever' => lang('Forever'),
-			),true,'tabindex="3"',0,false));
+			), true, 'tabindex="3"', 0, false));
 		}
 		else
 		{
 			/* trick to make remember_me section disapear */
-			$tmpl->set_block('login_form','remember_me_selection');
-			$tmpl->set_var('remember_me_selection','');
+			$tmpl->set_block('login_form', 'remember_me_selection');
+			$tmpl->set_var('remember_me_selection', '');
 		}
 		$tmpl->set_var('autocomplete', ($GLOBALS['egw_info']['server']['autocomplete_login'] ? 'autocomplete="off"' : ''));
 
 		if (Api\Header\UserAgent::type() == 'msie' && Api\Header\UserAgent::version() < 12)
 		{
-			$tmpl->set_var('cd', lang('Browser %1 %2 is not recommended. You may experience issues and not working features. Please use the latest version of Chrome, Firefox or Edge. Thank You!',Api\Header\UserAgent::type(), Api\Header\UserAgent::version()));
+			$tmpl->set_var('cd', lang('Browser %1 %2 is not recommended. You may experience issues and not working features. Please use the latest version of Chrome, Firefox or Edge. Thank You!', Api\Header\UserAgent::type(), Api\Header\UserAgent::version()));
 			$tmpl->set_var('cd_class', 'error');
 		}
 		// load jquery for login screen too
 		Api\Framework::includeJS('jquery', 'jquery');
 
-		$this->framework->render($tmpl->fp('loginout','login_form'),false,false);
+		$this->framework->render($tmpl->fp('loginout', 'login_form'), false, false);
 	}
 
 	/**
@@ -249,7 +249,7 @@ 
 	{
 		if (is_array($backgrounds))
 		{
-			$chosen = $backgrounds[rand(0, count($backgrounds)-1)];
+			$chosen = $backgrounds[rand(0, count($backgrounds) - 1)];
 		}
 		else
 		{
@@ -263,7 +263,7 @@ 
 		}
 		else
 		{
-			return Api\Image::find('api',$chosen ? $chosen : 'login_background', '', null);
+			return Api\Image::find('api', $chosen ? $chosen : 'login_background', '', null);
 		}
 	}
 
@@ -276,7 +276,7 @@ 
 			$tmpl = new Template(EGW_SERVER_ROOT.$this->framework->template_dir);
 			$tmpl->set_file(array('login_form' => 'login_denylogin.tpl'));
 		}
-		catch(Api\Exception\WrongParameter $e) {
+		catch (Api\Exception\WrongParameter $e) {
 			unset($e);
 			$tmpl = new Template(EGW_SERVER_ROOT.'/api/templates/default');
 			$tmpl->set_file(array('login_form' => 'login_denylogin.tpl'));
@@ -291,7 +291,7 @@ 
 		// load jquery for deny-login screen too
 		Api\Framework::includeJS('jquery', 'jquery');
 
-		$this->framework->render($tmpl->fp('loginout','login_form'),false,false);
+		$this->framework->render($tmpl->fp('loginout', 'login_form'), false, false);
 	}
 
 	/**
@@ -302,7 +302,7 @@ 
 	 */
 	static function check_logoutcode($code)
 	{
-		switch($code)
+		switch ($code)
 		{
 			case 1:
 				return lang('You have been successfully logged out');

api/src/Framework/Minimal.php

Indentation +54 added lines, -54 removed lines

@@ -21,29 +21,29 @@ 
 class Minimal extends Api\Framework
 {
 	/**
-	* Instance of the phplib Template class for the API's template dir (EGW_TEMPLATE_DIR)
-	*
-	* @var Template
-	*/
+	 * Instance of the phplib Template class for the API's template dir (EGW_TEMPLATE_DIR)
+	 *
+	 * @var Template
+	 */
 	var $tpl;
 
 	/**
-	* Constructor
-	*
-	* @param string $template ='default' name of the template
-	* @return idots_framework
-	*/
+	 * Constructor
+	 *
+	 * @param string $template ='default' name of the template
+	 * @return idots_framework
+	 */
 	function __construct($template='default')
 	{
 		parent::__construct($template);		// call the constructor of the extended class
 	}
 
 	/**
-	* Returns the html-header incl. the opening body tag
-	*
-	* @param array $extra =array() extra attributes passed as data-attribute to egw.js
-	* @return string with html
-	*/
+	 * Returns the html-header incl. the opening body tag
+	 *
+	 * @param array $extra =array() extra attributes passed as data-attribute to egw.js
+	 * @return string with html
+	 */
 	function header(array $extra=array())
 	{
 		// make sure header is output only once
@@ -76,10 +76,10 @@ 
 	}
 
 	/**
-	* Returns the html from the body-tag til the main application area (incl. opening div tag)
-	*
-	* @return string with html
-	*/
+	 * Returns the html from the body-tag til the main application area (incl. opening div tag)
+	 *
+	 * @return string with html
+	 */
 	function navbar()
 	{
 		return '';
@@ -101,37 +101,37 @@ 
 	}
 
 	/**
-	* Add menu items to the topmenu template class to be displayed
-	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
-	*/
+	 * Add menu items to the topmenu template class to be displayed
+	 *
+	 * @param array $app application data
+	 * @param mixed $alt_label string with alternative menu item label default value = null
+	 * @param string $urlextra string with alternate additional code inside <a>-tag
+	 * @access protected
+	 * @return void
+	 */
 	function _add_topmenu_item(array $app_data,$alt_label=null)
 	{
 		unset($app_data, $alt_label);
 	}
 
 	/**
-	* Add info items to the topmenu template class to be displayed
-	*
-	* @param string $content html of item
-	* @param string $id =null
-	* @access protected
-	* @return void
-	*/
+	 * Add info items to the topmenu template class to be displayed
+	 *
+	 * @param string $content html of item
+	 * @param string $id =null
+	 * @access protected
+	 * @return void
+	 */
 	function _add_topmenu_info_item($content, $id=null)
 	{
 		unset($content, $id);
 	}
 
 	/**
-	* Returns the html from the closing div of the main application area to the closing html-tag
-	*
-	* @return string html or null if no footer needed/wanted
-	*/
+	 * Returns the html from the closing div of the main application area to the closing html-tag
+	 *
+	 * @return string html or null if no footer needed/wanted
+	 */
 	function footer()
 	{
 		static $footer_done=0;
@@ -141,29 +141,29 @@ 
 	}
 
 	/**
-	* Parses one sidebox menu and add's the html to $this->sidebox_content for later use by $this->navbar
-	*
-	* @param string $appname
-	* @param string $menu_title
-	* @param array $file
-	* @param string $type =null 'admin', 'preferences', 'favorites', ...
-	*/
+	 * Parses one sidebox menu and add's the html to $this->sidebox_content for later use by $this->navbar
+	 *
+	 * @param string $appname
+	 * @param string $menu_title
+	 * @param array $file
+	 * @param string $type =null 'admin', 'preferences', 'favorites', ...
+	 */
 	function sidebox($appname,$menu_title,$file,$type=null)
 	{
 		unset($appname, $menu_title, $file, $type);
 	}
 
 	/**
-	* called by hooks to add an icon in the topmenu info location
-	*
-	* @param string $id unique element id
-	* @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
-	* @param string $iconlink where the icon links to
-	* @param booleon $blink set true to make the icon blink
-	* @param mixed $tooltip string containing the tooltip html, or null of no tooltip
-	* @access public
-	* @return void
-	*/
+	 * called by hooks to add an icon in the topmenu info location
+	 *
+	 * @param string $id unique element id
+	 * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
+	 * @param string $iconlink where the icon links to
+	 * @param booleon $blink set true to make the icon blink
+	 * @param mixed $tooltip string containing the tooltip html, or null of no tooltip
+	 * @access public
+	 * @return void
+	 */
 	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
 	{
 		unset($id, $icon_src, $iconlink, $blink, $tooltip);

Spacing +13 added lines, -13 removed lines

@@ -33,9 +33,9 @@ 
 	* @param string $template ='default' name of the template
 	* @return idots_framework
 	*/
-	function __construct($template='default')
+	function __construct($template = 'default')
 	{
-		parent::__construct($template);		// call the constructor of the extended class
+		parent::__construct($template); // call the constructor of the extended class
 	}
 
 	/**
@@ -44,7 +44,7 @@ 
 	* @param array $extra =array() extra attributes passed as data-attribute to egw.js
 	* @return string with html
 	*/
-	function header(array $extra=array())
+	function header(array $extra = array())
 	{
 		// make sure header is output only once
 		if (self::$header_done) return '';
@@ -66,11 +66,11 @@ 
 		// as the old Template class has problems if restored from the session (php-restore)
 		$this->tpl = new Template(EGW_SERVER_ROOT.$this->template_dir, 'keep');
 		$this->tpl->set_file(array('_head' => 'head.tpl'));
-		$this->tpl->set_block('_head','head');
+		$this->tpl->set_block('_head', 'head');
 
 		$this->tpl->set_var($this->_get_header($extra));
 
-		$content .= $this->tpl->fp('out','head');
+		$content .= $this->tpl->fp('out', 'head');
 
 		return $content;
 	}
@@ -93,7 +93,7 @@ 
 	 * @return boolean $consider_navbar_not_yet_called_as_true=true
 	 * @return boolean
 	 */
-	public function isTop($consider_navbar_not_yet_called_as_true=true)
+	public function isTop($consider_navbar_not_yet_called_as_true = true)
 	{
 		unset($consider_navbar_not_yet_called_as_true);
 
@@ -109,7 +109,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	function _add_topmenu_item(array $app_data,$alt_label=null)
+	function _add_topmenu_item(array $app_data, $alt_label = null)
 	{
 		unset($app_data, $alt_label);
 	}
@@ -122,7 +122,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	function _add_topmenu_info_item($content, $id=null)
+	function _add_topmenu_info_item($content, $id = null)
 	{
 		unset($content, $id);
 	}
@@ -134,10 +134,10 @@ 
 	*/
 	function footer()
 	{
-		static $footer_done=0;
-		if ($footer_done++) return;	// prevent multiple footers, not sure we still need this (RalfBecker)
+		static $footer_done = 0;
+		if ($footer_done++) return; // prevent multiple footers, not sure we still need this (RalfBecker)
 
-		return "</body>\n</html>\n";	// close body and html tag, eg. for popups
+		return "</body>\n</html>\n"; // close body and html tag, eg. for popups
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	* @param array $file
 	* @param string $type =null 'admin', 'preferences', 'favorites', ...
 	*/
-	function sidebox($appname,$menu_title,$file,$type=null)
+	function sidebox($appname, $menu_title, $file, $type = null)
 	{
 		unset($appname, $menu_title, $file, $type);
 	}
@@ -164,7 +164,7 @@ 
 	* @access public
 	* @return void
 	*/
-	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
+	function topmenu_info_icon($id, $icon_src, $iconlink, $blink = false, $tooltip = null)
 	{
 		unset($id, $icon_src, $iconlink, $blink, $tooltip);
 	}

Braces +9 added lines, -2 removed lines

@@ -47,7 +47,10 @@ 
 	function header(array $extra=array())
 	{
 		// make sure header is output only once
-		if (self::$header_done) return '';
+		if (self::$header_done)
+		{
+			return '';
+		}
 		self::$header_done = true;
 
 		// js stuff is not needed by login page or in popups
@@ -135,7 +138,11 @@ 
 	function footer()
 	{
 		static $footer_done=0;
-		if ($footer_done++) return;	// prevent multiple footers, not sure we still need this (RalfBecker)
+		if ($footer_done++)
+		{
+			return;
+		}
+		// prevent multiple footers, not sure we still need this (RalfBecker)
 
 		return "</body>\n</html>\n";	// close body and html tag, eg. for popups
 	}

Doc Comments -5 removed lines

@@ -356,11 +356,6 @@
 	/**
 	* Add menu items to the topmenu template class to be displayed
 	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
 	*/
 	function _add_topmenu_item(array $app_data,$alt_label=null)
 	{