EGroupware / egroupware

calendar/inc/class.calendar_merge.inc.php

Doc Comments -3 removed lines

@@ -113,8 +113,6 @@ 
 	 * @param array $ids array with contact id(s)
 	 * @param string &$err error-message on error
 	 * @param string $mimetype mimetype of complete document, eg. text/*, application/vnd.oasis.opendocument.text, application/rtf
-	 * @param array $fix=null regular expression => replacement pairs eg. to fix garbled placeholders
-	 * @param string $charset=null charset to override default set by mimetype or export charset
 	 * @return string|boolean merged document or false on error
 	 */
 	function merge_string($content,$ids,$err,$mimetype,$fix)
@@ -234,7 +232,6 @@ 
 	 * Return replacements for the calendar
 	 *
 	 * @param int|array $id event-id or array with id/recur_date, or array with event info
-	 * @param boolean $last_event_too=false also include information about the last event
 	 * @return array
 	 */
 	public function calendar_replacements($id,$prefix = '', &$content = '')

Indentation +34 added lines, -34 removed lines

@@ -326,20 +326,20 @@ 
 	}
 
 	/**
-	* Table plugin for event
-	* Lists events for a certain day of the week.  Only works for one week at a time, so for multiple weeks,
-	* use multiple date ranges.
-	*
-	* Use:
-	* $$table/Monday$$ $$starttime$$ $$title$$ $$endtable$$
-	* The day of the week may be language specific (date('l')).
-	*
-	* @param string $plugin (Monday-Sunday)
-	* @param int/array date or date range
-	* @param int $n Row number
-	* @param string $repeat Text being repeated for each entry
-	* @return array
-	*/
+	 * Table plugin for event
+	 * Lists events for a certain day of the week.  Only works for one week at a time, so for multiple weeks,
+	 * use multiple date ranges.
+	 *
+	 * Use:
+	 * $$table/Monday$$ $$starttime$$ $$title$$ $$endtable$$
+	 * The day of the week may be language specific (date('l')).
+	 *
+	 * @param string $plugin (Monday-Sunday)
+	 * @param int/array date or date range
+	 * @param int $n Row number
+	 * @param string $repeat Text being repeated for each entry
+	 * @return array
+	 */
 	public function day_plugin($plugin,$date,$n,$repeat)
 	{
 		static $days = null;
@@ -414,16 +414,16 @@ 
 	}
 
 	/**
-	* Table plugin for a certain date
-	*
-	* Can be either a particular date (2011-02-15) or a day of the month (15)
-	*
-	* @param string $plugin
-	* @param int $id ID for this record
-	* @param int $n Repeated row number
-	* @param string $repeat Text being repeated for each entry
-	* @return array
-	*/
+	 * Table plugin for a certain date
+	 *
+	 * Can be either a particular date (2011-02-15) or a day of the month (15)
+	 *
+	 * @param string $plugin
+	 * @param int $id ID for this record
+	 * @param int $n Repeated row number
+	 * @param string $repeat Text being repeated for each entry
+	 * @return array
+	 */
 	public function day($plugin,$id,$n,$repeat)
 	{
 		static $days = null;
@@ -515,15 +515,15 @@ 
 	}
 
 	/**
-	* Table plugin for participants
-	*
-	* Copied from eventmgr resources
-	*
-	* @param string $plugin
-	* @param int $id
-	* @param int $n
-	* @return array
-	*/
+	 * Table plugin for participants
+	 *
+	 * Copied from eventmgr resources
+	 *
+	 * @param string $plugin
+	 * @param int $id
+	 * @param int $n
+	 * @return array
+	 */
 	public function participant($plugin,$id,$n)
 	{
 		unset($plugin);	// not used, but required by function signature
@@ -582,7 +582,7 @@ 
 				{
 					foreach($resource as $name => $value)
 					{
-					    $replacements['$$'.$name.'$$'] = $value;
+						$replacements['$$'.$name.'$$'] = $value;
 					}
 				}
 				break;

Spacing +132 added lines, -132 removed lines

@@ -84,14 +84,14 @@ 
 
 		// Register table plugins
 		$this->table_plugins['participant'] = 'participant';
-		for($i = 0; $i < 7; $i++)
+		for ($i = 0; $i < 7; $i++)
 		{
 			$this->table_plugins[date('l', strtotime("+$i days"))] = 'day_plugin';
 		}
-		for($i = 1; $i <= 31; $i++) {
+		for ($i = 1; $i <= 31; $i++) {
 			$this->table_plugins['day_'.$i] = 'day'; // Numerically by day number (1-31)
 		}
-		foreach(self::$relative as $day) {
+		foreach (self::$relative as $day) {
 			$this->table_plugins[$day] = 'day'; // Current day
 		}
 		$this->query = is_array($this->bo->cal_prefs['saved_states']) ?
@@ -117,11 +117,11 @@ 
 	 * @param string $charset=null charset to override default set by mimetype or export charset
 	 * @return string|boolean merged document or false on error
 	 */
-	function merge_string($content,$ids,$err,$mimetype,$fix)
+	function merge_string($content, $ids, $err, $mimetype, $fix)
 	{
 		//error_log(__METHOD__ . ' IDs: ' . array2string($ids));
 		// Handle merging a list of events into a document with range instead of pagerepeat
-		if((strpos($content, '$$range') !== false || strpos($content, '{{range') !== false) && is_array($ids))
+		if ((strpos($content, '$$range') !== false || strpos($content, '{{range') !== false) && is_array($ids))
 		{
 			//error_log(__METHOD__ . ' Got list of events(?), no pagerepeat tag');
 			// Merging more than one something will fail without pagerepeat
@@ -131,9 +131,9 @@ 
 				$events = $ids;
 				$ids = array('start' => PHP_INT_MAX, 'end' => 0);
 				$this->ids = array();
-				foreach($events as $event) {
-					if($event['start'] && Api\DateTime::to($event['start'],'ts') < $ids['start']) $ids['start'] = Api\DateTime::to($event['start'],'ts');
-					if($event['end'] && Api\DateTime::to($event['end'],'ts') > $ids['end']) $ids['end'] = Api\DateTime::to($event['end'],'ts');
+				foreach ($events as $event) {
+					if ($event['start'] && Api\DateTime::to($event['start'], 'ts') < $ids['start']) $ids['start'] = Api\DateTime::to($event['start'], 'ts');
+					if ($event['end'] && Api\DateTime::to($event['end'], 'ts') > $ids['end']) $ids['end'] = Api\DateTime::to($event['end'], 'ts');
 					// Keep ids for future use
 					$this->ids[] = $event['id'];
 				}
@@ -154,12 +154,12 @@ 
 				'cfs' => strpos($content, '#') !== false ? array_keys(Api\Storage\Customfields::get('calendar')) : null
 			));
 			$ids = array();
-			foreach($events as $event) {
+			foreach ($events as $event) {
 				$ids[] = $event;
 			}
 		}
 
-		return parent::merge_string($content, $ids, $err, $mimetype,$fix);
+		return parent::merge_string($content, $ids, $err, $mimetype, $fix);
 	}
 
 	/**
@@ -169,20 +169,20 @@ 
 	 * @param string &$content=null content to create some replacements only if they are used
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null)
+	protected function get_replacements($id, &$content = null)
 	{
 		$prefix = '';
 		// List events ?
-		if(is_array($id) && !$id['id'] && !$id[0]['id'])
+		if (is_array($id) && !$id['id'] && !$id[0]['id'])
 		{
 			$events = $this->bo->search($this->query + $id + array(
 				'offset' => 0,
 				'order' => 'cal_start',
 				'cfs' => strpos($content, '#') !== false ? array_keys(Api\Storage\Customfields::get('calendar')) : null
 			));
-			if(strpos($content,'$$calendar/') !== false || strpos($content, '$$table/day') !== false)
+			if (strpos($content, '$$calendar/') !== false || strpos($content, '$$table/day') !== false)
 			{
-				array_unshift($events,false); unset($events[0]);	// renumber the array to start with key 1, instead of 0
+				array_unshift($events, false); unset($events[0]); // renumber the array to start with key 1, instead of 0
 				$prefix = 'calendar/%d';
 			}
 		}
@@ -192,11 +192,11 @@ 
 			$events = $id;
 			$id = array('start' => PHP_INT_MAX, 'end' => 0);
 			$this->ids = array();
-			foreach($events as $event) {
-				if($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
-				if($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
+			foreach ($events as $event) {
+				if ($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
+				if ($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
 				// Keep ids for future use
-				$this->ids[]  = $event['id'];
+				$this->ids[] = $event['id'];
 			}
 			$id = array($id);
 		}
@@ -208,20 +208,20 @@ 
 		// as this function allows to pass query- parameters, we need to check the result of the query against export_limit restrictions
 		if (Api\Storage\Merge::hasExportLimit($this->export_limit) && !Api\Storage\Merge::is_export_limit_excepted() && count($events) > (int)$this->export_limit)
 		{
-			$err = lang('No rights to export more than %1 entries!',(int)$this->export_limit);
+			$err = lang('No rights to export more than %1 entries!', (int)$this->export_limit);
 			throw new Api\Exception\WrongUserinput($err);
 		}
 		$replacements = array();
 		$n = 0;
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
-			$values = $this->calendar_replacements($event,sprintf($prefix,++$n), $content);
-			if(is_array($id) && $id['start'])
+			$values = $this->calendar_replacements($event, sprintf($prefix, ++$n), $content);
+			if (is_array($id) && $id['start'])
 			{
-				foreach(self::$range_tags as $key => $format)
+				foreach (self::$range_tags as $key => $format)
 				{
 					$value = date($format, $key == 'end' ? $id['end'] : $id['start']);
-					if($key == 'month') $value = lang($value);
+					if ($key == 'month') $value = lang($value);
 					$values["$\$range/$key$$"] = $value;
 				}
 			}
@@ -237,10 +237,10 @@ 
 	 * @param boolean $last_event_too=false also include information about the last event
 	 * @return array
 	 */
-	public function calendar_replacements($id,$prefix = '', &$content = '')
+	public function calendar_replacements($id, $prefix = '', &$content = '')
 	{
 		$replacements = array();
-		if(!is_array($id) || !$id['start']) {
+		if (!is_array($id) || !$id['start']) {
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
 		} else {
 			$event = $id;
@@ -253,68 +253,68 @@ 
 		importexport_export_csv::convert($record, $types, 'calendar');
 
 		$array = $record->get_record_array();
-		foreach($array as $key => $value)
+		foreach ($array as $key => $value)
 		{
-			$replacements['$$'.($prefix?$prefix.'/':'').$key.'$$'] = $value;
+			$replacements['$$'.($prefix ? $prefix.'/' : '').$key.'$$'] = $value;
 		}
 
-		$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_id'. '$$'] = $event['id'];
-		foreach($this->bo->event2array($event) as $name => $data)
+		$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_id'.'$$'] = $event['id'];
+		foreach ($this->bo->event2array($event) as $name => $data)
 		{
-			if (substr($name,-4) == 'date') $name = substr($name,0,-4);
-			$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_'.$name . '$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data'];
+			if (substr($name, -4) == 'date') $name = substr($name, 0, -4);
+			$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_'.$name.'$$'] = is_array($data['data']) ? implode(', ', $data['data']) : $data['data'];
 		}
 		// Add seperate lists of participants by type
-		if(strpos($content, 'calendar_participants/')!== false)
+		if (strpos($content, 'calendar_participants/') !== false)
 		{
 			$types = array();
-			foreach($this->bo->resources as $resource)
+			foreach ($this->bo->resources as $resource)
 			{
 				$types[$resource['app']] = array();
 			}
-			foreach($event['participants'] as $uid => $status)
+			foreach ($event['participants'] as $uid => $status)
 			{
 				$type = $this->bo->resources[$uid[0]]['app'];
-				if($type == 'api-accounts')
+				if ($type == 'api-accounts')
 				{
 					$type = ($GLOBALS['egw']->accounts->get_type($uid) == 'g' ? 'group' : 'account');
 				}
 				$types[$type][] = $this->bo->participant_name($uid);
 			}
-			foreach($types as $t_id => $type)
+			foreach ($types as $t_id => $type)
 			{
-				$replacements['$$'.($prefix ? $prefix . '/' : '') . "calendar_participants/{$t_id}$$"] = implode(', ',$type);
+				$replacements['$$'.($prefix ? $prefix.'/' : '')."calendar_participants/{$t_id}$$"] = implode(', ', $type);
 			}
 		}
-		if(!$replacements['$$'.($prefix ? $prefix . '/' : '') . 'calendar_recur_type$$'])
+		if (!$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_recur_type$$'])
 		{
 			// Need to set it to '' if not set or previous record may be used
-			$replacements['$$'.($prefix ? $prefix . '/' : '') . 'calendar_recur_type$$'] = '';
+			$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_recur_type$$'] = '';
 		}
-		foreach(array('start','end') as $what)
+		foreach (array('start', 'end') as $what)
 		{
-			foreach(array(
+			foreach (array(
 				'date' => $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],
 				'day'  => 'l',
-				'time' => (date('Ymd',$event['start']) != date('Ymd',$event['end']) ? $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' ' : '') . ($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i'),
+				'time' => (date('Ymd', $event['start']) != date('Ymd', $event['end']) ? $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' ' : '').($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i'),
 			) as $name => $format)
 			{
-				$value = Api\DateTime::to($event[$what],$format);
+				$value = Api\DateTime::to($event[$what], $format);
 				if ($format == 'l') $value = lang($value);
-				$replacements['$$' .($prefix ? $prefix.'/':'').'calendar_'.$what.$name.'$$'] = $value;
+				$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_'.$what.$name.'$$'] = $value;
 			}
 		}
-		$duration = ($event['end'] - $event['start'])/60;
-		$replacements['$$'.($prefix?$prefix.'/':'').'calendar_duration$$'] = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
+		$duration = ($event['end'] - $event['start']) / 60;
+		$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_duration$$'] = floor($duration / 60).lang('h').($duration % 60 ? $duration % 60 : '');
 
 		// Add in contact stuff for owner
-		if (strpos($content,'$$calendar_owner/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($event['owner'],'person_id')))
+		if (strpos($content, '$$calendar_owner/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($event['owner'], 'person_id')))
 		{
-			$replacements += $this->contact_replacements($user,($prefix ? $prefix.'/':'').'calendar_owner');
-			$replacements['$$'.($prefix?$prefix.'/':'').'calendar_owner/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($event['owner'],'account_primary_group'));
+			$replacements += $this->contact_replacements($user, ($prefix ? $prefix.'/' : '').'calendar_owner');
+			$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_owner/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($event['owner'], 'account_primary_group'));
 		}
 
-		if($content && strpos($content, '$$#') !== FALSE)
+		if ($content && strpos($content, '$$#') !== FALSE)
 		{
 			$this->cf_link_to_expand($event, $content, $replacements);
 		}
@@ -340,77 +340,77 @@ 
 	* @param string $repeat Text being repeated for each entry
 	* @return array
 	*/
-	public function day_plugin($plugin,$date,$n,$repeat)
+	public function day_plugin($plugin, $date, $n, $repeat)
 	{
 		static $days = null;
-		if(is_array($date) && !$date['start']) {
+		if (is_array($date) && !$date['start']) {
 			// List of IDs
-			if($date[0]['start']) {
+			if ($date[0]['start']) {
 				$id = array('start' => PHP_INT_MAX, 'end' => 0);
-				foreach($date as $event) {
-					if($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
-					if($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
+				foreach ($date as $event) {
+					if ($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
+					if ($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
 				}
 				$date = $id;
 			} else {
 				$event = $this->bo->read(is_array($date) ? $date['id'] : $date, is_array($date) ? $date['recur_date'] : null);
-				if(date('l',$event['start']) != $plugin) return array();
+				if (date('l', $event['start']) != $plugin) return array();
 				$date = $event['start'];
 			}
 		}
 
 		$_date = $date['start'] ? $date['start'] : $date;
-		if($days[date('Ymd',$_date)][$plugin]) return $days[date('Ymd',$_date)][$plugin][$n];
+		if ($days[date('Ymd', $_date)][$plugin]) return $days[date('Ymd', $_date)][$plugin][$n];
 
 		$events = $this->bo->search($this->query + array(
-			'start' => $date['end'] ? $date['start'] : mktime(0,0,0,date('m',$_date),date('d',$_date),date('Y',$_date)),
-			'end' => $date['end'] ? $date['end'] : mktime(23,59,59,date('m',$_date),date('d',$_date),date('Y',$_date)),
+			'start' => $date['end'] ? $date['start'] : mktime(0, 0, 0, date('m', $_date), date('d', $_date), date('Y', $_date)),
+			'end' => $date['end'] ? $date['end'] : mktime(23, 59, 59, date('m', $_date), date('d', $_date), date('Y', $_date)),
 			'offset' => 0,
 			'num_rows' => 20,
 			'order' => 'cal_start',
 			'daywise' => true,
-			'cfs' => array(),	// read all custom-fields
+			'cfs' => array(), // read all custom-fields
 		));
 
 		if (true) $days = array();
 		$replacements = array();
 		$time_format = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i';
-		foreach($events as $day => $list)
+		foreach ($events as $day => $list)
 		{
-			foreach($list as $event)
+			foreach ($list as $event)
 			{
-				if($this->ids && !in_array($event['id'], $this->ids)) continue;
+				if ($this->ids && !in_array($event['id'], $this->ids)) continue;
 				$start = Api\DateTime::to($event['start'], 'array');
 				$end = Api\DateTime::to($event['end'], 'array');
 				$replacements = $this->calendar_replacements($event);
-				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
-					$dow = date('l',$event['start']);
+				if ($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
+					$dow = date('l', $event['start']);
 				} else {
 					$dow = date('l', strtotime($day));
 					// Fancy date+time formatting for multi-day events
-					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
-					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0));
+					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0, 0, 0, 0, 0, 1));
+					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23, 59, 59, 0, 0, 0));
 				}
 
-				$days[date('Ymd',$_date)][$dow][] = $replacements;
+				$days[date('Ymd', $_date)][$dow][] = $replacements;
 			}
-			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
+			if (strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
 				$date_marker = array(
 					'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
 					'$$day/name$$' => lang(date('l', strtotime($day)))
 				);
-				if(!is_array($days[date('Ymd',$_date)][date('l',strtotime($day))])) {
+				if (!is_array($days[date('Ymd', $_date)][date('l', strtotime($day))])) {
 					$blank = $this->calendar_replacements(array());
-					foreach($blank as &$value)
+					foreach ($blank as &$value)
 					{
 						$value = '';
 					}
-					$days[date('Ymd',$_date)][date('l',strtotime($day))][] = $blank;
+					$days[date('Ymd', $_date)][date('l', strtotime($day))][] = $blank;
 				}
-				$days[date('Ymd',$_date)][date('l',strtotime($day))][0] += $date_marker;
+				$days[date('Ymd', $_date)][date('l', strtotime($day))][0] += $date_marker;
 			}
 		}
-		return $days[date('Ymd',$_date)][$plugin][0];
+		return $days[date('Ymd', $_date)][$plugin][0];
 	}
 
 	/**
@@ -424,27 +424,27 @@ 
 	* @param string $repeat Text being repeated for each entry
 	* @return array
 	*/
-	public function day($plugin,$id,$n,$repeat)
+	public function day($plugin, $id, $n, $repeat)
 	{
 		static $days = null;
 
 		// Figure out which day
-		list($type, $which) = explode('_',$plugin);
-		if($type == 'day' && $which)
+		list($type, $which) = explode('_', $plugin);
+		if ($type == 'day' && $which)
 		{
-			if($id[0]['start'])
+			if ($id[0]['start'])
 			{
 				$dates = array('start' => PHP_INT_MAX, 'end' => 0);
-				foreach($id as $event) {
-					if($event['start'] && $event['start'] < $dates['start']) $dates['start'] = $event['start'];
-					if($event['end'] && $event['end'] > $dates['end']) $dates['end'] = $event['end'];
+				foreach ($id as $event) {
+					if ($event['start'] && $event['start'] < $dates['start']) $dates['start'] = $event['start'];
+					if ($event['end'] && $event['end'] > $dates['end']) $dates['end'] = $event['end'];
 				}
 				$id = $dates;
 			}
 			$arr = $this->bo->date2array($id['start']);
 			$arr['day'] = $which;
 			$date = $this->bo->date2ts($arr);
-			if(is_array($id) && $id['start'] && ($date < $id['start'] || $date > $id['end'])) return array();
+			if (is_array($id) && $id['start'] && ($date < $id['start'] || $date > $id['end'])) return array();
 		}
 		elseif ($plugin == 'selected')
 		{
@@ -454,64 +454,64 @@ 
 		{
 			$date = strtotime($plugin);
 		}
-		if($type == 'day' && is_array($id) && !$id['start']) {
+		if ($type == 'day' && is_array($id) && !$id['start']) {
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
-			if($which && date('d',$event['start']) != $which) return array();
-			if(date('Ymd',$date) != date('Ymd', $event['start'])) return array();
+			if ($which && date('d', $event['start']) != $which) return array();
+			if (date('Ymd', $date) != date('Ymd', $event['start'])) return array();
 			return $n == 0 ? $this->calendar_replacements($event) : array();
 		}
 
 		// Use start for cache, in case of multiple months
 		$_date = $id['start'] ? $id['start'] : $date;
-		if($days[date('Ymd',$_date)][$plugin]) return $days[date('Ymd',$_date)][$plugin][$n];
+		if ($days[date('Ymd', $_date)][$plugin]) return $days[date('Ymd', $_date)][$plugin][$n];
 
 		$events = $this->bo->search($this->query + array(
 			'start' => $date,
-			'end' => mktime(23,59,59,date('m',$date),date('d',$date),date('Y',$date)),
+			'end' => mktime(23, 59, 59, date('m', $date), date('d', $date), date('Y', $date)),
 			'offset' => 0,
 			'num_rows' => 20,
 			'order' => 'cal_start',
 			'daywise' => true,
-			'cfs' => array(),	// read all custom-fields
+			'cfs' => array(), // read all custom-fields
 		));
 
 		$replacements = array();
 		if (true) $days = array();
 		$time_format = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i';
-		foreach($events as $day => $list)
+		foreach ($events as $day => $list)
 		{
-			foreach($list as $event)
+			foreach ($list as $event)
 			{
-				if($this->ids && !in_array($event['id'], $this->ids)) continue;
+				if ($this->ids && !in_array($event['id'], $this->ids)) continue;
 				$start = Api\DateTime::to($event['start'], 'array');
 				$end = Api\DateTime::to($event['end'], 'array');
 				$replacements = $this->calendar_replacements($event);
-				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
+				if ($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
 					//$dow = date('l',$event['start']);
 				} else {
 					// Fancy date+time formatting for multi-day events
-					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
-					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0));
+					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0, 0, 0, 0, 0, 1));
+					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23, 59, 59, 0, 0, 0));
 				}
-				$days[date('Ymd',$_date)][$plugin][] = $replacements;
+				$days[date('Ymd', $_date)][$plugin][] = $replacements;
 			}
-			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
+			if (strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
 				$date_marker = array(
 					'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
 					'$$day/name$$' => lang(date('l', strtotime($day)))
 				);
-				if(!is_array($days[date('Ymd',$_date)][$plugin])) {
+				if (!is_array($days[date('Ymd', $_date)][$plugin])) {
 					$blank = $this->calendar_replacements(array());
-					foreach($blank as &$value)
+					foreach ($blank as &$value)
 					{
 						$value = '';
 					}
-					$days[date('Ymd',$_date)][$plugin][] = $blank;
+					$days[date('Ymd', $_date)][$plugin][] = $blank;
 				}
-				$days[date('Ymd',$_date)][$plugin][0] += $date_marker;
+				$days[date('Ymd', $_date)][$plugin][0] += $date_marker;
 			}
 		}
-		return $days[date('Ymd',$_date)][$plugin][0];
+		return $days[date('Ymd', $_date)][$plugin][0];
 	}
 
 	/**
@@ -524,30 +524,30 @@ 
 	* @param int $n
 	* @return array
 	*/
-	public function participant($plugin,$id,$n)
+	public function participant($plugin, $id, $n)
 	{
-		unset($plugin);	// not used, but required by function signature
+		unset($plugin); // not used, but required by function signature
 
-		if(!is_array($id) || !$id['start']) {
+		if (!is_array($id) || !$id['start']) {
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
 		} else {
 			$event = $id;
 		}
 
-		if(!is_array($event['participants']) || $n >= count($event['participants'])) return array();
+		if (!is_array($event['participants']) || $n >= count($event['participants'])) return array();
 
 		$participant = null;
 		$status = null;
 		$i = -1;
-		foreach($event['participants'] as $participant => $status) {
-			if(++$i == $n) break;
+		foreach ($event['participants'] as $participant => $status) {
+			if (++$i == $n) break;
 		}
 
-		if(!$participant) return array();
+		if (!$participant) return array();
 
 		// Add some common information
 		$quantity = $role = null;
-		calendar_so::split_status($status,$quantity,$role);
+		calendar_so::split_status($status, $quantity, $role);
 		if ($role != 'REQ-PARTICIPANT')
 		{
 			if (isset($this->bo->roles[$role]))
@@ -555,13 +555,13 @@ 
 				$role = lang($this->bo->roles[$role]);
 			}
 			// allow to use cats as roles (beside regular iCal ones)
-			elseif (substr($role,0,6) == 'X-CAT-' && ($cat_id = (int)substr($role,6)) > 0)
+			elseif (substr($role, 0, 6) == 'X-CAT-' && ($cat_id = (int)substr($role, 6)) > 0)
 			{
 				$role = $GLOBALS['egw']->categories->id2name($cat_id);
 			}
 			else
 			{
-				$role = lang(str_replace('X-','',$role));
+				$role = lang(str_replace('X-', '', $role));
 			}
 		}
 		$info = array(
@@ -574,26 +574,26 @@ 
 		switch ($participant[0])
 		{
 			case 'c':
-				$replacements = $this->contact_replacements(substr($participant,1),'');
+				$replacements = $this->contact_replacements(substr($participant, 1), '');
 				break;
 			case 'r':
 				if (is_null(self::$resources)) self::$resources = CreateObject('resources.resources_bo');
-				if (($resource = self::$resources->read(substr($participant,1))))
+				if (($resource = self::$resources->read(substr($participant, 1))))
 				{
-					foreach($resource as $name => $value)
+					foreach ($resource as $name => $value)
 					{
 					    $replacements['$$'.$name.'$$'] = $value;
 					}
 				}
 				break;
 			default:
-				if (is_numeric($participant) && ($contact = $GLOBALS['egw']->accounts->id2name($participant,'person_id')))
+				if (is_numeric($participant) && ($contact = $GLOBALS['egw']->accounts->id2name($participant, 'person_id')))
 				{
-					$replacements = $this->contact_replacements($contact,'');
+					$replacements = $this->contact_replacements($contact, '');
 				}
 				break;
 		}
-		foreach($info as $name => $value)
+		foreach ($info as $name => $value)
 		{
 			$replacements['$$'.$name.'$$'] = $value;
 		}
@@ -615,7 +615,7 @@ 
 		echo '<tr><td colspan="4"><h3>'.lang('Calendar fields:')."</h3></td></tr>";
 
 		$n = 0;
-		foreach(array(
+		foreach (array(
 			'calendar_id' => lang('Calendar ID'),
 			'calendar_title' => lang('Title'),
 			'calendar_description' => lang('Description'),
@@ -638,7 +638,7 @@ 
 			'calendar_owner'    => lang('Owner'),
 		) as $name => $label)
 		{
-			if (in_array($name,array('start','end')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name, array('start', 'end')) && $n&1)		// main values, which should be in the first column
 			{
 				echo "</tr>\n";
 				$n++;
@@ -651,13 +651,13 @@ 
 
 		echo '<tr><td colspan="4"><h3>'.lang('Range fields').":</h3></td></tr>";
 		echo '<tr><td colspan="4">'.lang('If you select a range (month, week, etc) instead of a list of entries, these extra fields are available').'</td></tr>';
-		foreach(array_keys(self::$range_tags) as $name)
+		foreach (array_keys(self::$range_tags) as $name)
 		{
 			echo '<tr><td>{{range/'.$name.'}}</td><td>'.lang($name)."</td></tr>\n";
 		}
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
 		$custom = Api\Storage\Customfields::get('calendar');
-		foreach($custom as $name => $field)
+		foreach ($custom as $name => $field)
 		{
 			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
@@ -666,9 +666,9 @@ 
 		echo '<tr><td colspan="4"><h3>'.lang('Participants').":</h3></td></tr>";
 		echo '<tr><td>{{calendar_participants/account}}</td><td colspan="3">'.lang('Accounts')."</td></tr>\n";
 		echo '<tr><td>{{calendar_participants/group}}</td><td colspan="3">'.lang('Groups')."</td></tr>\n";
-		foreach($this->bo->resources as $resource)
+		foreach ($this->bo->resources as $resource)
 		{
-			if($resource['type'])
+			if ($resource['type'])
 			{
 				echo '<tr><td>{{calendar_participants/'.$resource['app'].'}}</td><td colspan="3">'.lang($resource['app'])."</td></tr>\n";
 			}
@@ -685,19 +685,19 @@ 
 		echo '<tr style="vertical-align:top"><td colspan="2"><table >';
 		echo '<tr><td><h3>'.lang('Day of week tables').":</h3></td></tr>";
 		$days = array();
-		for($i = 0; $i < 7; $i++)
+		for ($i = 0; $i < 7; $i++)
 		{
-			$days[date('N',strtotime("+$i days"))] = date('l',strtotime("+$i days"));
+			$days[date('N', strtotime("+$i days"))] = date('l', strtotime("+$i days"));
 		}
 		ksort($days);
-		foreach($days as $day)
+		foreach ($days as $day)
 		{
-			echo '<tr><td>{{table/'.$day. '}} ... {{endtable}}</td></tr>';
+			echo '<tr><td>{{table/'.$day.'}} ... {{endtable}}</td></tr>';
 		}
 		echo '</table></td><td colspan="2"><table >';
 		echo '<tr><td><h3>'.lang('Daily tables').":</h3></td></tr>";
-		foreach(self::$relative as $value) {
-			echo '<tr><td>{{table/'.$value. '}} ... {{endtable}}</td></tr>';
+		foreach (self::$relative as $value) {
+			echo '<tr><td>{{table/'.$value.'}} ... {{endtable}}</td></tr>';
 		}
 		echo '<tr><td>{{table/day_n}} ... {{endtable}}</td><td>1 <= n <= 31</td></tr>';
 		echo '</table></td></tr>';
@@ -705,7 +705,7 @@ 
 		echo '<tr><td>{{day/name}}</td><td colspan="3">'.lang('Name of the week (ex: Monday), available for the first entry inside each day of week or daily table inside the selected range.').'</td></tr>';
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'link' => lang('HTML link to the current record'),
 			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
 			'attachments' => lang('List of files linked to the current record'),

Braces +167 added lines, -53 removed lines

@@ -88,10 +88,12 @@ 
 		{
 			$this->table_plugins[date('l', strtotime("+$i days"))] = 'day_plugin';
 		}
-		for($i = 1; $i <= 31; $i++) {
+		for($i = 1; $i <= 31; $i++)
+		{
 			$this->table_plugins['day_'.$i] = 'day'; // Numerically by day number (1-31)
 		}
-		foreach(self::$relative as $day) {
+		foreach(self::$relative as $day)
+		{
 			$this->table_plugins[$day] = 'day'; // Current day
 		}
 		$this->query = is_array($this->bo->cal_prefs['saved_states']) ?
@@ -131,9 +133,16 @@ 
 				$events = $ids;
 				$ids = array('start' => PHP_INT_MAX, 'end' => 0);
 				$this->ids = array();
-				foreach($events as $event) {
-					if($event['start'] && Api\DateTime::to($event['start'],'ts') < $ids['start']) $ids['start'] = Api\DateTime::to($event['start'],'ts');
-					if($event['end'] && Api\DateTime::to($event['end'],'ts') > $ids['end']) $ids['end'] = Api\DateTime::to($event['end'],'ts');
+				foreach($events as $event)
+				{
+					if($event['start'] && Api\DateTime::to($event['start'],'ts') < $ids['start'])
+					{
+						$ids['start'] = Api\DateTime::to($event['start'],'ts');
+					}
+					if($event['end'] && Api\DateTime::to($event['end'],'ts') > $ids['end'])
+					{
+						$ids['end'] = Api\DateTime::to($event['end'],'ts');
+					}
 					// Keep ids for future use
 					$this->ids[] = $event['id'];
 				}
@@ -154,7 +163,8 @@ 
 				'cfs' => strpos($content, '#') !== false ? array_keys(Api\Storage\Customfields::get('calendar')) : null
 			));
 			$ids = array();
-			foreach($events as $event) {
+			foreach($events as $event)
+			{
 				$ids[] = $event;
 			}
 		}
@@ -192,9 +202,16 @@ 
 			$events = $id;
 			$id = array('start' => PHP_INT_MAX, 'end' => 0);
 			$this->ids = array();
-			foreach($events as $event) {
-				if($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
-				if($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
+			foreach($events as $event)
+			{
+				if($event['start'] && $event['start'] < $id['start'])
+				{
+					$id['start'] = $event['start'];
+				}
+				if($event['end'] && $event['end'] > $id['end'])
+				{
+					$id['end'] = $event['end'];
+				}
 				// Keep ids for future use
 				$this->ids[]  = $event['id'];
 			}
@@ -221,7 +238,10 @@ 
 				foreach(self::$range_tags as $key => $format)
 				{
 					$value = date($format, $key == 'end' ? $id['end'] : $id['start']);
-					if($key == 'month') $value = lang($value);
+					if($key == 'month')
+					{
+						$value = lang($value);
+					}
 					$values["$\$range/$key$$"] = $value;
 				}
 			}
@@ -240,9 +260,12 @@ 
 	public function calendar_replacements($id,$prefix = '', &$content = '')
 	{
 		$replacements = array();
-		if(!is_array($id) || !$id['start']) {
+		if(!is_array($id) || !$id['start'])
+		{
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
-		} else {
+		}
+		else
+		{
 			$event = $id;
 		}
 
@@ -261,7 +284,10 @@ 
 		$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_id'. '$$'] = $event['id'];
 		foreach($this->bo->event2array($event) as $name => $data)
 		{
-			if (substr($name,-4) == 'date') $name = substr($name,0,-4);
+			if (substr($name,-4) == 'date')
+			{
+				$name = substr($name,0,-4);
+			}
 			$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_'.$name . '$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data'];
 		}
 		// Add seperate lists of participants by type
@@ -300,7 +326,10 @@ 
 			) as $name => $format)
 			{
 				$value = Api\DateTime::to($event[$what],$format);
-				if ($format == 'l') $value = lang($value);
+				if ($format == 'l')
+				{
+					$value = lang($value);
+				}
 				$replacements['$$' .($prefix ? $prefix.'/':'').'calendar_'.$what.$name.'$$'] = $value;
 			}
 		}
@@ -343,24 +372,41 @@ 
 	public function day_plugin($plugin,$date,$n,$repeat)
 	{
 		static $days = null;
-		if(is_array($date) && !$date['start']) {
+		if(is_array($date) && !$date['start'])
+		{
 			// List of IDs
-			if($date[0]['start']) {
+			if($date[0]['start'])
+			{
 				$id = array('start' => PHP_INT_MAX, 'end' => 0);
-				foreach($date as $event) {
-					if($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
-					if($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
+				foreach($date as $event)
+				{
+					if($event['start'] && $event['start'] < $id['start'])
+					{
+						$id['start'] = $event['start'];
+					}
+					if($event['end'] && $event['end'] > $id['end'])
+					{
+						$id['end'] = $event['end'];
+					}
 				}
 				$date = $id;
-			} else {
+			}
+			else
+			{
 				$event = $this->bo->read(is_array($date) ? $date['id'] : $date, is_array($date) ? $date['recur_date'] : null);
-				if(date('l',$event['start']) != $plugin) return array();
+				if(date('l',$event['start']) != $plugin)
+				{
+					return array();
+				}
 				$date = $event['start'];
 			}
 		}
 
 		$_date = $date['start'] ? $date['start'] : $date;
-		if($days[date('Ymd',$_date)][$plugin]) return $days[date('Ymd',$_date)][$plugin][$n];
+		if($days[date('Ymd',$_date)][$plugin])
+		{
+			return $days[date('Ymd',$_date)][$plugin][$n];
+		}
 
 		$events = $this->bo->search($this->query + array(
 			'start' => $date['end'] ? $date['start'] : mktime(0,0,0,date('m',$_date),date('d',$_date),date('Y',$_date)),
@@ -372,20 +418,29 @@ 
 			'cfs' => array(),	// read all custom-fields
 		));
 
-		if (true) $days = array();
+		if (true)
+		{
+			$days = array();
+		}
 		$replacements = array();
 		$time_format = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i';
 		foreach($events as $day => $list)
 		{
 			foreach($list as $event)
 			{
-				if($this->ids && !in_array($event['id'], $this->ids)) continue;
+				if($this->ids && !in_array($event['id'], $this->ids))
+				{
+					continue;
+				}
 				$start = Api\DateTime::to($event['start'], 'array');
 				$end = Api\DateTime::to($event['end'], 'array');
 				$replacements = $this->calendar_replacements($event);
-				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
+				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day'])
+				{
 					$dow = date('l',$event['start']);
-				} else {
+				}
+				else
+				{
 					$dow = date('l', strtotime($day));
 					// Fancy date+time formatting for multi-day events
 					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
@@ -394,12 +449,14 @@ 
 
 				$days[date('Ymd',$_date)][$dow][] = $replacements;
 			}
-			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
+			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false)
+			{
 				$date_marker = array(
 					'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
 					'$$day/name$$' => lang(date('l', strtotime($day)))
 				);
-				if(!is_array($days[date('Ymd',$_date)][date('l',strtotime($day))])) {
+				if(!is_array($days[date('Ymd',$_date)][date('l',strtotime($day))]))
+				{
 					$blank = $this->calendar_replacements(array());
 					foreach($blank as &$value)
 					{
@@ -435,16 +492,26 @@ 
 			if($id[0]['start'])
 			{
 				$dates = array('start' => PHP_INT_MAX, 'end' => 0);
-				foreach($id as $event) {
-					if($event['start'] && $event['start'] < $dates['start']) $dates['start'] = $event['start'];
-					if($event['end'] && $event['end'] > $dates['end']) $dates['end'] = $event['end'];
+				foreach($id as $event)
+				{
+					if($event['start'] && $event['start'] < $dates['start'])
+					{
+						$dates['start'] = $event['start'];
+					}
+					if($event['end'] && $event['end'] > $dates['end'])
+					{
+						$dates['end'] = $event['end'];
+					}
 				}
 				$id = $dates;
 			}
 			$arr = $this->bo->date2array($id['start']);
 			$arr['day'] = $which;
 			$date = $this->bo->date2ts($arr);
-			if(is_array($id) && $id['start'] && ($date < $id['start'] || $date > $id['end'])) return array();
+			if(is_array($id) && $id['start'] && ($date < $id['start'] || $date > $id['end']))
+			{
+				return array();
+			}
 		}
 		elseif ($plugin == 'selected')
 		{
@@ -454,16 +521,26 @@ 
 		{
 			$date = strtotime($plugin);
 		}
-		if($type == 'day' && is_array($id) && !$id['start']) {
+		if($type == 'day' && is_array($id) && !$id['start'])
+		{
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
-			if($which && date('d',$event['start']) != $which) return array();
-			if(date('Ymd',$date) != date('Ymd', $event['start'])) return array();
+			if($which && date('d',$event['start']) != $which)
+			{
+				return array();
+			}
+			if(date('Ymd',$date) != date('Ymd', $event['start']))
+			{
+				return array();
+			}
 			return $n == 0 ? $this->calendar_replacements($event) : array();
 		}
 
 		// Use start for cache, in case of multiple months
 		$_date = $id['start'] ? $id['start'] : $date;
-		if($days[date('Ymd',$_date)][$plugin]) return $days[date('Ymd',$_date)][$plugin][$n];
+		if($days[date('Ymd',$_date)][$plugin])
+		{
+			return $days[date('Ymd',$_date)][$plugin][$n];
+		}
 
 		$events = $this->bo->search($this->query + array(
 			'start' => $date,
@@ -476,31 +553,42 @@ 
 		));
 
 		$replacements = array();
-		if (true) $days = array();
+		if (true)
+		{
+			$days = array();
+		}
 		$time_format = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i';
 		foreach($events as $day => $list)
 		{
 			foreach($list as $event)
 			{
-				if($this->ids && !in_array($event['id'], $this->ids)) continue;
+				if($this->ids && !in_array($event['id'], $this->ids))
+				{
+					continue;
+				}
 				$start = Api\DateTime::to($event['start'], 'array');
 				$end = Api\DateTime::to($event['end'], 'array');
 				$replacements = $this->calendar_replacements($event);
-				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
+				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day'])
+				{
 					//$dow = date('l',$event['start']);
-				} else {
+				}
+				else
+				{
 					// Fancy date+time formatting for multi-day events
 					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
 					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0));
 				}
 				$days[date('Ymd',$_date)][$plugin][] = $replacements;
 			}
-			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
+			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false)
+			{
 				$date_marker = array(
 					'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
 					'$$day/name$$' => lang(date('l', strtotime($day)))
 				);
-				if(!is_array($days[date('Ymd',$_date)][$plugin])) {
+				if(!is_array($days[date('Ymd',$_date)][$plugin]))
+				{
 					$blank = $this->calendar_replacements(array());
 					foreach($blank as &$value)
 					{
@@ -528,22 +616,35 @@ 
 	{
 		unset($plugin);	// not used, but required by function signature
 
-		if(!is_array($id) || !$id['start']) {
+		if(!is_array($id) || !$id['start'])
+		{
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
-		} else {
+		}
+		else
+		{
 			$event = $id;
 		}
 
-		if(!is_array($event['participants']) || $n >= count($event['participants'])) return array();
+		if(!is_array($event['participants']) || $n >= count($event['participants']))
+		{
+			return array();
+		}
 
 		$participant = null;
 		$status = null;
 		$i = -1;
-		foreach($event['participants'] as $participant => $status) {
-			if(++$i == $n) break;
+		foreach($event['participants'] as $participant => $status)
+		{
+			if(++$i == $n)
+			{
+				break;
+			}
 		}
 
-		if(!$participant) return array();
+		if(!$participant)
+		{
+			return array();
+		}
 
 		// Add some common information
 		$quantity = $role = null;
@@ -577,7 +678,10 @@ 
 				$replacements = $this->contact_replacements(substr($participant,1),'');
 				break;
 			case 'r':
-				if (is_null(self::$resources)) self::$resources = CreateObject('resources.resources_bo');
+				if (is_null(self::$resources))
+				{
+					self::$resources = CreateObject('resources.resources_bo');
+				}
 				if (($resource = self::$resources->read(substr($participant,1))))
 				{
 					foreach($resource as $name => $value)
@@ -638,14 +742,23 @@ 
 			'calendar_owner'    => lang('Owner'),
 		) as $name => $label)
 		{
-			if (in_array($name,array('start','end')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name,array('start','end')) && $n&1)
+			{
+				// main values, which should be in the first column
 			{
 				echo "</tr>\n";
+			}
 				$n++;
 			}
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{'.$name.'}}</td><td>'.$label.'</td>';
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 
@@ -696,7 +809,8 @@ 
 		}
 		echo '</table></td><td colspan="2"><table >';
 		echo '<tr><td><h3>'.lang('Daily tables').":</h3></td></tr>";
-		foreach(self::$relative as $value) {
+		foreach(self::$relative as $value)
+		{
 			echo '<tr><td>{{table/'.$value. '}} ... {{endtable}}</td></tr>';
 		}
 		echo '<tr><td>{{table/day_n}} ... {{endtable}}</td><td>1 <= n <= 31</td></tr>';

calendar/inc/class.calendar_so.inc.php

Doc Comments +13 added lines, -37 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)
@@ -682,24 +670,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
 	 */
@@ -1140,11 +1115,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)
 	 */
@@ -1312,6 +1287,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)
@@ -1722,7 +1698,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
@@ -1899,12 +1875,12 @@ 
 	 *
 	 * @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)
 	 *		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
+	 * @return boolean number of updated recurrences or false on error
 	 */
 	function participants($cal_id,$participants,$change_since=0,$add_only=false)
 	{
@@ -2045,7 +2021,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
@@ -2962,7 +2938,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
 	 */

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;
 			}
 

Braces +366 added lines, -96 removed lines

@@ -154,16 +154,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";
 
@@ -184,16 +200,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 ...",
@@ -243,7 +275,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']);
@@ -264,7 +299,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;
@@ -284,15 +322,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));
@@ -318,26 +363,35 @@ 
 		$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;
+		}
 			$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)
@@ -387,10 +441,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)
 		{
@@ -464,10 +524,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;
@@ -524,7 +587,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)
@@ -557,7 +623,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(
@@ -579,7 +648,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)
@@ -604,7 +676,10 @@ 
 		{
 			$cats = $GLOBALS['egw']->categories->return_all_children($cat_id);
 			array_walk($cats,create_function('&$val,$key','$val = (int) $val;'));
-			if (is_array($cat_id) && count($cat_id)==1) $cat_id = $cat_id[0];
+			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)
 			{
@@ -663,10 +738,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')";
@@ -798,7 +876,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));
 					}
@@ -818,7 +899,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);
 		}
@@ -837,7 +921,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'])
@@ -847,9 +935,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')
 		{
@@ -863,7 +957,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
@@ -885,7 +982,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!
@@ -940,9 +1040,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)
 				{
@@ -953,14 +1056,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);
 		}
@@ -978,9 +1087,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'])
@@ -1008,7 +1120,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'])
 			{
@@ -1028,7 +1143,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_');
 		}
@@ -1047,10 +1165,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',$num_rows,$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']);
@@ -1069,7 +1193,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'])
@@ -1085,7 +1212,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'];
@@ -1095,7 +1225,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)
 				{
@@ -1115,14 +1248,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;
 					}
+					}
 				}
 			}
 		}
@@ -1222,10 +1361,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];
@@ -1319,7 +1461,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
 		{
@@ -1367,7 +1513,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'] :
@@ -1388,7 +1537,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)
 		{
@@ -1405,7 +1557,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=cal_etag+1';	// always update the etag, even if none given to check
@@ -1416,14 +1571,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!
 
 			$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')))
@@ -1575,8 +1740,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');
 					}
@@ -1584,8 +1748,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);
 					}
@@ -1732,12 +1895,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'])
 			{
@@ -1839,7 +2008,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
@@ -1859,8 +2031,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;
 	}
@@ -1881,8 +2059,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)
@@ -1993,9 +2177,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();
 
@@ -2067,7 +2255,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;
@@ -2087,16 +2278,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)
@@ -2129,7 +2329,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,
@@ -2144,7 +2347,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;
@@ -2373,7 +2580,10 @@ 
 		}
 		$alarm['cal_id'] = $cal_id;		// we need the back-reference
 		// add an alarm uid, if none is given
-		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid')) $alarm['uid'] = (string)new Horde_Support_Uuid;
+		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']))
@@ -2382,10 +2592,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;
 	}
@@ -2408,7 +2624,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);
 	}
@@ -2431,7 +2650,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;
 	}
@@ -2455,11 +2677,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(
@@ -2487,11 +2712,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,
@@ -2516,8 +2744,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 .
@@ -2528,7 +2762,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);
 
@@ -2537,8 +2774,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 .
@@ -2628,17 +2871,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'));
 
@@ -2681,7 +2933,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');
@@ -2835,7 +3090,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)
 		{
@@ -2892,7 +3151,9 @@ 
 			}
 			if (!isset($participants[$uid])
 				|| $participants[$uid] != $status)
-				return true;
+			{
+							return true;
+			}
 			unset($participants[$uid]);
 		}
 		return (!empty($participants));
@@ -2906,7 +3167,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']))
 		{
@@ -2968,8 +3232,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),

Upper-Lower-Casing +8 added lines, -8 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
 		{
@@ -870,7 +870,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);
 
-		$join = "JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id ".
+		$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
@@ -946,7 +946,7 @@ 
 				// 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)
 				{
-					$selects[$key]['cols'] = "DISTINCT $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";
+					$selects[$key]['cols'] = "distinct $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'),
@@ -1397,7 +1397,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
@@ -1762,13 +1762,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();
@@ -2468,7 +2468,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 +388 added lines, -391 removed lines

@@ -19,40 +19,40 @@ 
 /**
  * some necessary defines used by the calendar
  */
-if(!extension_loaded('mcal'))
+if (!extension_loaded('mcal'))
 {
-	define('MCAL_RECUR_NONE',0);
-	define('MCAL_RECUR_DAILY',1);
-	define('MCAL_RECUR_WEEKLY',2);
-	define('MCAL_RECUR_MONTHLY_MDAY',3);
-	define('MCAL_RECUR_MONTHLY_WDAY',4);
-	define('MCAL_RECUR_YEARLY',5);
-	define('MCAL_RECUR_SECONDLY',6);
-	define('MCAL_RECUR_MINUTELY',7);
-	define('MCAL_RECUR_HOURLY',8);
-
-	define('MCAL_M_SUNDAY',1);
-	define('MCAL_M_MONDAY',2);
-	define('MCAL_M_TUESDAY',4);
-	define('MCAL_M_WEDNESDAY',8);
-	define('MCAL_M_THURSDAY',16);
-	define('MCAL_M_FRIDAY',32);
-	define('MCAL_M_SATURDAY',64);
-
-	define('MCAL_M_WEEKDAYS',62);
-	define('MCAL_M_WEEKEND',65);
-	define('MCAL_M_ALLDAYS',127);
+	define('MCAL_RECUR_NONE', 0);
+	define('MCAL_RECUR_DAILY', 1);
+	define('MCAL_RECUR_WEEKLY', 2);
+	define('MCAL_RECUR_MONTHLY_MDAY', 3);
+	define('MCAL_RECUR_MONTHLY_WDAY', 4);
+	define('MCAL_RECUR_YEARLY', 5);
+	define('MCAL_RECUR_SECONDLY', 6);
+	define('MCAL_RECUR_MINUTELY', 7);
+	define('MCAL_RECUR_HOURLY', 8);
+
+	define('MCAL_M_SUNDAY', 1);
+	define('MCAL_M_MONDAY', 2);
+	define('MCAL_M_TUESDAY', 4);
+	define('MCAL_M_WEDNESDAY', 8);
+	define('MCAL_M_THURSDAY', 16);
+	define('MCAL_M_FRIDAY', 32);
+	define('MCAL_M_SATURDAY', 64);
+
+	define('MCAL_M_WEEKDAYS', 62);
+	define('MCAL_M_WEEKEND', 65);
+	define('MCAL_M_ALLDAYS', 127);
 }
 
-define('REJECTED',0);
-define('NO_RESPONSE',1);
-define('TENTATIVE',2);
-define('ACCEPTED',3);
-define('DELEGATED',4);
+define('REJECTED', 0);
+define('NO_RESPONSE', 1);
+define('TENTATIVE', 2);
+define('ACCEPTED', 3);
+define('DELEGATED', 4);
 
-define('HOUR_s',60*60);
-define('DAY_s',24*HOUR_s);
-define('WEEK_s',7*DAY_s);
+define('HOUR_s', 60 * 60);
+define('DAY_s', 24 * HOUR_s);
+define('WEEK_s', 7 * DAY_s);
 
 /**
  * Class to store all calendar data (storage object)
@@ -100,7 +100,7 @@ 
 	 * name of the main calendar table and prefix for all other calendar tables
 	 */
 	var $cal_table = 'egw_cal';
-	var $extra_table,$repeats_table,$user_table,$dates_table,$all_tables;
+	var $extra_table, $repeats_table, $user_table, $dates_table, $all_tables;
 
 	/**
 	 * reference to global db-object
@@ -136,7 +136,7 @@ 
 		$this->db = $GLOBALS['egw']->db;
 
 		$this->all_tables = array($this->cal_table);
-		foreach(array('extra','repeats','user','dates') as $name)
+		foreach (array('extra', 'repeats', 'user', 'dates') as $name)
 		{
 			$vname = $name.'_table';
 			$this->all_tables[] = $this->$vname = $this->cal_table.'_'.$name;
@@ -152,11 +152,11 @@ 
 	 * @param boolean $deleted =false
 	 * @return string
 	 */
-	protected function cal_range_view($start, $end, array $_where=null, $deleted=false)
+	protected function cal_range_view($start, $end, array $_where = null, $deleted = false)
 	{
 		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)	// using view without start-date is slower!
 		{
-			return $this->cal_table;	// no need / use for a view
+			return $this->cal_table; // no need / use for a view
 		}
 
 		$where = array();
@@ -182,11 +182,11 @@ 
 	 * @param boolean $deleted =false
 	 * @return string
 	 */
-	protected function dates_range_view($start, $end, array $_where=null, $deleted=false)
+	protected function dates_range_view($start, $end, array $_where = null, $deleted = false)
 	{
 		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)	// using view without start- AND end-date is slower!
 		{
-			return $this->dates_table;	// no need / use for a view
+			return $this->dates_table; // no need / use for a view
 		}
 
 		$where = array();
@@ -231,14 +231,14 @@ 
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return array of events
 	 */
-	function &events($start,$end,$users,$cat_id=0,$filter='all',$offset=False,$num_rows=0,array $params=array(),$remove_rejected_by_user=null)
+	function &events($start, $end, $users, $cat_id = 0, $filter = 'all', $offset = False, $num_rows = 0, array $params = array(), $remove_rejected_by_user = null)
 	{
-		error_log(__METHOD__.'('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
+		error_log(__METHOD__.'('.($start ? date('Y-m-d H:i', $start) : '').','.($end ? date('Y-m-d H:i', $end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
 		$start_time = microtime(true);
 		// not everything is supported by now
 		if (!$start || !$end || is_string($params['query']) ||
 			//in_array($filter,array('owner','deleted')) ||
-			$params['enum_recuring']===false)
+			$params['enum_recuring'] === false)
 		{
 			throw new Api\Exception\AssertionFailed("Unsupported value for parameters!");
 		}
@@ -265,7 +265,7 @@ 
 		{
 			// fix $users to also prefix system users and groups (with 'u')
 			if (!is_array($users)) $users = $users ? (array)$users : array();
-			foreach($users as &$uid)
+			foreach ($users as &$uid)
 			{
 				$user_type = $user_id = null;
 				self::split_user($uid, $user_type, $user_id, true);
@@ -286,7 +286,7 @@ 
 
 		if ($params['order'])	// only order if requested
 		{
-			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+			if (!preg_match('/^[a-z_ ,c]+$/i', $params['order'])) $params['order'] = 'cal_start'; // gard against SQL injection
 			$sql .= "\nORDER BY ".$params['order'];
 		}
 
@@ -295,8 +295,8 @@ 
 			$offset = 0;
 			$num_rows = -1;
 		}
-		$events =& $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
-		error_log(__METHOD__."(...) $sql --> ".number_format(microtime(true)-$start_time, 3));
+		$events = & $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
+		error_log(__METHOD__."(...) $sql --> ".number_format(microtime(true) - $start_time, 3));
 		return $events;
 	}
 
@@ -309,12 +309,12 @@ 
 	 * @param int $recur_date =0 if set read the next recurrence at or after the timestamp, default 0 = read the initital one
 	 * @return array|boolean array with cal_id => event array pairs or false if entry not found
 	 */
-	function read($ids,$recur_date=0)
+	function read($ids, $recur_date = 0)
 	{
 		//error_log(__METHOD__.'('.array2string($ids).",$recur_date) ".function_backtrace());
 		$cols = self::get_columns('calendar', $this->cal_table);
 		$cols[0] = $this->db->to_varchar($this->cal_table.'.cal_id');
-		$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".implode(',',$cols);
+		$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".implode(',', $cols);
 		$join = "LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id";
 
 		$where = array();
@@ -324,23 +324,23 @@ 
 			$where['cal_uid'] = $ids;
 			$where['cal_reference'] = 0;
 		}
-		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))	// one or more cal_id's
+		elseif (is_array($ids) && isset($ids[count($ids) - 1]) || is_scalar($ids))	// one or more cal_id's
 		{
 			$where['cal_id'] = $ids;
 		}
 		else	// array with column => value pairs
 		{
 			$where = $ids;
-			unset($ids);	// otherwise users get not read!
+			unset($ids); // otherwise users get not read!
 		}
 		if (isset($where['cal_id']))	// prevent non-unique column-name cal_id
 		{
-			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.',array(
+			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.', array(
 				'cal_id' => $where['cal_id'],
 			));
 			unset($where['cal_id']);
 		}
-		if ((int) $recur_date)
+		if ((int)$recur_date)
 		{
 			$where[] = 'cal_start >= '.(int)$recur_date;
 			$group_by = 'GROUP BY '.$cols;
@@ -353,7 +353,7 @@ 
 		}
 		$cols .= ',range_end AS recur_enddate';
 
-		$events =& $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date);
+		$events = & $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date);
 
 		return $events ? $events : false;
 	}
@@ -365,7 +365,7 @@ 
 	 * @param int $recur_date =0
 	 * @return array
 	 */
-	protected function &get_events($rs, $recur_date=0)
+	protected function &get_events($rs, $recur_date = 0)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
@@ -377,7 +377,7 @@ 
 		}
 
 		$events = array();
-		foreach($rs as $row)
+		foreach ($rs as $row)
 		{
 			if (!$row['recur_type'])
 			{
@@ -385,7 +385,7 @@ 
 				unset($row['recur_enddate']);
 			}
 			$row['recur_exception'] = $row['alarm'] = array();
-			$events[$row['cal_id']] = Api\Db::strip_array_keys($row,'cal_');
+			$events[$row['cal_id']] = Api\Db::strip_array_keys($row, 'cal_');
 		}
 		if (!$events) return $events;
 
@@ -397,26 +397,26 @@ 
 			if (!isset($event['uid']) || strlen($event['uid']) < $minimum_uid_length)
 			{
 				// event (without uid), not strong enough uid => create new uid
-				$event['uid'] = Api\CalDAV::generate_uid('calendar',$event['id']);
+				$event['uid'] = Api\CalDAV::generate_uid('calendar', $event['id']);
 				$this->db->update($this->cal_table, array('cal_uid' => $event['uid']),
-					array('cal_id' => $event['id']),__LINE__,__FILE__,'calendar');
+					array('cal_id' => $event['id']), __LINE__, __FILE__, 'calendar');
 			}
 			if (!(int)$recur_date && $event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $ids,
 					'recur_exception' => true,
 				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_start', 'calendar') as $row)
 				{
 					$events[$row['cal_id']]['recur_exception'][] = $row['cal_start'];
 				}
-				break;	// as above select read all exceptions (and I dont think too short uid problem still exists)
+				break; // as above select read all exceptions (and I dont think too short uid problem still exists)
 			}
 			// make sure we fetch only real exceptions (deleted occurrences of a series should not show up)
-			if (($recur_date &&	$event['recur_type'] != MCAL_RECUR_NONE))
+			if (($recur_date && $event['recur_type'] != MCAL_RECUR_NONE))
 			{
 				//_debug_array(__METHOD__.__LINE__.' recur_date:'.$recur_date.' check cal_start:'.$event['start']);
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $event['id'],
 					'cal_start' => $event['start'],
 					'recur_exception' => true,
@@ -432,7 +432,7 @@ 
 						'cal_deleted' => NULL
 					), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn())
 					{
-						$e = $this->read($event['id'],$event['start']+1);
+						$e = $this->read($event['id'], $event['start'] + 1);
 						$event = $e[$event['id']];
 						break;
 					}
@@ -454,21 +454,21 @@ 
 			if ($recur_date)
 			{
 				// also remember recur_date, maybe we need it later, duno now
-				$recur_date = array(0,$events[$ids]['recur_date'] = $events[$ids]['start']);
+				$recur_date = array(0, $events[$ids]['recur_date'] = $events[$ids]['start']);
 			}
 		}
 
 		// participants, if a recur_date give, we read that recurance, plus the one users from the default entry with recur_date=0
 		// sorting by cal_recur_date ASC makes sure recurence status always overwrites series status
-		foreach($this->db->select($this->user_table,'*',array(
+		foreach ($this->db->select($this->user_table, '*', array(
 			'cal_id'      => $ids,
 			'cal_recur_date' => $recur_date,
 			"cal_status NOT IN ('X','E')",
-		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)	// DESC puts users before resources and contacts
+		), __LINE__, __FILE__, false, 'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT, 'calendar') as $row)	// DESC puts users before resources and contacts
 		{
 			// combine all participant data in uid and status values
 			$uid    = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
-			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+			$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 
 			$events[$row['cal_id']]['participants'][$uid] = $status;
 			$events[$row['cal_id']]['participant_types'][$row['cal_user_type']][is_numeric($uid) ? $uid : substr($uid, 1)] = $status;
@@ -477,7 +477,7 @@ 
 		}
 
 		// custom fields
-		foreach($this->db->select($this->extra_table,'*',array('cal_id'=>$ids),__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->extra_table, '*', array('cal_id'=>$ids), __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			$events[$row['cal_id']]['#'.$row['cal_extra_name']] = $row['cal_extra_value'];
 		}
@@ -485,7 +485,7 @@ 
 		// alarms
 		if (is_array($ids))
 		{
-			foreach($this->read_alarms((array)$ids) as $cal_id => $alarms)
+			foreach ($this->read_alarms((array)$ids) as $cal_id => $alarms)
 			{
 				$events[$cal_id]['alarm'] = $alarms;
 			}
@@ -514,11 +514,11 @@ 
 	 * @param boolean $master_only =false only check recurance master (egw_cal_user.recur_date=0)
 	 * @return int maximum modification timestamp
 	 */
-	function get_ctag($users, $owner_too=false,$master_only=false)
+	function get_ctag($users, $owner_too = false, $master_only = false)
 	{
-		static $ctags = array();	// some per-request caching
+		static $ctags = array(); // some per-request caching
 		static $last_request = null;
-		if (!isset($last_request) || time()-$last_request > self::MAX_CTAG_CACHE_TIME)
+		if (!isset($last_request) || time() - $last_request > self::MAX_CTAG_CACHE_TIME)
 		{
 			$ctags = array();
 			$last_request = time();
@@ -527,13 +527,13 @@ 
 		if (isset($ctags[$signature])) return $ctags[$signature];
 
 		$types = array();
-		foreach((array)$users as $uid)
+		foreach ((array)$users as $uid)
 		{
 			$type = $id = null;
 			self::split_user($uid, $type, $id, true);
 			$types[$type][] = $id;
 		}
-		foreach($types as $type => $ids)
+		foreach ($types as $type => $ids)
 		{
 			$where = array(
 				'cal_user_type' => $type,
@@ -555,17 +555,17 @@ 
 		if ($owner_too)
 		{
 			// owner can only by users, no groups or resources
-			foreach($users as $key => $user)
+			foreach ($users as $key => $user)
 			{
 				if (!($user > 0)) unset($users[$key]);
 			}
 			$where = $this->db->expression($this->user_table, '(', $where, ' OR ').
 				$this->db->expression($this->cal_table, array(
 					'cal_owner' => $users,
-				),')');
+				), ')');
 		}
-		return $ctags[$signature] = $this->db->select($this->user_table,'MAX(cal_modified)',
-			$where,__LINE__,__FILE__,false,'','calendar',0,'JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id')->fetchColumn();
+		return $ctags[$signature] = $this->db->select($this->user_table, 'MAX(cal_modified)',
+			$where, __LINE__, __FILE__, false, '', 'calendar', 0, 'JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id')->fetchColumn();
 	}
 
 	/**
@@ -577,7 +577,7 @@ 
 	 * @param string|array $cols ='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified' cols to query
 	 * @return Iterator as Api\Db::select
 	 */
-	function get_cal_data(array $query, $cols='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
+	function get_cal_data(array $query, $cols = 'cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
 	{
 		if (!is_array($cols)) $cols = explode(',', $cols);
 
@@ -605,14 +605,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 .= ') ';
 		}
@@ -627,13 +627,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;
@@ -707,7 +707,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());
 
@@ -730,7 +730,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 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 AS recur_enddate,".implode(',', $all_cols).",cal_start,cal_end,$this->user_table.cal_recur_date";
 		}
 		$where = array();
 		if (is_array($params['query']))
@@ -739,19 +739,19 @@ 
 		}
 		elseif ($params['query'])
 		{
-			foreach(array('cal_title','cal_description','cal_location') as $col)
+			foreach (array('cal_title', 'cal_description', 'cal_location') as $col)
 			{
 				$to_or[] = $col.' '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%'.$params['query'].'%');
 			}
-			$where[] = '('.implode(' OR ',$to_or).')';
+			$where[] = '('.implode(' OR ', $to_or).')';
 
 			// Searching - restrict private to own or private grant
 			if (!isset($params['private_grants']))
 			{
 				$params['private_grants'] = $GLOBALS['egw']->acl->get_ids_for_location($GLOBALS['egw_info']['user']['account_id'], Acl::PRIVAT, 'calendar');
-				$params['private_grants'][] = $GLOBALS['egw_info']['user']['account_id'];	// db query does NOT return current user
+				$params['private_grants'][] = $GLOBALS['egw_info']['user']['account_id']; // db query does NOT return current user
 			}
-			$private_filter = '(cal_public=1 OR cal_public=0 AND '.$this->db->expression($this->cal_table, array('cal_owner' => $params['private_grants'])) . ')';
+			$private_filter = '(cal_public=1 OR cal_public=0 AND '.$this->db->expression($this->cal_table, array('cal_owner' => $params['private_grants'])).')';
 			$where[] = $private_filter;
 		}
 		if (!empty($params['sql_filter']))
@@ -760,7 +760,7 @@ 
 			{
 				$where[] = $params['sql_filter'];
 			}
-			elseif(is_array($params['sql_filter']))
+			elseif (is_array($params['sql_filter']))
 			{
 				$where = array_merge($where, $params['sql_filter']);
 			}
@@ -768,11 +768,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
 				{
@@ -784,45 +784,45 @@ 
 			$to_or = $user_or = array();
 			$owner_or = null;
 			$useUnionQuery = $this->db->capabilities['distinct_on_text'] && $this->db->capabilities['union'];
-			$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);
 		}
@@ -841,15 +841,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';
   		}
@@ -861,14 +861,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');
@@ -880,7 +879,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 ".$join;
 		}
@@ -907,29 +906,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";
 					}
 				}
 			}
@@ -939,34 +938,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'] = "DISTINCT $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
 		{
@@ -989,27 +988,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;
@@ -1021,9 +1020,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
 			{
@@ -1032,9 +1031,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))
@@ -1044,26 +1043,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',$num_rows,$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', $num_rows, $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]))
 						{
@@ -1078,16 +1077,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;
 						}
@@ -1100,10 +1099,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]))
 						{
@@ -1113,9 +1112,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'];
 
@@ -1152,16 +1151,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,
@@ -1170,12 +1169,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']);
 			}
 		}
 	}
@@ -1200,35 +1199,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]))
 				{
@@ -1241,7 +1240,7 @@ 
 			}
 		}
 		//error_log(__METHOD__."(".array2string($app_cols).", ".array2string($required).", '$required_app') returning ".array2string(implode(',',$return_cols)));
-		return implode(',',$return_cols);
+		return implode(',', $return_cols);
 	}
 
 	/**
@@ -1251,21 +1250,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']);
 			}
 		}
@@ -1318,12 +1317,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
 		{
@@ -1334,7 +1333,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;
 
@@ -1362,9 +1361,9 @@ 
 		}
 
 		// add colum prefix 'cal_' if there's not already a 'recur_' prefix
-		foreach($event as $col => $val)
+		foreach ($event as $col => $val)
 		{
-			if ($col[0] != '#' && substr($col,0,6) != 'recur_' && substr($col,0,6) != 'range_' && $col != 'alarm' && $col != 'tz_id' && $col != 'caldav_name')
+			if ($col[0] != '#' && substr($col, 0, 6) != 'recur_' && substr($col, 0, 6) != 'range_' && $col != 'alarm' && $col != 'tz_id' && $col != 'caldav_name')
 			{
 				$event['cal_'.$col] = $val;
 				unset($event[$col]);
@@ -1374,13 +1373,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
@@ -1389,7 +1387,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;
@@ -1407,18 +1405,18 @@ 
 			// read only timezone id, to check if it is changed
 			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$old_tz_id = $this->db->select($this->cal_table,'tz_id',$where,__LINE__,__FILE__,'calendar')->fetchColumn();
+				$old_tz_id = $this->db->select($this->cal_table, 'tz_id', $where, __LINE__, __FILE__, 'calendar')->fetchColumn();
 			}
 			if (!is_null($etag)) $where['cal_etag'] = $etag;
 
 			unset($event['cal_etag']);
-			$event[] = 'cal_etag=cal_etag+1';	// always update the etag, even if none given to check
+			$event[] = 'cal_etag=cal_etag+1'; // always update the etag, even if none given to check
 
-			$this->db->update($this->cal_table,$event,$where,__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, $event, $where, __LINE__, __FILE__, 'calendar');
 
 			if (!is_null($etag) && $this->db->affected_rows() < 1)
 			{
-				return 0;	// wrong etag, someone else updated the entry
+				return 0; // wrong etag, someone else updated the entry
 			}
 			if (!is_null($etag)) ++$etag;
 		}
@@ -1427,10 +1425,10 @@ 
 			// new event
 			if (!$event['cal_owner']) $event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
 
-			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = '';	// uid is NOT NULL!
+			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = ''; // uid is NOT NULL!
 
-			$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__,'calendar');
-			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table,'cal_id')))
+			$this->db->insert($this->cal_table, $event, false, __LINE__, __FILE__, 'calendar');
+			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table, 'cal_id')))
 			{
 				return false;
 			}
@@ -1440,7 +1438,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', '>='))
@@ -1449,37 +1447,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);
@@ -1498,10 +1496,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)
@@ -1520,8 +1518,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']);
@@ -1531,7 +1529,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;
 			}
@@ -1540,22 +1538,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']))
 					{
@@ -1566,7 +1564,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);
@@ -1574,24 +1572,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");
 				}
@@ -1600,9 +1598,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,
@@ -1611,25 +1609,25 @@ 
 			}
 
 			// 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
-		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'];
@@ -1637,19 +1635,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');
 				}
 			}
 		}
@@ -1660,9 +1658,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'];
 				}
@@ -1673,14 +1671,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
@@ -1700,7 +1698,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)
 		{
@@ -1711,7 +1709,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;
@@ -1732,34 +1730,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;
 
@@ -1767,13 +1765,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();
 	}
@@ -1792,8 +1790,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;
@@ -1806,11 +1803,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)
 		{
@@ -1830,12 +1827,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')
@@ -1849,7 +1846,7 @@ 
 		else
 		{
 			$user_type = $uid[0];
-			$user_id = substr($uid,1);
+			$user_id = substr($uid, 1);
 		}
 	}
 
@@ -1861,7 +1858,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;
@@ -1877,13 +1874,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];
@@ -1910,14 +1907,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')
 			{
@@ -1926,7 +1923,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.')';
 		}
@@ -1934,31 +1931,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
@@ -1971,7 +1968,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)
 				{
@@ -1983,46 +1980,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)
@@ -2032,13 +2029,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');
 			}
 		}
@@ -2057,7 +2054,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',
@@ -2082,7 +2079,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;
 		}
@@ -2093,7 +2090,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
@@ -2101,7 +2098,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)
 			{
@@ -2114,7 +2111,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;
@@ -2129,7 +2126,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);
@@ -2138,7 +2135,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))
 		{
@@ -2146,26 +2143,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');
 			}
 		}
 	}
@@ -2179,7 +2176,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".
@@ -2205,9 +2202,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');
 		}
 	}
 
@@ -2223,19 +2220,19 @@ 
 	function purge($date)
 	{
 		// with new range_end we simple delete all with range_end < $date (range_end NULL is never returned)
-		foreach($this->db->select($this->cal_table, 'cal_id', 'range_end < '.(int)$date, __LINE__, __FILE__, false, '', 'calendar') as $row)
+		foreach ($this->db->select($this->cal_table, 'cal_id', 'range_end < '.(int)$date, __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			//echo __METHOD__." About to delete".$row['cal_id']."\r\n";
-			foreach($this->all_tables as $table)
+			foreach ($this->all_tables as $table)
 			{
 				$this->db->delete($table, array('cal_id'=>$row['cal_id']), __LINE__, __FILE__, 'calendar');
 			}
 			// handle sync
-			$this->db->update('egw_api_content_history',array(
+			$this->db->update('egw_api_content_history', array(
 				'sync_deleted' => time(),
-			),array(
+			), array(
 				'sync_appname' => 'calendar',
-				'sync_contentid' => $row['cal_id'],	// sync_contentid is varchar(60)!
+				'sync_contentid' => $row['cal_id'], // sync_contentid is varchar(60)!
 			), __LINE__, __FILE__);
 			// handle links
 			Link::unlink('', 'calendar', $row['cal_id']);
@@ -2258,23 +2255,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();
 
@@ -2282,13 +2279,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);
 					}
@@ -2300,7 +2297,7 @@ 
 			}
 			else
 			{
-				foreach($cal_id as $id)
+				foreach ($cal_id as $id)
 				{
 					$alarms[$id] = (array)self::$alarm_cache[$id];
 				}
@@ -2315,9 +2312,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'];
 
@@ -2340,8 +2337,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'];
 
@@ -2357,12 +2354,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
 			{
@@ -2375,12 +2372,12 @@ 
 		{
 			$this->async->cancel_timer($id);
 		}
-		$alarm['cal_id'] = $cal_id;		// we need the back-reference
+		$alarm['cal_id'] = $cal_id; // we need the back-reference
 		// add an alarm uid, if none is given
 		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid')) $alarm['uid'] = (string)new Horde_Support_Uuid;
 		//error_log(__METHOD__.__LINE__.' Save Alarm for CalID:'.$cal_id.'->'.array2string($alarm).'-->'.$id.'#'.function_backtrace());
 		// allways store job with the alarm owner as job-owner to get eg. the correct from address
-		if (!$this->async->set_timer($alarm['time'],$id,'calendar.calendar_boupdate.send_alarm',$alarm,$alarm['owner']))
+		if (!$this->async->set_timer($alarm['time'], $id, 'calendar.calendar_boupdate.send_alarm', $alarm, $alarm['owner']))
 		{
 			return False;
 		}
@@ -2407,7 +2404,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);
 			}
@@ -2427,7 +2424,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);
@@ -2446,7 +2443,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))
 		{
@@ -2457,52 +2454,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');
 		}
 	}
 
@@ -2516,18 +2513,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;
@@ -2541,17 +2538,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;
@@ -2600,8 +2597,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)
 			{
@@ -2630,10 +2627,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;
@@ -2657,27 +2654,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)
@@ -2688,14 +2685,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)");
 			}
@@ -2714,11 +2711,11 @@ 
 						//	'() tz exception: ' . $day->format('Ymd\THis'));
 						if ($remote)
 						{
-							$days[$locts]= $remts;
+							$days[$locts] = $remts;
 						}
 						else
 						{
-							$days[$remts]= $locts;
+							$days[$remts] = $locts;
 						}
 					}
 				}
@@ -2740,18 +2737,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') &&
@@ -2761,11 +2758,11 @@ 
 					if ($expand_all)
 					{
 
-						$days[$remts]= $locts;
+						$days[$remts] = $locts;
 					}
 					else
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 			}
@@ -2789,9 +2786,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)
 		{
@@ -2802,8 +2799,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'])
 				{
@@ -2826,8 +2823,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'])
 			{
@@ -2924,14 +2921,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;
@@ -2945,7 +2942,7 @@ 
 	 *
 	 * @return DateTime
 	 */
-	function &startOfDay(Api\DateTime $time, $tz_id=null)
+	function &startOfDay(Api\DateTime $time, $tz_id = null)
 	{
 		if (empty($tz_id))
 		{
@@ -2970,14 +2967,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)

calendar/inc/class.calendar_timezones.inc.php

Doc Comments +1 added lines

@@ -204,6 +204,7 @@
 	 *
 	 * @param boolean &$updated=null on return true if update was neccessary, false if tz's were already up to date
 	 * @param string $file ='calendar/setup/timezones.sqlite' filename relative to EGW_SERVER_ROOT
+	 * @param boolean $updated
 	 * @return string message about update
 	 * @throws Api\Exception\WrongParameter if $file is not readable or wrong format/version
 	 * @throws Api\Exception\WrongUserinput if no PDO sqlite support

Spacing +47 added lines, -47 removed lines

@@ -71,7 +71,7 @@ 
 	 */
 	public static function DateTimeZone($tzid)
 	{
-		if (($id = self::tz2id($tzid,'alias')))
+		if (($id = self::tz2id($tzid, 'alias')))
 		{
 			$tzid = self::id2tz($id);
 		}
@@ -89,34 +89,34 @@ 
 	 * @param string $what ='id' what to return, default id, null for whole array
 	 * @return int tz_id or null if not found
 	 */
-	public static function tz2id($tzid,$what='id')
+	public static function tz2id($tzid, $what = 'id')
 	{
-		$id =& self::$tz2id[$tzid];
+		$id = & self::$tz2id[$tzid];
 
 		if (!isset($id))
 		{
-			if (($data = $GLOBALS['egw']->db->select(self::TABLE,'*',array(
+			if (($data = $GLOBALS['egw']->db->select(self::TABLE, '*', array(
 				'tz_tzid' => $tzid,
-			),__LINE__,__FILE__,false,'','calendar')->fetch()))
+			), __LINE__, __FILE__, false, '', 'calendar')->fetch()))
 			{
 				$id = $data['tz_id'];
-				self::$tz_cache[$id] = Api\Db::strip_array_keys($data,'tz_');
+				self::$tz_cache[$id] = Api\Db::strip_array_keys($data, 'tz_');
 			}
 		}
 		// check if we can find a 3-part America timezone eg. check 'America/Argentina/Buenos_Aires' for 'America/Buenos_Aires'
 		if (!isset($id) && stripos($tzid, 'America/') === 0 && count($parts = explode('/', $tzid)) == 2)
 		{
-			if (($data = $GLOBALS['egw']->db->select(self::TABLE,'*',array(
+			if (($data = $GLOBALS['egw']->db->select(self::TABLE, '*', array(
 				'tz_tzid LIKE '.$GLOBALS['egw']->db->quote($parts[0].'/%/'.$parts[1]),
-			),__LINE__,__FILE__,false,'','calendar')->fetch()))
+			), __LINE__, __FILE__, false, '', 'calendar')->fetch()))
 			{
 				$id = $data['tz_id'];
-				self::$tz_cache[$id] = Api\Db::strip_array_keys($data,'tz_');
+				self::$tz_cache[$id] = Api\Db::strip_array_keys($data, 'tz_');
 			}
 		}
 		if (isset($id) && $what != 'id')
 		{
-			return self::id2tz($id,$what);
+			return self::id2tz($id, $what);
 		}
 		return $id;
 	}
@@ -134,24 +134,24 @@ 
 	 * @param string $what ='tzid' what data to return or null for whole data array, with keys 'id', 'tzid', 'component', 'alias', 'latitude', 'longitude'
 	 * @return mixed false: if not found
 	 */
-	public static function id2tz($id,$what='tzid')
+	public static function id2tz($id, $what = 'tzid')
 	{
-		$data =& self::$tz_cache[$id];
+		$data = & self::$tz_cache[$id];
 
 		if (!isset($data))
 		{
-			if (($data = $GLOBALS['egw']->db->select(self::TABLE,'*',array(
+			if (($data = $GLOBALS['egw']->db->select(self::TABLE, '*', array(
 				'tz_id' => $id,
-			),__LINE__,__FILE__,false,'','calendar')->fetch()))
+			), __LINE__, __FILE__, false, '', 'calendar')->fetch()))
 			{
-				$data = Api\Db::strip_array_keys($data,'tz_');
+				$data = Api\Db::strip_array_keys($data, 'tz_');
 				self::$tz2id[$data['tzid']] = $id;
 			}
 		}
 		// if not tzid queried, resolve aliases automatically
 		if ($data && $data['alias'] && $what != 'tzid' && $what != 'alias')
 		{
-			$data = self::id2tz($data['alias'],null);
+			$data = self::id2tz($data['alias'], null);
 		}
 		return !$data ? $data : ($what ? $data[$what] : $data);
 	}
@@ -170,8 +170,8 @@ 
 	 */
 	public static function init_static()
 	{
-		self::$tz_cache =& Api\Cache::getSession(__CLASS__,'tz_cache');
-		self::$tz2id =& Api\Cache::getSession(__CLASS__,'tz2id');
+		self::$tz_cache = & Api\Cache::getSession(__CLASS__, 'tz_cache');
+		self::$tz2id = & Api\Cache::getSession(__CLASS__, 'tz2id');
 
 		// init cache with mapping UTC <--> -1, as UTC is no real timezone, but we need to be able to use it in calendar
 		if (!is_array(self::$tz2id))
@@ -188,10 +188,10 @@ 
 		{
 			$updated = false;
 			$msg = self::import_zones($updated);
-			if ($updated) error_log($msg);	// log that timezones have been updated
+			if ($updated) error_log($msg); // log that timezones have been updated
 
 			$alias_msg = self::import_tz_aliases($updated);
-			if ($updated) error_log($alias_msg);	// log that timezone aliases have been updated
+			if ($updated) error_log($alias_msg); // log that timezone aliases have been updated
 
 			self::$import_msg = $msg.'<br/>'.$alias_msg;
 
@@ -210,7 +210,7 @@ 
 	 * @throws Api\Exception\WrongUserinput for broken sqlite extension
 	 * @link https://hg.mozilla.org/comm-central/raw-file/tip/calendar/timezones/zones.json
 	 */
-	public static function import_zones(&$updated=null, $file='calendar/setup/zones.json')
+	public static function import_zones(&$updated = null, $file = 'calendar/setup/zones.json')
 	{
 		$path = EGW_SERVER_ROOT.'/'.$file;
 
@@ -232,9 +232,9 @@ 
 		{
 			$updated = false;
 			fclose($fp);
-			return lang('Nothing to update, version is already %1.',$config['tz_version']);	// we already have the right
+			return lang('Nothing to update, version is already %1.', $config['tz_version']); // we already have the right
 		}
-		$json .= fread($fp, 1024*1024);
+		$json .= fread($fp, 1024 * 1024);
 		fclose($fp);
 		if (!($zones = json_decode($json, true)) || !isset($zones['aliases']) || !isset($zones['zones']))
 		{
@@ -242,38 +242,38 @@ 
 		}
 		// import zones first and then aliases
 		$tz2id = array();
-		foreach(array('zones', 'aliases') as $type)
+		foreach (array('zones', 'aliases') as $type)
 		{
-			foreach($zones[$type] as $tzid => $data)
+			foreach ($zones[$type] as $tzid => $data)
 			{
 				if ($type == 'aliases')
 				{
 					$data = array('alias' => $tz2id[$data['aliasTo']]);
-					if (!$data['alias']) continue;	// there's no such tzid
+					if (!$data['alias']) continue; // there's no such tzid
 				}
 				// check if already in database
-				$tz2id[$tzid] = $GLOBALS['egw']->db->select('egw_cal_timezones','tz_id',array(
+				$tz2id[$tzid] = $GLOBALS['egw']->db->select('egw_cal_timezones', 'tz_id', array(
 						'tz_tzid' => $tzid,
-					),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
+					), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn();
 
-				$GLOBALS['egw']->db->insert('egw_cal_timezones',array(
+				$GLOBALS['egw']->db->insert('egw_cal_timezones', array(
 					'tz_alias' => $data['alias'],
 					'tz_latitude' => $data['latitude'],
 					'tz_longitude' => $data['longitude'],
 					'tz_component' => $data['ics'],
-				),array(
+				), array(
 					'tz_tzid' => $tzid,
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 
 				// only query last insert id, if not already in database (gives warning for PostgreSQL)
-				if (!$tz2id[$tzid]) $tz2id[$tzid] = $GLOBALS['egw']->db->get_last_insert_id('egw_cal_timezones','tz_id');
+				if (!$tz2id[$tzid]) $tz2id[$tzid] = $GLOBALS['egw']->db->get_last_insert_id('egw_cal_timezones', 'tz_id');
 			}
 		}
 		Api\Config::save_value('tz_version', $tz_version, 'phpgwapi');
 
 		//_debug_array($tz2id);
 		$updated = true;
-		return lang('Timezones updated to version %1 (%2 records updated).',$tz_version,count($tz2id));
+		return lang('Timezones updated to version %1 (%2 records updated).', $tz_version, count($tz2id));
 	}
 
 	/**
@@ -284,7 +284,7 @@ 
 	 * @return string message about update
 	 * @throws Api\Exception\WrongParameter if $file is not readable or wrong format/version
 	 */
-	public static function import_tz_aliases(&$updated=null,$file='calendar/setup/tz_aliases.inc.php')
+	public static function import_tz_aliases(&$updated = null, $file = 'calendar/setup/tz_aliases.inc.php')
 	{
 		$path = EGW_SERVER_ROOT.'/'.$file;
 
@@ -297,27 +297,27 @@ 
 		if ($tz_aliases_mtime === $config['tz_aliases_mtime'])
 		{
 			$updated = false;
-			return lang('Nothing to update, version is already %1.',$tz_aliases_mtime);
+			return lang('Nothing to update, version is already %1.', $tz_aliases_mtime);
 		}
 		$tz_aliases = array();
-		include($path);	// sets $tz_aliases
+		include($path); // sets $tz_aliases
 
 		$updates = 0;
-		foreach($tz_aliases as $alias => $tzid)
+		foreach ($tz_aliases as $alias => $tzid)
 		{
-			if ((!($alias_id=self::tz2id($alias, 'alias')) || self::id2tz($alias_id, 'tzid') !== $tzid) &&	// not in DB or different
+			if ((!($alias_id = self::tz2id($alias, 'alias')) || self::id2tz($alias_id, 'tzid') !== $tzid) && // not in DB or different
 				($tz_id = self::tz2id($tzid)))	// given tzid for alias exists in DB
 			{
-				$GLOBALS['egw']->db->insert('egw_cal_timezones',array(
+				$GLOBALS['egw']->db->insert('egw_cal_timezones', array(
 					'tz_alias' => $tz_id,
-				),array(
+				), array(
 					'tz_tzid' => $alias,
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 				++$updates;
 			}
 			//error_log(__METHOD__."() alias=$alias, tzid=$tzid --> self::tz2id('$alias', 'alias') = ".array2string($alias_id).",  self::tz2id('$tzid')=".array2string($tz_id));
 		}
-		Api\Config::save_value('tz_aliases_mtime',$tz_aliases_mtime,$app='phpgwapi');
+		Api\Config::save_value('tz_aliases_mtime', $tz_aliases_mtime, $app = 'phpgwapi');
 
 		//_debug_array($tz2id);
 		$updated = true;
@@ -358,8 +358,8 @@ 
 		}
 		// $vtimezone is a string with a single VTIMEZONE component, afaik Horde_Icalendar can not add it directly
 		// --> we have to parse it and let Horde_Icalendar add it again
-		$horde_vtimezone = Horde_Icalendar::newComponent('VTIMEZONE',$container=false);
-		$horde_vtimezone->parsevCalendar($vtimezone,'VTIMEZONE');
+		$horde_vtimezone = Horde_Icalendar::newComponent('VTIMEZONE', $container = false);
+		$horde_vtimezone->parsevCalendar($vtimezone, 'VTIMEZONE');
 		// DTSTART is in UTC time, Horde_Icalendar parses it in server timezone, which we need to set again for printing
 		$standard = $horde_vtimezone->findComponent('STANDARD');
 		if (is_a($standard, 'Horde_Icalendar'))
@@ -390,7 +390,7 @@ 
 	 * @param string $type ='vcalendar' 'tzid' or everything tz2id supports, default 'vcalendar' = full vcalendar component
 	 * @return string
 	 */
-	public static function user_timezone($user=null, $type='vcalendar')
+	public static function user_timezone($user = null, $type = 'vcalendar')
 	{
 		if (!$user || $user == $GLOBALS['egw_info']['user']['account_id'])
 		{
@@ -409,7 +409,7 @@ 
 			case 'vcalendar':
 				// checking type of $val, now we included the object definition (no need to always include it!)
 				$vcal = new Horde_Icalendar;
-				$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+				$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 					strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 				self::add_vtimezone($vcal, $tzid);
 				$tzid = $vcal->exportvCalendar('utf-8');
@@ -417,7 +417,7 @@ 
 			case 'tzid':
 				break;
 			default:
-				$tzid = self::tz2id($tzid,$type == 'vcalendar' ? 'component' : $type);
+				$tzid = self::tz2id($tzid, $type == 'vcalendar' ? 'component' : $type);
 				break;
 		}
 		return $tzid;

Braces +27 added lines, -6 removed lines

@@ -188,10 +188,18 @@ 
 		{
 			$updated = false;
 			$msg = self::import_zones($updated);
-			if ($updated) error_log($msg);	// log that timezones have been updated
+			if ($updated)
+			{
+				error_log($msg);
+			}
+			// log that timezones have been updated
 
 			$alias_msg = self::import_tz_aliases($updated);
-			if ($updated) error_log($alias_msg);	// log that timezone aliases have been updated
+			if ($updated)
+			{
+				error_log($alias_msg);
+			}
+			// log that timezone aliases have been updated
 
 			self::$import_msg = $msg.'<br/>'.$alias_msg;
 
@@ -249,7 +257,11 @@ 
 				if ($type == 'aliases')
 				{
 					$data = array('alias' => $tz2id[$data['aliasTo']]);
-					if (!$data['alias']) continue;	// there's no such tzid
+					if (!$data['alias'])
+					{
+						continue;
+					}
+					// there's no such tzid
 				}
 				// check if already in database
 				$tz2id[$tzid] = $GLOBALS['egw']->db->select('egw_cal_timezones','tz_id',array(
@@ -266,7 +278,10 @@ 
 				),__LINE__,__FILE__,'calendar');
 
 				// only query last insert id, if not already in database (gives warning for PostgreSQL)
-				if (!$tz2id[$tzid]) $tz2id[$tzid] = $GLOBALS['egw']->db->get_last_insert_id('egw_cal_timezones','tz_id');
+				if (!$tz2id[$tzid])
+				{
+					$tz2id[$tzid] = $GLOBALS['egw']->db->get_last_insert_id('egw_cal_timezones','tz_id');
+				}
 			}
 		}
 		Api\Config::save_value('tz_version', $tz_version, 'phpgwapi');
@@ -306,13 +321,16 @@ 
 		foreach($tz_aliases as $alias => $tzid)
 		{
 			if ((!($alias_id=self::tz2id($alias, 'alias')) || self::id2tz($alias_id, 'tzid') !== $tzid) &&	// not in DB or different
-				($tz_id = self::tz2id($tzid)))	// given tzid for alias exists in DB
+				($tz_id = self::tz2id($tzid)))
+			{
+				// given tzid for alias exists in DB
 			{
 				$GLOBALS['egw']->db->insert('egw_cal_timezones',array(
 					'tz_alias' => $tz_id,
 				),array(
 					'tz_tzid' => $alias,
 				),__LINE__,__FILE__,'calendar');
+			}
 				++$updates;
 			}
 			//error_log(__METHOD__."() alias=$alias, tzid=$tzid --> self::tz2id('$alias', 'alias') = ".array2string($alias_id).",  self::tz2id('$tzid')=".array2string($tz_id));
@@ -402,7 +420,10 @@ 
 			$prefs = $prefs_obj->read();
 			$tzid = $prefs['common']['tz'];
 		}
-		if (!$tzid) $tzid = Api\DateTime::$server_timezone->getName();
+		if (!$tzid)
+		{
+			$tzid = Api\DateTime::$server_timezone->getName();
+		}
 
 		switch ($type)
 		{

calendar/inc/class.calendar_uiforms.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -1077,7 +1077,7 @@ 
 	 *	date instead of today
 	 * @param boolean $no_notifications Toggle notifications to participants
 	 *
-	 * @return false or error message
+	 * @return string|false or error message
 	 */
 	function _break_recurring(&$event, $old_event, $as_of_date = null, $no_notifications = true)
 	{
@@ -2173,7 +2173,7 @@ 
 	 * Freetime search
 	 *
 	 * As the function is called in a popup via javascript, parametes get initialy transfered via the url
-	 * @param array $content=null array with parameters or false (default) to use the get-params
+	 * @param array $content array with parameters or false (default) to use the get-params
 	 * @param string start[str] start-date
 	 * @param string start[hour] start-hour
 	 * @param string start[min] start-minutes
@@ -2417,7 +2417,7 @@ 
 	/**
      * Export events as vCalendar version 2.0 files (iCal)
      *
-     * @param int|array $content numeric cal_id or submitted content from etempalte::exec
+     * @param integer $content numeric cal_id or submitted content from etempalte::exec
      * @param boolean $return_error should an error-msg be returned or a regular page with it generated (default)
      * @return string error-msg if $return_error
      */

Indentation +11 added lines, -11 removed lines

@@ -2415,14 +2415,14 @@ 
 	}
 
 	/**
-     * Export events as vCalendar version 2.0 files (iCal)
-     *
-     * @param int|array $content numeric cal_id or submitted content from etempalte::exec
-     * @param boolean $return_error should an error-msg be returned or a regular page with it generated (default)
-     * @return string error-msg if $return_error
-     */
-    function export($content=0,$return_error=false)
-    {
+	 * Export events as vCalendar version 2.0 files (iCal)
+	 *
+	 * @param int|array $content numeric cal_id or submitted content from etempalte::exec
+	 * @param boolean $return_error should an error-msg be returned or a regular page with it generated (default)
+	 * @return string error-msg if $return_error
+	 */
+	function export($content=0,$return_error=false)
+	{
 		$boical = new calendar_ical();
 		#error_log(__METHOD__.print_r($content,true));
 		if (is_numeric($cal_id = $content ? $content : $_REQUEST['cal_id']))
@@ -2476,7 +2476,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Export');
 		$etpl = new etemplate_new('calendar.export');
 		$etpl->exec('calendar.calendar_uiforms.export',$content);
-    }
+	}
 	
 	/**
 	 * Edit category ACL (admin only)
@@ -2548,8 +2548,8 @@ 
 	}
 
 	/**
-	* Set up the required fields to get the history tab
-	*/
+	 * Set up the required fields to get the history tab
+	 */
 	public function setup_history(&$content, &$sel_options)
 	{
 		$status = 'history_status';

Switch Indentation +229 added lines, -229 removed lines

@@ -557,214 +557,214 @@ 
 
 		switch((string)$button)
 		{
-		case 'exception':	// create an exception in a recuring event
-			$msg = $this->_create_exception($event,$preserv);
-			break;
+			case 'exception':	// create an exception in a recuring event
+				$msg = $this->_create_exception($event,$preserv);
+				break;
 
-		case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
-			unset($event['id']);
-			unset($event['uid']);
-			unset($event['reference']);
-			unset($preserv['reference']);
-			unset($event['recurrence']);
-			unset($preserv['recurrence']);
-			unset($event['recur_exception']);
-			unset($event['edit_single']);	// in case it has been set
-			unset($event['modified']);
-			unset($event['modifier']);
-			unset($event['caldav_name']);
-			$event['owner'] = !(int)$this->owner || !$this->bo->check_perms(Acl::ADD,0,$this->owner) ? $this->user : $this->owner;
+			case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
+				unset($event['id']);
+				unset($event['uid']);
+				unset($event['reference']);
+				unset($preserv['reference']);
+				unset($event['recurrence']);
+				unset($preserv['recurrence']);
+				unset($event['recur_exception']);
+				unset($event['edit_single']);	// in case it has been set
+				unset($event['modified']);
+				unset($event['modifier']);
+				unset($event['caldav_name']);
+				$event['owner'] = !(int)$this->owner || !$this->bo->check_perms(Acl::ADD,0,$this->owner) ? $this->user : $this->owner;
+
+				// Clear participant stati
+				foreach($event['participant_types'] as $type => &$participants)
+				{
+					foreach($participants as $id => &$p_response)
+					{
+						if($type == 'u' && $id == $event['owner']) continue;
+						calendar_so::split_status($p_response, $quantity, $role);
+						// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
+						$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
+						$p_response = calendar_so::combine_status($status,$quantity,$role);
+					}
+				}
 
-			// Clear participant stati
-			foreach($event['participant_types'] as $type => &$participants)
-			{
-				foreach($participants as $id => &$p_response)
+				// Copy alarms
+				if (is_array($event['alarm']))
 				{
-					if($type == 'u' && $id == $event['owner']) continue;
-					calendar_so::split_status($p_response, $quantity, $role);
-					// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
-					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
-					$p_response = calendar_so::combine_status($status,$quantity,$role);
+					foreach($event['alarm'] as $n => &$alarm)
+					{
+						unset($alarm['id']);
+						unset($alarm['cal_id']);
+					}
 				}
-			}
 
-			// Copy alarms
-			if (is_array($event['alarm']))
-			{
-				foreach($event['alarm'] as $n => &$alarm)
+				// Get links to be copied
+				// With no ID, $content['link_to']['to_id'] is used
+				$content['link_to']['to_id'] = array('to_app' => 'calendar', 'to_id' => 0);
+				foreach(Link::get_links('calendar', $content['id']) as $link)
 				{
-					unset($alarm['id']);
-					unset($alarm['cal_id']);
+					if ($link['app'] != Link::VFS_APPNAME)
+					{
+						Link::link('calendar', $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
+					}
+					elseif ($link['app'] == Link::VFS_APPNAME)
+					{
+						Link::link('calendar', $content['link_to']['to_id'], Link::VFS_APPNAME, array(
+							'tmp_name' => Link::vfs_path($link['app2'], $link['id2']).'/'.$link['id'],
+							'name' => $link['id'],
+						), $link['remark']);
+					}
 				}
-			}
+				unset($link);
+				$preserv['view'] = $preserv['edit_single'] = false;
+				$msg = lang('Event copied - the copy can now be edited');
+				$event['title'] = lang('Copy of:').' '.$event['title'];
+				break;
 
-			// Get links to be copied
-			// With no ID, $content['link_to']['to_id'] is used
-			$content['link_to']['to_id'] = array('to_app' => 'calendar', 'to_id' => 0);
-			foreach(Link::get_links('calendar', $content['id']) as $link)
-			{
-				if ($link['app'] != Link::VFS_APPNAME)
+			case 'mail':
+			case 'sendrequest':
+			case 'save':
+			case 'print':
+			case 'apply':
+			case 'infolog':
+				if ($event['id'] && !$this->bo->check_perms(Acl::EDIT,$event))
 				{
-					Link::link('calendar', $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
+					$msg = lang('Permission denied');
+					$button = '';
+					break;
 				}
-				elseif ($link['app'] == Link::VFS_APPNAME)
+				if ($event['start'] > $event['end'])
 				{
-					Link::link('calendar', $content['link_to']['to_id'], Link::VFS_APPNAME, array(
-						'tmp_name' => Link::vfs_path($link['app2'], $link['id2']).'/'.$link['id'],
-						'name' => $link['id'],
-					), $link['remark']);
+					$msg = lang('Error: Starttime has to be before the endtime !!!');
+					$button = '';
+					break;
 				}
-			}
-			unset($link);
-			$preserv['view'] = $preserv['edit_single'] = false;
-			$msg = lang('Event copied - the copy can now be edited');
-			$event['title'] = lang('Copy of:').' '.$event['title'];
-			break;
-
-		case 'mail':
-		case 'sendrequest':
-		case 'save':
-		case 'print':
-		case 'apply':
-		case 'infolog':
-			if ($event['id'] && !$this->bo->check_perms(Acl::EDIT,$event))
-			{
-				$msg = lang('Permission denied');
-				$button = '';
-				break;
-			}
-			if ($event['start'] > $event['end'])
-			{
-				$msg = lang('Error: Starttime has to be before the endtime !!!');
-				$button = '';
-				break;
-			}
-			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'] > $event['recur_enddate'])
-			{
-				$msg = lang('repetition').': '.lang('Error: Starttime has to be before the endtime !!!');
-				$button = '';
-				break;
-			}
-			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end']-$event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
-			{
-				$msg = lang('Error: Duration of event longer then recurrence interval!');
-				$button = '';
-				break;
-			}
-			if (!$event['participants'])
-			{
-				$msg = lang('Error: no participants selected !!!');
-				$button = '';
-				break;
-			}
-			// if private event with ressource reservation is forbidden
-			if (!$event['public'] && $GLOBALS['egw_info']['server']['no_ressources_private'])
-			{
-				foreach (array_keys($event['participants']) as $uid)
+				if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'] > $event['recur_enddate'])
 				{
-					if ($uid[0] == 'r') //ressource detection
+					$msg = lang('repetition').': '.lang('Error: Starttime has to be before the endtime !!!');
+					$button = '';
+					break;
+				}
+				if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end']-$event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
+				{
+					$msg = lang('Error: Duration of event longer then recurrence interval!');
+					$button = '';
+					break;
+				}
+				if (!$event['participants'])
+				{
+					$msg = lang('Error: no participants selected !!!');
+					$button = '';
+					break;
+				}
+				// if private event with ressource reservation is forbidden
+				if (!$event['public'] && $GLOBALS['egw_info']['server']['no_ressources_private'])
+				{
+					foreach (array_keys($event['participants']) as $uid)
 					{
-						$msg = lang('Error: ressources reservation in private events is not allowed!!!');
-						$button = '';
-						break 2; //break foreach and case
+						if ($uid[0] == 'r') //ressource detection
+						{
+							$msg = lang('Error: ressources reservation in private events is not allowed!!!');
+							$button = '';
+							break 2; //break foreach and case
+						}
 					}
 				}
-			}
-			if ($content['edit_single'])	// we edited a single event from a series
-			{
-				$event['reference'] = $event['id'];
-				$event['recurrence'] = $content['edit_single'];
-				unset($event['id']);
-				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
-				if (!is_array($conflicts) && $conflicts)
+				if ($content['edit_single'])	// we edited a single event from a series
 				{
-					// now we need to add the original start as recur-execption to the series
-					$recur_event = $this->bo->read($event['reference']);
-					$recur_event['recur_exception'][] = $content['edit_single'];
-					// check if we need to move the alarms, because they are next on that exception
-					foreach($recur_event['alarm'] as $id => $alarm)
+					$event['reference'] = $event['id'];
+					$event['recurrence'] = $content['edit_single'];
+					unset($event['id']);
+					$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
+					if (!is_array($conflicts) && $conflicts)
 					{
-						if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
+						// now we need to add the original start as recur-execption to the series
+						$recur_event = $this->bo->read($event['reference']);
+						$recur_event['recur_exception'][] = $content['edit_single'];
+						// check if we need to move the alarms, because they are next on that exception
+						foreach($recur_event['alarm'] as $id => $alarm)
 						{
-							$rrule = calendar_rrule::event2rrule($recur_event, true);
-							foreach ($rrule as $time)
+							if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
 							{
-								if ($content['edit_single'] < $time->format('ts'))
+								$rrule = calendar_rrule::event2rrule($recur_event, true);
+								foreach ($rrule as $time)
 								{
-									$alarm['time'] = $time->format('ts') - $alarm['offset'];
-									$this->bo->save_alarm($event['reference'], $alarm);
-									break;
+									if ($content['edit_single'] < $time->format('ts'))
+									{
+										$alarm['time'] = $time->format('ts') - $alarm['offset'];
+										$this->bo->save_alarm($event['reference'], $alarm);
+										break;
+									}
 								}
 							}
 						}
-					}
-					unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
-					unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
-					$this->bo->update($recur_event,true);	// no conflict check here
+						unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
+						unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
+						$this->bo->update($recur_event,true);	// no conflict check here
 
-					if(Api\Json\Response::isJSONResponse())
+						if(Api\Json\Response::isJSONResponse())
+						{
+							// Sending null will trigger a removal of the original
+							// for that date
+							Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$content['reference'].':'.$content['actual_date'], 'data' => null));
+						}
+
+						unset($recur_event);
+						unset($event['edit_single']);			// if we further edit it, it's just a single event
+						unset($preserv['edit_single']);
+					}
+					else	// conflict or error, we need to reset everything to the state befor we tried to save it
 					{
-						// Sending null will trigger a removal of the original
-						// for that date
-						Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$content['reference'].':'.$content['actual_date'], 'data' => null));
+						$event['id'] = $event['reference'];
+						$event['reference'] = $event['recurrence'] = 0;
+						$event['uid'] = $content['uid'];
 					}
-
-					unset($recur_event);
-					unset($event['edit_single']);			// if we further edit it, it's just a single event
-					unset($preserv['edit_single']);
-				}
-				else	// conflict or error, we need to reset everything to the state befor we tried to save it
-				{
-					$event['id'] = $event['reference'];
-					$event['reference'] = $event['recurrence'] = 0;
-					$event['uid'] = $content['uid'];
+					$update_type = 'edit';
 				}
-				$update_type = 'edit';
-			}
-			else	// we edited a non-reccuring event or the whole series
-			{
-				if (($old_event = $this->bo->read($event['id'])))
+				else	// we edited a non-reccuring event or the whole series
 				{
-					if ($event['recur_type'] != MCAL_RECUR_NONE)
+					if (($old_event = $this->bo->read($event['id'])))
 					{
-						$update_type = 'edit';
-
-						// we edit a existing series event
-						if ($event['start'] != $old_event['start'] ||
-							$event['whole_day'] != $old_event['whole_day'] ||
-							$event['end'] != $old_event['end'])
+						if ($event['recur_type'] != MCAL_RECUR_NONE)
 						{
-							// calculate offset against old series start or clicked recurrance,
-							// depending on which is smaller
-							$offset = $event['start'] - $old_event['start'];
-							if (abs($offset) > abs($off2 = $event['start'] - $event['actual_date']))
-							{
-								$offset = $off2;
-							}
-							$msg = $this->_break_recurring($event, $old_event, $event['actual_date'] + $offset,$content['no_notifications']);
-							if($msg)
+							$update_type = 'edit';
+
+							// we edit a existing series event
+							if ($event['start'] != $old_event['start'] ||
+								$event['whole_day'] != $old_event['whole_day'] ||
+								$event['end'] != $old_event['end'])
 							{
-								$noerror = false;
+								// calculate offset against old series start or clicked recurrance,
+								// depending on which is smaller
+								$offset = $event['start'] - $old_event['start'];
+								if (abs($offset) > abs($off2 = $event['start'] - $event['actual_date']))
+								{
+									$offset = $off2;
+								}
+								$msg = $this->_break_recurring($event, $old_event, $event['actual_date'] + $offset,$content['no_notifications']);
+								if($msg)
+								{
+									$noerror = false;
+								}
 							}
 						}
-					}
-					else
-					{
-						if ($old_event['start'] != $event['start'] ||
-							$old_event['end'] != $event['end'] ||
-							$event['whole_day'] != $old_event['whole_day'])
+						else
 						{
-							$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
-							foreach((array)$event['participants'] as $uid => $status)
+							if ($old_event['start'] != $event['start'] ||
+								$old_event['end'] != $event['end'] ||
+								$event['whole_day'] != $old_event['whole_day'])
 							{
-								$q = $r = null;
-								calendar_so::split_status($status,$q,$r);
-								if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
+								$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
+								foreach((array)$event['participants'] as $uid => $status)
 								{
-									$preferences = CreateObject('phpgwapi.preferences',$uid);
-									$part_prefs = $preferences->read_repository();
-									switch ($part_prefs['calendar']['reset_stati'])
+									$q = $r = null;
+									calendar_so::split_status($status,$q,$r);
+									if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
 									{
+										$preferences = CreateObject('phpgwapi.preferences',$uid);
+										$part_prefs = $preferences->read_repository();
+										switch ($part_prefs['calendar']['reset_stati'])
+										{
 										case 'no':
 											break;
 										case 'startday':
@@ -773,7 +773,7 @@ 
 											$status_reset_to_unknown = true;
 											$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
 											// todo: report reset status to user
-									}
+										}
 								}
 							}
 							// check if we need to move the alarms, because they are relative
@@ -910,83 +910,83 @@ 
 			}
 			break;
 
-		case 'cancel':
-			if($content['cancel_needs_refresh'])
-			{
-				Framework::refresh_opener($msg, 'calendar');
-			}
-			break;
-
-		case 'delete':					// delete of event (regular or series)
-			$exceptions_kept = null;
-			if ($this->bo->delete($event['id'], (int)$content['edit_single'], false, $event['no_notifications'],
-				$content['delete_exceptions'] == 'true', $exceptions_kept))
-			{
-				if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
+			case 'cancel':
+				if($content['cancel_needs_refresh'])
 				{
-					$msg = lang('Series deleted');
-					if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					Framework::refresh_opener($msg, 'calendar');
 				}
-				else
+				break;
+
+			case 'delete':					// delete of event (regular or series)
+				$exceptions_kept = null;
+				if ($this->bo->delete($event['id'], (int)$content['edit_single'], false, $event['no_notifications'],
+					$content['delete_exceptions'] == 'true', $exceptions_kept))
 				{
-					$msg = lang('Event deleted');
-				}
+					if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
+					{
+						$msg = lang('Series deleted');
+						if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					}
+					else
+					{
+						$msg = lang('Event deleted');
+					}
 
-			}
-			break;
+				}
+				break;
 
-		case 'freetime':
-			// the "click" has to be in onload, to make sure the button is already created
-			$event['button_was'] = $button;
-			break;
+			case 'freetime':
+				// the "click" has to be in onload, to make sure the button is already created
+				$event['button_was'] = $button;
+				break;
 
-		case 'add_alarm':
-			$time = $content['start'];
-			$offset = $time - $content['new_alarm']['date'];
-			if ($event['recur_type'] != MCAL_RECUR_NONE &&
-				($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $offset, true)) &&
-				$time < $next_occurrence['start'])
-			{
-				$content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
-			}
-			if ($this->bo->check_perms(Acl::EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
-			{
-				$alarm = array(
-					'offset' => $offset,
-					'time'   => $content['new_alarm']['date'],
-					'all'    => !$content['new_alarm']['owner'],
-					'owner'  => $content['new_alarm']['owner'] ? $content['new_alarm']['owner'] : $this->user,
-				);
-				if ($alarm['time'] < $this->bo->now_su)
+			case 'add_alarm':
+				$time = $content['start'];
+				$offset = $time - $content['new_alarm']['date'];
+				if ($event['recur_type'] != MCAL_RECUR_NONE &&
+					($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $offset, true)) &&
+					$time < $next_occurrence['start'])
 				{
-					$msg = lang("Can't add alarms in the past !!!");
+					$content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
 				}
-				elseif ($event['id'])	// save the alarm immediatly
+				if ($this->bo->check_perms(Acl::EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
 				{
-					if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+					$alarm = array(
+						'offset' => $offset,
+						'time'   => $content['new_alarm']['date'],
+						'all'    => !$content['new_alarm']['owner'],
+						'owner'  => $content['new_alarm']['owner'] ? $content['new_alarm']['owner'] : $this->user,
+					);
+					if ($alarm['time'] < $this->bo->now_su)
+					{
+						$msg = lang("Can't add alarms in the past !!!");
+					}
+					elseif ($event['id'])	// save the alarm immediatly
 					{
-						$alarm['id'] = $alarm_id;
-						$event['alarm'][$alarm_id] = $alarm;
+						if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+						{
+							$alarm['id'] = $alarm_id;
+							$event['alarm'][$alarm_id] = $alarm;
 
-						$msg = lang('Alarm added');
-						Framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+							$msg = lang('Alarm added');
+							Framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+						}
+						else
+						{
+							$msg = lang('Error adding the alarm');
+						}
 					}
 					else
 					{
-						$msg = lang('Error adding the alarm');
+						for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
+						$event['alarm'][$alarm['id']] = $alarm;
 					}
 				}
 				else
 				{
-					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
-					$event['alarm'][$alarm['id']] = $alarm;
+					$msg = lang('Permission denied');
 				}
-			}
-			else
-			{
-				$msg = lang('Permission denied');
-			}
-			break;
+				break;
 		}
 		// add notification-errors, if we have some
 		if (($notification_errors = notifications::errors(true)))

Braces +288 added lines, -74 removed lines

@@ -110,11 +110,14 @@ 
 		if (!$owner || !is_numeric($owner) || $GLOBALS['egw']->accounts->get_type($owner) != 'u' ||
 			!$this->bo->check_perms(Acl::ADD,0,$owner))
 		{
-			if ($owner)	// make an owner who is no user or we have no add-rights a participant
+			if ($owner)
+			{
+				// make an owner who is no user or we have no add-rights a participant
 			{
 				if(!is_array($owner))
 				{
 					$owner = explode(',',$owner);
+			}
 				}
 				// if we come from ressources we don't need any users selected in calendar
 				if (!isset($_GET['participants']) || $_GET['participants'][0] != 'r')
@@ -150,9 +153,17 @@ 
 		$participant_types['u'] = $participant_types = $participants = array();
 		foreach($extra_participants as $uid)
 		{
-			if (isset($participants[$uid])) continue;	// already included
+			if (isset($participants[$uid]))
+			{
+				continue;
+			}
+			// already included
 
-			if (!$this->bo->check_acl_invite($uid)) continue;	// no right to invite --> ignored
+			if (!$this->bo->check_acl_invite($uid))
+			{
+				continue;
+			}
+			// no right to invite --> ignored
 
 			if (is_numeric($uid))
 			{
@@ -180,10 +191,13 @@ 
 				}
 			}
 		}
-		if (!$participants)	// if all participants got removed, include current user
+		if (!$participants)
+		{
+			// if all participants got removed, include current user
 		{
 			$participants[$this->user] = $participant_types['u'][$this->user] = calendar_so::combine_status('A',1,'CHAIR');
 		}
+		}
 		if(isset($_GET['cat_id']))
 		{
 			$cat_id = explode(',',$_GET['cat_id']);
@@ -231,10 +245,13 @@ 
 	 */
 	function process_edit($content)
 	{
-		if (!is_array($content))	// redirect from etemplate, if POST empty
+		if (!is_array($content))
+		{
+			// redirect from etemplate, if POST empty
 		{
 			return $this->edit(null,null,strip_tags($_GET['msg']));
 		}
+		}
 		// clear notification errors
 		notifications::errors(true);
 		$messages = null;
@@ -247,7 +264,11 @@ 
 		$update_type = $content['id'] ? ($content['recur_type'] == MCAL_RECUR_NONE ? 'update' : 'edit') : 'add';
 
 		list($button) = @each($content['button']);
-		if (!$button && $content['action']) $button = $content['action'];	// action selectbox
+		if (!$button && $content['action'])
+		{
+			$button = $content['action'];
+		}
+		// action selectbox
 		unset($content['button']); unset($content['action']);
 
 		$view = $content['view'];
@@ -260,7 +281,10 @@ 
 		{
 			list($date) = each($content['recur_exception']['delete_exception']);
 			// eT2 converts time to
-			if (!is_numeric($date)) $date = Api\DateTime::to (str_replace('Z','', $date), 'ts');
+			if (!is_numeric($date))
+			{
+				$date = Api\DateTime::to (str_replace('Z','', $date), 'ts');
+			}
 			unset($content['recur_exception']['delete_exception']);
 			if (($key = array_search($date,$content['recur_exception'])) !== false)
 			{
@@ -269,7 +293,10 @@ 
 				foreach ($recur_exceptions as $id)
 				{
 					if (!($exception = $this->bo->read($id)) ||
-							$exception['recurrence'] != $content['recur_exception'][$key]) continue;
+							$exception['recurrence'] != $content['recur_exception'][$key])
+					{
+						continue;
+					}
 					$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
 					$exception['reference'] = $exception['recurrence'] = 0;
 					$this->bo->update($exception, true, true,false,true,$messages,$content['no_notifications']);
@@ -344,7 +371,10 @@ 
 				$event['end'] = $this->bo->date2ts($event['end']);
 			}
 			// some checks for recurrences, if you give a date, make it a weekly repeating event and visa versa
-			if ($event['recur_type'] == MCAL_RECUR_NONE && $event['recur_data']) $event['recur_type'] = MCAL_RECUR_WEEKLY;
+			if ($event['recur_type'] == MCAL_RECUR_NONE && $event['recur_data'])
+			{
+				$event['recur_type'] = MCAL_RECUR_WEEKLY;
+			}
 			if ($event['recur_type'] == MCAL_RECUR_WEEKLY && !$event['recur_data'])
 			{
 				$event['recur_data'] = 1 << (int)date('w',$event['start']);
@@ -371,7 +401,8 @@ 
 							break;
 						case 'participant':
 							foreach($data as $participant)
-							{								// email or rfc822 addresse (eg. "Ralf Becker <ralf@domain.com>")
+							{
+// email or rfc822 addresse (eg. "Ralf Becker <ralf@domain.com>")
 								$email = array();
 								if(preg_match('/^(.*<)?([a-z0-9_.-]+@[a-z0-9_.-]{5,})>?$/i',$participant,$email))
 								{
@@ -451,7 +482,11 @@ 
 							break;
 
 						default:		// existing participant row
-							if (!is_array($data)) continue;	// widgets in participant tab, above participant list
+							if (!is_array($data))
+							{
+								continue;
+							}
+							// widgets in participant tab, above participant list
 							foreach(array('uid','status','quantity','role') as $name)
 							{
 								$$name = $data[$name];
@@ -580,7 +615,10 @@ 
 			{
 				foreach($participants as $id => &$p_response)
 				{
-					if($type == 'u' && $id == $event['owner']) continue;
+					if($type == 'u' && $id == $event['owner'])
+					{
+						continue;
+					}
 					calendar_so::split_status($p_response, $quantity, $role);
 					// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
 					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
@@ -662,17 +700,23 @@ 
 			{
 				foreach (array_keys($event['participants']) as $uid)
 				{
-					if ($uid[0] == 'r') //ressource detection
+					if ($uid[0] == 'r')
+					{
+						//ressource detection
 					{
 						$msg = lang('Error: ressources reservation in private events is not allowed!!!');
+					}
 						$button = '';
 						break 2; //break foreach and case
 					}
 				}
 			}
-			if ($content['edit_single'])	// we edited a single event from a series
+			if ($content['edit_single'])
+			{
+				// we edited a single event from a series
 			{
 				$event['reference'] = $event['id'];
+			}
 				$event['recurrence'] = $content['edit_single'];
 				unset($event['id']);
 				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
@@ -768,7 +812,10 @@ 
 										case 'no':
 											break;
 										case 'startday':
-											if ($sameday) break;
+											if ($sameday)
+											{
+												break;
+											}
 										default:
 											$status_reset_to_unknown = true;
 											$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
@@ -925,7 +972,10 @@ 
 				if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
 				{
 					$msg = lang('Series deleted');
-					if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					if ($exceptions_kept)
+					{
+						$msg .= lang(', exceptions preserved');
+					}
 				}
 				else
 				{
@@ -961,11 +1011,14 @@ 
 				{
 					$msg = lang("Can't add alarms in the past !!!");
 				}
-				elseif ($event['id'])	// save the alarm immediatly
+				elseif ($event['id'])
+				{
+					// save the alarm immediatly
 				{
 					if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
 					{
 						$alarm['id'] = $alarm_id;
+				}
 						$event['alarm'][$alarm_id] = $alarm;
 
 						$msg = lang('Alarm added');
@@ -978,7 +1031,9 @@ 
 				}
 				else
 				{
-					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
+					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++)
+					{
+}	// get a temporary non-conflicting, numeric id
 					$event['alarm'][$alarm['id']] = $alarm;
 				}
 			}
@@ -1001,10 +1056,13 @@ 
 		}
 		if (in_array($button,array('cancel','save','delete','delete_exceptions','delete_keep_exceptions')) && $noerror)
 		{
-			if ($content['lock_token'])	// remove an existing lock
+			if ($content['lock_token'])
+			{
+				// remove an existing lock
 			{
 				Vfs::unlock(Vfs::app_entry_lock_path('calendar',$content['id']),$content['lock_token'],false);
 			}
+			}
 			if ($content['no_popup'])
 			{
 				Egw::redirect_link('/index.php',array(
@@ -1108,8 +1166,7 @@ 
 		if (Api\DateTime::to($old_event['start'],'Ymd') < Api\DateTime::to($as_of_date,'Ymd') ||
 			// Adjust for requested date in the past
 			Api\DateTime::to($as_of_date,'ts') < time()
-		)
-		{
+		) {
 
 			unset($orig_event);
 			// copy event by unsetting the id(s)
@@ -1197,32 +1254,50 @@ 
 		foreach($event['participants'] as $uid => $status)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$uid.':'.array2string($status));
-			if (empty($status)) continue;
+			if (empty($status))
+			{
+				continue;
+			}
 			$toadd = '';
-			if ((isset($status['status']) && $status['status'] == 'R') || (isset($status['uid']) && $status['uid'] == $this->user)) continue;
+			if ((isset($status['status']) && $status['status'] == 'R') || (isset($status['uid']) && $status['uid'] == $this->user))
+			{
+				continue;
+			}
 
 			if (isset($status['uid']) && is_numeric($status['uid']) && $GLOBALS['egw']->accounts->get_type($status['uid']) == 'u')
 			{
-				if (!($email = $GLOBALS['egw']->accounts->id2name($status['uid'],'account_email'))) continue;
+				if (!($email = $GLOBALS['egw']->accounts->id2name($status['uid'],'account_email')))
+				{
+					continue;
+				}
 
 				$lid = $firstname = $lastname = null;
 				$GLOBALS['egw']->accounts->get_account_name($status['uid'],$lid,$firstname,$lastname);
 
 				$toadd = $firstname.' '.$lastname.' <'.$email.'>';
-				if (!in_array($toadd,$to)) $to[] = $toadd;
+				if (!in_array($toadd,$to))
+				{
+					$to[] = $toadd;
+				}
 				//error_log(__METHOD__.__LINE__.array2string($to));
 			}
 			elseif ($uid < 0)
 			{
 				foreach($GLOBALS['egw']->accounts->members($uid,true) as $uid)
 				{
-					if (!($email = $GLOBALS['egw']->accounts->id2name($uid,'account_email'))) continue;
+					if (!($email = $GLOBALS['egw']->accounts->id2name($uid,'account_email')))
+					{
+						continue;
+					}
 
 					$GLOBALS['egw']->accounts->get_account_name($uid,$lid,$firstname,$lastname);
 
 					$toadd = $firstname.' '.$lastname.' <'.$email.'>';
 					// dont add groupmembers if they already rejected the event, or are the current user
-					if (!in_array($toadd,$to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user)) $to[] = $toadd;
+					if (!in_array($toadd,$to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user))
+					{
+						$to[] = $toadd;
+					}
 					//error_log(__METHOD__.__LINE__.array2string($to));
 				}
 			}
@@ -1275,7 +1350,10 @@ 
 			'preset[type]'    => 'text/calendar'.($asrequest?'; method=REQUEST':''),
 			'preset[size]'    => filesize($ics_file),
 		);
-		if ($asrequest) $vars['preset[msg]'] = lang('You attempt to mail a meetingrequest to the recipients above. Depending on the client this mail is opened with, the recipient may or may not see the mailbody below, but only see the meeting request attached.');
+		if ($asrequest)
+		{
+			$vars['preset[msg]'] = lang('You attempt to mail a meetingrequest to the recipients above. Depending on the client this mail is opened with, the recipient may or may not see the mailbody below, but only see the meeting request attached.');
+		}
 		$response = Api\Json\Response::get();
 		$response->call('app.calendar.custom_mail', $vars);
 	}
@@ -1461,9 +1539,15 @@ 
 				}
 			}
 			// set new start and end if given by $_GET
-			if(isset($_GET['start'])) { $event['start'] = Api\DateTime::to($_GET['start'],'ts'); }
-			if(isset($_GET['end'])) { $event['end'] = Api\DateTime::to($_GET['end'],'ts'); }
-			if(isset($_GET['non_blocking'])) { $event['non_blocking'] = (bool)$_GET['non_blocking']; }
+			if(isset($_GET['start']))
+			{
+$event['start'] = Api\DateTime::to($_GET['start'],'ts'); }
+			if(isset($_GET['end']))
+			{
+$event['end'] = Api\DateTime::to($_GET['end'],'ts'); }
+			if(isset($_GET['non_blocking']))
+			{
+$event['non_blocking'] = (bool)$_GET['non_blocking']; }
 			// check if the event is the whole day
 			$start = $this->bo->date2array($event['start']);
 			$end = $this->bo->date2array($event['end']);
@@ -1476,10 +1560,13 @@ 
 				foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 				{
 					$link_id = $link_ids[$n];
-					if(!preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// guard against XSS
+					if(!preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))
+					{
+						// guard against XSS
 					{
 						continue;
 					}
+					}
 					if(!$n)
 					{
 						$event['title'] = Link::title($link_app,$link_id);
@@ -1488,7 +1575,10 @@ 
 						{
 							foreach((array)$set['link_app'] as $i => $l_app)
 							{
-								if (($l_id=$set['link_id'][$i])) Link::link('calendar',$event['link_to']['to_id'],$l_app,$l_id);
+								if (($l_id=$set['link_id'][$i]))
+								{
+									Link::link('calendar',$event['link_to']['to_id'],$l_app,$l_id);
+								}
 							}
 							unset($set['link_app']);
 							unset($set['link_id']);
@@ -1514,10 +1604,13 @@ 
 			$lock_path = Vfs::app_entry_lock_path('calendar',$event['id']);
 			$lock_owner = 'mailto:'.$GLOBALS['egw_info']['user']['account_email'];
 
-			if (($preserv['lock_token'] = $event['lock_token']))		// already locked --> refresh the lock
+			if (($preserv['lock_token'] = $event['lock_token']))
+			{
+				// already locked --> refresh the lock
 			{
 				Vfs::lock($lock_path,$preserv['lock_token'],$locktime,$lock_owner,$scope='shared',$type='write',true,false);
 			}
+			}
 			if (($lock = Vfs::checkLock($lock_path)) && $lock['owner'] != $lock_owner)
 			{
 				$msg .= ' '.lang('This entry is currently opened by %1!',
@@ -1550,14 +1643,20 @@ 
 		));
 		Framework::message($msg, $msg_type);
 		$content['duration'] = $content['end'] - $content['start'];
-		if (isset($this->durations[$content['duration']])) $content['end'] = '';
+		if (isset($this->durations[$content['duration']]))
+		{
+			$content['end'] = '';
+		}
 
 		$row = 3;
 		$readonlys = $content['participants'] = $preserv['participants'] = array();
 		// preserve some ui elements, if set eg. under error-conditions
 		foreach(array('quantity','resource','role') as $n)
 		{
-			if (isset($event['participants'][$n])) $content['participants'][$n] = $event['participants'][$n];
+			if (isset($event['participants'][$n]))
+			{
+				$content['participants'][$n] = $event['participants'][$n];
+			}
 		}
 		foreach($event['participant_types'] as $type => $participants)
 		{
@@ -1599,9 +1698,13 @@ 
 				//echo "<p>$uid ($quantity): $role --> {$content['participants'][$row]['role']}</p>\n";
 
 				if (($no_status = !$this->bo->check_status_perms($uid,$event)) || $view)
-					$readonlys['participants'][$row]['status'] = $no_status;
+				{
+									$readonlys['participants'][$row]['status'] = $no_status;
+				}
 				if ($preserv['hide_delete'] || !$this->bo->check_perms(Acl::EDIT,$event))
-					$readonlys['participants']['delete'][$uid] = true;
+				{
+									$readonlys['participants']['delete'][$uid] = true;
+				}
 				// todo: make the participants available as links with email as title
 				$content['participants'][$row++]['title'] = $this->get_title($uid);
 				// enumerate group-invitations, so people can accept/reject them
@@ -1632,7 +1735,11 @@ 
 			$content['participants']['cal_resources'] = '';
 			foreach($this->bo->resources as $data)
 			{
-				if ($data['app'] == 'email') continue;	// make no sense, as we cant search for email
+				if ($data['app'] == 'email')
+				{
+					continue;
+				}
+				// make no sense, as we cant search for email
 				$content['participants']['cal_resources'] .= ','.$data['app'];
 			}
 		}
@@ -1660,9 +1767,18 @@ 
 				$hours = (int) (($alarm['offset'] % DAY_s) / HOUR_s);
 				$minutes = (int) (($alarm['offset'] % HOUR_s) / 60);
 				$label = array();
-				if ($days) $label[] = $days.' '.lang('days');
-				if ($hours) $label[] = $hours.' '.lang('hours');
-				if ($minutes) $label[] = $minutes.' '.lang('Minutes');
+				if ($days)
+				{
+					$label[] = $days.' '.lang('days');
+				}
+				if ($hours)
+				{
+					$label[] = $hours.' '.lang('hours');
+				}
+				if ($minutes)
+				{
+					$label[] = $minutes.' '.lang('Minutes');
+				}
 				$alarm['offset'] = implode(', ',$label) . ' ' . ($after ? lang('after') : lang('before'));
 				$content['alarm'][] = $alarm;
 
@@ -1725,25 +1841,34 @@ 
 			'participants' => $this->accountsel->account_selection == 'none',
 			'history' => !$event['id'],
 		);
-		if (!isset($GLOBALS['egw_info']['user']['apps']['mail']))	// no mail without mail-app
+		if (!isset($GLOBALS['egw_info']['user']['apps']['mail']))
+		{
+			// no mail without mail-app
 		{
 			unset($sel_options['action']['mail']);
+		}
 			unset($sel_options['action']['sendmeetingrequest']);
 		}
-		if (!$event['id'])	// no ical export for new (not saved) events
+		if (!$event['id'])
+		{
+			// no ical export for new (not saved) events
 		{
 			$readonlys['action'] = true;
 		}
+		}
 		if (!($readonlys['button[exception]'] = !$this->bo->check_perms(Acl::EDIT,$event) || $event['recur_type'] == MCAL_RECUR_NONE || ($event['recur_enddate'] &&$event['start'] > $event['recur_enddate'])))
 		{
 			$content['exception_label'] = $this->bo->long_date(max($preserved['actual_date'], $event['start']));
 		}
 		$readonlys['button[delete]'] = !$event['id'] || $preserved['hide_delete'] || !$this->bo->check_perms(Acl::DELETE,$event);
 
-		if (!$event['id'] || $this->bo->check_perms(Acl::EDIT,$event))	// new event or edit rights to the event ==> allow to add alarm for all users
+		if (!$event['id'] || $this->bo->check_perms(Acl::EDIT,$event))
+		{
+			// new event or edit rights to the event ==> allow to add alarm for all users
 		{
 			$sel_options['owner'][0] = lang('All participants');
 		}
+		}
 		if (isset($event['participant_types']['u'][$this->user]))
 		{
 			$sel_options['owner'][$this->user] = $this->bo->participant_name($this->user);
@@ -1785,7 +1910,10 @@ 
 
 		$content['cancel_needs_refresh'] = (bool)$_GET['cancel_needs_refresh'];
 
-		if (!empty($preserved['lock_token'])) $content['lock_token'] = $preserved['lock_token'];
+		if (!empty($preserved['lock_token']))
+		{
+			$content['lock_token'] = $preserved['lock_token'];
+		}
 
 		// non_interactive==true from $_GET calls immediate save action without displaying the edit form
 		if(isset($_GET['non_interactive']) && (bool)$_GET['non_interactive'] === true)
@@ -1987,7 +2115,10 @@ 
 					// set status and send notification / meeting response
 					if ($this->bo->set_status($event['id'], $user, $status))
 					{
-						if (!$msg) $msg = lang('Status changed');
+						if (!$msg)
+						{
+							$msg = lang('Status changed');
+						}
 					}
 					break;
 
@@ -2066,13 +2197,16 @@ 
 
 		foreach (array_keys($allConflicts) as $pId)
 		{
-			if(substr($pId,0,1) == 'r' && $resources_config ) // resources Allow ignore conflicts
+			if(substr($pId,0,1) == 'r' && $resources_config )
+			{
+				// resources Allow ignore conflicts
 			{
 
 				switch ($resources_config['ignoreconflicts'])
 				{
 					case 'no':
 						$readonlys['button[ignore]'] = true;
+			}
 						break;
 					case 'allusers':
 						$readonlys['button[ignore]'] = false;
@@ -2216,7 +2350,10 @@ 
 		}
 		else
 		{
-			if (!$content['duration']) $content['duration'] = $content['end'] - $content['start'];
+			if (!$content['duration'])
+			{
+				$content['duration'] = $content['end'] - $content['start'];
+			}
 			$weekds = 0;
 			foreach ($content['weekdays'] as &$wdays)
 			{
@@ -2238,7 +2375,10 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('freetime search');
 
 		$sel_options['duration'] = $this->durations;
-		if ($content['duration'] && isset($sel_options['duration'][$content['duration']])) $content['end'] = '';
+		if ($content['duration'] && isset($sel_options['duration'][$content['duration']]))
+		{
+			$content['end'] = '';
+		}
 
 		$etpl->exec('calendar.calendar_uiforms.freetimesearch',$content,$sel_options,NULL,array(
 				'participants'	=> $content['participants'],
@@ -2259,7 +2399,10 @@ 
 	 */
 	function freetime($participants,$start,$end,$duration=1,$cal_id=0)
 	{
-		if ($this->debug > 2) $this->bo->debug_message(__METHOD__.'(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5)',true,$participants,$start,$end,$duration,$cal_id);
+		if ($this->debug > 2)
+		{
+			$this->bo->debug_message(__METHOD__.'(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5)',true,$participants,$start,$end,$duration,$cal_id);
+		}
 
 		$busy = $this->bo->search(array(
 			'start' => $start,
@@ -2276,15 +2419,26 @@ 
 		$n = 0;
 		foreach($busy as $event)
 		{
-			if ((int)$cal_id && $event['id'] == (int)$cal_id) continue;	// ignore our own event
+			if ((int)$cal_id && $event['id'] == (int)$cal_id)
+			{
+				continue;
+			}
+			// ignore our own event
 
- 			if ($event['non_blocking']) continue; // ignore non_blocking events
+ 			if ($event['non_blocking'])
+ 			{
+ 				continue;
+ 			}
+ 			// ignore non_blocking events
 
 			// check if from all wanted participants at least one has a not rejected status in found event
 			$non_rejected_found = false;
 			foreach($participants as $uid)
 			{
-				if ($event['participants'][$uid] == 'R') continue;
+				if ($event['participants'][$uid] == 'R')
+				{
+					continue;
+				}
 
 				if (isset($event['participants'][$uid]) ||
 					$uid > 0 && array_intersect(array_keys((array)$event['participants']),
@@ -2294,7 +2448,10 @@ 
 					break;
 				}
 			}
-			if (!$non_rejected_found) continue;
+			if (!$non_rejected_found)
+			{
+				continue;
+			}
 
 			if ($this->debug)
 			{
@@ -2325,11 +2482,17 @@ 
 					'start'	=> $ft_start,
 					'end'	=> $ft_end,
 				);
-				if ($this->debug > 1) echo "<p>freetime: ".date('D d.m.Y H:i',$ft_start)." - ".date('D d.m.Y H:i',$ft_end)."</p>\n";
+				if ($this->debug > 1)
+				{
+					echo "<p>freetime: ".date('D d.m.Y H:i',$ft_start)." - ".date('D d.m.Y H:i',$ft_end)."</p>\n";
+				}
 			}
 			$ft_start = $event['end'];
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6',true,$participants,$start,$end,$duration,$cal_id,$freetime);
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6',true,$participants,$start,$end,$duration,$cal_id,$freetime);
+		}
 
 		return $freetime;
 	}
@@ -2349,10 +2512,16 @@ 
 	 */
 	function split_freetime_daywise($freetime, $duration, $weekdays, $_start_time, $_end_time, &$sel_options)
 	{
-		if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(freetime=%1, duration=%2, start_time=%3, end_time=%4)',true,$freetime,$duration,$_start_time,$_end_time);
+		if ($this->debug > 1)
+		{
+			$this->bo->debug_message('uiforms::split_freetime_daywise(freetime=%1, duration=%2, start_time=%3, end_time=%4)',true,$freetime,$duration,$_start_time,$_end_time);
+		}
 
 		$freetime_daywise = array();
-		if (!is_array($sel_options)) $sel_options = array();
+		if (!is_array($sel_options))
+		{
+			$sel_options = array();
+		}
 		$time_format = $this->common_prefs['timeformat'] == 12 ? 'h:i a' : 'H:i';
 
 		$start_time = (int) $_start_time;	// ignore leading zeros
@@ -2362,7 +2531,10 @@ 
 		if (($end_time - $start_time)*HOUR_s < $duration)
 		{
 			$end_time = 0;
-			if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(, duration=%2, start_time=%3,..) end_time set to 0, it never fits durationn otherwise',true,$duration,$start_time);
+			if ($this->debug > 1)
+			{
+				$this->bo->debug_message('uiforms::split_freetime_daywise(, duration=%2, start_time=%3,..) end_time set to 0, it never fits durationn otherwise',true,$duration,$start_time);
+			}
 		}
 		$n = 0;
 		foreach($freetime as $ft)
@@ -2383,13 +2555,19 @@ 
 				}
 				$start = $t < $ft['start'] ? $ft['start'] : $t;
 
-				if ($start-$daybegin < $start_time*HOUR_s)	// start earlier then start_time
+				if ($start-$daybegin < $start_time*HOUR_s)
+				{
+					// start earlier then start_time
 				{
 					$start = $daybegin + $start_time*HOUR_s;
 				}
+				}
 				// if end_time given use it, else the original slot's end
 				$end = $end_time ? $daybegin + $end_time*HOUR_s : $ft['end'];
-				if ($end > $ft['end']) $end = $ft['end'];
+				if ($end > $ft['end'])
+				{
+					$end = $ft['end'];
+				}
 
 				// slot to small for duration
 				if ($end - $start < $duration)
@@ -2431,7 +2609,10 @@ 
 			{
 				$msg = lang('Permission denied');
 
-				if ($return_error) return $msg;
+				if ($return_error)
+				{
+					return $msg;
+				}
 			}
 			else
 			{
@@ -2493,27 +2674,42 @@ 
 		{
 			list($button) = each($_content['button']);
 			unset($_content['button']);
-			if ($button != 'cancel')	// store changed Acl
+			if ($button != 'cancel')
+			{
+				// store changed Acl
 			{
 				foreach($_content as $data)
 				{
 					if (!($cat_id = $data['cat_id'])) continue;
+			}
 					foreach(array_merge((array)$data['add'],(array)$data['status'],array_keys((array)$data['old'])) as $account_id)
 					{
 						$rights = 0;
-						if (in_array($account_id,(array)$data['add'])) $rights |= calendar_boupdate::CAT_ACL_ADD;
-						if (in_array($account_id,(array)$data['status'])) $rights |= calendar_boupdate::CAT_ACL_STATUS;
-						if ($account_id) $this->bo->set_cat_rights($cat_id,$account_id,$rights);
+						if (in_array($account_id,(array)$data['add']))
+						{
+							$rights |= calendar_boupdate::CAT_ACL_ADD;
+						}
+						if (in_array($account_id,(array)$data['status']))
+						{
+							$rights |= calendar_boupdate::CAT_ACL_STATUS;
+						}
+						if ($account_id)
+						{
+							$this->bo->set_cat_rights($cat_id,$account_id,$rights);
+						}
 					}
 				}
 			}
-			if ($button != 'apply')	// end dialog
+			if ($button != 'apply')
+			{
+				// end dialog
 			{
 				Egw::redirect_link('/index.php', array(
 					'menuaction' => 'admin.admin_ui.index',
 					'ajax' => 'true'
 				), 'admin');
 			}
+			}
 		}
 		$content= $preserv = array();
 		$n = 1;
@@ -2527,8 +2723,14 @@ 
 			);
 			foreach($data as $account_id => $rights)
 			{
-				if ($rights & calendar_boupdate::CAT_ACL_ADD) $row['add'][] = $account_id;
-				if ($rights & calendar_boupdate::CAT_ACL_STATUS) $row['status'][] = $account_id;
+				if ($rights & calendar_boupdate::CAT_ACL_ADD)
+				{
+					$row['add'][] = $account_id;
+				}
+				if ($rights & calendar_boupdate::CAT_ACL_STATUS)
+				{
+					$row['status'][] = $account_id;
+				}
 			}
 			$content[$n] = $row;
 			$preserv[$n] = array(
@@ -2656,7 +2858,10 @@ 
 					break;
 				}
 			}
-			if($return) return;
+			if($return)
+			{
+				return;
+			}
 		}
 		$old_event=$event=$this->bo->read($eventId);
 		if (!$durationT)
@@ -2741,7 +2946,10 @@ 
 			$this->bo->update($event,true, true, false, true, $message,true);
 
 			// Whole day non blocking with DAY_s would add a day
-			if($duration==DAY_s) $duration=0;
+			if($duration==DAY_s)
+			{
+				$duration=0;
+			}
 		}
 		// Drag a normal event to whole day non-blocking
 		else if ($durationT == 'whole_day')
@@ -2765,7 +2973,10 @@ 
 					case 'no':
 						break;
 					case 'startday':
-						if ($sameday) break;
+						if ($sameday)
+						{
+							break;
+						}
 					default:
 						$status_reset_to_unknown = true;
 						$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
@@ -2803,7 +3014,10 @@ 
 		{
 			$response->call('egw.message',  implode('<br />', $message));
 		}
-		if($event['id'] != $eventId ) $this->update_client($_eventId);
+		if($event['id'] != $eventId )
+		{
+			$this->update_client($_eventId);
+		}
 		if ($status_reset_to_unknown)
 		{
 			foreach((array)$event['participants'] as $uid => $status)

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

@@ -2890,11 +2890,11 @@
 			{
 				$msg = lang('Event deleted');
 			}
-			$response->apply('egw.refresh', Array($msg,'calendar',$eventId,'delete'));
+			$response->apply('egw.refresh', array($msg,'calendar',$eventId,'delete'));
 		}
 		else
 		{
-			$response->apply('egw.message', Array(lang('Error')),'error');
+			$response->apply('egw.message', array(lang('Error')),'error');
 		}
 	}
 

Spacing +461 added lines, -462 removed lines

@@ -55,18 +55,18 @@ 
 	 *
 	 * @var locktime in seconds
 	 */
-	var $locktime_default=1;
+	var $locktime_default = 1;
 
 	/**
 	 * Constructor
 	 */
 	function __construct()
 	{
-		parent::__construct(true);	// call the parent's constructor
+		parent::__construct(true); // call the parent's constructor
 
-		for ($n=15; $n <= 16*60; $n+=($n < 60 ? 15 : ($n < 240 ? 30 : ($n < 600 ? 60 : 120))))
+		for ($n = 15; $n <= 16 * 60; $n += ($n < 60 ? 15 : ($n < 240 ? 30 : ($n < 600 ? 60 : 120))))
 		{
-			$this->durations[$n*60] = sprintf('%d:%02d',$n/60,$n%60);
+			$this->durations[$n * 60] = sprintf('%d:%02d', $n / 60, $n % 60);
 		}
 	}
 
@@ -77,10 +77,10 @@ 
 	 */
 	function &default_add_event()
 	{
-		$extra_participants = $_GET['participants'] ? explode(',',$_GET['participants']) : array();
+		$extra_participants = $_GET['participants'] ? explode(',', $_GET['participants']) : array();
 
 		// if participant is a contact, add its link title as title
-		foreach($extra_participants as $uid)
+		foreach ($extra_participants as $uid)
 		{
 			if ($uid[0] == 'c')
 			{
@@ -92,7 +92,7 @@ 
 		if (isset($_GET['owner']))
 		{
 			$owner = $_GET['owner'];
-			if(is_array($owner))
+			if (is_array($owner))
 			{
 				$extra_participants += $owner;
 				$owner = count($owner) > 1 ? $this->user : $owner[0];
@@ -108,18 +108,18 @@ 
 		}
 
 		if (!$owner || !is_numeric($owner) || $GLOBALS['egw']->accounts->get_type($owner) != 'u' ||
-			!$this->bo->check_perms(Acl::ADD,0,$owner))
+			!$this->bo->check_perms(Acl::ADD, 0, $owner))
 		{
 			if ($owner)	// make an owner who is no user or we have no add-rights a participant
 			{
-				if(!is_array($owner))
+				if (!is_array($owner))
 				{
-					$owner = explode(',',$owner);
+					$owner = explode(',', $owner);
 				}
 				// if we come from ressources we don't need any users selected in calendar
 				if (!isset($_GET['participants']) || $_GET['participants'][0] != 'r')
 				{
-					foreach($owner as $uid)
+					foreach ($owner as $uid)
 					{
 						$extra_participants[] = $uid;
 					}
@@ -129,71 +129,71 @@ 
 		}
 		//error_log("this->owner=$this->owner, _GET[owner]=$_GET[owner], user=$this->user => owner=$owner, extra_participants=".implode(',',$extra_participants).")");
 
-		if(isset($_GET['start']))
+		if (isset($_GET['start']))
 		{
 			$start = Api\DateTime::to($_GET['start'], 'ts');
 		}
 		else
 		{
 			$start = $this->bo->date2ts(array(
-				'full' => isset($_GET['date']) && (int) $_GET['date'] ? (int) $_GET['date'] : $this->date,
-				'hour' => (int) (isset($_GET['hour']) && (int) $_GET['hour'] ? $_GET['hour'] : $this->bo->cal_prefs['workdaystarts']),
-				'minute' => (int) $_GET['minute'],
+				'full' => isset($_GET['date']) && (int)$_GET['date'] ? (int)$_GET['date'] : $this->date,
+				'hour' => (int)(isset($_GET['hour']) && (int)$_GET['hour'] ? $_GET['hour'] : $this->bo->cal_prefs['workdaystarts']),
+				'minute' => (int)$_GET['minute'],
 			));
 		}
 		//echo "<p>_GET[date]=$_GET[date], _GET[hour]=$_GET[hour], _GET[minute]=$_GET[minute], this->date=$this->date ==> start=$start=".date('Y-m-d H:i',$start)."</p>\n";
 
 		$participant_types['u'] = $participant_types = $participants = array();
-		foreach($extra_participants as $uid)
+		foreach ($extra_participants as $uid)
 		{
-			if (isset($participants[$uid])) continue;	// already included
+			if (isset($participants[$uid])) continue; // already included
 
-			if (!$this->bo->check_acl_invite($uid)) continue;	// no right to invite --> ignored
+			if (!$this->bo->check_acl_invite($uid)) continue; // no right to invite --> ignored
 
 			if (is_numeric($uid))
 			{
 				$participants[$uid] = $participant_types['u'][$uid] =
-					calendar_so::combine_status($uid == $this->user ? 'A' : 'U',1,
-					($uid == $this->user || ($uid == $owner && $this->bo->check_perms(Acl::ADD,0,$owner))) ? 'CHAIR' : 'REQ-PARTICIPANT');
+					calendar_so::combine_status($uid == $this->user ? 'A' : 'U', 1,
+					($uid == $this->user || ($uid == $owner && $this->bo->check_perms(Acl::ADD, 0, $owner))) ? 'CHAIR' : 'REQ-PARTICIPANT');
 			}
 			elseif (is_array($this->bo->resources[$uid[0]]))
 			{
 				// Expand mailing lists
-				if($uid[0] == 'l')
+				if ($uid[0] == 'l')
 				{
-					foreach($this->bo->enum_mailing_list($uid) as $contact)
+					foreach ($this->bo->enum_mailing_list($uid) as $contact)
 					{
-						$participants[$contact] = $participant_types['c'][substr($contact,1)] =
-							calendar_so::combine_status('U',1,'REQ-PARTICIPANT');
+						$participants[$contact] = $participant_types['c'][substr($contact, 1)] =
+							calendar_so::combine_status('U', 1, 'REQ-PARTICIPANT');
 					}
 					continue;
 				}
 				// if contact is a user, use the user instead (as the GUI)
-				if ($uid[0] == 'c' && ($account_id = $GLOBALS['egw']->accounts->name2id(substr($uid,1),'person_id')))
+				if ($uid[0] == 'c' && ($account_id = $GLOBALS['egw']->accounts->name2id(substr($uid, 1), 'person_id')))
 				{
 					$uid = $account_id;
 					$participants[$uid] = $participant_types['u'][$uid] =
-						calendar_so::combine_status($uid == $this->user ? 'A' : 'U',1,
-						($uid == $this->user || ($uid == $owner && $this->bo->check_perms(Acl::ADD,0,$owner))) ? 'CHAIR' : 'REQ-PARTICIPANT');
+						calendar_so::combine_status($uid == $this->user ? 'A' : 'U', 1,
+						($uid == $this->user || ($uid == $owner && $this->bo->check_perms(Acl::ADD, 0, $owner))) ? 'CHAIR' : 'REQ-PARTICIPANT');
 					continue;
 				}
 				$res_data = $this->bo->resources[$uid[0]];
-				list($id,$quantity) = explode(':',substr($uid,1));
-				if (($status = $res_data['new_status'] ? ExecMethod($res_data['new_status'],$id) : 'U'))
+				list($id, $quantity) = explode(':', substr($uid, 1));
+				if (($status = $res_data['new_status'] ? ExecMethod($res_data['new_status'], $id) : 'U'))
 				{
 					$participants[$uid] = $participant_types[$uid[0]][$id] =
-						calendar_so::combine_status($status,$quantity,'REQ-PARTICIPANT');
+						calendar_so::combine_status($status, $quantity, 'REQ-PARTICIPANT');
 				}
 			}
 		}
 		if (!$participants)	// if all participants got removed, include current user
 		{
-			$participants[$this->user] = $participant_types['u'][$this->user] = calendar_so::combine_status('A',1,'CHAIR');
+			$participants[$this->user] = $participant_types['u'][$this->user] = calendar_so::combine_status('A', 1, 'CHAIR');
 		}
-		if(isset($_GET['cat_id']))
+		if (isset($_GET['cat_id']))
 		{
-			$cat_id = explode(',',$_GET['cat_id']);
-			foreach($cat_id as &$cat)
+			$cat_id = explode(',', $_GET['cat_id']);
+			foreach ($cat_id as &$cat)
 			{
 				$cat = (int)$cat;
 			}
@@ -204,16 +204,16 @@ 
 		if ((string)$this->cal_prefs['default-alarm'] !== '')
 		{
 			$offset = 60 * $this->cal_prefs['default-alarm'];
-			$alarms[1] =  array(
+			$alarms[1] = array(
 				'default' => 1,
-				'offset' => $offset ,
+				'offset' => $offset,
 				'time'   => $start - $offset,
 				'all'    => false,
 				'owner'  => $owner,
 				'id'	=> 1,
 			);
 		}
-		$duration = isset($_GET['duration']) ? (int)$_GET['duration'] : (int) $this->bo->cal_prefs['defaultlength']*60;
+		$duration = isset($_GET['duration']) ? (int)$_GET['duration'] : (int)$this->bo->cal_prefs['defaultlength'] * 60;
 		$end = isset($_GET['end']) ? Api\DateTime::to($_GET['end'], 'ts') : $start + $duration;
 		return array(
 			'participant_types' => $participant_types,
@@ -222,7 +222,7 @@ 
 			'start' => $start,
 			'end'   => $end,
 			'tzid'  => $this->bo->common_prefs['tz'],
-			'priority' => 2,	// normal
+			'priority' => 2, // normal
 			'public'=> $this->cal_prefs['default_private'] ? 0 : 1,
 			'alarm' => $alarms,
 			'recur_exception' => array(),
@@ -241,7 +241,7 @@ 
 	{
 		if (!is_array($content))	// redirect from etemplate, if POST empty
 		{
-			return $this->edit(null,null,strip_tags($_GET['msg']));
+			return $this->edit(null, null, strip_tags($_GET['msg']));
 		}
 		// clear notification errors
 		notifications::errors(true);
@@ -255,22 +255,22 @@ 
 		$update_type = $content['id'] ? ($content['recur_type'] == MCAL_RECUR_NONE ? 'update' : 'edit') : 'add';
 
 		list($button) = @each($content['button']);
-		if (!$button && $content['action']) $button = $content['action'];	// action selectbox
+		if (!$button && $content['action']) $button = $content['action']; // action selectbox
 		unset($content['button']); unset($content['action']);
 
 		$view = $content['view'];
 		if ($button == 'ical')
 		{
-			$msg = $this->export($content['id'],true);
+			$msg = $this->export($content['id'], true);
 		}
 		// delete a recur-exception
 		if ($content['recur_exception']['delete_exception'])
 		{
 			list($date) = each($content['recur_exception']['delete_exception']);
 			// eT2 converts time to
-			if (!is_numeric($date)) $date = Api\DateTime::to (str_replace('Z','', $date), 'ts');
+			if (!is_numeric($date)) $date = Api\DateTime::to(str_replace('Z', '', $date), 'ts');
 			unset($content['recur_exception']['delete_exception']);
-			if (($key = array_search($date,$content['recur_exception'])) !== false)
+			if (($key = array_search($date, $content['recur_exception'])) !== false)
 			{
 				// propagate the exception to a single event
 				$recur_exceptions = $this->bo->so->get_related($content['uid']);
@@ -280,7 +280,7 @@ 
 							$exception['recurrence'] != $content['recur_exception'][$key]) continue;
 					$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
 					$exception['reference'] = $exception['recurrence'] = 0;
-					$this->bo->update($exception, true, true,false,true,$messages,$content['no_notifications']);
+					$this->bo->update($exception, true, true, false, true, $messages, $content['no_notifications']);
 					break;
 				}
 				unset($content['recur_exception'][$key]);
@@ -321,7 +321,7 @@ 
 			$def_alarm = $this->cal_prefs['default-alarm'.($content['whole_day'] ? '-wholeday' : '')];
 			if ((string)$def_alarm === '')
 			{
-				unset($content['alarm'][1]);	// '' = no alarm on whole day --> delete it
+				unset($content['alarm'][1]); // '' = no alarm on whole day --> delete it
 			}
 			else
 			{
@@ -335,7 +335,7 @@ 
 		unset($event['alarm']['delete_alarm']);
 		unset($event['duration']);
 
-		if (in_array($button,array('ignore','freetime','reedit','confirm_edit_series')))
+		if (in_array($button, array('ignore', 'freetime', 'reedit', 'confirm_edit_series')))
 		{
 			// no conversation necessary, event is already in the right format
 		}
@@ -355,7 +355,7 @@ 
 			if ($event['recur_type'] == MCAL_RECUR_NONE && $event['recur_data']) $event['recur_type'] = MCAL_RECUR_WEEKLY;
 			if ($event['recur_type'] == MCAL_RECUR_WEEKLY && !$event['recur_data'])
 			{
-				$event['recur_data'] = 1 << (int)date('w',$event['start']);
+				$event['recur_data'] = 1 << (int)date('w', $event['start']);
 			}
 			if ($event['recur_type'] != MCAL_RECUR_NONE && !isset($event['recur_enddate']))
 			{
@@ -367,9 +367,9 @@ 
 
 				$event['participants'] = $event['participant_types'] = array();
 
-				foreach($content['participants'] as $key => $data)
+				foreach ($content['participants'] as $key => $data)
 				{
-					switch($key)
+					switch ($key)
 					{
 						case 'delete':		// handled in default
 						case 'quantity':	// handled in new_resource
@@ -378,20 +378,20 @@ 
 						case 'status_date':
 							break;
 						case 'participant':
-							foreach($data as $participant)
+							foreach ($data as $participant)
 							{								// email or rfc822 addresse (eg. "Ralf Becker <ralf@domain.com>")
 								$email = array();
-								if(preg_match('/^(.*<)?([a-z0-9_.-]+@[a-z0-9_.-]{5,})>?$/i',$participant,$email))
+								if (preg_match('/^(.*<)?([a-z0-9_.-]+@[a-z0-9_.-]{5,})>?$/i', $participant, $email))
 								{
-									$status = calendar_so::combine_status('U',$content['participants']['quantity'],$content['participants']['role']);
-									if (($data = $GLOBALS['egw']->accounts->name2id($email[2],'account_email')) && $this->bo->check_acl_invite($data))
+									$status = calendar_so::combine_status('U', $content['participants']['quantity'], $content['participants']['role']);
+									if (($data = $GLOBALS['egw']->accounts->name2id($email[2], 'account_email')) && $this->bo->check_acl_invite($data))
 									{
 										$event['participants'][$data] = $event['participant_types']['u'][$data] = $status;
 									}
-									elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',array(
+									elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search', array(
 										'email' => $email[2],
 										'email_home' => $email[2],
-									),true,'','','',false,'OR')))
+									), true, '', '', '', false, 'OR')))
 									{
 										$event['participants']['c'.$data['id']] = $event['participant_types']['c'][$data['id']] = $status;
 									}
@@ -402,7 +402,7 @@ 
 								}
 								else
 								{
-									if(is_numeric($participant))
+									if (is_numeric($participant))
 									{
 										$uid = 'u'.$participant;
 										$id = $participant;
@@ -411,12 +411,12 @@ 
 									else
 									{
 										$uid = $participant;
-										$id = substr($participant,1);
+										$id = substr($participant, 1);
 										$resource = $this->bo->resources[$participant[0]];
 									}
-									if(!$this->bo->check_acl_invite($uid))
+									if (!$this->bo->check_acl_invite($uid))
 									{
-										if(!$msg_permission_denied_added)
+										if (!$msg_permission_denied_added)
 										{
 											$msg .= lang('Permission denied!');
 											$msg_permission_denied_added = true;
@@ -426,16 +426,15 @@ 
 
 									$type = $resource['type'];
 									$status = isset($this->bo->resources[$type]['new_status']) ?
-										ExecMethod($this->bo->resources[$type]['new_status'],$id) :
-										($uid == $this->bo->user ? 'A' : 'U');
+										ExecMethod($this->bo->resources[$type]['new_status'], $id) : ($uid == $this->bo->user ? 'A' : 'U');
 
 									// Expand mailing lists
-									if($type == 'l')
+									if ($type == 'l')
 									{
-										foreach($this->bo->enum_mailing_list($participant) as $contact)
+										foreach ($this->bo->enum_mailing_list($participant) as $contact)
 										{
-											$event['participants'][$contact] = $event['participant_types']['c'][substr($contact,1)] = 
-												calendar_so::combine_status($status,$content['participants']['quantity'],$content['participants']['role']);
+											$event['participants'][$contact] = $event['participant_types']['c'][substr($contact, 1)] = 
+												calendar_so::combine_status($status, $content['participants']['quantity'], $content['participants']['role']);
 										}
 										continue;
 									}
@@ -445,8 +444,8 @@ 
 										// todo check real availability = maximum - already booked quantity
 										if (isset($res_info['useable']) && $content['participants']['quantity'] > $res_info['useable'])
 										{
-											$msg .= lang('Maximum available quantity of %1 exceeded!',$res_info['useable']);
-											foreach(array('quantity','resource','role') as $n)
+											$msg .= lang('Maximum available quantity of %1 exceeded!', $res_info['useable']);
+											foreach (array('quantity', 'resource', 'role') as $n)
 											{
 												$event['participants'][$n] = $content['participants'][$n];
 											}
@@ -455,7 +454,7 @@ 
 										else
 										{
 											$event['participants'][$uid] = $event['participant_types'][$type][$id] =
-												calendar_so::combine_status($status,$content['participants']['quantity'],$content['participants']['role']);
+												calendar_so::combine_status($status, $content['participants']['quantity'], $content['participants']['role']);
 										}
 									}
 								}
@@ -469,14 +468,14 @@ 
 							break;
 
 						default:		// existing participant row
-							if (!is_array($data)) continue;	// widgets in participant tab, above participant list
-							foreach(array('uid','status','quantity','role') as $name)
+							if (!is_array($data)) continue; // widgets in participant tab, above participant list
+							foreach (array('uid', 'status', 'quantity', 'role') as $name)
 							{
 								$$name = $data[$name];
 							}
 							if ($content['participants']['delete'][$uid] || $content['participants']['delete'][md5($uid)])
 							{
-								$uid = false;	// entry has been deleted
+								$uid = false; // entry has been deleted
 							}
 							elseif ($uid)
 							{
@@ -487,7 +486,7 @@ 
 								}
 								else
 								{
-									$id = substr($uid,1);
+									$id = substr($uid, 1);
 									$type = $uid[0];
 								}
 								if ($data['old_status'] != $status && !(!$data['old_status'] && $status == 'G'))
@@ -495,19 +494,19 @@ 
 									//echo "<p>$uid: status changed '$data[old_status]' --> '$status<'/p>\n";
 									$quantity = $role = null;
 									$new_status = calendar_so::combine_status($status, $quantity, $role);
-									if ($this->bo->set_status($event['id'],$uid,$new_status,isset($content['edit_single']) ? $content['participants']['status_date'] : 0, false, true, $content['no_notifications']))
+									if ($this->bo->set_status($event['id'], $uid, $new_status, isset($content['edit_single']) ? $content['participants']['status_date'] : 0, false, true, $content['no_notifications']))
 									{
 										// Update main window
 										$client_updated = $this->update_client($event['id'], $content['edit_single']);
 										
 										// refreshing the calendar-view with the changed participant-status
-										if($event['recur_type'] != MCAL_RECUR_NONE)
+										if ($event['recur_type'] != MCAL_RECUR_NONE)
 										{
 											$msg = lang('Status for all future scheduled days changed');
 										}
 										else
 										{
-											if(isset($content['edit_single']))
+											if (isset($content['edit_single']))
 											{
 												$msg = lang('Status for this particular day changed');
 												// prevent accidentally creating a real exception afterwards
@@ -528,7 +527,7 @@ 
 										if ($status == 'R' && $event['alarm'])
 										{
 											// remove from bo->set_status deleted alarms of rejected users from UI too
-											foreach($event['alarm'] as $alarm_id => $alarm)
+											foreach ($event['alarm'] as $alarm_id => $alarm)
 											{
 												if ((string)$alarm['owner'] === (string)$uid)
 												{
@@ -541,7 +540,7 @@ 
 								if ($uid && $status != 'G')
 								{
 									$event['participants'][$uid] = $event['participant_types'][$type][$id] =
-										calendar_so::combine_status($status,$quantity,$role);
+										calendar_so::combine_status($status, $quantity, $role);
 								}
 							}
 							break;
@@ -560,26 +559,26 @@ 
 			'tabs'			=> $content['tabs'],
 			'template'      => $content['template'],
 		);
-		$noerror=true;
+		$noerror = true;
 
 		//error_log(__METHOD__.$button.'#'.array2string($content['edit_single']).'#');
 
 		$ignore_conflicts = $status_reset_to_unknown = false;
 
-		switch((string)$button)
+		switch ((string)$button)
 		{
 			case 'ignore':
 				$ignore_conflicts = true;
-				$button = $event['button_was'];	// save or apply
+				$button = $event['button_was']; // save or apply
 				unset($event['button_was']);
 				break;
 
 		}
 
-		switch((string)$button)
+		switch ((string)$button)
 		{
 		case 'exception':	// create an exception in a recuring event
-			$msg = $this->_create_exception($event,$preserv);
+			$msg = $this->_create_exception($event, $preserv);
 			break;
 
 		case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
@@ -590,29 +589,29 @@ 
 			unset($event['recurrence']);
 			unset($preserv['recurrence']);
 			unset($event['recur_exception']);
-			unset($event['edit_single']);	// in case it has been set
+			unset($event['edit_single']); // in case it has been set
 			unset($event['modified']);
 			unset($event['modifier']);
 			unset($event['caldav_name']);
-			$event['owner'] = !(int)$this->owner || !$this->bo->check_perms(Acl::ADD,0,$this->owner) ? $this->user : $this->owner;
+			$event['owner'] = !(int)$this->owner || !$this->bo->check_perms(Acl::ADD, 0, $this->owner) ? $this->user : $this->owner;
 
 			// Clear participant stati
-			foreach($event['participant_types'] as $type => &$participants)
+			foreach ($event['participant_types'] as $type => &$participants)
 			{
-				foreach($participants as $id => &$p_response)
+				foreach ($participants as $id => &$p_response)
 				{
-					if($type == 'u' && $id == $event['owner']) continue;
+					if ($type == 'u' && $id == $event['owner']) continue;
 					calendar_so::split_status($p_response, $quantity, $role);
 					// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
-					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
-					$p_response = calendar_so::combine_status($status,$quantity,$role);
+					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'], $id) : 'U';
+					$p_response = calendar_so::combine_status($status, $quantity, $role);
 				}
 			}
 
 			// Copy alarms
 			if (is_array($event['alarm']))
 			{
-				foreach($event['alarm'] as $n => &$alarm)
+				foreach ($event['alarm'] as $n => &$alarm)
 				{
 					unset($alarm['id']);
 					unset($alarm['cal_id']);
@@ -622,7 +621,7 @@ 
 			// Get links to be copied
 			// With no ID, $content['link_to']['to_id'] is used
 			$content['link_to']['to_id'] = array('to_app' => 'calendar', 'to_id' => 0);
-			foreach(Link::get_links('calendar', $content['id']) as $link)
+			foreach (Link::get_links('calendar', $content['id']) as $link)
 			{
 				if ($link['app'] != Link::VFS_APPNAME)
 				{
@@ -648,7 +647,7 @@ 
 		case 'print':
 		case 'apply':
 		case 'infolog':
-			if ($event['id'] && !$this->bo->check_perms(Acl::EDIT,$event))
+			if ($event['id'] && !$this->bo->check_perms(Acl::EDIT, $event))
 			{
 				$msg = lang('Permission denied');
 				$button = '';
@@ -666,7 +665,7 @@ 
 				$button = '';
 				break;
 			}
-			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end']-$event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
+			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end'] - $event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
 			{
 				$msg = lang('Error: Duration of event longer then recurrence interval!');
 				$button = '';
@@ -696,14 +695,14 @@ 
 				$event['reference'] = $event['id'];
 				$event['recurrence'] = $content['edit_single'];
 				unset($event['id']);
-				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
+				$conflicts = $this->bo->update($event, $ignore_conflicts, true, false, true, $messages, $content['no_notifications']);
 				if (!is_array($conflicts) && $conflicts)
 				{
 					// now we need to add the original start as recur-execption to the series
 					$recur_event = $this->bo->read($event['reference']);
 					$recur_event['recur_exception'][] = $content['edit_single'];
 					// check if we need to move the alarms, because they are next on that exception
-					foreach($recur_event['alarm'] as $id => $alarm)
+					foreach ($recur_event['alarm'] as $id => $alarm)
 					{
 						if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
 						{
@@ -719,11 +718,11 @@ 
 							}
 						}
 					}
-					unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
-					unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
-					$this->bo->update($recur_event,true);	// no conflict check here
+					unset($recur_event['start']); unset($recur_event['end']); // no update necessary
+					unset($recur_event['alarm']); // unsetting alarms too, as they cant be updated without start!
+					$this->bo->update($recur_event, true); // no conflict check here
 
-					if(Api\Json\Response::isJSONResponse())
+					if (Api\Json\Response::isJSONResponse())
 					{
 						// Sending null will trigger a removal of the original
 						// for that date
@@ -731,7 +730,7 @@ 
 					}
 
 					unset($recur_event);
-					unset($event['edit_single']);			// if we further edit it, it's just a single event
+					unset($event['edit_single']); // if we further edit it, it's just a single event
 					unset($preserv['edit_single']);
 				}
 				else	// conflict or error, we need to reset everything to the state befor we tried to save it
@@ -762,8 +761,8 @@ 
 							{
 								$offset = $off2;
 							}
-							$msg = $this->_break_recurring($event, $old_event, $event['actual_date'] + $offset,$content['no_notifications']);
-							if($msg)
+							$msg = $this->_break_recurring($event, $old_event, $event['actual_date'] + $offset, $content['no_notifications']);
+							if ($msg)
 							{
 								$noerror = false;
 							}
@@ -776,13 +775,13 @@ 
 							$event['whole_day'] != $old_event['whole_day'])
 						{
 							$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
-							foreach((array)$event['participants'] as $uid => $status)
+							foreach ((array)$event['participants'] as $uid => $status)
 							{
 								$q = $r = null;
-								calendar_so::split_status($status,$q,$r);
+								calendar_so::split_status($status, $q, $r);
 								if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
 								{
-									$preferences = CreateObject('phpgwapi.preferences',$uid);
+									$preferences = CreateObject('phpgwapi.preferences', $uid);
 									$part_prefs = $preferences->read_repository();
 									switch ($part_prefs['calendar']['reset_stati'])
 									{
@@ -792,7 +791,7 @@ 
 											if ($sameday) break;
 										default:
 											$status_reset_to_unknown = true;
-											$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
+											$event['participants'][$uid] = calendar_so::combine_status('U', $q, $r);
 											// todo: report reset status to user
 									}
 								}
@@ -804,43 +803,43 @@ 
 				}
 				// Adding participants needs to be done as an edit, in case we
 				// have participants visible in seperate calendars
-				if(is_array($old_event['participants']) && count(array_diff_key($event['participants'], $old_event['participants'])))
+				if (is_array($old_event['participants']) && count(array_diff_key($event['participants'], $old_event['participants'])))
 				{
 					$update_type = 'edit';
 				}
 				// Changing category may affect event filtering
-				if($this->cal_prefs['saved_states']['cat_id'] && $old_event['category'] != $event['category'])
+				if ($this->cal_prefs['saved_states']['cat_id'] && $old_event['category'] != $event['category'])
 				{
 					$update_type = 'edit';
 				}
-				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
+				$conflicts = $this->bo->update($event, $ignore_conflicts, true, false, true, $messages, $content['no_notifications']);
 				unset($event['ignore']);
 			}
 			if (is_array($conflicts))
 			{
-				$event['button_was'] = $button;	// remember for ignore
-				return $this->conflicts($event,$conflicts,$preserv);
+				$event['button_was'] = $button; // remember for ignore
+				return $this->conflicts($event, $conflicts, $preserv);
 			}
 
 			// Event spans multiple days, need an edit to make sure they all get updated
 			// We could check old date, as removing from days could still be an update
-			if(date('Ymd', $event['start']) != date('Ymd', $event['end']))
+			if (date('Ymd', $event['start']) != date('Ymd', $event['end']))
 			{
 				$update_type = 'edit';
 			}
 			// check if there are messages from update, eg. removed participants or Api\Categories because of missing rights
 			if ($messages)
 			{
-				$msg  .= ($msg ? ', ' : '').implode(', ',$messages);
+				$msg .= ($msg ? ', ' : '').implode(', ', $messages);
 			}
 			if ($conflicts === 0)
 			{
-				$msg .= ($msg ? ', ' : '') .lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
-							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
-								htmlspecialchars(Egw::link('/index.php',array(
+				$msg .= ($msg ? ', ' : '').lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
+							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.', '<a href="'.
+								htmlspecialchars(Egw::link('/index.php', array(
 								'menuaction' => 'calendar.calendar_uiforms.edit',
 								'cal_id'    => $content['id'],
-							))).'">','</a>');
+							))).'">', '</a>');
 				$noerror = false;
 			}
 			elseif ($conflicts > 0)
@@ -862,19 +861,19 @@ 
 						// if alarm would be in the past (eg. event moved back) --> move to next possible recurrence
 						if ($alarm['time'] < $this->bo->now_su)
 						{
-							if (($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su+$alarm['offset'], true)))
+							if (($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $alarm['offset'], true)))
 							{
-								$alarm['time'] =  $next_occurrence['start'] - $alarm['offset'];
+								$alarm['time'] = $next_occurrence['start'] - $alarm['offset'];
 							}
 							else
 							{
-								$alarm = false;	// no (further) recurence found --> ignore alarm
+								$alarm = false; // no (further) recurence found --> ignore alarm
 							}
 						}
 						// alarm is currently on a previous recurrence --> set for first recurrence of new series
 						elseif ($event_time < $event['start'])
 						{
-							$alarm['time'] =  $event['start'] - $alarm['offset'];
+							$alarm['time'] = $event['start'] - $alarm['offset'];
 						}
 						if ($alarm)
 						{
@@ -883,9 +882,9 @@ 
 						}
 					}
 					// attach all future exceptions to the new series
-					$events =& $this->bo->search(array(
+					$events = & $this->bo->search(array(
 						'query' => array('cal_uid' => $old_event['uid']),
-						'filter' => 'owner',  // return all possible entries
+						'filter' => 'owner', // return all possible entries
 						'daywise' => false,
 						'date_format' => 'ts',
 					));
@@ -896,7 +895,7 @@ 
 							$exception['recurrence'] += $offset;
 							$exception['reference'] = $event['id'];
 							$exception['uid'] = $event['uid'];
-							$this->bo->update($exception, true, true, true, true, $msg=null, $content['no_notifications']);
+							$this->bo->update($exception, true, true, true, true, $msg = null, $content['no_notifications']);
 						}
 					}
 				}
@@ -904,12 +903,12 @@ 
 				$message = lang('Event saved');
 				if ($status_reset_to_unknown)
 				{
-					foreach((array)$event['participants'] as $uid => $status)
+					foreach ((array)$event['participants'] as $uid => $status)
 					{
 						if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user)
 						{
-							calendar_so::split_status($status,$q,$r);
-							$status = calendar_so::combine_status('U',$q,$r);
+							calendar_so::split_status($status, $q, $r);
+							$status = calendar_so::combine_status('U', $q, $r);
 							$this->bo->set_status($event['id'], $uid, $status, 0, true);
 						}
 					}
@@ -917,17 +916,17 @@ 
 				}
 
 				$response = Api\Json\Response::get();
-				if($response && $update_type != 'delete')
+				if ($response && $update_type != 'delete')
 				{
 					$client_updated = $this->update_client($event['id']);
 				}
 
-				$msg = $message . ($msg ? ', ' . $msg : '');
+				$msg = $message.($msg ? ', '.$msg : '');
 				Framework::refresh_opener($msg, 'calendar', $event['id'], $client_updated ? ($event['recur_type'] ? 'edit' : $update_type) : 'delete');
 				// writing links for new entry, existing ones are handled by the widget itself
 				if (!$content['id'] && is_array($content['link_to']['to_id']))
 				{
-					Link::link('calendar',$event['id'],$content['link_to']['to_id']);
+					Link::link('calendar', $event['id'], $content['link_to']['to_id']);
 				}
 			}
 			else
@@ -937,7 +936,7 @@ 
 			break;
 
 		case 'cancel':
-			if($content['cancel_needs_refresh'])
+			if ($content['cancel_needs_refresh'])
 			{
 				Framework::refresh_opener($msg, 'calendar');
 			}
@@ -975,7 +974,7 @@ 
 			{
 				$content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
 			}
-			if ($this->bo->check_perms(Acl::EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
+			if ($this->bo->check_perms(Acl::EDIT, !$content['new_alarm']['owner'] ? $event : 0, $content['new_alarm']['owner']))
 			{
 				$alarm = array(
 					'offset' => $offset,
@@ -989,13 +988,13 @@ 
 				}
 				elseif ($event['id'])	// save the alarm immediatly
 				{
-					if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+					if (($alarm_id = $this->bo->save_alarm($event['id'], $alarm)))
 					{
 						$alarm['id'] = $alarm_id;
 						$event['alarm'][$alarm_id] = $alarm;
 
 						$msg = lang('Alarm added');
-						Framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+						Framework::refresh_opener($msg, 'calendar', $event['id'], 'update');
 					}
 					else
 					{
@@ -1004,7 +1003,7 @@ 
 				}
 				else
 				{
-					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
+					for ($alarm['id'] = 1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
 					$event['alarm'][$alarm['id']] = $alarm;
 				}
 			}
@@ -1021,31 +1020,31 @@ 
 		}
 		// New event, send data before updating so it's there
 		$response = Api\Json\Response::get();
-		if($response && !$content['id'] && $event['id'])
+		if ($response && !$content['id'] && $event['id'])
 		{
 			$client_updated = $this->update_client($event['id']);
 		}
-		if (in_array($button,array('cancel','save','delete','delete_exceptions','delete_keep_exceptions')) && $noerror)
+		if (in_array($button, array('cancel', 'save', 'delete', 'delete_exceptions', 'delete_keep_exceptions')) && $noerror)
 		{
 			if ($content['lock_token'])	// remove an existing lock
 			{
-				Vfs::unlock(Vfs::app_entry_lock_path('calendar',$content['id']),$content['lock_token'],false);
+				Vfs::unlock(Vfs::app_entry_lock_path('calendar', $content['id']), $content['lock_token'], false);
 			}
 			if ($content['no_popup'])
 			{
-				Egw::redirect_link('/index.php',array(
+				Egw::redirect_link('/index.php', array(
 					'menuaction' => 'calendar.calendar_uiviews.index',
 					'msg'        => $msg,
 				));
 			}
-			if (in_array($button,array('delete_exceptions','delete_keep_exceptions')) || $content['recur_type'] && $button == 'delete')
+			if (in_array($button, array('delete_exceptions', 'delete_keep_exceptions')) || $content['recur_type'] && $button == 'delete')
 			{
-				Framework::refresh_opener($msg,'calendar');
+				Framework::refresh_opener($msg, 'calendar');
 			}
 			else
 			{
 				Framework::refresh_opener($msg, 'calendar', 
-					$event['id'] . ($content['edit_single'] ? ':' . (int)$content['edit_single'] : '' ),
+					$event['id'].($content['edit_single'] ? ':'.(int)$content['edit_single'] : ''),
 					$button == 'save' && $client_updated ? ($content['id'] ? $update_type : 'add') : 'delete'
 				);
 			}
@@ -1053,7 +1052,7 @@ 
 			exit();
 		}
 		unset($event['no_notifications']);
-		return $this->edit($event,$preserv,$msg,$event['id'] ? $event['id'] : $content['link_to']['to_id']);
+		return $this->edit($event, $preserv, $msg, $event['id'] ? $event['id'] : $content['link_to']['to_id']);
 	}
 
 	/**
@@ -1065,7 +1064,7 @@ 
 	 * @param array &$preserv
 	 * @return string message that exception was created
 	 */
-	function _create_exception(&$event,&$preserv)
+	function _create_exception(&$event, &$preserv)
 	{
 		// In some cases where the user makes the first day an exception, actual_date may be missing
 		$preserv['actual_date'] = $preserv['actual_date'] ? $preserv['actual_date'] : $event['start'];
@@ -1075,17 +1074,17 @@ 
 		$event['recurrence'] = $preserv['recurrence'] = $preserv['actual_date'];
 		$event['start'] = $preserv['edit_single'] = $preserv['actual_date'];
 		$event['recur_type'] = MCAL_RECUR_NONE;
-		foreach(array('recur_enddate','recur_interval','recur_exception','recur_data') as $name)
+		foreach (array('recur_enddate', 'recur_interval', 'recur_exception', 'recur_data') as $name)
 		{
 			unset($event[$name]);
 		}
 		// add all alarms as new alarms to execption
 		$event['alarm'] = array_values((array)$event['alarm']);
-		foreach($event['alarm'] as &$alarm)
+		foreach ($event['alarm'] as &$alarm)
 		{
 			unset($alarm['uid'], $alarm['id'], $alarm['time']);
 		}
-		if($this->bo->check_perms(Acl::EDIT,$event))
+		if ($this->bo->check_perms(Acl::EDIT, $event))
 		{
 			return lang('Save event as exception - Delete single occurrence - Edit status or alarms for this particular day');
 		}
@@ -1112,14 +1111,14 @@ 
 	{
 		$msg = false;
 
-		if(!$as_of_date )
+		if (!$as_of_date)
 		{
 			$as_of_date = time();
 		}
 
 		//error_log(__METHOD__ . Api\DateTime::to($old_event['start']) . ' -> '. Api\DateTime::to($event['start']) . ' as of ' . Api\DateTime::to($as_of_date));
 
-		if(!($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + 1, true)))
+		if (!($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + 1, true)))
 		{
 			$msg = lang("Error: You can't shift a series from the past!");
 			return $msg;
@@ -1132,11 +1131,11 @@ 
 		$duration = $event['duration'] ? $event['duration'] : $event['end'] - $event['start'];
 
 		// base start-date of new series on actual / clicked date
-		$event['start'] = $as_of_date ;
+		$event['start'] = $as_of_date;
 
-		if (Api\DateTime::to($old_event['start'],'Ymd') < Api\DateTime::to($as_of_date,'Ymd') ||
+		if (Api\DateTime::to($old_event['start'], 'Ymd') < Api\DateTime::to($as_of_date, 'Ymd') ||
 			// Adjust for requested date in the past
-			Api\DateTime::to($as_of_date,'ts') < time()
+			Api\DateTime::to($as_of_date, 'ts') < time()
 		)
 		{
 
@@ -1156,17 +1155,17 @@ 
 				$rriter->next_no_exception();
 				$occurrence = $rriter->current();
 			}
-			while ($rriter->valid()  && (
+			while ($rriter->valid() && (
 				Api\DateTime::to($occurrence, 'ts') <= time() ||
-				Api\DateTime::to($occurrence, 'Ymd') < Api\DateTime::to($as_of_date,'Ymd')
+				Api\DateTime::to($occurrence, 'Ymd') < Api\DateTime::to($as_of_date, 'Ymd')
 			) && ($last = $occurrence));
 
 
 			// Make sure as_of_date is still valid, may have to move forward
-			if(Api\DateTime::to($as_of_date,'ts') < Api\DateTime::to($last,'ts') ||
+			if (Api\DateTime::to($as_of_date, 'ts') < Api\DateTime::to($last, 'ts') ||
 				Api\DateTime::to($as_of_date, 'Ymd') == Api\DateTime::to($last, 'Ymd'))
 			{
-				$event['start'] = Api\DateTime::to($rriter->current(),'ts') + $offset;
+				$event['start'] = Api\DateTime::to($rriter->current(), 'ts') + $offset;
 			}
 
 			//error_log(__METHOD__ ." Series should end at " . Api\DateTime::to($last) . " New series starts at " . Api\DateTime::to($event['start']));
@@ -1174,7 +1173,7 @@ 
 			{
 				$event['end'] = $event['start'] + $duration;
 			}
-			elseif($event['end'] < $event['start'])
+			elseif ($event['end'] < $event['start'])
 			{
 				$event['end'] = $old_event['end'] - $old_event['start'] + $event['start'];
 			}
@@ -1183,7 +1182,7 @@ 
 			$event['participants'] = $old_event['participants'];
 			foreach ($old_event['recur_exception'] as $key => $exdate)
 			{
-				if ($exdate > Api\DateTime::to($last,'ts'))
+				if ($exdate > Api\DateTime::to($last, 'ts'))
 				{
 					//error_log("Moved exception on " . Api\DateTime::to($exdate));
 					unset($old_event['recur_exception'][$key]);
@@ -1197,18 +1196,18 @@ 
 			}
 			$last->setTime(0, 0, 0);
 			$old_event['recur_enddate'] = Api\DateTime::to($last, 'ts');
-			if (!$this->bo->update($old_event,true,true,false,true,$dummy=null,$no_notifications))
+			if (!$this->bo->update($old_event, true, true, false, true, $dummy = null, $no_notifications))
 			{
-				$msg .= ($msg ? ', ' : '') .lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
-					lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
-						htmlspecialchars(Egw::link('/index.php',array(
+				$msg .= ($msg ? ', ' : '').lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
+					lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.', '<a href="'.
+						htmlspecialchars(Egw::link('/index.php', array(
 							'menuaction' => 'calendar.calendar_uiforms.edit',
 							'cal_id'    => $event['id'],
-						))).'">','</a>');
+						))).'">', '</a>');
 				$event = $orig_event;
 			}
 		}
-		$event['start'] = Api\DateTime::to($event['start'],'ts');
+		$event['start'] = Api\DateTime::to($event['start'], 'ts');
 		return $msg;
 	}
 
@@ -1219,11 +1218,11 @@ 
 	 * @param boolean $added
 	 * @return string javascript window.open command
 	 */
-	function ajax_custom_mail($event,$added,$asrequest=false)
+	function ajax_custom_mail($event, $added, $asrequest = false)
 	{
 		$to = array();
 
-		foreach($event['participants'] as $uid => $status)
+		foreach ($event['participants'] as $uid => $status)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$uid.':'.array2string($status));
 			if (empty($status)) continue;
@@ -1232,35 +1231,35 @@ 
 
 			if (isset($status['uid']) && is_numeric($status['uid']) && $GLOBALS['egw']->accounts->get_type($status['uid']) == 'u')
 			{
-				if (!($email = $GLOBALS['egw']->accounts->id2name($status['uid'],'account_email'))) continue;
+				if (!($email = $GLOBALS['egw']->accounts->id2name($status['uid'], 'account_email'))) continue;
 
 				$lid = $firstname = $lastname = null;
-				$GLOBALS['egw']->accounts->get_account_name($status['uid'],$lid,$firstname,$lastname);
+				$GLOBALS['egw']->accounts->get_account_name($status['uid'], $lid, $firstname, $lastname);
 
 				$toadd = $firstname.' '.$lastname.' <'.$email.'>';
-				if (!in_array($toadd,$to)) $to[] = $toadd;
+				if (!in_array($toadd, $to)) $to[] = $toadd;
 				//error_log(__METHOD__.__LINE__.array2string($to));
 			}
 			elseif ($uid < 0)
 			{
-				foreach($GLOBALS['egw']->accounts->members($uid,true) as $uid)
+				foreach ($GLOBALS['egw']->accounts->members($uid, true) as $uid)
 				{
-					if (!($email = $GLOBALS['egw']->accounts->id2name($uid,'account_email'))) continue;
+					if (!($email = $GLOBALS['egw']->accounts->id2name($uid, 'account_email'))) continue;
 
-					$GLOBALS['egw']->accounts->get_account_name($uid,$lid,$firstname,$lastname);
+					$GLOBALS['egw']->accounts->get_account_name($uid, $lid, $firstname, $lastname);
 
 					$toadd = $firstname.' '.$lastname.' <'.$email.'>';
 					// dont add groupmembers if they already rejected the event, or are the current user
-					if (!in_array($toadd,$to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user)) $to[] = $toadd;
+					if (!in_array($toadd, $to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user)) $to[] = $toadd;
 					//error_log(__METHOD__.__LINE__.array2string($to));
 				}
 			}
-			elseif(!empty($status['uid'])&& !is_numeric(substr($status['uid'],0,1)) && ($info = $this->bo->resource_info($status['uid'])))
+			elseif (!empty($status['uid']) && !is_numeric(substr($status['uid'], 0, 1)) && ($info = $this->bo->resource_info($status['uid'])))
 			{
 				$to[] = $info['email'];
 				//error_log(__METHOD__.__LINE__.array2string($to));
 			}
-			elseif(!is_numeric(substr($uid,0,1)) && ($info = $this->bo->resource_info($uid)))
+			elseif (!is_numeric(substr($uid, 0, 1)) && ($info = $this->bo->resource_info($uid)))
 			{
 				$to[] = $info['email'];
 				//error_log(__METHOD__.__LINE__.array2string($to));
@@ -1269,7 +1268,7 @@ 
 		// prefer event description over standard notification text
 		if (empty($event['description']))
 		{
-			list(,$body) = $this->bo->get_update_message($event,$added ? MSG_ADDED : MSG_MODIFIED);	// update-message is in TZ of the user
+			list(,$body) = $this->bo->get_update_message($event, $added ? MSG_ADDED : MSG_MODIFIED); // update-message is in TZ of the user
 		}
 		else
 		{
@@ -1284,12 +1283,12 @@ 
 		$boical = new calendar_ical();
 		// we need to pass $event[id] so iCal class reads event again,
 		// as event is in user TZ, but iCal class expects server TZ!
-		$ics = $boical->exportVCal(array($event['id']),'2.0','REQUEST',false);
+		$ics = $boical->exportVCal(array($event['id']), '2.0', 'REQUEST', false);
 
-		$ics_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'ics');
-		if(($f = fopen($ics_file,'w')))
+		$ics_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'ics');
+		if (($f = fopen($ics_file, 'w')))
 		{
-			fwrite($f,$ics);
+			fwrite($f, $ics);
 			fclose($f);
 		}
 		//error_log(__METHOD__.__LINE__.array2string($to));
@@ -1301,7 +1300,7 @@ 
 			'preset[body]'    => $body,
 			'preset[name]'    => 'event.ics',
 			'preset[file]'    => $ics_file,
-			'preset[type]'    => 'text/calendar'.($asrequest?'; method=REQUEST':''),
+			'preset[type]'    => 'text/calendar'.($asrequest ? '; method=REQUEST' : ''),
 			'preset[size]'    => filesize($ics_file),
 		);
 		if ($asrequest) $vars['preset[msg]'] = lang('You attempt to mail a meetingrequest to the recipients above. Depending on the client this mail is opened with, the recipient may or may not see the mailbody below, but only see the meeting request attached.');
@@ -1357,7 +1356,7 @@ 
 	 * @param mixed $link_to_id ='' from or for the link-widget
 	 * @param string $msg_type =null default automatic detect, if it contains "error"
 	 */
-	function edit($event=null,$preserv=null,$msg='',$link_to_id='',$msg_type=null)
+	function edit($event = null, $preserv = null, $msg = '', $link_to_id = '', $msg_type = null)
 	{
 		$sel_options = array(
 			'recur_type' => &$this->bo->recur_types,
@@ -1381,8 +1380,8 @@ 
 				'no_popup' => isset($_GET['no_popup']),
 				'template' => isset($_GET['template']) ? $_GET['template'] : (isset($_REQUEST['print']) ? 'calendar.print' : 'calendar.edit'),
 			);
-			$cal_id = (int) $_GET['cal_id'];
-			if($_GET['action'])
+			$cal_id = (int)$_GET['cal_id'];
+			if ($_GET['action'])
 			{
 				$event = $this->bo->read($cal_id);
 				$event['action'] = $_GET['action'];
@@ -1400,14 +1399,14 @@ 
 			{
 				//error_log(__METHOD__."() Error: importing the iCal: vfs file not found '$_GET[ical_vfs]'!");
 				$msg = lang('Error: importing the iCal').': '.lang('VFS file not found').': '.$_GET['ical_vfs'];
-				$event =& $this->default_add_event();
+				$event = & $this->default_add_event();
 			}
 			if (!empty($_GET['ical_data']) &&
 				!($_GET['ical'] = Link::get_data($_GET['ical_data'])))
 			{
 				//error_log(__METHOD__."() Error: importing the iCal: data not found '$_GET[ical_data]'!");
 				$msg = lang('Error: importing the iCal').': '.lang('Data not found').': '.$_GET['ical_data'];
-				$event =& $this->default_add_event();
+				$event = & $this->default_add_event();
 			}
 			if (!empty($_GET['ical']))
 			{
@@ -1416,14 +1415,14 @@ 
 				{
 					error_log(__METHOD__."('$_GET[ical]') error parsing iCal!");
 					$msg = lang('Error: importing the iCal');
-					$event =& $this->default_add_event();
+					$event = & $this->default_add_event();
 				}
 				else
 				{
 					if (count($events) > 1)
 					{
 						$msg = lang('%1 events in iCal file, only first one imported and displayed!', count($events));
-						$msg_type = 'notice';	// no not hide automatic
+						$msg_type = 'notice'; // no not hide automatic
 					}
 					// as icaltoegw returns timestamps in server-time, we have to convert them here to user-time
 					$this->bo->db2data($events, 'ts');
@@ -1436,7 +1435,7 @@ 
 					else
 					{
 						$event['participant_types'] = array();
-						foreach($event['participants'] as $uid => $status)
+						foreach ($event['participants'] as $uid => $status)
 						{
 							$user_type = $user_id = null;
 							calendar_so::split_user($uid, $user_type, $user_id);
@@ -1457,15 +1456,15 @@ 
 					}
 					else
 					{
-						$GLOBALS['egw']->framework->render('<p class="message" align="center">'.lang('Permission denied')."</p>\n",null,true);
+						$GLOBALS['egw']->framework->render('<p class="message" align="center">'.lang('Permission denied')."</p>\n", null, true);
 						exit();
 					}
 				}
-				$event =& $this->default_add_event();
+				$event = & $this->default_add_event();
 			}
 			else
 			{
-				$preserv['actual_date'] = $event['start'];		// remember the date clicked
+				$preserv['actual_date'] = $event['start']; // remember the date clicked
 				if ($event['recur_type'] != MCAL_RECUR_NONE)
 				{
 					if (empty($event['whole_day']))
@@ -1478,10 +1477,10 @@ 
 						$date->setUser();
 					}
 					$event = $this->bo->read($cal_id, $date, true);
-					$preserv['actual_date'] = $event['start'];		// remember the date clicked
+					$preserv['actual_date'] = $event['start']; // remember the date clicked
 					if ($_GET['exception'])
 					{
-						$msg = $this->_create_exception($event,$preserv);
+						$msg = $this->_create_exception($event, $preserv);
 					}
 					else
 					{
@@ -1490,9 +1489,9 @@ 
 				}
 			}
 			// set new start and end if given by $_GET
-			if(isset($_GET['start'])) { $event['start'] = Api\DateTime::to($_GET['start'],'ts'); }
-			if(isset($_GET['end'])) { $event['end'] = Api\DateTime::to($_GET['end'],'ts'); }
-			if(isset($_GET['non_blocking'])) { $event['non_blocking'] = (bool)$_GET['non_blocking']; }
+			if (isset($_GET['start'])) { $event['start'] = Api\DateTime::to($_GET['start'], 'ts'); }
+			if (isset($_GET['end'])) { $event['end'] = Api\DateTime::to($_GET['end'], 'ts'); }
+			if (isset($_GET['non_blocking'])) { $event['non_blocking'] = (bool)$_GET['non_blocking']; }
 			// check if the event is the whole day
 			$start = $this->bo->date2array($event['start']);
 			$end = $this->bo->date2array($event['end']);
@@ -1502,30 +1501,30 @@ 
 			if (!$event['id'] && isset($_REQUEST['link_app']) && isset($_REQUEST['link_id']))
 			{
 				$link_ids = is_array($_REQUEST['link_id']) ? $_REQUEST['link_id'] : array($_REQUEST['link_id']);
-				foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
+				foreach (is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 				{
 					$link_id = $link_ids[$n];
-					if(!preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// guard against XSS
+					if (!preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i', $link_app.':'.$link_id))	// guard against XSS
 					{
 						continue;
 					}
-					if(!$n)
+					if (!$n)
 					{
-						$event['title'] = Link::title($link_app,$link_id);
+						$event['title'] = Link::title($link_app, $link_id);
 						// ask first linked app via "calendar_set" hook, for further data to set, incl. links
-						if (($set = Api\Hooks::single($event+array('location'=>'calendar_set','entry_id'=>$link_id),$link_app)))
+						if (($set = Api\Hooks::single($event + array('location'=>'calendar_set', 'entry_id'=>$link_id), $link_app)))
 						{
-							foreach((array)$set['link_app'] as $i => $l_app)
+							foreach ((array)$set['link_app'] as $i => $l_app)
 							{
-								if (($l_id=$set['link_id'][$i])) Link::link('calendar',$event['link_to']['to_id'],$l_app,$l_id);
+								if (($l_id = $set['link_id'][$i])) Link::link('calendar', $event['link_to']['to_id'], $l_app, $l_id);
 							}
 							unset($set['link_app']);
 							unset($set['link_id']);
 
-							$event = array_merge($event,$set);
+							$event = array_merge($event, $set);
 						}
 					}
-					Link::link('calendar',$link_to_id,$link_app,$link_id);
+					Link::link('calendar', $link_to_id, $link_app, $link_id);
 				}
 			}
 		}
@@ -1535,44 +1534,44 @@ 
 		{
 			$etpl->read($preserv['template'] = 'calendar.edit');
 		}
-		$view = $preserv['view'] = $preserv['view'] || $event['id'] && !$this->bo->check_perms(Acl::EDIT,$event);
+		$view = $preserv['view'] = $preserv['view'] || $event['id'] && !$this->bo->check_perms(Acl::EDIT, $event);
 		//echo "view=$view, event="; _debug_array($event);
 		// shared locking of entries to edit
 		if (!$view && ($locktime = $GLOBALS['egw_info']['server']['Lock_Time_Calender']) && $event['id'])
 		{
-			$lock_path = Vfs::app_entry_lock_path('calendar',$event['id']);
+			$lock_path = Vfs::app_entry_lock_path('calendar', $event['id']);
 			$lock_owner = 'mailto:'.$GLOBALS['egw_info']['user']['account_email'];
 
 			if (($preserv['lock_token'] = $event['lock_token']))		// already locked --> refresh the lock
 			{
-				Vfs::lock($lock_path,$preserv['lock_token'],$locktime,$lock_owner,$scope='shared',$type='write',true,false);
+				Vfs::lock($lock_path, $preserv['lock_token'], $locktime, $lock_owner, $scope = 'shared', $type = 'write', true, false);
 			}
 			if (($lock = Vfs::checkLock($lock_path)) && $lock['owner'] != $lock_owner)
 			{
 				$msg .= ' '.lang('This entry is currently opened by %1!',
-					(($lock_uid = $GLOBALS['egw']->accounts->name2id(substr($lock['owner'],7),'account_email')) ?
+					(($lock_uid = $GLOBALS['egw']->accounts->name2id(substr($lock['owner'], 7), 'account_email')) ?
 					Api\Accounts::username($lock_uid) : $lock['owner']));
 			}
-			elseif($lock)
+			elseif ($lock)
 			{
 				$preserv['lock_token'] = $lock['token'];
 			}
-			elseif(Vfs::lock($lock_path,$preserv['lock_token'],$locktime,$lock_owner,$scope='shared',$type='write',false,false))
+			elseif (Vfs::lock($lock_path, $preserv['lock_token'], $locktime, $lock_owner, $scope = 'shared', $type = 'write', false, false))
 			{
 				//We handle AJAX_REQUEST in client-side for unlocking the locked entry, in case of closing the entry by X button or close button
 			}
 			else
 			{
-				$msg .= ' '.lang("Can't aquire lock!");		// eg. an exclusive lock via CalDAV ...
+				$msg .= ' '.lang("Can't aquire lock!"); // eg. an exclusive lock via CalDAV ...
 				$view = true;
 			}
 		}
-		$content = array_merge($event,array(
+		$content = array_merge($event, array(
 			'link_to' => array(
 				'to_id'  => $link_to_id,
 				'to_app' => 'calendar',
 			),
-			'edit_single' => $preserv['edit_single'],	// need to be in content too, as it is used in the template
+			'edit_single' => $preserv['edit_single'], // need to be in content too, as it is used in the template
 			'tabs'   => $preserv['tabs'],
 			'view' => $view,
 			'query_delete_exceptions' => (int)($event['recur_type'] && $event['recur_exception']),
@@ -1584,11 +1583,11 @@ 
 		$row = 3;
 		$readonlys = $content['participants'] = $preserv['participants'] = array();
 		// preserve some ui elements, if set eg. under error-conditions
-		foreach(array('quantity','resource','role') as $n)
+		foreach (array('quantity', 'resource', 'role') as $n)
 		{
 			if (isset($event['participants'][$n])) $content['participants'][$n] = $event['participants'][$n];
 		}
-		foreach($event['participant_types'] as $type => $participants)
+		foreach ($event['participant_types'] as $type => $participants)
 		{
 			$name = 'accounts';
 			if (isset($this->bo->resources[$type]))
@@ -1597,17 +1596,17 @@ 
 			}
 			// sort participants (in there group/app) by title
 			uksort($participants, array($this, 'uid_title_cmp'));
-			foreach($participants as $id => $status)
+			foreach ($participants as $id => $status)
 			{
 				$uid = $type == 'u' ? $id : $type.$id;
 				$quantity = $role = null;
-				calendar_so::split_status($status,$quantity,$role);
+				calendar_so::split_status($status, $quantity, $role);
 				$preserv['participants'][$row] = $content['participants'][$row] = array(
 					'app'      => $name == 'accounts' ? ($GLOBALS['egw']->accounts->get_type($id) == 'g' ? 'Group' : 'User') : $name,
 					'uid'      => $uid,
 					'status'   => $status,
 					'old_status' => $status,
-					'quantity' => $quantity > 1 || $uid[0] == 'r' ? $quantity : '',	// only display quantity for resources or if > 1
+					'quantity' => $quantity > 1 || $uid[0] == 'r' ? $quantity : '', // only display quantity for resources or if > 1
 					'role'     => $role,
 				);
 				// replace iCal roles with a nicer label and remove regular REQ-PARTICIPANT
@@ -1616,33 +1615,33 @@ 
 					$content['participants'][$row]['role_label'] = lang($this->bo->roles[$role]);
 				}
 				// allow third party apps to use categories for roles
-				elseif(substr($role,0,6) == 'X-CAT-')
+				elseif (substr($role, 0, 6) == 'X-CAT-')
 				{
-					$content['participants'][$row]['role_label'] = $GLOBALS['egw']->categories->id2name(substr($role,6));
+					$content['participants'][$row]['role_label'] = $GLOBALS['egw']->categories->id2name(substr($role, 6));
 				}
 				else
 				{
-					$content['participants'][$row]['role_label'] = lang(str_replace('X-','',$role));
+					$content['participants'][$row]['role_label'] = lang(str_replace('X-', '', $role));
 				}
-				$content['participants'][$row]['delete_id'] = strpbrk($uid,'"\'<>') !== false ? md5($uid) : $uid;
+				$content['participants'][$row]['delete_id'] = strpbrk($uid, '"\'<>') !== false ? md5($uid) : $uid;
 				//echo "<p>$uid ($quantity): $role --> {$content['participants'][$row]['role']}</p>\n";
 
-				if (($no_status = !$this->bo->check_status_perms($uid,$event)) || $view)
+				if (($no_status = !$this->bo->check_status_perms($uid, $event)) || $view)
 					$readonlys['participants'][$row]['status'] = $no_status;
-				if ($preserv['hide_delete'] || !$this->bo->check_perms(Acl::EDIT,$event))
+				if ($preserv['hide_delete'] || !$this->bo->check_perms(Acl::EDIT, $event))
 					$readonlys['participants']['delete'][$uid] = true;
 				// todo: make the participants available as links with email as title
 				$content['participants'][$row++]['title'] = $this->get_title($uid);
 				// enumerate group-invitations, so people can accept/reject them
 				if ($name == 'accounts' && $GLOBALS['egw']->accounts->get_type($id) == 'g' &&
-					($members = $GLOBALS['egw']->accounts->members($id,true)))
+					($members = $GLOBALS['egw']->accounts->members($id, true)))
 				{
 					$sel_options['status']['G'] = lang('Select one');
 					// sort members by title
 					usort($members, array($this, 'uid_title_cmp'));
-					foreach($members as $member)
+					foreach ($members as $member)
 					{
-						if (!isset($participants[$member]) && $this->bo->check_perms(Acl::READ,0,$member))
+						if (!isset($participants[$member]) && $this->bo->check_perms(Acl::READ, 0, $member))
 						{
 							$preserv['participants'][$row] = $content['participants'][$row] = array(
 								'app'      => 'Group invitation',
@@ -1651,7 +1650,7 @@ 
 							);
 							$readonlys['participants'][$row]['quantity'] = $readonlys['participants']['delete'][$member] = true;
 							// read access is enough to invite participants, but you need edit rights to change status
-							$readonlys['participants'][$row]['status'] = !$this->bo->check_perms(Acl::EDIT,0,$member);
+							$readonlys['participants'][$row]['status'] = !$this->bo->check_perms(Acl::EDIT, 0, $member);
 							$content['participants'][$row++]['title'] = Api\Accounts::username($member);
 						}
 					}
@@ -1659,43 +1658,43 @@ 
 			}
 			// resouces / apps we shedule, atm. resources and addressbook
 			$content['participants']['cal_resources'] = '';
-			foreach($this->bo->resources as $data)
+			foreach ($this->bo->resources as $data)
 			{
-				if ($data['app'] == 'email') continue;	// make no sense, as we cant search for email
+				if ($data['app'] == 'email') continue; // make no sense, as we cant search for email
 				$content['participants']['cal_resources'] .= ','.$data['app'];
 			}
 		}
 		$content['participants']['status_date'] = $preserv['actual_date'];
-		$preserved = array_merge($preserv,$content);
+		$preserved = array_merge($preserv, $content);
 		$event['new_alarm']['options'] = $content['new_alarm']['options'];
 		if ($event['alarm'])
 		{
 			// makes keys of the alarm-array starting with 1
 			$content['alarm'] = array(false);
-			foreach(array_values($event['alarm']) as $id => $alarm)
+			foreach (array_values($event['alarm']) as $id => $alarm)
 			{
-				if (!$alarm['all'] && !$this->bo->check_perms(Acl::READ,0,$alarm['owner']))
+				if (!$alarm['all'] && !$this->bo->check_perms(Acl::READ, 0, $alarm['owner']))
 				{
-					continue;	// no read rights to the calendar of the alarm-owner, dont show the alarm
+					continue; // no read rights to the calendar of the alarm-owner, dont show the alarm
 				}
-				$alarm['all'] = (int) $alarm['all'];
+				$alarm['all'] = (int)$alarm['all'];
 				$after = false;
-				if($alarm['offset'] < 0)
+				if ($alarm['offset'] < 0)
 				{
 					$after = true;
 					$alarm['offset'] = -1 * $alarm['offset'];
 				}
-				$days = (int) ($alarm['offset'] / DAY_s);
-				$hours = (int) (($alarm['offset'] % DAY_s) / HOUR_s);
-				$minutes = (int) (($alarm['offset'] % HOUR_s) / 60);
+				$days = (int)($alarm['offset'] / DAY_s);
+				$hours = (int)(($alarm['offset'] % DAY_s) / HOUR_s);
+				$minutes = (int)(($alarm['offset'] % HOUR_s) / 60);
 				$label = array();
 				if ($days) $label[] = $days.' '.lang('days');
 				if ($hours) $label[] = $hours.' '.lang('hours');
 				if ($minutes) $label[] = $minutes.' '.lang('Minutes');
-				$alarm['offset'] = implode(', ',$label) . ' ' . ($after ? lang('after') : lang('before'));
+				$alarm['offset'] = implode(', ', $label).' '.($after ? lang('after') : lang('before'));
 				$content['alarm'][] = $alarm;
 
-				$readonlys['alarm[delete_alarm]['.$alarm['id'].']'] = !$this->bo->check_perms(Acl::EDIT,$alarm['all'] ? $event : 0,$alarm['owner']);
+				$readonlys['alarm[delete_alarm]['.$alarm['id'].']'] = !$this->bo->check_perms(Acl::EDIT, $alarm['all'] ? $event : 0, $alarm['owner']);
 			}
 			if (count($content['alarm']) == 1)
 			{
@@ -1710,20 +1709,20 @@ 
 
 		if ($view)
 		{
-			$readonlys['__ALL__'] = true;	// making everything readonly, but widgets set explicitly to false
+			$readonlys['__ALL__'] = true; // making everything readonly, but widgets set explicitly to false
 			$readonlys['button[cancel]'] = $readonlys['action'] =
 				$readonlys['before_after'] = $readonlys['button[add_alarm]'] = $readonlys['new_alarm[owner]'] =
 				$readonlys['new_alarm[options]'] = $readonlys['new_alarm[date]'] = false;
 
 			$content['participants']['no_add'] = true;
 
-			if(!$event['whole_day'])
+			if (!$event['whole_day'])
 			{
 				$etpl->setElementAttribute('whole_day', 'disabled', true);
 			}
 
 			// respect category permissions
-			if(!empty($event['category']))
+			if (!empty($event['category']))
 			{
 				$content['category'] = $this->categories->check_list(Acl::READ, $event['category']);
 			}
@@ -1734,7 +1733,7 @@ 
 
 			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$readonlys['recur_exception'] = !count($content['recur_exception']);	// otherwise we get a delete button
+				$readonlys['recur_exception'] = !count($content['recur_exception']); // otherwise we get a delete button
 				//$onclick =& $etpl->get_cell_attribute('button[delete]','onclick');
 				//$onclick = str_replace('Delete this event','Delete this series of recuring events',$onclick);
 			}
@@ -1744,9 +1743,9 @@ 
 				$readonlys['recur_interval'] = $readonlys['recur_data'] = true;
 			}
 		}
-		if($content['category'] && !is_array($content['category']))
+		if ($content['category'] && !is_array($content['category']))
 		{
-			$content['category'] = explode(',',$event['category']);
+			$content['category'] = explode(',', $event['category']);
 		}
 		// disabling the custom fields tab, if there are none
 		$readonlys['tabs'] = array(
@@ -1763,13 +1762,13 @@ 
 		{
 			$readonlys['action'] = true;
 		}
-		if (!($readonlys['button[exception]'] = !$this->bo->check_perms(Acl::EDIT,$event) || $event['recur_type'] == MCAL_RECUR_NONE || ($event['recur_enddate'] &&$event['start'] > $event['recur_enddate'])))
+		if (!($readonlys['button[exception]'] = !$this->bo->check_perms(Acl::EDIT, $event) || $event['recur_type'] == MCAL_RECUR_NONE || ($event['recur_enddate'] && $event['start'] > $event['recur_enddate'])))
 		{
 			$content['exception_label'] = $this->bo->long_date(max($preserved['actual_date'], $event['start']));
 		}
-		$readonlys['button[delete]'] = !$event['id'] || $preserved['hide_delete'] || !$this->bo->check_perms(Acl::DELETE,$event);
+		$readonlys['button[delete]'] = !$event['id'] || $preserved['hide_delete'] || !$this->bo->check_perms(Acl::DELETE, $event);
 
-		if (!$event['id'] || $this->bo->check_perms(Acl::EDIT,$event))	// new event or edit rights to the event ==> allow to add alarm for all users
+		if (!$event['id'] || $this->bo->check_perms(Acl::EDIT, $event))	// new event or edit rights to the event ==> allow to add alarm for all users
 		{
 			$sel_options['owner'][0] = lang('All participants');
 		}
@@ -1777,25 +1776,25 @@ 
 		{
 			$sel_options['owner'][$this->user] = $this->bo->participant_name($this->user);
 		}
-		foreach((array) $event['participant_types']['u'] as $uid => $status)
+		foreach ((array)$event['participant_types']['u'] as $uid => $status)
 		{
-			if ($uid != $this->user && $status != 'R' && $this->bo->check_perms(Acl::EDIT,0,$uid))
+			if ($uid != $this->user && $status != 'R' && $this->bo->check_perms(Acl::EDIT, 0, $uid))
 			{
 				$sel_options['owner'][$uid] = $this->bo->participant_name($uid);
 			}
 		}
-		$content['no_add_alarm'] = !count($sel_options['owner']);	// no rights to set any alarm
+		$content['no_add_alarm'] = !count($sel_options['owner']); // no rights to set any alarm
 		if (!$event['id'])
 		{
-			$etpl->set_cell_attribute('button[new_alarm]','type','checkbox');
+			$etpl->set_cell_attribute('button[new_alarm]', 'type', 'checkbox');
 		}
 		if ($preserved['no_popup'])
 		{
-			$etpl->set_cell_attribute('button[cancel]','onclick','');
+			$etpl->set_cell_attribute('button[cancel]', 'onclick', '');
 		}
 
 		// Allow admins to restore deleted events
-		if($GLOBALS['egw_info']['server']['calendar_delete_history'] && $event['deleted'] )
+		if ($GLOBALS['egw_info']['server']['calendar_delete_history'] && $event['deleted'])
 		{
 			$content['deleted'] = $preserved['deleted'] = null;
 			$etpl->set_cell_attribute('button[save]', 'label', 'Recover');
@@ -1807,7 +1806,7 @@ 
 		// Setup history tab
 		$this->setup_history($content, $sel_options);
 
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - '
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '
 			. (!$event['id'] ? lang('Add')
 				: ($view ? ($content['edit_single'] ? lang('View exception') : ($content['recur_type'] ? lang('View series') : lang('View')))
 					: ($content['edit_single'] ? lang('Create exception') : ($content['recur_type'] ? lang('Edit series') : lang('Edit')))));
@@ -1817,15 +1816,15 @@ 
 		if (!empty($preserved['lock_token'])) $content['lock_token'] = $preserved['lock_token'];
 
 		// non_interactive==true from $_GET calls immediate save action without displaying the edit form
-		if(isset($_GET['non_interactive']) && (bool)$_GET['non_interactive'] === true)
+		if (isset($_GET['non_interactive']) && (bool)$_GET['non_interactive'] === true)
 		{
-			unset($_GET['non_interactive']);	// prevent process_exec <--> edit loops
+			unset($_GET['non_interactive']); // prevent process_exec <--> edit loops
 			$content['button']['save'] = true;
-			$this->process_edit(array_merge($content,$preserved));
+			$this->process_edit(array_merge($content, $preserved));
 		}
 		else
 		{
-			$etpl->exec('calendar.calendar_uiforms.process_edit',$content,$sel_options,$readonlys,$preserved,$preserved['no_popup'] ? 0 : 2);
+			$etpl->exec('calendar.calendar_uiforms.process_edit', $content, $sel_options, $readonlys, $preserved, $preserved['no_popup'] ? 0 : 2);
 		}
 	}
 
@@ -1835,14 +1834,14 @@ 
 	 * @param int $id
 	 * @param string $token
 	 */
-	function ajax_unlock($id,$token)
+	function ajax_unlock($id, $token)
 	{
-		$lock_path = Vfs::app_entry_lock_path('calendar',$id);
+		$lock_path = Vfs::app_entry_lock_path('calendar', $id);
 		$lock_owner = 'mailto:'.$GLOBALS['egw_info']['user']['account_email'];
 
 		if (($lock = Vfs::checkLock($lock_path)) && $lock['owner'] == $lock_owner || $lock['token'] == $token)
 		{
-			Vfs::unlock($lock_path,$token,false);
+			Vfs::unlock($lock_path, $token, false);
 		}
 	}
 
@@ -1854,17 +1853,17 @@ 
 	 * 		are called by new mail-app; and we intend to use the stuff passed on by session
 	 * @param string $msg = null
 	 */
-	function meeting(array $event=null, $msg=null)
+	function meeting(array $event = null, $msg = null)
 	{
 		$user = $GLOBALS['egw_info']['user']['account_id'];
 		$readonlys['button[apply]'] = true;
-		$_usesession=!is_array($event);
+		$_usesession = !is_array($event);
 		//special usage if $event is array('event'=>null,'msg'=>'','useSession'=>true) we
 		//are called by new mail-app; and we intend to use the stuff passed on by session
-		if ($event == array('event'=>null,'msg'=>'','useSession'=>true))
+		if ($event == array('event'=>null, 'msg'=>'', 'useSession'=>true))
 		{
-			$event=null; // set to null
-			$_usesession=true; // trigger session read
+			$event = null; // set to null
+			$_usesession = true; // trigger session read
 		}
 		if (!is_array($event))
 		{
@@ -1893,7 +1892,7 @@ 
 
 			if (($existing_event = $this->bo->read($event['uid'])) && !$existing_event['deleted'])
 			{
-				switch(strtolower($ical_method))
+				switch (strtolower($ical_method))
 				{
 					case 'reply':
 						// first participant is the one replying (our iCal parser adds owner first!)
@@ -1947,19 +1946,19 @@ 
 			}
 			else	// event not in calendar
 			{
-				$readonlys['button[cancel]'] = true;	// no way to remove a canceled event not in calendar
+				$readonlys['button[cancel]'] = true; // no way to remove a canceled event not in calendar
 			}
 			$event['participant_types'] = array();
-			foreach($event['participants'] as $uid => $status)
+			foreach ($event['participants'] as $uid => $status)
 			{
 				$user_type = $user_id = null;
 				calendar_so::split_user($uid, $user_type, $user_id);
 				$event['participants'][$uid] = $event['participant_types'][$user_type][$user_id] =
-					$status && $status !== 'X' ? $status : 'U';	// X --> no status given --> U = unknown
+					$status && $status !== 'X' ? $status : 'U'; // X --> no status given --> U = unknown
 			}
 			//error_log(__METHOD__."(...) parsed as ".array2string($event));
 			$event['recure'] = $this->bo->recure2string($event);
-			$event['all_participants'] = implode(",\n",$this->bo->participants($event, true));
+			$event['all_participants'] = implode(",\n", $this->bo->participants($event, true));
 
 			// ignore events in the past (for recurring events check enddate!)
 			if ($this->bo->date2ts($event['start']) < $this->bo->now_su &&
@@ -1979,23 +1978,23 @@ 
 			// clear notification errors
 			notifications::errors(true);
 
-			switch($button)
+			switch ($button)
 			{
 				case 'reject':
 					if (!$event['id'])
 					{
 						// send reply to organizer
-						$this->bo->send_update(MSG_REJECTED,array('e'.$event['organizer'] => 'DCHAIR'),$event);
-						break;	// no need to store rejected event
+						$this->bo->send_update(MSG_REJECTED, array('e'.$event['organizer'] => 'DCHAIR'), $event);
+						break; // no need to store rejected event
 					}
 					// fall-through
 				case 'accept':
 				case 'tentativ':
-					$status = strtoupper($button[0]);	// A, R or T
+					$status = strtoupper($button[0]); // A, R or T
 					if (!$event['id'])
 					{
 						// if organizer is a EGroupware user, but we have no rights to organizers calendar
-						if (isset($event['owner']) && !$this->bo->check_perms(Acl::ADD,0,$event['owner']))
+						if (isset($event['owner']) && !$this->bo->check_perms(Acl::ADD, 0, $event['owner']))
 						{
 							// --> make organize a participant with role chair and current user the owner
 							$event['participant_types']['u'] = $event['participants'][$event['owner']] =
@@ -2003,7 +2002,7 @@ 
 							$event['owner'] = $this->user;
 						}
 						// store event without notifications!
-						if (($event['id'] = $this->bo->update($event, $ignore_conflicts=true, true, false, true, $msg, true)))
+						if (($event['id'] = $this->bo->update($event, $ignore_conflicts = true, true, false, true, $msg, true)))
 						{
 							$msg[] = lang('Event saved');
 						}
@@ -2041,7 +2040,7 @@ 
 		Framework::message(implode("\n", (array)$msg));
 		$readonlys['button[edit]'] = !$event['id'];
 		$event['ics_method'] = $readonlys['ics_method'] = strtolower($ical_method);
-		switch(strtolower($ical_method))
+		switch (strtolower($ical_method))
 		{
 			case 'reply':
 				$event['ics_method_label'] = lang('Reply to meeting request');
@@ -2065,37 +2064,37 @@ 
 	 * @param array $conflicts array with conflicting events, the events are not garantied to be readable by the user!
 	 * @param array $preserv data to preserv
 	 */
-	function conflicts($event,$conflicts,$preserv)
+	function conflicts($event, $conflicts, $preserv)
 	{
 		$etpl = new Etemplate('calendar.conflicts');
 		$allConflicts = array();
 
-		foreach($conflicts as $k => $conflict)
+		foreach ($conflicts as $k => $conflict)
 		{
-			$is_readable = $this->bo->check_perms(Acl::READ,$conflict);
+			$is_readable = $this->bo->check_perms(Acl::READ, $conflict);
 
 			$conflicts[$k] += array(
 				'icon_participants' => $is_readable ? (count($conflict['participants']) > 1 ? 'users' : 'single') : 'private',
-				'tooltip_participants' => $is_readable ? implode(', ',$this->bo->participants($conflict)) : '',
-				'time' => $this->bo->long_date($conflict['start'],$conflict['end'],true),
-				'conflicting_participants' => implode(",\n",$this->bo->participants(array(
-					'participants' => array_intersect_key((array)$conflict['participants'],$event['participants']),
-				),true,true)),	// show group invitations too
+				'tooltip_participants' => $is_readable ? implode(', ', $this->bo->participants($conflict)) : '',
+				'time' => $this->bo->long_date($conflict['start'], $conflict['end'], true),
+				'conflicting_participants' => implode(",\n", $this->bo->participants(array(
+					'participants' => array_intersect_key((array)$conflict['participants'], $event['participants']),
+				), true, true)), // show group invitations too
 				'icon_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? 'recur' : '',
 				'text_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? lang('Recurring event') : ' ',
 			);
-				$allConflicts += array_intersect_key((array)$conflict['participants'],$event['participants']);
+				$allConflicts += array_intersect_key((array)$conflict['participants'], $event['participants']);
 			}
 		$content = $event + array(
-			'conflicts' => array_values($conflicts),	// conflicts have id-start as key
+			'conflicts' => array_values($conflicts), // conflicts have id-start as key
 		);
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('Scheduling conflict');
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '.lang('Scheduling conflict');
 		$resources_config = Api\Config::read('resources');
 		$readonlys = array();
 
 		foreach (array_keys($allConflicts) as $pId)
 		{
-			if(substr($pId,0,1) == 'r' && $resources_config ) // resources Allow ignore conflicts
+			if (substr($pId, 0, 1) == 'r' && $resources_config) // resources Allow ignore conflicts
 			{
 
 				switch ($resources_config['ignoreconflicts'])
@@ -2115,7 +2114,7 @@ 
 				}
 			}
 		}
-		$etpl->exec('calendar.calendar_uiforms.process_edit',$content,array(),$readonlys,array_merge($event,$preserv),$preserv['no_popup'] ? 0 : 2);
+		$etpl->exec('calendar.calendar_uiforms.process_edit', $content, array(), $readonlys, array_merge($event, $preserv), $preserv['no_popup'] ? 0 : 2);
 	}
 
 	/**
@@ -2133,7 +2132,7 @@ 
 		//$response->addAlert(__METHOD__.'('.array2string($edit_content).')');
 
 		// convert start/end date-time values to timestamps
-		foreach(array('start', 'end') as $name)
+		foreach (array('start', 'end') as $name)
 		{
 			if (!empty($edit_content[$name]))
 			{
@@ -2163,7 +2162,7 @@ 
 			'recur_type'   => $edit_content['recur_type'],
 			'participants' => array(),
 		);
-		foreach($edit_content['participants'] as $key => $data)
+		foreach ($edit_content['participants'] as $key => $data)
 		{
 			if (is_numeric($key) && !$edit_content['participants']['delete'][$data['uid']] &&
 				!$edit_content['participants']['delete'][md5($data['uid'])])
@@ -2178,21 +2177,21 @@ 
 		// default search parameters
 		$content['start_time'] = $edit_content['whole_day'] ? 0 : $this->cal_prefs['workdaystarts'];
 		$content['end_time'] = $this->cal_prefs['workdayends'];
-		if ($this->cal_prefs['workdayends']*HOUR_s < $this->cal_prefs['workdaystarts']*HOUR_s+$content['duration'])
+		if ($this->cal_prefs['workdayends'] * HOUR_s < $this->cal_prefs['workdaystarts'] * HOUR_s + $content['duration'])
 		{
-			$content['end_time'] = 0;	// no end-time limit, as duration would never fit
+			$content['end_time'] = 0; // no end-time limit, as duration would never fit
 		}
 		$content['weekdays'] = MCAL_M_WEEKDAYS;
 
 		$content['search_window'] = 7 * DAY_s;
 
 		// store content in session
-		Api\Cache::setSession('calendar','freetimesearch_args_'.(int)$edit_content['id'],$content);
+		Api\Cache::setSession('calendar', 'freetimesearch_args_'.(int)$edit_content['id'], $content);
 
 		//menuaction=calendar.calendar_uiforms.freetimesearch&values2url('start,end,duration,participants,recur_type,whole_day'),ft_search,700,500
-		$link = 'calendar.calendar_uiforms.freetimesearch&cal_id='. $edit_content['id'];
+		$link = 'calendar.calendar_uiforms.freetimesearch&cal_id='.$edit_content['id'];
 
-		$response->call('app.calendar.freetime_search_popup',$link);
+		$response->call('app.calendar.freetime_search_popup', $link);
 
 		//$response->addScriptCall('egw_openWindowCentered2',$link,'ft_search',700,500);
 
@@ -2215,26 +2214,26 @@ 
 	{
 		$etpl = new Etemplate('calendar.freetimesearch');
 		$sel_options['search_window'] = array(
-			7*DAY_s		=> lang('one week'),
-			14*DAY_s	=> lang('two weeks'),
-			31*DAY_s	=> lang('one month'),
-			92*DAY_s	=> lang('three month'),
-			365*DAY_s	=> lang('one year'),
+			7 * DAY_s		=> lang('one week'),
+			14 * DAY_s	=> lang('two weeks'),
+			31 * DAY_s	=> lang('one month'),
+			92 * DAY_s	=> lang('three month'),
+			365 * DAY_s	=> lang('one year'),
 		);
 		if (!is_array($content))
 		{
 			// get content from session (and delete it immediatly)
-			$content = Api\Cache::getSession('calendar','freetimesearch_args_'.(int)$_GET['cal_id']);
-			Api\Cache::unsetSession('calendar','freetimesearch_args_'.(int)$_GET['cal_id']);
+			$content = Api\Cache::getSession('calendar', 'freetimesearch_args_'.(int)$_GET['cal_id']);
+			Api\Cache::unsetSession('calendar', 'freetimesearch_args_'.(int)$_GET['cal_id']);
 			//Since the start_time and end_time from calendar_user_preferences are numbers, not timestamp, in order to show them on date-timeonly
 			//widget we need to convert them from numbers to timestamps, only for the first time when we have template without content
 			$sTime = $content['start_time'];
 			$eTime = $content['end_time'];
-			$content['start_time'] = strtotime(((strlen($content['start_time'])<2)?("0".$content['start_time']):$content['start_time']).":00");
-			$content['end_time'] = strtotime(((strlen($content['end_time'])<2)?("0".$content['end_time']):$content['end_time']).":00");
+			$content['start_time'] = strtotime(((strlen($content['start_time']) < 2) ? ("0".$content['start_time']) : $content['start_time']).":00");
+			$content['end_time'] = strtotime(((strlen($content['end_time']) < 2) ? ("0".$content['end_time']) : $content['end_time']).":00");
 
 			// pick a searchwindow fitting the duration (search for a 10 day slot in a one week window never succeeds)
-			foreach(array_keys($sel_options['search_window']) as $window)
+			foreach (array_keys($sel_options['search_window']) as $window)
 			{
 				if ($window > $content['duration'])
 				{
@@ -2261,19 +2260,19 @@ 
 		{
 			$content['msg'] .= lang('Only the initial date of that recuring event is checked!');
 		}
-		$content['freetime'] = $this->freetime($content['participants'],$content['start'],$content['start']+$content['search_window'],$content['duration'],$content['cal_id']);
-		$content['freetime'] = $this->split_freetime_daywise($content['freetime'],$content['duration'],(is_array($content['weekdays'])?$weekds:$content['weekdays']),$sTime,$eTime,$sel_options);
+		$content['freetime'] = $this->freetime($content['participants'], $content['start'], $content['start'] + $content['search_window'], $content['duration'], $content['cal_id']);
+		$content['freetime'] = $this->split_freetime_daywise($content['freetime'], $content['duration'], (is_array($content['weekdays']) ? $weekds : $content['weekdays']), $sTime, $eTime, $sel_options);
 
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('freetime search');
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '.lang('freetime search');
 
 		$sel_options['duration'] = $this->durations;
 		if ($content['duration'] && isset($sel_options['duration'][$content['duration']])) $content['end'] = '';
 
-		$etpl->exec('calendar.calendar_uiforms.freetimesearch',$content,$sel_options,NULL,array(
+		$etpl->exec('calendar.calendar_uiforms.freetimesearch', $content, $sel_options, NULL, array(
 				'participants'	=> $content['participants'],
 				'cal_id'		=> $content['cal_id'],
 				'recur_type'	=> $content['recur_type'],
-			),2);
+			), 2);
 	}
 
 	/**
@@ -2286,15 +2285,15 @@ 
 	 * @param int $cal_id own id for existing events, to exclude them from being busy-time, default 0
 	 * @return array of free time-slots: array with start and end values
 	 */
-	function freetime($participants,$start,$end,$duration=1,$cal_id=0)
+	function freetime($participants, $start, $end, $duration = 1, $cal_id = 0)
 	{
-		if ($this->debug > 2) $this->bo->debug_message(__METHOD__.'(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5)',true,$participants,$start,$end,$duration,$cal_id);
+		if ($this->debug > 2) $this->bo->debug_message(__METHOD__.'(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5)', true, $participants, $start, $end, $duration, $cal_id);
 
 		$busy = $this->bo->search(array(
 			'start' => $start,
 			'end'	=> $end,
 			'users'	=> $participants,
-			'ignore_acl' => true,	// otherwise we get only events readable by the user
+			'ignore_acl' => true, // otherwise we get only events readable by the user
 		));
 		$busy[] = array(	// add end-of-search-date as event, to cope with empty search and get freetime til that date
 			'start'	=> $end,
@@ -2303,15 +2302,15 @@ 
 		$ft_start = $start;
 		$freetime = array();
 		$n = 0;
-		foreach($busy as $event)
+		foreach ($busy as $event)
 		{
-			if ((int)$cal_id && $event['id'] == (int)$cal_id) continue;	// ignore our own event
+			if ((int)$cal_id && $event['id'] == (int)$cal_id) continue; // ignore our own event
 
  			if ($event['non_blocking']) continue; // ignore non_blocking events
 
 			// check if from all wanted participants at least one has a not rejected status in found event
 			$non_rejected_found = false;
-			foreach($participants as $uid)
+			foreach ($participants as $uid)
 			{
 				if ($event['participants'][$uid] == 'R') continue;
 
@@ -2327,10 +2326,10 @@ 
 
 			if ($this->debug)
 			{
-				echo "<p>ft_start=".date('D d.m.Y H:i',$ft_start)."<br>\n";
+				echo "<p>ft_start=".date('D d.m.Y H:i', $ft_start)."<br>\n";
 				echo "event[title]=$event[title]<br>\n";
-				echo "event[start]=".date('D d.m.Y H:i',$event['start'])."<br>\n";
-				echo "event[end]=".date('D d.m.Y H:i',$event['end'])."<br>\n";
+				echo "event[start]=".date('D d.m.Y H:i', $event['start'])."<br>\n";
+				echo "event[end]=".date('D d.m.Y H:i', $event['end'])."<br>\n";
 			}
 			// $events ends before our actual position ==> ignore it
 			if ($event['end'] < $ft_start)
@@ -2354,11 +2353,11 @@ 
 					'start'	=> $ft_start,
 					'end'	=> $ft_end,
 				);
-				if ($this->debug > 1) echo "<p>freetime: ".date('D d.m.Y H:i',$ft_start)." - ".date('D d.m.Y H:i',$ft_end)."</p>\n";
+				if ($this->debug > 1) echo "<p>freetime: ".date('D d.m.Y H:i', $ft_start)." - ".date('D d.m.Y H:i', $ft_end)."</p>\n";
 			}
 			$ft_start = $event['end'];
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6',true,$participants,$start,$end,$duration,$cal_id,$freetime);
+		if ($this->debug > 0) $this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6', true, $participants, $start, $end, $duration, $cal_id, $freetime);
 
 		return $freetime;
 	}
@@ -2378,46 +2377,46 @@ 
 	 */
 	function split_freetime_daywise($freetime, $duration, $weekdays, $_start_time, $_end_time, &$sel_options)
 	{
-		if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(freetime=%1, duration=%2, start_time=%3, end_time=%4)',true,$freetime,$duration,$_start_time,$_end_time);
+		if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(freetime=%1, duration=%2, start_time=%3, end_time=%4)', true, $freetime, $duration, $_start_time, $_end_time);
 
 		$freetime_daywise = array();
 		if (!is_array($sel_options)) $sel_options = array();
 		$time_format = $this->common_prefs['timeformat'] == 12 ? 'h:i a' : 'H:i';
 
-		$start_time = (int) $_start_time;	// ignore leading zeros
-		$end_time   = (int) $_end_time;
+		$start_time = (int)$_start_time; // ignore leading zeros
+		$end_time   = (int)$_end_time;
 
 		// ignore the end_time, if duration would never fit
-		if (($end_time - $start_time)*HOUR_s < $duration)
+		if (($end_time - $start_time) * HOUR_s < $duration)
 		{
 			$end_time = 0;
-			if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(, duration=%2, start_time=%3,..) end_time set to 0, it never fits durationn otherwise',true,$duration,$start_time);
+			if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(, duration=%2, start_time=%3,..) end_time set to 0, it never fits durationn otherwise', true, $duration, $start_time);
 		}
 		$n = 0;
-		foreach($freetime as $ft)
+		foreach ($freetime as $ft)
 		{
 			$adaybegin = $this->bo->date2array($ft['start']);
 			$adaybegin['hour'] = $adaybegin['minute'] = $adaybegin['second'] = 0;
 			unset($adaybegin['raw']);
 			$daybegin = $this->bo->date2ts($adaybegin);
 
-			for($t = $daybegin; $t < $ft['end']; $t += DAY_s,$daybegin += DAY_s)
+			for ($t = $daybegin; $t < $ft['end']; $t += DAY_s, $daybegin += DAY_s)
 			{
-				$dow = date('w',$daybegin+DAY_s/2);	// 0=Sun, .., 6=Sat
-				$mcal_dow = pow(2,$dow);
-				if (!($weekdays & $mcal_dow))
+				$dow = date('w', $daybegin + DAY_s / 2); // 0=Sun, .., 6=Sat
+				$mcal_dow = pow(2, $dow);
+				if (!($weekdays&$mcal_dow))
 				{
 					//echo "wrong day of week $dow<br>\n";
-					continue;	// wrong day of week
+					continue; // wrong day of week
 				}
 				$start = $t < $ft['start'] ? $ft['start'] : $t;
 
-				if ($start-$daybegin < $start_time*HOUR_s)	// start earlier then start_time
+				if ($start - $daybegin < $start_time * HOUR_s)	// start earlier then start_time
 				{
-					$start = $daybegin + $start_time*HOUR_s;
+					$start = $daybegin + $start_time * HOUR_s;
 				}
 				// if end_time given use it, else the original slot's end
-				$end = $end_time ? $daybegin + $end_time*HOUR_s : $ft['end'];
+				$end = $end_time ? $daybegin + $end_time * HOUR_s : $ft['end'];
 				if ($end > $ft['end']) $end = $ft['end'];
 
 				// slot to small for duration
@@ -2431,11 +2430,11 @@ 
 					'end'	=> $end,
 				);
 				$times = array();
-				for ($s = $start; $s+$duration <= $end && $s < $daybegin+DAY_s; $s += 60*$this->cal_prefs['interval'])
+				for ($s = $start; $s + $duration <= $end && $s < $daybegin + DAY_s; $s += 60 * $this->cal_prefs['interval'])
 				{
 					$e = $s + $duration;
-					$end_date = $e-$daybegin > DAY_s ? lang(date('l',$e)).' '.date($this->common_prefs['dateformat'],$e).' ' : '';
-					$times[$s] = date($time_format,$s).' - '.$end_date.date($time_format,$e);
+					$end_date = $e - $daybegin > DAY_s ? lang(date('l', $e)).' '.date($this->common_prefs['dateformat'], $e).' ' : '';
+					$times[$s] = date($time_format, $s).' - '.$end_date.date($time_format, $e);
 				}
 				$sel_options[$n.'start'] = $times;
 			}
@@ -2450,13 +2449,13 @@ 
      * @param boolean $return_error should an error-msg be returned or a regular page with it generated (default)
      * @return string error-msg if $return_error
      */
-    function export($content=0,$return_error=false)
+    function export($content = 0, $return_error = false)
     {
 		$boical = new calendar_ical();
 		#error_log(__METHOD__.print_r($content,true));
 		if (is_numeric($cal_id = $content ? $content : $_REQUEST['cal_id']))
 		{
-			if (!($ical =& $boical->exportVCal(array($cal_id),'2.0','PUBLISH',false)))
+			if (!($ical = & $boical->exportVCal(array($cal_id), '2.0', 'PUBLISH', false)))
 			{
 				$msg = lang('Permission denied');
 
@@ -2464,20 +2463,20 @@ 
 			}
 			else
 			{
-				html::content_header('event.ics','text/calendar',bytes($ical));
+				html::content_header('event.ics', 'text/calendar', bytes($ical));
 				echo $ical;
 				common::egw_exit();
 			}
 		}
 		if (is_array($content))
 		{
-			$events =& $this->bo->search(array(
+			$events = & $this->bo->search(array(
 				'start' => $content['start'],
 				'end'   => $content['end'],
 				'enum_recuring' => false,
 				'daywise'       => false,
 				'owner'         => $this->owner,
-				'date_format'   => 'server',    // timestamp in server time for boical class
+				'date_format'   => 'server', // timestamp in server time for boical class
 			));
 			if (!$events)
 			{
@@ -2485,8 +2484,8 @@ 
 			}
 			else
 			{
-				$ical =& $boical->exportVCal($events,'2.0','PUBLISH',false);
-				html::content_header($content['file'] ? $content['file'] : 'event.ics','text/calendar',bytes($ical));
+				$ical = & $boical->exportVCal($events, '2.0', 'PUBLISH', false);
+				html::content_header($content['file'] ? $content['file'] : 'event.ics', 'text/calendar', bytes($ical));
 				echo $ical;
 				common::egw_exit();
 			}
@@ -2502,9 +2501,9 @@ 
 		}
 		$content['msg'] = $msg;
 
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Export');
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '.lang('iCal Export');
 		$etpl = new etemplate_new('calendar.export');
-		$etpl->exec('calendar.calendar_uiforms.export',$content);
+		$etpl->exec('calendar.calendar_uiforms.export', $content);
     }
 	
 	/**
@@ -2512,7 +2511,7 @@ 
 	 *
 	 * @param array $_content
 	 */
-	function cat_acl(array $_content=null)
+	function cat_acl(array $_content = null)
 	{
 		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
@@ -2524,15 +2523,15 @@ 
 			unset($_content['button']);
 			if ($button != 'cancel')	// store changed Acl
 			{
-				foreach($_content as $data)
+				foreach ($_content as $data)
 				{
 					if (!($cat_id = $data['cat_id'])) continue;
-					foreach(array_merge((array)$data['add'],(array)$data['status'],array_keys((array)$data['old'])) as $account_id)
+					foreach (array_merge((array)$data['add'], (array)$data['status'], array_keys((array)$data['old'])) as $account_id)
 					{
 						$rights = 0;
-						if (in_array($account_id,(array)$data['add'])) $rights |= calendar_boupdate::CAT_ACL_ADD;
-						if (in_array($account_id,(array)$data['status'])) $rights |= calendar_boupdate::CAT_ACL_STATUS;
-						if ($account_id) $this->bo->set_cat_rights($cat_id,$account_id,$rights);
+						if (in_array($account_id, (array)$data['add'])) $rights |= calendar_boupdate::CAT_ACL_ADD;
+						if (in_array($account_id, (array)$data['status'])) $rights |= calendar_boupdate::CAT_ACL_STATUS;
+						if ($account_id) $this->bo->set_cat_rights($cat_id, $account_id, $rights);
 					}
 				}
 			}
@@ -2544,20 +2543,20 @@ 
 				), 'admin');
 			}
 		}
-		$content= $preserv = array();
+		$content = $preserv = array();
 		$n = 1;
-		foreach($this->bo->get_cat_rights() as $Lcat_id => $data)
+		foreach ($this->bo->get_cat_rights() as $Lcat_id => $data)
 		{
-			$cat_id = substr($Lcat_id,1);
+			$cat_id = substr($Lcat_id, 1);
 			$row = array(
 				'cat_id' => $cat_id,
 				'add' => array(),
 				'status' => array(),
 			);
-			foreach($data as $account_id => $rights)
+			foreach ($data as $account_id => $rights)
 			{
-				if ($rights & calendar_boupdate::CAT_ACL_ADD) $row['add'][] = $account_id;
-				if ($rights & calendar_boupdate::CAT_ACL_STATUS) $row['status'][] = $account_id;
+				if ($rights&calendar_boupdate::CAT_ACL_ADD) $row['add'][] = $account_id;
+				if ($rights&calendar_boupdate::CAT_ACL_STATUS) $row['status'][] = $account_id;
 			}
 			$content[$n] = $row;
 			$preserv[$n] = array(
@@ -2573,7 +2572,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Calendar').' - '.lang('Category ACL');
 		$tmp = new Etemplate('calendar.cat_acl');
 		$GLOBALS['egw_info']['flags']['nonavbar'] = 1;
-		$tmp->exec('calendar.calendar_uiforms.cat_acl',$content,null,$readonlys,$preserv);
+		$tmp->exec('calendar.calendar_uiforms.cat_acl', $content, null, $readonlys, $preserv);
 	}
 
 	/**
@@ -2623,18 +2622,18 @@ 
 
 
 		// Get participants for only this one, if it's recurring.  The date is on the end of the value.
-		if($content['recur_type'] || $content['recurrence'])
+		if ($content['recur_type'] || $content['recurrence'])
 		{
 			$content['history']['filter'] = array(
 				'(history_status NOT LIKE \'participants%\' OR (history_status LIKE \'participants%\' AND (
-					history_new_value LIKE \'%' . Api\Storage\Tracking::ONE2N_SEPERATOR . $content['recurrence'] . '\' OR
-					history_old_value LIKE \'%' . Api\Storage\Tracking::ONE2N_SEPERATOR . $content['recurrence'] . '\')))'
+					history_new_value LIKE \'%' . Api\Storage\Tracking::ONE2N_SEPERATOR.$content['recurrence'].'\' OR
+					history_old_value LIKE \'%' . Api\Storage\Tracking::ONE2N_SEPERATOR.$content['recurrence'].'\')))'
 			);
 		}
 
 		// Translate labels
 		$tracking = new calendar_tracking();
-		foreach($tracking->field2label as $field => $label)
+		foreach ($tracking->field2label as $field => $label)
 		{
 			$sel_options[$status][$field] = lang($label);
 		}
@@ -2653,44 +2652,44 @@ 
 	 *	which particular instance was dragged
 	 * @return string XML response if no error occurs
 	 */
-	function ajax_moveEvent($_eventId,$calendarOwner,$targetDateTime,$targetOwner,$durationT=null,$seriesInstance=null)
+	function ajax_moveEvent($_eventId, $calendarOwner, $targetDateTime, $targetOwner, $durationT = null, $seriesInstance = null)
 	{
-		list($eventId, $date) = explode(':', $_eventId,2);
+		list($eventId, $date) = explode(':', $_eventId, 2);
 		$ignore_conflicts = false;
 
 		// we do not allow dragging into another users calendar ATM
-		if($targetOwner < 0)
+		if ($targetOwner < 0)
 		{
 			$targetOwner = array($targetOwner);
 		}
-		if($targetOwner == 0 || is_array($targetOwner) && $targetOwner[0] == 0)
+		if ($targetOwner == 0 || is_array($targetOwner) && $targetOwner[0] == 0)
 		{
 			$targetOwner = $calendarOwner;
 		}
 		// But you may be viewing multiple users, or a group calendar and
 		// dragging your event - dragging across calendars does not change owner
-		if(is_array($targetOwner) && !in_array($calendarOwner, $targetOwner))
+		if (is_array($targetOwner) && !in_array($calendarOwner, $targetOwner))
 		{
 			$return = true;
-			foreach($targetOwner as $owner)
+			foreach ($targetOwner as $owner)
 			{
-				if($owner < 0 && in_array($calendarOwner, $GLOBALS['egw']->accounts->members($owner,true)))
+				if ($owner < 0 && in_array($calendarOwner, $GLOBALS['egw']->accounts->members($owner, true)))
 				{
 					$return = false;
 					break;
 				}
-				else if ($owner > 0 && $this->bo->check_perms(Acl::EDIT, $eventId,0,'ts',$date))
+				else if ($owner > 0 && $this->bo->check_perms(Acl::EDIT, $eventId, 0, 'ts', $date))
 				{
 					$return = false;
 					break;
 				}
 			}
-			if($return) return;
+			if ($return) return;
 		}
-		$old_event=$event=$this->bo->read($eventId);
+		$old_event = $event = $this->bo->read($eventId);
 		if (!$durationT)
 		{
-			$duration=$event['end']-$event['start'];
+			$duration = $event['end'] - $event['start'];
 		}
 		// Drag a normal event to whole day non-blocking
 		else if ($durationT == 'whole_day')
@@ -2698,7 +2697,7 @@ 
 			$event['whole_day'] = true;
 			$event['non_blocking'] = true;
 			// Make duration whole days, less 1 second
-			$duration = round(($event['end']-$event['start'])/DAY_s) * DAY_s - 1;
+			$duration = round(($event['end'] - $event['start']) / DAY_s) * DAY_s - 1;
 		}
 		else
 		{
@@ -2711,18 +2710,18 @@ 
 			$d = new Api\DateTime($date, Api\DateTime::$user_timezone);
 			if (!empty($event['whole_day']))
 			{
-				$d =& $this->bo->so->startOfDay($d);
+				$d = & $this->bo->so->startOfDay($d);
 				$d->setUser();
 			}
 			$event = $this->bo->read($eventId, $d, true);
 
 			// For DnD, create an exception if they gave the date
 			$preserv = null;
-			$this->_create_exception($event,$preserv);
+			$this->_create_exception($event, $preserv);
 			unset($event['id']);
 
 			$messages = null;
-			$conflicts = $this->bo->update($event,false,true,false,true,$messages);
+			$conflicts = $this->bo->update($event, false, true, false, true, $messages);
 			if (!is_array($conflicts) && $conflicts)
 			{
 				// now we need to add the original start as recur-execption to the series
@@ -2730,28 +2729,28 @@ 
 				$recur_event['recur_exception'][] = $d->format('ts');
 				// check if we need to move the alarms, because they are next on that exception
 				$this->bo->check_move_alarms($recur_event, null, $d);
-				unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
-				unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
-				$this->bo->update($recur_event,true);	// no conflict check here
+				unset($recur_event['start']); unset($recur_event['end']); // no update necessary
+				unset($recur_event['alarm']); // unsetting alarms too, as they cant be updated without start!
+				$this->bo->update($recur_event, true); // no conflict check here
 
 				// Sending null will trigger a removal of the original for that date
 				Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$_eventId, 'data' => null));
 
 				unset($recur_event);
-				unset($event['edit_single']);			// if we further edit it, it's just a single event
+				unset($event['edit_single']); // if we further edit it, it's just a single event
 				unset($preserv['edit_single']);
 			}
 		}
 
 		$d = new Api\DateTime($targetDateTime, Api\DateTime::$user_timezone);
 		$event['start'] = $d->format('ts');
-		$event['end'] = $event['start']+$duration;
+		$event['end'] = $event['start'] + $duration;
 
 		if ($event['recur_type'] != MCAL_RECUR_NONE && !$date && $seriesInstance)
 		{
 			// calculate offset against clicked recurrance,
 			// depending on which is smaller
-			$offset = Api\DateTime::to($targetDateTime,'ts') - Api\DateTime::to($seriesInstance,'ts');
+			$offset = Api\DateTime::to($targetDateTime, 'ts') - Api\DateTime::to($seriesInstance, 'ts');
 			$event['start'] = $old_event['start'] + $offset;
 			$event['duration'] = $duration;
 
@@ -2762,34 +2761,34 @@ 
 			// Can't handle conflict.  Just ignore it.
 			$ignore_conflicts = true;
 		}
-		if(!$event['recur_type'])
+		if (!$event['recur_type'])
 		{
 			$this->bo->check_move_alarms($event, $old_event);
 		}
 
 		// Drag a whole day to a time
-		if($durationT && $durationT != 'whole_day')
+		if ($durationT && $durationT != 'whole_day')
 		{
 			$event['whole_day'] = ($duration == DAY_s);
 			$event['non_blocking'] = false;
 			// If there's a conflict, it won't save the change and the conflict popup will be blank
 			// so save the change now, and then let the conflict check happen.
 			$message = null;
-			$this->bo->update($event,true, true, false, true, $message,true);
+			$this->bo->update($event, true, true, false, true, $message, true);
 
 			// Whole day non blocking with DAY_s would add a day
-			if($duration==DAY_s) $duration=0;
+			if ($duration == DAY_s) $duration = 0;
 		}
 
 		$status_reset_to_unknown = false;
 		$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
-		foreach((array)$event['participants'] as $uid => $status)
+		foreach ((array)$event['participants'] as $uid => $status)
 		{
 			$q = $r = null;
-			calendar_so::split_status($status,$q,$r);
+			calendar_so::split_status($status, $q, $r);
 			if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
 			{
-				$preferences = CreateObject('phpgwapi.preferences',$uid);
+				$preferences = CreateObject('phpgwapi.preferences', $uid);
 				$part_prefs = $preferences->read_repository();
 				switch ($part_prefs['calendar']['reset_stati'])
 				{
@@ -2799,23 +2798,23 @@ 
 						if ($sameday) break;
 					default:
 						$status_reset_to_unknown = true;
-						$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
+						$event['participants'][$uid] = calendar_so::combine_status('U', $q, $r);
 						// todo: report reset status to user
 				}
 			}
 		}
 
 		$message = false;
-		$conflicts=$this->bo->update($event,$ignore_conflicts, true, false, true, $message);
+		$conflicts = $this->bo->update($event, $ignore_conflicts, true, false, true, $message);
 
-		$this->update_client($event['id'],$d);
+		$this->update_client($event['id'], $d);
 		$response = Api\Json\Response::get();
-		if(!is_array($conflicts) && $conflicts)
+		if (!is_array($conflicts) && $conflicts)
 		{
-			if(is_int($conflicts))
+			if (is_int($conflicts))
 			{
 				$event['id'] = $conflicts;
-				$response->call('egw.refresh', '','calendar',$event['id'],'edit');
+				$response->call('egw.refresh', '', 'calendar', $event['id'], 'edit');
 			}
 		}
 		else if ($conflicts)
@@ -2828,21 +2827,21 @@ 
 					.'&end='.$event['end']
 					.'&non_interactive=true'
 					.'&cancel_needs_refresh=true',
-				'',750,410);
+				'', 750, 410);
 		}
 		else if ($message)
 		{
-			$response->call('egw.message',  implode('<br />', $message));
+			$response->call('egw.message', implode('<br />', $message));
 		}
-		if($event['id'] != $eventId ) $this->update_client($_eventId);
+		if ($event['id'] != $eventId) $this->update_client($_eventId);
 		if ($status_reset_to_unknown)
 		{
-			foreach((array)$event['participants'] as $uid => $status)
+			foreach ((array)$event['participants'] as $uid => $status)
 			{
 				if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user)
 				{
-					calendar_so::split_status($status,$q,$r);
-					$status = calendar_so::combine_status('U',$q,$r);
+					calendar_so::split_status($status, $q, $r);
+					$status = calendar_so::combine_status('U', $q, $r);
 					$this->bo->set_status($event['id'], $uid, $status, 0, true);
 				}
 			}
@@ -2859,7 +2858,7 @@ 
 	{
 		list($eventId, $date) = explode(':', $_eventId);
 		$event = $this->bo->read($eventId);
-		if($date)
+		if ($date)
 		{
 			$d = new Api\DateTime($date, Api\DateTime::$user_timezone);
 		}
@@ -2869,29 +2868,29 @@ 
 		{
 			if (!empty($event['whole_day']))
 			{
-				$d =& $this->bo->so->startOfDay($date);
+				$d = & $this->bo->so->startOfDay($date);
 				$d->setUser();
 			}
 			$event = $this->bo->read($eventId, $d, true);
 			$date = $d->format('ts');
 		}
-		if($event['participants'][$uid])
+		if ($event['participants'][$uid])
 		{
 			$q = $r = null;
-			calendar_so::split_status($event['participants'][$uid],$q,$r);
-			$event['participants'][$uid] = $status = calendar_so::combine_status($status,$q,$r);
-			$this->bo->set_status($event['id'],$uid,$status,$date,true);
+			calendar_so::split_status($event['participants'][$uid], $q, $r);
+			$event['participants'][$uid] = $status = calendar_so::combine_status($status, $q, $r);
+			$this->bo->set_status($event['id'], $uid, $status, $date, true);
 		}
 		else
 		{
 			// Group membership
-			foreach($event['participants'] as $id => $status)
+			foreach ($event['participants'] as $id => $status)
 			{
-				if($GLOBALS['egw']->accounts->get_type($id) == 'g' && in_array($uid,$GLOBALS['egw']->accounts->members($id,true)))
+				if ($GLOBALS['egw']->accounts->get_type($id) == 'g' && in_array($uid, $GLOBALS['egw']->accounts->members($id, true)))
 				{
-					calendar_so::split_status($event['participants'][$uid],$q,$r);
-					$event['participants'][$uid] = $status = calendar_so::combine_status($status,$q,$r);
-					$this->bo->set_status($event['id'],$uid,$status,$date,true);
+					calendar_so::split_status($event['participants'][$uid], $q, $r);
+					$event['participants'][$uid] = $status = calendar_so::combine_status($status, $q, $r);
+					$this->bo->set_status($event['id'], $uid, $status, $date, true);
 					break;
 				}
 			}
@@ -2899,7 +2898,7 @@ 
 
 		// Directly update stored data.  If event is still visible, it will
 		// be notified & update itself.
-		$this->update_client($eventId,$d);
+		$this->update_client($eventId, $d);
 	}
 
 	/**
@@ -2907,8 +2906,8 @@ 
 	 */
 	public function ajax_delete($eventId)
 	{
-		list($id, $date) = explode(':',$eventId);
-		$event=$this->bo->read($id);
+		list($id, $date) = explode(':', $eventId);
+		$event = $this->bo->read($id);
 		$response = Api\Json\Response::get();
 
 		if ($this->bo->delete($event['id'], (int)$date))
@@ -2921,11 +2920,11 @@ 
 			{
 				$msg = lang('Event deleted');
 			}
-			$response->apply('egw.refresh', Array($msg,'calendar',$eventId,'delete'));
+			$response->apply('egw.refresh', Array($msg, 'calendar', $eventId, 'delete'));
 		}
 		else
 		{
-			$response->apply('egw.message', Array(lang('Error')),'error');
+			$response->apply('egw.message', Array(lang('Error')), 'error');
 		}
 	}
 
@@ -2938,11 +2937,11 @@ 
 	 */
 	public function ajax_invite($_eventId, $invite = array(), $remove = array())
 	{
-		list($eventId, $date) = explode(':', $_eventId,2);
+		list($eventId, $date) = explode(':', $_eventId, 2);
 
-		$old_event=$event=$this->bo->read($eventId);
+		$old_event = $event = $this->bo->read($eventId);
 		$event = $this->bo->read($eventId);
-		if($date)
+		if ($date)
 		{
 			$d = new Api\DateTime($date, Api\DateTime::$user_timezone);
 		}
@@ -2952,17 +2951,17 @@ 
 		{
 			if (!empty($event['whole_day']))
 			{
-				$d =& $this->bo->so->startOfDay($date);
+				$d = & $this->bo->so->startOfDay($date);
 				$d->setUser();
 			}
 			$event = $this->bo->read($eventId, $d, true);
 			// For DnD, create an exception if they gave the date
 			$preserv = null;
-			$this->_create_exception($event,$preserv);
+			$this->_create_exception($event, $preserv);
 			unset($event['id']);
 
 			$messages = null;
-			$conflicts = $this->bo->update($event,true,true,false,true,$messages);
+			$conflicts = $this->bo->update($event, true, true, false, true, $messages);
 			if (!is_array($conflicts) && $conflicts)
 			{
 				// now we need to add the original start as recur-execption to the series
@@ -2970,27 +2969,27 @@ 
 				$recur_event['recur_exception'][] = $d->format('ts');
 				// check if we need to move the alarms, because they are next on that exception
 				$this->bo->check_move_alarms($recur_event, null, $d);
-				unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
-				unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
-				$this->bo->update($recur_event,true);	// no conflict check here
+				unset($recur_event['start']); unset($recur_event['end']); // no update necessary
+				unset($recur_event['alarm']); // unsetting alarms too, as they cant be updated without start!
+				$this->bo->update($recur_event, true); // no conflict check here
 
 				// Sending null will trigger a removal of the original for that date
 				Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$_eventId, 'data' => null));
 
 				unset($recur_event);
-				unset($event['edit_single']);			// if we further edit it, it's just a single event
+				unset($event['edit_single']); // if we further edit it, it's just a single event
 				unset($preserv['edit_single']);
 			}
 		}
-		foreach($remove as $participant)
+		foreach ($remove as $participant)
 		{
 			unset($event['participants'][$participant]);
 		}
-		foreach($invite as $participant)
+		foreach ($invite as $participant)
 		{
 			$event['participants'][$participant] = 'U';
 		}
-		$conflicts=$this->bo->update($event,false, true, false, true, $message);
+		$conflicts = $this->bo->update($event, false, true, false, true, $message);
 
 		$response = Api\Json\Response::get();
 
@@ -2998,8 +2997,8 @@ 
 		{
 			// Save it anyway, was done with explicit user interaction,
 			// and if we don't we lose the invite
-			$this->bo->update($event,true);	// no conflict check here
-			$this->update_client($event['id'],$d);
+			$this->bo->update($event, true); // no conflict check here
+			$this->update_client($event['id'], $d);
 			$response->call(
 				'egw_openWindowCentered2',
 				$GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.calendar_uiforms.edit
@@ -3008,22 +3007,22 @@ 
 					.'&end='.$event['end']
 					.'&non_interactive=true'
 					.'&cancel_needs_refresh=true',
-				'',750,410);
+				'', 750, 410);
 		}
 		else if ($message)
 		{
-			$response->call('egw.message',  implode('<br />', $message));
+			$response->call('egw.message', implode('<br />', $message));
 		}
-		if($conflicts)
+		if ($conflicts)
 		{
-			$this->update_client($event['id'],$d);
-			if(is_int($conflicts))
+			$this->update_client($event['id'], $d);
+			if (is_int($conflicts))
 			{
 				$event['id'] = $conflicts;
 			}
-			if($event['id'])
+			if ($event['id'])
 			{
-				$response->call('egw.refresh', '','calendar',$event['id'],'edit');
+				$response->call('egw.refresh', '', 'calendar', $event['id'], 'edit');
 			}
 		}
 	}
@@ -3034,13 +3033,13 @@ 
 	 * @param array $mailContent = null mail content
 	 * @return  array
 	 */
-	function mail_import(array $mailContent=null)
+	function mail_import(array $mailContent = null)
 	{
 		// It would get called from compose as a popup with egw_data
 		if (!is_array($mailContent) && ($_GET['egw_data']))
 		{
 			// get raw mail data
-			Link::get_data ($_GET['egw_data']);
+			Link::get_data($_GET['egw_data']);
 			return false;
 		}
 
@@ -3050,7 +3049,7 @@ 
 			$AB = new Api\Contacts();
 			$accounts = array(0 => $GLOBALS['egw_info']['user']['account_id']);
 
-			$participants[0] = array (
+			$participants[0] = array(
 				'uid' => $GLOBALS['egw_info']['user']['account_id'],
 				'delete_id' => $GLOBALS['egw_info']['user']['account_id'],
 				'status' => 'A',
@@ -3058,23 +3057,23 @@ 
 				'app' => 'User',
 				'role' => 'REQ-PARTICIPANT'
 			);
-			foreach($mailContent['addresses'] as $address)
+			foreach ($mailContent['addresses'] as $address)
 			{
 				// Get available contacts from the email
 				$contacts = $AB->search(array(
 						'email' => $address['email'],
 						'email_home' => $address['email']
-					),'contact_id,contact_email,contact_email_home,egw_addressbook.account_id as account_id','','','',false,'OR',false,array('owner' => 0),'',false);
+					), 'contact_id,contact_email,contact_email_home,egw_addressbook.account_id as account_id', '', '', '', false, 'OR', false, array('owner' => 0), '', false);
 				if (is_array($contacts))
 				{
-					foreach($contacts as $account)
+					foreach ($contacts as $account)
 					{
 						$accounts[] = $account['account_id'];
 					}
 				}
 				else
 				{
-					$participants []= array (
+					$participants [] = array(
 						'app' => 'email',
 						'uid' => 'e'.$address['email'],
 						'status' => 'U',
@@ -3082,7 +3081,7 @@ 
 					);
 				}
 			}
-			$participants = array_merge($participants , array(
+			$participants = array_merge($participants, array(
 				"participant" => $accounts,
 				"role" => "REQ-PARTICIPANT",
 				"add" => "pressed"
@@ -3106,14 +3105,14 @@ 
 			{
 				foreach ($mailContent['attachments'] as $attachment)
 				{
-					if($attachment['egw_data'])
+					if ($attachment['egw_data'])
 					{
-						Link::link('calendar',$event['link_to']['to_id'],Link::DATA_APPNAME,  $attachment);
+						Link::link('calendar', $event['link_to']['to_id'], Link::DATA_APPNAME, $attachment);
 					}
-					else if(is_readable($attachment['tmp_name']) ||
+					else if (is_readable($attachment['tmp_name']) ||
 						(Vfs::is_readable($attachment['tmp_name']) && parse_url($attachment['tmp_name'], PHP_URL_SCHEME) === 'vfs'))
 					{
-						Link::link('calendar',$event['link_to']['to_id'],'file',  $attachment);
+						Link::link('calendar', $event['link_to']['to_id'], 'file', $attachment);
 					}
 				}
 			}

calendar/inc/class.calendar_uilist.inc.php

Doc Comments +3 added lines, -2 removed lines

@@ -539,8 +539,9 @@
 	 * @param int &$success number of succeded actions
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 events 'deleted'
-	 * @param string/array $session_name 'calendar_list'
-	 * @return boolean true if all actions succeded, false otherwise
+	 * @param string $session_name 'calendar_list'
+	 * @param null|string $msg
+	 * @return null|boolean true if all actions succeded, false otherwise
 	 */
 	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg,$skip_notification=false)
 	{

Braces +48 added lines, -13 removed lines

@@ -77,8 +77,14 @@ 
 	 */
 	function listview($_content=null,$msg='',$home=false)
 	{
-		if ($_GET['msg']) $msg .= $_GET['msg'];
-		if ($this->group_warning) $msg .= $this->group_warning;
+		if ($_GET['msg'])
+		{
+			$msg .= $_GET['msg'];
+		}
+		if ($this->group_warning)
+		{
+			$msg .= $this->group_warning;
+		}
 
 		$etpl = new Etemplate('calendar.list');
 
@@ -106,7 +112,8 @@ 
 			{
 				// Allow merge using the date range filter
 				if(strpos($_content['nm']['action'],'document') !== false &&
-					!count($_content['nm']['selected']) && !$_content['nm']['select_all']) {
+					!count($_content['nm']['selected']) && !$_content['nm']['select_all'])
+				{
 					$_content['nm']['selected'][] = $this->get_merge_range($_content['nm']);
 				}
 				if (!count($_content['nm']['selected']) && !$_content['nm']['select_all'])
@@ -165,15 +172,21 @@ 
 		{
 			$params = null;
 			parse_str(substr($json_data['request']['parameters'][0], 10), $params);	// cut off "/index.php?"
-			if (isset($params['keywords']))	// new search => set filters so every match is shown
+			if (isset($params['keywords']))
+			{
+				// new search => set filters so every match is shown
 			{
 				$this->adjust_for_search($params['keywords'], $content['nm']);
 			}
+			}
 		}
-		if (isset($_REQUEST['keywords']))	// new search => set filters so every match is shown
+		if (isset($_REQUEST['keywords']))
+		{
+			// new search => set filters so every match is shown
 		{
 			$this->adjust_for_search($_REQUEST['keywords'],$content['nm']);
 		}
+		}
 		$sel_options['filter'] = &$this->date_filters;
 
 		// Send categories for row styling - calendar uses no_cat, so they don't go automatically
@@ -264,9 +277,12 @@ 
 		$old_params = Api\Cache::getSession('calendar', 'calendar_list');
 		if (is_array($old_params))
 		{
-			if ($old_params['filter'] && $old_params['filter'] != $params['filter'])	// filter changed => order accordingly
+			if ($old_params['filter'] && $old_params['filter'] != $params['filter'])
+			{
+				// filter changed => order accordingly
 			{
 				$params['order'] = 'cal_start';
+			}
 				$params['sort'] = $params['filter'] == 'before' ? 'DESC' : 'ASC';
 			}
 			if ($old_params['search'] != $params['search'])
@@ -274,7 +290,10 @@ 
 				$this->adjust_for_search($params['search'],$params);
 			}
 		}
-		if (!$params['csv_export']) Api\Cache::setSession('calendar', 'calendar_list', $params);
+		if (!$params['csv_export'])
+		{
+			Api\Cache::setSession('calendar', 'calendar_list', $params);
+		}
 
 		// do we need to query custom fields and which
 		// Check stored preference if selectcols isn't available (ie: first call)
@@ -288,7 +307,10 @@ 
 			$cfs = array();
 			foreach($select_cols as $col)
 			{
-				if ($col[0] == '#') $cfs[] = substr($col,1);
+				if ($col[0] == '#')
+				{
+					$cfs[] = substr($col,1);
+				}
 			}
 		}
 		$search_params = array(
@@ -521,7 +543,10 @@ 
 		{
 			$rows['format'] = '64';
 		}
-		if ($this->cat_id) $rows['no_cat_id'] = true;
+		if ($this->cat_id)
+		{
+			$rows['no_cat_id'] = true;
+		}
 		if (!$GLOBALS['egw_info']['user']['apps']['projectmanager'])
 		{
 			$params['options-selectcols']['pm_id'] = false;
@@ -587,7 +612,10 @@ 
 			$this->get_rows($query,$events,$readonlys);
 			foreach($events as $key => $event)
 			{
-				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
+				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked))
+				{
+					unset($events[$key]);
+				}
 			}
 			$checked = array_values($events); // Clear keys
 		}
@@ -601,7 +629,10 @@ 
 				$ids = array();
 				foreach($checked as $id)
 				{
-					if (is_array($id)) $id = $id['id'];
+					if (is_array($id))
+					{
+						$id = $id['id'];
+					}
 					// get rid of recurrences, doublicate series and calendar-integration events
 					if (($id = (int)$id))
 					{
@@ -615,7 +646,10 @@ 
 				exit();
 
 			case 'document':
-				if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['calendar']['default_document'];
+				if (!$settings)
+				{
+					$settings = $GLOBALS['egw_info']['user']['preferences']['calendar']['default_document'];
+				}
 				$document_merge = new calendar_merge();
 				$msg = $document_merge->download($settings, $checked, '', $GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']);
 				$failed = count($checked);
@@ -802,7 +836,8 @@ 
 						$success++;
 
 						// Can't link to just one of a recurring series of events
-						if(!$recur_date || $app) {
+						if(!$recur_date || $app)
+						{
 							// Create link
 							$link_id = $app ? $app_id : $id;
 							Link::link($app ? $app : 'calendar', $link_id, 'timesheet', $timesheet_bo->data['ts_id']);

Spacing +149 added lines, -149 removed lines

@@ -39,7 +39,7 @@ 
 	 *
 	 * @var mixed
 	 */
-	var $debug=false;
+	var $debug = false;
 	/**
 	 * Filternames
 	 *
@@ -60,11 +60,11 @@ 
 	 *
 	 * @param array $set_states =null to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function __construct($set_states=null)
+	function __construct($set_states = null)
 	{
-		parent::__construct(true,$set_states);	// call the parent's constructor
+		parent::__construct(true, $set_states); // call the parent's constructor
 
-		foreach($this->date_filters as $name => $label)
+		foreach ($this->date_filters as $name => $label)
 		{
 			$this->date_filters[$name] = lang($label);
 		}
@@ -75,7 +75,7 @@ 
 	/**
 	 * Show the listview
 	 */
-	function listview($_content=null,$msg='',$home=false)
+	function listview($_content = null, $msg = '', $home = false)
 	{
 		if ($_GET['msg']) $msg .= $_GET['msg'];
 		if ($this->group_warning) $msg .= $this->group_warning;
@@ -83,7 +83,7 @@ 
 		$etpl = new Etemplate('calendar.list');
 
 		// Handle merge from sidebox
-		if($_GET['merge'])
+		if ($_GET['merge'])
 		{
 			$_content['nm']['action'] = 'document_'.$_GET['merge'];
 			$_content['nm']['select_all'] = true;
@@ -92,7 +92,7 @@ 
 		if (is_array($_content))
 		{
 			// handle a single button like actions
-			foreach(array('delete','timesheet','document') as $button)
+			foreach (array('delete', 'timesheet', 'document') as $button)
 			{
 				if ($_content['nm']['rows'][$button])
 				{
@@ -105,7 +105,7 @@ 
 			if ($_content['nm']['action'])
 			{
 				// Allow merge using the date range filter
-				if(strpos($_content['nm']['action'],'document') !== false &&
+				if (strpos($_content['nm']['action'], 'document') !== false &&
 					!count($_content['nm']['selected']) && !$_content['nm']['select_all']) {
 					$_content['nm']['selected'][] = $this->get_merge_range($_content['nm']);
 				}
@@ -116,14 +116,14 @@ 
 				else
 				{
 					$success = $failed = $action_msg = null;
-					if ($this->action($_content['nm']['action'],$_content['nm']['selected'],$_content['nm']['select_all'],
-						$success,$failed,$action_msg,'calendar_list',$msg, $_content['nm']['checkboxes']['no_notifications']))
+					if ($this->action($_content['nm']['action'], $_content['nm']['selected'], $_content['nm']['select_all'],
+						$success, $failed, $action_msg, 'calendar_list', $msg, $_content['nm']['checkboxes']['no_notifications']))
 					{
-						$msg .= lang('%1 event(s) %2',$success,$action_msg);
+						$msg .= lang('%1 event(s) %2', $success, $action_msg);
 					}
-					elseif(is_null($msg))
+					elseif (is_null($msg))
 					{
-						$msg .= lang('%1 event(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+						$msg .= lang('%1 event(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 					}
 				}
 			}
@@ -135,15 +135,15 @@ 
 		{
 			$content['nm'] = array(
 				'get_rows'        =>	'calendar.calendar_uilist.get_rows',
-	 			'filter_no_lang'  => True,	// I  set no_lang for filter (=dont translate the options)
-				'no_filter2'      => True,	// I  disable the 2. filter (params are the same as for filter)
-				'no_cat'          => True,	// I  disable the cat-selectbox
+	 			'filter_no_lang'  => True, // I  set no_lang for filter (=dont translate the options)
+				'no_filter2'      => True, // I  disable the 2. filter (params are the same as for filter)
+				'no_cat'          => True, // I  disable the cat-selectbox
 				'filter'          => 'after',
-				'order'           => 'cal_start',// IO name of the column to sort after (optional for the sortheaders)
-				'sort'            => 'ASC',// IO direction of the sort: 'ASC' or 'DESC'
+				'order'           => 'cal_start', // IO name of the column to sort after (optional for the sortheaders)
+				'sort'            => 'ASC', // IO direction of the sort: 'ASC' or 'DESC'
 				'default_cols'    => '!week,weekday,cal_title,cal_description,recure,cal_location,cal_owner,cat_id,pm_id',
 				'filter_onchange' => "app.calendar.filter_change",
-				'row_id'          => 'row_id',	// set in get rows "$event[id]:$event[recur_date]"
+				'row_id'          => 'row_id', // set in get rows "$event[id]:$event[recur_date]"
 				'row_modified'    => 'modified',
 				'favorites'       => true,
 				'placeholder_actions' => array('add')
@@ -151,7 +151,7 @@ 
 		}
 		$content['nm']['actions'] = $this->get_actions();
 
-		if (isset($_GET['filter']) && in_array($_GET['filter'],array_keys($this->date_filters)))
+		if (isset($_GET['filter']) && in_array($_GET['filter'], array_keys($this->date_filters)))
 		{
 			$content['nm']['filter'] = $_GET['filter'];
 		}
@@ -164,7 +164,7 @@ 
 			!empty($json_data['request']['parameters'][0]))
 		{
 			$params = null;
-			parse_str(substr($json_data['request']['parameters'][0], 10), $params);	// cut off "/index.php?"
+			parse_str(substr($json_data['request']['parameters'][0], 10), $params); // cut off "/index.php?"
 			if (isset($params['keywords']))	// new search => set filters so every match is shown
 			{
 				$this->adjust_for_search($params['keywords'], $content['nm']);
@@ -172,22 +172,22 @@ 
 		}
 		if (isset($_REQUEST['keywords']))	// new search => set filters so every match is shown
 		{
-			$this->adjust_for_search($_REQUEST['keywords'],$content['nm']);
+			$this->adjust_for_search($_REQUEST['keywords'], $content['nm']);
 		}
 		$sel_options['filter'] = &$this->date_filters;
 
 		// Send categories for row styling - calendar uses no_cat, so they don't go automatically
 		$sel_options['category'] = array('' => lang('all')) + Etemplate\Widget\Select::typeOptions('select-cat', ',,calendar');
 		// Prevent double encoding - widget does this on its own, but we're just grabbing the options
-		foreach($sel_options['category'] as &$label)
+		foreach ($sel_options['category'] as &$label)
 		{
-			if(!is_array($label))
+			if (!is_array($label))
 			{
-				$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
+				$label = html_entity_decode($label, ENT_NOQUOTES, 'utf-8');
 			}
-			elseif($label['label'])
+			elseif ($label['label'])
 			{
-				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
+				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES, 'utf-8');
 			}
 		}
 
@@ -195,15 +195,15 @@ 
 		if ($this->prefs['limit_des_lines'] > 0 || (string)$this->prefs['limit_des_lines'] == '')
 		{
 			$content['css'] .= '<style type="text/css">@media screen { .listDescription {  max-height: '.
-				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).	   // dono why em is not real lines
+				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).// dono why em is not real lines
 				'em; overflow: auto; }}</style>';
 		}
 
-		if($msg)
+		if ($msg)
 		{
 			Framework::message($msg);
 		}
-		$html = $etpl->exec('calendar.calendar_uilist.listview',$content,$sel_options,array(),array(),$home ? -1 : 0);
+		$html = $etpl->exec('calendar.calendar_uilist.listview', $content, $sel_options, array(), array(), $home ? -1 : 0);
 
 		// Not sure why this has to be echoed instead of appended, but that's what works.
 		//echo calendar_uiviews::edit_series();
@@ -214,7 +214,7 @@ 
 	/**
 	 * set filter for search, so that everything is shown
 	 */
-	function adjust_for_search($keywords,&$params)
+	function adjust_for_search($keywords, &$params)
 	{
 		$params['search'] = $keywords;
 		$params['start']  = 0;
@@ -240,9 +240,9 @@ 
 	 * @param array &$rows returned rows/events
 	 * @param array &$readonlys eg. to disable buttons based on Acl
 	 */
-	function get_rows(&$params,&$rows,&$readonlys)
+	function get_rows(&$params, &$rows, &$readonlys)
 	{
-		unset($readonlys);	// not used;
+		unset($readonlys); // not used;
 		//echo "uilist::get_rows() params="; _debug_array($params);
 		$this->filter = $params['filter'];
 		if ($params['filter'] == 'custom')
@@ -272,7 +272,7 @@ 
 			}
 			if ($old_params['search'] != $params['search'])
 			{
-				$this->adjust_for_search($params['search'],$params);
+				$this->adjust_for_search($params['search'], $params);
 			}
 		}
 		if (!$params['csv_export']) Api\Cache::setSession('calendar', 'calendar_list', $params);
@@ -280,23 +280,23 @@ 
 		// do we need to query custom fields and which
 		// Check stored preference if selectcols isn't available (ie: first call)
 		$select_cols = $params['selectcols'] ? $params['selectcols'] : $GLOBALS['egw_info']['user']['preferences']['calendar']['nextmatch-calendar.list.rows'];
-		if(!is_array($params['selectcols']))
+		if (!is_array($params['selectcols']))
 		{
-			$select_cols = explode(',',$select_cols);
+			$select_cols = explode(',', $select_cols);
 		}
-		if (in_array('cfs',$select_cols))
+		if (in_array('cfs', $select_cols))
 		{
 			$cfs = array();
-			foreach($select_cols as $col)
+			foreach ($select_cols as $col)
 			{
-				if ($col[0] == '#') $cfs[] = substr($col,1);
+				if ($col[0] == '#') $cfs[] = substr($col, 1);
 			}
 		}
 		$search_params = array(
 			'cat_id'  => $params['cat_id'] ? $params['cat_id'] : 0,
 			'filter'  => $this->filter,
 			'query'   => $params['search'],
-			'offset'  => (int) $params['start'],
+			'offset'  => (int)$params['start'],
 			'num_rows'=> $params['num_rows'],
 			'order'   => $params['order'] ? $params['order'].' '.$params['sort'] : 'cal_start ASC',
 			'cfs'	 => $params['csv_export'] ? array() : $cfs,
@@ -304,24 +304,24 @@ 
 		// Non-blocking events above blocking
 		$search_params['order'] .= ', cal_non_blocking DESC';
 
-		switch($this->filter)
+		switch ($this->filter)
 		{
 			case 'all':
 				break;
 			case 'before':
-				$search_params['end'] = $params['date'] ? Api\DateTime::to($params['date'],'ts') : $this->date;
-				$label = lang('Before %1',$this->bo->long_date($search_params['end']));
+				$search_params['end'] = $params['date'] ? Api\DateTime::to($params['date'], 'ts') : $this->date;
+				$label = lang('Before %1', $this->bo->long_date($search_params['end']));
 				break;
 			case 'custom':
-				$this->first = $search_params['start'] = Api\DateTime::to($params['startdate'],'ts');
-				$this->last  = $search_params['end'] = strtotime('+1 day', $this->bo->date2ts($params['enddate']))-1;
-				$label = $this->bo->long_date($this->first,$this->last);
+				$this->first = $search_params['start'] = Api\DateTime::to($params['startdate'], 'ts');
+				$this->last  = $search_params['end'] = strtotime('+1 day', $this->bo->date2ts($params['enddate'])) - 1;
+				$label = $this->bo->long_date($this->first, $this->last);
 				break;
 			case 'today':
 				$today = new Api\DateTime();
 				$today->setTime(0, 0, 0);
 				$this->first = $search_params['start'] = $today->format('ts');
-				$today->setTime(23,59,59);
+				$today->setTime(23, 59, 59);
 				$this->last  = $search_params['end'] = $today->format('ts');
 				break;
 			case 'week':
@@ -333,7 +333,7 @@ 
 				$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
 				unset($this->last['raw']);
 				$this->last = $this->bo->date2ts($this->last);
-				$this->date_filters['week'] = $label = lang('Week').' '.adodb_date('W',$this->first).': '.$this->bo->long_date($this->first,$this->last);
+				$this->date_filters['week'] = $label = lang('Week').' '.adodb_date('W', $this->first).': '.$this->bo->long_date($this->first, $this->last);
 				$search_params['start'] = $this->first;
 				$search_params['end'] = $this->last;
 				$params['startdate'] = Api\DateTime::to($this->first, Api\DateTime::ET2);
@@ -346,7 +346,7 @@ 
 				unset($this->first['raw']);
 				$this->last = $this->first;
 				$this->last['month'] += 1;
-				$this->date_filters['month'] = $label = lang(adodb_date('F',$this->bo->date2ts($params['date']))).' '.$this->first['year'];
+				$this->date_filters['month'] = $label = lang(adodb_date('F', $this->bo->date2ts($params['date']))).' '.$this->first['year'];
 				$this->first = $this->bo->date2ts($this->first);
 				$this->last = $this->bo->date2ts($this->last);
 				$this->last--;
@@ -359,29 +359,29 @@ 
 				// fall through to after given date
 			case 'after':
 			default:
-				$this->date = $params['startdate'] ? Api\DateTime::to($params['startdate'],'ts') : $this->date;
-				$label = lang('After %1',$this->bo->long_date($this->date));
+				$this->date = $params['startdate'] ? Api\DateTime::to($params['startdate'], 'ts') : $this->date;
+				$label = lang('After %1', $this->bo->long_date($this->date));
 				$search_params['start'] = $this->date;
 				break;
 		}
-		if($params['status_filter'])
+		if ($params['status_filter'])
 		{
 			$search_params['filter'] = $params['status_filter'];
 		}
 		if ($params['col_filter']['participant'])
 		{
-			$search_params['users'] = is_array($params['col_filter']['participant']) ? $params['col_filter']['participant'] : array( $params['col_filter']['participant']);
+			$search_params['users'] = is_array($params['col_filter']['participant']) ? $params['col_filter']['participant'] : array($params['col_filter']['participant']);
 		}
 		elseif (!$params['col_filter'] || !$params['col_filter']['participant'])
 		{
-			$search_params['users'] = $params['owner'] ? $params['owner'] : explode(',',$this->owner);
+			$search_params['users'] = $params['owner'] ? $params['owner'] : explode(',', $this->owner);
 		}
 		if ($params['col_filter'])
 		{
 			$col_filter = array();
-			foreach($params['col_filter'] as $name => $val)
+			foreach ($params['col_filter'] as $name => $val)
 			{
-				if (!in_array($name, array('participant','row_id')) && (string)$val !== '')
+				if (!in_array($name, array('participant', 'row_id')) && (string)$val !== '')
 				{
 					$col_filter[$name] = $val;
 				}
@@ -391,18 +391,18 @@ 
 
 		// App header is mostly taken care of on the client side, but here we update
 		// it to match changing list filters
-		if($params['view'] && $params['view'] == 'listview')
+		if ($params['view'] && $params['view'] == 'listview')
 		{
 			Api\Json\Response::get()->call('app.calendar.set_app_header',
-				(count($search_params['users']) == 1 ? $this->bo->participant_name($search_params['users'][0]).': ' : '') .
+				(count($search_params['users']) == 1 ? $this->bo->participant_name($search_params['users'][0]).': ' : '').
 				$label);
 		}
-		foreach((array) $this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event)
+		foreach ((array)$this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event)
 		{
 
 			if ($params['csv_export'])
 			{
-				$event['participants'] = implode(",\n",$this->bo->participants($event,true));
+				$event['participants'] = implode(",\n", $this->bo->participants($event, true));
 			}
 			else
 			{
@@ -410,23 +410,23 @@ 
 			}
 
 			$matches = null;
-			if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
+			if (!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i', $event['id'], $matches))
 			{
 				$app = $matches[1];
 				$app_id = $matches[2];
 				$icons = array();
-				if (($is_private = calendar_bo::integration_get_private($app,$app_id,$event)))
+				if (($is_private = calendar_bo::integration_get_private($app, $app_id, $event)))
 				{
-					$icons[] = Api\Html::image('calendar','private');
+					$icons[] = Api\Html::image('calendar', 'private');
 				}
 				else
 				{
-					$icons = calendar_uiviews::integration_get_icons($app,$app_id,$event);
+					$icons = calendar_uiviews::integration_get_icons($app, $app_id, $event);
 				}
 			}
 			else
 			{
-				$is_private = !$this->bo->check_perms(Acl::READ,$event);
+				$is_private = !$this->bo->check_perms(Acl::READ, $event);
 			}
 			if ($is_private)
 			{
@@ -437,9 +437,9 @@ 
 			$event['app_id'] = $event['id'];
 
 			// Edit link
-			if($app && $app_id)
+			if ($app && $app_id)
 			{
-				$popup = calendar_uiviews::integration_get_popup($app,$app_id);
+				$popup = calendar_uiviews::integration_get_popup($app, $app_id);
 
 				// Need to strip off 'onclick'
 				$event['edit_link'] = preg_replace('/ ?onclick="(.+)"/i', '$1', $popup);
@@ -450,18 +450,18 @@ 
 				// populate js_integration_data, if not already set
 				if (!isset($js_integration_data[$app]))
 				{
-					$js_integration_data[$app] = calendar_bo::integration_get_data($app,'edit_link');
+					$js_integration_data[$app] = calendar_bo::integration_get_data($app, 'edit_link');
 				}
 			}
 			elseif ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$event['app_id'] .= ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'],'ts');
+				$event['app_id'] .= ':'.Api\DateTime::to($event['recur_date'] ? $event['recur_date'] : $event['start'], 'ts');
 			}
 
 			// Format start and end with timezone
-			foreach(array('start','end') as $time)
+			foreach (array('start', 'end') as $time)
 			{
-				$event[$time] = Api\DateTime::to($event[$time],'Y-m-d\TH:i:s\Z');
+				$event[$time] = Api\DateTime::to($event[$time], 'Y-m-d\TH:i:s\Z');
 			}
 
 			$rows[] = $event;
@@ -471,35 +471,35 @@ 
 		// set js_calendar_integration object, to use it in app.js cal_open() function
 		$params['js_integration_data'] = json_encode($js_integration_data);
 
-		$wv=0;
-		$dv=0;
+		$wv = 0;
+		$dv = 0;
 
 		// Add in some select options
-		$users = is_array($search_params['users']) ? $search_params['users'] : explode(',',$search_params['users']);
+		$users = is_array($search_params['users']) ? $search_params['users'] : explode(',', $search_params['users']);
 
 		$this->bo->warnings['groupmembers'] = '';
-		if(($message = $this->check_owners_access($users)))
+		if (($message = $this->check_owners_access($users)))
 		{
 			Api\Json\Response::get()->error($message);
 		}
-		else if($this->bo->warnings['groupmembers'])
+		else if ($this->bo->warnings['groupmembers'])
 		{
 			Api\Json\Response::get()->error($this->bo->warnings['groupmembers']);
 		}
 		$rows['sel_options']['filter'] = $this->date_filters;
-		if($label)
+		if ($label)
 		{
 			$rows['sel_options']['filter'][$params['filter']] = $label;
 		}
-		foreach($users as $owner)
+		foreach ($users as $owner)
 		{
-			if(!is_int($owner) && $this->bo->resources[$owner[0]])
+			if (!is_int($owner) && $this->bo->resources[$owner[0]])
 			{
 				$app = $this->bo->resources[$owner[0]]['app'];
-				$_owner = substr($owner,1);
+				$_owner = substr($owner, 1);
 				// Try link first
-				$title = Link::title($app, $_owner );
-				if($title)
+				$title = Link::title($app, $_owner);
+				if ($title)
 				{
 					$rows['sel_options']['owner'][$owner] = $title;
 				}
@@ -507,15 +507,15 @@ 
 		}
 		$params['options-selectcols']['week'] = lang('Week');
 		$params['options-selectcols']['weekday'] = lang('Weekday');
-		if ((substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,4) == 'week' && strlen($this->cal_prefs['nextmatch-calendar.list.rows'])==4) || substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,5) == 'week,')
+		if ((substr($this->cal_prefs['nextmatch-calendar.list.rows'], 0, 4) == 'week' && strlen($this->cal_prefs['nextmatch-calendar.list.rows']) == 4) || substr($this->cal_prefs['nextmatch-calendar.list.rows'], 0, 5) == 'week,')
 		{
-			$rows['format'] = '32';	// prefix date with week-number
-			$wv=1;
+			$rows['format'] = '32'; // prefix date with week-number
+			$wv = 1;
 		}
-		if (!(strpos($this->cal_prefs['nextmatch-calendar.list.rows'],'weekday')===FALSE))
+		if (!(strpos($this->cal_prefs['nextmatch-calendar.list.rows'], 'weekday') === FALSE))
 		{
 			$rows['format'] = '16';
-			$dv=1;
+			$dv = 1;
 		}
 		if ($wv && $dv)
 		{
@@ -542,36 +542,36 @@ 
 	 * @param string/array $session_name 'calendar_list'
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg,$skip_notification=false)
+	function action($action, $checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg, $skip_notification = false)
 	{
 		//error_log(__METHOD__."('$action', ".array2string($checked).', all='.(int)$use_all.", ...)");
 		$success = $failed = 0;
 		$msg = null;
 
 		// Split out combined values
-		if(strpos($action, 'status') !== false)
+		if (strpos($action, 'status') !== false)
 		{
 			list($action, $status) = explode('-', $action);
 		}
 		elseif (strpos($action, '_') !== false)
 		{
-			list($action, $settings) = explode('_', $action,2);
+			list($action, $settings) = explode('_', $action, 2);
 		}
 
 		if ($use_all)
 		{
 			// get the whole selection
 			$query = is_array($session_name) ? $session_name : Api\Cache::getSession('calendar', $session_name);
-			@set_time_limit(0);				// switch off the execution time limit, as for big selections it's too small
-			$query['num_rows'] = -1;		// all
+			@set_time_limit(0); // switch off the execution time limit, as for big selections it's too small
+			$query['num_rows'] = -1; // all
 			$readonlys = null;
-			$this->get_rows($query,$checked,$readonlys,!in_array($action,array('ical','document')));	   // true = only return the id's
+			$this->get_rows($query, $checked, $readonlys, !in_array($action, array('ical', 'document'))); // true = only return the id's
 			// Get rid of any extras (rows that aren't events)
-			if(in_array($action,array('ical','document')))
+			if (in_array($action, array('ical', 'document')))
 			{
-				foreach($checked as $key => $event)
+				foreach ($checked as $key => $event)
 				{
-					if(!is_numeric($key))
+					if (!is_numeric($key))
 					{
 						unset($checked[$key]);
 					}
@@ -579,27 +579,27 @@ 
 			}
 		}
 		// for calendar integration we have to fetch all rows and unset the not selected ones, as we can not filter by id
-		elseif($action == 'document')
+		elseif ($action == 'document')
 		{
 			$query = is_array($session_name) ? $session_name : Api\Cache::getSession('calendar', $session_name);
-			@set_time_limit(0);				// switch off the execution time limit, as for big selections it's too small
+			@set_time_limit(0); // switch off the execution time limit, as for big selections it's too small
 			$events = null;
-			$this->get_rows($query,$events,$readonlys);
-			foreach($events as $key => $event)
+			$this->get_rows($query, $events, $readonlys);
+			foreach ($events as $key => $event)
 			{
-				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
+				if (!in_array($event['id'], $checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
 			}
 			$checked = array_values($events); // Clear keys
 		}
 
 		// Actions where one action is done to the group
-		switch($action)
+		switch ($action)
 		{
 			case 'ical':
 				// compile list of unique cal_id's, as iCal should contain whole series, not recurrences
 				// calendar_ical->exportVCal needs to read events again, to get them in server-time
 				$ids = array();
-				foreach($checked as $id)
+				foreach ($checked as $id)
 				{
 					if (is_array($id)) $id = $id['id'];
 					// get rid of recurrences, doublicate series and calendar-integration events
@@ -609,7 +609,7 @@ 
 					}
 				}
 				$boical = new calendar_ical();
-				$ical =& $boical->exportVCal($ids, '2.0', 'PUBLISH');
+				$ical = & $boical->exportVCal($ids, '2.0', 'PUBLISH');
 				Api\Header\Content::type('event.ics', 'text/calendar', bytes($ical));
 				echo $ical;
 				exit();
@@ -624,19 +624,19 @@ 
 		}
 
 		// Actions where the action is applied to each entry
-		if(strpos($action, 'timesheet') !== false)
+		if (strpos($action, 'timesheet') !== false)
 		{
 			$timesheet_bo = new timesheet_bo();
 		}
-		foreach($checked as &$id)
+		foreach ($checked as &$id)
 		{
 			$recur_date = $app = $app_id = null;
-			if(is_array($id) && $id['id'])
+			if (is_array($id) && $id['id'])
 			{
 				$id = $id['id'];
 			}
 			$matches = null;
-			if(!(int)$id && preg_match('/^([a-z_-]+)([0-9]+)$/i',$id,$matches))
+			if (!(int)$id && preg_match('/^([a-z_-]+)([0-9]+)$/i', $id, $matches))
 			{
 				$app = $matches[1];
 				$app_id = $matches[2];
@@ -644,36 +644,36 @@ 
 			}
 			else
 			{
-				list($id,$recur_date) = explode(':',$id);
+				list($id, $recur_date) = explode(':', $id);
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'delete':
 					$action_msg = lang('deleted');
-					if($settings == 'series')
+					if ($settings == 'series')
 					{
 						// Delete the whole thing
 						$recur_date = 0;
 					}
-					if ($id && $this->bo->delete($id, $recur_date,false,$skip_notification))
+					if ($id && $this->bo->delete($id, $recur_date, false, $skip_notification))
 					{
 						$success++;
-						if(!$recur_date && $settings == 'series')
+						if (!$recur_date && $settings == 'series')
 						{
 							// If there are multiple events in a series selected, the next one could purge
-							foreach($checked as $key => $c_id)
+							foreach ($checked as $key => $c_id)
 							{
-								list($c_id,$recur_date) = explode(':',$c_id);
-								if($c_id == $id)
+								list($c_id, $recur_date) = explode(':', $c_id);
+								if ($c_id == $id)
 								{
 									unset($checked[$key]);
 								}
 							}
 						}
 
-						if(Api\Json\Response::isJSONResponse())
+						if (Api\Json\Response::isJSONResponse())
 						{
-							Api\Json\Response::get()->call('egw.refresh','','calendar',$id,'delete');
+							Api\Json\Response::get()->call('egw.refresh', '', 'calendar', $id, 'delete');
 						}
 					}
 					else
@@ -683,23 +683,23 @@ 
 					break;
 				case 'undelete':
 					$action_msg = lang('recovered');
-					if($settings == 'series')
+					if ($settings == 'series')
 					{
 						// unDelete the whole thing
 						$recur_date = 0;
 					}
-					if ($id && ($event = $this->bo->read($id, $recur_date)) && $this->bo->check_perms(Acl::EDIT,$id) &&
+					if ($id && ($event = $this->bo->read($id, $recur_date)) && $this->bo->check_perms(Acl::EDIT, $id) &&
 						is_array($event) && $event['deleted'])
 					{
 						$event['deleted'] = null;
-						if($this->bo->save($event))
+						if ($this->bo->save($event))
 						{
 							$success++;
 
-							if(Api\Json\Response::isJSONResponse())
+							if (Api\Json\Response::isJSONResponse())
 							{
-								Api\Json\Response::get()->call('egw.dataStoreUID','calendar::'.$id,$this->to_client($this->bo->read($id,$recur_date)));
-								Api\Json\Response::get()->call('egw.refresh','','calendar',$id,'edit');
+								Api\Json\Response::get()->call('egw.dataStoreUID', 'calendar::'.$id, $this->to_client($this->bo->read($id, $recur_date)));
+								Api\Json\Response::get()->call('egw.refresh', '', 'calendar', $id, 'edit');
 							}
 							break;
 						}
@@ -708,7 +708,7 @@ 
 					break;
 				case 'status':
 					$action_msg = lang('Status changed');
-					if($id && ($event = $this->bo->read($id, $recur_date)))
+					if ($id && ($event = $this->bo->read($id, $recur_date)))
 					{
 						$old_status = $event['participants'][$GLOBALS['egw_info']['user']['account_id']];
 						$quantity = $role = null;
@@ -717,12 +717,12 @@ 
 						{
 							//echo "<p>$uid: status changed '$data[old_status]' --> '$status<'/p>\n";
 							$new_status = calendar_so::combine_status($status, $quantity, $role);
-							if ($this->bo->set_status($event,$GLOBALS['egw_info']['user']['account_id'],$new_status,$recur_date,
-								false,true,$skip_notification))
+							if ($this->bo->set_status($event, $GLOBALS['egw_info']['user']['account_id'], $new_status, $recur_date,
+								false, true, $skip_notification))
 							{
-								if(Api\Json\Response::isJSONResponse())
+								if (Api\Json\Response::isJSONResponse())
 								{
-									Api\Json\Response::get()->call('egw.dataStoreUID','calendar::'.$id,$this->to_client($this->bo->read($id,$recur_date)));
+									Api\Json\Response::get()->call('egw.dataStoreUID', 'calendar::'.$id, $this->to_client($this->bo->read($id, $recur_date)));
 								}
 								$success++;
 								//$msg = lang('Status changed');
@@ -739,7 +739,7 @@ 
 					}
 					break;
 				case 'timesheet-add':
-					if($id && !$app)
+					if ($id && !$app)
 					{
 						$event = $this->bo->read($id, $recur_date);
 					}
@@ -751,7 +751,7 @@ 
 						$result = $this->bo->search($query);
 						$event = $result[$app.$app_id];
 					}
-					if(!$event)
+					if (!$event)
 					{
 						$failed++;
 						continue;
@@ -768,16 +768,16 @@ 
 					);
 
 					// Add global categories
-					$categories = explode(',',$event['category']);
+					$categories = explode(',', $event['category']);
 					$global_categories = array();
-					foreach($categories as $cat_id)
+					foreach ($categories as $cat_id)
 					{
-						if($GLOBALS['egw']->categories->is_global($cat_id))
+						if ($GLOBALS['egw']->categories->is_global($cat_id))
 						{
 							$global_categories[] = $cat_id;
 						}
 					}
-					if(count($global_categories))
+					if (count($global_categories))
 					{
 						$timesheet['cat_id'] = implode(',', $global_categories);
 					}
@@ -797,12 +797,12 @@ 
 						}
 					}
 
-					if(!$err)
+					if (!$err)
 					{
 						$success++;
 
 						// Can't link to just one of a recurring series of events
-						if(!$recur_date || $app) {
+						if (!$recur_date || $app) {
 							// Create link
 							$link_id = $app ? $app_id : $id;
 							Link::link($app ? $app : 'calendar', $link_id, 'timesheet', $timesheet_bo->data['ts_id']);
@@ -830,7 +830,7 @@ 
 	protected function get_merge_range($nm)
 	{
 		$checked = array();
-		if($nm['filter'] == 'fixed')
+		if ($nm['filter'] == 'fixed')
 		{
 			$checked['start'] = $nm['startdate'];
 			$last = $this->bo->date2array($nm['enddate']);
@@ -839,7 +839,7 @@ 
 		}
 		else
 		{
-			switch($nm['filter'])
+			switch ($nm['filter'])
 			{
 				case 'after':
 					$checked['start'] = $nm['startdate'] ? $nm['startdate'] : strtotime('today');
@@ -852,8 +852,8 @@ 
 					$checked['end'] = $nm['enddate'];
 					break;
 				default:
-					$date = date_create_from_format('Ymd',$this->date);
-					$checked['start']= $date->format('U');
+					$date = date_create_from_format('Ymd', $this->date);
+					$checked['start'] = $date->format('U');
 			}
 		}
 		return $checked;
@@ -878,7 +878,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=calendar.calendar_uiforms.edit&cal_id=$id',
 				'popup' => Link::get_registry('calendar', 'view_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'onExecute' => 'javaScript:app.calendar.cal_open',
 				'disableClass' => 'rowNoView',
 			),
@@ -903,7 +903,7 @@ 
 				'group' => $group,
 			),
 		);
-		$status = array_map('lang',$this->bo->verbose_status);
+		$status = array_map('lang', $this->bo->verbose_status);
 		unset($status['G']);
 		$actions['status'] = array(
 			'caption' => 'Change your status',
@@ -912,7 +912,7 @@ 
 			'children' => $status,
 			'group' => ++$group,
 		);
-		++$group;	// integration with other apps: infolog, calendar, filemanager
+		++$group; // integration with other apps: infolog, calendar, filemanager
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
 			$actions['filemanager'] = array(
@@ -944,7 +944,7 @@ 
 				'url' => 'menuaction=timesheet.timesheet_ui.edit&link_app[]=$app&link_id[]=$id',
 				'group' => $group,
 				'allowOnMultiple' => false,
-				'hideOnDisabled' => true,	// show only one timesheet action in context menu
+				'hideOnDisabled' => true, // show only one timesheet action in context menu
 				'onExecute' => 'javaScript:app.calendar.cal_fix_app_id',
 				'popup' => Link::get_registry('timesheet', 'add_popup'),
 			);
@@ -953,7 +953,7 @@ 
 				'caption' => 'Timesheet',
 				'group' => $group,
 				'allowOnMultiple' => 'only',
-				'hideOnDisabled' => true,	// show only one timesheet action in context menu
+				'hideOnDisabled' => true, // show only one timesheet action in context menu
 			);
 		}
 		$actions['ical'] = array(
@@ -962,11 +962,11 @@ 
 			'group' => ++$group,
 			'hint' => 'Download this event as iCal',
 			'disableClass' => 'rowNoView',
-			'postSubmit' => true,	// download needs post submit (not Ajax) to work
+			'postSubmit' => true, // download needs post submit (not Ajax) to work
 		);
 		$actions['documents'] = calendar_merge::document_action(
 			$this->bo->cal_prefs['document_dir'], ++$group, 'Insert in document', 'document_',
-			$this->bo->cal_prefs['default_document'],Api\Storage\Merge::getExportLimit('calendar')
+			$this->bo->cal_prefs['default_document'], Api\Storage\Merge::getExportLimit('calendar')
 		);
 		++$group;
 		$actions['delete'] = array(
@@ -976,7 +976,7 @@ 
 			'disableClass' => 'rowNoDelete',
 		);
 		// Add in deleted for admins
-		if($GLOBALS['egw_info']['server']['calendar_delete_history'])
+		if ($GLOBALS['egw_info']['server']['calendar_delete_history'])
 		{
 			$actions['undelete'] = array(
 				'caption' => 'Un-delete',

calendar/inc/class.calendar_uiviews.inc.php

Doc Comments +8 added lines, -6 removed lines

@@ -412,7 +412,7 @@ 
 	/**
 	 * Displays the planner view
 	 *
-	 * @param boolean|Etemplate $home = false if etemplate return content suitable for home-page
+	 * @param null|Etemplate $home = false if etemplate return content suitable for home-page
 	 */
 	function &planner($content = array(), $home=false)
 	{
@@ -497,7 +497,7 @@ 
 	 * Used for home app
 	 *
 	 * @param int $weeks = 0 number of weeks to show, if 0 (default) all weeks of one month are shown
-	 * @param boolean|etemplate2 $home = false if not false return content suitable for home-page
+	 * @param null|Etemplate $home = false if not false return content suitable for home-page
 	 */
 	function &month($weeks=0,$home=false)
 	{
@@ -580,6 +580,8 @@ 
 	 * @param int &$first timestamp 0h of first day of week containing the first of the current month
 	 * @param int &$last timestamp 23:59:59 of last day of week containg the last day of the current month
 	 * @param int $day = 1 should the alignment be based on the 1. of the month or an other date, eg. the 15.
+	 * @param integer $first
+	 * @param integer $last
 	 */
 	function _week_align_month(&$first,&$last,$day=1)
 	{
@@ -604,7 +606,7 @@ 
 	 * Displays the weekview, with 5 or 7 days
 	 *
 	 * @param int $days = 0 number of days to show, if 0 (default) the value from the URL or the prefs is used
-	 * @param boolean|etemplate2 $home = false if not false return content suitable for home-page
+	 * @param null|Etemplate $home = false if not false return content suitable for home-page
 	 */
 	function week($days=0,$home=false)
 	{
@@ -740,7 +742,7 @@ 
 	/**
 	 * Query the open ToDo's via a hook from InfoLog or any other 'calendar_include_todos' provider
 	 *
-	 * @param array/string $todo_label label for the todo-box or array with 2 values: the label and a boolean show_all
+	 * @param string $todo_label label for the todo-box or array with 2 values: the label and a boolean show_all
 	 *	On return $todo_label contains the label for the todo-box
 	 * @return string/boolean Api\Html with a table of open todo's or false if no hook availible
 	 */
@@ -824,7 +826,7 @@ 
 	 * - 'edit_popup' => '400x300' (optional)
 	 *
 	 * @param string $app
-	 * @param int|string $id
+	 * @param string $id
 	 * @return string
 	 */
 	public static function integration_get_popup($app,$id)
@@ -864,7 +866,7 @@ 
 	 * Icons specified in $events['icons'] are always displayed!
 	 *
 	 * @param string $app
-	 * @param int|string $id
+	 * @param string $id
 	 * @param array $event
 	 * @return array
 	 */

Spacing +129 added lines, -130 removed lines

@@ -41,7 +41,7 @@ 
 	 *
 	 * @var mixed
 	 */
-	var $debug=false;
+	var $debug = false;
 
 	/**
 	 * extra rows above and below the workday
@@ -92,7 +92,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $use_time_grid=true;
+	var $use_time_grid = true;
 
 	/**
 	 * Pref value of use_time_grid preference
@@ -105,14 +105,14 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $scroll_to_wdstart=false;
+	var $scroll_to_wdstart = false;
 
 	/**
 	 * counter for the current whole day event of a single day
 	 *
 	 * @var int
 	 */
-	var $wholeDayPosCounter=1;
+	var $wholeDayPosCounter = 1;
 
 	/**
 	 * Switch to disable private data and possibility to view and edit events
@@ -135,25 +135,25 @@ 
 	 *
 	 * @param array $set_states = null to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function __construct($set_states=null)
+	function __construct($set_states = null)
 	{
-		parent::__construct(false,$set_states);	// call the parent's constructor
+		parent::__construct(false, $set_states); // call the parent's constructor
 		$this->extraRowsOriginal = $this->extraRows; //save original extraRows value
 
 		$GLOBALS['egw_info']['flags']['nonavbar'] = False;
 
 		// Check for GET message (from merge)
-		if($_GET['msg'])
+		if ($_GET['msg'])
 		{
 			Framework::message($_GET['msg']);
 			unset($_GET['msg']);
 		}
 		// standard params for calling bocal::search for all views
-		$this->owner = str_replace('%2C',',',$this->owner);
+		$this->owner = str_replace('%2C', ',', $this->owner);
 		$this->search_params = array(
 			'start'   => $this->date,
-			'cat_id'  => $this->cat_id ? (is_array($this->cat_id)?$this->cat_id:explode(',',$this->cat_id)) : 0,
-			'users'   => explode(',',$this->owner),
+			'cat_id'  => $this->cat_id ? (is_array($this->cat_id) ? $this->cat_id : explode(',', $this->cat_id)) : 0,
+			'users'   => explode(',', $this->owner),
 			'filter'  => $this->filter,
 			'daywise' => True,
 			'use_so_events' => $this->test === 'true',
@@ -179,7 +179,7 @@ 
 	 */
 	public function week_number($time)
 	{
-		if (!is_a($time,'DateTime')) $time = new Api\DateTime($time);
+		if (!is_a($time, 'DateTime')) $time = new Api\DateTime($time);
 
 		// if week does not start Monday and $time is Sunday --> add one day
 		if ($this->cal_prefs['weekdaystarts'] != 'Monday' && !($wday = $time->format('w')))
@@ -197,19 +197,19 @@ 
 	/**
 	 * Load all views used by calendar, client side switches between them as needed
 	 */
-	function index($content=array())
+	function index($content = array())
 	{
-		if($content['merge'])
+		if ($content['merge'])
 		{
 			// View from sidebox is JSON encoded
-			$this->manage_states(array_merge($content,json_decode($content['view'],true)));
-			if($content['first'])
+			$this->manage_states(array_merge($content, json_decode($content['view'], true)));
+			if ($content['first'])
 			{
-				$this->first = Api\DateTime::to($content['first'],'ts');
+				$this->first = Api\DateTime::to($content['first'], 'ts');
 			}
-			if($content['last'])
+			if ($content['last'])
 			{
-				$this->last = Api\DateTime::to($content['last'],'ts');
+				$this->last = Api\DateTime::to($content['last'], 'ts');
 			}
 			$_GET['merge'] = $content['merge'];
 			$this->merge();
@@ -225,7 +225,7 @@ 
 		$GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => 'ManualCalendar'.ucfirst($this->view));
 
 		// Sidebox & iframe for old views
-		if(in_array($this->view,array('year')) && $_GET['view'])
+		if (in_array($this->view, array('year')) && $_GET['view'])
 		{
 			$GLOBALS['egw_info']['flags']['nonavbar'] = true;
 			$this->manage_states($_GET);
@@ -237,24 +237,24 @@ 
 		$tmpl = new Etemplate('calendar.toolbar');
 		$tmpl->setElementAttribute('toolbar', 'actions', $this->getToolbarActions($content));
 		// Adjust toolbar for mobile
-		if(Api\Header\UserAgent::mobile()){
-			$tmpl->setElementAttribute('toolbar','class', 'et2_head_toolbar');
-			$tmpl->setElementAttribute('toolbar','view_range', '3');
+		if (Api\Header\UserAgent::mobile()) {
+			$tmpl->setElementAttribute('toolbar', 'class', 'et2_head_toolbar');
+			$tmpl->setElementAttribute('toolbar', 'view_range', '3');
 		}
-		$tmpl->exec('calendar_uiviews::index',array());
+		$tmpl->exec('calendar_uiviews::index', array());
 
 		// Load the different views once, we'll switch between them on the client side
 		$todo = new Etemplate('calendar.todo');
 		$label = '';
-		$todo->exec('calendar_uiviews::index',array('todos'=>$this->get_todos($label), 'label' => $label));
+		$todo->exec('calendar_uiviews::index', array('todos'=>$this->get_todos($label), 'label' => $label));
 
 		// Actually, this takes care of most of it...
 		$this->week();
 
 		$planner = new Etemplate('calendar.planner');
 		// Get the actions
-		$planner->setElementAttribute('planner','actions',$this->get_actions());
-		$planner->exec('calendar_uiviews::index',array());
+		$planner->setElementAttribute('planner', 'actions', $this->get_actions());
+		$planner->exec('calendar_uiviews::index', array());
 
 		// List view in a separate file
 		$list_ui = new calendar_uilist();
@@ -396,7 +396,7 @@ 
 		{
 			foreach (array_keys($actions) as $key)
 			{
-				if (!in_array($key, array('day_view','week_view','next', 'today','previous'))) {
+				if (!in_array($key, array('day_view', 'week_view', 'next', 'today', 'previous'))) {
 					$actions[$key]['toolbarDefault'] = false;
 				}
 				else {
@@ -414,7 +414,7 @@ 
 	 *
 	 * @param boolean|Etemplate $home = false if etemplate return content suitable for home-page
 	 */
-	function &planner($content = array(), $home=false)
+	function &planner($content = array(), $home = false)
 	{
 		if ($this->sortby == 'month')	// yearly planner with month rows
 		{
@@ -423,17 +423,17 @@ 
 			unset($this->first['raw']);
 			$this->last = $this->first;
 			$this->last['year']++;
-			$this->last = $this->bo->date2ts($this->last)-1;
+			$this->last = $this->bo->date2ts($this->last) - 1;
 		}
 		elseif (!$this->planner_view || $this->planner_view == 'month')	// planner monthview
 		{
 			if ($this->day < 15)	// show one complete month
 			{
-				$this->_week_align_month($this->first,$this->last);
+				$this->_week_align_month($this->first, $this->last);
 			}
 			else	// show 2 half month
 			{
-				$this->_week_align_month($this->first,$this->last,15);
+				$this->_week_align_month($this->first, $this->last, 15);
 			}
 		}
 		elseif ($this->planner_view == 'week' || $this->planner_view == 'weekN')	// weeekview
@@ -442,7 +442,7 @@ 
 			$start->setWeekstart();
 			$this->first = $start->format('ts');
 			$this->last = $this->bo->date2array($this->first);
-			$this->last['day'] += ($this->planner_view == 'week' ? 7 : 7 * $this->cal_prefs['multiple_weeks'])-1;
+			$this->last['day'] += ($this->planner_view == 'week' ? 7 : 7 * $this->cal_prefs['multiple_weeks']) - 1;
 			$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
 			unset($this->last['raw']);
 			$this->last = $this->bo->date2ts($this->last);
@@ -458,9 +458,9 @@ 
 		}
 
 		$merge = $this->merge();
-		if($merge)
+		if ($merge)
 		{
-			Egw::redirect_link('/index.php',array(
+			Egw::redirect_link('/index.php', array(
 				'menuaction' => 'calendar.calendar_uiviews.index',
 				'msg'        => $merge,
 			));
@@ -472,21 +472,21 @@ 
 		$search_params['end'] = $this->last;
 		$search_params['enum_groups'] = $this->sortby == 'user';
 		$content['planner'] = $this->bo->search($search_params);
-		foreach($content['planner'] as &$event)
+		foreach ($content['planner'] as &$event)
 		{
 			$this->to_client($event);
 		}
 
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3',False,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3', False, $this->date, $this->bo->date2string($this->first), $this->bo->date2string($this->last));
 
 		$tmpl = $home ? $home : new Etemplate('calendar.planner');
 
-		$tmpl->setElementAttribute('planner','start_date', Api\DateTime::to($this->first, Api\DateTime::ET2));
-		$tmpl->setElementAttribute('planner','end_date', Api\DateTime::to($this->last, Api\DateTime::ET2));
-		$tmpl->setElementAttribute('planner','owner', $search_params['users']);
-		$tmpl->setElementAttribute('planner','group_by', $this->sortby);
+		$tmpl->setElementAttribute('planner', 'start_date', Api\DateTime::to($this->first, Api\DateTime::ET2));
+		$tmpl->setElementAttribute('planner', 'end_date', Api\DateTime::to($this->last, Api\DateTime::ET2));
+		$tmpl->setElementAttribute('planner', 'owner', $search_params['users']);
+		$tmpl->setElementAttribute('planner', 'group_by', $this->sortby);
 		// Get the actions
-		$tmpl->setElementAttribute('planner','actions',$this->get_actions());
+		$tmpl->setElementAttribute('planner', 'actions', $this->get_actions());
 
 		$tmpl->exec(__METHOD__, $content);
 	}
@@ -499,30 +499,30 @@ 
 	 * @param int $weeks = 0 number of weeks to show, if 0 (default) all weeks of one month are shown
 	 * @param boolean|etemplate2 $home = false if not false return content suitable for home-page
 	 */
-	function &month($weeks=0,$home=false)
+	function &month($weeks = 0, $home = false)
 	{
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date);
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2', True, $weeks, $this->date);
 
 		if (!$home)
 		{
-			trigger_error(__METHOD__ .' only used by home app', E_USER_DEPRECATED);
+			trigger_error(__METHOD__.' only used by home app', E_USER_DEPRECATED);
 			return;
 		}
 
-		$this->use_time_grid = !$this->use_time_grid_pref || $this->use_time_grid_pref == 'all';	// all views
+		$this->use_time_grid = !$this->use_time_grid_pref || $this->use_time_grid_pref == 'all'; // all views
 		$granularity = 0;
-		if($weeks)
+		if ($weeks)
 		{
 			$granularity = ($this->cal_prefs['interval'] ? (int)$this->cal_prefs['interval'] : 30);
 
 			$list = $this->cal_prefs['use_time_grid'];
-			if(!is_array($list))
+			if (!is_array($list))
 			{
-				$list = explode(',',$list);
+				$list = explode(',', $list);
 			}
-			if(is_array($list))
+			if (is_array($list))
 			{
-				$granularity = in_array('weekN',$list) ? 0 : $granularity;
+				$granularity = in_array('weekN', $list) ? 0 : $granularity;
 			}
 		}
 		$content = array('view' => array());
@@ -532,23 +532,23 @@ 
 			$start = new Api\DateTime($this->date);
 			$start->setWeekstart();
 			$this->first = $start->format('ts');
-			$this->last = strtotime("+$weeks weeks",$this->first) - 1;
+			$this->last = strtotime("+$weeks weeks", $this->first) - 1;
 			$weekNavH = "$weeks weeks";
 			$navHeader = lang('Week').' '.$this->week_number($this->first).' - '.$this->week_number($this->last).': '.
-				$this->bo->long_date($this->first,$this->last);
+				$this->bo->long_date($this->first, $this->last);
 		}
 		else
 		{
-			$this->_week_align_month($this->first,$this->last);
+			$this->_week_align_month($this->first, $this->last);
 			$weekNavH = "1 month";
-			$navHeader = lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
+			$navHeader = lang(adodb_date('F', $this->bo->date2ts($this->date))).' '.$this->year;
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4',False,$weeks,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4', False, $weeks, $this->date, $this->bo->date2string($this->first), $this->bo->date2string($this->last));
 
 		// Loop through, using Api\DateTime to handle DST
 		$week = 0;
 		$week_start = new EGroupware\Api\DateTime($this->first);
-		$week_start->setTime(0,0,0);
+		$week_start->setTime(0, 0, 0);
 		$week_end = new Api\DateTime($week_start);
 		$week_end->add(new DateInterval('P6DT23H59M59S'));
 		$last = new EGroupware\Api\DateTime($this->last);
@@ -562,14 +562,14 @@ 
 			array(
 				'id' => $week_start->format('Ymd')
 			);
-			$home->setElementAttribute("view[$week]",'onchange',false);
-			$home->setElementAttribute("view[$week]",'granularity',$granularity);
-			$home->setElementAttribute("view[$week]",'show_weekend', $this->search_params['weekend']);
+			$home->setElementAttribute("view[$week]", 'onchange', false);
+			$home->setElementAttribute("view[$week]", 'granularity', $granularity);
+			$home->setElementAttribute("view[$week]", 'show_weekend', $this->search_params['weekend']);
 			$week++;
 		}
 
 		// Get the actions
-		$home->setElementAttribute('view','actions',$this->get_actions());
+		$home->setElementAttribute('view', 'actions', $this->get_actions());
 
 		$home->exec(__METHOD__, $content);
 	}
@@ -581,13 +581,13 @@ 
 	 * @param int &$last timestamp 23:59:59 of last day of week containg the last day of the current month
 	 * @param int $day = 1 should the alignment be based on the 1. of the month or an other date, eg. the 15.
 	 */
-	function _week_align_month(&$first,&$last,$day=1)
+	function _week_align_month(&$first, &$last, $day = 1)
 	{
 		$start = new Api\DateTime($this->date);
-		$start->setDate($this->year,$this->month,$this->day=$day);
+		$start->setDate($this->year, $this->month, $this->day = $day);
 		$start->setWeekstart();
 		$first = $start->format('ts');
-		$start->setDate($this->year,$this->month+1,$day);
+		$start->setDate($this->year, $this->month + 1, $day);
 		if ($day == 1) $start->add('-1day');
 		$start->setWeekstart();
 		// now we need to calculate the end of the last day of that week
@@ -596,7 +596,7 @@ 
 		$arr['day'] += 6;
 		$arr['hour'] = 23;
 		$arr['min'] = $arr['sec'] = 59;
-		unset($arr['raw']);	// otherwise date2ts does not calc raw new, but uses it
+		unset($arr['raw']); // otherwise date2ts does not calc raw new, but uses it
 		$last = $this->bo->date2ts($arr);
 	}
 
@@ -606,7 +606,7 @@ 
 	 * @param int $days = 0 number of days to show, if 0 (default) the value from the URL or the prefs is used
 	 * @param boolean|etemplate2 $home = false if not false return content suitable for home-page
 	 */
-	function week($days=0,$home=false)
+	function week($days = 0, $home = false)
 	{
 		if (!$days)
 		{
@@ -614,17 +614,17 @@ 
 			if ($days != 5) $days = 7;
 			if ($days != $this->cal_prefs['days_in_weekview'])	// save the preference
 			{
-				$GLOBALS['egw']->preferences->add('calendar','days_in_weekview',$days);
+				$GLOBALS['egw']->preferences->add('calendar', 'days_in_weekview', $days);
 				$GLOBALS['egw']->preferences->save_repository();
 				$this->cal_prefs['days_in_weekview'] = $days;
 			}
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::week(days=%1) date=%2',True,$days,$this->date);
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::week(days=%1) date=%2', True, $days, $this->date);
 
 		if ($days <= 4)		// next 4 days view
 		{
 			$wd_start = $this->first = $this->bo->date2ts($this->date);
-			$this->last = strtotime("+$days days",$this->first) - 1;
+			$this->last = strtotime("+$days days", $this->first) - 1;
 			$view = $days == 1 ? 'day' : 'day4';
 		}
 		else
@@ -634,30 +634,30 @@ 
 			$wd_start = $this->first = $start->format('ts');
 			if ($days <= 5)		// no weekend-days
 			{
-				switch($this->cal_prefs['weekdaystarts'])
+				switch ($this->cal_prefs['weekdaystarts'])
 				{
 					case 'Saturday':
-						$this->first = strtotime("+2 days",$this->first);
+						$this->first = strtotime("+2 days", $this->first);
 						break;
 					case 'Sunday':
-						$this->first = strtotime("+1 day",$this->first);
+						$this->first = strtotime("+1 day", $this->first);
 						break;
 				}
 			}
-			$this->last = strtotime("+$days days",$this->first) - 1;
+			$this->last = strtotime("+$days days", $this->first) - 1;
 			$view = 'week';
 		}
 
 		$granularity = ($this->cal_prefs['interval'] ? (int)$this->cal_prefs['interval'] : 30);
 
 		$list = $this->cal_prefs['use_time_grid'];
-		if(!is_array($list))
+		if (!is_array($list))
 		{
-			$list = explode(',',$list);
+			$list = explode(',', $list);
 		}
-		if(is_array($list))
+		if (is_array($list))
 		{
-			$granularity = in_array($view,$list) ? 0 : $granularity;
+			$granularity = in_array($view, $list) ? 0 : $granularity;
 		}
 
 		$search_params = array(
@@ -670,15 +670,15 @@ 
 
 		$content = array('view' => array());
 
-		if(!$home)
+		if (!$home)
 		{
 			// Fill with the minimum needed 'weeks'
 			$min = max(
 				6, // Some months need 6 weeks for full display
-				$this->cal_prefs['multiple_weeks'],  // WeekN view
+				$this->cal_prefs['multiple_weeks'], // WeekN view
 				$this->cal_prefs['week_consolidate'] // We collapse after this many users
 			);
-			for($i = 0; $i < $min; $i++)
+			for ($i = 0; $i < $min; $i++)
 			{
 				$content['view'][] = array();
 			}
@@ -686,8 +686,8 @@ 
 		else
 		{
 			// Always do 7 days for a week so scrolling works properly
-			$this->last = ($days == 4 ? $this->last : $search_params['end'] = strtotime("+$days days",$this->first) - 1);
-			if (count($users) == 1 || count($users) >= $this->cal_prefs['week_consolidate']	||// for more then X users, show all in one row
+			$this->last = ($days == 4 ? $this->last : $search_params['end'] = strtotime("+$days days", $this->first) - 1);
+			if (count($users) == 1 || count($users) >= $this->cal_prefs['week_consolidate'] || // for more then X users, show all in one row
 				$days == 1 // Showing just 1 day
 			)
 			{
@@ -696,7 +696,7 @@ 
 			}
 			else
 			{
-				foreach(array_keys($this->_get_planner_users(false)) as $uid)
+				foreach (array_keys($this->_get_planner_users(false)) as $uid)
 				{
 					$search_params['users'] = $uid;
 					$content['view'][] = $this->tagWholeDayOnTop($this->bo->search($search_params))
@@ -704,15 +704,15 @@ 
 				}
 			}
 		}
-		$tmpl = $home ? $home :new Etemplate('calendar.view');
-		foreach(array_keys($content['view']) as $index)
+		$tmpl = $home ? $home : new Etemplate('calendar.view');
+		foreach (array_keys($content['view']) as $index)
 		{
-			$tmpl->setElementAttribute("view[$index]",'granularity',$granularity);
-			$tmpl->setElementAttribute("view[$index]",'show_weekend',$this->search_params['weekend']);
+			$tmpl->setElementAttribute("view[$index]", 'granularity', $granularity);
+			$tmpl->setElementAttribute("view[$index]", 'show_weekend', $this->search_params['weekend']);
 		}
 
 		// Get the actions
-		$tmpl->setElementAttribute('view','actions',$this->get_actions());
+		$tmpl->setElementAttribute('view', 'actions', $this->get_actions());
 
 		$tmpl->exec(__METHOD__, $content);
 	}
@@ -754,57 +754,56 @@ 
 			'owner'     => $this->owner	// num. id of the user, not necessary current user
 		));
 
-		if(is_array($todo_label))
+		if (is_array($todo_label))
 		{
-			list($label,$showall)=$todo_label;
+			list($label, $showall) = $todo_label;
 		}
 		else
 		{
-			$label=$todo_label;
-			$showall=true;
+			$label = $todo_label;
+			$showall = true;
 		}
 		$maxshow = (int)$GLOBALS['egw_info']['user']['preferences']['infolog']['mainscreen_maxshow'];
-		if($maxshow <= 0)
+		if ($maxshow <= 0)
 		{
-			$maxshow=10;
+			$maxshow = 10;
 		}
 		//print_debug("get_todos(): label=$label; showall=$showall; max=$maxshow");
 
 		$content = $todo_label = '';
 		if (is_array($todos_from_hook) && count($todos_from_hook))
 		{
-			foreach($todos_from_hook as $todos)
+			foreach ($todos_from_hook as $todos)
 			{
 				$i = 0;
 				if (is_array($todos))
 				{
 					$todo_label = !empty($label) ? $label : lang("open ToDo's:");
 
-					foreach($todos as &$todo)
+					foreach ($todos as &$todo)
 					{
-						if(!$showall && ($i++ > $maxshow))
+						if (!$showall && ($i++ > $maxshow))
 						{
 							break;
 						}
 						$icons = '';
-						foreach($todo['icons'] as $name => $alt)
+						foreach ($todo['icons'] as $name => $alt)
 						{
-							$icons .= ($icons?' ':'').Api\Html::image('infolog',$name,lang($alt),'border="0" width="15" height="15"');
+							$icons .= ($icons ? ' ' : '').Api\Html::image('infolog', $name, lang($alt), 'border="0" width="15" height="15"');
 						}
 						$todo['icons'] = $icons;
 						$class = $class == 'row_on' ? 'row_off' : 'row_on';
-						if($todo['edit']) {
+						if ($todo['edit']) {
 							$todo['edit_size'] = $todo['edit']['size'];
 							unset($todo['edit']['size']);
-							$edit_icon_href = Api\Html::a_href( $icons, $todo['edit'],'',' data-todo="app|750x590" ');
-							$edit_href = Api\Html::a_href( $todo['title'], $todo['edit'],'',' data-todo="app|750x590" ');
-							$todo['edit'] = Framework::link('/index.php',$todo['edit'],true);
+							$edit_icon_href = Api\Html::a_href($icons, $todo['edit'], '', ' data-todo="app|750x590" ');
+							$edit_href = Api\Html::a_href($todo['title'], $todo['edit'], '', ' data-todo="app|750x590" ');
+							$todo['edit'] = Framework::link('/index.php', $todo['edit'], true);
 						}
-						$icon_href = Api\Html::a_href($icons,$todo['view']);
+						$icon_href = Api\Html::a_href($icons, $todo['view']);
 						$content .= " <tr class=\"$class\">\n  <td valign=\"top\" width=\"15%\" nowrap>".
-							($this->bo->printer_friendly?$icons:($edit_icon_href ? $edit_icon_href : $icon_href)).
-							"</td>\n  <td>".($this->printer_friendly?$todo['title']:
-							$edit_href)."</td>\n </tr>\n";
+							($this->bo->printer_friendly ? $icons : ($edit_icon_href ? $edit_icon_href : $icon_href)).
+							"</td>\n  <td>".($this->printer_friendly ? $todo['title'] : $edit_href)."</td>\n </tr>\n";
 						/**
 						 * ToDo: add delete and closing action
 						 */
@@ -827,9 +826,9 @@ 
 	 * @param int|string $id
 	 * @return string
 	 */
-	public static function integration_get_popup($app,$id)
+	public static function integration_get_popup($app, $id)
 	{
-		$app_data = calendar_bo::integration_get_data($app,'edit_link');
+		$app_data = calendar_bo::integration_get_data($app, 'edit_link');
 
 		if (is_array($app_data) && isset($app_data['edit']))
 		{
@@ -839,7 +838,7 @@ 
 		}
 		else
 		{
-			$edit = Link::edit($app,$id,$popup_size);
+			$edit = Link::edit($app, $id, $popup_size);
 		}
 		if ($edit)
 		{
@@ -868,28 +867,28 @@ 
 	 * @param array $event
 	 * @return array
 	 */
-	static function integration_get_icons($app,$id,$event)
+	static function integration_get_icons($app, $id, $event)
 	{
 		$icons = array();
 		if ($event['icons'])
 		{
-			foreach(explode(',',$event['icons']) as $icon)
+			foreach (explode(',', $event['icons']) as $icon)
 			{
-				list($icon_app,$icon) = explode(':',$icon);
-				if (Api\Image::find($icon_app,$icon))
+				list($icon_app, $icon) = explode(':', $icon);
+				if (Api\Image::find($icon_app, $icon))
 				{
-					$icons[] = Api\Html::image($icon_app,$icon);
+					$icons[] = Api\Html::image($icon_app, $icon);
 				}
 			}
 		}
-		$app_data = calendar_bo::integration_get_data($app,'icons');
+		$app_data = calendar_bo::integration_get_data($app, 'icons');
 		if (is_null($app_data))
 		{
-			$icons[] = Api\Html::image($app,'navbar');	// use navbar icon
+			$icons[] = Api\Html::image($app, 'navbar'); // use navbar icon
 		}
 		elseif ($app_data)
 		{
-			$icons += (array)ExecMethod2($app_data,$id,$event);
+			$icons += (array)ExecMethod2($app_data, $id, $event);
 		}
 		return $icons;
 	}
@@ -912,20 +911,20 @@ 
 		unset($actions['select_all']);
 
 		// This disables the event actions for the grid rows (calendar weeks/owners)
-		foreach($actions as $id => &$action)
+		foreach ($actions as $id => &$action)
 		{
-			if($id=='add') continue;
-			if(!$action['enabled'])
+			if ($id == 'add') continue;
+			if (!$action['enabled'])
 			{
 				$action['enabled'] = 'javaScript:app.calendar.is_event';
 			}
 		}
 		$actions['add']['open'] = '{"app":"calendar","type":"add"}';
-		$actions['add']['onExecute'] =  'javaScript:app.calendar.action_open';
+		$actions['add']['onExecute'] = 'javaScript:app.calendar.action_open';
 		$actions['copy']['open'] = '{"app": "calendar", "type": "add", "extra": "cal_id=$id&action=copy"}';
 		$actions['copy']['onExecute'] = 'javaScript:app.calendar.action_open';
 
-		foreach($actions['status']['children'] as $id => &$status)
+		foreach ($actions['status']['children'] as $id => &$status)
 		{
 			$status = array(
 				'id' => $id,
@@ -936,7 +935,7 @@ 
 
 		if ($actions['filemanager'])
 		{
-			$actions['filemanager']['url'] = '/index.php?'. $actions['filemanager']['url'];
+			$actions['filemanager']['url'] = '/index.php?'.$actions['filemanager']['url'];
 			$actions['filemanager']['onExecute'] = 'javaScript:app.calendar.action_open';
 		}
 		if ($actions['infolog_app'])
@@ -981,26 +980,26 @@ 
 				{
 					$start = $this->bo->date2array($event['start']);
 					$end = $this->bo->date2array($event['end']);
-					if(!$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59)
+					if (!$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59)
 					{
-						if($event['non_blocking'])
+						if ($event['non_blocking'])
 						{
-							$dayEvents[$day][$num]['whole_day_on_top']=true;
-							$this->whole_day_positions[$num]=($this->rowHeight*($num+2));
+							$dayEvents[$day][$num]['whole_day_on_top'] = true;
+							$this->whole_day_positions[$num] = ($this->rowHeight * ($num + 2));
 							$extraRowsToAdd++;
 						}
 						else
 						{
-							$dayEvents[$day][$num]['whole_day']=true;
+							$dayEvents[$day][$num]['whole_day'] = true;
 						}
 					}
 					$this->to_client($dayEvents[$day][$num]);
 				}
 				// check after every day if we have to increase $this->extraRows
-				if(($this->extraRowsOriginal+$extraRowsToAdd) > $this->extraRows)
+				if (($this->extraRowsOriginal + $extraRowsToAdd) > $this->extraRows)
 				{
 					$this->remBotExtraRows = $extraRowsToAdd;
-					$this->extraRows = ($this->extraRowsOriginal+$extraRowsToAdd);
+					$this->extraRows = ($this->extraRowsOriginal + $extraRowsToAdd);
 				}
 			}
 		}

Braces +69 added lines, -21 removed lines

@@ -179,7 +179,10 @@ 
 	 */
 	public function week_number($time)
 	{
-		if (!is_a($time,'DateTime')) $time = new Api\DateTime($time);
+		if (!is_a($time,'DateTime'))
+		{
+			$time = new Api\DateTime($time);
+		}
 
 		// if week does not start Monday and $time is Sunday --> add one day
 		if ($this->cal_prefs['weekdaystarts'] != 'Monday' && !($wday = $time->format('w')))
@@ -237,7 +240,8 @@ 
 		$tmpl = new Etemplate('calendar.toolbar');
 		$tmpl->setElementAttribute('toolbar', 'actions', $this->getToolbarActions($content));
 		// Adjust toolbar for mobile
-		if(Api\Header\UserAgent::mobile()){
+		if(Api\Header\UserAgent::mobile())
+		{
 			$tmpl->setElementAttribute('toolbar','class', 'et2_head_toolbar');
 			$tmpl->setElementAttribute('toolbar','view_range', '3');
 		}
@@ -396,10 +400,12 @@ 
 		{
 			foreach (array_keys($actions) as $key)
 			{
-				if (!in_array($key, array('day_view','week_view','next', 'today','previous'))) {
+				if (!in_array($key, array('day_view','week_view','next', 'today','previous')))
+				{
 					$actions[$key]['toolbarDefault'] = false;
 				}
-				else {
+				else
+				{
 					$actions[$key]['toolbarDefault'] = true;
 				}
 			}
@@ -416,29 +422,38 @@ 
 	 */
 	function &planner($content = array(), $home=false)
 	{
-		if ($this->sortby == 'month')	// yearly planner with month rows
+		if ($this->sortby == 'month')
+		{
+			// yearly planner with month rows
 		{
 			$this->first = $this->bo->date2array($this->date);
+		}
 			$this->first['day'] = 1;
 			unset($this->first['raw']);
 			$this->last = $this->first;
 			$this->last['year']++;
 			$this->last = $this->bo->date2ts($this->last)-1;
 		}
-		elseif (!$this->planner_view || $this->planner_view == 'month')	// planner monthview
+		elseif (!$this->planner_view || $this->planner_view == 'month')
+		{
+			// planner monthview
 		{
 			if ($this->day < 15)	// show one complete month
 			{
 				$this->_week_align_month($this->first,$this->last);
+		}
 			}
 			else	// show 2 half month
 			{
 				$this->_week_align_month($this->first,$this->last,15);
 			}
 		}
-		elseif ($this->planner_view == 'week' || $this->planner_view == 'weekN')	// weeekview
+		elseif ($this->planner_view == 'week' || $this->planner_view == 'weekN')
+		{
+			// weeekview
 		{
 			$start = new Api\DateTime($this->date);
+		}
 			$start->setWeekstart();
 			$this->first = $start->format('ts');
 			$this->last = $this->bo->date2array($this->first);
@@ -477,7 +492,10 @@ 
 			$this->to_client($event);
 		}
 
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3',False,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3',False,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		}
 
 		$tmpl = $home ? $home : new Etemplate('calendar.planner');
 
@@ -501,7 +519,10 @@ 
 	 */
 	function &month($weeks=0,$home=false)
 	{
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date);
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date);
+		}
 
 		if (!$home)
 		{
@@ -543,7 +564,10 @@ 
 			$weekNavH = "1 month";
 			$navHeader = lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4',False,$weeks,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4',False,$weeks,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		}
 
 		// Loop through, using Api\DateTime to handle DST
 		$week = 0;
@@ -588,7 +612,10 @@ 
 		$start->setWeekstart();
 		$first = $start->format('ts');
 		$start->setDate($this->year,$this->month+1,$day);
-		if ($day == 1) $start->add('-1day');
+		if ($day == 1)
+		{
+			$start->add('-1day');
+		}
 		$start->setWeekstart();
 		// now we need to calculate the end of the last day of that week
 		// as simple $last += WEEK_s - 1; does NOT work, if daylight saving changes in that week!!!
@@ -611,19 +638,31 @@ 
 		if (!$days)
 		{
 			$days = isset($_GET['days']) ? $_GET['days'] : $this->cal_prefs['days_in_weekview'];
-			if ($days != 5) $days = 7;
-			if ($days != $this->cal_prefs['days_in_weekview'])	// save the preference
+			if ($days != 5)
+			{
+				$days = 7;
+			}
+			if ($days != $this->cal_prefs['days_in_weekview'])
+			{
+				// save the preference
 			{
 				$GLOBALS['egw']->preferences->add('calendar','days_in_weekview',$days);
+			}
 				$GLOBALS['egw']->preferences->save_repository();
 				$this->cal_prefs['days_in_weekview'] = $days;
 			}
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::week(days=%1) date=%2',True,$days,$this->date);
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::week(days=%1) date=%2',True,$days,$this->date);
+		}
 
-		if ($days <= 4)		// next 4 days view
+		if ($days <= 4)
+		{
+			// next 4 days view
 		{
 			$wd_start = $this->first = $this->bo->date2ts($this->date);
+		}
 			$this->last = strtotime("+$days days",$this->first) - 1;
 			$view = $days == 1 ? 'day' : 'day4';
 		}
@@ -632,12 +671,15 @@ 
 			$start = new Api\DateTime($this->date);
 			$start->setWeekstart();
 			$wd_start = $this->first = $start->format('ts');
-			if ($days <= 5)		// no weekend-days
+			if ($days <= 5)
+			{
+				// no weekend-days
 			{
 				switch($this->cal_prefs['weekdaystarts'])
 				{
 					case 'Saturday':
 						$this->first = strtotime("+2 days",$this->first);
+			}
 						break;
 					case 'Sunday':
 						$this->first = strtotime("+1 day",$this->first);
@@ -666,7 +708,10 @@ 
 			) + $this->search_params;
 
 		$users = $this->search_params['users'];
-		if (!is_array($users)) $users = array($users);
+		if (!is_array($users))
+		{
+			$users = array($users);
+		}
 
 		$content = array('view' => array());
 
@@ -689,8 +734,7 @@ 
 			$this->last = ($days == 4 ? $this->last : $search_params['end'] = strtotime("+$days days",$this->first) - 1);
 			if (count($users) == 1 || count($users) >= $this->cal_prefs['week_consolidate']	||// for more then X users, show all in one row
 				$days == 1 // Showing just 1 day
-			)
-			{
+			) {
 				$content['view'][] = (array)$this->tagWholeDayOnTop($this->bo->search($search_params)) +
 					array('owner' => $users);
 			}
@@ -793,7 +837,8 @@ 
 						}
 						$todo['icons'] = $icons;
 						$class = $class == 'row_on' ? 'row_off' : 'row_on';
-						if($todo['edit']) {
+						if($todo['edit'])
+						{
 							$todo['edit_size'] = $todo['edit']['size'];
 							unset($todo['edit']['size']);
 							$edit_icon_href = Api\Html::a_href( $icons, $todo['edit'],'',' data-todo="app|750x590" ');
@@ -914,7 +959,10 @@ 
 		// This disables the event actions for the grid rows (calendar weeks/owners)
 		foreach($actions as $id => &$action)
 		{
-			if($id=='add') continue;
+			if($id=='add')
+			{
+				continue;
+			}
 			if(!$action['enabled'])
 			{
 				$action['enabled'] = 'javaScript:app.calendar.is_event';

calendar/inc/class.calendar_zpush.inc.php

Doc Comments +4 added lines, -3 removed lines

@@ -272,7 +272,7 @@ 
 	 * @param int $truncsize
 	 * @param int $bodypreference
 	 * @param $optionbodypreference
-	 * @param bool $mimesupport
+	 * @param integer $mimesupport
 	 * @return SyncMail
 	 */
 	function GetMeetingRequest($id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
@@ -875,7 +875,7 @@ 
 	 * @param string $displayname => new folder name (to be created, or to be renamed to)
 	 * @param string $type folder type, ignored in IMAP
 	 *
-	 * @return array|boolean stat array or false on error
+	 * @return boolean stat array or false on error
 	 */
 	public function ChangeFolder($id, $oldid, $displayname, $type)
 	{
@@ -890,7 +890,7 @@ 
 	 * @param string $id of the folder to delete
 	 *
 	 * @return
-	 * @TODO check what is to be returned
+	 boolean @TODO check what is to be returned
 	 */
 	public function DeleteFolder($parentid, $id)
 	{
@@ -1578,6 +1578,7 @@ 
 	 * Unpack timezone info from Sync
 	 *
 	 * copied from backend/ics.php
+	 * @param string $data
 	 */
 	static public function _getTZFromSyncBlob($data)
 	{

Indentation +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 	 * @param int $cutoffdate =null
 	 * @param array $not_uids =null uids NOT to return for meeting requests
 	 * @return array
-  	 */
+	 */
 	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();

Spacing +176 added lines, -177 removed lines

@@ -84,19 +84,19 @@ 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
 		$cals_pref = $GLOBALS['egw_info']['user']['preferences']['activesync']['calendar-cals'];
-		$cals = $cals_pref ? explode(',',$cals_pref) : array('P');	// implicit default of 'P'
+		$cals = $cals_pref ? explode(',', $cals_pref) : array('P'); // implicit default of 'P'
 		$folderlist = array();
 
 		foreach ($this->calendar->list_cals() as $entry)
 		{
 			$account_id = $entry['grantor'];
-			if (in_array('A',$cals) || in_array($account_id,$cals) ||
-				$account_id == $GLOBALS['egw_info']['user']['account_id'] ||	// always incl. own calendar!
-				$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G',$cals))
+			if (in_array('A', $cals) || in_array($account_id, $cals) ||
+				$account_id == $GLOBALS['egw_info']['user']['account_id'] || // always incl. own calendar!
+				$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G', $cals))
 			{
 				$folderlist[] = $f = array(
-					'id'	=>	$this->backend->createID('calendar',$account_id),
-					'mod'	=>	$GLOBALS['egw']->accounts->id2name($account_id,'account_fullname'),
+					'id'	=>	$this->backend->createID('calendar', $account_id),
+					'mod'	=>	$GLOBALS['egw']->accounts->id2name($account_id, 'account_fullname'),
 					'parent'=>	'0',
 				);
 			}
@@ -120,7 +120,7 @@ 
 		$folderObj = new SyncFolder();
 		$folderObj->serverid = $id;
 		$folderObj->parentid = '0';
-		$folderObj->displayname = $GLOBALS['egw']->accounts->id2name($owner,'account_fullname');
+		$folderObj->displayname = $GLOBALS['egw']->accounts->id2name($owner, 'account_fullname');
 		if ($owner == $GLOBALS['egw_info']['user']['account_id'])
 		{
 			$folderObj->type = SYNC_FOLDER_TYPE_APPOINTMENT;
@@ -154,7 +154,7 @@ 
 
 		$stat = array(
 			'id'	 => $id,
-			'mod'	=> $GLOBALS['egw']->accounts->id2name($owner,'account_fullname'),
+			'mod'	=> $GLOBALS['egw']->accounts->id2name($owner, 'account_fullname'),
 			'parent' => '0',
 		);
 		//error_log(__METHOD__."('$id') folderObj=".array2string($stat));
@@ -178,19 +178,19 @@ 
 	 * @param array $not_uids =null uids NOT to return for meeting requests
 	 * @return array
   	 */
-	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
+	function GetMessageList($id, $cutoffdate = NULL, array $not_uids = null)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$id',$cutoffdate)");
 		$type = $user = null;
-		$this->backend->splitID($id,$type,$user);
+		$this->backend->splitID($id, $type, $user);
 
-		if (!$cutoffdate) $cutoffdate = $this->bo->now - 100*24*3600;	// default three month back -30 breaks all sync recurrences
+		if (!$cutoffdate) $cutoffdate = $this->bo->now - 100 * 24 * 3600; // default three month back -30 breaks all sync recurrences
 
 		$filter = array(
 			'users' => $user,
-			'start' => $cutoffdate,	// default one month back -30 breaks all sync recurrences
+			'start' => $cutoffdate, // default one month back -30 breaks all sync recurrences
 			'enum_recuring' => false,
 			'daywise' => false,
 			'date_format' => 'server',
@@ -199,13 +199,13 @@ 
 			'filter' => $user == $GLOBALS['egw_info']['user']['account_id'] ? (is_array($not_uids) ? 'unknown' : 'default') : 'default',
 			// @todo return only etag relevant information (seems not to work ...)
 			//'cols'		=> array('egw_cal.cal_id', 'cal_start',	'recur_type', 'cal_modified', 'cal_uid', 'cal_etag'),
-			'query' => array('cal_recurrence' => 0),	// do NOT return recurrence exceptions
+			'query' => array('cal_recurrence' => 0), // do NOT return recurrence exceptions
 		);
 
 		$messagelist = array();
 		// reading events in chunks of 100, to keep memory down for huge calendars
 		$num_rows = 100;
-		for($start=0; ($events = $this->calendar->search($filter+array(
+		for ($start = 0; ($events = $this->calendar->search($filter + array(
 			'offset'   => $start,
 			'num_rows' => $num_rows,
 		))); $start += $num_rows)
@@ -240,7 +240,7 @@ 
 	 * @param int $cutoffdate =null
 	 * @return array
 	 */
-	function GetMeetingRequests(array $not_uids, $cutoffdate=NULL)
+	function GetMeetingRequests(array $not_uids, $cutoffdate = NULL)
 	{
 		unset($not_uids, $cutoffdate);
 		return array();
@@ -266,7 +266,7 @@ 
 	 */
 	function StatMeetingRequest($id)
 	{
-		$folderid = $this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']);	// users personal calendar
+		$folderid = $this->backend->createID('calendar', $GLOBALS['egw_info']['user']['account_id']); // users personal calendar
 
 		$ret = $this->StatMessage($folderid, abs($id));
 		$ret['id'] = $id;
@@ -285,9 +285,9 @@ 
 	 * @param bool $mimesupport
 	 * @return SyncMail
 	 */
-	function GetMeetingRequest($id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
+	function GetMeetingRequest($id, $truncsize, $bodypreference = false, $optionbodypreference = false, $mimesupport = 0)
 	{
-		unset($truncsize, $optionbodypreference, $mimesupport);	// not used, but required by function signature
+		unset($truncsize, $optionbodypreference, $mimesupport); // not used, but required by function signature
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -300,13 +300,13 @@ 
 			$message = new SyncMail();
 			$message->read = false;
 			$message->subject = $event['title'];
-			$message->importance = 1;	// 0=Low, 1=Normal, 2=High
+			$message->importance = 1; // 0=Low, 1=Normal, 2=High
 			$message->datereceived = $event['created'];
 			$message->to = $message->displayto = $GLOBALS['egw_info']['user']['account_email'];
-			$message->from = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_fullname').
-				' <'.$GLOBALS['egw']->accounts->id2name($event['owner'],'account_email').'>';
+			$message->from = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_fullname').
+				' <'.$GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email').'>';
 			$message->internetcpid = 65001;
-			$message->contentclass="urn:content-classes:message";
+			$message->contentclass = "urn:content-classes:message";
 
 			$message->meetingrequest = self::meetingRequest($event);
 			$message->messageclass = "IPM.Schedule.Meeting.Request";
@@ -321,7 +321,7 @@ 
 			else
 			{
 				$message->airsyncbasebody = new SyncAirSyncBaseBody();
-				$message->airsyncbasenativebodytype=1;
+				$message->airsyncbasenativebodytype = 1;
 				$this->backend->note2messagenote($event['description'], $bodypreference, $message->airsyncbasebody);
 			}
 		}
@@ -356,12 +356,12 @@ 
 			$as_tz = self::tz2as($event['tzid']);
 			$message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz));
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			// ignore exception, simply set no timezone, as it is optional
 		}
 		// copying timestamps (they are already read in servertime, so non tz conversation)
-		foreach(array(
+		foreach (array(
 			'start' => 'starttime',
 			'end'   => 'endtime',
 			'created' => 'dtstamp',
@@ -371,10 +371,10 @@ 
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
-			++$message->endtime;	// EGw all-day-events are 1 sec shorter!
+			++$message->endtime; // EGw all-day-events are 1 sec shorter!
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'location' => 'location',
 		) as $key => $attr)
@@ -383,16 +383,16 @@ 
 		}
 		$message->organizer = $event['organizer'];
 
-		$message->sensitivity = $event['public'] ? 0 : 2;	// 0=normal, 1=personal, 2=private, 3=confidential
+		$message->sensitivity = $event['public'] ? 0 : 2; // 0=normal, 1=personal, 2=private, 3=confidential
 
 		// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
 		$message->busystatus = $event['non_blocking'] ? 0 : 2;
 
 		// ToDo: recurring events: InstanceType, RecurrenceId, Recurrences; ...
-		$message->instancetype = 0;	// 0=Single, 1=Master recurring, 2=Single recuring, 3=Exception
+		$message->instancetype = 0; // 0=Single, 1=Master recurring, 2=Single recuring, 3=Exception
 
-		$message->responserequested = 1;	//0=No, 1=Yes
-		$message->disallownewtimeproposal = 1;	//1=forbidden, 0=allowed
+		$message->responserequested = 1; //0=No, 1=Yes
+		$message->disallownewtimeproposal = 1; //1=forbidden, 0=allowed
 		//$message->messagemeetingtype;	// email2
 
 		// ToDo: alarme: Reminder
@@ -438,14 +438,14 @@ 
 			// check if event already exist (invitation of or already imported by other user)
 			if (!($event = $this->calendar->read($parsed_event['uid'], 0, false, 'server')))
 			{
-				$event = $parsed_event;	// create new event from external invitation
+				$event = $parsed_event; // create new event from external invitation
 			}
-			elseif(!isset($event['participants'][$uid]))
+			elseif (!isset($event['participants'][$uid]))
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($requestid).", $folderid, $response) current user ($uid) is NO participant of event ".array2string($event));
 				// maybe we should silently add him, as he might not have the rights to add him himself with calendar->update ...
 			}
-			elseif($event['deleted'])
+			elseif ($event['deleted'])
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($requestid).", $folderid, $response) event ($uid) deleted on server --> return false");
 				return false;
@@ -468,7 +468,7 @@ 
 		else
 		{
 			$event['participants'][$uid] = $status;
-			$ret = $this->calendar->update($event, true);	// true = ignore conflicts, as there seems no conflict handling in AS
+			$ret = $this->calendar->update($event, true); // true = ignore conflicts, as there seems no conflict handling in AS
 		}
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.'('.array2string($requestid).", '$folderid', $response) returning ".array2string($ret));
 		return $ret;
@@ -480,10 +480,10 @@ 
 	 * @var array
 	 */
 	static $status2as = array(
-		'U' => 0,	// unknown
-		'T' => 2,	// tentative
-		'A' => 3,	// accepted
-		'R' => 4,	// decline
+		'U' => 0, // unknown
+		'T' => 2, // tentative
+		'A' => 3, // accepted
+		'R' => 4, // decline
 		// 5 = not responded
 	);
 	/**
@@ -492,9 +492,9 @@ 
 	 * @var array
 	 */
 	static $role2as = array(
-		'REQ-PARTICIPANT' => 1,	// required
-		'CHAIR' => 1,			// required
-		'OPT-PARTICIPANT' => 2,	// optional
+		'REQ-PARTICIPANT' => 1, // required
+		'CHAIR' => 1, // required
+		'OPT-PARTICIPANT' => 2, // optional
 		'NON-PARTICIPANT' => 2,
 		// 3 = ressource
 	);
@@ -506,8 +506,8 @@ 
 	static $recur_type2as = array(
 		calendar_rrule::DAILY => 0,
 		calendar_rrule::WEEKLY => 1,
-		calendar_rrule::MONTHLY_MDAY => 2,	// monthly
-		calendar_rrule::MONTHLY_WDAY => 3,	// monthly on nth day
+		calendar_rrule::MONTHLY_MDAY => 2, // monthly
+		calendar_rrule::MONTHLY_WDAY => 3, // monthly on nth day
 		calendar_rrule::YEARLY => 5,
 		// 6 = yearly on nth day (same as 5 on non-leapyears or before March on leapyears)
 	);
@@ -534,7 +534,7 @@ 
 	 */
 	public function ChangeMessage($folderid, $_id, $message, $contentParameters)
 	{
-		unset($contentParameters);	// unused, but required by function signature
+		unset($contentParameters); // unused, but required by function signature
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -544,7 +544,7 @@ 
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $_id, ".array2string($message).") type='$type', account=$account");
 
-		list($id,$recur_date) = explode(':', $_id);
+		list($id, $recur_date) = explode(':', $_id);
 
 		if ($type != 'calendar' || $id && !($old_event = $this->calendar->read($id, $recur_date, false, 'server')))
 		{
@@ -557,21 +557,21 @@ 
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
 			//error_log(__METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
 		}
-		if (!$this->calendar->check_perms($id ? Acl::EDIT : Acl::ADD, $old_event ? $old_event : 0,$account))
+		if (!$this->calendar->check_perms($id ? Acl::EDIT : Acl::ADD, $old_event ? $old_event : 0, $account))
 		{
 			// @todo: write in users calendar and make account only a participant
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id,...) no rights to add/edit event!");
 			//error_log(__METHOD__."('$folderid',$id,".array2string($message).") no rights to add/edit event!");
 			return false;
 		}
-		if (!$id) $old_event['owner'] = $account;	// we do NOT allow to change the owner of existing events
+		if (!$id) $old_event['owner'] = $account; // we do NOT allow to change the owner of existing events
 
 		$event = $this->message2event($message, $account, $old_event);
 
 		// store event, ignore conflicts and skip notifications, as AS clients do their own notifications
 		$skip_notification = false;
 		if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']) &&
-			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations']=='send')
+			$GLOBALS['egw_info']['user']['preferences']['activesync']['mail-allowSendingInvitations'] == 'send')
 		{
 			$skip_notification = true; // to avoid double notification from client AND Server
 		}
@@ -584,16 +584,16 @@ 
 		// store non-delete exceptions
 		if ($message->exceptions)
 		{
-			foreach($message->exceptions as $exception)
+			foreach ($message->exceptions as $exception)
 			{
 				if (!$exception->deleted)
 				{
 					$ex_event = $event;
 					unset($ex_event['id']);
 					unset($ex_event['etag']);
-					foreach(array_keys($ex_event) as $name)
+					foreach (array_keys($ex_event) as $name)
 					{
-						if (substr($name,0,6) == 'recur_') unset($ex_event[$name]);
+						if (substr($name, 0, 6) == 'recur_') unset($ex_event[$name]);
 					}
 					$ex_event['recur_type'] = calendar_rrule::NONE;
 
@@ -601,10 +601,10 @@ 
 						'user' => $account,
 						'enum_recuring' => false,
 						'daywise' => false,
-						'filter' => 'owner',  // return all possible entries
+						'filter' => 'owner', // return all possible entries
 						'query' => array(
 							'cal_uid' => $event['uid'],
-							'cal_recurrence' => $exception->exceptionstarttime,	// in servertime
+							'cal_recurrence' => $exception->exceptionstarttime, // in servertime
 						),
 					))))
 					{
@@ -616,7 +616,7 @@ 
 						$participants = $event['participants'];
 					}
 					$save_event = $this->message2event($exception, $account, $ex_event);
-					$save_event['participants'] = $participants;	// not contained in $exception
+					$save_event['participants'] = $participants; // not contained in $exception
 					$save_event['reference'] = $event['id'];
 					$save_event['recurrence'] = Api\DateTime::server2user($exception->exceptionstarttime);
 					$ex_ok = $this->calendar->save($save_event);
@@ -638,10 +638,10 @@ 
 	 * @param array $event =array()
 	 * @return array
 	 */
-	private function message2event(SyncAppointment $message, $account, $event=array())
+	private function message2event(SyncAppointment $message, $account, $event = array())
 	{
 		// timestamps (created & modified are updated automatically)
-		foreach(array(
+		foreach (array(
 			'start' => 'starttime',
 			'end' => 'endtime',
 		) as $key => $attr)
@@ -649,7 +649,7 @@ 
 			if (isset($message->$attr)) $event[$key] = Api\DateTime::server2user($message->$attr);
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'uid'   => 'uid',
 			'location' => 'location',
@@ -664,7 +664,7 @@ 
 		{
 			$event['description'] = $description;
 		}
-		$event['public'] = (int)($message->sensitivity < 1);	// 0=normal, 1=personal, 2=private, 3=confidential
+		$event['public'] = (int)($message->sensitivity < 1); // 0=normal, 1=personal, 2=private, 3=confidential
 
 		// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
 		if (isset($message->busystatus))
@@ -674,21 +674,21 @@ 
 
 		if (($event['whole_day'] = $message->alldayevent))
 		{
-			if ($event['end'] == $event['start']) $event['end'] += 24*3600;	// some clients send equal start&end for 1day
-			$event['end']--;	// otherwise our whole-day event code in save makes it one more day!
+			if ($event['end'] == $event['start']) $event['end'] += 24 * 3600; // some clients send equal start&end for 1day
+			$event['end']--; // otherwise our whole-day event code in save makes it one more day!
 		}
 
 		$participants = array();
-		foreach((array)$message->attendees as $attendee)
+		foreach ((array)$message->attendees as $attendee)
 		{
-			if ($attendee->type == 3) continue;	// we can not identify resources and re-add them anyway later
+			if ($attendee->type == 3) continue; // we can not identify resources and re-add them anyway later
 
 			$matches = null;
-			if (preg_match('/^noreply-(.*)-uid@egroupware.org$/',$attendee->email,$matches))
+			if (preg_match('/^noreply-(.*)-uid@egroupware.org$/', $attendee->email, $matches))
 			{
 				$uid = $matches[1];
 			}
-			elseif (!($uid = $GLOBALS['egw']->accounts->name2id($attendee->email,'account_email')))
+			elseif (!($uid = $GLOBALS['egw']->accounts->name2id($attendee->email, 'account_email')))
 			{
 				$search = array(
 					'email' => $attendee->email,
@@ -698,13 +698,13 @@ 
 				// search addressbook for participant
 				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 				if ((list($data) = $this->addressbook->search($search,
-					array('id','egw_addressbook.account_id as account_id','n_fn'),
+					array('id', 'egw_addressbook.account_id as account_id', 'n_fn'),
 					'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
-					'','',false,'OR')))
+					'', '', false, 'OR')))
 				{
 					$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 				}
-				elseif($attendee->name === $attendee->email || empty($attendee->name))	// dont store empty or email as name
+				elseif ($attendee->name === $attendee->email || empty($attendee->name))	// dont store empty or email as name
 				{
 					$uid = 'e'.$attendee->email;
 				}
@@ -722,8 +722,8 @@ 
 				//ZLog::Write(LOGLEVEL_DEBUG, "old status for $uid is status=$status, quantity=$quantitiy, role=$role");
 			}
 			// check if just email is an existing attendee (iOS returns email as name too!), keep it to keep status/role if not set
-			elseif ($event['id'] && (isset($event['participants'][$u='e'.$attendee->email]) ||
-				(isset($event['participants'][$u='e'.$attendee->name.' <'.$attendee->email.'>']))))
+			elseif ($event['id'] && (isset($event['participants'][$u = 'e'.$attendee->email]) ||
+				(isset($event['participants'][$u = 'e'.$attendee->name.' <'.$attendee->email.'>']))))
 			{
 				$status = $event['participants'][$u];
 				calendar_so::split_status($status, $quantity, $role);
@@ -736,9 +736,9 @@ 
 				$role = 'REQ-PARTICIPANT';
 				//ZLog::Write(LOGLEVEL_DEBUG, "default status for $uid is status=$status, quantity=$quantitiy, role=$role");
 			}
-			if ($role == 'CHAIR') $chair_set = true;	// by role from existing participant
+			if ($role == 'CHAIR') $chair_set = true; // by role from existing participant
 
-			if (isset($attendee->attendeestatus) && ($s = array_search($attendee->attendeestatus,self::$status2as)))
+			if (isset($attendee->attendeestatus) && ($s = array_search($attendee->attendeestatus, self::$status2as)))
 			{
 				$status = $s;
 			}
@@ -748,29 +748,29 @@ 
 				$chair_set = true;
 			}
 			elseif (isset($attendee->attendeetype) &&
-				!($role == 'CHAIR' && !is_numeric($uid)) &&	// do not override our external ORGANIZER
-				($r = array_search($attendee->attendeetype,self::$role2as)) &&
+				!($role == 'CHAIR' && !is_numeric($uid)) && // do not override our external ORGANIZER
+				($r = array_search($attendee->attendeetype, self::$role2as)) &&
 				(int)self::$role2as[$role] != $attendee->attendeetype)	// if old role gives same type, use old role, as we have a lot more roles then AS
 			{
 				$role = $r;
 			}
 			//ZLog::Write(LOGLEVEL_DEBUG, "-> status for $uid is status=$status ($s), quantity=$quantitiy, role=$role ($r)");
-			$participants[$uid] = calendar_so::combine_status($status,$quantitiy,$role);
+			$participants[$uid] = calendar_so::combine_status($status, $quantitiy, $role);
 		}
 		// if organizer is not already participant, add him as chair
-		if (($uid = $GLOBALS['egw']->accounts->name2id($message->organizeremail,'account_email')) && !isset($participants[$uid]))
+		if (($uid = $GLOBALS['egw']->accounts->name2id($message->organizeremail, 'account_email')) && !isset($participants[$uid]))
 		{
 			$participants[$uid] = calendar_so::combine_status($uid == $GLOBALS['egw_info']['user']['account_id'] ?
-				'A' : 'U',1,'CHAIR');
+				'A' : 'U', 1, 'CHAIR');
 			$chair_set = true;
 		}
 		// preserve all resource types not account, contact or email (eg. resources) for existing events
 		// $account is also preserved, as AS does not add him as participant!
-		foreach((array)$event['participant_types'] as $type => $parts)
+		foreach ((array)$event['participant_types'] as $type => $parts)
 		{
-			if (in_array($type,array('c','e'))) continue;	// they are correctly representable in AS
+			if (in_array($type, array('c', 'e'))) continue; // they are correctly representable in AS
 
-			foreach($parts as $id => $status)
+			foreach ($parts as $id => $status)
 			{
 				// accounts are represented correctly, but the event owner which is no participant in AS
 				if ($type == 'u' && $id != $account) continue;
@@ -786,13 +786,13 @@ 
 		if (!$event['id'] || !$participants || !isset($participants[$account]))
 		{
 			$participants[$account] = calendar_so::combine_status($account == $GLOBALS['egw_info']['user']['account_id'] ?
-				'A' : 'U',1,!$chair_set ? 'CHAIR' : 'REQ-PARTICIPANT');
+				'A' : 'U', 1, !$chair_set ? 'CHAIR' : 'REQ-PARTICIPANT');
 		}
 		$event['participants'] = $participants;
 
 		if (isset($message->categories))
 		{
-			$event['category'] = implode(',', array_filter($this->calendar->find_or_add_categories($message->categories, $event),'strlen'));
+			$event['category'] = implode(',', array_filter($this->calendar->find_or_add_categories($message->categories, $event), 'strlen'));
 		}
 
 		// check if event is recurring and import recur information (incl. timezone)
@@ -802,8 +802,7 @@ 
 			{
 				$event['tzid'] = self::as2tz(self::_getTZFromSyncBlob(base64_decode($message->timezone)));
 			}
-			$event['recur_type'] = $message->recurrence->type == 6 ? calendar_rrule::YEARLY :
-				array_search($message->recurrence->type, self::$recur_type2as);
+			$event['recur_type'] = $message->recurrence->type == 6 ? calendar_rrule::YEARLY : array_search($message->recurrence->type, self::$recur_type2as);
 			$event['recur_interval'] = $message->recurrence->interval;
 
 			switch ($event['recur_type'])
@@ -812,7 +811,7 @@ 
 					// $message->recurrence->weekofmonth is not explicitly stored in egw, just taken from start date
 					// fall throught
 				case calendar_rrule::WEEKLY:
-					$event['recur_data'] = $message->recurrence->dayofweek;	// 1=Su, 2=Mo, 4=Tu, .., 64=Sa
+					$event['recur_data'] = $message->recurrence->dayofweek; // 1=Su, 2=Mo, 4=Tu, .., 64=Sa
 					break;
 				case calendar_rrule::MONTHLY_MDAY:
 					// $message->recurrence->dayofmonth is not explicitly stored in egw, just taken from start date
@@ -828,7 +827,7 @@ 
 			$event['recur_exceptions'] = array();
 			if ($message->exceptions)
 			{
-				foreach($message->exceptions as $exception)
+				foreach ($message->exceptions as $exception)
 				{
 					$event['recur_exception'][] = Api\DateTime::server2user($exception->exceptionstarttime);
 				}
@@ -838,7 +837,7 @@ 
 			{
 				// calculate enddate from occurences count, as we only support enddate
 				$count = $message->recurrence->occurrences;
-				foreach(calendar_rrule::event2rrule($event, true) as $rtime)	// true = timestamps are user time here, because of save!
+				foreach (calendar_rrule::event2rrule($event, true) as $rtime)	// true = timestamps are user time here, because of save!
 				{
 					if (--$count <= 0) break;
 				}
@@ -848,11 +847,11 @@ 
 		// only import alarms in own calendar
 		if ($message->reminder && $account == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			foreach((array)$event['alarm'] as $alarm)
+			foreach ((array)$event['alarm'] as $alarm)
 			{
-				if (($alarm['all'] || $alarm['owner'] == $account) && $alarm['offset'] == 60*$message->reminder)
+				if (($alarm['all'] || $alarm['owner'] == $account) && $alarm['offset'] == 60 * $message->reminder)
 				{
-					$alarm = true;	// alarm already exists --> do nothing
+					$alarm = true; // alarm already exists --> do nothing
 					break;
 				}
 			}
@@ -861,16 +860,16 @@ 
 				// delete all earlier alarms of that user
 				// user get's per AS only the earliest alarm, as AS only supports one alarm
 				// --> if a later alarm is returned, user probably modifed an existing alarm
-				foreach((array)$event['alarm'] as $key => $alarm)
+				foreach ((array)$event['alarm'] as $key => $alarm)
 				{
-					if ($alarm['owner'] == $account && $alarm['offset'] > 60*$message->reminder)
+					if ($alarm['owner'] == $account && $alarm['offset'] > 60 * $message->reminder)
 					{
 						unset($event['alarm'][$key]);
 					}
 				}
 				$event['alarm'][] = $alarm = array(
 					'owner' => $account,
-					'offset' => 60*$message->reminder,
+					'offset' => 60 * $message->reminder,
 				);
 			}
 		}
@@ -944,7 +943,7 @@ 
 	 */
 	public function DeleteMessage($folderid, $id, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 
 		if (!isset($this->caledar)) $this->calendar = new calendar_boupdate();
 
@@ -972,7 +971,7 @@ 
 	 */
 	function SetReadFlag($folderid, $id, $flags, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $id, ".array2string($flags)." NOT supported!");
 		return false;
@@ -1006,7 +1005,7 @@ 
 	 * @param string $class ='SyncAppointment' or 'SyncAppointmentException'
 	 * @return SyncAppointment|boolean false on error
 	 */
-	public function GetMessage($folderid, $id, $contentparameters, $class='SyncAppointment')
+	public function GetMessage($folderid, $id, $contentparameters, $class = 'SyncAppointment')
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 		//error_log(__METHOD__.__LINE__.array2string($contentparameters).function_backtrace());
@@ -1024,17 +1023,17 @@ 
 		}
 		else
 		{
-			list($id,$recur_date) = explode(':',$id);
-			if ($type != 'calendar' || !($event = $this->calendar->read($id,$recur_date,false,'server',$account)))
+			list($id, $recur_date) = explode(':', $id);
+			if ($type != 'calendar' || !($event = $this->calendar->read($id, $recur_date, false, 'server', $account)))
 			{
 				error_log(__METHOD__."('$folderid', $id, ...) read($id,null,false,'server',$account) returned false");
 				return false;
 			}
 		}
-		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid,$id,...) start=$event[start]=".date('Y-m-d H:i:s',$event['start']).", recurrence=$event[recurrence]=".date('Y-m-d H:i:s',$event['recurrence']));
-		foreach((array)$event['recur_exception'] as $ex)
+		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid,$id,...) start=$event[start]=".date('Y-m-d H:i:s', $event['start']).", recurrence=$event[recurrence]=".date('Y-m-d H:i:s', $event['recurrence']));
+		foreach ((array)$event['recur_exception'] as $ex)
 		{
-			ZLog::Write(LOGLEVEL_DEBUG, "exception=$ex=".date('Y-m-d H:i:s',$ex));
+			ZLog::Write(LOGLEVEL_DEBUG, "exception=$ex=".date('Y-m-d H:i:s', $ex));
 		}
 		$message = new $class();
 
@@ -1043,14 +1042,14 @@ 
 			$as_tz = self::tz2as($event['tzid']);
 			$message->timezone = base64_encode(self::_getSyncBlobFromTZ($as_tz));
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			// z-push (2.3 at least) requires a timezone for recurring events
 			if ($event['recur_type']) $message->timezone = self::UTC_BLOB;
 		}
 
 		// copying timestamps (they are already read in servertime, so non tz conversation)
-		foreach(array(
+		foreach (array(
 			'start' => 'starttime',
 			'end'   => 'endtime',
 			'created' => 'dtstamp',
@@ -1061,10 +1060,10 @@ 
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
-			++$message->endtime;	// EGw all-day-events are 1 sec shorter!
+			++$message->endtime; // EGw all-day-events are 1 sec shorter!
 		}
 		// copying strings
-		foreach(array(
+		foreach (array(
 			'title' => 'subject',
 			'uid'   => 'uid',
 			'location' => 'location',
@@ -1086,21 +1085,21 @@ 
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, "airsyncbasebody!");
 				$message->asbody = new SyncBaseBody();
-				$message->nativebodytype=1;
+				$message->nativebodytype = 1;
 				$this->backend->note2messagenote($event['description'], $bodypreference, $message->asbody);
 			}
 		}
-		$message->organizername  = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_fullname');
+		$message->organizername  = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_fullname');
 		// at least iOS calendar crashes, if organizer has no email address (true = generate an email, if user has none)
 		$message->organizeremail = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email', true);
 
-		$message->sensitivity = $event['public'] ? 0 : 2;	// 0=normal, 1=personal, 2=private, 3=confidential
+		$message->sensitivity = $event['public'] ? 0 : 2; // 0=normal, 1=personal, 2=private, 3=confidential
 
 		// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
 		$message->busystatus = $event['non_blocking'] ? 0 : 2;
 
 		$message->attendees = array();
-		foreach($event['participants'] as $uid => $status)
+		foreach ($event['participants'] as $uid => $status)
 		{
 			// AS does NOT want calendar owner as participant
 			if ($uid == $account) continue;
@@ -1112,13 +1111,13 @@ 
 			$attendee->attendeetype = (int)self::$role2as[$role];
 			if (is_numeric($uid))
 			{
-				$attendee->name = $GLOBALS['egw']->accounts->id2name($uid,'account_fullname');
+				$attendee->name = $GLOBALS['egw']->accounts->id2name($uid, 'account_fullname');
 				$attendee->email = $GLOBALS['egw']->accounts->id2name($uid, 'account_email', true);
 			}
 			else
 			{
 				list($info) = $i = $this->calendar->resources[$uid[0]]['info'] ?
-					ExecMethod($this->calendar->resources[$uid[0]]['info'],substr($uid,1)) : array(false);
+					ExecMethod($this->calendar->resources[$uid[0]]['info'], substr($uid, 1)) : array(false);
 
 				if (!$info) continue;
 
@@ -1136,7 +1135,7 @@ 
 					$message->organizeremail = $attendee->email;
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, $id, ...) external organizer detected (role=$role, uid=$uid), set as AS organizer: $message->organizername <$message->organizeremail>");
 				}
-				if ($uid[0] == 'r') $attendee->type = 3;	// 3 = resource
+				if ($uid[0] == 'r') $attendee->type = 3; // 3 = resource
 			}
 			// email must NOT be empty, but MAY be an arbitrary text
 			if (empty($attendee->email)) $attendee->email = 'noreply-'.$uid.'-uid@egroupware.org';
@@ -1144,7 +1143,7 @@ 
 			$message->attendees[] = $attendee;
 		}
 		$message->categories = array();
-		foreach($event['category'] ? explode(',',$event['category']) : array() as $cat_id)
+		foreach ($event['category'] ? explode(',', $event['category']) : array() as $cat_id)
 		{
 			$message->categories[] = Api\Categories::id2name($cat_id);
 		}
@@ -1153,25 +1152,25 @@ 
 		if ($event['recur_type'] != calendar_rrule::NONE && !$recur_date)
 		{
 			$message->recurrence = $recurrence = new SyncRecurrence();
-			$rrule = calendar_rrule::event2rrule($event,false);	// false = timestamps in $event are servertime
+			$rrule = calendar_rrule::event2rrule($event, false); // false = timestamps in $event are servertime
 			$recurrence->type = (int)self::$recur_type2as[$rrule->type];
 			$recurrence->interval = $rrule->interval;
 			switch ($rrule->type)
 			{
 				case calendar_rrule::MONTHLY_WDAY:
 					$recurrence->weekofmonth = $rrule->monthly_byday_num >= 1 ?
-						$rrule->monthly_byday_num : 5;	// 1..5=last week of month, not -1
+						$rrule->monthly_byday_num : 5; // 1..5=last week of month, not -1
 					// fall throught
 				case calendar_rrule::WEEKLY:
-					$recurrence->dayofweek = $rrule->weekdays;	// 1=Su, 2=Mo, 4=Tu, .., 64=Sa
+					$recurrence->dayofweek = $rrule->weekdays; // 1=Su, 2=Mo, 4=Tu, .., 64=Sa
 					break;
 				case calendar_rrule::MONTHLY_MDAY:
-					$recurrence->dayofmonth = $rrule->monthly_bymonthday >= 1 ?	// 1..31
-						$rrule->monthly_bymonthday : 31;	// not -1 for last day of month!
+					$recurrence->dayofmonth = $rrule->monthly_bymonthday >= 1 ? // 1..31
+						$rrule->monthly_bymonthday : 31; // not -1 for last day of month!
 					break;
 				case calendar_rrule::YEARLY:
-					$recurrence->dayofmonth = (int)$rrule->time->format('d');	// 1..31
-					$recurrence->monthofyear = (int)$rrule->time->format('m');	// 1..12
+					$recurrence->dayofmonth = (int)$rrule->time->format('d'); // 1..31
+					$recurrence->monthofyear = (int)$rrule->time->format('m'); // 1..12
 					break;
 			}
 			if ($rrule->enddate)	// enddate is only a date, but AS needs a time incl. correct starttime!
@@ -1187,9 +1186,9 @@ 
 				// search real / non-virtual exceptions
 				if (!empty($event['uid']))
 				{
-					$ex_events =& $this->calendar->search(array(
+					$ex_events = & $this->calendar->search(array(
 						'query' => array('cal_uid' => $event['uid']),
-						'filter' => 'owner',  // return all possible entries
+						'filter' => 'owner', // return all possible entries
 						'daywise' => false,
 						'date_format' => 'server',
 					));
@@ -1198,36 +1197,36 @@ 
 				{
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." Exceptions found but no UID given for Event:".$event['id'].' Exceptions:'.array2string($event['recur_exception']));
 				}
-				if (count($ex_events)>=1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
+				if (count($ex_events) >= 1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
 
 				$message->exceptions = array();
-				foreach($ex_events as $ex_event)
+				foreach ($ex_events as $ex_event)
 				{
-					if ($ex_event['id'] == $event['id']) continue;	// ignore series master
+					if ($ex_event['id'] == $event['id']) continue; // ignore series master
 					$exception = $this->GetMessage($folderid, $ex_event, $contentparameters, 'SyncAppointmentException');
 					$exception->exceptionstarttime = $exception_time = $ex_event['recurrence'];
-					foreach(array('attendees','recurrence','uid','timezone','organizername','organizeremail') as $not_supported)
+					foreach (array('attendees', 'recurrence', 'uid', 'timezone', 'organizername', 'organizeremail') as $not_supported)
 					{
-						$exception->$not_supported = null;	// not allowed in exceptions :-(
+						$exception->$not_supported = null; // not allowed in exceptions :-(
 					}
 					$exception->deleted = 0;
-					if (($key = array_search($exception_time,$event['recur_exception'])) !== false)
+					if (($key = array_search($exception_time, $event['recur_exception'])) !== false)
 					{
 						unset($event['recur_exception'][$key]);
 					}
-					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added exception ".date('Y-m-d H:i:s',$exception_time).' '.array2string($exception));
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added exception ".date('Y-m-d H:i:s', $exception_time).' '.array2string($exception));
 					$message->exceptions[] = $exception;
 				}
 				// add rest of exceptions as deleted
-				foreach($event['recur_exception'] as $exception_time)
+				foreach ($event['recur_exception'] as $exception_time)
 				{
 					if (!empty($exception_time))
 					{
 						if (empty($event['uid'])) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
-						$exception = new SyncAppointmentException();	// exceptions seems to be full SyncAppointments, with only starttime required
+						$exception = new SyncAppointmentException(); // exceptions seems to be full SyncAppointments, with only starttime required
 						$exception->deleted = 1;
 						$exception->exceptionstarttime = $exception_time;
-						ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added deleted exception ".date('Y-m-d H:i:s',$exception_time).' '.array2string($exception));
+						ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."() added deleted exception ".date('Y-m-d H:i:s', $exception_time).' '.array2string($exception));
 						$message->exceptions[] = $exception;
 					}
 				}
@@ -1249,12 +1248,12 @@ 
 		// only return alarms if in own calendar
 		if ($account == $GLOBALS['egw_info']['user']['account_id'] && $event['alarm'])
 		{
-			foreach($event['alarm'] as $alarm)
+			foreach ($event['alarm'] as $alarm)
 			{
 				if ($alarm['all'] || $alarm['owner'] == $account)
 				{
-					$message->reminder = $alarm['offset']/60;	// is in minutes, not seconds as in EGw
-					break;	// AS supports only one alarm! (we use the next/earliest one)
+					$message->reminder = $alarm['offset'] / 60; // is in minutes, not seconds as in EGw
+					break; // AS supports only one alarm! (we use the next/earliest one)
 				}
 			}
 		}
@@ -1277,7 +1276,7 @@ 
 	 */
 	public function StatMessage($folderid, $id)
 	{
-		unset($folderid);	// not used ($id is unique), but required by function signature
+		unset($folderid); // not used ($id is unique), but required by function signature
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 
@@ -1288,7 +1287,7 @@ 
 			// error_log why access is denied (should never happen for everything returned by calendar_bo::search)
 			$backup = $this->calendar->debug;
 			//$this->calendar->debug = 2;
-			list($id) = explode(':',$id);
+			list($id) = explode(':', $id);
 			$this->calendar->check_perms(calendar_bo::ACL_FREEBUSY, $id, 0, 'server');
 			$this->calendar->debug = $backup;
 		}
@@ -1322,7 +1321,7 @@ 
 
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
 		//$ctag = $this->calendar->get_ctag($owner,'owner',true);	// true only consider recurrence master
-		$syncstate = $this->calendar->get_ctag($owner,false,true); // we only want to fetch the owners events, where he is a participant too
+		$syncstate = $this->calendar->get_ctag($owner, false, true); // we only want to fetch the owners events, where he is a participant too
 		// workaround for syncstate = 0 when calendar is empty causes synctate to not return 0 but array resulting in foldersync loop
 		if ($syncstate == 0) $syncstate = 1;
 
@@ -1402,8 +1401,8 @@ 
 
 		if ($tz === 'UTC') return $data;
 
-		$name = $component = is_a($tz,'DateTimeZone') ? $tz->getName() : $tz;
-		if (strpos($component, 'VTIMEZONE') === false) $component = calendar_timezones::tz2id($name,'component');
+		$name = $component = is_a($tz, 'DateTimeZone') ? $tz->getName() : $tz;
+		if (strpos($component, 'VTIMEZONE') === false) $component = calendar_timezones::tz2id($name, 'component');
 		// parse ical timezone defintion
 		$ical = self::ical2array($component);
 		$standard = $ical['VTIMEZONE']['STANDARD'];
@@ -1412,11 +1411,11 @@ 
 		if (!isset($standard))
 		{
 			$matches = null;
-			if (preg_match('/^etc\/gmt([+-])([0-9]+)$/i',$name,$matches))
+			if (preg_match('/^etc\/gmt([+-])([0-9]+)$/i', $name, $matches))
 			{
 				$standard = array(
-					'TZOFFSETTO'   => sprintf('%s%02d00',$matches[1],$matches[2]),
-					'TZOFFSETFROM' => sprintf('%s%02d00',$matches[1],$matches[2]),
+					'TZOFFSETTO'   => sprintf('%s%02d00', $matches[1], $matches[2]),
+					'TZOFFSETFROM' => sprintf('%s%02d00', $matches[1], $matches[2]),
 				);
 				unset($daylight);
 			}
@@ -1427,15 +1426,15 @@ 
 		}
 		// get bias and dstbias from standard component, which is present in all tz's
 		// (dstbias is relative to bias and almost always 60 or 0)
-		$data['bias'] = -(60 * substr($standard['TZOFFSETTO'],0,-2) + substr($standard['TZOFFSETTO'],-2));
-		$data['dstbias'] = -(60 * substr($standard['TZOFFSETFROM'],0,-2) + substr($standard['TZOFFSETFROM'],-2) + $data['bias']);
+		$data['bias'] = -(60 * substr($standard['TZOFFSETTO'], 0, -2) + substr($standard['TZOFFSETTO'], -2));
+		$data['dstbias'] = -(60 * substr($standard['TZOFFSETFROM'], 0, -2) + substr($standard['TZOFFSETFROM'], -2) + $data['bias']);
 
 		// check if we have an additional DAYLIGHT component and both have a RRULE component --> tz uses daylight saving
 		if (isset($standard['RRULE']) && isset($daylight) && isset($daylight['RRULE']))
 		{
-			foreach(array('dststart' => $daylight,'dstend' => $standard) as $prefix => $comp)
+			foreach (array('dststart' => $daylight, 'dstend' => $standard) as $prefix => $comp)
 			{
-				if (preg_match('/FREQ=YEARLY;BYDAY=(.*);BYMONTH=(\d+)/',$comp['RRULE'],$matches))
+				if (preg_match('/FREQ=YEARLY;BYDAY=(.*);BYMONTH=(\d+)/', $comp['RRULE'], $matches))
 				{
 					$data[$prefix.'month'] = (int)$matches[2];
 					$data[$prefix.'week'] = (int)$matches[1];
@@ -1452,20 +1451,20 @@ 
 						$data[$prefix.'week'] = 5;
 						if ($prefix == 'dstend') $data[$prefix.'month'] -= 1;
 					}
-					static $day2int = array('SU'=>0,'MO'=>1,'TU'=>2,'WE'=>3,'TH'=>4,'FR'=>5,'SA'=>6);
-					$data[$prefix.'day'] = (int)$day2int[substr($matches[1],-2)];
+					static $day2int = array('SU'=>0, 'MO'=>1, 'TU'=>2, 'WE'=>3, 'TH'=>4, 'FR'=>5, 'SA'=>6);
+					$data[$prefix.'day'] = (int)$day2int[substr($matches[1], -2)];
 				}
-				if (preg_match('/^\d{8}T(\d{6})$/',$comp['DTSTART'],$matches))
+				if (preg_match('/^\d{8}T(\d{6})$/', $comp['DTSTART'], $matches))
 				{
-					$data[$prefix.'hour'] = (int)substr($matches[1],0,2)+($prefix=='dststart'?-1:1)*$data['dstbias']/60;
-					$data[$prefix.'minute'] = (int)substr($matches[1],2,2)+($prefix=='dststart'?-1:1)*$data['dstbias']%60;
-					$data[$prefix.'second'] = (int)substr($matches[1],4,2);
+					$data[$prefix.'hour'] = (int)substr($matches[1], 0, 2) + ($prefix == 'dststart' ?-1 : 1) * $data['dstbias'] / 60;
+					$data[$prefix.'minute'] = (int)substr($matches[1], 2, 2) + ($prefix == 'dststart' ?-1 : 1) * $data['dstbias'] % 60;
+					$data[$prefix.'second'] = (int)substr($matches[1], 4, 2);
 				}
 			}
 			// for southern hermisphere, were DST is in January, we have to swap start- and end-hour/-minute
 			if ($data['dststartmonth'] > $data['dstendmonth'])
 			{
-				$start = $data['dststarthour'];   $data['dststarthour'] = $data['dstendhour'];     $data['dstendhour'] = $start;
+				$start = $data['dststarthour']; $data['dststarthour'] = $data['dstendhour']; $data['dstendhour'] = $start;
 				$end = $data['dststartminute']; $data['dststartminute'] = $data['dstendminute']; $data['dstendminute'] = $end;
 			}
 		}
@@ -1523,20 +1522,20 @@ 
 	 * @param string|array $ical lines of ical file
 	 * @return array with parsed ical components
 	 */
-	static public function ical2array(&$ical,$section=null)
+	static public function ical2array(&$ical, $section = null)
 	{
 		$arr = array();
 		if (!is_array($ical)) $ical = preg_split("/[\r\n]+/m", $ical);
 		while (($line = array_shift($ical)))
 		{
-			list($name,$value) = explode(':',$line,2);
+			list($name, $value) = explode(':', $line, 2);
 			if ($name == 'BEGIN')
 			{
-				$arr[$value] = self::ical2array($ical,$value);
+				$arr[$value] = self::ical2array($ical, $value);
 			}
-			elseif($name == 'END')
+			elseif ($name == 'END')
 			{
-				if ($section && $section==$value) return $arr;
+				if ($section && $section == $value) return $arr;
 				break;
 			}
 			else
@@ -1559,13 +1558,13 @@ 
 	 */
 	public static function as2tz(array $data)
 	{
-		static $cache=null;	// some caching withing the request
+		static $cache = null; // some caching withing the request
 
-		unset($data['name']);	// not used, but can stall the match
+		unset($data['name']); // not used, but can stall the match
 
 		$key = serialize($data);
 
-		for($n = 0; !isset($cache[$key]); ++$n)
+		for ($n = 0; !isset($cache[$key]); ++$n)
 		{
 			if (!$n)	// check users timezone first
 			{
@@ -1584,7 +1583,7 @@ 
 					break;
 				}
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				unset($e);
 				// simpy ignore that, as it only means $tz can NOT be converted, because it has no VTIMEZONE component
 			}
@@ -1599,8 +1598,8 @@ 
 	 */
 	static public function _getTZFromSyncBlob($data)
 	{
-		$tz = unpack(	"lbias/a64name/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/" .
-						"lstdbias/a64name/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/" .
+		$tz = unpack("lbias/a64name/vdstendyear/vdstendmonth/vdstendday/vdstendweek/vdstendhour/vdstendminute/vdstendsecond/vdstendmillis/".
+						"lstdbias/a64name/vdststartyear/vdststartmonth/vdststartday/vdststartweek/vdststarthour/vdststartminute/vdststartsecond/vdststartmillis/".
 						"ldstbias", $data);
 
 		return $tz;
@@ -1613,7 +1612,7 @@ 
 	 */
 	static public function _getSyncBlobFromTZ($tz)
 	{
-		$packed = pack("la64vvvvvvvv" . "la64vvvvvvvv" . "l",
+		$packed = pack("la64vvvvvvvv"."la64vvvvvvvv"."l",
 				$tz["bias"], "", 0, $tz["dstendmonth"], $tz["dstendday"], $tz["dstendweek"], $tz["dstendhour"], $tz["dstendminute"], $tz["dstendsecond"], $tz["dstendmillis"],
 				$tz["stdbias"], "", 0, $tz["dststartmonth"], $tz["dststartday"], $tz["dststartweek"], $tz["dststarthour"], $tz["dststartminute"], $tz["dststartsecond"], $tz["dststartmillis"],
 				$tz["dstbias"]);
@@ -1637,7 +1636,7 @@ 
 				$account_id = $entry['grantor'];
 				$cals[$account_id] = $entry['name'];
 			}
-			if ($hook_data['account_id'] > 0) unset($cals[$hook_data['account_id']]);	// skip current user
+			if ($hook_data['account_id'] > 0) unset($cals[$hook_data['account_id']]); // skip current user
 		}
 		$cals['G'] = lang('Primary group');
 		$cals['A'] = lang('All');
@@ -1673,8 +1672,8 @@ 
 		)
 	);
 	require_once('../../header.inc.php');
-	ini_set('display_errors',1);
-	error_reporting(E_ALL & ~E_NOTICE);
+	ini_set('display_errors', 1);
+	error_reporting(E_ALL&~E_NOTICE);
 
 	echo "<html><head><title>Conversation of ActiveSync Timezone Blobs to TZID's</title></head>\n<body>\n";
 	echo "<h3>Conversation of ActiveSync Timezone Blobs to TZID's</h3>\n";
@@ -1688,7 +1687,7 @@ 
 	</script>\n";
 
 	// TZID => AS timezone blobs reported by various devices
-	foreach(array(
+	foreach (array(
 		'Europe/Berlin'    => 'xP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAMAAAAAAAAAxP///w==',
 		'Europe/Helsinki'  => 'iP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAQAAAAAAAAAxP///w==',
 		'Asia/Tokyo'       => '5P3//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///w==',
@@ -1702,7 +1701,7 @@ 
 	) as $tz => $sync_blob)
 	{
 		// get as timezone data for a given timezone
-		$ical = calendar_timezones::tz2id($tz,'component');
+		$ical = calendar_timezones::tz2id($tz, 'component');
 		//echo "<pre>".print_r($ical,true)."</pre>\n";
 		$ical_tz = $ical;
 		$ical_arr = calendar_zpush::ical2array($ical_tz);
@@ -1719,22 +1718,22 @@ 
 		//echo array2string($matched);
 
 		echo "<tr><td><b onclick='toggle_display(this.nextSibling);' style='cursor:pointer;'>$tz</b><pre style='margin:0; font-size: 90%; display:none;'>$ical</pre></td><td>$as_tz_org[bias]<br/>$as_tz[bias]</td><td>$as_tz_org[dstbias]<br/>$as_tz[dstbias]</td>\n";
-		foreach(array('dststart','dstend') as $prefix)
+		foreach (array('dststart', 'dstend') as $prefix)
 		{
 			echo "<td>\n";
-			foreach(array($as_tz_org,$as_tz) as $n => $arr)
+			foreach (array($as_tz_org, $as_tz) as $n => $arr)
 			{
 				$parts = array();
-				foreach(array('year','month','day','week','hour','minute','second') as $postfix)
+				foreach (array('year', 'month', 'day', 'week', 'hour', 'minute', 'second') as $postfix)
 				{
 					$failed = $n && $as_tz_org[$prefix.$postfix] !== $as_tz[$prefix.$postfix];
-					$parts[] = ($failed?'<font color="red">':'').$arr[$prefix.$postfix].($failed?'</font>':'');
+					$parts[] = ($failed ? '<font color="red">' : '').$arr[$prefix.$postfix].($failed ? '</font>' : '');
 				}
-				echo implode(' ', $parts).(!$n?'<br/>':'');
+				echo implode(' ', $parts).(!$n ? '<br/>' : '');
 			}
 			echo "</td>\n";
 		}
-		echo "<td>&nbsp;<br/>".($matched=='UTC'?'<font color="red">':'').$matched.($matched=='UTC'?'</font>':'')."</td></tr>\n";
+		echo "<td>&nbsp;<br/>".($matched == 'UTC' ? '<font color="red">' : '').$matched.($matched == 'UTC' ? '</font>' : '')."</td></tr>\n";
 	}
 	echo "</tbody></table>\n";
 	echo "</body></html>\n";

Braces +235 added lines, -57 removed lines

@@ -20,8 +20,12 @@ 
  */
 if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)
 {
-	interface activesync_plugin_write {}
-	interface activesync_plugin_meeting_requests {}
+	interface activesync_plugin_write
+	{
+}
+	interface activesync_plugin_meeting_requests
+	{
+}
 }
 
 /**
@@ -81,7 +85,10 @@ 
 	 */
 	public function GetFolderList()
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$cals_pref = $GLOBALS['egw_info']['user']['preferences']['activesync']['calendar-cals'];
 		$cals = $cals_pref ? explode(',',$cals_pref) : array('P');	// implicit default of 'P'
@@ -180,13 +187,20 @@ 
   	 */
 	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$id',$cutoffdate)");
 		$type = $user = null;
 		$this->backend->splitID($id,$type,$user);
 
-		if (!$cutoffdate) $cutoffdate = $this->bo->now - 100*24*3600;	// default three month back -30 breaks all sync recurrences
+		if (!$cutoffdate)
+		{
+			$cutoffdate = $this->bo->now - 100*24*3600;
+		}
+		// default three month back -30 breaks all sync recurrences
 
 		$filter = array(
 			'users' => $user,
@@ -212,7 +226,10 @@ 
 		{
 			foreach ($events as $event)
 			{
-				if ($not_uids && in_array($event['uid'], $not_uids)) continue;
+				if ($not_uids && in_array($event['uid'], $not_uids))
+				{
+					continue;
+				}
 				$messagelist[] = $this->StatMessage($id, $event);
 
 				// add virtual exceptions for recuring events too
@@ -227,7 +244,10 @@ 
 					}
 				}*/
 			}
-			if (count($events) < $num_rows) break;
+			if (count($events) < $num_rows)
+			{
+				break;
+			}
 		}
 		//error_log(__METHOD__."($id, $cutoffdate, ".array2string($not_uids).") type=$type, user=$user returning ".count($messagelist)." messages ".function_backtrace());
 		return $messagelist;
@@ -289,7 +309,10 @@ 
 	{
 		unset($truncsize, $optionbodypreference, $mimesupport);	// not used, but required by function signature
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		if (!($event = $this->calendar->read(abs($id), 0, false, 'server')))
 		{
@@ -367,7 +390,10 @@ 
 			'created' => 'dtstamp',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
@@ -379,7 +405,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 		$message->organizer = $event['organizer'];
 
@@ -414,7 +443,10 @@ 
 	 */
 	function MeetingResponse($folderid, $requestid, $response)
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		static $as2status = array(	// different from self::$status2as!
 			1 => 'A',
@@ -424,9 +456,12 @@ 
 		$status_in = isset($as2status[$response]) ? $as2status[$response] : 'U';
 		$uid = $GLOBALS['egw_info']['user']['account_id'];
 
-		if (!is_numeric($requestid))	// iCal from fmail
+		if (!is_numeric($requestid))
+		{
+			// iCal from fmail
 		{
 			$ical = new calendar_ical();
+		}
 			if (!($events = $ical->icaltoegw($requestid, '', 'utf-8')) || count($events) != 1)
 			{
 				ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, '$requestid') error parsing iCal!");
@@ -536,7 +571,10 @@ 
 	{
 		unset($contentParameters);	// unused, but required by function signature
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$old_event = array();
 		$type = $account = null;
@@ -551,10 +589,13 @@ 
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id,...) Folder wrong or event does not existing");
 			return false;
 		}
-		if ($recur_date)	// virtual exception
+		if ($recur_date)
+		{
+			// virtual exception
 		{
 			// @todo check if virtual exception needs to be saved as real exception, or only stati need to be changed
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
+		}
 			//error_log(__METHOD__."('$folderid',$id:$recur_date,".array2string($message).") handling of virtual exception not yet implemented!");
 		}
 		if (!$this->calendar->check_perms($id ? Acl::EDIT : Acl::ADD, $old_event ? $old_event : 0,$account))
@@ -564,7 +605,11 @@ 
 			//error_log(__METHOD__."('$folderid',$id,".array2string($message).") no rights to add/edit event!");
 			return false;
 		}
-		if (!$id) $old_event['owner'] = $account;	// we do NOT allow to change the owner of existing events
+		if (!$id)
+		{
+			$old_event['owner'] = $account;
+		}
+		// we do NOT allow to change the owner of existing events
 
 		$event = $this->message2event($message, $account, $old_event);
 
@@ -593,7 +638,10 @@ 
 					unset($ex_event['etag']);
 					foreach(array_keys($ex_event) as $name)
 					{
-						if (substr($name,0,6) == 'recur_') unset($ex_event[$name]);
+						if (substr($name,0,6) == 'recur_')
+						{
+							unset($ex_event[$name]);
+						}
 					}
 					$ex_event['recur_type'] = calendar_rrule::NONE;
 
@@ -646,7 +694,10 @@ 
 			'end' => 'endtime',
 		) as $key => $attr)
 		{
-			if (isset($message->$attr)) $event[$key] = Api\DateTime::server2user($message->$attr);
+			if (isset($message->$attr))
+			{
+				$event[$key] = Api\DateTime::server2user($message->$attr);
+			}
 		}
 		// copying strings
 		foreach(array(
@@ -655,7 +706,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (isset($message->$attr)) $event[$key] = $message->$attr;
+			if (isset($message->$attr))
+			{
+				$event[$key] = $message->$attr;
+			}
 		}
 
 		// only change description, if one given, as iOS5 skips description in ChangeMessage after MeetingResponse
@@ -674,14 +728,22 @@ 
 
 		if (($event['whole_day'] = $message->alldayevent))
 		{
-			if ($event['end'] == $event['start']) $event['end'] += 24*3600;	// some clients send equal start&end for 1day
+			if ($event['end'] == $event['start'])
+			{
+				$event['end'] += 24*3600;
+			}
+			// some clients send equal start&end for 1day
 			$event['end']--;	// otherwise our whole-day event code in save makes it one more day!
 		}
 
 		$participants = array();
 		foreach((array)$message->attendees as $attendee)
 		{
-			if ($attendee->type == 3) continue;	// we can not identify resources and re-add them anyway later
+			if ($attendee->type == 3)
+			{
+				continue;
+			}
+			// we can not identify resources and re-add them anyway later
 
 			$matches = null;
 			if (preg_match('/^noreply-(.*)-uid@egroupware.org$/',$attendee->email,$matches))
@@ -696,7 +758,10 @@ 
 					//'n_fn' => $attendee->name,	// not sure if we want matches without email
 				);
 				// search addressbook for participant
-				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+				if (!isset($this->addressbook))
+				{
+					$this->addressbook = new Api\Contacts();
+				}
 				if ((list($data) = $this->addressbook->search($search,
 					array('id','egw_addressbook.account_id as account_id','n_fn'),
 					'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
@@ -704,10 +769,13 @@ 
 				{
 					$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 				}
-				elseif($attendee->name === $attendee->email || empty($attendee->name))	// dont store empty or email as name
+				elseif($attendee->name === $attendee->email || empty($attendee->name))
+				{
+					// dont store empty or email as name
 				{
 					$uid = 'e'.$attendee->email;
 				}
+				}
 				else	// store just the email
 				{
 					$uid = 'e'.$attendee->name.' <'.$attendee->email.'>';
@@ -736,7 +804,11 @@ 
 				$role = 'REQ-PARTICIPANT';
 				//ZLog::Write(LOGLEVEL_DEBUG, "default status for $uid is status=$status, quantity=$quantitiy, role=$role");
 			}
-			if ($role == 'CHAIR') $chair_set = true;	// by role from existing participant
+			if ($role == 'CHAIR')
+			{
+				$chair_set = true;
+			}
+			// by role from existing participant
 
 			if (isset($attendee->attendeestatus) && ($s = array_search($attendee->attendeestatus,self::$status2as)))
 			{
@@ -750,10 +822,13 @@ 
 			elseif (isset($attendee->attendeetype) &&
 				!($role == 'CHAIR' && !is_numeric($uid)) &&	// do not override our external ORGANIZER
 				($r = array_search($attendee->attendeetype,self::$role2as)) &&
-				(int)self::$role2as[$role] != $attendee->attendeetype)	// if old role gives same type, use old role, as we have a lot more roles then AS
+				(int)self::$role2as[$role] != $attendee->attendeetype)
+			{
+				// if old role gives same type, use old role, as we have a lot more roles then AS
 			{
 				$role = $r;
 			}
+			}
 			//ZLog::Write(LOGLEVEL_DEBUG, "-> status for $uid is status=$status ($s), quantity=$quantitiy, role=$role ($r)");
 			$participants[$uid] = calendar_so::combine_status($status,$quantitiy,$role);
 		}
@@ -768,12 +843,19 @@ 
 		// $account is also preserved, as AS does not add him as participant!
 		foreach((array)$event['participant_types'] as $type => $parts)
 		{
-			if (in_array($type,array('c','e'))) continue;	// they are correctly representable in AS
+			if (in_array($type,array('c','e')))
+			{
+				continue;
+			}
+			// they are correctly representable in AS
 
 			foreach($parts as $id => $status)
 			{
 				// accounts are represented correctly, but the event owner which is no participant in AS
-				if ($type == 'u' && $id != $account) continue;
+				if ($type == 'u' && $id != $account)
+				{
+					continue;
+				}
 
 				$uid = calendar_so::combine_user($type, $id);
 				if (!isset($participants[$uid]))
@@ -798,10 +880,13 @@ 
 		// check if event is recurring and import recur information (incl. timezone)
 		if ($message->recurrence)
 		{
-			if ($message->timezone && !$event['id'])	// dont care for timezone, if no new and recurring event
+			if ($message->timezone && !$event['id'])
+			{
+				// dont care for timezone, if no new and recurring event
 			{
 				$event['tzid'] = self::as2tz(self::_getTZFromSyncBlob(base64_decode($message->timezone)));
 			}
+			}
 			$event['recur_type'] = $message->recurrence->type == 6 ? calendar_rrule::YEARLY :
 				array_search($message->recurrence->type, self::$recur_type2as);
 			$event['recur_interval'] = $message->recurrence->interval;
@@ -838,10 +923,13 @@ 
 			{
 				// calculate enddate from occurences count, as we only support enddate
 				$count = $message->recurrence->occurrences;
-				foreach(calendar_rrule::event2rrule($event, true) as $rtime)	// true = timestamps are user time here, because of save!
+				foreach(calendar_rrule::event2rrule($event, true) as $rtime)
+				{
+					// true = timestamps are user time here, because of save!
 				{
 					if (--$count <= 0) break;
 				}
+				}
 				$event['recur_enddate'] = $rtime->format('ts');
 			}
 		}
@@ -856,7 +944,9 @@ 
 					break;
 				}
 			}
-			if ($alarm !== true)	// new alarm
+			if ($alarm !== true)
+			{
+				// new alarm
 			{
 				// delete all earlier alarms of that user
 				// user get's per AS only the earliest alarm, as AS only supports one alarm
@@ -866,6 +956,7 @@ 
 					if ($alarm['owner'] == $account && $alarm['offset'] > 60*$message->reminder)
 					{
 						unset($event['alarm'][$key]);
+			}
 					}
 				}
 				$event['alarm'][] = $alarm = array(
@@ -946,7 +1037,10 @@ 
 	{
 		unset($contentParameters);	// not used, but required by function signature
 
-		if (!isset($this->caledar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->caledar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$ret = $this->calendar->delete($id);
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $id) delete($id) returned ".array2string($ret));
@@ -1008,7 +1102,10 @@ 
 	 */
 	public function GetMessage($folderid, $id, $contentparameters, $class='SyncAppointment')
 	{
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 		//error_log(__METHOD__.__LINE__.array2string($contentparameters).function_backtrace());
 		$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
 		$mimesupport = $contentparameters->GetMimeSupport();
@@ -1046,7 +1143,10 @@ 
 		catch(Exception $e) {
 			unset($e);
 			// z-push (2.3 at least) requires a timezone for recurring events
-			if ($event['recur_type']) $message->timezone = self::UTC_BLOB;
+			if ($event['recur_type'])
+			{
+				$message->timezone = self::UTC_BLOB;
+			}
 		}
 
 		// copying timestamps (they are already read in servertime, so non tz conversation)
@@ -1057,7 +1157,10 @@ 
 			'modified' => 'dtstamp',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 		if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
 		{
@@ -1070,7 +1173,10 @@ 
 			'location' => 'location',
 		) as $key => $attr)
 		{
-			if (!empty($event[$key])) $message->$attr = $event[$key];
+			if (!empty($event[$key]))
+			{
+				$message->$attr = $event[$key];
+			}
 		}
 
 		// appoint description
@@ -1103,7 +1209,10 @@ 
 		foreach($event['participants'] as $uid => $status)
 		{
 			// AS does NOT want calendar owner as participant
-			if ($uid == $account) continue;
+			if ($uid == $account)
+			{
+				continue;
+			}
 			$quantity = $role = null;
 			calendar_so::split_status($status, $quantity, $role);
 
@@ -1120,7 +1229,10 @@ 
 				list($info) = $i = $this->calendar->resources[$uid[0]]['info'] ?
 					ExecMethod($this->calendar->resources[$uid[0]]['info'],substr($uid,1)) : array(false);
 
-				if (!$info) continue;
+				if (!$info)
+				{
+					continue;
+				}
 
 				if (!$info['email'] && $info['responsible'])
 				{
@@ -1136,10 +1248,17 @@ 
 					$message->organizeremail = $attendee->email;
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."($folderid, $id, ...) external organizer detected (role=$role, uid=$uid), set as AS organizer: $message->organizername <$message->organizeremail>");
 				}
-				if ($uid[0] == 'r') $attendee->type = 3;	// 3 = resource
+				if ($uid[0] == 'r')
+				{
+					$attendee->type = 3;
+				}
+				// 3 = resource
 			}
 			// email must NOT be empty, but MAY be an arbitrary text
-			if (empty($attendee->email)) $attendee->email = 'noreply-'.$uid.'-uid@egroupware.org';
+			if (empty($attendee->email))
+			{
+				$attendee->email = 'noreply-'.$uid.'-uid@egroupware.org';
+			}
 
 			$message->attendees[] = $attendee;
 		}
@@ -1174,9 +1293,12 @@ 
 					$recurrence->monthofyear = (int)$rrule->time->format('m');	// 1..12
 					break;
 			}
-			if ($rrule->enddate)	// enddate is only a date, but AS needs a time incl. correct starttime!
+			if ($rrule->enddate)
+			{
+				// enddate is only a date, but AS needs a time incl. correct starttime!
 			{
 				$enddate = clone $rrule->time;
+			}
 				$enddate->setDate($rrule->enddate->format('Y'), $rrule->enddate->format('m'),
 					$rrule->enddate->format('d'));
 				$recurrence->until = $enddate->format('server');
@@ -1198,12 +1320,19 @@ 
 				{
 					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." Exceptions found but no UID given for Event:".$event['id'].' Exceptions:'.array2string($event['recur_exception']));
 				}
-				if (count($ex_events)>=1) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
+				if (count($ex_events)>=1)
+				{
+					ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." found ".count($ex_events)." exeptions for event with UID/ID:".$event['uid'].'/'.$event['id']);
+				}
 
 				$message->exceptions = array();
 				foreach($ex_events as $ex_event)
 				{
-					if ($ex_event['id'] == $event['id']) continue;	// ignore series master
+					if ($ex_event['id'] == $event['id'])
+					{
+						continue;
+					}
+					// ignore series master
 					$exception = $this->GetMessage($folderid, $ex_event, $contentparameters, 'SyncAppointmentException');
 					$exception->exceptionstarttime = $exception_time = $ex_event['recurrence'];
 					foreach(array('attendees','recurrence','uid','timezone','organizername','organizeremail') as $not_supported)
@@ -1223,7 +1352,10 @@ 
 				{
 					if (!empty($exception_time))
 					{
-						if (empty($event['uid'])) ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
+						if (empty($event['uid']))
+						{
+							ZLog::Write(LOGLEVEL_DEBUG, __METHOD__.__LINE__." BEWARE no UID given for this event:".$event['id'].' but exception is set for '.$exception_time);
+						}
 						$exception = new SyncAppointmentException();	// exceptions seems to be full SyncAppointments, with only starttime required
 						$exception->deleted = 1;
 						$exception->exceptionstarttime = $exception_time;
@@ -1279,12 +1411,18 @@ 
 	{
 		unset($folderid);	// not used ($id is unique), but required by function signature
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 
 		$nul = null;
-		if (!($etag = $this->calendar->get_etag($id, $nul, true, true)))	// last true: $only_master=true
+		if (!($etag = $this->calendar->get_etag($id, $nul, true, true)))
+		{
+			// last true: $only_master=true
 		{
 			$stat = false;
+		}
 			// error_log why access is denied (should never happen for everything returned by calendar_bo::search)
 			$backup = $this->calendar->debug;
 			//$this->calendar->debug = 2;
@@ -1318,13 +1456,22 @@ 
 		$type = $owner = null;
 		$this->backend->splitID($folderid, $type, $owner);
 
-		if ($type != 'calendar') return false;
+		if ($type != 'calendar')
+		{
+			return false;
+		}
 
-		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
+		if (!isset($this->calendar))
+		{
+			$this->calendar = new calendar_boupdate();
+		}
 		//$ctag = $this->calendar->get_ctag($owner,'owner',true);	// true only consider recurrence master
 		$syncstate = $this->calendar->get_ctag($owner,false,true); // we only want to fetch the owners events, where he is a participant too
 		// workaround for syncstate = 0 when calendar is empty causes synctate to not return 0 but array resulting in foldersync loop
-		if ($syncstate == 0) $syncstate = 1;
+		if ($syncstate == 0)
+		{
+			$syncstate = 1;
+		}
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', ...) type='$type', owner=$owner --> syncstate='$syncstate'");
 	}
@@ -1400,10 +1547,16 @@ 
 			'dstendhour' => 0, 'dstendminute' => 0, 'dstendsecond' => 0, 'dstendmillis' => 0,
 		);
 
-		if ($tz === 'UTC') return $data;
+		if ($tz === 'UTC')
+		{
+			return $data;
+		}
 
 		$name = $component = is_a($tz,'DateTimeZone') ? $tz->getName() : $tz;
-		if (strpos($component, 'VTIMEZONE') === false) $component = calendar_timezones::tz2id($name,'component');
+		if (strpos($component, 'VTIMEZONE') === false)
+		{
+			$component = calendar_timezones::tz2id($name,'component');
+		}
 		// parse ical timezone defintion
 		$ical = self::ical2array($component);
 		$standard = $ical['VTIMEZONE']['STANDARD'];
@@ -1446,11 +1599,17 @@ 
 						$data[$prefix.'week'] = 5;
 					}
 					// if both start and end use 1SU use week=5 and decrement month
-					if ($prefix == 'dststart') $start_byday = $matches[1];
+					if ($prefix == 'dststart')
+					{
+						$start_byday = $matches[1];
+					}
 					if ($prefix == 'dstend' && $matches[1] == '1SU' && $start_byday == '1SU')
 					{
 						$data[$prefix.'week'] = 5;
-						if ($prefix == 'dstend') $data[$prefix.'month'] -= 1;
+						if ($prefix == 'dstend')
+						{
+							$data[$prefix.'month'] -= 1;
+						}
 					}
 					static $day2int = array('SU'=>0,'MO'=>1,'TU'=>2,'WE'=>3,'TH'=>4,'FR'=>5,'SA'=>6);
 					$data[$prefix.'day'] = (int)$day2int[substr($matches[1],-2)];
@@ -1526,7 +1685,10 @@ 
 	static public function ical2array(&$ical,$section=null)
 	{
 		$arr = array();
-		if (!is_array($ical)) $ical = preg_split("/[\r\n]+/m", $ical);
+		if (!is_array($ical))
+		{
+			$ical = preg_split("/[\r\n]+/m", $ical);
+		}
 		while (($line = array_shift($ical)))
 		{
 			list($name,$value) = explode(':',$line,2);
@@ -1536,7 +1698,10 @@ 
 			}
 			elseif($name == 'END')
 			{
-				if ($section && $section==$value) return $arr;
+				if ($section && $section==$value)
+				{
+					return $arr;
+				}
 				break;
 			}
 			else
@@ -1567,13 +1732,19 @@ 
 
 		for($n = 0; !isset($cache[$key]); ++$n)
 		{
-			if (!$n)	// check users timezone first
+			if (!$n)
+			{
+				// check users timezone first
 			{
 				$tz = Api\DateTime::$user_timezone->getName();
 			}
-			elseif (!($tz = calendar_timezones::id2tz($n)))	// no further timezones to check
+			}
+			elseif (!($tz = calendar_timezones::id2tz($n)))
+			{
+				// no further timezones to check
 			{
 				$cache[$key] = 'UTC';
+			}
 				error_log(__METHOD__.'('.array2string($data).') NO matching timezone found --> using UTC now!');
 				break;
 			}
@@ -1637,7 +1808,11 @@ 
 				$account_id = $entry['grantor'];
 				$cals[$account_id] = $entry['name'];
 			}
-			if ($hook_data['account_id'] > 0) unset($cals[$hook_data['account_id']]);	// skip current user
+			if ($hook_data['account_id'] > 0)
+			{
+				unset($cals[$hook_data['account_id']]);
+			}
+			// skip current user
 		}
 		$cals['G'] = lang('Primary group');
 		$cals['A'] = lang('All');
@@ -1665,13 +1840,16 @@ 
  *
  * You need to comment implements activesync_plugin_write
  */
-if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)
+{
+	// some tests
 {
 	$GLOBALS['egw_info'] = array(
 		'flags' => array(
 			'currentapp' => 'login'
 		)
 	);
+}
 	require_once('../../header.inc.php');
 	ini_set('display_errors',1);
 	error_reporting(E_ALL & ~E_NOTICE);

calendar/setup/tables_update.inc.php

Doc Comments +5 added lines, -1 removed lines

@@ -11,6 +11,10 @@ 
 
 use EGroupware\Api;
 
+/**
+ * @param string $table
+ * @param string $field
+ */
 function calendar_v0_9_2to0_9_3update_owner($table, $field)
 {
 	$GLOBALS['egw_setup']->oProc->query("select distinct($field) from $table");
@@ -2306,7 +2310,7 @@ 
  *
  * Also fix recurring events containing a reference to an other master, created when an exception is made a recurring event.
  *
- * @return type
+ * @return string
  */
 function calendar_upgrade14_1()
 {

Indentation +1 added lines, -1 removed lines

@@ -1909,7 +1909,7 @@
 			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
 	}
 
-    $GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
 			WHERE recur_interval=0',__LINE__,__FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.007';

Spacing +437 added lines, -437 removed lines

@@ -20,7 +20,7 @@ 
 		{
 			$owner[count($owner)] = $GLOBALS['egw_setup']->oProc->f($field);
 		}
-		if($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],'0.9.10pre4'))
+		if ($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'], '0.9.10pre4'))
 		{
 			$acctstbl = 'accounts';
 		}
@@ -28,7 +28,7 @@ 
 		{
 			$acctstbl = 'phpgw_accounts';
 		}
-		for($i=0;$i<count($owner);$i++)
+		for ($i = 0; $i < count($owner); $i++)
 		{
 			$GLOBALS['egw_setup']->oProc->query("SELECT account_id FROM $acctstbl WHERE account_lid='".$owner[$i]."'");
 			$GLOBALS['egw_setup']->oProc->next_record();
@@ -41,8 +41,8 @@ 
 
 function calendar_upgrade0_9_3pre1()
 {
-	calendar_v0_9_2to0_9_3update_owner('webcal_entry','cal_create_by');
-	calendar_v0_9_2to0_9_3update_owner('webcal_entry_user','cal_login');
+	calendar_v0_9_2to0_9_3update_owner('webcal_entry', 'cal_create_by');
+	calendar_v0_9_2to0_9_3update_owner('webcal_entry_user', 'cal_login');
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre2';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
 }
@@ -209,12 +209,12 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry', __LINE__, __FILE__);
 	$GLOBALS['egw_setup']->oProc->next_record();
-	if($GLOBALS['egw_setup']->oProc->f(0))
+	if ($GLOBALS['egw_setup']->oProc->f(0))
 	{
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time FROM webcal_entry ORDER BY cal_id',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time FROM webcal_entry ORDER BY cal_id', __LINE__, __FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$cal_owner = $GLOBALS['egw_setup']->oProc->f('cal_owner');
@@ -224,13 +224,13 @@ 
 			$cal_access = $GLOBALS['egw_setup']->oProc->f('cal_access');
 			$cal_name = $GLOBALS['egw_setup']->oProc->f('cal_name');
 			$cal_description = $GLOBALS['egw_setup']->oProc->f('cal_description');
-			$datetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),4))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),2,2))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),0,2))),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),0,4)));
-			$moddatetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),4))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),2,2))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),0,2))),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),0,4)));
-			$db2->query('SELECT groups FROM webcal_entry_groups WHERE cal_id='.$cal_id,__LINE__,__FILE__);
+			$datetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')), 4))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')), 2, 2))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')), 0, 2))), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'), 4, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'), 6, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'), 0, 4)));
+			$moddatetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')), 4))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')), 2, 2))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')), 0, 2))), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'), 4, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'), 6, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'), 0, 4)));
+			$db2->query('SELECT groups FROM webcal_entry_groups WHERE cal_id='.$cal_id, __LINE__, __FILE__);
 			$db2->next_record();
 			$cal_group = $db2->f('groups');
 			$db2->query('INSERT INTO calendar_entry(cal_id,cal_owner,cal_group,cal_datetime,cal_mdatetime,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description) '
-				.'VALUES('.$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')",__LINE__,__FILE__);
+				.'VALUES('.$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')", __LINE__, __FILE__);
 		}
 	}
 
@@ -251,17 +251,17 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_user',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_user', __LINE__, __FILE__);
 	$GLOBALS['egw_setup']->oProc->next_record();
-	if($GLOBALS['egw_setup']->oProc->f(0))
+	if ($GLOBALS['egw_setup']->oProc->f(0))
 	{
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY cal_id',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY cal_id', __LINE__, __FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$cal_login = $GLOBALS['egw_setup']->oProc->f('cal_login');
 			$cal_status = $GLOBALS['egw_setup']->oProc->f('cal_status');
-			$db2->query('INSERT INTO calendar_entry_user(cal_id,cal_login,cal_status) VALUES('.$cal_id.','.$cal_login.",'".$cal_status."')",__LINE__,__FILE__);
+			$db2->query('INSERT INTO calendar_entry_user(cal_id,cal_login,cal_status) VALUES('.$cal_id.','.$cal_login.",'".$cal_status."')", __LINE__, __FILE__);
 		}
 	}
 
@@ -284,18 +284,18 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_repeats',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_repeats', __LINE__, __FILE__);
 	$GLOBALS['egw_setup']->oProc->next_record();
-	if($GLOBALS['egw_setup']->oProc->f(0))
+	if ($GLOBALS['egw_setup']->oProc->f(0))
 	{
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER BY cal_id',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER BY cal_id', __LINE__, __FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$cal_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
-			if(isset($GLOBALS['egw_setup']->oProc->Record['cal_end']))
+			if (isset($GLOBALS['egw_setup']->oProc->Record['cal_end']))
 			{
-				$enddate = mktime(0,0,0,intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),0,4)));
+				$enddate = mktime(0, 0, 0, intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'), 4, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'), 6, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'), 0, 4)));
 				$useend = 1;
 			}
 			else
@@ -305,12 +305,12 @@ 
 			}
 			$cal_frequency = $GLOBALS['egw_setup']->oProc->f('cal_frequency');
 			$cal_days = $GLOBALS['egw_setup']->oProc->f('cal_days');
-			$db2->query('INSERT INTO calendar_entry_repeats(cal_id,cal_type,cal_use_end,cal_end,cal_frequency,cal_days) VALUES('.$cal_id.",'".$cal_type."',".$useend.",".$enddate.",".$cal_frequency.",'".$cal_days."')",__LINE__,__FILE__);
+			$db2->query('INSERT INTO calendar_entry_repeats(cal_id,cal_type,cal_use_end,cal_end,cal_frequency,cal_days) VALUES('.$cal_id.",'".$cal_type."',".$useend.",".$enddate.",".$cal_frequency.",'".$cal_days."')", __LINE__, __FILE__);
 		}
 	}
 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_repeats');
-	$GLOBALS['egw_setup']->oProc->query("UPDATE {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'", __LINE__, __FILE__);
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre2';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -322,19 +322,19 @@ 
 	$db2 = $GLOBALS['egw_setup']->db;
 
 	$GLOBALS['egw_setup']->oProc->RenameColumn('calendar_entry', 'cal_duration', 'cal_edatetime');
-	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_datetime,cal_owner,cal_edatetime,cal_mdatetime FROM calendar_entry ORDER BY cal_id',__LINE__,__FILE__);
-	if($GLOBALS['egw_setup']->oProc->num_rows())
+	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_datetime,cal_owner,cal_edatetime,cal_mdatetime FROM calendar_entry ORDER BY cal_id', __LINE__, __FILE__);
+	if ($GLOBALS['egw_setup']->oProc->num_rows())
 	{
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
-			$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$GLOBALS['egw_setup']->db->f('cal_owner'),__LINE__,__FILE__);
+			$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$GLOBALS['egw_setup']->db->f('cal_owner'), __LINE__, __FILE__);
 			$db2->next_record();
 			$tz = $db2->f('preference_value');
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$datetime = $GLOBALS['egw_setup']->oProc->f('cal_datetime') - ((60 * 60) * $tz);
 			$mdatetime = $GLOBALS['egw_setup']->oProc->f('cal_mdatetime') - ((60 * 60) * $tz);
 			$edatetime = $datetime + (60 * $GLOBALS['egw_setup']->oProc->f('cal_edatetime'));
-			$db2->query('UPDATE calendar_entry SET cal_datetime='.$datetime.', cal_edatetime='.$edatetime.', cal_mdatetime='.$mdatetime.' WHERE cal_id='.$cal_id,__LINE__,__FILE__);
+			$db2->query('UPDATE calendar_entry SET cal_datetime='.$datetime.', cal_edatetime='.$edatetime.', cal_mdatetime='.$mdatetime.' WHERE cal_id='.$cal_id, __LINE__, __FILE__);
 		}
 	}
 
@@ -582,22 +582,22 @@ 
 {
 	$db2 = $GLOBALS['egw_setup']->db;
 
-	if(extension_loaded('mcal') == False)
+	if (extension_loaded('mcal') == False)
 	{
-		define(RECUR_NONE,0);
-		define(RECUR_DAILY,1);
-		define(RECUR_WEEKLY,2);
-		define(RECUR_MONTHLY_MDAY,3);
-		define(RECUR_MONTHLY_WDAY,4);
-		define(RECUR_YEARLY,5);
-
-		define(M_SUNDAY,1);
-		define(M_MONDAY,2);
-		define(M_TUESDAY,4);
-		define(M_WEDNESDAY,8);
-		define(M_THURSDAY,16);
-		define(M_FRIDAY,32);
-		define(M_SATURDAY,64);
+		define(RECUR_NONE, 0);
+		define(RECUR_DAILY, 1);
+		define(RECUR_WEEKLY, 2);
+		define(RECUR_MONTHLY_MDAY, 3);
+		define(RECUR_MONTHLY_WDAY, 4);
+		define(RECUR_YEARLY, 5);
+
+		define(M_SUNDAY, 1);
+		define(M_MONDAY, 2);
+		define(M_TUESDAY, 4);
+		define(M_WEDNESDAY, 8);
+		define(M_THURSDAY, 16);
+		define(M_FRIDAY, 32);
+		define(M_SATURDAY, 64);
 	}
 
 // calendar_entry => phpgw_cal
@@ -624,13 +624,13 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 		$owner = $GLOBALS['egw_setup']->oProc->f('cal_owner');
 		$access = $GLOBALS['egw_setup']->oProc->f('cal_access');
-		switch($access)
+		switch ($access)
 		{
 			case 'private':
 				$is_public = 0;
@@ -652,7 +652,7 @@ 
 		$description = $GLOBALS['egw_setup']->oProc->f('cal_description');
 
 		$db2->query("INSERT INTO phpgw_cal(cal_id,owner,groups,datetime,mdatetime,edatetime,priority,cal_type,is_public,title,description) "
-			. "VALUES($id,$owner,'$groups',$datetime,$mdatetime,$edatetime,$priority,'$type',$is_public,'$title','$description')",__LINE__,__FILE__);
+			. "VALUES($id,$owner,'$groups',$datetime,$mdatetime,$edatetime,$priority,'$type',$is_public,'$title','$description')", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->oProc->DropTable('calendar_entry');
 
@@ -660,12 +660,12 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_repeats',
 		Array(
 			'fd' => array(
-				'cal_id' => array('type' => 'int', 'precision' => 8,'nullable' => False),
-				'recur_type' => array('type' => 'int', 'precision' => 8,'nullable' => False),
-				'recur_use_end' => array('type' => 'int', 'precision' => 8,'nullable' => True),
-				'recur_enddate' => array('type' => 'int', 'precision' => 8,'nullable' => True),
-				'recur_interval' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1'),
-				'recur_data' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1')
+				'cal_id' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
+				'recur_type' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
+				'recur_use_end' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
+				'recur_enddate' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
+				'recur_interval' => array('type' => 'int', 'precision' => 8, 'nullable' => True, 'default' => '1'),
+				'recur_data' => array('type' => 'int', 'precision' => 8, 'nullable' => True, 'default' => '1')
 			),
 			'pk' => array(),
 			'fk' => array(),
@@ -673,12 +673,12 @@ 
 			'uc' => array()
 		)
 	);
-	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 		$recur_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
-		switch($recur_type)
+		switch ($recur_type)
 		{
 			case 'daily':
 				$recur_type_num = RECUR_DAILY;
@@ -701,20 +701,20 @@ 
 		$recur_interval = $GLOBALS['egw_setup']->oProc->f('cal_frequency');
 		$days = strtoupper($GLOBALS['egw_setup']->oProc->f('cal_days'));
 		$recur_data = 0;
-		$recur_data += (substr($days,0,1)=='Y'?M_SUNDAY:0);
-		$recur_data += (substr($days,1,1)=='Y'?M_MONDAY:0);
-		$recur_data += (substr($days,2,1)=='Y'?M_TUESDAY:0);
-		$recur_data += (substr($days,3,1)=='Y'?M_WEDNESDAY:0);
-		$recur_data += (substr($days,4,1)=='Y'?M_THURSDAY:0);
-		$recur_data += (substr($days,5,1)=='Y'?M_FRIDAY:0);
-		$recur_data += (substr($days,6,1)=='Y'?M_SATURDAY:0);
+		$recur_data += (substr($days, 0, 1) == 'Y' ? M_SUNDAY : 0);
+		$recur_data += (substr($days, 1, 1) == 'Y' ? M_MONDAY : 0);
+		$recur_data += (substr($days, 2, 1) == 'Y' ? M_TUESDAY : 0);
+		$recur_data += (substr($days, 3, 1) == 'Y' ? M_WEDNESDAY : 0);
+		$recur_data += (substr($days, 4, 1) == 'Y' ? M_THURSDAY : 0);
+		$recur_data += (substr($days, 5, 1) == 'Y' ? M_FRIDAY : 0);
+		$recur_data += (substr($days, 6, 1) == 'Y' ? M_SATURDAY : 0);
 		$db2->query("INSERT INTO phpgw_cal_repeats(cal_id,recur_type,recur_use_end,recur_enddate,recur_interval,recur_data) "
-			. "VALUES($id,$recur_type_num,$recur_use_end,$recur_end,$recur_interval,$recur_data)",__LINE__,__FILE__);
+			. "VALUES($id,$recur_type_num,$recur_use_end,$recur_end,$recur_interval,$recur_data)", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->oProc->DropTable('calendar_entry_repeats');
 
 // calendar_entry_user => phpgw_cal_user
-	$GLOBALS['egw_setup']->oProc->RenameTable('calendar_entry_user','phpgw_cal_user');
+	$GLOBALS['egw_setup']->oProc->RenameTable('calendar_entry_user', 'phpgw_cal_user');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.002';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -733,11 +733,11 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
 		Array(
 			'fd' => array(
-				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
-				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
-				'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
+				'locale' => array('type' => 'char', 'precision' => 2, 'nullable' => False),
+				'name' => array('type' => 'varchar', 'precision' => 50, 'nullable' => False),
+				'date_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0')
 			),
-			'pk' => array('locale','name'),
+			'pk' => array('locale', 'name'),
 			'fk' => array(),
 			'ix' => array(),
 			'uc' => array()
@@ -769,10 +769,10 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
 		Array(
 			'fd' => array(
-				'hol_id' => array('type' => 'auto','nullable' => False),
-				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
-				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
-				'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
+				'hol_id' => array('type' => 'auto', 'nullable' => False),
+				'locale' => array('type' => 'char', 'precision' => 2, 'nullable' => False),
+				'name' => array('type' => 'varchar', 'precision' => 50, 'nullable' => False),
+				'date_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0')
 			),
 			'pk' => array('hol_id'),
 			'fk' => array(),
@@ -789,10 +789,10 @@ 
 function calendar_upgrade0_9_11_007()
 {
 	$GLOBALS['egw_setup']->oProc->query('DELETE FROM phpgw_cal_holidays');
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','mday',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','month_num',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','occurence',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','dow',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'mday', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'month_num', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'occurence', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'dow', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.008';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -809,7 +809,7 @@ 
 function calendar_upgrade0_9_11_009()
 {
 	$GLOBALS['egw_setup']->oProc->query('DELETE FROM phpgw_cal_holidays');
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','observance_rule',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'observance_rule', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.010';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -844,7 +844,7 @@ 
 
 function calendar_upgrade0_9_13_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','reference',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'reference', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.003';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -856,7 +856,7 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_alarm',
 		Array(
 			'fd' => array(
-				'alarm_id' => array('type' => 'auto','nullable' => False),
+				'alarm_id' => array('type' => 'auto', 'nullable' => False),
 				'cal_id'   => array('type' => 'int', 'precision' => 8, 'nullable' => False),
 				'cal_owner'	=> array('type' => 'int', 'precision' => 8, 'nullable' => False),
 				'cal_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
@@ -869,8 +869,8 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','uid',array('type' => 'varchar', 'precision' => 255,'nullable' => False));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','location',array('type' => 'varchar', 'precision' => 255,'nullable' => True));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'uid', array('type' => 'varchar', 'precision' => 255, 'nullable' => False));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'location', array('type' => 'varchar', 'precision' => 255, 'nullable' => True));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.004';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -879,7 +879,7 @@ 
 
 function calendar_upgrade0_9_13_004()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_alarm','alarm_enabled',array('type' => 'int', 'precision' => 4,'nullable' => False, 'default' => '1'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_alarm', 'alarm_enabled', array('type' => 'int', 'precision' => 4, 'nullable' => False, 'default' => '1'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.005';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -889,18 +889,18 @@ 
 function calendar_upgrade0_9_13_005()
 {
 	$calendar_data = Array();
-	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$calendar_data[$GLOBALS['egw_setup']->oProc->f('cal_id')] = $GLOBALS['egw_setup']->oProc->f('category');
 	}
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','category',array('type' => 'varchar', 'precision' => 30,'nullable' => True));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal', 'category', array('type' => 'varchar', 'precision' => 30, 'nullable' => True));
 
 	@reset($calendar_data);
-	while($calendar_data && list($cal_id,$category) = each($calendar_data))
+	while ($calendar_data && list($cal_id, $category) = each($calendar_data))
 	{
-		$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_cal SET category='".$category."' WHERE cal_id=".$cal_id,__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_cal SET category='".$category."' WHERE cal_id=".$cal_id, __LINE__, __FILE__);
 	}
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.006';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -909,7 +909,7 @@ 
 
 function calendar_upgrade0_9_13_006()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_repeats','recur_exception',array('type' => 'varchar', 'precision' => 255, 'nullable' => True, 'default' => ''));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_repeats', 'recur_exception', array('type' => 'varchar', 'precision' => 255, 'nullable' => True, 'default' => ''));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.007';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -919,20 +919,20 @@ 
 
 function calendar_upgrade0_9_13_007()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user','cal_type',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user', 'cal_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
 		'default' => 'u'
 	));
 
-	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_extra',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_extra', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_extra_name' => array('type' => 'varchar','precision' => '40','nullable' => False),
-			'cal_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_extra_name' => array('type' => 'varchar', 'precision' => '40', 'nullable' => False),
+			'cal_extra_value' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('cal_id','cal_extra_name'),
+		'pk' => array('cal_id', 'cal_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -949,7 +949,7 @@ 
 function calendar_upgrade0_9_16_001()
 {
 	// this is to set the default as schema_proc was not setting an empty default
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal_user','cal_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal_user', 'cal_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
@@ -966,15 +966,15 @@ 
 
 function calendar_upgrade0_9_16_002()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_use_end' => array('type' => 'int','precision' => '8','default' => '0'),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_use_end' => array('type' => 'int', 'precision' => '8', 'default' => '0'),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_exception' => array('type' => 'varchar', 'precision' => '255', 'default' => '')
 		),
 		'pk' => array(),
 		'fk' => array(),
@@ -990,14 +990,14 @@ 
 
 function calendar_upgrade0_9_16_003()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_login' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_status' => array('type' => 'char','precision' => '1','default' => 'A'),
-			'cal_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_login' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_status' => array('type' => 'char', 'precision' => '1', 'default' => 'A'),
+			'cal_type' => array('type' => 'varchar', 'precision' => '1', 'nullable' => False, 'default' => 'u')
 		),
-		'pk' => array('cal_id','cal_login','cal_type'),
+		'pk' => array('cal_id', 'cal_login', 'cal_type'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1011,16 +1011,16 @@ 
 
 function calendar_upgrade0_9_16_004()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_holidays',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_holidays', array(
 		'fd' => array(
-			'hol_id' => array('type' => 'auto','nullable' => False),
-			'locale' => array('type' => 'char','precision' => '2','nullable' => False),
-			'name' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'mday' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'month_num' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'occurence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'dow' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'observance_rule' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'hol_id' => array('type' => 'auto', 'nullable' => False),
+			'locale' => array('type' => 'char', 'precision' => '2', 'nullable' => False),
+			'name' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False),
+			'mday' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'month_num' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'occurence' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'dow' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'observance_rule' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('hol_id'),
 		'fk' => array(),
@@ -1038,13 +1038,13 @@ 
 {
 	// creates uid's for all entries which do not have unique ones, they are '-@domain.com'
 	// very old entries even have an empty uid, see 0.9.16.006 update
-	$GLOBALS['egw_setup']->oProc->query("SELECT config_name,config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_name IN ('install_id','mail_suffix') AND config_app='phpgwapi'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("SELECT config_name,config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_name IN ('install_id','mail_suffix') AND config_app='phpgwapi'", __LINE__, __FILE__);
 	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$config[$GLOBALS['egw_setup']->oProc->f(0)] = $GLOBALS['egw_setup']->oProc->f(1);
 	}
 	$GLOBALS['egw_setup']->oProc->query('UPDATE phpgw_cal SET uid='.
-		$GLOBALS['egw_setup']->db->concat($GLOBALS['egw_setup']->db->quote('cal-'),'cal_id',
+		$GLOBALS['egw_setup']->db->concat($GLOBALS['egw_setup']->db->quote('cal-'), 'cal_id',
 			$GLOBALS['egw_setup']->db->quote('-'.$config['install_id'].'@'.
 			($config['mail_suffix'] ? $config['mail_suffix'] : 'local'))).
 		" WHERE uid LIKE '-@%' OR uid=''");
@@ -1067,7 +1067,7 @@ 
 function calendar_upgrade0_9_16_007()
 {
 	// update the sequenzes for refreshed tables (postgres only)
-	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_cal_holidays','hol_id');
+	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_cal_holidays', 'hol_id');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1077,19 +1077,19 @@ 
 
 function calendar_upgrade1_0_0()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','uid','cal_uid');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','owner','cal_owner');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','category','cal_category');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','groups','cal_groups');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','datetime','cal_starttime');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','mdatetime','cal_modified');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','edatetime','cal_endtime');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','priority','cal_priority');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','is_public','cal_public');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','title','cal_title');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','description','cal_description');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','location','cal_location');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','reference','cal_reference');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'uid', 'cal_uid');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'owner', 'cal_owner');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'category', 'cal_category');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'groups', 'cal_groups');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'datetime', 'cal_starttime');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'mdatetime', 'cal_modified');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'edatetime', 'cal_endtime');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'priority', 'cal_priority');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'is_public', 'cal_public');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'title', 'cal_title');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'description', 'cal_description');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'location', 'cal_location');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'reference', 'cal_reference');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.001';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1099,13 +1099,13 @@ 
 
 function calendar_upgrade1_0_0_001()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','locale','hol_locale');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','name','hol_name');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','mday','hol_mday');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','month_num','hol_month_num');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','occurence','hol_occurence');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','dow','hol_dow');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','observance_rule','hol_observance_rule');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'locale', 'hol_locale');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'name', 'hol_name');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'mday', 'hol_mday');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'month_num', 'hol_month_num');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'occurence', 'hol_occurence');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'dow', 'hol_dow');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'observance_rule', 'hol_observance_rule');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.002';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1115,8 +1115,8 @@ 
 
 function calendar_upgrade1_0_0_002()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user','cal_login','cal_user_id');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user','cal_type','cal_user_type');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user', 'cal_login', 'cal_user_id');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user', 'cal_type', 'cal_user_type');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.003';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1126,7 +1126,7 @@ 
 
 function calendar_upgrade1_0_0_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','cal_title',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal', 'cal_title', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False,
@@ -1141,15 +1141,15 @@ 
 
 function calendar_upgrade1_0_0_004()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_use_end' => array('type' => 'int','precision' => '8','default' => '0'),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_use_end' => array('type' => 'int', 'precision' => '8', 'default' => '0'),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_exception' => array('type' => 'varchar', 'precision' => '255', 'default' => '')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
@@ -1166,19 +1166,19 @@ 
 function calendar_upgrade1_0_0_005()
 {
 	// change prefix of all calendar tables to egw_
-	foreach(array('cal_user','cal_repeats','cal_extra','cal_holidays','cal') as $name)
+	foreach (array('cal_user', 'cal_repeats', 'cal_extra', 'cal_holidays', 'cal') as $name)
 	{
-		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_'.$name,'egw_'.$name);
+		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_'.$name, 'egw_'.$name);
 	}
 
 	// create new dates table, with content from the egw_cal table
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_dates',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_dates', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_start' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_end' => array('type' => 'int','precision' => '8','nullable' => False)
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_start' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_end' => array('type' => 'int', 'precision' => '8', 'nullable' => False)
 		),
-		'pk' => array('cal_id','cal_start'),
+		'pk' => array('cal_id', 'cal_start'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1186,49 +1186,49 @@ 
 	$GLOBALS['egw_setup']->oProc->query("INSERT INTO egw_cal_dates SELECT cal_id,cal_starttime,cal_endtime FROM egw_cal");
 
 	// drop the fields transfered to the dates table
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_groups' => array('type' => 'varchar','precision' => '255'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_endtime' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-			'cal_type' => array('type' => 'varchar','precision' => '10'),
-			'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_groups' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_endtime' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '2'),
+			'cal_type' => array('type' => 'varchar', 'precision' => '10'),
+			'cal_public' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_starttime');
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	), 'cal_starttime');
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_groups' => array('type' => 'varchar','precision' => '255'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-			'cal_type' => array('type' => 'varchar','precision' => '10'),
-			'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_groups' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '2'),
+			'cal_type' => array('type' => 'varchar', 'precision' => '10'),
+			'cal_public' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_endtime');
+	), 'cal_endtime');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.001';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1244,15 +1244,15 @@ 
 		'precision' => '8',
 		'default' => '0'
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_recur_date' => array('type' => 'int','precision' => '8','default' => '0'),
-			'cal_user_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u'),
-			'cal_user_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_status' => array('type' => 'char','precision' => '1','default' => 'A')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_recur_date' => array('type' => 'int', 'precision' => '8', 'default' => '0'),
+			'cal_user_type' => array('type' => 'varchar', 'precision' => '1', 'nullable' => False, 'default' => 'u'),
+			'cal_user_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_status' => array('type' => 'char', 'precision' => '1', 'default' => 'A')
 		),
-		'pk' => array('cal_id','cal_recur_date','cal_user_type','cal_user_id'),
+		'pk' => array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1266,50 +1266,50 @@ 
 
 function calendar_upgrade1_0_1_002()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_groups' => array('type' => 'varchar','precision' => '255'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_groups' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_type');
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_owner',array(
+	), 'cal_type');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_owner', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_priority',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_priority', array(
 		'type' => 'int',
 		'precision' => '2',
 		'nullable' => False,
 		'default' => '2'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_public',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_public', array(
 		'type' => 'int',
 		'precision' => '2',
 		'nullable' => False,
 		'default' => '1'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_reference',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_reference', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_modifier',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_modifier', array(
 		'type' => 'int',
 		'precision' => '4'
 	));
@@ -1322,36 +1322,36 @@ 
 
 function calendar_upgrade1_0_1_003()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_exception' => array('type' => 'varchar', 'precision' => '255', 'default' => '')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'recur_use_end');
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','cal_id',array(
+	), 'recur_use_end');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'cal_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_type', array(
 		'type' => 'int',
 		'precision' => '2',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_interval',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_interval', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '1'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_data',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_data', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '1'
@@ -1365,13 +1365,13 @@ 
 
 function calendar_upgrade1_0_1_004()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
@@ -1386,7 +1386,7 @@ 
 
 function calendar_upgrade1_0_1_005()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_quantity',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_quantity', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '1'
@@ -1400,7 +1400,7 @@ 
 
 function calendar_upgrade1_0_1_006()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_non_blocking',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_non_blocking', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '0'
@@ -1414,9 +1414,9 @@ 
 
 function calendar_upgrade1_0_1_007()
 {
-	$GLOBALS['egw_setup']->db->update('egw_cal_repeats',array('recur_exception' => null),array('recur_exception' => ''),__LINE__,__FILE__,'calendar');
+	$GLOBALS['egw_setup']->db->update('egw_cal_repeats', array('recur_exception' => null), array('recur_exception' => ''), __LINE__, __FILE__, 'calendar');
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_exception',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_exception', array(
 		'type' => 'text'
 	));
 
@@ -1433,11 +1433,11 @@ 
 	{
 		$customfields = array();
 		$order = 0;
-		foreach($config_data['fields'] as $name => $data)
+		foreach ($config_data['fields'] as $name => $data)
 		{
 			if ($name{0} == '#' && !$data['disabled'])	// real not-disabled custom field
 			{
-				$customfields[substr($name,1)] = array(
+				$customfields[substr($name, 1)] = array(
 					'type'  => 'text',
 					'len'   => $data['length'].($data['shown'] ? ','.$data['shown'] : ''),
 					'label' => $data['name'],
@@ -1460,38 +1460,38 @@ 
 function calendar_upgrade1_0_1_009()
 {
 	$db2 = clone($GLOBALS['egw_setup']->db);
-	$GLOBALS['egw_setup']->db->select('egw_cal','DISTINCT egw_cal.cal_id,cal_groups,cal_recur_date',"cal_groups != ''",__LINE__,__FILE__,
-		False,'','calendar',0,',egw_cal_user WHERE egw_cal.cal_id=egw_cal_user.cal_id');
-	while(($row = $GLOBALS['egw_setup']->db->row(true)))
+	$GLOBALS['egw_setup']->db->select('egw_cal', 'DISTINCT egw_cal.cal_id,cal_groups,cal_recur_date', "cal_groups != ''", __LINE__, __FILE__,
+		False, '', 'calendar', 0, ',egw_cal_user WHERE egw_cal.cal_id=egw_cal_user.cal_id');
+	while (($row = $GLOBALS['egw_setup']->db->row(true)))
 	{
 		$row['cal_user_type'] = 'u';
-		foreach(explode(',',$row['cal_groups']) as $group)
+		foreach (explode(',', $row['cal_groups']) as $group)
 		{
 			$row['cal_user_id'] = $group;
-			$db2->insert('egw_cal_user',array('cal_status' => 'U'),$row,__LINE__,__FILE__,'calendar');
+			$db2->insert('egw_cal_user', array('cal_status' => 'U'), $row, __LINE__, __FILE__, 'calendar');
 		}
 	}
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'cal_modifier' => array('type' => 'int','precision' => '4'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_groups');
+	), 'cal_groups');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2';
 }
@@ -1501,7 +1501,7 @@ 
 function calendar_upgrade1_2()
 {
 	// get old alarms (saved before 1.2) working again
-	$GLOBALS['egw_setup']->db->query("UPDATE egw_async SET async_method ='calendar.bocalupdate.send_alarm' WHERE async_method ='calendar.bocalendar.send_alarm'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->db->query("UPDATE egw_async SET async_method ='calendar.bocalupdate.send_alarm' WHERE async_method ='calendar.bocalendar.send_alarm'", __LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2.001';
 }
@@ -1509,7 +1509,7 @@ 
 
 function calendar_upgrade1_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_special',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_special', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '0'
@@ -1527,7 +1527,7 @@ 
 
 function calendar_upgrade1_4()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_etag',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_etag', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0'
@@ -1539,59 +1539,59 @@ 
 
 function calendar_upgrade1_5()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'cal_modifier' => array('type' => 'int','precision' => '4'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4'),
-			'cal_edit_time' => array('type' => 'int','precision' => '8')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4'),
+			'cal_edit_time' => array('type' => 'int', 'precision' => '8')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_edit_user');
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	), 'cal_edit_user');
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'cal_modifier' => array('type' => 'int','precision' => '4'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_edit_time');
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_etag',array(
+	), 'cal_edit_time');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_etag', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_etag=0 WHERE cal_etag IS NULL',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_etag=0 WHERE cal_etag IS NULL', __LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.5.001';
 }
@@ -1599,12 +1599,12 @@ 
 
 function calendar_upgrade1_5_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'nullable' => False
@@ -1618,12 +1618,12 @@ 
 {
 	// update the alarm methods
 	$async = new Api\Asyncservice();
-	foreach((array)$async->read('cal:%') as $job)
+	foreach ((array)$async->read('cal:%') as $job)
 	{
 		if ($job['method'] == 'calendar.bocalupdate.send_alarm')
 		{
 			$job['method'] = 'calendar.calendar_boupdate.send_alarm';
-			$async->write($job,true);
+			$async->write($job, true);
 		}
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.6';
@@ -1640,48 +1640,48 @@ 
 {
 	// Set UID of series exception to UID of series master
 	// update cal_etag, cal_modified and cal_modifier to distribute changes on GroupDAV devices
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id,cal_ex.cal_uid AS cal_uid_ex,cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master ON cal_ex.cal_reference=cal_master.cal_id
-		WHERE cal_ex.cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		if (strlen($row['cal_uid_master']) > 0 && $row['cal_uid_ex'] != $row['cal_uid_master'])
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_uid=\''.$row['cal_uid_master'].
 				'\',cal_etag=cal_etag+1,cal_modified='.time().
-				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 
 	// Search series exception for nearest exception in series master and add that RECURRENCE-ID
 	// as cal_reference (for 1.6.003 and move it to new field cal_recurrence in 1.7.001)
 	$diff = null;
-	foreach($GLOBALS['egw_setup']->db->query('SELECT egw_cal.cal_id,cal_start,recur_exception FROM egw_cal
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT egw_cal.cal_id,cal_start,recur_exception FROM egw_cal
 		JOIN egw_cal_dates ON egw_cal.cal_id=egw_cal_dates.cal_id
 		JOIN egw_cal_repeats ON cal_reference=egw_cal_repeats.cal_id
-		WHERE cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		$recurrence = null;
-		foreach(explode(',',$row['recur_exception']) as $ts)
+		foreach (explode(',', $row['recur_exception']) as $ts)
 		{
-			if (is_null($recurrence) || abs($ts-$row['cal_start']) < $diff)
+			if (is_null($recurrence) || abs($ts - $row['cal_start']) < $diff)
 			{
 				$recurrence = $ts;
-				$diff = abs($ts-$row['cal_start']);
+				$diff = abs($ts - $row['cal_start']);
 			}
 		}
 		if ($recurrence)
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_reference='.(int)$recurrence.
-				' WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				' WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 		else
 		{
 			// if we cannot determine the RECURRENCE-ID use cal_start
 			// because RECURRENCE-ID must be present
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_reference='.(int)$row['cal_start'].
-				' WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				' WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 
@@ -1696,33 +1696,33 @@ 
  */
 function calendar_upgrade1_6_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_creator',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_creator', array(
 		'type' => 'int',
 		'precision' => '4',
 		'comment' => 'creating user'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_creator=cal_owner',__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_creator',array(
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_creator=cal_owner', __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_creator', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'comment' => 'creating user'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_created',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_created', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'creation time of event'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_created=cal_modified',__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_created',array(
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_created=cal_modified', __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_created', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'creation time of event'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_recurrence',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_recurrence', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
@@ -1733,14 +1733,14 @@ 
 	// move RECURRENCE-ID from temporarily (1.6.003)
 	// used field cal_reference to new field cal_recurrence
 	// and restore cal_reference field of series exceptions with id of the series master
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id AS cal_id_ex,cal_master.cal_id AS cal_id_master,
 		cal_ex.cal_reference AS cal_reference_ex,cal_ex.cal_uid AS cal_uid_ex,
 		cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master
 		ON cal_ex.cal_uid=cal_master.cal_uid AND cal_master.cal_reference = 0 AND cal_ex.cal_owner = cal_master.cal_owner
-		WHERE cal_ex.cal_reference !=0 AND cal_master.cal_id IS NOT NULL',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference !=0 AND cal_master.cal_id IS NOT NULL',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_recurrence='.(int)$row['cal_reference_ex'].
 			', cal_reference='.(int)$row['cal_id_master'].
@@ -1757,7 +1757,7 @@ 
  */
 function calendar_upgrade1_7_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_role',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_role', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'default' => 'REQ-PARTICIPANT'
@@ -1773,14 +1773,14 @@ 
  */
 function calendar_upgrade1_7_002()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_timezones',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_timezones', array(
 		'fd' => array(
-			'tz_id' => array('type' => 'auto','nullable' => False),
-			'tz_tzid' => array('type' => 'varchar','precision' => '128','nullable' => False),
-			'tz_alias' => array('type' => 'int','precision' => '4','comment' => 'tz_id for data'),
-			'tz_latitude' => array('type' => 'int','precision' => '4'),
-			'tz_longitude' => array('type' => 'int','precision' => '4'),
-			'tz_component' => array('type' => 'text','comment' => 'iCal VTIMEZONE component')
+			'tz_id' => array('type' => 'auto', 'nullable' => False),
+			'tz_tzid' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False),
+			'tz_alias' => array('type' => 'int', 'precision' => '4', 'comment' => 'tz_id for data'),
+			'tz_latitude' => array('type' => 'int', 'precision' => '4'),
+			'tz_longitude' => array('type' => 'int', 'precision' => '4'),
+			'tz_component' => array('type' => 'text', 'comment' => 'iCal VTIMEZONE component')
 		),
 		'pk' => array('tz_id'),
 		'fk' => array(),
@@ -1800,38 +1800,38 @@ 
  */
 function calendar_upgrade1_7_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
 		'default' => 'u',
 		'comment' => 'u=user, g=group, c=contact, r=resource, e=email'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'nullable' => False,
 		'comment' => 'id or email-address for type=e'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_status',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_status', array(
 		'type' => 'char',
 		'precision' => '1',
 		'default' => 'A',
 		'comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_quantity',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_quantity', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '1',
 		'comment' => 'only for certain types (eg. resources)'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_role',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_role', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'default' => 'REQ-PARTICIPANT',
 		'comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_user_modified',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_user_modified', array(
 		'type' => 'timestamp',
 		'default' => 'current_timestamp',
 		'comment' => 'automatic timestamp of last update'
@@ -1847,19 +1847,19 @@ 
  */
 function calendar_upgrade1_7_004()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates','cal_start',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates', 'cal_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'starttime in server time'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates','cal_end',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates', 'cal_end', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'endtime in server time'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','tz_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'tz_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'comment' => 'key into egw_cal_timezones'
@@ -1868,7 +1868,7 @@ 
 	// set id of server timezone for existing events, as that's the timezone their recurrences are using
 	if (($tzid = date_default_timezone_get()) && ($tz_id = calendar_timezones::tz2id($tzid)))
 	{
-		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET tz_id='.(int)$tz_id,__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET tz_id='.(int)$tz_id, __LINE__, __FILE__);
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.005';
 }
@@ -1895,22 +1895,22 @@ 
  */
 function calendar_upgrade1_7_006()
 {
-	foreach($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
-		WHERE (cal_end-cal_start)%86400=86340',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
+		WHERE (cal_end-cal_start)%86400=86340',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_dates SET cal_end=cal_end+59
-			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
+			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'], __LINE__, __FILE__);
 	}
 
-	foreach($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
-		WHERE cal_end-cal_start>0 AND (cal_end-cal_start)%86400=0',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
+		WHERE cal_end-cal_start>0 AND (cal_end-cal_start)%86400=0',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_dates SET cal_end=cal_end-1
-			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
+			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'], __LINE__, __FILE__);
 	}
 
     $GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
-			WHERE recur_interval=0',__LINE__,__FILE__);
+			WHERE recur_interval=0',__LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.007';
 }
@@ -1926,17 +1926,17 @@ 
 {
 	// Set UID of series exception to UID of series master
 	// update cal_etag,cal_modified and cal_modifier to distribute changes on GroupDAV devices
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id,cal_ex.cal_uid AS cal_uid_ex,cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master ON cal_ex.cal_reference=cal_master.cal_id
-		WHERE cal_ex.cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		if (strlen($row['cal_uid_master']) > 0 && $row['cal_uid_ex'] != $row['cal_uid_master'])
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_uid=\''.$row['cal_uid_master'].
 				'\',cal_etag=cal_etag+1,cal_modified='.time().
-				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.008';
@@ -1949,7 +1949,7 @@ 
  */
 function calendar_upgrade1_7_008()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user',array('cal_user_type','cal_user_id'));
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user', array('cal_user_type', 'cal_user_id'));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.009';
 }
@@ -1961,22 +1961,22 @@ 
  */
 function calendar_upgrade1_7_009()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_uid');
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_owner');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_uid');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_owner');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.010';
 }
 
 function calendar_upgrade1_7_010()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_deleted',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_deleted', array(
 		'type' => 'bool',
 		'nullable' => False,
 		'default' => '0',
 		'comment' => '1 if the event has been deleted, but you want to keep it around'
 	));
 
-	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001';	// was 1.7.011
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001'; // was 1.7.011
 }
 
 function calendar_upgrade1_7_011()
@@ -2001,7 +2001,7 @@ 
 function calendar_upgrade1_9_001()
 {
 	// delete in the past wrongly created entries for a single recurrence, which mess up the update, beside being wrong anyway
-	$GLOBALS['egw_setup']->db->delete('egw_api_content_history',array(
+	$GLOBALS['egw_setup']->db->delete('egw_api_content_history', array(
 		'sync_appname' => 'calendar',
 		"sync_contentid LIKE '%:%'",
 	), __LINE__, __FILE__);
@@ -2012,36 +2012,36 @@ 
 		'precision' => '8',
 		'comment' => 'ts when event was deleted'
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False,'comment' => 'unique id of event(-series)'),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'event owner / calendar'),
-			'cal_category' => array('type' => 'varchar','precision' => '30','comment' => 'category id'),
-			'cal_modified' => array('type' => 'int','precision' => '8','comment' => 'ts of last modification'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1','comment' => '1=public, 0=private event'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'comment' => 'unique id of event(-series)'),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'event owner / calendar'),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30', 'comment' => 'category id'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8', 'comment' => 'ts of last modification'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1', 'comment' => '1=public, 0=private event'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'cal_id of series for exception'),
-			'cal_modifier' => array('type' => 'int','precision' => '4','comment' => 'user who last modified event'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0','comment' => '1 for non-blocking events'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag for optimistic locking'),
-			'cal_creator' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'creating user'),
-			'cal_created' => array('type' => 'int','precision' => '8','nullable' => False,'comment' => 'creation time of event'),
-			'cal_recurrence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0','comment' => 'cal_start of original recurrence for exception'),
-			'tz_id' => array('type' => 'int','precision' => '4','comment' => 'key into egw_cal_timezones'),
-			'cal_deleted' => array('type' => 'int','precision' => '8','comment' => 'ts when event was deleted')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'cal_id of series for exception'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4', 'comment' => 'user who last modified event'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0', 'comment' => '1 for non-blocking events'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'comment' => 'etag for optimistic locking'),
+			'cal_creator' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'creating user'),
+			'cal_created' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'comment' => 'creation time of event'),
+			'cal_recurrence' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0', 'comment' => 'cal_start of original recurrence for exception'),
+			'tz_id' => array('type' => 'int', 'precision' => '4', 'comment' => 'key into egw_cal_timezones'),
+			'cal_deleted' => array('type' => 'int', 'precision' => '8', 'comment' => 'ts when event was deleted')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
-		'ix' => array('cal_uid','cal_owner','cal_deleted'),
+		'ix' => array('cal_uid', 'cal_owner', 'cal_deleted'),
 		'uc' => array()
-	),array(
+	), array(
 		// for deleted rows use cal_modified as deleted date, NULL for not deleted ones
-		'cal_deleted' => 'CASE cal_deleted WHEN '.$GLOBALS['egw_setup']->db->quote(true,'bool').' THEN cal_modified ELSE NULL END',
+		'cal_deleted' => 'CASE cal_deleted WHEN '.$GLOBALS['egw_setup']->db->quote(true, 'bool').' THEN cal_modified ELSE NULL END',
 	));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.002';
@@ -2053,16 +2053,16 @@ 
  */
 function calendar_upgrade1_9_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'comment' => 'name part of CalDAV URL, if specified by client'
 	));
-	$GLOBALS['egw_setup']->db->query($sql='UPDATE egw_cal SET caldav_name='.
+	$GLOBALS['egw_setup']->db->query($sql = 'UPDATE egw_cal SET caldav_name='.
 		$GLOBALS['egw_setup']->db->concat(
-			$GLOBALS['egw_setup']->db->to_varchar('cal_id'),"'.ics'"),__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->to_varchar('cal_id'), "'.ics'"), __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','caldav_name');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'caldav_name');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.003';
 }
@@ -2073,8 +2073,8 @@ 
  */
 function calendar_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_modified');
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user','cal_user_modified');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_modified');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user', 'cal_user_modified');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.004';
 }
@@ -2086,7 +2086,7 @@ 
  */
 function calendar_upgrade1_9_004()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_dates','recur_exception',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_dates', 'recur_exception', array(
 		'type' => 'bool',
 		'default' => '',
 		'null' => false,
@@ -2094,16 +2094,16 @@ 
 	));
 
 	// migrate existing exceptions to egw_cal_dates
-	foreach($GLOBALS['egw_setup']->db->select('egw_cal_repeats',
+	foreach ($GLOBALS['egw_setup']->db->select('egw_cal_repeats',
 		'egw_cal_repeats.cal_id AS cal_id,egw_cal_repeats.recur_exception AS recur_exception,MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
 		'egw_cal_repeats.recur_exception IS NOT NULL', __LINE__, __FILE__, false,
 		'GROUP BY egw_cal_repeats.cal_id,egw_cal_repeats.recur_exception', 'calendar', '',
 		'JOIN egw_cal_dates ON egw_cal_repeats.cal_id=egw_cal_dates.cal_id') as $row)
 	{
-		foreach($row['recur_exception'] ? array_unique(explode(',', $row['recur_exception'])) : array() as $recur_exception)
+		foreach ($row['recur_exception'] ? array_unique(explode(',', $row['recur_exception'])) : array() as $recur_exception)
 		{
 			$GLOBALS['egw_setup']->db->insert('egw_cal_dates', array(
-				'cal_end' => $recur_exception+$row['cal_end']-$row['cal_start'],
+				'cal_end' => $recur_exception + $row['cal_end'] - $row['cal_start'],
 				'recur_exception' => true,
 			), array(
 				'cal_id' => $row['cal_id'],
@@ -2115,11 +2115,11 @@ 
 
 	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '2','nullable' => False),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '2','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '2','default' => '1'),
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '2', 'nullable' => False),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
@@ -2140,19 +2140,19 @@ 
 	// returns NULL, if there are no rows!
 	if ((int)$max_description_length <= 16384 && $GLOBALS['egw_setup']->oProc->max_varchar_length >= 16384)
 	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_description',array(
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_description', array(
 			'type' => 'varchar',
 			'precision' => '16384'
 		));
 	}
 	// allow more categories
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_category',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_category', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'comment' => 'category id(s)'
 	));
 	// remove silly default of 1
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_title',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_title', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False
@@ -2167,14 +2167,14 @@ 
 {
 	// PostgreSQL needs temporary a nullable column, to not stall on broken events without dates!
 	// We add that constrain in 1.9.007, after deleting all rows with range_start=0 OR range_start IS NULL
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','range_start',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'range_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'startdate (of range)'
 	));
 	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_start = (SELECT MIN(cal_start) FROM egw_cal_dates WHERE egw_cal_dates.cal_id=egw_cal.cal_id)', __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','range_end',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'range_end', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'enddate (of range, UNTIL of RRULE)'
@@ -2190,18 +2190,18 @@ 
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_end=recur_enddate FROM egw_cal_repeats WHERE egw_cal.cal_id=egw_cal_repeats.cal_id', __LINE__, __FILE__);
 	}
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '2','nullable' => False),
-			'recur_interval' => array('type' => 'int','precision' => '2','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '2','default' => '1')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '2', 'nullable' => False),
+			'recur_interval' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '2', 'default' => '1')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'recur_enddate');
+	), 'recur_enddate');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.007';
 }
@@ -2213,14 +2213,14 @@ 
  */
 function calendar_upgrade1_9_007()
 {
-	foreach(array('egw_cal_repeats','egw_cal_dates','egw_cal_user','egw_cal_extra') as $table)
+	foreach (array('egw_cal_repeats', 'egw_cal_dates', 'egw_cal_user', 'egw_cal_extra') as $table)
 	{
 		$GLOBALS['egw_setup']->db->query("DELETE FROM $table WHERE cal_id IN (SELECT cal_id FROM egw_cal WHERE range_start=0 OR range_start IS NULL)", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->db->query("DELETE FROM egw_cal WHERE range_start=0 OR range_start IS NULL", __LINE__, __FILE__);
 
 	// now we can remove temporary default of 0 from range_start and set it NOT NULL
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','range_start',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'range_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
@@ -2285,7 +2285,7 @@ 
 
 function calendar_upgrade1_9_010()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '200',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -2315,7 +2315,7 @@ 
 SET cal_reference=0,cal_recurrence=0,cal_etag=cal_etag+1,cal_modifier=0,cal_modified=".time()."
 WHERE cal_reference != 0 AND cal_id IN (SELECT cal_id FROM egw_cal_repeats)", __LINE__, __FILE__);
 
-	foreach($GLOBALS['egw_setup']->db->query(
+	foreach ($GLOBALS['egw_setup']->db->query(
 "SELECT DISTINCT master.cal_id,egw_cal_user.cal_user_type,egw_cal_user.cal_user_id,'E' AS cal_status
 FROM egw_cal_user
 JOIN egw_cal ON egw_cal_user.cal_id=egw_cal.cal_id
@@ -2342,7 +2342,7 @@ 
  */
 function calendar_upgrade14_1_001()
 {
-	foreach($GLOBALS['egw_setup']->db->query(
+	foreach ($GLOBALS['egw_setup']->db->query(
 "SELECT egw_cal.cal_id AS cal_id,cal_start,cal_end,range_start,range_end,egw_cal_repeats.*,tz_tzid AS tzid
 FROM egw_cal
 JOIN egw_cal_repeats ON egw_cal_repeats.cal_id=egw_cal.cal_id
@@ -2364,7 +2364,7 @@ 
 		$enddate->modify(($event['end'] - $event['start']).' second');
 		if (($range_end = $enddate->format('server')) != $event['range_end'])
 		{
-			$GLOBALS['egw_setup']->db->update('egw_cal',array(
+			$GLOBALS['egw_setup']->db->update('egw_cal', array(
 				'range_end' => $range_end,
 				'cal_etag=cal_etag+1',
 				'cal_modified' => time(),
@@ -2374,7 +2374,7 @@ 
 			//error_log(__FUNCTION__."() #$event[id], start=".date('Y-m-d H:i:s', $event['start']).', end='.date('Y-m-d H:i:s', $event['end']).', range_end='.date('Y-m-d H:i:s', $event['recur_enddate']).' --> '.date('Y-m-d H:i:s', $range_end));
 		}
 	}
-	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.002';	// skip 14.2.001 update, as query is fixed now
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.002'; // skip 14.2.001 update, as query is fixed now
 }
 
 /**
@@ -2398,7 +2398,7 @@ 
 	// if maximum is bigger then 3
 	if ($values[1] > 3)
 	{
-		switch($GLOBALS['egw_setup']->db->Type)
+		switch ($GLOBALS['egw_setup']->db->Type)
 		{
 			case 'mysql':
 				$sql = "UPDATE egw_cal
@@ -2448,7 +2448,7 @@ 
 
 function calendar_upgrade14_2_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_uid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_uid', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False,
@@ -2460,13 +2460,13 @@ 
 	{
 		$GLOBALS['egw_setup']->db->query("UPDATE egw_cal SET cal_category='' WHERE cal_category NOT REGEXP '^[0-9,]*$'", __LINE__, __FILE__);
 	}
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_category',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_category', array(
 		'type' => 'ascii',
 		'meta' => 'category',
 		'precision' => '64',
 		'comment' => 'category id(s)'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'caldav_name', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -2523,22 +2523,22 @@ 
 		'type' => 'auto',
 		'nullable' => False
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_recur_date' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_user_type' => array('type' => 'ascii','precision' => '1','nullable' => False,'default' => 'u','comment' => 'u=user, g=group, c=contact, r=resource, e=email'),
-			'cal_user_id' => array('type' => 'varchar','meta' => array("cal_user_type='u'" => 'account'),'precision' => '128','nullable' => False,'comment' => 'id or email-address for type=e'),
-			'cal_status' => array('type' => 'ascii','precision' => '1','default' => 'A','comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'),
-			'cal_quantity' => array('type' => 'int','precision' => '4','default' => '1','comment' => 'only for certain types (eg. resources)'),
-			'cal_role' => array('type' => 'ascii','precision' => '64','default' => 'REQ-PARTICIPANT','comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'),
-			'cal_user_modified' => array('type' => 'timestamp','default' => 'current_timestamp','comment' => 'automatic timestamp of last update'),
-			'cal_user_auto' => array('type' => 'auto','nullable' => False)
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_recur_date' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_user_type' => array('type' => 'ascii', 'precision' => '1', 'nullable' => False, 'default' => 'u', 'comment' => 'u=user, g=group, c=contact, r=resource, e=email'),
+			'cal_user_id' => array('type' => 'varchar', 'meta' => array("cal_user_type='u'" => 'account'), 'precision' => '128', 'nullable' => False, 'comment' => 'id or email-address for type=e'),
+			'cal_status' => array('type' => 'ascii', 'precision' => '1', 'default' => 'A', 'comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'),
+			'cal_quantity' => array('type' => 'int', 'precision' => '4', 'default' => '1', 'comment' => 'only for certain types (eg. resources)'),
+			'cal_role' => array('type' => 'ascii', 'precision' => '64', 'default' => 'REQ-PARTICIPANT', 'comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'),
+			'cal_user_modified' => array('type' => 'timestamp', 'default' => 'current_timestamp', 'comment' => 'automatic timestamp of last update'),
+			'cal_user_auto' => array('type' => 'auto', 'nullable' => False)
 		),
 		'pk' => array('cal_user_auto'),
 		'fk' => array(),
-		'ix' => array('cal_user_modified',array('cal_user_type','cal_user_id')),
-		'uc' => array(array('cal_id','cal_recur_date','cal_user_type','cal_user_id'))
+		'ix' => array('cal_user_modified', array('cal_user_type', 'cal_user_id')),
+		'uc' => array(array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id'))
 	));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.005';
@@ -2547,12 +2547,12 @@ 
 
 function calendar_upgrade14_2_005()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones','tz_tzid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones', 'tz_tzid', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones','tz_component',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones', 'tz_component', array(
 		'type' => 'ascii',
 		'precision' => '8192',
 		'comment' => 'iCal VTIMEZONE component'
@@ -2568,7 +2568,7 @@ 
  */
 function calendar_upgrade14_3()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_user_attendee',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_user_attendee', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'comment' => 'email or json object with attr. cn, url, ...'
@@ -2579,12 +2579,12 @@ 
 
 	// delete all but one row, which would give a doublicate key, after above normalising of email addresses
 	// by ordering by status we prever accepted over tentative over unknow over deleted
-	foreach($GLOBALS['egw_setup']->db->select('egw_cal_user', "cal_id,cal_recur_date,$email AS email", array(
+	foreach ($GLOBALS['egw_setup']->db->select('egw_cal_user', "cal_id,cal_recur_date,$email AS email", array(
 		'cal_user_type' => 'e',
 	), __LINE__, __FILE__, false, "GROUP BY cal_id,cal_recur_date,$email HAVING COUNT(*)>1", 'calendar') as $row)
 	{
 		$n = 0;
-		foreach($GLOBALS['egw_setup']->db->select('egw_cal_user', "*,$email AS email", array(
+		foreach ($GLOBALS['egw_setup']->db->select('egw_cal_user', "*,$email AS email", array(
 			'cal_id' => $row['cal_id'],
 			'cal_recur_date' => $row['cal_recur_date'],
 			'cal_user_type' => 'e',
@@ -2592,7 +2592,7 @@ 
 		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)	// order A, T, U, X
 		{
 			if (strpos($user['email'], '@') !== false && !$n++) continue;
-			$GLOBALS['egw_setup']->db->delete('egw_cal_user', array_intersect_key($user, array_flip(array('cal_id','cal_recur_date','cal_user_type','cal_user_id','cal_status'))));
+			$GLOBALS['egw_setup']->db->delete('egw_cal_user', array_intersect_key($user, array_flip(array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id', 'cal_status'))));
 		}
 	}
 
@@ -2601,7 +2601,7 @@ 
 		"UPDATE egw_cal_user SET cal_user_attendee=cal_user_id,cal_user_id=MD5($email) WHERE cal_user_type='e'",
 		__LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'ascii',
 		'meta' => array(
 			"cal_user_type='u'" => 'account'
@@ -2623,7 +2623,7 @@ 
 {
 	$GLOBALS['calendar_upgrade14_3_001-run'] = true;
 
-	foreach($GLOBALS['egw_setup']->db->query("SELECT egw_cal_user.cal_id AS cal_id,egw_cal_user.cal_user_id AS cal_user_id,egw_cal_user.cal_user_attendee AS cal_user_attendee
+	foreach ($GLOBALS['egw_setup']->db->query("SELECT egw_cal_user.cal_id AS cal_id,egw_cal_user.cal_user_id AS cal_user_id,egw_cal_user.cal_user_attendee AS cal_user_attendee
 FROM egw_cal_user
 JOIN egw_cal_user euser ON euser.cal_id=egw_cal_user.cal_id AND euser.cal_user_type='e' AND euser.cal_user_id=egw_cal_user.cal_user_id AND euser.cal_user_attendee IS NULL
 WHERE egw_cal_user.cal_user_type='e' AND egw_cal_user.cal_user_attendee IS NOT NULL
@@ -2674,8 +2674,8 @@ 
 {
 	Api\Preferences::change_preference('calendar', '/^favorite_/', function($attr, $old_value, $owner)
 	{
-		unset($attr, $owner);	// not used, but required by function signature
-		if($old_value['state'] && is_array($old_value['state']))
+		unset($attr, $owner); // not used, but required by function signature
+		if ($old_value['state'] && is_array($old_value['state']))
 		{
 			unset($old_value['state']['date']);
 			unset($old_value['state']['startdate']);
@@ -2695,15 +2695,15 @@ 
 {
 	Api\Preferences::change_preference('calendar', 'use_time_grid', function($attr, $old_value, $owner)
 	{
-		unset($attr, $owner);	// not used, but required by function signature
-		switch($old_value)
+		unset($attr, $owner); // not used, but required by function signature
+		switch ($old_value)
 		{
 			case 'all':
 				return 0;
 			case 'day_week':
-				return ['day','day4','week'];
+				return ['day', 'day4', 'week'];
 			case 'day4':
-				return ['day','day4'];
+				return ['day', 'day4'];
 		}
 		return null;
 	});
@@ -2728,7 +2728,7 @@ 
 function calendar_upgrade16_1_001()
 {
 	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_extra', 'cal_extra_value',
-		array('type' => 'varchar','meta' => 'cfvalue','precision' => '16384','nullable' => False,'default' => ''));
+		array('type' => 'varchar', 'meta' => 'cfvalue', 'precision' => '16384', 'nullable' => False, 'default' => ''));
 
 	Api\Preferences::change_preference('calendar', 'defaultresource_sel', 'resources', 'addressbook', 'forced');
 	Api\Preferences::change_preference('calendar', 'defaultresource_sel', 'resources', 'addressbook', 'default');

Braces +12 added lines, -3 removed lines

@@ -1429,13 +1429,18 @@ 
 function calendar_upgrade1_0_1_008()
 {
 	$config_data = Api\Config::read('calendar');
-	if (isset($config_data['fields']))	// old custom fields
+	if (isset($config_data['fields']))
+	{
+		// old custom fields
 	{
 		$customfields = array();
+	}
 		$order = 0;
 		foreach($config_data['fields'] as $name => $data)
 		{
-			if ($name{0} == '#' && !$data['disabled'])	// real not-disabled custom field
+			if ($name{0} == '#' && !$data['disabled'])
+			{
+				// real not-disabled custom field
 			{
 				$customfields[substr($name,1)] = array(
 					'type'  => 'text',
@@ -1444,6 +1449,7 @@ 
 					'order' => ($order += 10),
 				);
 			}
+			}
 		}
 		if (count($customfields))
 		{
@@ -2589,9 +2595,12 @@ 
 			'cal_recur_date' => $row['cal_recur_date'],
 			'cal_user_type' => 'e',
 			$email.'='.$GLOBALS['egw_setup']->db->quote($row['email']),
-		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)	// order A, T, U, X
+		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)
+		{
+			// order A, T, U, X
 		{
 			if (strpos($user['email'], '@') !== false && !$n++) continue;
+		}
 			$GLOBALS['egw_setup']->db->delete('egw_cal_user', array_intersect_key($user, array_flip(array('cal_id','cal_recur_date','cal_user_type','cal_user_id','cal_status'))));
 		}
 	}

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

@@ -32,7 +32,7 @@ 
 		{
 			$GLOBALS['egw_setup']->oProc->query("SELECT account_id FROM $acctstbl WHERE account_lid='".$owner[$i]."'");
 			$GLOBALS['egw_setup']->oProc->next_record();
-			$GLOBALS['egw_setup']->oProc->query("UPDATE $table SET $field=".$GLOBALS['egw_setup']->oProc->f('account_id')." WHERE $field='".$owner[$i]."'");
+			$GLOBALS['egw_setup']->oProc->query("update $table SET $field=".$GLOBALS['egw_setup']->oProc->f('account_id')." WHERE $field='".$owner[$i]."'");
 		}
 	}
 	$GLOBALS['egw_setup']->oProc->AlterColumn($table, $field, array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => 0));
@@ -188,7 +188,7 @@ 
 	$db2 = clone($GLOBALS['egw_setup']->db);
 
 	$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'auto', 'nullable' => false),
 				'cal_owner' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
@@ -238,7 +238,7 @@ 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry');
 
 	$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry_user',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
 				'cal_login' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
@@ -268,7 +268,7 @@ 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_user');
 
 	$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry_repeats',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int', 'precision' => 4, 'default' => '0', 'nullable' => false),
 				'cal_type' => array('type' => 'varchar', 'precision' => 20, 'default' => 'daily', 'nullable' => false),
@@ -310,7 +310,7 @@ 
 	}
 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_repeats');
-	$GLOBALS['egw_setup']->oProc->query("UPDATE {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("update {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre2';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -602,7 +602,7 @@ 
 
 // calendar_entry => phpgw_cal
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'auto', 'nullable' => False),
 				'owner' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
@@ -658,7 +658,7 @@ 
 
 // calendar_entry_repeats => phpgw_cal_repeats
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_repeats',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int', 'precision' => 8,'nullable' => False),
 				'recur_type' => array('type' => 'int', 'precision' => 8,'nullable' => False),
@@ -731,7 +731,7 @@ 
 function calendar_upgrade0_9_11_003()
 {
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
-		Array(
+		array(
 			'fd' => array(
 				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
 				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
@@ -767,7 +767,7 @@ 
 {
 	$GLOBALS['egw_setup']->oProc->DropTable('phpgw_cal_holidays');
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
-		Array(
+		array(
 			'fd' => array(
 				'hol_id' => array('type' => 'auto','nullable' => False),
 				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
@@ -854,7 +854,7 @@ 
 function calendar_upgrade0_9_13_003()
 {
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_alarm',
-		Array(
+		array(
 			'fd' => array(
 				'alarm_id' => array('type' => 'auto','nullable' => False),
 				'cal_id'   => array('type' => 'int', 'precision' => 8, 'nullable' => False),
@@ -888,7 +888,7 @@ 
 
 function calendar_upgrade0_9_13_005()
 {
-	$calendar_data = Array();
+	$calendar_data = array();
 	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal',__LINE__,__FILE__);
 	while($GLOBALS['egw_setup']->oProc->next_record())
 	{

doc/fix_api.php

Doc Comments +1 added lines, -1 removed lines

@@ -187,7 +187,7 @@
  *
  * @param string $file filename
  * @param boolean $dry_run =false true: only echo fixed file, not fix it
- * @return boolean false on error
+ * @return boolean|null false on error
  */
 function fix_api($file, $dry_run=false)
 {

Spacing +15 added lines, -15 removed lines

@@ -17,7 +17,7 @@ 
 
 // raw replacements
 $add_use_api = array(
-	"#use EGroupware\\\\Api;\n#" => '',	// remove evtl. use EGroupware\Api, as we add it again below
+	"#use EGroupware\\\\Api;\n#" => '', // remove evtl. use EGroupware\Api, as we add it again below
 	"#<\?php\n+\s*/\*+?(.*)\*/#msU" => "<?php\n/**$1*/\n\nuse EGroupware\\Api;",
 );
 $replace = array(
@@ -46,7 +46,7 @@ 
 // enclose class-names and static methods with some syntax check
 $class_start = '#(?<!function)([\[\s,;().!=])';
 $class_end = '(::|\\(|\\)|;|\?|:|\\s|,|$)#';
-foreach(array(
+foreach (array(
 	'accounts' => 'Api\\Accounts',
 	'acl' => 'Api\\Acl',
 	'EGW_ACL_READ' => 'Api\\Acl::READ',
@@ -189,10 +189,10 @@ 
  * @param boolean $dry_run =false true: only echo fixed file, not fix it
  * @return boolean false on error
  */
-function fix_api($file, $dry_run=false)
+function fix_api($file, $dry_run = false)
 {
 	global $prog, $replace, $add_use_api;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog) return true; // dont fix ourself ;-)
 
 	if (($content = $content_in = file_get_contents($file)) === false) return false;
 
@@ -203,12 +203,12 @@ 
 	}
 	$content2 = preg_replace(array_keys($replace), array_values($replace), $content);
 
-	if ($content2 == $content_in) return true;	// nothing changed
+	if ($content2 == $content_in) return true; // nothing changed
 
 	$content = preg_replace(array_keys($add_use_api), array_values($add_use_api), $content2);
 
 	// shorten some classes, if used, with further use declarations
-	foreach(array('Api\\Etemplate', 'Api\\Vfs', 'Api\\Acl', 'Api\\Egw', 'Api\\Framework', 'Api\\Link') as $namespace)
+	foreach (array('Api\\Etemplate', 'Api\\Vfs', 'Api\\Acl', 'Api\\Egw', 'Api\\Framework', 'Api\\Link') as $namespace)
 	{
 		if (strpos($content, $namespace) !== false && strpos($content, 'use EGroupware\\'.$namespace) === false)
 		{
@@ -247,11 +247,11 @@ 
  * @param boolean $dry_run =false true: only echo fixed file, not fix it
  * @return boolean false on error
  */
-function fix_api_recursive($dir, $dry_run=false)
+function fix_api_recursive($dir, $dry_run = false)
 {
 	if (!is_dir($dir)) return false;
 
-	foreach(scandir($dir) as $file)
+	foreach (scandir($dir) as $file)
 	{
 		if ($file == '.' || $file == '..') continue;
 
@@ -259,13 +259,13 @@ 
 		{
 			fix_api_recursive($dir.'/'.$file, $dry_run);
 		}
-		elseif(substr($file,-4) == '.php')
+		elseif (substr($file, -4) == '.php')
 		{
-			echo "\r".str_repeat(' ',100)."\r".$dir.'/'.$file.': ';
+			echo "\r".str_repeat(' ', 100)."\r".$dir.'/'.$file.': ';
 			fix_api($dir.'/'.$file, $dry_run);
 		}
 	}
-	echo "\r".str_repeat(' ',100)."\r";
+	echo "\r".str_repeat(' ', 100)."\r";
 	return true;
 }
 
@@ -274,7 +274,7 @@ 
  *
  * @param string $error =null
  */
-function usage($error=null)
+function usage($error = null)
 {
 	global $prog;
 	echo "Usage: $prog [-h|--help] [-d|--dry-run] file(s) or dir(s)\n\n";
@@ -288,9 +288,9 @@ 
 if (!$args) usage();
 
 $dry_run = false;
-while(($arg = array_shift($args)) && $arg[0] == '-')
+while (($arg = array_shift($args)) && $arg[0] == '-')
 {
-	switch($arg)
+	switch ($arg)
 	{
 		case '-h':
 		case '--help':
@@ -323,4 +323,4 @@ 
 		fix_api_recursive($arg, $dry_run);
 	}
 }
-while(($arg = array_shift($args)));
+while (($arg = array_shift($args)));

Braces +42 added lines, -10 removed lines

@@ -10,10 +10,13 @@ 
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling as web-page
 {
 	die('<h1>fix_api.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 // raw replacements
 $add_use_api = array(
@@ -192,9 +195,16 @@ 
 function fix_api($file, $dry_run=false)
 {
 	global $prog, $replace, $add_use_api;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog)
+	{
+		return true;
+	}
+	// dont fix ourself ;-)
 
-	if (($content = $content_in = file_get_contents($file)) === false) return false;
+	if (($content = $content_in = file_get_contents($file)) === false)
+	{
+		return false;
+	}
 
 	if (!preg_match("|<\?php\n+\s*/\*\*?.*\*/|msU", $content))
 	{
@@ -203,7 +213,11 @@ 
 	}
 	$content2 = preg_replace(array_keys($replace), array_values($replace), $content);
 
-	if ($content2 == $content_in) return true;	// nothing changed
+	if ($content2 == $content_in)
+	{
+		return true;
+	}
+	// nothing changed
 
 	$content = preg_replace(array_keys($add_use_api), array_values($add_use_api), $content2);
 
@@ -249,11 +263,17 @@ 
  */
 function fix_api_recursive($dir, $dry_run=false)
 {
-	if (!is_dir($dir)) return false;
+	if (!is_dir($dir))
+	{
+		return false;
+	}
 
 	foreach(scandir($dir) as $file)
 	{
-		if ($file == '.' || $file == '..') continue;
+		if ($file == '.' || $file == '..')
+		{
+			continue;
+		}
 
 		if (is_dir($dir.'/'.$file))
 		{
@@ -278,14 +298,20 @@ 
 {
 	global $prog;
 	echo "Usage: $prog [-h|--help] [-d|--dry-run] file(s) or dir(s)\n\n";
-	if ($error) echo $error."\n\n";
+	if ($error)
+	{
+		echo $error."\n\n";
+	}
 	exit($error ? 1 : 0);
 }
 
 $args = $_SERVER['argv'];
 $prog = basename(array_shift($args));
 
-if (!$args) usage();
+if (!$args)
+{
+	usage();
+}
 
 $dry_run = false;
 while(($arg = array_shift($args)) && $arg[0] == '-')
@@ -303,16 +329,22 @@ 
 			break;
 
 		default:
-			if ($args)	// not last argument
+			if ($args)
+			{
+				// not last argument
 			{
 				usage("Unknown argument '$arg'!");
 			}
+			}
 			break 2;
 	}
 }
 
 do {
-	if (!file_exists($arg)) usage("Error: $arg not found!");
+	if (!file_exists($arg))
+	{
+		usage("Error: $arg not found!");
+	}
 
 	if (!is_dir($arg))
 	{