EGroupware / egroupware

calendar/inc/class.calendar_import_csv.inc.php

Spacing +62 added lines, -62 removed lines

@@ -17,12 +17,12 @@ 
 /**
  * class import_csv for calendar
  */
-class calendar_import_csv extends importexport_basic_import_csv  {
+class calendar_import_csv extends importexport_basic_import_csv {
 
 	/**
 	 * actions wich could be done to data entries
 	 */
-	protected static $actions = array( 'none', 'update', 'insert' );
+	protected static $actions = array('none', 'update', 'insert');
 
 	/**
 	 * conditions for actions
@@ -44,16 +44,16 @@ 
 	/**
 	 * Set up tracker
 	 */
-	protected function init(importexport_definition &$definition)
+	protected function init(importexport_definition&$definition)
 	{
 		// fetch the addressbook bo
-		$this->bo= new calendar_boupdate();
+		$this->bo = new calendar_boupdate();
 
 		// Get the tracker for changes
 		$this->tracking = new calendar_tracking();
 
 		// Used for participants
-		$this->status_map = array_flip(array_map('lang',$this->bo->verbose_status));
+		$this->status_map = array_flip(array_map('lang', $this->bo->verbose_status));
 		$this->role_map = array_flip($this->bo->roles);
 
 		$this->lookups = array(
@@ -76,15 +76,15 @@ 
 	 *
 	 * @return boolean success
 	 */
-	public function import_record(\importexport_iface_egw_record &$record, &$import_csv)
+	public function import_record(\importexport_iface_egw_record&$record, &$import_csv)
 	{
 		// set eventOwner
-		$options =& $this->definition->plugin_options;
+		$options = & $this->definition->plugin_options;
 		$options['owner'] = $options['owner'] ? $options['owner'] : $this->user;
 
 		// Set owner, unless it's supposed to come from CSV file
-		if($options['owner_from_csv']) {
-			if(!is_numeric($record['owner'])) {
+		if ($options['owner_from_csv']) {
+			if (!is_numeric($record['owner'])) {
 				$this->errors[$import_csv->get_current_position()] = lang(
 					'Invalid owner ID: %1.  Might be a bad field translation.  Used %2 instead.',
 					$record->owner,
@@ -99,7 +99,7 @@ 
 		}
 		
 		// Handle errors in length or start/end date
-		if($record->start > $record->end)
+		if ($record->start > $record->end)
 		{
 			$record->end = $record->start + $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength'] * 60;
 			$this->warnings[$import_csv->get_current_position()] = lang('error: starttime has to be before the endtime !!!');
@@ -109,11 +109,11 @@ 
 		if ($record->participants && !is_array($record->participants)) {
 			// Importing participants in human friendly format:
 			// Name (quantity)? (status) Role[, Name (quantity)? (status) Role]+
-			preg_match_all('/(([^(]+?)(?: \(([\d]+)\))? \(([^,)]+)\)(?: ([^ ,]+))?)(?:, )?/',$record->participants,$participants);
+			preg_match_all('/(([^(]+?)(?: \(([\d]+)\))? \(([^,)]+)\)(?: ([^ ,]+))?)(?:, )?/', $record->participants, $participants);
 			$p_participants = array();
 			$missing = array();
 			list($lines, $p, $names, $quantity, $status, $role) = $participants;
-			foreach($names as $key => $name) {
+			foreach ($names as $key => $name) {
 				//error_log("Name: $name Quantity: {$quantity[$key]} Status: {$status[$key]} Role: {$role[$key]}");
 
 				// Search for direct account name, then user in accounts first
@@ -121,26 +121,26 @@ 
 				$id = importexport_helper_functions::account_name2id($name);
 
 				// If not found, or not an exact match to a user (account_name2id is pretty generous)
-				if(!$id || $names[$key] !== $this->bo->participant_name($id)) {
-					$contacts = ExecMethod2('addressbook.addressbook_bo.search', $search,array('contact_id','account_id'),'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR',array(0,1));
-					if($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];
+				if (!$id || $names[$key] !== $this->bo->participant_name($id)) {
+					$contacts = ExecMethod2('addressbook.addressbook_bo.search', $search, array('contact_id', 'account_id'), 'org_name,n_family,n_given,cat_id,contact_email', '', '%', false, 'OR', array(0, 1));
+					if ($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];
 				}
-				if(!$id)
+				if (!$id)
 				{
 					// Use calendar's registered resources to find participant
-					foreach($this->bo->resources as $resource)
+					foreach ($this->bo->resources as $resource)
 					{
 						// Can't search for email
-						if($resource['app'] == 'email') continue;
+						if ($resource['app'] == 'email') continue;
 						// Special resource search, since it does special stuff in link_query
-						if($resource['app'] == 'resources')
+						if ($resource['app'] == 'resources')
 						{
-							if(!$this->resource_so)
+							if (!$this->resource_so)
 							{
 								$this->resource_so = new resources_so();
 							}
-							$result = $this->resource_so->search($search,'res_id');
-							if(count($result) >= 1) {
+							$result = $this->resource_so->search($search, 'res_id');
+							if (count($result) >= 1) {
 								$id = $resource['type'].$result[0]['res_id'];
 								break;
 							}
@@ -151,15 +151,15 @@ 
 							$link_options = array();
 							$result = Link::query($resource['app'], $search, $link_options);
 
-							if($result)
+							if ($result)
 							{
-								$id = $resource['type'] . key($result);
+								$id = $resource['type'].key($result);
 								break;
 							}
 						}
 					}
 				}
-				if($id) {
+				if ($id) {
 					$p_participants[$id] = calendar_so::combine_status(
 						$this->status_map[lang($status[$key])] ? $this->status_map[lang($status[$key])] : $status[$key][0],
 						$quantity[$key] ? $quantity[$key] : 1,
@@ -170,47 +170,47 @@ 
 				{
 					$missing[] = $name;
 				}
-				if(count($missing) > 0)
+				if (count($missing) > 0)
 				{
-					$this->warnings[$import_csv->get_current_position()] = $record->title . ' ' . lang('participants') . ': ' .
-						lang('Contact not found!') . '<br />'.implode(", ",$missing);
+					$this->warnings[$import_csv->get_current_position()] = $record->title.' '.lang('participants').': '.
+						lang('Contact not found!').'<br />'.implode(", ", $missing);
 				}
 			}
 			$record->participants = $p_participants;
 		}
 
-		if($record->recurrence)
+		if ($record->recurrence)
 		{
-			list($record->recur_type, $record->recur_interval) = explode('/',$record->recurrence,2);
+			list($record->recur_type, $record->recur_interval) = explode('/', $record->recurrence, 2);
 			$record->recur_interval = trim($record->recur_interval);
-			$record->recur_type = array_search(strtolower(trim($record->recur_type)), array_map('strtolower',$this->lookups['recurrence']));
+			$record->recur_type = array_search(strtolower(trim($record->recur_type)), array_map('strtolower', $this->lookups['recurrence']));
 			unset($record->recurrence);
 		}
 		$record->tzid = calendar_timezones::id2tz($record->tz_id);
 
-		if ( $options['conditions'] ) {
-			foreach ( $options['conditions'] as $condition ) {
+		if ($options['conditions']) {
+			foreach ($options['conditions'] as $condition) {
 				$records = array();
-				switch ( $condition['type'] ) {
+				switch ($condition['type']) {
 					// exists
 					case 'exists' :
 						// Check for that record
 						$result = $this->exists($record, $condition, $records);
 
-						if ( is_array( $records ) && count( $records ) >= 1) {
+						if (is_array($records) && count($records) >= 1) {
 							// apply action to all records matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$records as $event ) {
+							foreach ((array)$records as $event) {
 								$record->id = $event['id'];
-								if ( $this->definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $record->category ) ) $record->category = explode( ',', $record->category );
-									$record->category = implode( ',', array_unique( array_merge( $record->category, $event['category'] ) ) );
+								if ($this->definition->plugin_options['update_cats'] == 'add') {
+									if (!is_array($record->category)) $record->category = explode(',', $record->category);
+									$record->category = implode(',', array_unique(array_merge($record->category, $event['category'])));
 								}
-								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+								$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 							}
 						} else {
 							$action = $condition['false'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						break;
 
@@ -223,7 +223,7 @@ 
 			}
 		} else {
 			// unconditional insert
-			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+			$success = $this->action('insert', $record, $import_csv->get_current_position());
 		}
 		
 		return $success;
@@ -238,14 +238,14 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$records = array())
+	protected function exists(importexport_iface_egw_record&$record, Array &$condition, &$records = array())
 	{
-		if($record->__get($condition['string']) && $condition['string'] == 'id') {
+		if ($record->__get($condition['string']) && $condition['string'] == 'id') {
 			$event = $this->bo->read($record->__get($condition['string']));
 			$records = array($event);
 		}
 
-		if ( is_array( $records ) && count( $records ) >= 1) {
+		if (is_array($records) && count($records) >= 1) {
 			return true;
 		}
 		return false;
@@ -258,7 +258,7 @@ 
 	 * @param array $_data record data for the action
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
+	protected function action($_action, importexport_iface_egw_record&$record, $record_num = 0)
 	{
 		$_data = $record->get_record_array();
 		switch ($_action) {
@@ -269,7 +269,7 @@ 
 				$old = $this->bo->read($_data['id']);
 
 				// Don't change a user account into a record
-				if(!$this->definition->plugin_options['change_owner']) {
+				if (!$this->definition->plugin_options['change_owner']) {
 					// Don't change owner of an existing record
 					unset($_data['owner']);
 				}
@@ -277,30 +277,30 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0) {
+				if (count($changed) == 0) {
 					return true;
 				}
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if ($_action == 'insert') {
 					// Backend doesn't like inserting with ID specified, can overwrite existing
 					unset($_data['id']);
 				}
 				// Make sure participants are set
-				if(!$_data['participants']) {
+				if (!$_data['participants']) {
 					$user = $_data['owner'] ? $_data['owner'] : $this->user;
 					$_data['participants'] = array(
 						$user => 'U'
 					);
 				}
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 					// User is interested in conflict checks, do so for dry run
 					// Otherwise, conflicts are just ignored and imported anyway
-					if($this->definition->plugin_options['skip_conflicts'] && !$_data['non_blocking'])
+					if ($this->definition->plugin_options['skip_conflicts'] && !$_data['non_blocking'])
 					{
 						$conflicts = $this->bo->conflicts($_data);
-						if($conflicts)
+						if ($conflicts)
 						{
 							$this->conflict_warning($record_num, $conflicts);
 							$this->results['skipped']++;
@@ -311,15 +311,15 @@ 
 					return true;
 				} else {
 					$messages = null;
-					$result = $this->bo->update( $_data, 
+					$result = $this->bo->update($_data, 
 						!$this->definition->plugin_options['skip_conflicts'],
 						true, $this->is_admin, true, $messages,
 						$this->definition->plugin_options['no_notification']
 					);
-					if(!$result)
+					if (!$result)
 					{
-						$this->errors[$record_num] = lang('Unable to save') . "\n" .
-							implode("\n",$messages);
+						$this->errors[$record_num] = lang('Unable to save')."\n".
+							implode("\n", $messages);
 					}
 					else if (is_array($result))
 					{
@@ -349,10 +349,10 @@ 
 	 */
 	protected function conflict_warning($record_num, &$conflicts)
 	{
-		$this->warnings[$record_num] = lang('Conflicts') . ':';
-		foreach($conflicts as $conflict)
+		$this->warnings[$record_num] = lang('Conflicts').':';
+		foreach ($conflicts as $conflict)
 		{
-			$this->warnings[$record_num] .= "<br />\n" . egw_time::to($conflict['start']) . "\t" . $conflict['title'];
+			$this->warnings[$record_num] .= "<br />\n".egw_time::to($conflict['start'])."\t".$conflict['title'];
 		}
 	}
 
@@ -388,9 +388,9 @@ 
 	 *
 	 * @param egw_record $row_entry
 	 */
-	protected function row_preview(importexport_iface_egw_record &$row_entry)
+	protected function row_preview(importexport_iface_egw_record&$row_entry)
 	{
-		$row_entry->participants = implode('<br />', $this->bo->participants(array('participants' => $row_entry->participants),true));
+		$row_entry->participants = implode('<br />', $this->bo->participants(array('participants' => $row_entry->participants), true));
 	}
 
 } // end of iface_export_plugin

calendar/inc/class.calendar_boupdate.inc.php

Spacing +336 added lines, -338 removed lines

@@ -12,15 +12,15 @@ 
  */
 
 // types of messsages send by calendar_boupdate::send_update
-define('MSG_DELETED',0);
-define('MSG_MODIFIED',1);
-define('MSG_ADDED',2);
-define('MSG_REJECTED',3);
-define('MSG_TENTATIVE',4);
-define('MSG_ACCEPTED',5);
-define('MSG_ALARM',6);
-define('MSG_DISINVITE',7);
-define('MSG_DELEGATED',8);
+define('MSG_DELETED', 0);
+define('MSG_MODIFIED', 1);
+define('MSG_ADDED', 2);
+define('MSG_REJECTED', 3);
+define('MSG_TENTATIVE', 4);
+define('MSG_ACCEPTED', 5);
+define('MSG_ALARM', 6);
+define('MSG_DISINVITE', 7);
+define('MSG_DELEGATED', 8);
 
 /**
  * Class to access AND manipulate all calendar data (business object)
@@ -81,11 +81,11 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started',True);
+		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started', True);
 
-		parent::__construct();	// calling the parent constructor
+		parent::__construct(); // calling the parent constructor
 
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished',True);
+		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished', True);
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 * +      + +  C   +	which is clearly wrong for everything with a maximum quantity > 1
 	 * ++++++++ ++++++++
 	 */
-	function update(&$event,$ignore_conflicts=false,$touch_modified=true,$ignore_acl=false,$updateTS=true,&$messages=null, $skip_notification=false)
+	function update(&$event, $ignore_conflicts = false, $touch_modified = true, $ignore_acl = false, $updateTS = true, &$messages = null, $skip_notification = false)
 	{
 		//error_log(__METHOD__."(".array2string($event).",$ignore_conflicts,$touch_modified,$ignore_acl)");
 		if (!is_array($messages)) $messages = $messages ? (array)$messages : array();
@@ -120,7 +120,7 @@ 
 		if ($this->debug > 1 || $this->debug == 'update')
 		{
 			$this->debug_message('calendar_boupdate::update(%1,ignore_conflict=%2,touch_modified=%3,ignore_acl=%4)',
-				false,$event,$ignore_conflicts,$touch_modified,$ignore_acl);
+				false, $event, $ignore_conflicts, $touch_modified, $ignore_acl);
 		}
 		// check some minimum requirements:
 		// - new events need start, end and title
@@ -148,11 +148,11 @@ 
 		}
 
 		// check if user has the permission to update / create the event
-		if (!$ignore_acl && (!$new_event && !$this->check_perms(EGW_ACL_EDIT,$event['id']) ||
-			$new_event && !$this->check_perms(EGW_ACL_EDIT,0,$event['owner'])) &&
-			!$this->check_perms(EGW_ACL_ADD,0,$event['owner']))
+		if (!$ignore_acl && (!$new_event && !$this->check_perms(EGW_ACL_EDIT, $event['id']) ||
+			$new_event && !$this->check_perms(EGW_ACL_EDIT, 0, $event['owner'])) &&
+			!$this->check_perms(EGW_ACL_ADD, 0, $event['owner']))
 		{
-			$messages[] = lang('Access to calendar of %1 denied!',common::grab_owner_name($event['owner']));
+			$messages[] = lang('Access to calendar of %1 denied!', common::grab_owner_name($event['owner']));
 			return false;
 		}
 		if ($new_event)
@@ -161,24 +161,24 @@ 
 		}
 		else
 		{
-			$old_event = $this->read((int)$event['id'],null,$ignore_acl);
+			$old_event = $this->read((int)$event['id'], null, $ignore_acl);
 		}
 
 		// do we need to check, if user is allowed to invite the invited participants
-		if ($this->require_acl_invite && ($removed = $this->remove_no_acl_invite($event,$old_event)))
+		if ($this->require_acl_invite && ($removed = $this->remove_no_acl_invite($event, $old_event)))
 		{
 			// report removed participants back to user
-			foreach($removed as $key => $account_id)
+			foreach ($removed as $key => $account_id)
 			{
 				$removed[$key] = $this->participant_name($account_id);
 			}
-			$messages[] = lang('%1 participants removed because of missing invite grants',count($removed)).
-				': '.implode(', ',$removed);
+			$messages[] = lang('%1 participants removed because of missing invite grants', count($removed)).
+				': '.implode(', ', $removed);
 		}
 		// check category based ACL
 		if ($event['category'])
 		{
-			if (!is_array($event['category'])) $event['category'] = explode(',',$event['category']);
+			if (!is_array($event['category'])) $event['category'] = explode(',', $event['category']);
 			if (!$old_event || !isset($old_event['category']))
 			{
 				$old_event['category'] = array();
@@ -187,38 +187,38 @@ 
 			{
 				$old_event['category'] = explode(',', $old_event['category']);
 			}
-			foreach($event['category'] as $key => $cat_id)
+			foreach ($event['category'] as $key => $cat_id)
 			{
 				// check if user is allowed to update event categories
-				if ((!$old_event || !in_array($cat_id,$old_event['category'])) &&
-					self::has_cat_right(self::CAT_ACL_ADD,$cat_id,$this->user) === false)
+				if ((!$old_event || !in_array($cat_id, $old_event['category'])) &&
+					self::has_cat_right(self::CAT_ACL_ADD, $cat_id, $this->user) === false)
 				{
 					unset($event['category'][$key]);
 					// report removed category to user
 					$removed_cats[$cat_id] = $this->categories->id2name($cat_id);
-					continue;	// no further check, as cat was removed
+					continue; // no further check, as cat was removed
 				}
 				// for new or moved events check status of participants, if no category status right --> set all status to 'U' = unknown
 				if (!$status_reset_to_unknown &&
-					self::has_cat_right(self::CAT_ACL_STATUS,$cat_id,$this->user) === false &&
+					self::has_cat_right(self::CAT_ACL_STATUS, $cat_id, $this->user) === false &&
 					(!$old_event || $old_event['start'] != $event['start'] || $old_event['end'] != $event['end']))
 				{
-					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 ($status != 'U')
 						{
-							$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
 						}
 					}
-					$status_reset_to_unknown = true;	// once is enough
+					$status_reset_to_unknown = true; // once is enough
 				}
 			}
 			if ($removed_cats)
 			{
-				$messages[] = lang('Category %1 removed because of missing rights',implode(', ',$removed_cats));
+				$messages[] = lang('Category %1 removed because of missing rights', implode(', ', $removed_cats));
 			}
 			if ($status_reset_to_unknown)
 			{
@@ -229,61 +229,61 @@ 
 		if (!$ignore_conflicts && !$event['non_blocking'] && isset($event['start']) && isset($event['end']))
 		{
 			$types_with_quantity = array();
-			foreach($this->resources as $type => $data)
+			foreach ($this->resources as $type => $data)
 			{
 				if ($data['max_quantity']) $types_with_quantity[] = $type;
 			}
 			// get all NOT rejected participants and evtl. their quantity
 			$quantity = $users = array();
-			foreach($event['participants'] as $uid => $status)
+			foreach ($event['participants'] as $uid => $status)
 			{
-				calendar_so::split_status($status,$q,$r);
-				if ($status[0] == 'R') continue;	// ignore rejected participants
+				calendar_so::split_status($status, $q, $r);
+				if ($status[0] == 'R') continue; // ignore rejected participants
 
 				if ($uid < 0)	// group, check it's members too
 				{
-					$users += (array)$GLOBALS['egw']->accounts->members($uid,true);
+					$users += (array)$GLOBALS['egw']->accounts->members($uid, true);
 					$users = array_unique($users);
 				}
 				$users[] = $uid;
-				if (in_array($uid[0],$types_with_quantity))
+				if (in_array($uid[0], $types_with_quantity))
 				{
 					$quantity[$uid] = $q;
 				}
 			}
 			//$start = microtime(true);
-			$overlapping_events =& $this->search(array(
+			$overlapping_events = & $this->search(array(
 				'start' => $event['start'],
 				'end'   => $event['end'],
 				'users' => $users,
-				'ignore_acl' => true,	// otherwise we get only events readable by the user
-				'enum_groups' => true,	// otherwise group-events would not block time
+				'ignore_acl' => true, // otherwise we get only events readable by the user
+				'enum_groups' => true, // otherwise group-events would not block time
 				'query' => array(
 					'cal_non_blocking' => 0,
 				),
-				'no_integration' => true,	// do NOT use integration of other apps
+				'no_integration' => true, // do NOT use integration of other apps
 			));
 			//error_log(__METHOD__."() conflict check took ".number_format(microtime(true)-$start, 3).'s');
 			if ($this->debug > 2 || $this->debug == 'update')
 			{
-				$this->debug_message('calendar_boupdate::update() checking for potential overlapping events for users %1 from %2 to %3',false,$users,$event['start'],$event['end']);
+				$this->debug_message('calendar_boupdate::update() checking for potential overlapping events for users %1 from %2 to %3', false, $users, $event['start'], $event['end']);
 			}
 			$max_quantity = $possible_quantity_conflicts = $conflicts = array();
-			foreach((array) $overlapping_events as $k => $overlap)
+			foreach ((array)$overlapping_events as $k => $overlap)
 			{
-				if ($overlap['id'] == $event['id'] ||	// that's the event itself
-					$overlap['id'] == $event['reference'] ||	// event is an exception of overlap
+				if ($overlap['id'] == $event['id'] || // that's the event itself
+					$overlap['id'] == $event['reference'] || // event is an exception of overlap
 					$overlap['non_blocking'])			// that's a non_blocking event
 				{
 					continue;
 				}
 				if ($this->debug > 3 || $this->debug == 'update')
 				{
-					$this->debug_message('calendar_boupdate::update() checking overlapping event %1',false,$overlap);
+					$this->debug_message('calendar_boupdate::update() checking overlapping event %1', false, $overlap);
 				}
 				// check if the overlap is with a rejected participant or within the allowed quantity
-				$common_parts = array_intersect($users,array_keys($overlap['participants']));
-				foreach($common_parts as $n => $uid)
+				$common_parts = array_intersect($users, array_keys($overlap['participants']));
+				foreach ($common_parts as $n => $uid)
 				{
 					$status = $overlap['participants'][$uid];
 					calendar_so::split_status($status, $q, $r);
@@ -292,9 +292,9 @@ 
 						unset($common_parts[$n]);
 						continue;
 					}
-					if (is_numeric($uid) || !in_array($uid[0],$types_with_quantity))
+					if (is_numeric($uid) || !in_array($uid[0], $types_with_quantity))
 					{
-						continue;	// no quantity check: quantity allways 1 ==> conflict
+						continue; // no quantity check: quantity allways 1 ==> conflict
 					}
 					if (!isset($max_quantity[$uid]))
 					{
@@ -304,7 +304,7 @@ 
 					$quantity[$uid] += $q;
 					if ($quantity[$uid] <= $max_quantity[$uid])
 					{
-						$possible_quantity_conflicts[$uid][] =& $overlapping_events[$k];	// an other event can give the conflict
+						$possible_quantity_conflicts[$uid][] = & $overlapping_events[$k]; // an other event can give the conflict
 						unset($common_parts[$n]);
 						continue;
 					}
@@ -314,20 +314,20 @@ 
 				{
 					if ($this->debug > 3 || $this->debug == 'update')
 					{
-						$this->debug_message('calendar_boupdate::update() conflicts with the following participants found %1',false,$common_parts);
+						$this->debug_message('calendar_boupdate::update() conflicts with the following participants found %1', false, $common_parts);
 					}
-					$conflicts[$overlap['id'].'-'.$this->date2ts($overlap['start'])] =& $overlapping_events[$k];
+					$conflicts[$overlap['id'].'-'.$this->date2ts($overlap['start'])] = & $overlapping_events[$k];
 				}
 			}
 			// check if we are withing the allowed quantity and if not add all events using that resource
 			// seems this function is doing very strange things, it gives empty conflicts
-			foreach($max_quantity as $uid => $max)
+			foreach ($max_quantity as $uid => $max)
 			{
 				if ($quantity[$uid] > $max)
 				{
-					foreach((array)$possible_quantity_conflicts[$uid] as $conflict)
+					foreach ((array)$possible_quantity_conflicts[$uid] as $conflict)
 					{
-						$conflicts[$conflict['id'].'-'.$this->date2ts($conflict['start'])] =& $possible_quantity_conflicts[$k];
+						$conflicts[$conflict['id'].'-'.$this->date2ts($conflict['start'])] = & $possible_quantity_conflicts[$k];
 					}
 				}
 			}
@@ -335,10 +335,10 @@ 
 
 			if (count($conflicts))
 			{
-				foreach($conflicts as $key => $conflict)
+				foreach ($conflicts as $key => $conflict)
 				{
-						$conflict['participants'] = array_intersect_key((array)$conflict['participants'],$event['participants']);
-					if (!$this->check_perms(EGW_ACL_READ,$conflict))
+						$conflict['participants'] = array_intersect_key((array)$conflict['participants'], $event['participants']);
+					if (!$this->check_perms(EGW_ACL_READ, $conflict))
 					{
 						$conflicts[$key] = array(
 							'id'    => $conflict['id'],
@@ -351,7 +351,7 @@ 
 				}
 				if ($this->debug > 2 || $this->debug == 'update')
 				{
-					$this->debug_message('calendar_boupdate::update() %1 conflicts found %2',false,count($conflicts),$conflicts);
+					$this->debug_message('calendar_boupdate::update() %1 conflicts found %2', false, count($conflicts), $conflicts);
 				}
 				return $conflicts;
 			}
@@ -365,33 +365,33 @@ 
 			return $cal_id;
 		}
 
-		$event = $this->read($cal_id);	// we re-read the event, in case only partial information was update and we need the full info for the notifies
+		$event = $this->read($cal_id); // we re-read the event, in case only partial information was update and we need the full info for the notifies
 		//echo "new $cal_id="; _debug_array($event);
 
-		if($old_event['deleted'] && $event['deleted'] == null)
+		if ($old_event['deleted'] && $event['deleted'] == null)
 		{
 			// Restored, bring back links
 			egw_link::restore('calendar', $cal_id);
 		}
 		if ($this->log_file)
 		{
-			$this->log2file($event2save,$event,$old_event);
+			$this->log2file($event2save, $event, $old_event);
 		}
 		// send notifications
-		if(!$skip_notification)
+		if (!$skip_notification)
 		{
 			if ($new_event)
 			{
-				$this->send_update(MSG_ADDED,$event['participants'],'',$event);
+				$this->send_update(MSG_ADDED, $event['participants'], '', $event);
 			}
 			else // update existing event
 			{
-				$this->check4update($event,$old_event);
+				$this->check4update($event, $old_event);
 			}
 		}
 
 		// notify the link-class about the update, as other apps may be subscribt to it
-		egw_link::notify_update('calendar',$cal_id,$event);
+		egw_link::notify_update('calendar', $cal_id, $event);
 
 		return $cal_id;
 	}
@@ -409,27 +409,27 @@ 
 	 * @param Api\DateTime& $checked_excluding =null time until which (excluding) recurrences have been checked
 	 * @return array or events
 	 */
-	function conflicts(array $event, &$checked_excluding=null)
+	function conflicts(array $event, &$checked_excluding = null)
 	{
 		$types_with_quantity = array();
-		foreach($this->resources as $type => $data)
+		foreach ($this->resources as $type => $data)
 		{
 			if ($data['max_quantity']) $types_with_quantity[] = $type;
 		}
 		// get all NOT rejected participants and evtl. their quantity
 		$quantity = $users = array();
-		foreach($event['participants'] as $uid => $status)
+		foreach ($event['participants'] as $uid => $status)
 		{
 			$q = $r = null;
-			calendar_so::split_status($status,$q,$r);
-			if ($status[0] == 'R') continue;	// ignore rejected participants
+			calendar_so::split_status($status, $q, $r);
+			if ($status[0] == 'R') continue; // ignore rejected participants
 
 			if ($uid < 0)	// group, check it's members too
 			{
-				$users = array_unique(array_merge($users, (array)$GLOBALS['egw']->accounts->members($uid,true)));
+				$users = array_unique(array_merge($users, (array)$GLOBALS['egw']->accounts->members($uid, true)));
 			}
 			$users[] = $uid;
-			if (in_array($uid[0],$types_with_quantity))
+			if (in_array($uid[0], $types_with_quantity))
 			{
 				$quantity[$uid] = $q;
 			}
@@ -452,58 +452,58 @@ 
 		}
 		$checked = 0;
 		$start = microtime(true);
-		$duration = $event['end']-$event['start'];
-		foreach($recurences as $date)
+		$duration = $event['end'] - $event['start'];
+		foreach ($recurences as $date)
 		{
 			$startts = $date->format('ts');
 
 			// skip past events or recurrences
-			if ($startts+$duration < $this->now_su) continue;
+			if ($startts + $duration < $this->now_su) continue;
 
 			// abort check if configured limits are exceeded
 			if ($event['recur_type'] &&
 				(++$checked > $max_checked && $max_checked > 0 || // maximum number of checked recurrences exceeded
-				microtime(true) > $start+$max_check_time ||	// max check time exceeded
+				microtime(true) > $start + $max_check_time || // max check time exceeded
 				$startts > $this->config['horizont']))	// we are behind horizon for which recurrences are rendered
 			{
 				if ($this->debug > 2 || $this->debug == 'conflicts')
 				{
 					$this->debug_message(__METHOD__.'() conflict check limited to %1 recurrences, %2 seconds, until (excluding) %3',
-						$checked, microtime(true)-$start, $date);
+						$checked, microtime(true) - $start, $date);
 				}
 				$checked_excluding = $date;
 				break;
 			}
-			$overlapping_events =& $this->search(array(
+			$overlapping_events = & $this->search(array(
 				'start' => $startts,
-				'end'   => $startts+$duration,
+				'end'   => $startts + $duration,
 				'users' => $users,
-				'ignore_acl' => true,	// otherwise we get only events readable by the user
-				'enum_groups' => true,	// otherwise group-events would not block time
+				'ignore_acl' => true, // otherwise we get only events readable by the user
+				'enum_groups' => true, // otherwise group-events would not block time
 				'query' => array(
 					'cal_non_blocking' => 0,
 				),
-				'no_integration' => true,	// do NOT use integration of other apps
+				'no_integration' => true, // do NOT use integration of other apps
 			));
 			if ($this->debug > 2 || $this->debug == 'conflicts')
 			{
-				$this->debug_message(__METHOD__.'() checking for potential overlapping events for users %1 from %2 to %3',false,$users,$startts,$startts+$duration);
+				$this->debug_message(__METHOD__.'() checking for potential overlapping events for users %1 from %2 to %3', false, $users, $startts, $startts + $duration);
 			}
-			foreach((array) $overlapping_events as $k => $overlap)
+			foreach ((array)$overlapping_events as $k => $overlap)
 			{
-				if ($overlap['id'] == $event['id'] ||	// that's the event itself
-					$overlap['id'] == $event['reference'] ||	// event is an exception of overlap
+				if ($overlap['id'] == $event['id'] || // that's the event itself
+					$overlap['id'] == $event['reference'] || // event is an exception of overlap
 					$overlap['non_blocking'])			// that's a non_blocking event
 				{
 					continue;
 				}
 				if ($this->debug > 3 || $this->debug == 'conflicts')
 				{
-					$this->debug_message(__METHOD__.'() checking overlapping event %1',false,$overlap);
+					$this->debug_message(__METHOD__.'() checking overlapping event %1', false, $overlap);
 				}
 				// check if the overlap is with a rejected participant or within the allowed quantity
-				$common_parts = array_intersect($users,array_keys($overlap['participants']));
-				foreach($common_parts as $n => $uid)
+				$common_parts = array_intersect($users, array_keys($overlap['participants']));
+				foreach ($common_parts as $n => $uid)
 				{
 					$status = $overlap['participants'][$uid];
 					calendar_so::split_status($status, $q, $r);
@@ -512,9 +512,9 @@ 
 						unset($common_parts[$n]);
 						continue;
 					}
-					if (is_numeric($uid) || !in_array($uid[0],$types_with_quantity))
+					if (is_numeric($uid) || !in_array($uid[0], $types_with_quantity))
 					{
-						continue;	// no quantity check: quantity allways 1 ==> conflict
+						continue; // no quantity check: quantity allways 1 ==> conflict
 					}
 					if (!isset($max_quantity[$uid]))
 					{
@@ -524,7 +524,7 @@ 
 					$quantity[$uid] += $q;
 					if ($quantity[$uid] <= $max_quantity[$uid])
 					{
-						$possible_quantity_conflicts[$uid][] =& $overlapping_events[$k];	// an other event can give the conflict
+						$possible_quantity_conflicts[$uid][] = & $overlapping_events[$k]; // an other event can give the conflict
 						unset($common_parts[$n]);
 						continue;
 					}
@@ -534,22 +534,22 @@ 
 				{
 					if ($this->debug > 3 || $this->debug == 'conflicts')
 					{
-						$this->debug_message(__METHOD__.'() conflicts with the following participants found %1',false,$common_parts);
+						$this->debug_message(__METHOD__.'() conflicts with the following participants found %1', false, $common_parts);
 					}
-					$conflicts[$overlap['id'].'-'.$this->date2ts($overlap['start'])] =& $overlapping_events[$k];
+					$conflicts[$overlap['id'].'-'.$this->date2ts($overlap['start'])] = & $overlapping_events[$k];
 				}
 			}
 		}
 		//error_log(__METHOD__."() conflict check took ".number_format(microtime(true)-$start, 3).'s');
 		// check if we are withing the allowed quantity and if not add all events using that resource
 		// seems this function is doing very strange things, it gives empty conflicts
-		foreach($max_quantity as $uid => $max)
+		foreach ($max_quantity as $uid => $max)
 		{
 			if ($quantity[$uid] > $max)
 			{
-				foreach((array)$possible_quantity_conflicts[$uid] as $conflict)
+				foreach ((array)$possible_quantity_conflicts[$uid] as $conflict)
 				{
-					$conflicts[$conflict['id'].'-'.$this->date2ts($conflict['start'])] =& $possible_quantity_conflicts[$k];
+					$conflicts[$conflict['id'].'-'.$this->date2ts($conflict['start'])] = & $possible_quantity_conflicts[$k];
 				}
 			}
 		}
@@ -557,10 +557,10 @@ 
 
 		if (count($conflicts))
 		{
-			foreach($conflicts as $key => $conflict)
+			foreach ($conflicts as $key => $conflict)
 			{
-					$conflict['participants'] = array_intersect_key((array)$conflict['participants'],$event['participants']);
-				if (!$this->check_perms(Acl::READ,$conflict))
+					$conflict['participants'] = array_intersect_key((array)$conflict['participants'], $event['participants']);
+				if (!$this->check_perms(Acl::READ, $conflict))
 				{
 					$conflicts[$key] = array(
 						'id'    => $conflict['id'],
@@ -573,7 +573,7 @@ 
 			}
 			if ($this->debug > 2 || $this->debug == 'conflicts')
 			{
-				$this->debug_message(__METHOD__.'() %1 conflicts found %2',false,count($conflicts),$conflicts);
+				$this->debug_message(__METHOD__.'() %1 conflicts found %2', false, count($conflicts), $conflicts);
 			}
 		}
 		return $conflicts;
@@ -586,22 +586,22 @@ 
 	 * @param array $old_event =null old event with already invited participants
 	 * @return array removed participants because of missing invite grants
 	 */
-	public function remove_no_acl_invite(array &$event,array $old_event=null)
+	public function remove_no_acl_invite(array &$event, array $old_event = null)
 	{
 		if (!$this->require_acl_invite)
 		{
-			return array();	// nothing to check, everyone can invite everyone else
+			return array(); // nothing to check, everyone can invite everyone else
 		}
 		if ($event['id'] && is_null($old_event))
 		{
 			$old_event = $this->read($event['id']);
 		}
 		$removed = array();
-		foreach(array_keys((array)$event['participants']) as $uid)
+		foreach (array_keys((array)$event['participants']) as $uid)
 		{
 			if ((is_null($old_event) || !isset($old_event['participants'][$uid])) && !$this->check_acl_invite($uid))
 			{
-				unset($event['participants'][$uid]);	// remove participant
+				unset($event['participants'][$uid]); // remove participant
 				$removed[] = $uid;
 			}
 		}
@@ -617,19 +617,19 @@ 
 	 */
 	public function check_acl_invite($uid)
 	{
-		if (!is_numeric($uid)) return true;	// nothing implemented for resources so far
+		if (!is_numeric($uid)) return true; // nothing implemented for resources so far
 
 		if (!$this->require_acl_invite)
 		{
-			$ret = true;	// no grant required
+			$ret = true; // no grant required
 		}
 		elseif ($this->require_acl_invite == 'groups' && $GLOBALS['egw']->accounts->get_type($uid) != 'g')
 		{
-			$ret = true;	// grant only required for groups
+			$ret = true; // grant only required for groups
 		}
 		else
 		{
-			$ret = $this->check_perms(EGW_ACL_INVITE,0,$uid);
+			$ret = $this->check_perms(EGW_ACL_INVITE, 0, $uid);
 		}
 		//error_log(__METHOD__."($uid) = ".array2string($ret));
 		//echo "<p>".__METHOD__."($uid) require_acl_invite=$this->require_acl_invite returning ".array2string($ret)."</p>\n";
@@ -643,7 +643,7 @@ 
 	 * @param array $old_event the event before the update
 	 * @todo check if there is a real change, not assume every save is a change
 	 */
-	function check4update($new_event,$old_event)
+	function check4update($new_event, $old_event)
 	{
 		//error_log(__METHOD__."($new_event[title])");
 		$modified = $added = $deleted = array();
@@ -651,9 +651,9 @@ 
 		//echo "<p>calendar_boupdate::check4update() new participants = ".print_r($new_event['participants'],true).", old participants =".print_r($old_event['participants'],true)."</p>\n";
 
 		// Find modified and deleted participants ...
-		foreach($old_event['participants'] as $old_userid => $old_status)
+		foreach ($old_event['participants'] as $old_userid => $old_status)
 		{
-			if(isset($new_event['participants'][$old_userid]))
+			if (isset($new_event['participants'][$old_userid]))
 			{
 				$modified[$old_userid] = $new_event['participants'][$old_userid];
 			}
@@ -663,27 +663,27 @@ 
 			}
 		}
 		// Find new participants ...
-		foreach(array_keys((array)$new_event['participants']) as $new_userid)
+		foreach (array_keys((array)$new_event['participants']) as $new_userid)
 		{
-			if(!isset($old_event['participants'][$new_userid]))
+			if (!isset($old_event['participants'][$new_userid]))
 			{
 				$added[$new_userid] = 'U';
 			}
 		}
 		//echo "<p>calendar_boupdate::check4update() added=".print_r($added,true).", modified=".print_r($modified,true).", deleted=".print_r($deleted,true)."</p>\n";
-		if(count($added) || count($modified) || count($deleted))
+		if (count($added) || count($modified) || count($deleted))
 		{
-			if(count($added))
+			if (count($added))
 			{
-				$this->send_update(MSG_ADDED,$added,$old_event,$new_event);
+				$this->send_update(MSG_ADDED, $added, $old_event, $new_event);
 			}
-			if(count($modified))
+			if (count($modified))
 			{
-				$this->send_update(MSG_MODIFIED,$modified,$old_event,$new_event);
+				$this->send_update(MSG_MODIFIED, $modified, $old_event, $new_event);
 			}
-			if(count($deleted))
+			if (count($deleted))
 			{
-				$this->send_update(MSG_DISINVITE,$deleted,$new_event);
+				$this->send_update(MSG_DISINVITE, $deleted, $new_event);
 			}
 		}
 	}
@@ -700,11 +700,11 @@ 
 	 * @param string $status of current user
 	 * @return boolean true = update requested, false otherwise
 	 */
-	public static function update_requested($userid, $part_prefs, &$msg_type, $old_event ,$new_event, $role, $status=null)
+	public static function update_requested($userid, $part_prefs, &$msg_type, $old_event, $new_event, $role, $status = null)
 	{
 		if ($msg_type == MSG_ALARM)
 		{
-			return True;	// always True for now
+			return True; // always True for now
 		}
 		$want_update = 0;
 
@@ -712,7 +712,7 @@ 
 		//
 		$msg_is_response = $msg_type == MSG_REJECTED || $msg_type == MSG_ACCEPTED || $msg_type == MSG_TENTATIVE || $msg_type == MSG_DELEGATED;
 
-		switch($ru = $part_prefs['calendar']['receive_updates'])
+		switch ($ru = $part_prefs['calendar']['receive_updates'])
 		{
 			case 'responses':
 				++$want_update;
@@ -726,8 +726,8 @@ 
 			default:
 				if (is_array($new_event) && is_array($old_event))
 				{
-					$diff = max(abs(self::date2ts($old_event['start'])-self::date2ts($new_event['start'])),
-						abs(self::date2ts($old_event['end'])-self::date2ts($new_event['end'])));
+					$diff = max(abs(self::date2ts($old_event['start']) - self::date2ts($new_event['start'])),
+						abs(self::date2ts($old_event['end']) - self::date2ts($new_event['end'])));
 					$check = $ru == 'time_change_4h' ? 4 * 60 * 60 - 1 : 0;
 					if ($msg_type == MSG_MODIFIED && $diff > $check)
 					{
@@ -747,13 +747,13 @@ 
 				if (!is_numeric($userid) && $role == 'CHAIR' &&
 					($msg_is_response || in_array($msg_type, array(MSG_ADDED, MSG_DELETED))))
 				{
-					switch($msg_type)
+					switch ($msg_type)
 					{
 						case MSG_DELETED:	// treat deleting event as rejection to organizer
 							$msg_type = MSG_REJECTED;
 							break;
 						case MSG_ADDED:		// new events use added, but organizer needs status
-							switch($status[0])
+							switch ($status[0])
 							{
 								case 'A': $msg_type = MSG_ACCEPTED; break;
 								case 'R': $msg_type = MSG_REJECTED; break;
@@ -778,7 +778,7 @@ 
 	 * @param string $role ='REQ-PARTICIPANT'
 	 * @return boolean true if user requested to be notified, false if not
 	 */
-	static public function email_update_requested($user_or_email, $ical_method='REQUEST', $role='REQ-PARTICIPANT')
+	static public function email_update_requested($user_or_email, $ical_method = 'REQUEST', $role = 'REQ-PARTICIPANT')
 	{
 		// check if email is from a user
 		if (is_numeric($user_or_email))
@@ -802,7 +802,7 @@ 
 				)
 			);
 		}
-		switch($ical_method)
+		switch ($ical_method)
 		{
 			default:
 			case 'REQUEST':
@@ -827,9 +827,9 @@ 
 	 * @param string& $action=null on return verbose name
 	 * @param string& $msg=null on return notification message
 	 */
-	function msg_type2ical_method($msg_type, &$action=null, &$msg=null)
+	function msg_type2ical_method($msg_type, &$action = null, &$msg = null)
 	{
-		switch($msg_type)
+		switch ($msg_type)
 		{
 			case MSG_DELETED:
 				$action = 'Canceled';
@@ -881,7 +881,7 @@ 
 		$msg = $this->cal_prefs['notify'.$pref];
 		if (empty($msg))
 		{
-			$msg = $this->cal_prefs['notifyAdded'];	// use a default
+			$msg = $this->cal_prefs['notifyAdded']; // use a default
 		}
 		//error_log(__METHOD__."($msg_type) action='$action', $msg='$msg' returning '$method'");
 		return $method;
@@ -897,7 +897,7 @@ 
 	 * @param int $user =0 User who started the notify, default current user
 	 * @return bool true/false
 	 */
-	function send_update($msg_type,$to_notify,$old_event,$new_event=null,$user=0)
+	function send_update($msg_type, $to_notify, $old_event, $new_event = null, $user = 0)
 	{
 		//error_log(__METHOD__."($msg_type,".array2string($to_notify).",...) ".array2string($new_event));
 		if (!is_array($to_notify))
@@ -909,11 +909,11 @@ 
 		$owner = $old_event ? $old_event['owner'] : $new_event['owner'];
 		if ($owner && !isset($to_notify[$owner]) && $msg_type != MSG_ALARM)
 		{
-			$to_notify[$owner] = 'OCHAIR';	// always include the event-owner
+			$to_notify[$owner] = 'OCHAIR'; // always include the event-owner
 		}
 
 		// ignore events in the past (give a tolerance of 10 seconds for the script)
-		if($old_event && $this->date2ts($old_event['start']) < ($this->now_su - 10))
+		if ($old_event && $this->date2ts($old_event['start']) < ($this->now_su - 10))
 		{
 			return False;
 		}
@@ -923,7 +923,7 @@ 
 			$restore_tz = $tz;
 			date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
 		}
-		$temp_user = $GLOBALS['egw_info']['user'];	// save user-date of the enviroment to restore it after
+		$temp_user = $GLOBALS['egw_info']['user']; // save user-date of the enviroment to restore it after
 
 		if (!$user)
 		{
@@ -939,17 +939,17 @@ 
 		$event = $msg_type == MSG_ADDED || $msg_type == MSG_MODIFIED ? $new_event : $old_event;
 
 		// add all group-members to the notification, unless they are already participants
-		foreach($to_notify as $userid => $statusid)
+		foreach ($to_notify as $userid => $statusid)
 		{
 			if (is_numeric($userid) && $GLOBALS['egw']->accounts->get_type($userid) == 'g' &&
 				($members = $GLOBALS['egw']->accounts->member($userid)))
 			{
-				foreach($members as $member)
+				foreach ($members as $member)
 				{
 					$member = $member['account_id'];
 					if (!isset($to_notify[$member]))
 					{
-						$to_notify[$member] = 'G';	// Group-invitation
+						$to_notify[$member] = 'G'; // Group-invitation
 					}
 				}
 			}
@@ -961,7 +961,7 @@ 
 		if ($old_event) $olddate = new egw_time($old_event['start']);
 		//error_log(__METHOD__."() date_default_timezone_get()=".date_default_timezone_get().", user-timezone=".egw_time::$user_timezone->getName().", startdate=".$startdate->format().", enddate=".$enddate->format().", updated=".$modified->format().", olddate=".($olddate ? $olddate->format() : ''));
 		$owner_prefs = $ics = null;
-		foreach($to_notify as $userid => $statusid)
+		foreach ($to_notify as $userid => $statusid)
 		{
 			$res_info = $quantity = $role = null;
 			calendar_so::split_status($statusid, $quantity, $role);
@@ -984,14 +984,14 @@ 
 
 				if (!isset($userid))
 				{
-					if (empty($res_info['email'])) continue;	// no way to notify
+					if (empty($res_info['email'])) continue; // no way to notify
 					// check if event-owner wants non-EGroupware users notified
 					if (is_null($owner_prefs))
 					{
 						$preferences = new preferences($owner);
 						$owner_prefs = $preferences->read_repository();
 					}
-					if ($role != 'CHAIR' &&		// always notify externals CHAIRs
+					if ($role != 'CHAIR' && // always notify externals CHAIRs
 						(empty($owner_prefs['calendar']['notify_externals']) ||
 						$owner_prefs['calendar']['notify_externals'] == 'no'))
 					{
@@ -1003,12 +1003,12 @@ 
 
 			if ($statusid == 'R' || $GLOBALS['egw']->accounts->get_type($userid) == 'g')
 			{
-				continue;	// dont notify rejected participants or groups
+				continue; // dont notify rejected participants or groups
 			}
 
-			if($userid != $GLOBALS['egw_info']['user']['account_id'] ||
+			if ($userid != $GLOBALS['egw_info']['user']['account_id'] ||
 				($userid == $GLOBALS['egw_info']['user']['account_id'] &&
-					$user_prefs['calendar']['receive_own_updates']==1) ||
+					$user_prefs['calendar']['receive_own_updates'] == 1) ||
 				$msg_type == MSG_ALARM)
 			{
 				$tfn = $tln = $lid = null; //cleanup of lastname and fullname (in case they are set in a previous loop)
@@ -1016,8 +1016,8 @@ 
 				{
 					$preferences = new preferences($userid);
 					$GLOBALS['egw_info']['user']['preferences'] = $part_prefs = $preferences->read_repository();
-					$GLOBALS['egw']->accounts->get_account_name($userid,$lid,$tfn,$tln);
-					$fullname = common::display_fullname('',$tfn,$tln);
+					$GLOBALS['egw']->accounts->get_account_name($userid, $lid, $tfn, $tln);
+					$fullname = common::display_fullname('', $tfn, $tln);
 				}
 				else	// external email address: use preferences of event-owner, plus some hardcoded settings (eg. ical notification)
 				{
@@ -1028,7 +1028,7 @@ 
 					}
 					$part_prefs = $owner_prefs;
 					$part_prefs['calendar']['receive_updates'] = $owner_prefs['calendar']['notify_externals'];
-					$part_prefs['calendar']['update_format'] = 'ical';	// use ical format
+					$part_prefs['calendar']['update_format'] = 'ical'; // use ical format
 					$fullname = $res_info && !empty($res_info['name']) ? $res_info['name'] : $userid;
 				}
 				$m_type = $msg_type;
@@ -1056,7 +1056,7 @@ 
 				if (!isset($part_prefs['common']['tz'])) $part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];
 				$timezone = new DateTimeZone($part_prefs['common']['tz']);
 				$timeformat = $part_prefs['common']['timeformat'];
-				switch($timeformat)
+				switch ($timeformat)
 				{
 			  		case '24':
 						$timeformat = 'H:i';
@@ -1065,7 +1065,7 @@ 
 						$timeformat = 'h:i a';
 						break;
 				}
-				$timeformat = $part_prefs['common']['dateformat'] . ', ' . $timeformat;
+				$timeformat = $part_prefs['common']['dateformat'].', '.$timeformat;
 
 				$startdate->setTimezone($timezone);
 				$details['startdate'] = $startdate->format($timeformat);
@@ -1074,7 +1074,7 @@ 
 				$details['enddate'] = $enddate->format($timeformat);
 
 				$modified->setTimezone($timezone);
-				$details['updated'] = $modified->format($timeformat) . ', ' . common::grab_owner_name($event['modifier']);
+				$details['updated'] = $modified->format($timeformat).', '.common::grab_owner_name($event['modifier']);
 
 				if ($old_event != False)
 				{
@@ -1083,15 +1083,14 @@ 
 				}
 				//error_log(__METHOD__."() userid=$userid, timezone=".$timezone->getName().", startdate=$details[startdate], enddate=$details[enddate], updated=$details[updated], olddate=$details[olddate]");
 
-				list($subject,$notify_body) = explode("\n",$GLOBALS['egw']->preferences->parse_notify($notify_msg,$details),2);
+				list($subject, $notify_body) = explode("\n", $GLOBALS['egw']->preferences->parse_notify($notify_msg, $details), 2);
 				// alarm is NOT an iCal method, therefore we have to use extened (no iCal)
-				switch($msg_type == MSG_ALARM ? 'extended' : $part_prefs['calendar']['update_format'])
+				switch ($msg_type == MSG_ALARM ? 'extended' : $part_prefs['calendar']['update_format'])
 				{
-					case 'ical':
-						if (is_null($ics) || $m_type != $msg_type)	// need different ical for organizer notification
+					case 'ical' : if (is_null($ics) || $m_type != $msg_type)	// need different ical for organizer notification
 						{
 							$calendar_ical = new calendar_ical();
-							$calendar_ical->setSupportedFields('full');	// full iCal fields+event TZ
+							$calendar_ical->setSupportedFields('full'); // full iCal fields+event TZ
 							// 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 = $calendar_ical->exportVCal(array(isset($cleared_event) ? $cleared_event : $event['id']),
@@ -1110,11 +1109,11 @@ 
 					case 'extended':
 
 						$details_body = lang('Event Details follow').":\n";
-						foreach($event_arr as $key => $val)
+						foreach ($event_arr as $key => $val)
 						{
-							if(!empty($details[$key]))
+							if (!empty($details[$key]))
 							{
-								switch($key)
+								switch ($key)
 								{
 							 		case 'access':
 									case 'priority':
@@ -1123,7 +1122,7 @@ 
 									case 'title':
 										break;
 									default:
-										$details_body .= sprintf("%-20s %s\n",$val['field'].':',$details[$key]);
+										$details_body .= sprintf("%-20s %s\n", $val['field'].':', $details[$key]);
 										break;
 							 	}
 							}
@@ -1131,7 +1130,7 @@ 
 						break;
 				}
 				// send via notification_app
-				if($GLOBALS['egw_info']['apps']['notifications']['enabled'])
+				if ($GLOBALS['egw_info']['apps']['notifications']['enabled'])
 				{
 					try {
 						//error_log(__METHOD__."() notifying $userid from $senderid: $subject");
@@ -1155,7 +1154,7 @@ 
 						$notification->set_popupmessage($notify_body."\n\n".$details['description']."\n\n".$details_body);
 						$notification->set_popuplinks(array($details['link_arr']));
 
-						if(is_array($attachment)) { $notification->set_attachments(array($attachment)); }
+						if (is_array($attachment)) { $notification->set_attachments(array($attachment)); }
 						$notification->send();
 					}
 					catch (Exception $exception) {
@@ -1187,14 +1186,14 @@ 
 		return true;
 	}
 
-	function get_update_message($event,$added)
+	function get_update_message($event, $added)
 	{
 		$nul = null;
-		$details = $this->_get_event_details($event,$added ? lang('Added') : lang('Modified'),$nul);
+		$details = $this->_get_event_details($event, $added ? lang('Added') : lang('Modified'), $nul);
 
 		$notify_msg = $this->cal_prefs[$added || empty($this->cal_prefs['notifyModified']) ? 'notifyAdded' : 'notifyModified'];
 
-		return explode("\n",$GLOBALS['egw']->preferences->parse_notify($notify_msg,$details),2);
+		return explode("\n", $GLOBALS['egw']->preferences->parse_notify($notify_msg, $details), 2);
 	}
 
 	/**
@@ -1208,37 +1207,37 @@ 
 		//echo "<p>bocalendar::send_alarm("; print_r($alarm); echo ")</p>\n";
 		$GLOBALS['egw_info']['user']['account_id'] = $this->owner = $alarm['owner'];
 
-		$event_time_user = egw_time::server2user($alarm['time'] + $alarm['offset']);	// alarm[time] is in server-time, read requires user-time
-		if (!$alarm['owner'] || !$alarm['cal_id'] || !($event = $this->read($alarm['cal_id'],$event_time_user)))
+		$event_time_user = egw_time::server2user($alarm['time'] + $alarm['offset']); // alarm[time] is in server-time, read requires user-time
+		if (!$alarm['owner'] || !$alarm['cal_id'] || !($event = $this->read($alarm['cal_id'], $event_time_user)))
 		{
-			return False;	// event not found
+			return False; // event not found
 		}
 		if ($alarm['all'])
 		{
 			$to_notify = $event['participants'];
 		}
-		elseif ($this->check_perms(EGW_ACL_READ,$event))	// checks agains $this->owner set to $alarm[owner]
+		elseif ($this->check_perms(EGW_ACL_READ, $event))	// checks agains $this->owner set to $alarm[owner]
 		{
 			$to_notify[$alarm['owner']] = 'A';
 		}
 		else
 		{
-			return False;	// no rights
+			return False; // no rights
 		}
 		// need to load calendar translations and set currentapp, so calendar can reload a different lang
 		translation::add_app('calendar');
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'calendar';
 
-		$ret = $this->send_update(MSG_ALARM,$to_notify,$event,False,$alarm['owner']);
+		$ret = $this->send_update(MSG_ALARM, $to_notify, $event, False, $alarm['owner']);
 
 		// create a new alarm for recuring events for the next event, if one exists
-		if ($event['recur_type'] != MCAL_RECUR_NONE && ($event = $this->read($alarm['cal_id'],$event_time_user+1)))
+		if ($event['recur_type'] != MCAL_RECUR_NONE && ($event = $this->read($alarm['cal_id'], $event_time_user + 1)))
 		{
 			$alarm['time'] = $this->date2ts($event['start']) - $alarm['offset'];
 			unset($alarm['times']);
 			unset($alarm['next']);
 			//error_log(__METHOD__."() moving alarm to next recurrence ".array2string($alarm));
-			$this->save_alarm($alarm['cal_id'], $alarm, false);	// false = do NOT update timestamp, as nothing changed for iCal clients
+			$this->save_alarm($alarm['cal_id'], $alarm, false); // false = do NOT update timestamp, as nothing changed for iCal clients
 		}
 		return $ret;
 	}
@@ -1254,15 +1253,15 @@ 
 	 * DEPRECATED: we allways (have to) update timestamp, as they are required for sync!
 	 * @return int|boolean $cal_id > 0 or false on error (eg. permission denied)
 	 */
-	function save($event,$ignore_acl=false,$updateTS=true)
+	function save($event, $ignore_acl = false, $updateTS = true)
 	{
 		unset($updateTS);
 		//error_log(__METHOD__.'('.array2string($event).", $ignore_acl, $updateTS)");
 
 		// check if user has the permission to update / create the event
-		if (!$ignore_acl && ($event['id'] && !$this->check_perms(EGW_ACL_EDIT,$event['id']) ||
-			!$event['id'] && !$this->check_perms(EGW_ACL_EDIT,0,$event['owner']) &&
-			!$this->check_perms(EGW_ACL_ADD,0,$event['owner'])))
+		if (!$ignore_acl && ($event['id'] && !$this->check_perms(EGW_ACL_EDIT, $event['id']) ||
+			!$event['id'] && !$this->check_perms(EGW_ACL_EDIT, 0, $event['owner']) &&
+			!$this->check_perms(EGW_ACL_ADD, 0, $event['owner'])))
 		{
 			return false;
 		}
@@ -1307,19 +1306,19 @@ 
 				$time->setUser();
 				$save_event['recur_enddate'] = egw_time::to($time, 'ts');
 			}
-			$timestamps = array('modified','created');
+			$timestamps = array('modified', 'created');
 			// all-day events are handled in server time
 			$event['tzid'] = $save_event['tzid'] = egw_time::$server_timezone->getName();
 		}
 		else
 		{
-			$timestamps = array('start','end','modified','created','recur_enddate','recurrence');
+			$timestamps = array('start', 'end', 'modified', 'created', 'recur_enddate', 'recurrence');
 		}
 		// we run all dates through date2ts, to adjust to server-time and the possible date-formats
-		foreach($timestamps as $ts)
+		foreach ($timestamps as $ts)
 		{
 			// we convert here from user-time to timestamps in server-time!
-			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
+			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts], true) : 0;
 		}
 		// convert tzid name to integer tz_id, of set user default
 		if (empty($event['tzid']) || !($event['tz_id'] = calendar_timezones::tz2id($event['tzid'])))
@@ -1329,7 +1328,7 @@ 
 		// same with the recur exceptions
 		if (isset($event['recur_exception']) && is_array($event['recur_exception']))
 		{
-			foreach($event['recur_exception'] as &$date)
+			foreach ($event['recur_exception'] as &$date)
 			{
 				if ($event['whole_day'])
 				{
@@ -1338,7 +1337,7 @@ 
 				}
 				else
 				{
-					$date = $this->date2ts($date,true);
+					$date = $this->date2ts($date, true);
 				}
 			}
 			unset($date);
@@ -1346,7 +1345,7 @@ 
 		// same with the alarms
 		if (isset($event['alarm']) && is_array($event['alarm']) && isset($event['start']))
 		{
-			foreach($event['alarm'] as $id => &$alarm)
+			foreach ($event['alarm'] as $id => &$alarm)
 			{
 				// remove alarms belonging to not longer existing or rejected participants
 				if ($alarm['owner'] && isset($event['participants']))
@@ -1364,15 +1363,14 @@ 
 		// update all existing alarm times, in case alarm got moved and alarms are not include in $event
 		if ($old_event && is_array($old_event['alarm']) && isset($event['start']))
 		{
-			foreach($old_event['alarm'] as $id => &$alarm)
+			foreach ($old_event['alarm'] as $id => &$alarm)
 			{
 				if (!isset($event['alarm'][$id]))
 				{
 					$alarm['time'] = $event['start'] - $alarm['offset'];
 					if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
 						// remove (not store) alarms belonging to not longer existing or rejected participants
-					$status = isset($event['participants']) ? $event['participants'][$alarm['owner']] :
-						$old_event['participants'][$alarm['owner']];
+					$status = isset($event['participants']) ? $event['participants'][$alarm['owner']] : $old_event['participants'][$alarm['owner']];
 					if (!$alarm['owner'] || isset($status) && calendar_so::split_status($status) !== 'R')
 					{
 						$this->so->save_alarm($event['id'], $alarm);
@@ -1398,7 +1396,7 @@ 
 		}
 		$set_recurrences = false;
 		$set_recurrences_start = 0;
-		if (($cal_id = $this->so->save($event,$set_recurrences,$set_recurrences_start,0,$event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
+		if (($cal_id = $this->so->save($event, $set_recurrences, $set_recurrences_start, 0, $event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
 		{
 			$save_event['id'] = $cal_id;
 			// unset participants to enforce the default stati for all added recurrences
@@ -1410,7 +1408,7 @@ 
 		// create links for new participants from addressbook, if configured
 		if ($cal_id && $GLOBALS['egw_info']['server']['link_contacts'] && $event['participants'])
 		{
-			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);
@@ -1423,7 +1421,7 @@ 
 
 		// Update history
 		$tracking = new calendar_tracking($this);
-		if (empty($event['id']) && !empty($cal_id)) $event['id']=$cal_id;
+		if (empty($event['id']) && !empty($cal_id)) $event['id'] = $cal_id;
 		$tracking->track($event, $old_event);
 
 		return $cal_id;
@@ -1438,16 +1436,16 @@ 
 	 * @param array|int $event event array or id of the event
 	 * @return boolean
 	 */
-	function check_status_perms($uid,$event)
+	function check_status_perms($uid, $event)
 	{
 		if ($uid[0] == 'c' || $uid[0] == 'e')	// for contact we use the owner of the event
 		{
 			if (!is_array($event) && !($event = $this->read($event))) return false;
 
-			return $this->check_perms(EGW_ACL_EDIT,0,$event['owner']);
+			return $this->check_perms(EGW_ACL_EDIT, 0, $event['owner']);
 		}
 		// check if we have a category acl for the event or not (null)
-		$access = $this->check_cat_acl(self::CAT_ACL_STATUS,$event);
+		$access = $this->check_cat_acl(self::CAT_ACL_STATUS, $event);
 		if (!is_null($access))
 		{
 			return $access;
@@ -1457,17 +1455,17 @@ 
 		{
 			$resource = $this->resource_info($uid);
 
-			return EGW_ACL_EDIT & $resource['rights'];
+			return EGW_ACL_EDIT&$resource['rights'];
 		}
 		if (!is_array($event) && !($event = $this->read($event))) return false;
 
 		// regular user and groups (need to check memberships too)
 		if (!isset($event['participants'][$uid]))
 		{
-			$memberships = $GLOBALS['egw']->accounts->memberships($uid,true);
+			$memberships = $GLOBALS['egw']->accounts->memberships($uid, true);
 		}
 		$memberships[] = $uid;
-		return array_intersect($memberships, array_keys($event['participants'])) && $this->check_perms(EGW_ACL_EDIT,0,$uid);
+		return array_intersect($memberships, array_keys($event['participants'])) && $this->check_perms(EGW_ACL_EDIT, 0, $uid);
 	}
 
 	/**
@@ -1481,16 +1479,16 @@ 
 	 * @return boolean false=access denied because of cat acl, true access granted because of cat acl,
 	 * 	null = cat has no acl
 	 */
-	function check_cat_acl($right,$event)
+	function check_cat_acl($right, $event)
 	{
 		if (!is_array($event)) $event = $this->read($event);
 
 		$ret = null;
 		if ($event['category'])
 		{
-			foreach(is_array($event['category']) ? $event['category'] : explode(',',$event['category']) as $cat_id)
+			foreach (is_array($event['category']) ? $event['category'] : explode(',', $event['category']) as $cat_id)
 			{
-				$access = self::has_cat_right($right,$cat_id,$this->user);
+				$access = self::has_cat_right($right, $cat_id, $this->user);
 				if ($access === true)
 				{
 					$ret = true;
@@ -1498,7 +1496,7 @@ 
 				}
 				if ($access === false)
 				{
-					$ret = false;	// cat denies access --> check further cats
+					$ret = false; // cat denies access --> check further cats
 				}
 			}
 		}
@@ -1519,12 +1517,12 @@ 
 	 * @param int $cat_id =null null to return array with all cats
 	 * @return array with account_id => right pairs
 	 */
-	public static function get_cat_rights($cat_id=null)
+	public static function get_cat_rights($cat_id = null)
 	{
 		if (!isset(self::$cat_rights_cache))
 		{
-			self::$cat_rights_cache = egw_cache::getSession('calendar','cat_rights',
-				array($GLOBALS['egw']->acl,'get_location_grants'),array('L%','calendar'));
+			self::$cat_rights_cache = egw_cache::getSession('calendar', 'cat_rights',
+				array($GLOBALS['egw']->acl, 'get_location_grants'), array('L%', 'calendar'));
 		}
 		//echo "<p>".__METHOD__."($cat_id) = ".array2string($cat_id ? self::$cat_rights_cache['L'.$cat_id] : self::$cat_rights_cache)."</p>\n";
 		return $cat_id ? self::$cat_rights_cache['L'.$cat_id] : self::$cat_rights_cache;
@@ -1537,7 +1535,7 @@ 
 	 * @param int $user
 	 * @param int $rights self::CAT_ACL_{ADD|STATUS} or'ed together
 	 */
-	public static function set_cat_rights($cat_id,$user,$rights)
+	public static function set_cat_rights($cat_id, $user, $rights)
 	{
 		//echo "<p>".__METHOD__."($cat_id,$user,$rights)</p>\n";
 		if (!isset(self::$cat_rights_cache)) self::get_cat_rights($cat_id);
@@ -1547,15 +1545,15 @@ 
 			if ($rights)
 			{
 				self::$cat_rights_cache['L'.$cat_id][$user] = $rights;
-				$GLOBALS['egw']->acl->add_repository('calendar','L'.$cat_id,$user,$rights);
+				$GLOBALS['egw']->acl->add_repository('calendar', 'L'.$cat_id, $user, $rights);
 			}
 			else
 			{
 				unset(self::$cat_rights_cache['L'.$cat_id][$user]);
 				if (!self::$cat_rights_cache['L'.$cat_id]) unset(self::$cat_rights_cache['L'.$cat_id]);
-				$GLOBALS['egw']->acl->delete_repository('calendar','L'.$cat_id,$user);
+				$GLOBALS['egw']->acl->delete_repository('calendar', 'L'.$cat_id, $user);
 			}
-			egw_cache::setSession('calendar','cat_rights',self::$cat_rights_cache);
+			egw_cache::setSession('calendar', 'cat_rights', self::$cat_rights_cache);
 		}
 	}
 
@@ -1566,9 +1564,9 @@ 
 	 * @return boolean false=access denied because of cat acl, true access granted because of cat acl,
 	 * 	null = cat has no acl
 	 */
-	public static function has_cat_right($right,$cat_id,$user)
+	public static function has_cat_right($right, $cat_id, $user)
 	{
-		static $cache=null;
+		static $cache = null;
 
 		if (!isset($cache[$cat_id]))
 		{
@@ -1576,21 +1574,21 @@ 
 			$cat_rights = self::get_cat_rights($cat_id);
 			if (!is_null($cat_rights))
 			{
-				static $memberships=null;
+				static $memberships = null;
 				if (is_null($memberships))
 				{
-					$memberships = $GLOBALS['egw']->accounts->memberships($user,true);
+					$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 					$memberships[] = $user;
 				}
-				foreach($cat_rights as $uid => $value)
+				foreach ($cat_rights as $uid => $value)
 				{
 					$all |= $value;
-					if (in_array($uid,$memberships)) $own |= $value;
+					if (in_array($uid, $memberships)) $own |= $value;
 				}
 			}
-			foreach(array(self::CAT_ACL_ADD,self::CAT_ACL_STATUS) as $mask)
+			foreach (array(self::CAT_ACL_ADD, self::CAT_ACL_STATUS) as $mask)
 			{
-				$cache[$cat_id][$mask] = !($all & $mask) ? null : !!($own & $mask);
+				$cache[$cat_id][$mask] = !($all&$mask) ? null : !!($own&$mask);
 			}
 		}
 		//echo "<p>".__METHOD__."($right,$cat_id) all=$all, own=$own returning ".array2string($cache[$cat_id][$right])."</p>\n";
@@ -1610,13 +1608,13 @@ 
 	 * @param boolean $skip_notification =false true: do not send notification messages
 	 * @return int number of changed recurrences
 	 */
-	function set_status($event,$uid,$status,$recur_date=0,$ignore_acl=false,$updateTS=true,$skip_notification=false)
+	function set_status($event, $uid, $status, $recur_date = 0, $ignore_acl = false, $updateTS = true, $skip_notification = false)
 	{
 		unset($updateTS);
 
 		$cal_id = is_array($event) ? $event['id'] : $event;
 		//echo "<p>calendar_boupdate::set_status($cal_id,$uid,$status,$recur_date)</p>\n";
-		if (!$cal_id || (!$ignore_acl && !$this->check_status_perms($uid,$event)))
+		if (!$cal_id || (!$ignore_acl && !$this->check_status_perms($uid, $event)))
 		{
 			return false;
 		}
@@ -1625,16 +1623,16 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				"($cal_id, $uid, $status, $recur_date)\n",3,$this->logfile);
+				"($cal_id, $uid, $status, $recur_date)\n", 3, $this->logfile);
 		}
 		$old_event = $this->read($cal_id, $recur_date, false, 'server');
-		if (($Ok = $this->so->set_status($cal_id,is_numeric($uid)?'u':$uid[0],
-				is_numeric($uid)?$uid:substr($uid,1),$status,
-				$recur_date?$this->date2ts($recur_date,true):0,$role)))
+		if (($Ok = $this->so->set_status($cal_id, is_numeric($uid) ? 'u' : $uid[0],
+				is_numeric($uid) ? $uid : substr($uid, 1), $status,
+				$recur_date ? $this->date2ts($recur_date, true) : 0, $role)))
 		{
 			if ($status == 'R')	// remove alarms belonging to rejected participants
 			{
-				foreach(isset($event['alarm']) ? $event['alarm'] : $old_event['alarm'] as $id => $alarm)
+				foreach (isset($event['alarm']) ? $event['alarm'] : $old_event['alarm'] as $id => $alarm)
 				{
 					if ((string)$alarm['owner'] === (string)$uid)
 					{
@@ -1657,8 +1655,8 @@ 
 			if (isset($status2msg[$status]) && !$skip_notification)
 			{
 				if (!is_array($event)) $event = $this->read($cal_id);
-				if (isset($recur_date)) $event = $this->read($event['id'],$recur_date); //re-read the actually edited recurring event
-				$this->send_update($status2msg[$status],$event['participants'],$event);
+				if (isset($recur_date)) $event = $this->read($event['id'], $recur_date); //re-read the actually edited recurring event
+				$this->send_update($status2msg[$status], $event['participants'], $event);
 			}
 
 			// Update history
@@ -1678,14 +1676,14 @@ 
 	 * @param int $recur_date =0 date to change, or 0 = all since now
 	 * @param boolean $skip_notification Do not send notifications.  Parameter passed on to set_status().
 	 */
-	function update_status($new_event, $old_event , $recur_date=0, $skip_notification=false)
+	function update_status($new_event, $old_event, $recur_date = 0, $skip_notification = false)
 	{
 		if (!isset($new_event['participants'])) return;
 
 		// check the old list against the new list
 		foreach ($old_event['participants'] as $userid => $status)
   		{
-            if (!isset($new_event['participants'][$userid])){
+            if (!isset($new_event['participants'][$userid])) {
             	// Attendee will be deleted this way
             	$new_event['participants'][$userid] = 'G';
             }
@@ -1698,7 +1696,7 @@ 
 		// write the changes
 		foreach ($new_event['participants'] as $userid => $status)
 		{
-			$this->set_status($old_event, $userid, $status, $recur_date, true, false,$skip_notification);
+			$this->set_status($old_event, $userid, $status, $recur_date, true, false, $skip_notification);
 		}
     }
 
@@ -1713,43 +1711,43 @@ 
 	 * @param int &$exceptions_kept=null on return number of kept exceptions
 	 * @return boolean true on success, false on error (usually permission denied)
 	 */
-	function delete($cal_id, $recur_date=0, $ignore_acl=false, $skip_notification=false,
-		$delete_exceptions=true, &$exceptions_kept=null)
+	function delete($cal_id, $recur_date = 0, $ignore_acl = false, $skip_notification = false,
+		$delete_exceptions = true, &$exceptions_kept = null)
 	{
 		//error_log(__METHOD__."(cal_id=$cal_id, recur_date=$recur_date, ignore_acl=$ignore_acl, skip_notifications=$skip_notification)");
-		if (!($event = $this->read($cal_id,$recur_date)) ||
-			!$ignore_acl && !$this->check_perms(EGW_ACL_DELETE,$event))
+		if (!($event = $this->read($cal_id, $recur_date)) ||
+			!$ignore_acl && !$this->check_perms(EGW_ACL_DELETE, $event))
 		{
 			return false;
 		}
 
 		// Don't send notification if the event has already been deleted
-		if(!$event['deleted'] && !$skip_notification)
+		if (!$event['deleted'] && !$skip_notification)
 		{
-			$this->send_update(MSG_DELETED,$event['participants'],$event);
+			$this->send_update(MSG_DELETED, $event['participants'], $event);
 		}
 
 		if (!$recur_date || $event['recur_type'] == MCAL_RECUR_NONE)
 		{
 			$config = config::read('phpgwapi');
-			if(!$config['calendar_delete_history'] || $event['deleted'])
+			if (!$config['calendar_delete_history'] || $event['deleted'])
 			{
 				$this->so->delete($cal_id);
 
 				// delete all links to the event
-				egw_link::unlink(0,'calendar',$cal_id);
+				egw_link::unlink(0, 'calendar', $cal_id);
 			}
 			elseif ($config['calendar_delete_history'])
 			{
 				// mark all links to the event as deleted, but keep them
-				egw_link::unlink(0,'calendar',$cal_id,'','','',true);
+				egw_link::unlink(0, 'calendar', $cal_id, '', '', '', true);
 
 				$event['deleted'] = $this->now;
 				$this->save($event, $ignore_acl);
 				// Actually delete alarms
 				if (isset($event['alarm']) && is_array($event['alarm']))
 				{
-					foreach($event['alarm'] as $id => $alarm)
+					foreach ($event['alarm'] as $id => $alarm)
 					{
 						$this->delete_alarm($id);
 					}
@@ -1772,7 +1770,7 @@ 
 						if (!($exception = $this->read($id))) continue;
 						$exception['uid'] = common::generate_uid('calendar', $id);
 						$exception['reference'] = $exception['recurrence'] = 0;
-						$this->update($exception, true, true, false, true, $msg=null, true);
+						$this->update($exception, true, true, false, true, $msg = null, true);
 						++$exceptions_kept;
 					}
 				}
@@ -1784,9 +1782,9 @@ 
 			if ($event['alarm'])
 			{
 				$next_recurrance = null;
-				foreach($event['alarm'] as &$alarm)
+				foreach ($event['alarm'] as &$alarm)
 				{
-					if (($alarm['time'] == $recur_date) || ($alarm['time']+$alarm['offset'] == $recur_date))
+					if (($alarm['time'] == $recur_date) || ($alarm['time'] + $alarm['offset'] == $recur_date))
 					{
 						//error_log(__METHOD__.__LINE__.'->'.array2string($recur_date));
 						//error_log(__METHOD__.__LINE__.array2string($event));
@@ -1794,12 +1792,12 @@ 
 						{
 							$checkdate = $recur_date;
 							//if ($alarm['time']+$alarm['offset'] == $recur_date) $checkdate = $recur_date + $alarm['offset'];
-							if (($e = $this->read($cal_id,$checkdate+1)))
+							if (($e = $this->read($cal_id, $checkdate + 1)))
 							{
 								$next_recurrance = $this->date2ts($e['start']);
 							}
 						}
-						$alarm['time'] = $this->date2ts($next_recurrance, true);	// user to server-time
+						$alarm['time'] = $this->date2ts($next_recurrance, true); // user to server-time
 						$alarm['cal_id'] = $cal_id;
 						unset($alarm['times']);
 						unset($alarm['next']);
@@ -1813,7 +1811,7 @@ 
 			$event = $this->read($cal_id);
 			//if (isset($alarmbuffer)) $event['alarm'] = $alarmbuffer;
 			$event['recur_exception'][] = $recur_date;
-			$this->save($event);// updates the content-history
+			$this->save($event); // updates the content-history
 		}
 		if ($event['reference'])
 		{
@@ -1831,19 +1829,19 @@ 
 	 * @param array $disinvited
 	 * @return array
 	 */
-	function _get_event_details($event,$action,&$event_arr,$disinvited=array())
+	function _get_event_details($event, $action, &$event_arr, $disinvited = array())
 	{
 		$details = array(			// event-details for the notify-msg
 			'id'          => $event['id'],
 			'action'      => lang($action),
 		);
 		$event_arr = $this->event2array($event);
-		foreach($event_arr as $key => $val)
+		foreach ($event_arr as $key => $val)
 		{
 			if ($key == 'recur_type') $key = 'repetition';
 			$details[$key] = $val['data'];
 		}
-		$details['participants'] = $details['participants'] ? implode("\n",$details['participants']) : '';
+		$details['participants'] = $details['participants'] ? implode("\n", $details['participants']) : '';
 
 		$event_arr['link']['field'] = lang('URL');
 		$eventStart_arr = $this->date2array($event['start']); // give this as 'date' to the link to pick the right recurrence for the participants state
@@ -1864,7 +1862,7 @@ 
 		 */
 		$link_arr = array();
 		$link_arr['text'] = $event['title'];
-		$link_arr['view'] = array(	'menuaction' => 'calendar.calendar_uiforms.edit',
+		$link_arr['view'] = array('menuaction' => 'calendar.calendar_uiforms.edit',
 									'cal_id' => $event['id'],
 									'date' => $eventStart_arr['full'],
 									);
@@ -1872,11 +1870,11 @@ 
 		$details['link_arr'] = $link_arr;
 
 		$dis = array();
-		foreach($disinvited as $uid)
+		foreach ($disinvited as $uid)
 		{
 			$dis[] = $this->participant_name($uid);
 		}
-		$details['disinvited'] = implode(', ',$dis);
+		$details['disinvited'] = implode(', ', $dis);
 		return $details;
 	}
 
@@ -1900,14 +1898,14 @@ 
 			'data'	=> $event['description']
 		);
 
-		foreach(explode(',',$event['category']) as $cat_id)
+		foreach (explode(',', $event['category']) as $cat_id)
 		{
 			list($cat) = $GLOBALS['egw']->categories->return_single($cat_id);
 			$cat_string[] = stripslashes($cat['name']);
 		}
 		$var['category'] = Array(
 			'field'	=> lang('Category'),
-			'data'	=> implode(', ',$cat_string)
+			'data'	=> implode(', ', $cat_string)
 		);
 
 		$var['location'] = Array(
@@ -1953,7 +1951,7 @@ 
 
 		if (isset($event['participants']) && is_array($event['participants']) && !empty($event['participants']))
 		{
-			$participants = $this->participants($event,true);
+			$participants = $this->participants($event, true);
 		}
 		$var['participants'] = Array(
 			'field'	=> lang('Participants'),
@@ -1976,26 +1974,26 @@ 
 	 * @param array $old_event =null event-data in the DB before calling save
 	 * @param string $type ='update'
 	 */
-	function log2file($event2save,$event_saved,$old_event=null,$type='update')
+	function log2file($event2save, $event_saved, $old_event = null, $type = 'update')
 	{
-		if (!($f = fopen($this->log_file,'a')))
+		if (!($f = fopen($this->log_file, 'a')))
 		{
 			echo "<p>error opening '$this->log_file' !!!</p>\n";
 			return false;
 		}
-		fwrite($f,$type.': '.common::grab_owner_name($this->user).': '.date('r')."\n");
-		fwrite($f,"Time: time to save / saved time read back / old time before save\n");
-		foreach(array('start','end') as $name)
+		fwrite($f, $type.': '.common::grab_owner_name($this->user).': '.date('r')."\n");
+		fwrite($f, "Time: time to save / saved time read back / old time before save\n");
+		foreach (array('start', 'end') as $name)
 		{
-			fwrite($f,$name.': '.(isset($event2save[$name]) ? $this->format_date($event2save[$name]) : 'not set').' / '.
-				$this->format_date($event_saved[$name]) .' / '.
+			fwrite($f, $name.': '.(isset($event2save[$name]) ? $this->format_date($event2save[$name]) : 'not set').' / '.
+				$this->format_date($event_saved[$name]).' / '.
 				(is_null($old_event) ? 'no old event' : $this->format_date($old_event[$name]))."\n");
 		}
-		foreach(array('event2save','event_saved','old_event') as $name)
+		foreach (array('event2save', 'event_saved', 'old_event') as $name)
 		{
-			fwrite($f,$name.' = '.print_r($$name,true));
+			fwrite($f, $name.' = '.print_r($$name, true));
 		}
-		fwrite($f,"\n");
+		fwrite($f, "\n");
 		fclose($f);
 
 		return true;
@@ -2016,14 +2014,14 @@ 
 		if ($old_event !== null && $event['start'] == $old_event['start']) return;
 
 		$time = new egw_time($event['start']);
-		if(!is_array($event['alarm']))
+		if (!is_array($event['alarm']))
 		{
 			$event['alarm'] = $this->so->read_alarms($event['id']);
 		}
 
-		foreach($event['alarm'] as $id => &$alarm)
+		foreach ($event['alarm'] as $id => &$alarm)
 		{
-			if($event['recur_type'] != MCAL_RECUR_NONE)
+			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
 				calendar_so::shift_alarm($event, $alarm, $instance_date->format('ts'));
 			}
@@ -2043,14 +2041,14 @@ 
 	 * @param boolean $update_modified =true call update modified, default true
 	 * @return string id of the alarm, or false on error (eg. no perms)
 	 */
-	function save_alarm($cal_id, $alarm, $update_modified=true)
+	function save_alarm($cal_id, $alarm, $update_modified = true)
 	{
-		if (!$cal_id || !$this->check_perms(EGW_ACL_EDIT,$alarm['all'] ? $cal_id : 0,!$alarm['all'] ? $alarm['owner'] : 0))
+		if (!$cal_id || !$this->check_perms(EGW_ACL_EDIT, $alarm['all'] ? $cal_id : 0, !$alarm['all'] ? $alarm['owner'] : 0))
 		{
 			//echo "<p>no rights to save the alarm=".print_r($alarm,true)." to event($cal_id)</p>";
-			return false;	// no rights to add the alarm
+			return false; // no rights to add the alarm
 		}
-		$alarm['time'] = $this->date2ts($alarm['time'],true);	// user to server-time
+		$alarm['time'] = $this->date2ts($alarm['time'], true); // user to server-time
 
 		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, 'modify', $this->now);
 
@@ -2065,11 +2063,11 @@ 
 	 */
 	function delete_alarm($id)
 	{
-		list(,$cal_id) = explode(':',$id);
+		list(,$cal_id) = explode(':', $id);
 
-		if (!($alarm = $this->so->read_alarm($id)) || !$cal_id || !$this->check_perms(EGW_ACL_EDIT,$alarm['all'] ? $cal_id : 0,!$alarm['all'] ? $alarm['owner'] : 0))
+		if (!($alarm = $this->so->read_alarm($id)) || !$cal_id || !$this->check_perms(EGW_ACL_EDIT, $alarm['all'] ? $cal_id : 0, !$alarm['all'] ? $alarm['owner'] : 0))
 		{
-			return false;	// no rights to delete the alarm
+			return false; // no rights to delete the alarm
 		}
 
 		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, 'modify', $this->now);
@@ -2086,13 +2084,13 @@ 
 	 *  by the ones the user normally does not see due to category permissions - used to preserve categories
 	 * @return array category ids (found, added and preserved categories)
 	 */
-	function find_or_add_categories($catname_list, $old_event=null)
+	function find_or_add_categories($catname_list, $old_event = null)
 	{
 		if (is_array($old_event) || $old_event > 0)
 		{
 			// preserve categories without users read access
 			if (!is_array($old_event)) $old_event = $this->read($old_event);
-			$old_categories = explode(',',$old_event['category']);
+			$old_categories = explode(',', $old_event['category']);
 			$old_cats_preserve = array();
 			if (is_array($old_categories) && count($old_categories) > 0)
 			{
@@ -2146,7 +2144,7 @@ 
 	{
 		if (!is_array($cat_id_list))
 		{
-			$cat_id_list = explode(',',$cat_id_list);
+			$cat_id_list = explode(',', $cat_id_list);
 		}
 		$cat_list = array();
 		foreach ($cat_id_list as $cat_id)
@@ -2171,7 +2169,7 @@ 
 	 *                              master	-> try to find a releated series master
 	 * @return array calendar_ids of matching entries
 	 */
-	function find_event($event, $filter='exact')
+	function find_event($event, $filter = 'exact')
 	{
 		$matchingEvents = array();
 		$query = array();
@@ -2179,14 +2177,14 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				"($filter)[EVENT]:" . array2string($event)."\n",3,$this->logfile);
+				"($filter)[EVENT]:".array2string($event)."\n", 3, $this->logfile);
 		}
 
 		if (!isset($event['recurrence'])) $event['recurrence'] = 0;
 
 		if ($filter == 'master')
 		{
-			$query[] = 'recur_type!='. MCAL_RECUR_NONE;
+			$query[] = 'recur_type!='.MCAL_RECUR_NONE;
 			$query['cal_recurrence'] = 0;
 		}
 		elseif ($filter == 'exact')
@@ -2207,14 +2205,14 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'(' . $event['id'] . ")[EventID]\n",3,$this->logfile);
+					'('.$event['id'].")[EventID]\n", 3, $this->logfile);
 			}
 			if (($egwEvent = $this->read($event['id'], 0, false, 'server')))
 			{
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-						'()[FOUND]:' . array2string($egwEvent)."\n",3,$this->logfile);
+						'()[FOUND]:'.array2string($egwEvent)."\n", 3, $this->logfile);
 				}
 				if ($egwEvent['recur_type'] != MCAL_RECUR_NONE &&
 					(empty($event['uid']) || $event['uid'] == $egwEvent['uid']))
@@ -2233,7 +2231,7 @@ 
 						$exceptions = $this->so->get_recurrence_exceptions($egwEvent, $event['tzid']);
 						if (in_array($event['recurrence'], $exceptions))
 						{
-							$matchingEvents[] = $egwEvent['id'] . ':' . (int)$event['recurrence'];
+							$matchingEvents[] = $egwEvent['id'].':'.(int)$event['recurrence'];
 						}
 					}
 				} elseif ($filter != 'master' && ($filter == 'exact' ||
@@ -2252,19 +2250,19 @@ 
 
 		// only query calendars of users, we have READ-grants from
 		$users = array();
-		foreach(array_keys($this->grants) as $user)
+		foreach (array_keys($this->grants) as $user)
 		{
 			$user = trim($user);
-			if ($this->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY,0,$user))
+			if ($this->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY, 0, $user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user, $users))	// already added?
 				{
 					$users[] = $user;
 				}
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
-				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
+				continue; // for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
 			if (!is_numeric($user)) continue;
@@ -2275,11 +2273,11 @@ 
 				$members = $GLOBALS['egw']->accounts->member($user);
 				if (is_array($members))
 				{
-					foreach($members as $member)
+					foreach ($members as $member)
 					{
 						// use only members which gave the user a read-grant
-						if (!in_array($member['account_id'],$users) &&
-								$this->check_perms(EGW_ACL_READ|EGW_ACL_FREEBUSY,0,$member['account_id']))
+						if (!in_array($member['account_id'], $users) &&
+								$this->check_perms(EGW_ACL_READ|EGW_ACL_FREEBUSY, 0, $member['account_id']))
 						{
 							$users[] = $member['account_id'];
 						}
@@ -2291,9 +2289,9 @@ 
 				$memberships = $GLOBALS['egw']->accounts->membership($user);
 				if (is_array($memberships))
 				{
-					foreach($memberships as $group)
+					foreach ($memberships as $group)
 					{
-						if (!in_array($group['account_id'],$users))
+						if (!in_array($group['account_id'], $users))
 						{
 							$users[] = $group['account_id'];
 						}
@@ -2317,24 +2315,24 @@ 
 
 				// check length with some tolerance
 				$length = $event['end'] - $event['start'] - $delta;
-				$query[] = ('(cal_end-cal_start)>' . $length);
+				$query[] = ('(cal_end-cal_start)>'.$length);
 				$length += 2 * $delta;
-				$query[] = ('(cal_end-cal_start)<' . $length);
-				$query[] = ('cal_start>' . ($event['start'] - 86400));
-				$query[] = ('cal_start<' . ($event['start'] + 86400));
+				$query[] = ('(cal_end-cal_start)<'.$length);
+				$query[] = ('cal_start>'.($event['start'] - 86400));
+				$query[] = ('cal_start<'.($event['start'] + 86400));
 			}
 			elseif (isset($event['start']))
 			{
 				if ($filter == 'relax')
 				{
-					$query[] = ('cal_start>' . ($event['start'] - 3600));
-					$query[] = ('cal_start<' . ($event['start'] + 3600));
+					$query[] = ('cal_start>'.($event['start'] - 3600));
+					$query[] = ('cal_start<'.($event['start'] + 3600));
 				}
 				else
 				{
 					// we accept a tiny tolerance
-					$query[] = ('cal_start>' . ($event['start'] - 2));
-					$query[] = ('cal_start<' . ($event['start'] + 2));
+					$query[] = ('cal_start>'.($event['start'] - 2));
+					$query[] = ('cal_start<'.($event['start'] + 2));
 				}
 			}
 			if ($filter == 'relax')
@@ -2357,14 +2355,14 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'(' . $event['uid'] . ")[EventUID]\n",3,$this->logfile);
+					'('.$event['uid'].")[EventUID]\n", 3, $this->logfile);
 			}
 		}
 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'[QUERY]: ' . array2string($query)."\n",3,$this->logfile);
+				'[QUERY]: '.array2string($query)."\n", 3, $this->logfile);
 		}
 		if (!count($users) || !($foundEvents =
 			$this->so->search(null, null, $users, 0, 'owner', false, 0, array('query' => $query))))
@@ -2372,19 +2370,19 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				"[NO MATCH]\n",3,$this->logfile);
+				"[NO MATCH]\n", 3, $this->logfile);
 			}
 			return $matchingEvents;
 		}
 
 		$pseudos = array();
 
-		foreach($foundEvents as $egwEvent)
+		foreach ($foundEvents as $egwEvent)
 		{
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'[FOUND]: ' . array2string($egwEvent)."\n",3,$this->logfile);
+					'[FOUND]: '.array2string($egwEvent)."\n", 3, $this->logfile);
 			}
 
 			if (in_array($egwEvent['id'], $matchingEvents)) continue;
@@ -2458,7 +2456,7 @@ 
 						if (in_array($event['recurrence'], $exceptions))
 						{
 							// We found a pseudo exception
-							$matchingEvents = array($egwEvent['id'] . ':' . (int)$event['recurrence']);
+							$matchingEvents = array($egwEvent['id'].':'.(int)$event['recurrence']);
 							break;
 						}
 					}
@@ -2476,7 +2474,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() egwEvent length does not match!\n",3,$this->logfile);
+							"() egwEvent length does not match!\n", 3, $this->logfile);
 						}
 						continue;
 					}
@@ -2488,7 +2486,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() egwEvent is not a whole-day event!\n",3,$this->logfile);
+							"() egwEvent is not a whole-day event!\n", 3, $this->logfile);
 						}
 						continue;
 					}
@@ -2509,8 +2507,8 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() event[$key] differ: '" . $event[$key] .
-							"' <> '" . $egwEvent[$key] . "'\n",3,$this->logfile);
+							"() event[$key] differ: '".$event[$key].
+							"' <> '".$egwEvent[$key]."'\n", 3, $this->logfile);
 					}
 					continue 2; // next foundEvent
 				}
@@ -2528,7 +2526,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() egwEvent category $cat_id is missing!\n",3,$this->logfile);
+							"() egwEvent category $cat_id is missing!\n", 3, $this->logfile);
 						}
 						continue 2;
 					}
@@ -2540,7 +2538,7 @@ 
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 							'() event has additional categories:'
-							. array2string($newCategories)."\n",3,$this->logfile);
+							. array2string($newCategories)."\n", 3, $this->logfile);
 					}
 					continue;
 				}
@@ -2560,7 +2558,7 @@ 
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								"() additional event['participants']: $attendee\n",3,$this->logfile);
+								"() additional event['participants']: $attendee\n", 3, $this->logfile);
 							}
 							continue 2;
 						}
@@ -2583,8 +2581,8 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								'() missing event[participants]: ' .
-								array2string($egwEvent['participants'])."\n",3,$this->logfile);
+								'() missing event[participants]: '.
+								array2string($egwEvent['participants'])."\n", 3, $this->logfile);
 						}
 						continue;
 					}
@@ -2596,7 +2594,7 @@ 
 				if ($egwEvent['recur_type'] != MCAL_RECUR_NONE)
 				{
 					// We found a pseudo Exception
-					$pseudos[] = $egwEvent['id'] . ':' . $event['start'];
+					$pseudos[] = $egwEvent['id'].':'.$event['start'];
 					continue;
 				}
 			}
@@ -2618,7 +2616,7 @@ 
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								"() additional event['recur_exception']: $day\n",3,$this->logfile);
+								"() additional event['recur_exception']: $day\n", 3, $this->logfile);
 							}
 							continue 2;
 						}
@@ -2628,8 +2626,8 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								'() missing event[recur_exception]: ' .
-								array2string($event['recur_exception'])."\n",3,$this->logfile);
+								'() missing event[recur_exception]: '.
+								array2string($event['recur_exception'])."\n", 3, $this->logfile);
 						}
 						continue;
 					}
@@ -2644,8 +2642,8 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								"() events[$key] differ: " . $event[$key] .
-								' <> ' . $egwEvent[$key]."\n",3,$this->logfile);
+								"() events[$key] differ: ".$event[$key].
+								' <> '.$egwEvent[$key]."\n", 3, $this->logfile);
 						}
 						continue 2;
 					}
@@ -2661,7 +2659,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"() new exception for series found.\n",3,$this->logfile);
+					"() new exception for series found.\n", 3, $this->logfile);
 			}
 			$matchingEvents = array();
 		}
@@ -2672,7 +2670,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'[MATCHES]:' . array2string($matches)."\n",3,$this->logfile);
+				'[MATCHES]:'.array2string($matches)."\n", 3, $this->logfile);
 		}
 		return $matches;
 	}
@@ -2745,7 +2743,7 @@ 
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"()[MASTER]: $eventID\n",3,$this->logfile);
+					"()[MASTER]: $eventID\n", 3, $this->logfile);
 				}
 				$type = 'SERIES-EXCEPTION';
 				if (($master_event = $this->read($eventID, 0, false, 'server')))
@@ -2766,7 +2764,7 @@ 
 					}
 					elseif (in_array($event['start'], $master_event['recur_exception']))
 					{
-						$type='SERIES-PSEUDO-EXCEPTION'; // new pseudo exception?
+						$type = 'SERIES-PSEUDO-EXCEPTION'; // new pseudo exception?
 						$recurrence_event = $master_event;
 						$recurrence_event['start'] = $event['start'];
 						$recurrence_event['end'] -= $master_event['start'] - $event['start'];
@@ -2783,8 +2781,8 @@ 
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-									'() try occurrence ' . $egw_rrule->current()
-									. " ($occurrence)\n",3,$this->logfile);
+									'() try occurrence '.$egw_rrule->current()
+									. " ($occurrence)\n", 3, $this->logfile);
 							}
 							if ($event['start'] == $occurrence)
 							{
@@ -2817,8 +2815,8 @@ 
 			// default if we cannot find a proof for a fundamental change
 			// the recurrence_event is the master event with start and end adjusted to the recurrence
 			// check for changed data
-			foreach (array('start','end','uid','title','location','description',
-				'priority','public','special','non_blocking') as $key)
+			foreach (array('start', 'end', 'uid', 'title', 'location', 'description',
+				'priority', 'public', 'special', 'non_blocking') as $key)
 			{
 				if (!empty($event[$key]) && $recurrence_event[$key] != $event[$key])
 				{
@@ -2876,10 +2874,10 @@ 
      * @param &$event	the event we are working on
      *
      */
-    function server2usertime (&$event)
+    function server2usertime(&$event)
     {
 		// we run all dates through date2usertime, to adjust to user-time
-		foreach(array('start','end','recur_enddate','recurrence') as $ts)
+		foreach (array('start', 'end', 'recur_enddate', 'recurrence') as $ts)
 		{
 			// we convert here from server-time to timestamps in user-time!
 			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2usertime($event[$ts]) : 0;
@@ -2887,7 +2885,7 @@ 
 		// same with the recur exceptions
 		if (isset($event['recur_exception']) && is_array($event['recur_exception']))
 		{
-			foreach($event['recur_exception'] as $n => $date)
+			foreach ($event['recur_exception'] as $n => $date)
 			{
 				$event['recur_exception'][$n] = $this->date2usertime($date);
 			}
@@ -2895,7 +2893,7 @@ 
 		// same with the alarms
 		if (isset($event['alarm']) && is_array($event['alarm']))
 		{
-			foreach($event['alarm'] as $id => $alarm)
+			foreach ($event['alarm'] as $id => $alarm)
 			{
 				$event['alarm'][$id]['time'] = $this->date2usertime($alarm['time']);
 			}
@@ -2912,7 +2910,7 @@ 
 	{
 		if (is_numeric($age) && $age > 0)	// just make sure bogus values dont delete everything
 		{
-			$this->so->purge(time() - 365*24*3600*(float)$age);
+			$this->so->purge(time() - 365 * 24 * 3600 * (float)$age);
 		}
 	}
 }

Braces +241 added lines, -61 removed lines

@@ -81,11 +81,17 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started',True);
+		if ($this->debug > 0)
+		{
+			$this->debug_message('calendar_boupdate::__construct() started',True);
+		}
 
 		parent::__construct();	// calling the parent constructor
 
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished',True);
+		if ($this->debug > 0)
+		{
+			$this->debug_message('calendar_boupdate::__construct() finished',True);
+		}
 	}
 
 	/**
@@ -115,7 +121,10 @@ 
 	function update(&$event,$ignore_conflicts=false,$touch_modified=true,$ignore_acl=false,$updateTS=true,&$messages=null, $skip_notification=false)
 	{
 		//error_log(__METHOD__."(".array2string($event).",$ignore_conflicts,$touch_modified,$ignore_acl)");
-		if (!is_array($messages)) $messages = $messages ? (array)$messages : array();
+		if (!is_array($messages))
+		{
+			$messages = $messages ? (array)$messages : array();
+		}
 
 		if ($this->debug > 1 || $this->debug == 'update')
 		{
@@ -135,10 +144,13 @@ 
 
 		$status_reset_to_unknown = false;
 
-		if (($new_event = !$event['id']))	// some defaults for new entries
+		if (($new_event = !$event['id']))
+		{
+			// some defaults for new entries
 		{
 			// if no owner given, set user to owner
 			if (!$event['owner']) $event['owner'] = $this->user;
+		}
 			// set owner as participant if none is given
 			if (!is_array($event['participants']) || !count($event['participants']))
 			{
@@ -178,7 +190,10 @@ 
 		// check category based ACL
 		if ($event['category'])
 		{
-			if (!is_array($event['category'])) $event['category'] = explode(',',$event['category']);
+			if (!is_array($event['category']))
+			{
+				$event['category'] = explode(',',$event['category']);
+			}
 			if (!$old_event || !isset($old_event['category']))
 			{
 				$old_event['category'] = array();
@@ -231,18 +246,28 @@ 
 			$types_with_quantity = array();
 			foreach($this->resources as $type => $data)
 			{
-				if ($data['max_quantity']) $types_with_quantity[] = $type;
+				if ($data['max_quantity'])
+				{
+					$types_with_quantity[] = $type;
+				}
 			}
 			// get all NOT rejected participants and evtl. their quantity
 			$quantity = $users = array();
 			foreach($event['participants'] as $uid => $status)
 			{
 				calendar_so::split_status($status,$q,$r);
-				if ($status[0] == 'R') continue;	// ignore rejected participants
+				if ($status[0] == 'R')
+				{
+					continue;
+				}
+				// ignore rejected participants
 
-				if ($uid < 0)	// group, check it's members too
+				if ($uid < 0)
+				{
+					// group, check it's members too
 				{
 					$users += (array)$GLOBALS['egw']->accounts->members($uid,true);
+				}
 					$users = array_unique($users);
 				}
 				$users[] = $uid;
@@ -273,10 +298,13 @@ 
 			{
 				if ($overlap['id'] == $event['id'] ||	// that's the event itself
 					$overlap['id'] == $event['reference'] ||	// event is an exception of overlap
-					$overlap['non_blocking'])			// that's a non_blocking event
+					$overlap['non_blocking'])
+				{
+					// that's a non_blocking event
 				{
 					continue;
 				}
+				}
 				if ($this->debug > 3 || $this->debug == 'update')
 				{
 					$this->debug_message('calendar_boupdate::update() checking overlapping event %1',false,$overlap);
@@ -414,7 +442,10 @@ 
 		$types_with_quantity = array();
 		foreach($this->resources as $type => $data)
 		{
-			if ($data['max_quantity']) $types_with_quantity[] = $type;
+			if ($data['max_quantity'])
+			{
+				$types_with_quantity[] = $type;
+			}
 		}
 		// get all NOT rejected participants and evtl. their quantity
 		$quantity = $users = array();
@@ -422,12 +453,19 @@ 
 		{
 			$q = $r = null;
 			calendar_so::split_status($status,$q,$r);
-			if ($status[0] == 'R') continue;	// ignore rejected participants
+			if ($status[0] == 'R')
+			{
+				continue;
+			}
+			// ignore rejected participants
 
-			if ($uid < 0)	// group, check it's members too
+			if ($uid < 0)
+			{
+				// group, check it's members too
 			{
 				$users = array_unique(array_merge($users, (array)$GLOBALS['egw']->accounts->members($uid,true)));
 			}
+			}
 			$users[] = $uid;
 			if (in_array($uid[0],$types_with_quantity))
 			{
@@ -458,18 +496,24 @@ 
 			$startts = $date->format('ts');
 
 			// skip past events or recurrences
-			if ($startts+$duration < $this->now_su) continue;
+			if ($startts+$duration < $this->now_su)
+			{
+				continue;
+			}
 
 			// abort check if configured limits are exceeded
 			if ($event['recur_type'] &&
 				(++$checked > $max_checked && $max_checked > 0 || // maximum number of checked recurrences exceeded
 				microtime(true) > $start+$max_check_time ||	// max check time exceeded
-				$startts > $this->config['horizont']))	// we are behind horizon for which recurrences are rendered
+				$startts > $this->config['horizont']))
+			{
+				// we are behind horizon for which recurrences are rendered
 			{
 				if ($this->debug > 2 || $this->debug == 'conflicts')
 				{
 					$this->debug_message(__METHOD__.'() conflict check limited to %1 recurrences, %2 seconds, until (excluding) %3',
 						$checked, microtime(true)-$start, $date);
+			}
 				}
 				$checked_excluding = $date;
 				break;
@@ -493,10 +537,13 @@ 
 			{
 				if ($overlap['id'] == $event['id'] ||	// that's the event itself
 					$overlap['id'] == $event['reference'] ||	// event is an exception of overlap
-					$overlap['non_blocking'])			// that's a non_blocking event
+					$overlap['non_blocking'])
+				{
+					// that's a non_blocking event
 				{
 					continue;
 				}
+				}
 				if ($this->debug > 3 || $this->debug == 'conflicts')
 				{
 					$this->debug_message(__METHOD__.'() checking overlapping event %1',false,$overlap);
@@ -617,7 +664,11 @@ 
 	 */
 	public function check_acl_invite($uid)
 	{
-		if (!is_numeric($uid)) return true;	// nothing implemented for resources so far
+		if (!is_numeric($uid))
+		{
+			return true;
+		}
+		// nothing implemented for resources so far
 
 		if (!$this->require_acl_invite)
 		{
@@ -958,14 +1009,20 @@ 
 		$startdate = new egw_time($event['start']);
 		$enddate = new egw_time($event['end']);
 		$modified = new egw_time($event['modified']);
-		if ($old_event) $olddate = new egw_time($old_event['start']);
+		if ($old_event)
+		{
+			$olddate = new egw_time($old_event['start']);
+		}
 		//error_log(__METHOD__."() date_default_timezone_get()=".date_default_timezone_get().", user-timezone=".egw_time::$user_timezone->getName().", startdate=".$startdate->format().", enddate=".$enddate->format().", updated=".$modified->format().", olddate=".($olddate ? $olddate->format() : ''));
 		$owner_prefs = $ics = null;
 		foreach($to_notify as $userid => $statusid)
 		{
 			$res_info = $quantity = $role = null;
 			calendar_so::split_status($statusid, $quantity, $role);
-			if ($this->debug > 0) error_log(__METHOD__." trying to notify $userid, with $statusid ($role)");
+			if ($this->debug > 0)
+			{
+				error_log(__METHOD__." trying to notify $userid, with $statusid ($role)");
+			}
 
 			if (!is_numeric($userid))
 			{
@@ -984,7 +1041,11 @@ 
 
 				if (!isset($userid))
 				{
-					if (empty($res_info['email'])) continue;	// no way to notify
+					if (empty($res_info['email']))
+					{
+						continue;
+					}
+					// no way to notify
 					// check if event-owner wants non-EGroupware users notified
 					if (is_null($owner_prefs))
 					{
@@ -1049,11 +1110,20 @@ 
 				$details = $this->_get_event_details(isset($cleared_event) ? $cleared_event : $event,
 					$action, $event_arr, $disinvited);
 				$details['to-fullname'] = $fullname;
-				if (isset($tfn)) $details['to-firstname'] = $tfn;
-				if (isset($tln)) $details['to-lastname'] = $tln;
+				if (isset($tfn))
+				{
+					$details['to-firstname'] = $tfn;
+				}
+				if (isset($tln))
+				{
+					$details['to-lastname'] = $tln;
+				}
 
 				// event is in user-time of current user, now we need to calculate the tz-difference to the notified user and take it into account
-				if (!isset($part_prefs['common']['tz'])) $part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];
+				if (!isset($part_prefs['common']['tz']))
+				{
+					$part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];
+				}
 				$timezone = new DateTimeZone($part_prefs['common']['tz']);
 				$timeformat = $part_prefs['common']['timeformat'];
 				switch($timeformat)
@@ -1088,9 +1158,12 @@ 
 				switch($msg_type == MSG_ALARM ? 'extended' : $part_prefs['calendar']['update_format'])
 				{
 					case 'ical':
-						if (is_null($ics) || $m_type != $msg_type)	// need different ical for organizer notification
+						if (is_null($ics) || $m_type != $msg_type)
+						{
+							// need different ical for organizer notification
 						{
 							$calendar_ical = new calendar_ical();
+						}
 							$calendar_ical->setSupportedFields('full');	// full iCal fields+event TZ
 							// we need to pass $event[id] so iCal class reads event again,
 							// as event is in user TZ, but iCal class expects server TZ!
@@ -1104,7 +1177,10 @@ 
 							'encoding' => '8bit',
 							'type' => 'text/calendar; method='.$method,
 						);
-						if ($m_type != $msg_type) unset($ics);
+						if ($m_type != $msg_type)
+						{
+							unset($ics);
+						}
 						$subject = isset($cleared_event) ? $cleared_event['title'] : $event['title'];
 						// fall through
 					case 'extended':
@@ -1155,7 +1231,9 @@ 
 						$notification->set_popupmessage($notify_body."\n\n".$details['description']."\n\n".$details_body);
 						$notification->set_popuplinks(array($details['link_arr']));
 
-						if(is_array($attachment)) { $notification->set_attachments(array($attachment)); }
+						if(is_array($attachment))
+						{
+$notification->set_attachments(array($attachment)); }
 						$notification->send();
 					}
 					catch (Exception $exception) {
@@ -1182,7 +1260,10 @@ 
 			translation::init();
 		}
 		// restore timezone, in case we had to reset it to server-timezone
-		if ($restore_tz) date_default_timezone_set($restore_tz);
+		if ($restore_tz)
+		{
+			date_default_timezone_set($restore_tz);
+		}
 
 		return true;
 	}
@@ -1217,10 +1298,13 @@ 
 		{
 			$to_notify = $event['participants'];
 		}
-		elseif ($this->check_perms(EGW_ACL_READ,$event))	// checks agains $this->owner set to $alarm[owner]
+		elseif ($this->check_perms(EGW_ACL_READ,$event))
+		{
+			// checks agains $this->owner set to $alarm[owner]
 		{
 			$to_notify[$alarm['owner']] = 'A';
 		}
+		}
 		else
 		{
 			return False;	// no rights
@@ -1270,7 +1354,10 @@ 
 		if ($event['id'])
 		{
 			// invalidate the read-cache if it contains the event we store now
-			if ($event['id'] == self::$cached_event['id']) self::$cached_event = array();
+			if ($event['id'] == self::$cached_event['id'])
+			{
+				self::$cached_event = array();
+			}
 			$old_event = $this->read($event['id'], $event['recurrence'], false, 'server');
 		}
 		else
@@ -1278,7 +1365,10 @@ 
 			$old_event = null;
 		}
 
-		if (!isset($event['whole_day'])) $event['whole_day'] = $this->isWholeDay($event);
+		if (!isset($event['whole_day']))
+		{
+			$event['whole_day'] = $this->isWholeDay($event);
+		}
 		$save_event = $event;
 		if ($event['whole_day'])
 		{
@@ -1319,7 +1409,10 @@ 
 		foreach($timestamps as $ts)
 		{
 			// we convert here from user-time to timestamps in server-time!
-			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
+			if (isset($event[$ts]))
+			{
+				$event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
+			}
 		}
 		// convert tzid name to integer tz_id, of set user default
 		if (empty($event['tzid']) || !($event['tz_id'] = calendar_timezones::tz2id($event['tzid'])))
@@ -1369,7 +1462,10 @@ 
 				if (!isset($event['alarm'][$id]))
 				{
 					$alarm['time'] = $event['start'] - $alarm['offset'];
-					if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
+					if ($alarm['time'] < time())
+					{
+						calendar_so::shift_alarm($event, $alarm);
+					}
 						// remove (not store) alarms belonging to not longer existing or rejected participants
 					$status = isset($event['participants']) ? $event['participants'][$alarm['owner']] :
 						$old_event['participants'][$alarm['owner']];
@@ -1405,7 +1501,10 @@ 
 			unset($save_event['participants']);
 			$this->set_recurrences($save_event, $set_recurrences_start);
 		}
-		if ($updateTS) $GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, $event['id'] ? 'modify' : 'add', $this->now);
+		if ($updateTS)
+		{
+			$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, $event['id'] ? 'modify' : 'add', $this->now);
+		}
 
 		// create links for new participants from addressbook, if configured
 		if ($cal_id && $GLOBALS['egw_info']['server']['link_contacts'] && $event['participants'])
@@ -1423,7 +1522,10 @@ 
 
 		// Update history
 		$tracking = new calendar_tracking($this);
-		if (empty($event['id']) && !empty($cal_id)) $event['id']=$cal_id;
+		if (empty($event['id']) && !empty($cal_id))
+		{
+			$event['id']=$cal_id;
+		}
 		$tracking->track($event, $old_event);
 
 		return $cal_id;
@@ -1440,9 +1542,12 @@ 
 	 */
 	function check_status_perms($uid,$event)
 	{
-		if ($uid[0] == 'c' || $uid[0] == 'e')	// for contact we use the owner of the event
+		if ($uid[0] == 'c' || $uid[0] == 'e')
+		{
+			// for contact we use the owner of the event
 		{
 			if (!is_array($event) && !($event = $this->read($event))) return false;
+		}
 
 			return $this->check_perms(EGW_ACL_EDIT,0,$event['owner']);
 		}
@@ -1453,13 +1558,19 @@ 
 			return $access;
 		}
 		// no access or denied access because of category acl --> regular check
-		if (!is_numeric($uid))	// this is eg. for resources (r123)
+		if (!is_numeric($uid))
+		{
+			// this is eg. for resources (r123)
 		{
 			$resource = $this->resource_info($uid);
+		}
 
 			return EGW_ACL_EDIT & $resource['rights'];
 		}
-		if (!is_array($event) && !($event = $this->read($event))) return false;
+		if (!is_array($event) && !($event = $this->read($event)))
+		{
+			return false;
+		}
 
 		// regular user and groups (need to check memberships too)
 		if (!isset($event['participants'][$uid]))
@@ -1483,7 +1594,10 @@ 
 	 */
 	function check_cat_acl($right,$event)
 	{
-		if (!is_array($event)) $event = $this->read($event);
+		if (!is_array($event))
+		{
+			$event = $this->read($event);
+		}
 
 		$ret = null;
 		if ($event['category'])
@@ -1540,7 +1654,10 @@ 
 	public static function set_cat_rights($cat_id,$user,$rights)
 	{
 		//echo "<p>".__METHOD__."($cat_id,$user,$rights)</p>\n";
-		if (!isset(self::$cat_rights_cache)) self::get_cat_rights($cat_id);
+		if (!isset(self::$cat_rights_cache))
+		{
+			self::get_cat_rights($cat_id);
+		}
 
 		if ((int)$rights != (int)self::$cat_rights_cache['L'.$cat_id][$user])
 		{
@@ -1552,7 +1669,10 @@ 
 			else
 			{
 				unset(self::$cat_rights_cache['L'.$cat_id][$user]);
-				if (!self::$cat_rights_cache['L'.$cat_id]) unset(self::$cat_rights_cache['L'.$cat_id]);
+				if (!self::$cat_rights_cache['L'.$cat_id])
+				{
+					unset(self::$cat_rights_cache['L'.$cat_id]);
+				}
 				$GLOBALS['egw']->acl->delete_repository('calendar','L'.$cat_id,$user);
 			}
 			egw_cache::setSession('calendar','cat_rights',self::$cat_rights_cache);
@@ -1585,7 +1705,10 @@ 
 				foreach($cat_rights as $uid => $value)
 				{
 					$all |= $value;
-					if (in_array($uid,$memberships)) $own |= $value;
+					if (in_array($uid,$memberships))
+					{
+						$own |= $value;
+					}
 				}
 			}
 			foreach(array(self::CAT_ACL_ADD,self::CAT_ACL_STATUS) as $mask)
@@ -1632,13 +1755,16 @@ 
 				is_numeric($uid)?$uid:substr($uid,1),$status,
 				$recur_date?$this->date2ts($recur_date,true):0,$role)))
 		{
-			if ($status == 'R')	// remove alarms belonging to rejected participants
+			if ($status == 'R')
+			{
+				// remove alarms belonging to rejected participants
 			{
 				foreach(isset($event['alarm']) ? $event['alarm'] : $old_event['alarm'] as $id => $alarm)
 				{
 					if ((string)$alarm['owner'] === (string)$uid)
 					{
 						$this->so->delete_alarm($id);
+			}
 						//error_log(__LINE__.': '.__METHOD__."(".array2string($event).", '$uid', '$status', ...) deleting alarm=".array2string($alarm).", $status=".array2string($alarm));
 					}
 				}
@@ -1656,8 +1782,15 @@ 
 			);
 			if (isset($status2msg[$status]) && !$skip_notification)
 			{
-				if (!is_array($event)) $event = $this->read($cal_id);
-				if (isset($recur_date)) $event = $this->read($event['id'],$recur_date); //re-read the actually edited recurring event
+				if (!is_array($event))
+				{
+					$event = $this->read($cal_id);
+				}
+				if (isset($recur_date))
+				{
+					$event = $this->read($event['id'],$recur_date);
+				}
+				//re-read the actually edited recurring event
 				$this->send_update($status2msg[$status],$event['participants'],$event);
 			}
 
@@ -1680,12 +1813,16 @@ 
 	 */
 	function update_status($new_event, $old_event , $recur_date=0, $skip_notification=false)
 	{
-		if (!isset($new_event['participants'])) return;
+		if (!isset($new_event['participants']))
+		{
+			return;
+		}
 
 		// check the old list against the new list
 		foreach ($old_event['participants'] as $userid => $status)
-  		{
-            if (!isset($new_event['participants'][$userid])){
+		{
+            if (!isset($new_event['participants'][$userid]))
+            {
             	// Attendee will be deleted this way
             	$new_event['participants'][$userid] = 'G';
             }
@@ -1769,7 +1906,10 @@ 
 					}
 					else
 					{
-						if (!($exception = $this->read($id))) continue;
+						if (!($exception = $this->read($id)))
+						{
+							continue;
+						}
 						$exception['uid'] = common::generate_uid('calendar', $id);
 						$exception['reference'] = $exception['recurrence'] = 0;
 						$this->update($exception, true, true, false, true, $msg=null, true);
@@ -1840,7 +1980,10 @@ 
 		$event_arr = $this->event2array($event);
 		foreach($event_arr as $key => $val)
 		{
-			if ($key == 'recur_type') $key = 'repetition';
+			if ($key == 'recur_type')
+			{
+				$key = 'repetition';
+			}
 			$details[$key] = $val['data'];
 		}
 		$details['participants'] = $details['participants'] ? implode("\n",$details['participants']) : '';
@@ -2013,7 +2156,10 @@ 
 	 */
 	function check_move_alarms(Array &$event, Array $old_event = null, egw_time $instance_date = null)
 	{
-		if ($old_event !== null && $event['start'] == $old_event['start']) return;
+		if ($old_event !== null && $event['start'] == $old_event['start'])
+		{
+			return;
+		}
 
 		$time = new egw_time($event['start']);
 		if(!is_array($event['alarm']))
@@ -2091,7 +2237,10 @@ 
 		if (is_array($old_event) || $old_event > 0)
 		{
 			// preserve categories without users read access
-			if (!is_array($old_event)) $old_event = $this->read($old_event);
+			if (!is_array($old_event))
+			{
+				$old_event = $this->read($old_event);
+			}
 			$old_categories = explode(',',$old_event['category']);
 			$old_cats_preserve = array();
 			if (is_array($old_categories) && count($old_categories) > 0)
@@ -2182,7 +2331,10 @@ 
 				"($filter)[EVENT]:" . array2string($event)."\n",3,$this->logfile);
 		}
 
-		if (!isset($event['recurrence'])) $event['recurrence'] = 0;
+		if (!isset($event['recurrence']))
+		{
+			$event['recurrence'] = 0;
+		}
 
 		if ($filter == 'master')
 		{
@@ -2236,19 +2388,26 @@ 
 							$matchingEvents[] = $egwEvent['id'] . ':' . (int)$event['recurrence'];
 						}
 					}
-				} elseif ($filter != 'master' && ($filter == 'exact' ||
+				}
+				elseif ($filter != 'master' && ($filter == 'exact' ||
 							$event['recur_type'] == $egwEvent['recur_type'] &&
 							strpos($egwEvent['title'], $event['title']) === 0))
 				{
 					$matchingEvents[] = $egwEvent['id']; // we found the event
 				}
 			}
-			if (!empty($matchingEvents) || $filter == 'exact') return $matchingEvents;
+			if (!empty($matchingEvents) || $filter == 'exact')
+			{
+				return $matchingEvents;
+			}
 		}
 		unset($event['id']);
 
 		// No chance to find a master without [U]ID
-		if ($filter == 'master' && empty($event['uid'])) return $matchingEvents;
+		if ($filter == 'master' && empty($event['uid']))
+		{
+			return $matchingEvents;
+		}
 
 		// only query calendars of users, we have READ-grants from
 		$users = array();
@@ -2257,17 +2416,23 @@ 
 			$user = trim($user);
 			if ($this->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY,0,$user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user,$users))
+				{
+					// already added?
 				{
 					$users[] = $user;
 				}
+				}
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
 				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
-			if (!is_numeric($user)) continue;
+			if (!is_numeric($user))
+			{
+				continue;
+			}
 
 			// for groups we have to include the members
 			if ($GLOBALS['egw']->accounts->get_type($user) == 'g')
@@ -2347,7 +2512,10 @@ 
 			}
 			foreach ($matchFields as $key)
 			{
-				if (isset($event[$key])) $query['cal_'.$key] = $event[$key];
+				if (isset($event[$key]))
+				{
+					$query['cal_'.$key] = $event[$key];
+				}
 			}
 		}
 
@@ -2387,7 +2555,10 @@ 
 					'[FOUND]: ' . array2string($egwEvent)."\n",3,$this->logfile);
 			}
 
-			if (in_array($egwEvent['id'], $matchingEvents)) continue;
+			if (in_array($egwEvent['id'], $matchingEvents))
+			{
+				continue;
+			}
 
 			// convert timezone id of event to tzid (iCal id like 'Europe/Berlin')
 			if (!$egwEvent['tz_id'] || !($egwEvent['tzid'] = calendar_timezones::id2tz($egwEvent['tz_id'])))
@@ -2554,13 +2725,16 @@ 
 					foreach ($event['participants'] as $attendee => $status)
 					{
 						if (!isset($egwEvent['participants'][$attendee]) &&
-								$attendee != $egwEvent['owner']) // ||
+								$attendee != $egwEvent['owner'])
+						{
+							// ||
 							//(!$relax && $egw_event['participants'][$attendee] != $status))
 						{
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 								"() additional event['participants']: $attendee\n",3,$this->logfile);
+						}
 							}
 							continue 2;
 						}
@@ -2882,7 +3056,10 @@ 
 		foreach(array('start','end','recur_enddate','recurrence') as $ts)
 		{
 			// we convert here from server-time to timestamps in user-time!
-			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2usertime($event[$ts]) : 0;
+			if (isset($event[$ts]))
+			{
+				$event[$ts] = $event[$ts] ? $this->date2usertime($event[$ts]) : 0;
+			}
 		}
 		// same with the recur exceptions
 		if (isset($event['recur_exception']) && is_array($event['recur_exception']))
@@ -2910,9 +3087,12 @@ 
 	 */
 	function purge($age)
 	{
-		if (is_numeric($age) && $age > 0)	// just make sure bogus values dont delete everything
+		if (is_numeric($age) && $age > 0)
+		{
+			// just make sure bogus values dont delete everything
 		{
 			$this->so->purge(time() - 365*24*3600*(float)$age);
 		}
+		}
 	}
 }