EGroupware / egroupware

calendar/inc/class.calendar_uiforms.inc.php

Doc Comments +4 added lines, -4 removed lines

@@ -2202,7 +2202,7 @@ 
 	 * Freetime search
 	 *
 	 * As the function is called in a popup via javascript, parametes get initialy transfered via the url
-	 * @param array $content=null array with parameters or false (default) to use the get-params
+	 * @param array $content array with parameters or false (default) to use the get-params
 	 * @param string start[str] start-date
 	 * @param string start[hour] start-hour
 	 * @param string start[min] start-minutes
@@ -2446,7 +2446,7 @@ 
 	/**
 	 * Export events as vCalendar version 2.0 files (iCal)
 	 *
-	 * @param int|array $content numeric cal_id or submitted content from etempalte::exec
+	 * @param integer $content numeric cal_id or submitted content from etempalte::exec
 	 * @param boolean $return_error should an error-msg be returned or a regular page with it generated (default)
 	 * @return string error-msg if $return_error
 	 */
@@ -2683,12 +2683,12 @@ 
 	/**
 	 * moves an event to another date/time
 	 *
-	 * @param string $eventId id of the event which has to be moved
+	 * @param string $_eventId id of the event which has to be moved
 	 * @param string $calendarOwner the owner of the calendar the event is in
 	 * @param string $targetDateTime the datetime where the event should be moved to, format: YYYYMMDD
 	 * @param string $targetOwner the owner of the target calendar
 	 * @param string $durationT the duration to support resizable calendar event
-	 * @return string XML response if no error occurs
+	 * @return false|null XML response if no error occurs
 	 */
 	function ajax_moveEvent($_eventId,$calendarOwner,$targetDateTime,$targetOwner,$durationT=null)
 	{

Indentation +3 added lines, -3 removed lines

@@ -2452,7 +2452,7 @@ 
 	 */
 	function export($content=0,$return_error=false)
 	{
-        $boical = new calendar_ical();
+		$boical = new calendar_ical();
 		#error_log(__METHOD__.print_r($content,true));
 		if (is_numeric($cal_id = $content ? $content : $_REQUEST['cal_id']))
 		{
@@ -2616,8 +2616,8 @@ 
 	}
 
 	/**
-	* Set up the required fields to get the history tab
-	*/
+	 * Set up the required fields to get the history tab
+	 */
 	public function setup_history(&$content, &$sel_options)
 	{
 		$status = 'history_status';

Switch Indentation +276 added lines, -276 removed lines

@@ -538,268 +538,268 @@ 
 
 		switch((string)$button)
 		{
-		case 'exception':	// create an exception in a recuring event
-			$msg = $this->_create_exception($event,$preserv);
-			break;
+			case 'exception':	// create an exception in a recuring event
+				$msg = $this->_create_exception($event,$preserv);
+				break;
 
-		case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
-			unset($event['id']);
-			unset($event['uid']);
-			unset($event['reference']);
-			unset($preserv['reference']);
-			unset($event['recurrence']);
-			unset($preserv['recurrence']);
-			unset($event['recur_exception']);
-			unset($event['edit_single']);	// in case it has been set
-			unset($event['modified']);
-			unset($event['modifier']);
-			unset($event['caldav_name']);
-			$event['owner'] = !(int)$this->owner || !$this->bo->check_perms(EGW_ACL_ADD,0,$this->owner) ? $this->user : $this->owner;
+			case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
+				unset($event['id']);
+				unset($event['uid']);
+				unset($event['reference']);
+				unset($preserv['reference']);
+				unset($event['recurrence']);
+				unset($preserv['recurrence']);
+				unset($event['recur_exception']);
+				unset($event['edit_single']);	// in case it has been set
+				unset($event['modified']);
+				unset($event['modifier']);
+				unset($event['caldav_name']);
+				$event['owner'] = !(int)$this->owner || !$this->bo->check_perms(EGW_ACL_ADD,0,$this->owner) ? $this->user : $this->owner;
+
+				// Clear participant stati
+				foreach($event['participant_types'] as $type => &$participants)
+				{
+					foreach($participants as $id => &$response)
+					{
+						if($type == 'u' && $id == $event['owner']) continue;
+						calendar_so::split_status($response, $quantity, $role);
+						// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
+						$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
+						$response = calendar_so::combine_status($status,$quantity,$role);
+					}
+				}
 
-			// Clear participant stati
-			foreach($event['participant_types'] as $type => &$participants)
-			{
-				foreach($participants as $id => &$response)
+				// Copy alarms
+				if (is_array($event['alarm']))
 				{
-					if($type == 'u' && $id == $event['owner']) continue;
-					calendar_so::split_status($response, $quantity, $role);
-					// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
-					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
-					$response = calendar_so::combine_status($status,$quantity,$role);
+					foreach($event['alarm'] as $n => &$alarm)
+					{
+						unset($alarm['id']);
+						unset($alarm['cal_id']);
+					}
 				}
-			}
 
-			// Copy alarms
-			if (is_array($event['alarm']))
-			{
-				foreach($event['alarm'] as $n => &$alarm)
+				// Get links to be copied
+				// With no ID, $content['link_to']['to_id'] is used
+				$content['link_to']['to_id'] = array('to_app' => 'calendar', 'to_id' => 0);
+				foreach(egw_link::get_links('calendar', $content['id']) as $link)
 				{
-					unset($alarm['id']);
-					unset($alarm['cal_id']);
+					if ($link['app'] != egw_link::VFS_APPNAME)
+					{
+						egw_link::link('calendar', $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
+					}
+					elseif ($link['app'] == egw_link::VFS_APPNAME)
+					{
+						egw_link::link('calendar', $content['link_to']['to_id'], egw_link::VFS_APPNAME, array(
+							'tmp_name' => egw_link::vfs_path($link['app2'], $link['id2']).'/'.$link['id'],
+							'name' => $link['id'],
+						), $link['remark']);
+					}
 				}
-			}
+				unset($link);
+				$preserv['view'] = $preserv['edit_single'] = false;
+				$msg = lang('Event copied - the copy can now be edited');
+				$event['title'] = lang('Copy of:').' '.$event['title'];
+				break;
 
-			// Get links to be copied
-			// With no ID, $content['link_to']['to_id'] is used
-			$content['link_to']['to_id'] = array('to_app' => 'calendar', 'to_id' => 0);
-			foreach(egw_link::get_links('calendar', $content['id']) as $link)
-			{
-				if ($link['app'] != egw_link::VFS_APPNAME)
+			case 'mail':
+			case 'sendrequest':
+			case 'save':
+			case 'print':
+			case 'apply':
+			case 'infolog':
+				if ($event['id'] && !$this->bo->check_perms(EGW_ACL_EDIT,$event))
 				{
-					egw_link::link('calendar', $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
+					$msg = lang('Permission denied');
+					$button = '';
+					break;
 				}
-				elseif ($link['app'] == egw_link::VFS_APPNAME)
+				if ($event['start'] > $event['end'])
 				{
-					egw_link::link('calendar', $content['link_to']['to_id'], egw_link::VFS_APPNAME, array(
-						'tmp_name' => egw_link::vfs_path($link['app2'], $link['id2']).'/'.$link['id'],
-						'name' => $link['id'],
-					), $link['remark']);
+					$msg = lang('Error: Starttime has to be before the endtime !!!');
+					$button = '';
+					break;
 				}
-			}
-			unset($link);
-			$preserv['view'] = $preserv['edit_single'] = false;
-			$msg = lang('Event copied - the copy can now be edited');
-			$event['title'] = lang('Copy of:').' '.$event['title'];
-			break;
-
-		case 'mail':
-		case 'sendrequest':
-		case 'save':
-		case 'print':
-		case 'apply':
-		case 'infolog':
-			if ($event['id'] && !$this->bo->check_perms(EGW_ACL_EDIT,$event))
-			{
-				$msg = lang('Permission denied');
-				$button = '';
-				break;
-			}
-			if ($event['start'] > $event['end'])
-			{
-				$msg = lang('Error: Starttime has to be before the endtime !!!');
-				$button = '';
-				break;
-			}
-			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'] > $event['recur_enddate'])
-			{
-				$msg = lang('repetition').': '.lang('Error: Starttime has to be before the endtime !!!');
-				$button = '';
-				break;
-			}
-			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end']-$event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
-			{
-				$msg = lang('Error: Duration of event longer then recurrence interval!');
-				$button = '';
-				break;
-			}
-			if (!$event['participants'])
-			{
-				$msg = lang('Error: no participants selected !!!');
-				$button = '';
-				break;
-			}
-			// if private event with ressource reservation is forbidden
-			if (!$event['public'] && $GLOBALS['egw_info']['server']['no_ressources_private'])
-			{
-				foreach (array_keys($event['participants']) as $uid)
+				if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'] > $event['recur_enddate'])
+				{
+					$msg = lang('repetition').': '.lang('Error: Starttime has to be before the endtime !!!');
+					$button = '';
+					break;
+				}
+				if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end']-$event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
+				{
+					$msg = lang('Error: Duration of event longer then recurrence interval!');
+					$button = '';
+					break;
+				}
+				if (!$event['participants'])
+				{
+					$msg = lang('Error: no participants selected !!!');
+					$button = '';
+					break;
+				}
+				// if private event with ressource reservation is forbidden
+				if (!$event['public'] && $GLOBALS['egw_info']['server']['no_ressources_private'])
 				{
-					if ($uid[0] == 'r') //ressource detection
+					foreach (array_keys($event['participants']) as $uid)
 					{
-						$msg = lang('Error: ressources reservation in private events is not allowed!!!');
-						$button = '';
-						break 2; //break foreach and case
+						if ($uid[0] == 'r') //ressource detection
+						{
+							$msg = lang('Error: ressources reservation in private events is not allowed!!!');
+							$button = '';
+							break 2; //break foreach and case
+						}
 					}
 				}
-			}
-			if ($content['edit_single'])	// we edited a single event from a series
-			{
-				$event['reference'] = $event['id'];
-				$event['recurrence'] = $content['edit_single'];
-				unset($event['id']);
-				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
-				if (!is_array($conflicts) && $conflicts)
+				if ($content['edit_single'])	// we edited a single event from a series
 				{
-					// now we need to add the original start as recur-execption to the series
-					$recur_event = $this->bo->read($event['reference']);
-					$recur_event['recur_exception'][] = $content['edit_single'];
-					// check if we need to move the alarms, because they are next on that exception
-					foreach($recur_event['alarm'] as $id => $alarm)
+					$event['reference'] = $event['id'];
+					$event['recurrence'] = $content['edit_single'];
+					unset($event['id']);
+					$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
+					if (!is_array($conflicts) && $conflicts)
 					{
-						if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
+						// now we need to add the original start as recur-execption to the series
+						$recur_event = $this->bo->read($event['reference']);
+						$recur_event['recur_exception'][] = $content['edit_single'];
+						// check if we need to move the alarms, because they are next on that exception
+						foreach($recur_event['alarm'] as $id => $alarm)
 						{
-							$rrule = calendar_rrule::event2rrule($recur_event, true);
-							foreach ($rrule as $time)
+							if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
 							{
-								if ($content['edit_single'] < $time->format('ts'))
+								$rrule = calendar_rrule::event2rrule($recur_event, true);
+								foreach ($rrule as $time)
 								{
-									$alarm['time'] = $time->format('ts') - $alarm['offset'];
-									$this->bo->save_alarm($event['reference'], $alarm);
-									break;
+									if ($content['edit_single'] < $time->format('ts'))
+									{
+										$alarm['time'] = $time->format('ts') - $alarm['offset'];
+										$this->bo->save_alarm($event['reference'], $alarm);
+										break;
+									}
 								}
 							}
 						}
+						unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
+						unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
+						$this->bo->update($recur_event,true);	// no conflict check here
+						unset($recur_event);
+						unset($event['edit_single']);			// if we further edit it, it's just a single event
+						unset($preserv['edit_single']);
+					}
+					else	// conflict or error, we need to reset everything to the state befor we tried to save it
+					{
+						$event['id'] = $event['reference'];
+						$event['reference'] = $event['recurrence'] = 0;
+						$event['uid'] = $content['uid'];
 					}
-					unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
-					unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
-					$this->bo->update($recur_event,true);	// no conflict check here
-					unset($recur_event);
-					unset($event['edit_single']);			// if we further edit it, it's just a single event
-					unset($preserv['edit_single']);
 				}
-				else	// conflict or error, we need to reset everything to the state befor we tried to save it
+				else	// we edited a non-reccuring event or the whole series
 				{
-					$event['id'] = $event['reference'];
-					$event['reference'] = $event['recurrence'] = 0;
-					$event['uid'] = $content['uid'];
-				}
-			}
-			else	// we edited a non-reccuring event or the whole series
-			{
-				if (($old_event = $this->bo->read($event['id'])))
-				{
-					if ($event['recur_type'] != MCAL_RECUR_NONE)
+					if (($old_event = $this->bo->read($event['id'])))
 					{
-						// we edit a existing series event
-						if ($event['start'] != $old_event['start'] ||
-							$event['whole_day'] != $old_event['whole_day'])
+						if ($event['recur_type'] != MCAL_RECUR_NONE)
 						{
-							if(!($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + 1, true)))
+							// we edit a existing series event
+							if ($event['start'] != $old_event['start'] ||
+								$event['whole_day'] != $old_event['whole_day'])
 							{
-								$msg = lang("Error: You can't shift a series from the past!");
-								$noerror = false;
-								break;
-							}
-							// splitting of series confirmed or first event clicked (no confirmation necessary)
-							$orig_event = $event;
+								if(!($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + 1, true)))
+								{
+									$msg = lang("Error: You can't shift a series from the past!");
+									$noerror = false;
+									break;
+								}
+								// splitting of series confirmed or first event clicked (no confirmation necessary)
+								$orig_event = $event;
 
-							// calculate offset against old series start or clicked recurrance,
-							// depending on which is smaller
-							$offset = $event['start'] - $old_event['start'];
-							if (abs($offset) > abs($off2 = $event['start'] - $event['actual_date']))
-							{
-								$offset = $off2;
-							}
-							// base start-date of new series on actual / clicked date
-							$actual_date = $event['actual_date'];
-							$event['start'] = $actual_date + $offset;
-							if ($content['duration'])
-							{
-								$event['end'] = $event['start'] + $content['duration'];
-							}
-							elseif($event['end'] < $event['start'])
-							{
-								$event['end'] = $event['start'] + $event['end'] - $actual_date;
-							}
-							//echo "<p>".__LINE__.": event[start]=$event[start]=".egw_time::to($event['start']).", duration=$content[duration], event[end]=$event[end]=".egw_time::to($event['end']).", offset=$offset</p>\n";
-							$event['participants'] = $old_event['participants'];
-							foreach ($old_event['recur_exception'] as $key => $exdate)
-							{
-								if ($exdate > $actual_date)
+								// calculate offset against old series start or clicked recurrance,
+								// depending on which is smaller
+								$offset = $event['start'] - $old_event['start'];
+								if (abs($offset) > abs($off2 = $event['start'] - $event['actual_date']))
 								{
-									unset($old_event['recur_exception'][$key]);
-									$event['recur_exception'][$key] += $offset;
+									$offset = $off2;
 								}
-								else
+								// base start-date of new series on actual / clicked date
+								$actual_date = $event['actual_date'];
+								$event['start'] = $actual_date + $offset;
+								if ($content['duration'])
 								{
-									unset($event['recur_exception'][$key]);
+									$event['end'] = $event['start'] + $content['duration'];
 								}
-							}
-							$old_alarms = $old_event['alarm'];
-							if ($old_event['start'] < $actual_date)
-							{
-								unset($orig_event);
-								// copy event by unsetting the id(s)
-								unset($event['id']);
-								unset($event['uid']);
-								unset($event['caldav_name']);
-
-								// set enddate of existing event
-								$rriter = calendar_rrule::event2rrule($old_event, true);
-								$rriter->rewind();
-								$last = $rriter->current();
-								do
+								elseif($event['end'] < $event['start'])
 								{
-									$rriter->next_no_exception();
-									$occurrence = $rriter->current();
+									$event['end'] = $event['start'] + $event['end'] - $actual_date;
 								}
-								while ($rriter->valid() &&
-										egw_time::to($occurrence, 'ts') < $actual_date &&
-										($last = $occurrence));
-								$last->setTime(0, 0, 0);
-								$old_event['recur_enddate'] = egw_time::to($last, 'ts');
-								if (!$this->bo->update($old_event,true,true,false,true,$dummy=null,$content['no_notifications']))
+								//echo "<p>".__LINE__.": event[start]=$event[start]=".egw_time::to($event['start']).", duration=$content[duration], event[end]=$event[end]=".egw_time::to($event['end']).", offset=$offset</p>\n";
+								$event['participants'] = $old_event['participants'];
+								foreach ($old_event['recur_exception'] as $key => $exdate)
 								{
-									$msg .= ($msg ? ', ' : '') .lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
-										lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
-											htmlspecialchars(egw::link('/index.php',array(
-												'menuaction' => 'calendar.calendar_uiforms.edit',
-												'cal_id'    => $content['id'],
-											))).'">','</a>');
-									$noerror = false;
-									$event = $orig_event;
-									break;
+									if ($exdate > $actual_date)
+									{
+										unset($old_event['recur_exception'][$key]);
+										$event['recur_exception'][$key] += $offset;
+									}
+									else
+									{
+										unset($event['recur_exception'][$key]);
+									}
+								}
+								$old_alarms = $old_event['alarm'];
+								if ($old_event['start'] < $actual_date)
+								{
+									unset($orig_event);
+									// copy event by unsetting the id(s)
+									unset($event['id']);
+									unset($event['uid']);
+									unset($event['caldav_name']);
+
+									// set enddate of existing event
+									$rriter = calendar_rrule::event2rrule($old_event, true);
+									$rriter->rewind();
+									$last = $rriter->current();
+									do
+									{
+										$rriter->next_no_exception();
+										$occurrence = $rriter->current();
+									}
+									while ($rriter->valid() &&
+											egw_time::to($occurrence, 'ts') < $actual_date &&
+											($last = $occurrence));
+									$last->setTime(0, 0, 0);
+									$old_event['recur_enddate'] = egw_time::to($last, 'ts');
+									if (!$this->bo->update($old_event,true,true,false,true,$dummy=null,$content['no_notifications']))
+									{
+										$msg .= ($msg ? ', ' : '') .lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
+											lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
+												htmlspecialchars(egw::link('/index.php',array(
+													'menuaction' => 'calendar.calendar_uiforms.edit',
+													'cal_id'    => $content['id'],
+												))).'">','</a>');
+										$noerror = false;
+										$event = $orig_event;
+										break;
+									}
+									$event['alarm'] = array();
 								}
-								$event['alarm'] = array();
 							}
 						}
-					}
-					else
-					{
-						if ($old_event['start'] != $event['start'] ||
-							$old_event['end'] != $event['end'] ||
-							$event['whole_day'] != $old_event['whole_day'])
+						else
 						{
-							$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
-							foreach((array)$event['participants'] as $uid => $status)
+							if ($old_event['start'] != $event['start'] ||
+								$old_event['end'] != $event['end'] ||
+								$event['whole_day'] != $old_event['whole_day'])
 							{
-								$q = $r = null;
-								calendar_so::split_status($status,$q,$r);
-								if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
+								$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
+								foreach((array)$event['participants'] as $uid => $status)
 								{
-									$preferences = CreateObject('phpgwapi.preferences',$uid);
-									$part_prefs = $preferences->read_repository();
-									switch ($part_prefs['calendar']['reset_stati'])
+									$q = $r = null;
+									calendar_so::split_status($status,$q,$r);
+									if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
 									{
+										$preferences = CreateObject('phpgwapi.preferences',$uid);
+										$part_prefs = $preferences->read_repository();
+										switch ($part_prefs['calendar']['reset_stati'])
+										{
 										case 'no':
 											break;
 										case 'startday':
@@ -808,7 +808,7 @@ 
 											$status_reset_to_unknown = true;
 											$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
 											// todo: report reset status to user
-									}
+										}
 								}
 							}
 							// check if we need to move the alarms, because they are relative
@@ -925,83 +925,83 @@ 
 			}
 			break;
 
-		case 'cancel':
-			if($content['cancel_needs_refresh'])
-			{
-				egw_framework::refresh_opener($msg, 'calendar');
-			}
-			break;
-
-		case 'delete':					// delete of event (regular or series)
-			$exceptions_kept = null;
-			if ($this->bo->delete($event['id'], (int)$content['edit_single'], false, $event['no_notifications'],
-				$content['delete_exceptions'] == 'true', $exceptions_kept))
-			{
-				if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
+			case 'cancel':
+				if($content['cancel_needs_refresh'])
 				{
-					$msg = lang('Series deleted');
-					if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					egw_framework::refresh_opener($msg, 'calendar');
 				}
-				else
+				break;
+
+			case 'delete':					// delete of event (regular or series)
+				$exceptions_kept = null;
+				if ($this->bo->delete($event['id'], (int)$content['edit_single'], false, $event['no_notifications'],
+					$content['delete_exceptions'] == 'true', $exceptions_kept))
 				{
-					$msg = lang('Event deleted');
-				}
+					if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
+					{
+						$msg = lang('Series deleted');
+						if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					}
+					else
+					{
+						$msg = lang('Event deleted');
+					}
 
-			}
-			break;
+				}
+				break;
 
-		case 'freetime':
-			// the "click" has to be in onload, to make sure the button is already created
-			$event['button_was'] = $button;
-			break;
+			case 'freetime':
+				// the "click" has to be in onload, to make sure the button is already created
+				$event['button_was'] = $button;
+				break;
 
-		case 'add_alarm':
-			$time = $content['start'];
-			$offset = $time - $content['new_alarm']['date'];
-			if ($event['recur_type'] != MCAL_RECUR_NONE &&
-				($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $offset, true)) &&
-				$time < $next_occurrence['start'])
-			{
-				$content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
-			}
-			if ($this->bo->check_perms(EGW_ACL_EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
-			{
-				$alarm = array(
-					'offset' => $offset,
-					'time'   => $content['new_alarm']['date'],
-					'all'    => !$content['new_alarm']['owner'],
-					'owner'  => $content['new_alarm']['owner'] ? $content['new_alarm']['owner'] : $this->user,
-				);
-				if ($alarm['time'] < $this->bo->now_su)
+			case 'add_alarm':
+				$time = $content['start'];
+				$offset = $time - $content['new_alarm']['date'];
+				if ($event['recur_type'] != MCAL_RECUR_NONE &&
+					($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $offset, true)) &&
+					$time < $next_occurrence['start'])
 				{
-					$msg = lang("Can't add alarms in the past !!!");
+					$content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
 				}
-				elseif ($event['id'])	// save the alarm immediatly
+				if ($this->bo->check_perms(EGW_ACL_EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
 				{
-					if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+					$alarm = array(
+						'offset' => $offset,
+						'time'   => $content['new_alarm']['date'],
+						'all'    => !$content['new_alarm']['owner'],
+						'owner'  => $content['new_alarm']['owner'] ? $content['new_alarm']['owner'] : $this->user,
+					);
+					if ($alarm['time'] < $this->bo->now_su)
+					{
+						$msg = lang("Can't add alarms in the past !!!");
+					}
+					elseif ($event['id'])	// save the alarm immediatly
 					{
-						$alarm['id'] = $alarm_id;
-						$event['alarm'][$alarm_id] = $alarm;
+						if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+						{
+							$alarm['id'] = $alarm_id;
+							$event['alarm'][$alarm_id] = $alarm;
 
-						$msg = lang('Alarm added');
-						egw_framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+							$msg = lang('Alarm added');
+							egw_framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+						}
+						else
+						{
+							$msg = lang('Error adding the alarm');
+						}
 					}
 					else
 					{
-						$msg = lang('Error adding the alarm');
+						for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
+						$event['alarm'][$alarm['id']] = $alarm;
 					}
 				}
 				else
 				{
-					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
-					$event['alarm'][$alarm['id']] = $alarm;
+					$msg = lang('Permission denied');
 				}
-			}
-			else
-			{
-				$msg = lang('Permission denied');
-			}
-			break;
+				break;
 		}
 		// add notification-errors, if we have some
 		if (($notification_errors = notifications::errors(true)))

Spacing +404 added lines, -404 removed lines

@@ -47,18 +47,18 @@ 
 	 *
 	 * @var locktime in seconds
 	 */
-	var $locktime_default=1;
+	var $locktime_default = 1;
 
 	/**
 	 * Constructor
 	 */
 	function __construct()
 	{
-		parent::__construct(true);	// call the parent's constructor
+		parent::__construct(true); // call the parent's constructor
 
-		for ($n=15; $n <= 16*60; $n+=($n < 60 ? 15 : ($n < 240 ? 30 : ($n < 600 ? 60 : 120))))
+		for ($n = 15; $n <= 16 * 60; $n += ($n < 60 ? 15 : ($n < 240 ? 30 : ($n < 600 ? 60 : 120))))
 		{
-			$this->durations[$n*60] = sprintf('%d:%02d',$n/60,$n%60);
+			$this->durations[$n * 60] = sprintf('%d:%02d', $n / 60, $n % 60);
 		}
 	}
 
@@ -69,10 +69,10 @@ 
 	 */
 	function &default_add_event()
 	{
-		$extra_participants = $_GET['participants'] ? explode(',',$_GET['participants']) : array();
+		$extra_participants = $_GET['participants'] ? explode(',', $_GET['participants']) : array();
 
 		// if participant is a contact, add its link title as title
-		foreach($extra_participants as $uid)
+		foreach ($extra_participants as $uid)
 		{
 			if ($uid[0] == 'c')
 			{
@@ -92,14 +92,14 @@ 
 		}
 
 		if (!$owner || !is_numeric($owner) || $GLOBALS['egw']->accounts->get_type($owner) != 'u' ||
-			!$this->bo->check_perms(EGW_ACL_ADD,0,$owner))
+			!$this->bo->check_perms(EGW_ACL_ADD, 0, $owner))
 		{
 			if ($owner)	// make an owner who is no user or we have no add-rights a participant
 			{
 				// if we come from ressources we don't need any users selected in calendar
 				if (!isset($_GET['participants']) || $_GET['participants'][0] != 'r')
 				{
-					foreach(explode(',',$owner) as $uid)
+					foreach (explode(',', $owner) as $uid)
 					{
 						// only add users or a single ressource, not all ressources displayed by a category
 						if (is_numeric($uid) || $owner == $uid)
@@ -117,48 +117,48 @@ 
 		$extra_participants[] = $owner;
 
 		$start = $this->bo->date2ts(array(
-			'full' => isset($_GET['date']) && (int) $_GET['date'] ? (int) $_GET['date'] : $this->date,
-			'hour' => (int) (isset($_GET['hour']) && (int) $_GET['hour'] ? $_GET['hour'] : $this->bo->cal_prefs['workdaystarts']),
-			'minute' => (int) $_GET['minute'],
+			'full' => isset($_GET['date']) && (int)$_GET['date'] ? (int)$_GET['date'] : $this->date,
+			'hour' => (int)(isset($_GET['hour']) && (int)$_GET['hour'] ? $_GET['hour'] : $this->bo->cal_prefs['workdaystarts']),
+			'minute' => (int)$_GET['minute'],
 		));
 		//echo "<p>_GET[date]=$_GET[date], _GET[hour]=$_GET[hour], _GET[minute]=$_GET[minute], this->date=$this->date ==> start=$start=".date('Y-m-d H:i',$start)."</p>\n";
 
 		$participant_types['u'] = $participant_types = $participants = array();
-		foreach($extra_participants as $uid)
+		foreach ($extra_participants as $uid)
 		{
-			if (isset($participants[$uid])) continue;	// already included
+			if (isset($participants[$uid])) continue; // already included
 
-			if (!$this->bo->check_acl_invite($uid)) continue;	// no right to invite --> ignored
+			if (!$this->bo->check_acl_invite($uid)) continue; // no right to invite --> ignored
 
 			if (is_numeric($uid))
 			{
 				$participants[$uid] = $participant_types['u'][$uid] =
-					calendar_so::combine_status($uid == $this->user ? 'A' : 'U',1,
-					($uid == $this->user || ($uid == $owner && $this->bo->check_perms(EGW_ACL_ADD,0,$owner))) ? 'CHAIR' : 'REQ-PARTICIPANT');
+					calendar_so::combine_status($uid == $this->user ? 'A' : 'U', 1,
+					($uid == $this->user || ($uid == $owner && $this->bo->check_perms(EGW_ACL_ADD, 0, $owner))) ? 'CHAIR' : 'REQ-PARTICIPANT');
 			}
 			elseif (is_array($this->bo->resources[$uid[0]]))
 			{
 				// if contact is a user, use the user instead (as the GUI)
-				if ($uid[0] == 'c' && ($account_id = $GLOBALS['egw']->accounts->name2id(substr($uid,1),'person_id')))
+				if ($uid[0] == 'c' && ($account_id = $GLOBALS['egw']->accounts->name2id(substr($uid, 1), 'person_id')))
 				{
 					$uid = $account_id;
 					$participants[$uid] = $participant_types['u'][$uid] =
-						calendar_so::combine_status($uid == $this->user ? 'A' : 'U',1,
-						($uid == $this->user || ($uid == $owner && $this->bo->check_perms(EGW_ACL_ADD,0,$owner))) ? 'CHAIR' : 'REQ-PARTICIPANT');
+						calendar_so::combine_status($uid == $this->user ? 'A' : 'U', 1,
+						($uid == $this->user || ($uid == $owner && $this->bo->check_perms(EGW_ACL_ADD, 0, $owner))) ? 'CHAIR' : 'REQ-PARTICIPANT');
 					continue;
 				}
 				$res_data = $this->bo->resources[$uid[0]];
-				list($id,$quantity) = explode(':',substr($uid,1));
-				if (($status = $res_data['new_status'] ? ExecMethod($res_data['new_status'],$id) : 'U'))
+				list($id, $quantity) = explode(':', substr($uid, 1));
+				if (($status = $res_data['new_status'] ? ExecMethod($res_data['new_status'], $id) : 'U'))
 				{
 					$participants[$uid] = $participant_types[$uid[0]][$id] =
-						calendar_so::combine_status($status,$quantity,'REQ-PARTICIPANT');
+						calendar_so::combine_status($status, $quantity, 'REQ-PARTICIPANT');
 				}
 			}
 		}
 		if (!$participants)	// if all participants got removed, include current user
 		{
-			$participants[$this->user] = $participant_types['u'][$this->user] = calendar_so::combine_status('A',1,'CHAIR');
+			$participants[$this->user] = $participant_types['u'][$this->user] = calendar_so::combine_status('A', 1, 'CHAIR');
 		}
 		$alarms = array();
 		// if default alarm set in prefs --> add it
@@ -166,9 +166,9 @@ 
 		if ((string)$this->cal_prefs['default-alarm'] !== '')
 		{
 			$offset = 60 * $this->cal_prefs['default-alarm'];
-			$alarms[1] =  array(
+			$alarms[1] = array(
 				'default' => 1,
-				'offset' => $offset ,
+				'offset' => $offset,
 				'time'   => $start - $offset,
 				'all'    => false,
 				'owner'  => $owner,
@@ -180,9 +180,9 @@ 
 			'participants' => $participants,
 			'owner' => $owner,
 			'start' => $start,
-			'end'   => $start + (int) $this->bo->cal_prefs['defaultlength']*60,
+			'end'   => $start + (int)$this->bo->cal_prefs['defaultlength'] * 60,
 			'tzid'  => $this->bo->common_prefs['tz'],
-			'priority' => 2,	// normal
+			'priority' => 2, // normal
 			'public'=> $this->cal_prefs['default_private'] ? 0 : 1,
 			'alarm' => $alarms,
 			'recur_exception' => array(),
@@ -200,29 +200,29 @@ 
 	{
 		if (!is_array($content))	// redirect from etemplate, if POST empty
 		{
-			return $this->edit(null,null,strip_tags($_GET['msg']));
+			return $this->edit(null, null, strip_tags($_GET['msg']));
 		}
 		// clear notification errors
 		notifications::errors(true);
 		$messages = null;
 		$msg_permission_denied_added = false;
 		list($button) = @each($content['button']);
-		if (!$button && $content['action']) $button = $content['action'];	// action selectbox
+		if (!$button && $content['action']) $button = $content['action']; // action selectbox
 		unset($content['button']); unset($content['action']);
 
 		$view = $content['view'];
 		if ($button == 'ical')
 		{
-			$msg = $this->export($content['id'],true);
+			$msg = $this->export($content['id'], true);
 		}
 		// delete a recur-exception
 		if ($content['recur_exception']['delete_exception'])
 		{
 			list($date) = each($content['recur_exception']['delete_exception']);
 			// eT2 converts time to
-			if (!is_numeric($date)) $date = egw_time::to (str_replace('Z','', $date), 'ts');
+			if (!is_numeric($date)) $date = egw_time::to(str_replace('Z', '', $date), 'ts');
 			unset($content['recur_exception']['delete_exception']);
-			if (($key = array_search($date,$content['recur_exception'])) !== false)
+			if (($key = array_search($date, $content['recur_exception'])) !== false)
 			{
 				// propagate the exception to a single event
 				$recur_exceptions = $this->bo->so->get_related($content['uid']);
@@ -232,7 +232,7 @@ 
 							$exception['recurrence'] != $content['recur_exception'][$key]) continue;
 					$exception['uid'] = common::generate_uid('calendar', $id);
 					$exception['reference'] = $exception['recurrence'] = 0;
-					$this->bo->update($exception, true, true,false,true,$messages,$content['no_notifications']);
+					$this->bo->update($exception, true, true, false, true, $messages, $content['no_notifications']);
 					break;
 				}
 				unset($content['recur_exception'][$key]);
@@ -272,7 +272,7 @@ 
 			$def_alarm = $this->cal_prefs['default-alarm'.($content['whole_day'] ? '-wholeday' : '')];
 			if ((string)$def_alarm === '')
 			{
-				unset($content['alarm'][1]);	// '' = no alarm on whole day --> delete it
+				unset($content['alarm'][1]); // '' = no alarm on whole day --> delete it
 			}
 			else
 			{
@@ -286,7 +286,7 @@ 
 		unset($event['alarm']['delete_alarm']);
 		unset($event['duration']);
 
-		if (in_array($button,array('ignore','freetime','reedit','confirm_edit_series')))
+		if (in_array($button, array('ignore', 'freetime', 'reedit', 'confirm_edit_series')))
 		{
 			// no conversation necessary, event is already in the right format
 		}
@@ -306,16 +306,16 @@ 
 			if ($event['recur_type'] == MCAL_RECUR_NONE && $event['recur_data']) $event['recur_type'] = MCAL_RECUR_WEEKLY;
 			if ($event['recur_type'] == MCAL_RECUR_WEEKLY && !$event['recur_data'])
 			{
-				$event['recur_data'] = 1 << (int)date('w',$event['start']);
+				$event['recur_data'] = 1 << (int)date('w', $event['start']);
 			}
 			if (isset($content['participants']))
 			{
 
 				$event['participants'] = $event['participant_types'] = array();
 
-				foreach($content['participants'] as $key => $data)
+				foreach ($content['participants'] as $key => $data)
 				{
-					switch($key)
+					switch ($key)
 					{
 						case 'delete':		// handled in default
 						case 'quantity':	// handled in new_resource
@@ -328,18 +328,18 @@ 
 							// email or rfc822 addresse (eg. "Ralf Becker <ralf@domain.com>") in the search field
 							$matches = array();
 							if (($email = $content['participants']['resource']['search']) &&
-									(preg_match('/^(.*<)?([a-z0-9_.-]+@[a-z0-9_.-]{5,})>?$/i',$email,$matches)))
+									(preg_match('/^(.*<)?([a-z0-9_.-]+@[a-z0-9_.-]{5,})>?$/i', $email, $matches)))
 							{
-								$status = calendar_so::combine_status('U',$content['participants']['quantity'],$content['participants']['role']);
+								$status = calendar_so::combine_status('U', $content['participants']['quantity'], $content['participants']['role']);
 								// check if email belongs to account or contact --> prefer them over just emails (if we are allowed to invite him)
-								if (($data = $GLOBALS['egw']->accounts->name2id($matches[2],'account_email')) && $this->bo->check_acl_invite($data))
+								if (($data = $GLOBALS['egw']->accounts->name2id($matches[2], 'account_email')) && $this->bo->check_acl_invite($data))
 								{
 									$event['participants'][$data] = $event['participant_types']['u'][$data] = $status;
 								}
-								elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',array(
+								elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search', array(
 									'email' => $matches[2],
 									'email_home' => $matches[2],
-								),true,'','','',false,'OR')))
+								), true, '', '', '', false, 'OR')))
 								{
 									$event['participants']['c'.$data['id']] = $event['participant_types']['c'][$data['id']] = $status;
 								}
@@ -357,8 +357,8 @@ 
 						case 'resource':
 							if (is_array($data))	// if $data['current'] is NOT set --> $app==''
 							{
-								list($app,$id) = explode(':',$data['current']);
-								if(!$app && !$id)
+								list($app, $id) = explode(':', $data['current']);
+								if (!$app && !$id)
 								{
 									$app = $data['app'];
 									$id = $data['id'];
@@ -366,9 +366,9 @@ 
 							}
 							else
 							{
-								list($app,$id) = explode(':',$data);
+								list($app, $id) = explode(':', $data);
 							}
-							foreach($this->bo->resources as $type => $data)
+							foreach ($this->bo->resources as $type => $data)
 							{
 								if ($data['app'] == $app) break;
 							}
@@ -378,19 +378,19 @@ 
 								$data = $id;
 							}
 							// check if new entry is no account (or contact entry of an account)
-							elseif ($app != 'addressbook' || !($data = $GLOBALS['egw']->accounts->name2id($id,'person_id')) || !$this->bo->check_acl_invite($data))
+							elseif ($app != 'addressbook' || !($data = $GLOBALS['egw']->accounts->name2id($id, 'person_id')) || !$this->bo->check_acl_invite($data))
 							{
 								if ($uid && $id)
 								{
-									$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
+									$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'], $id) : 'U';
 									if ($status)
 									{
 										$res_info = $this->bo->resource_info($uid);
 										// todo check real availability = maximum - already booked quantity
 										if (isset($res_info['useable']) && $content['participants']['quantity'] > $res_info['useable'])
 										{
-											$msg .= lang('Maximum available quantity of %1 exceeded!',$res_info['useable']);
-											foreach(array('quantity','resource','role') as $n)
+											$msg .= lang('Maximum available quantity of %1 exceeded!', $res_info['useable']);
+											foreach (array('quantity', 'resource', 'role') as $n)
 											{
 												$event['participants'][$n] = $content['participants'][$n];
 											}
@@ -398,10 +398,10 @@ 
 										else
 										{
 											$event['participants'][$uid] = $event['participant_types'][$type][$id] =
-												calendar_so::combine_status($status,$content['participants']['quantity'],$content['participants']['role']);
+												calendar_so::combine_status($status, $content['participants']['quantity'], $content['participants']['role']);
 										}
 									}
-									elseif(!$msg_permission_denied_added)
+									elseif (!$msg_permission_denied_added)
 									{
 										$msg .= lang('Permission denied!');
 										$msg_permission_denied_added = true;
@@ -416,14 +416,14 @@ 
 							}
 							// fall-through for accounts entered as contact
 						case 'account':
-							foreach(is_array($data) ? $data : explode(',',$data) as $uid)
+							foreach (is_array($data) ? $data : explode(',', $data) as $uid)
 							{
 								if ($uid && $this->bo->check_acl_invite($uid))
 								{
 									$event['participants'][$uid] = $event['participant_types']['u'][$uid] =
-										calendar_so::combine_status($uid == $this->bo->user ? 'A' : 'U',1,$content['participants']['role']);
+										calendar_so::combine_status($uid == $this->bo->user ? 'A' : 'U', 1, $content['participants']['role']);
 								}
-								elseif($uid && !$msg_permission_denied_added)
+								elseif ($uid && !$msg_permission_denied_added)
 								{
 									$msg .= lang('Permission denied!');
 									$msg_permission_denied_added = true;
@@ -432,14 +432,14 @@ 
 							break;
 
 						default:		// existing participant row
-							if (!is_array($data)) continue;	// widgets in participant tab, above participant list
-							foreach(array('uid','status','quantity','role') as $name)
+							if (!is_array($data)) continue; // widgets in participant tab, above participant list
+							foreach (array('uid', 'status', 'quantity', 'role') as $name)
 							{
 								$$name = $data[$name];
 							}
 							if ($content['participants']['delete'][$uid] || $content['participants']['delete'][md5($uid)])
 							{
-								$uid = false;	// entry has been deleted
+								$uid = false; // entry has been deleted
 							}
 							elseif ($uid)
 							{
@@ -450,7 +450,7 @@ 
 								}
 								else
 								{
-									$id = substr($uid,1);
+									$id = substr($uid, 1);
 									$type = $uid[0];
 								}
 								if ($data['old_status'] != $status && !(!$data['old_status'] && $status == 'G'))
@@ -458,16 +458,16 @@ 
 									//echo "<p>$uid: status changed '$data[old_status]' --> '$status<'/p>\n";
 									$quantity = $role = null;
 									$new_status = calendar_so::combine_status($status, $quantity, $role);
-									if ($this->bo->set_status($event['id'],$uid,$new_status,isset($content['edit_single']) ? $content['participants']['status_date'] : 0, false, true, $content['no_notifications']))
+									if ($this->bo->set_status($event['id'], $uid, $new_status, isset($content['edit_single']) ? $content['participants']['status_date'] : 0, false, true, $content['no_notifications']))
 									{
 										// refreshing the calendar-view with the changed participant-status
-										if($event['recur_type'] != MCAL_RECUR_NONE)
+										if ($event['recur_type'] != MCAL_RECUR_NONE)
 										{
 											$msg = lang('Status for all future scheduled days changed');
 										}
 										else
 										{
-											if(isset($content['edit_single']))
+											if (isset($content['edit_single']))
 											{
 												$msg = lang('Status for this particular day changed');
 												// prevent accidentally creating a real exception afterwards
@@ -488,7 +488,7 @@ 
 										if ($status == 'R' && $event['alarm'])
 										{
 											// remove from bo->set_status deleted alarms of rejected users from UI too
-											foreach($event['alarm'] as $alarm_id => $alarm)
+											foreach ($event['alarm'] as $alarm_id => $alarm)
 											{
 												if ((string)$alarm['owner'] === (string)$uid)
 												{
@@ -501,7 +501,7 @@ 
 								if ($uid && $status != 'G')
 								{
 									$event['participants'][$uid] = $event['participant_types'][$type][$id] =
-										calendar_so::combine_status($status,$quantity,$role);
+										calendar_so::combine_status($status, $quantity, $role);
 								}
 							}
 							break;
@@ -520,26 +520,26 @@ 
 			'tabs'			=> $content['tabs'],
 			'template'      => $content['template'],
 		);
-		$noerror=true;
+		$noerror = true;
 
 		//error_log(__METHOD__.$button.'#'.array2string($content['edit_single']).'#');
 
 		$ignore_conflicts = $status_reset_to_unknown = false;
 
-		switch((string)$button)
+		switch ((string)$button)
 		{
 			case 'ignore':
 				$ignore_conflicts = true;
-				$button = $event['button_was'];	// save or apply
+				$button = $event['button_was']; // save or apply
 				unset($event['button_was']);
 				break;
 
 		}
 
-		switch((string)$button)
+		switch ((string)$button)
 		{
 		case 'exception':	// create an exception in a recuring event
-			$msg = $this->_create_exception($event,$preserv);
+			$msg = $this->_create_exception($event, $preserv);
 			break;
 
 		case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
@@ -550,29 +550,29 @@ 
 			unset($event['recurrence']);
 			unset($preserv['recurrence']);
 			unset($event['recur_exception']);
-			unset($event['edit_single']);	// in case it has been set
+			unset($event['edit_single']); // in case it has been set
 			unset($event['modified']);
 			unset($event['modifier']);
 			unset($event['caldav_name']);
-			$event['owner'] = !(int)$this->owner || !$this->bo->check_perms(EGW_ACL_ADD,0,$this->owner) ? $this->user : $this->owner;
+			$event['owner'] = !(int)$this->owner || !$this->bo->check_perms(EGW_ACL_ADD, 0, $this->owner) ? $this->user : $this->owner;
 
 			// Clear participant stati
-			foreach($event['participant_types'] as $type => &$participants)
+			foreach ($event['participant_types'] as $type => &$participants)
 			{
-				foreach($participants as $id => &$response)
+				foreach ($participants as $id => &$response)
 				{
-					if($type == 'u' && $id == $event['owner']) continue;
+					if ($type == 'u' && $id == $event['owner']) continue;
 					calendar_so::split_status($response, $quantity, $role);
 					// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
-					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
-					$response = calendar_so::combine_status($status,$quantity,$role);
+					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'], $id) : 'U';
+					$response = calendar_so::combine_status($status, $quantity, $role);
 				}
 			}
 
 			// Copy alarms
 			if (is_array($event['alarm']))
 			{
-				foreach($event['alarm'] as $n => &$alarm)
+				foreach ($event['alarm'] as $n => &$alarm)
 				{
 					unset($alarm['id']);
 					unset($alarm['cal_id']);
@@ -582,7 +582,7 @@ 
 			// Get links to be copied
 			// With no ID, $content['link_to']['to_id'] is used
 			$content['link_to']['to_id'] = array('to_app' => 'calendar', 'to_id' => 0);
-			foreach(egw_link::get_links('calendar', $content['id']) as $link)
+			foreach (egw_link::get_links('calendar', $content['id']) as $link)
 			{
 				if ($link['app'] != egw_link::VFS_APPNAME)
 				{
@@ -608,7 +608,7 @@ 
 		case 'print':
 		case 'apply':
 		case 'infolog':
-			if ($event['id'] && !$this->bo->check_perms(EGW_ACL_EDIT,$event))
+			if ($event['id'] && !$this->bo->check_perms(EGW_ACL_EDIT, $event))
 			{
 				$msg = lang('Permission denied');
 				$button = '';
@@ -626,7 +626,7 @@ 
 				$button = '';
 				break;
 			}
-			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end']-$event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
+			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end'] - $event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
 			{
 				$msg = lang('Error: Duration of event longer then recurrence interval!');
 				$button = '';
@@ -656,14 +656,14 @@ 
 				$event['reference'] = $event['id'];
 				$event['recurrence'] = $content['edit_single'];
 				unset($event['id']);
-				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
+				$conflicts = $this->bo->update($event, $ignore_conflicts, true, false, true, $messages, $content['no_notifications']);
 				if (!is_array($conflicts) && $conflicts)
 				{
 					// now we need to add the original start as recur-execption to the series
 					$recur_event = $this->bo->read($event['reference']);
 					$recur_event['recur_exception'][] = $content['edit_single'];
 					// check if we need to move the alarms, because they are next on that exception
-					foreach($recur_event['alarm'] as $id => $alarm)
+					foreach ($recur_event['alarm'] as $id => $alarm)
 					{
 						if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
 						{
@@ -679,11 +679,11 @@ 
 							}
 						}
 					}
-					unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
-					unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
-					$this->bo->update($recur_event,true);	// no conflict check here
+					unset($recur_event['start']); unset($recur_event['end']); // no update necessary
+					unset($recur_event['alarm']); // unsetting alarms too, as they cant be updated without start!
+					$this->bo->update($recur_event, true); // no conflict check here
 					unset($recur_event);
-					unset($event['edit_single']);			// if we further edit it, it's just a single event
+					unset($event['edit_single']); // if we further edit it, it's just a single event
 					unset($preserv['edit_single']);
 				}
 				else	// conflict or error, we need to reset everything to the state befor we tried to save it
@@ -703,7 +703,7 @@ 
 						if ($event['start'] != $old_event['start'] ||
 							$event['whole_day'] != $old_event['whole_day'])
 						{
-							if(!($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + 1, true)))
+							if (!($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + 1, true)))
 							{
 								$msg = lang("Error: You can't shift a series from the past!");
 								$noerror = false;
@@ -726,7 +726,7 @@ 
 							{
 								$event['end'] = $event['start'] + $content['duration'];
 							}
-							elseif($event['end'] < $event['start'])
+							elseif ($event['end'] < $event['start'])
 							{
 								$event['end'] = $event['start'] + $event['end'] - $actual_date;
 							}
@@ -767,14 +767,14 @@ 
 										($last = $occurrence));
 								$last->setTime(0, 0, 0);
 								$old_event['recur_enddate'] = egw_time::to($last, 'ts');
-								if (!$this->bo->update($old_event,true,true,false,true,$dummy=null,$content['no_notifications']))
+								if (!$this->bo->update($old_event, true, true, false, true, $dummy = null, $content['no_notifications']))
 								{
-									$msg .= ($msg ? ', ' : '') .lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
-										lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
-											htmlspecialchars(egw::link('/index.php',array(
+									$msg .= ($msg ? ', ' : '').lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
+										lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.', '<a href="'.
+											htmlspecialchars(egw::link('/index.php', array(
 												'menuaction' => 'calendar.calendar_uiforms.edit',
 												'cal_id'    => $content['id'],
-											))).'">','</a>');
+											))).'">', '</a>');
 									$noerror = false;
 									$event = $orig_event;
 									break;
@@ -790,13 +790,13 @@ 
 							$event['whole_day'] != $old_event['whole_day'])
 						{
 							$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
-							foreach((array)$event['participants'] as $uid => $status)
+							foreach ((array)$event['participants'] as $uid => $status)
 							{
 								$q = $r = null;
-								calendar_so::split_status($status,$q,$r);
+								calendar_so::split_status($status, $q, $r);
 								if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
 								{
-									$preferences = CreateObject('phpgwapi.preferences',$uid);
+									$preferences = CreateObject('phpgwapi.preferences', $uid);
 									$part_prefs = $preferences->read_repository();
 									switch ($part_prefs['calendar']['reset_stati'])
 									{
@@ -806,7 +806,7 @@ 
 											if ($sameday) break;
 										default:
 											$status_reset_to_unknown = true;
-											$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
+											$event['participants'][$uid] = calendar_so::combine_status('U', $q, $r);
 											// todo: report reset status to user
 									}
 								}
@@ -816,27 +816,27 @@ 
 						}
 					}
 				}
-				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
+				$conflicts = $this->bo->update($event, $ignore_conflicts, true, false, true, $messages, $content['no_notifications']);
 				unset($event['ignore']);
 			}
 			if (is_array($conflicts))
 			{
-				$event['button_was'] = $button;	// remember for ignore
-				return $this->conflicts($event,$conflicts,$preserv);
+				$event['button_was'] = $button; // remember for ignore
+				return $this->conflicts($event, $conflicts, $preserv);
 			}
 			// check if there are messages from update, eg. removed participants or categories because of missing rights
 			if ($messages)
 			{
-				$msg  .= ($msg ? ', ' : '').implode(', ',$messages);
+				$msg .= ($msg ? ', ' : '').implode(', ', $messages);
 			}
 			if ($conflicts === 0)
 			{
-				$msg .= ($msg ? ', ' : '') .lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
-							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
-								htmlspecialchars(egw::link('/index.php',array(
+				$msg .= ($msg ? ', ' : '').lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
+							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.', '<a href="'.
+								htmlspecialchars(egw::link('/index.php', array(
 								'menuaction' => 'calendar.calendar_uiforms.edit',
 								'cal_id'    => $content['id'],
-							))).'">','</a>');
+							))).'">', '</a>');
 				$noerror = false;
 			}
 			elseif ($conflicts > 0)
@@ -857,19 +857,19 @@ 
 						// if alarm would be in the past (eg. event moved back) --> move to next possible recurrence
 						if ($alarm['time'] < $this->bo->now_su)
 						{
-							if (($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su+$alarm['offset'], true)))
+							if (($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $alarm['offset'], true)))
 							{
-								$alarm['time'] =  $next_occurrence['start'] - $alarm['offset'];
+								$alarm['time'] = $next_occurrence['start'] - $alarm['offset'];
 							}
 							else
 							{
-								$alarm = false;	// no (further) recurence found --> ignore alarm
+								$alarm = false; // no (further) recurence found --> ignore alarm
 							}
 						}
 						// alarm is currently on a previous recurrence --> set for first recurrence of new series
 						elseif ($event_time < $event['start'])
 						{
-							$alarm['time'] =  $event['start'] - $alarm['offset'];
+							$alarm['time'] = $event['start'] - $alarm['offset'];
 						}
 						if ($alarm)
 						{
@@ -878,9 +878,9 @@ 
 						}
 					}
 					// attach all future exceptions to the new series
-					$events =& $this->bo->search(array(
+					$events = & $this->bo->search(array(
 						'query' => array('cal_uid' => $old_event['uid']),
-						'filter' => 'owner',  // return all possible entries
+						'filter' => 'owner', // return all possible entries
 						'daywise' => false,
 						'date_format' => 'ts',
 					));
@@ -891,7 +891,7 @@ 
 							$exception['recurrence'] += $offset;
 							$exception['reference'] = $event['id'];
 							$exception['uid'] = $event['uid'];
-							$this->bo->update($exception, true, true, true, true, $msg=null, $content['no_notifications']);
+							$this->bo->update($exception, true, true, true, true, $msg = null, $content['no_notifications']);
 						}
 					}
 				}
@@ -899,24 +899,24 @@ 
 				$message = lang('Event saved');
 				if ($status_reset_to_unknown)
 				{
-					foreach((array)$event['participants'] as $uid => $status)
+					foreach ((array)$event['participants'] as $uid => $status)
 					{
 						if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user)
 						{
-							calendar_so::split_status($status,$q,$r);
-							$status = calendar_so::combine_status('U',$q,$r);
+							calendar_so::split_status($status, $q, $r);
+							$status = calendar_so::combine_status('U', $q, $r);
 							$this->bo->set_status($event['id'], $uid, $status, 0, true);
 						}
 					}
 					$message .= lang(', stati of participants reset');
 				}
 
-				$msg = $message . ($msg ? ', ' . $msg : '');
+				$msg = $message.($msg ? ', '.$msg : '');
 				egw_framework::refresh_opener($msg, 'calendar', $event['id']);
 				// writing links for new entry, existing ones are handled by the widget itself
 				if (!$content['id'] && is_array($content['link_to']['to_id']))
 				{
-					egw_link::link('calendar',$event['id'],$content['link_to']['to_id']);
+					egw_link::link('calendar', $event['id'], $content['link_to']['to_id']);
 				}
 			}
 			else
@@ -926,7 +926,7 @@ 
 			break;
 
 		case 'cancel':
-			if($content['cancel_needs_refresh'])
+			if ($content['cancel_needs_refresh'])
 			{
 				egw_framework::refresh_opener($msg, 'calendar');
 			}
@@ -964,7 +964,7 @@ 
 			{
 				$content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
 			}
-			if ($this->bo->check_perms(EGW_ACL_EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
+			if ($this->bo->check_perms(EGW_ACL_EDIT, !$content['new_alarm']['owner'] ? $event : 0, $content['new_alarm']['owner']))
 			{
 				$alarm = array(
 					'offset' => $offset,
@@ -978,13 +978,13 @@ 
 				}
 				elseif ($event['id'])	// save the alarm immediatly
 				{
-					if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+					if (($alarm_id = $this->bo->save_alarm($event['id'], $alarm)))
 					{
 						$alarm['id'] = $alarm_id;
 						$event['alarm'][$alarm_id] = $alarm;
 
 						$msg = lang('Alarm added');
-						egw_framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+						egw_framework::refresh_opener($msg, 'calendar', $event['id'], 'update');
 					}
 					else
 					{
@@ -993,7 +993,7 @@ 
 				}
 				else
 				{
-					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
+					for ($alarm['id'] = 1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
 					$event['alarm'][$alarm['id']] = $alarm;
 				}
 			}
@@ -1008,22 +1008,22 @@ 
 		{
 			$msg .= ($msg ? "\n" : '').implode("\n", $notification_errors);
 		}
-		if (in_array($button,array('cancel','save','delete','delete_exceptions','delete_keep_exceptions')) && $noerror)
+		if (in_array($button, array('cancel', 'save', 'delete', 'delete_exceptions', 'delete_keep_exceptions')) && $noerror)
 		{
 			if ($content['lock_token'])	// remove an existing lock
 			{
-				egw_vfs::unlock(egw_vfs::app_entry_lock_path('calendar',$content['id']),$content['lock_token'],false);
+				egw_vfs::unlock(egw_vfs::app_entry_lock_path('calendar', $content['id']), $content['lock_token'], false);
 			}
 			if ($content['no_popup'])
 			{
-				egw::redirect_link('/index.php',array(
+				egw::redirect_link('/index.php', array(
 					'menuaction' => 'calendar.calendar_uiviews.index',
 					'msg'        => $msg,
 				));
 			}
-			if (in_array($button,array('delete_exceptions','delete_keep_exceptions')) || $content['recur_type'] && $button == 'delete')
+			if (in_array($button, array('delete_exceptions', 'delete_keep_exceptions')) || $content['recur_type'] && $button == 'delete')
 			{
-				egw_framework::refresh_opener($msg,'calendar');
+				egw_framework::refresh_opener($msg, 'calendar');
 			}
 			else
 			{
@@ -1033,7 +1033,7 @@ 
 			common::egw_exit();
 		}
 		unset($event['no_notifications']);
-		return $this->edit($event,$preserv,$msg,$event['id'] ? $event['id'] : $content['link_to']['to_id']);
+		return $this->edit($event, $preserv, $msg, $event['id'] ? $event['id'] : $content['link_to']['to_id']);
 	}
 
 	/**
@@ -1045,7 +1045,7 @@ 
 	 * @param array &$preserv
 	 * @return string message that exception was created
 	 */
-	function _create_exception(&$event,&$preserv)
+	function _create_exception(&$event, &$preserv)
 	{
 		// In some cases where the user makes the first day an exception, actual_date may be missing
 		$preserv['actual_date'] = $preserv['acutal_date'] ? $preserv['actual_date'] : $event['start'];
@@ -1055,17 +1055,17 @@ 
 		$event['recurrence'] = $preserv['recurrence'] = $preserv['actual_date'];
 		$event['start'] = $preserv['edit_single'] = $preserv['actual_date'];
 		$event['recur_type'] = MCAL_RECUR_NONE;
-		foreach(array('recur_enddate','recur_interval','recur_exception','recur_data') as $name)
+		foreach (array('recur_enddate', 'recur_interval', 'recur_exception', 'recur_data') as $name)
 		{
 			unset($event[$name]);
 		}
 		// add all alarms as new alarms to execption
 		$event['alarm'] = array_values((array)$event['alarm']);
-		foreach($event['alarm'] as &$alarm)
+		foreach ($event['alarm'] as &$alarm)
 		{
 			unset($alarm['uid'], $alarm['id'], $alarm['time']);
 		}
-		if($this->bo->check_perms(EGW_ACL_EDIT,$event))
+		if ($this->bo->check_perms(EGW_ACL_EDIT, $event))
 		{
 			return lang('Save event as exception - Delete single occurrence - Edit status or alarms for this particular day');
 		}
@@ -1092,14 +1092,14 @@ 
 	{
 		$msg = false;
 
-		if(!$as_of_date )
+		if (!$as_of_date)
 		{
 			$as_of_date = time();
 		}
 
 		//error_log(__METHOD__ . egw_time::to($old_event['start']) . ' -> '. egw_time::to($event['start']) . ' as of ' . egw_time::to($as_of_date));
 
-		if(!($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + 1, true)))
+		if (!($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + 1, true)))
 		{
 			$msg = lang("Error: You can't shift a series from the past!");
 			$noerror = false;
@@ -1113,11 +1113,11 @@ 
 		$duration = $event['duration'] ? $event['duration'] : $event['end'] - $event['start'];
 
 		// base start-date of new series on actual / clicked date
-		$event['start'] = $as_of_date ;
+		$event['start'] = $as_of_date;
 
-		if (egw_time::to($old_event['start'],'Ymd') < egw_time::to($as_of_date,'Ymd') ||
+		if (egw_time::to($old_event['start'], 'Ymd') < egw_time::to($as_of_date, 'Ymd') ||
 			// Adjust for requested date in the past
-			egw_time::to($as_of_date,'ts') < time()
+			egw_time::to($as_of_date, 'ts') < time()
 		)
 		{
 
@@ -1137,17 +1137,17 @@ 
 				$rriter->next_no_exception();
 				$occurrence = $rriter->current();
 			}
-			while ($rriter->valid()  && (
+			while ($rriter->valid() && (
 				egw_time::to($occurrence, 'ts') <= time() ||
-				egw_time::to($occurrence, 'Ymd') < egw_time::to($as_of_date,'Ymd')
+				egw_time::to($occurrence, 'Ymd') < egw_time::to($as_of_date, 'Ymd')
 			) && ($last = $occurrence));
 
 
 			// Make sure as_of_date is still valid, may have to move forward
-			if(egw_time::to($as_of_date,'ts') < egw_time::to($last,'ts') ||
+			if (egw_time::to($as_of_date, 'ts') < egw_time::to($last, 'ts') ||
 				egw_time::to($as_of_date, 'Ymd') == egw_time::to($last, 'Ymd'))
 			{
-				$event['start'] = egw_time::to($rriter->current(),'ts') + $offset;
+				$event['start'] = egw_time::to($rriter->current(), 'ts') + $offset;
 			}
 
 			//error_log(__METHOD__ ." Series should end at " . egw_time::to($last) . " New series starts at " . egw_time::to($event['start']));
@@ -1155,7 +1155,7 @@ 
 			{
 				$event['end'] = $event['start'] + $duration;
 			}
-			elseif($event['end'] < $event['start'])
+			elseif ($event['end'] < $event['start'])
 			{
 				$event['end'] = $old_event['end'] - $old_event['start'] + $event['start'];
 			}
@@ -1164,7 +1164,7 @@ 
 			$event['participants'] = $old_event['participants'];
 			foreach ($old_event['recur_exception'] as $key => $exdate)
 			{
-				if ($exdate > egw_time::to($last,'ts'))
+				if ($exdate > egw_time::to($last, 'ts'))
 				{
 					//error_log("Moved exception on " . egw_time::to($exdate));
 					unset($old_event['recur_exception'][$key]);
@@ -1178,18 +1178,18 @@ 
 			}
 			$last->setTime(0, 0, 0);
 			$old_event['recur_enddate'] = egw_time::to($last, 'ts');
-			if (!$this->bo->update($old_event,true,true,false,true,$dummy=null,$no_notifications))
+			if (!$this->bo->update($old_event, true, true, false, true, $dummy = null, $no_notifications))
 			{
-				$msg .= ($msg ? ', ' : '') .lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
-					lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
-						htmlspecialchars(egw::link('/index.php',array(
+				$msg .= ($msg ? ', ' : '').lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
+					lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.', '<a href="'.
+						htmlspecialchars(egw::link('/index.php', array(
 							'menuaction' => 'calendar.calendar_uiforms.edit',
 							'cal_id'    => $content['id'],
-						))).'">','</a>');
+						))).'">', '</a>');
 				$event = $orig_event;
 			}
 		}
-		$event['start'] = egw_time::to($event['start'],'ts');
+		$event['start'] = egw_time::to($event['start'], 'ts');
 		return $msg;
 	}
 
@@ -1200,11 +1200,11 @@ 
 	 * @param boolean $added
 	 * @return string javascript window.open command
 	 */
-	function ajax_custom_mail($event,$added,$asrequest=false)
+	function ajax_custom_mail($event, $added, $asrequest = false)
 	{
 		$to = array();
 
-		foreach($event['participants'] as $uid => $status)
+		foreach ($event['participants'] as $uid => $status)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$uid.':'.array2string($status));
 			if (empty($status)) continue;
@@ -1213,35 +1213,35 @@ 
 
 			if (isset($status['uid']) && is_numeric($status['uid']) && $GLOBALS['egw']->accounts->get_type($status['uid']) == 'u')
 			{
-				if (!($email = $GLOBALS['egw']->accounts->id2name($status['uid'],'account_email'))) continue;
+				if (!($email = $GLOBALS['egw']->accounts->id2name($status['uid'], 'account_email'))) continue;
 
 				$lid = $firstname = $lastname = null;
-				$GLOBALS['egw']->accounts->get_account_name($status['uid'],$lid,$firstname,$lastname);
+				$GLOBALS['egw']->accounts->get_account_name($status['uid'], $lid, $firstname, $lastname);
 
 				$toadd = $firstname.' '.$lastname.' <'.$email.'>';
-				if (!in_array($toadd,$to)) $to[] = $toadd;
+				if (!in_array($toadd, $to)) $to[] = $toadd;
 				//error_log(__METHOD__.__LINE__.array2string($to));
 			}
 			elseif ($uid < 0)
 			{
-				foreach($GLOBALS['egw']->accounts->members($uid,true) as $uid)
+				foreach ($GLOBALS['egw']->accounts->members($uid, true) as $uid)
 				{
-					if (!($email = $GLOBALS['egw']->accounts->id2name($uid,'account_email'))) continue;
+					if (!($email = $GLOBALS['egw']->accounts->id2name($uid, 'account_email'))) continue;
 
-					$GLOBALS['egw']->accounts->get_account_name($uid,$lid,$firstname,$lastname);
+					$GLOBALS['egw']->accounts->get_account_name($uid, $lid, $firstname, $lastname);
 
 					$toadd = $firstname.' '.$lastname.' <'.$email.'>';
 					// dont add groupmembers if they already rejected the event, or are the current user
-					if (!in_array($toadd,$to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user)) $to[] = $toadd;
+					if (!in_array($toadd, $to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user)) $to[] = $toadd;
 					//error_log(__METHOD__.__LINE__.array2string($to));
 				}
 			}
-			elseif(!empty($status['uid'])&& !is_numeric(substr($status['uid'],0,1)) && ($info = $this->bo->resource_info($status['uid'])))
+			elseif (!empty($status['uid']) && !is_numeric(substr($status['uid'], 0, 1)) && ($info = $this->bo->resource_info($status['uid'])))
 			{
 				$to[] = $info['email'];
 				//error_log(__METHOD__.__LINE__.array2string($to));
 			}
-			elseif(!is_numeric(substr($uid,0,1)) && ($info = $this->bo->resource_info($uid)))
+			elseif (!is_numeric(substr($uid, 0, 1)) && ($info = $this->bo->resource_info($uid)))
 			{
 				$to[] = $info['email'];
 				//error_log(__METHOD__.__LINE__.array2string($to));
@@ -1250,7 +1250,7 @@ 
 		// prefer event description over standard notification text
 		if (empty($event['description']))
 		{
-			list(,$body) = $this->bo->get_update_message($event,$added ? MSG_ADDED : MSG_MODIFIED);	// update-message is in TZ of the user
+			list(,$body) = $this->bo->get_update_message($event, $added ? MSG_ADDED : MSG_MODIFIED); // update-message is in TZ of the user
 		}
 		else
 		{
@@ -1265,12 +1265,12 @@ 
 		$boical = new calendar_ical();
 		// we need to pass $event[id] so iCal class reads event again,
 		// as event is in user TZ, but iCal class expects server TZ!
-		$ics = $boical->exportVCal(array($event['id']),'2.0','REQUEST',false);
+		$ics = $boical->exportVCal(array($event['id']), '2.0', 'REQUEST', false);
 
-		$ics_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'ics');
-		if(($f = fopen($ics_file,'w')))
+		$ics_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'ics');
+		if (($f = fopen($ics_file, 'w')))
 		{
-			fwrite($f,$ics);
+			fwrite($f, $ics);
 			fclose($f);
 		}
 		//error_log(__METHOD__.__LINE__.array2string($to));
@@ -1282,7 +1282,7 @@ 
 			'preset[body]'    => $body,
 			'preset[name]'    => 'event.ics',
 			'preset[file]'    => $ics_file,
-			'preset[type]'    => 'text/calendar'.($asrequest?'; method=REQUEST':''),
+			'preset[type]'    => 'text/calendar'.($asrequest ? '; method=REQUEST' : ''),
 			'preset[size]'    => filesize($ics_file),
 		);
 		if ($asrequest) $vars['preset[msg]'] = lang('You attempt to mail a meetingrequest to the recipients above. Depending on the client this mail is opened with, the recipient may or may not see the mailbody below, but only see the meeting request attached.');
@@ -1338,7 +1338,7 @@ 
 	 * @param mixed $link_to_id ='' from or for the link-widget
 	 * @param string $msg_type =null default automatic detect, if it contains "error"
 	 */
-	function edit($event=null,$preserv=null,$msg='',$link_to_id='',$msg_type=null)
+	function edit($event = null, $preserv = null, $msg = '', $link_to_id = '', $msg_type = null)
 	{
 		$sel_options = array(
 			'recur_type' => &$this->bo->recur_types,
@@ -1362,8 +1362,8 @@ 
 				'no_popup' => isset($_GET['no_popup']),
 				'template' => isset($_GET['template']) ? $_GET['template'] : (isset($_REQUEST['print']) ? 'calendar.print' : 'calendar.edit'),
 			);
-			$cal_id = (int) $_GET['cal_id'];
-			if($_GET['action'])
+			$cal_id = (int)$_GET['cal_id'];
+			if ($_GET['action'])
 			{
 				$event = $this->bo->read($cal_id);
 				$event['action'] = $_GET['action'];
@@ -1381,14 +1381,14 @@ 
 			{
 				//error_log(__METHOD__."() Error: importing the iCal: vfs file not found '$_GET[ical_vfs]'!");
 				$msg = lang('Error: importing the iCal').': '.lang('VFS file not found').': '.$_GET['ical_vfs'];
-				$event =& $this->default_add_event();
+				$event = & $this->default_add_event();
 			}
 			if (!empty($_GET['ical_data']) &&
 				!($_GET['ical'] = egw_link::get_data($_GET['ical_data'])))
 			{
 				//error_log(__METHOD__."() Error: importing the iCal: data not found '$_GET[ical_data]'!");
 				$msg = lang('Error: importing the iCal').': '.lang('Data not found').': '.$_GET['ical_data'];
-				$event =& $this->default_add_event();
+				$event = & $this->default_add_event();
 			}
 			if (!empty($_GET['ical']))
 			{
@@ -1397,14 +1397,14 @@ 
 				{
 					error_log(__METHOD__."('$_GET[ical]') error parsing iCal!");
 					$msg = lang('Error: importing the iCal');
-					$event =& $this->default_add_event();
+					$event = & $this->default_add_event();
 				}
 				else
 				{
 					if (count($events) > 1)
 					{
 						$msg = lang('%1 events in iCal file, only first one imported and displayed!', count($events));
-						$msg_type = 'notice';	// no not hide automatic
+						$msg_type = 'notice'; // no not hide automatic
 					}
 					// as icaltoegw returns timestamps in server-time, we have to convert them here to user-time
 					$this->bo->db2data($events, 'ts');
@@ -1417,7 +1417,7 @@ 
 					else
 					{
 						$event['participant_types'] = array();
-						foreach($event['participants'] as $uid => $status)
+						foreach ($event['participants'] as $uid => $status)
 						{
 							$user_type = $user_id = null;
 							calendar_so::split_user($uid, $user_type, $user_id);
@@ -1438,15 +1438,15 @@ 
 					}
 					else
 					{
-						$GLOBALS['egw']->framework->render('<p class="message" align="center">'.lang('Permission denied')."</p>\n",null,true);
+						$GLOBALS['egw']->framework->render('<p class="message" align="center">'.lang('Permission denied')."</p>\n", null, true);
 						common::egw_exit();
 					}
 				}
-				$event =& $this->default_add_event();
+				$event = & $this->default_add_event();
 			}
 			else
 			{
-				$preserv['actual_date'] = $event['start'];		// remember the date clicked
+				$preserv['actual_date'] = $event['start']; // remember the date clicked
 				if ($event['recur_type'] != MCAL_RECUR_NONE)
 				{
 					if (empty($event['whole_day']))
@@ -1459,10 +1459,10 @@ 
 						$date->setUser();
 					}
 					$event = $this->bo->read($cal_id, $date, true);
-					$preserv['actual_date'] = $event['start'];		// remember the date clicked
+					$preserv['actual_date'] = $event['start']; // remember the date clicked
 					if ($_GET['exception'])
 					{
-						$msg = $this->_create_exception($event,$preserv);
+						$msg = $this->_create_exception($event, $preserv);
 					}
 					else
 					{
@@ -1471,8 +1471,8 @@ 
 				}
 			}
 			// set new start and end if given by $_GET
-			if(isset($_GET['start'])) { $event['start'] = $_GET['start']; }
-			if(isset($_GET['end'])) { $event['end'] = $_GET['end']; }
+			if (isset($_GET['start'])) { $event['start'] = $_GET['start']; }
+			if (isset($_GET['end'])) { $event['end'] = $_GET['end']; }
 			// check if the event is the whole day
 			$start = $this->bo->date2array($event['start']);
 			$end = $this->bo->date2array($event['end']);
@@ -1482,30 +1482,30 @@ 
 			if (!$event['id'] && isset($_REQUEST['link_app']) && isset($_REQUEST['link_id']))
 			{
 				$link_ids = is_array($_REQUEST['link_id']) ? $_REQUEST['link_id'] : array($_REQUEST['link_id']);
-				foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
+				foreach (is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 				{
 					$link_id = $link_ids[$n];
-					if(!preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// guard against XSS
+					if (!preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i', $link_app.':'.$link_id))	// guard against XSS
 					{
 						continue;
 					}
-					if(!$n)
+					if (!$n)
 					{
-						$event['title'] = egw_link::title($link_app,$link_id);
+						$event['title'] = egw_link::title($link_app, $link_id);
 						// ask first linked app via "calendar_set" hook, for further data to set, incl. links
-						if (($set = $GLOBALS['egw']->hooks->single($event+array('location'=>'calendar_set','entry_id'=>$link_id),$link_app)))
+						if (($set = $GLOBALS['egw']->hooks->single($event + array('location'=>'calendar_set', 'entry_id'=>$link_id), $link_app)))
 						{
-							foreach((array)$set['link_app'] as $i => $l_app)
+							foreach ((array)$set['link_app'] as $i => $l_app)
 							{
-								if (($l_id=$set['link_id'][$i])) egw_link::link('calendar',$event['link_to']['to_id'],$l_app,$l_id);
+								if (($l_id = $set['link_id'][$i])) egw_link::link('calendar', $event['link_to']['to_id'], $l_app, $l_id);
 							}
 							unset($set['link_app']);
 							unset($set['link_id']);
 
-							$event = array_merge($event,$set);
+							$event = array_merge($event, $set);
 						}
 					}
-					egw_link::link('calendar',$link_to_id,$link_app,$link_id);
+					egw_link::link('calendar', $link_to_id, $link_app, $link_id);
 				}
 			}
 		}
@@ -1515,44 +1515,44 @@ 
 		{
 			$etpl->read($preserv['template'] = 'calendar.edit');
 		}
-		$view = $preserv['view'] = $preserv['view'] || $event['id'] && !$this->bo->check_perms(EGW_ACL_EDIT,$event);
+		$view = $preserv['view'] = $preserv['view'] || $event['id'] && !$this->bo->check_perms(EGW_ACL_EDIT, $event);
 		//echo "view=$view, event="; _debug_array($event);
 		// shared locking of entries to edit
 		if (!$view && ($locktime = $GLOBALS['egw_info']['server']['Lock_Time_Calender']) && $event['id'])
 		{
-			$lock_path = egw_vfs::app_entry_lock_path('calendar',$event['id']);
+			$lock_path = egw_vfs::app_entry_lock_path('calendar', $event['id']);
 			$lock_owner = 'mailto:'.$GLOBALS['egw_info']['user']['account_email'];
 
 			if (($preserv['lock_token'] = $event['lock_token']))		// already locked --> refresh the lock
 			{
-				egw_vfs::lock($lock_path,$preserv['lock_token'],$locktime,$lock_owner,$scope='shared',$type='write',true,false);
+				egw_vfs::lock($lock_path, $preserv['lock_token'], $locktime, $lock_owner, $scope = 'shared', $type = 'write', true, false);
 			}
 			if (($lock = egw_vfs::checkLock($lock_path)) && $lock['owner'] != $lock_owner)
 			{
 				$msg .= ' '.lang('This entry is currently opened by %1!',
-					(($lock_uid = $GLOBALS['egw']->accounts->name2id(substr($lock['owner'],7),'account_email')) ?
+					(($lock_uid = $GLOBALS['egw']->accounts->name2id(substr($lock['owner'], 7), 'account_email')) ?
 					common::grab_owner_name($lock_uid) : $lock['owner']));
 			}
-			elseif($lock)
+			elseif ($lock)
 			{
 				$preserv['lock_token'] = $lock['token'];
 			}
-			elseif(egw_vfs::lock($lock_path,$preserv['lock_token'],$locktime,$lock_owner,$scope='shared',$type='write',false,false))
+			elseif (egw_vfs::lock($lock_path, $preserv['lock_token'], $locktime, $lock_owner, $scope = 'shared', $type = 'write', false, false))
 			{
 				//We handle AJAX_REQUEST in client-side for unlocking the locked entry, in case of closing the entry by X button or close button
 			}
 			else
 			{
-				$msg .= ' '.lang("Can't aquire lock!");		// eg. an exclusive lock via CalDAV ...
+				$msg .= ' '.lang("Can't aquire lock!"); // eg. an exclusive lock via CalDAV ...
 				$view = true;
 			}
 		}
-		$content = array_merge($event,array(
+		$content = array_merge($event, array(
 			'link_to' => array(
 				'to_id'  => $link_to_id,
 				'to_app' => 'calendar',
 			),
-			'edit_single' => $preserv['edit_single'],	// need to be in content too, as it is used in the template
+			'edit_single' => $preserv['edit_single'], // need to be in content too, as it is used in the template
 			'tabs'   => $preserv['tabs'],
 			'view' => $view,
 			'query_delete_exceptions' => (int)($event['recur_type'] && $event['recur_exception']),
@@ -1564,11 +1564,11 @@ 
 		$row = 3;
 		$readonlys = $content['participants'] = $preserv['participants'] = array();
 		// preserve some ui elements, if set eg. under error-conditions
-		foreach(array('quantity','resource','role') as $n)
+		foreach (array('quantity', 'resource', 'role') as $n)
 		{
 			if (isset($event['participants'][$n])) $content['participants'][$n] = $event['participants'][$n];
 		}
-		foreach($event['participant_types'] as $type => $participants)
+		foreach ($event['participant_types'] as $type => $participants)
 		{
 			$name = 'accounts';
 			if (isset($this->bo->resources[$type]))
@@ -1577,17 +1577,17 @@ 
 			}
 			// sort participants (in there group/app) by title
 			uksort($participants, array($this, 'uid_title_cmp'));
-			foreach($participants as $id => $status)
+			foreach ($participants as $id => $status)
 			{
 				$uid = $type == 'u' ? $id : $type.$id;
 				$quantity = $role = null;
-				calendar_so::split_status($status,$quantity,$role);
+				calendar_so::split_status($status, $quantity, $role);
 				$preserv['participants'][$row] = $content['participants'][$row] = array(
 					'app'      => $name == 'accounts' ? ($GLOBALS['egw']->accounts->get_type($id) == 'g' ? 'Group' : 'User') : $name,
 					'uid'      => $uid,
 					'status'   => $status,
 					'old_status' => $status,
-					'quantity' => $quantity > 1 || $uid[0] == 'r' ? $quantity : '',	// only display quantity for resources or if > 1
+					'quantity' => $quantity > 1 || $uid[0] == 'r' ? $quantity : '', // only display quantity for resources or if > 1
 					'role'     => $role,
 				);
 				// replace iCal roles with a nicer label and remove regular REQ-PARTICIPANT
@@ -1596,33 +1596,33 @@ 
 					$content['participants'][$row]['role_label'] = lang($this->bo->roles[$role]);
 				}
 				// allow third party apps to use categories for roles
-				elseif(substr($role,0,6) == 'X-CAT-')
+				elseif (substr($role, 0, 6) == 'X-CAT-')
 				{
-					$content['participants'][$row]['role_label'] = $GLOBALS['egw']->categories->id2name(substr($role,6));
+					$content['participants'][$row]['role_label'] = $GLOBALS['egw']->categories->id2name(substr($role, 6));
 				}
 				else
 				{
-					$content['participants'][$row]['role_label'] = lang(str_replace('X-','',$role));
+					$content['participants'][$row]['role_label'] = lang(str_replace('X-', '', $role));
 				}
-				$content['participants'][$row]['delete_id'] = strpbrk($uid,'"\'<>') !== false ? md5($uid) : $uid;
+				$content['participants'][$row]['delete_id'] = strpbrk($uid, '"\'<>') !== false ? md5($uid) : $uid;
 				//echo "<p>$uid ($quantity): $role --> {$content['participants'][$row]['role']}</p>\n";
 
-				if (($no_status = !$this->bo->check_status_perms($uid,$event)) || $view)
+				if (($no_status = !$this->bo->check_status_perms($uid, $event)) || $view)
 					$readonlys['participants'][$row]['status'] = $no_status;
-				if ($preserv['hide_delete'] || !$this->bo->check_perms(EGW_ACL_EDIT,$event))
+				if ($preserv['hide_delete'] || !$this->bo->check_perms(EGW_ACL_EDIT, $event))
 					$readonlys['participants']['delete'][$uid] = true;
 				// todo: make the participants available as links with email as title
 				$content['participants'][$row++]['title'] = $this->get_title($uid);
 				// enumerate group-invitations, so people can accept/reject them
 				if ($name == 'accounts' && $GLOBALS['egw']->accounts->get_type($id) == 'g' &&
-					($members = $GLOBALS['egw']->accounts->members($id,true)))
+					($members = $GLOBALS['egw']->accounts->members($id, true)))
 				{
 					$sel_options['status']['G'] = lang('Select one');
 					// sort members by title
 					usort($members, array($this, 'uid_title_cmp'));
-					foreach($members as $member)
+					foreach ($members as $member)
 					{
-						if (!isset($participants[$member]) && $this->bo->check_perms(EGW_ACL_READ,0,$member))
+						if (!isset($participants[$member]) && $this->bo->check_perms(EGW_ACL_READ, 0, $member))
 						{
 							$preserv['participants'][$row] = $content['participants'][$row] = array(
 								'app'      => 'Group invitation',
@@ -1631,7 +1631,7 @@ 
 							);
 							$readonlys['participants'][$row]['quantity'] = $readonlys['participants']['delete'][$member] = true;
 							// read access is enough to invite participants, but you need edit rights to change status
-							$readonlys['participants'][$row]['status'] = !$this->bo->check_perms(EGW_ACL_EDIT,0,$member);
+							$readonlys['participants'][$row]['status'] = !$this->bo->check_perms(EGW_ACL_EDIT, 0, $member);
 							$content['participants'][$row++]['title'] = common::grab_owner_name($member);
 						}
 					}
@@ -1639,16 +1639,16 @@ 
 			}
 			// resouces / apps we shedule, atm. resources and addressbook
 			$content['participants']['cal_resources'] = '';
-			foreach($this->bo->resources as $data)
+			foreach ($this->bo->resources as $data)
 			{
-				if ($data['app'] == 'email') continue;	// make no sense, as we cant search for email
+				if ($data['app'] == 'email') continue; // make no sense, as we cant search for email
 				$content['participants']['cal_resources'] .= ','.$data['app'];
 			}
 			// adding extra content for the resource link-entry widget to
 			// * select resources or addressbook as a default selection on the app selectbox based on prefs
 			$content['participants']['resource']['app'] = $this->cal_prefs['defaultresource_sel'];
 			// * get informations from the event on the ajax callback
-			if (in_array($content['participants']['resource']['app'],array('resources_conflict','resources_without_conflict')))
+			if (in_array($content['participants']['resource']['app'], array('resources_conflict', 'resources_without_conflict')))
 			{
 				// fix real app string
 				$content['participants']['resource']['app'] = 'resources';
@@ -1660,36 +1660,36 @@ 
 			}
 		}
 		$content['participants']['status_date'] = $preserv['actual_date'];
-		$preserved = array_merge($preserv,$content);
+		$preserved = array_merge($preserv, $content);
 		$event['new_alarm']['options'] = $content['new_alarm']['options'];
 		if ($event['alarm'])
 		{
 			// makes keys of the alarm-array starting with 1
 			$content['alarm'] = array(false);
-			foreach(array_values($event['alarm']) as $id => $alarm)
+			foreach (array_values($event['alarm']) as $id => $alarm)
 			{
-				if (!$alarm['all'] && !$this->bo->check_perms(EGW_ACL_READ,0,$alarm['owner']))
+				if (!$alarm['all'] && !$this->bo->check_perms(EGW_ACL_READ, 0, $alarm['owner']))
 				{
-					continue;	// no read rights to the calendar of the alarm-owner, dont show the alarm
+					continue; // no read rights to the calendar of the alarm-owner, dont show the alarm
 				}
-				$alarm['all'] = (int) $alarm['all'];
+				$alarm['all'] = (int)$alarm['all'];
 				$after = false;
-				if($alarm['offset'] < 0)
+				if ($alarm['offset'] < 0)
 				{
 					$after = true;
 					$alarm['offset'] = -1 * $alarm['offset'];
 				}
-				$days = (int) ($alarm['offset'] / DAY_s);
-				$hours = (int) (($alarm['offset'] % DAY_s) / HOUR_s);
-				$minutes = (int) (($alarm['offset'] % HOUR_s) / 60);
+				$days = (int)($alarm['offset'] / DAY_s);
+				$hours = (int)(($alarm['offset'] % DAY_s) / HOUR_s);
+				$minutes = (int)(($alarm['offset'] % HOUR_s) / 60);
 				$label = array();
 				if ($days) $label[] = $days.' '.lang('days');
 				if ($hours) $label[] = $hours.' '.lang('hours');
 				if ($minutes) $label[] = $minutes.' '.lang('Minutes');
-				$alarm['offset'] = implode(', ',$label) . ' ' . ($after ? lang('after') : lang('before'));
+				$alarm['offset'] = implode(', ', $label).' '.($after ? lang('after') : lang('before'));
 				$content['alarm'][] = $alarm;
 
-				$readonlys['alarm[delete_alarm]['.$alarm['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$alarm['all'] ? $event : 0,$alarm['owner']);
+				$readonlys['alarm[delete_alarm]['.$alarm['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT, $alarm['all'] ? $event : 0, $alarm['owner']);
 			}
 			if (count($content['alarm']) == 1)
 			{
@@ -1704,20 +1704,20 @@ 
 
 		if ($view)
 		{
-			$readonlys['__ALL__'] = true;	// making everything readonly, but widgets set explicitly to false
+			$readonlys['__ALL__'] = true; // making everything readonly, but widgets set explicitly to false
 			$readonlys['button[cancel]'] = $readonlys['action'] =
 				$readonlys['before_after'] = $readonlys['button[add_alarm]'] = $readonlys['new_alarm[owner]'] =
 				$readonlys['new_alarm[options]'] = $readonlys['new_alarm[date]'] = false;
 
 			$content['participants']['no_add'] = true;
 
-			if(!$event['whole_day'])
+			if (!$event['whole_day'])
 			{
 				$etpl->setElementAttribute('whole_day', 'disabled', true);
 			}
 
 			// respect category permissions
-			if(!empty($event['category']))
+			if (!empty($event['category']))
 			{
 				$content['category'] = $this->categories->check_list(EGW_ACL_READ, $event['category']);
 			}
@@ -1728,7 +1728,7 @@ 
 
 			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$readonlys['recur_exception'] = !count($content['recur_exception']);	// otherwise we get a delete button
+				$readonlys['recur_exception'] = !count($content['recur_exception']); // otherwise we get a delete button
 				//$onclick =& $etpl->get_cell_attribute('button[delete]','onclick');
 				//$onclick = str_replace('Delete this event','Delete this series of recuring events',$onclick);
 			}
@@ -1753,13 +1753,13 @@ 
 		{
 			$readonlys['action'] = true;
 		}
-		if (!($readonlys['button[exception]'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event) || $event['recur_type'] == MCAL_RECUR_NONE || ($event['recur_enddate'] &&$event['start'] > $event['recur_enddate'])))
+		if (!($readonlys['button[exception]'] = !$this->bo->check_perms(EGW_ACL_EDIT, $event) || $event['recur_type'] == MCAL_RECUR_NONE || ($event['recur_enddate'] && $event['start'] > $event['recur_enddate'])))
 		{
 			$content['exception_label'] = $this->bo->long_date(max($preserved['actual_date'], $event['start']));
 		}
-		$readonlys['button[delete]'] = !$event['id'] || $preserved['hide_delete'] || !$this->bo->check_perms(EGW_ACL_DELETE,$event);
+		$readonlys['button[delete]'] = !$event['id'] || $preserved['hide_delete'] || !$this->bo->check_perms(EGW_ACL_DELETE, $event);
 
-		if (!$event['id'] || $this->bo->check_perms(EGW_ACL_EDIT,$event))	// new event or edit rights to the event ==> allow to add alarm for all users
+		if (!$event['id'] || $this->bo->check_perms(EGW_ACL_EDIT, $event))	// new event or edit rights to the event ==> allow to add alarm for all users
 		{
 			$sel_options['owner'][0] = lang('All participants');
 		}
@@ -1767,25 +1767,25 @@ 
 		{
 			$sel_options['owner'][$this->user] = $this->bo->participant_name($this->user);
 		}
-		foreach((array) $event['participant_types']['u'] as $uid => $status)
+		foreach ((array)$event['participant_types']['u'] as $uid => $status)
 		{
-			if ($uid != $this->user && $status != 'R' && $this->bo->check_perms(EGW_ACL_EDIT,0,$uid))
+			if ($uid != $this->user && $status != 'R' && $this->bo->check_perms(EGW_ACL_EDIT, 0, $uid))
 			{
 				$sel_options['owner'][$uid] = $this->bo->participant_name($uid);
 			}
 		}
-		$content['no_add_alarm'] = !count($sel_options['owner']);	// no rights to set any alarm
+		$content['no_add_alarm'] = !count($sel_options['owner']); // no rights to set any alarm
 		if (!$event['id'])
 		{
-			$etpl->set_cell_attribute('button[new_alarm]','type','checkbox');
+			$etpl->set_cell_attribute('button[new_alarm]', 'type', 'checkbox');
 		}
 		if ($preserved['no_popup'])
 		{
-			$etpl->set_cell_attribute('button[cancel]','onclick','');
+			$etpl->set_cell_attribute('button[cancel]', 'onclick', '');
 		}
 
 		// Allow admins to restore deleted events
-		if($GLOBALS['egw_info']['server']['calendar_delete_history'] && $event['deleted'] )
+		if ($GLOBALS['egw_info']['server']['calendar_delete_history'] && $event['deleted'])
 		{
 			$content['deleted'] = $preserved['deleted'] = null;
 			$etpl->set_cell_attribute('button[save]', 'label', 'Recover');
@@ -1801,7 +1801,7 @@ 
 		//echo "preserv="; _debug_array($preserved);
  		//echo "readonlys="; _debug_array($readonlys);
  		//echo "sel_options="; _debug_array($sel_options);
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - '
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '
 			. (!$event['id'] ? lang('Add')
 				: ($view ? ($content['edit_single'] ? lang('View exception') : ($content['recur_type'] ? lang('View series') : lang('View')))
 					: ($content['edit_single'] ? lang('Create exception') : ($content['recur_type'] ? lang('Edit series') : lang('Edit')))));
@@ -1817,15 +1817,15 @@ 
 		}
 
 		// non_interactive==true from $_GET calls immediate save action without displaying the edit form
-		if(isset($_GET['non_interactive']) && (bool)$_GET['non_interactive'] === true)
+		if (isset($_GET['non_interactive']) && (bool)$_GET['non_interactive'] === true)
 		{
-			unset($_GET['non_interactive']);	// prevent process_exec <--> edit loops
+			unset($_GET['non_interactive']); // prevent process_exec <--> edit loops
 			$content['button']['save'] = true;
-			$this->process_edit(array_merge($content,$preserved));
+			$this->process_edit(array_merge($content, $preserved));
 		}
 		else
 		{
-			$etpl->exec('calendar.calendar_uiforms.process_edit',$content,$sel_options,$readonlys,$preserved,$preserved['no_popup'] ? 0 : 2);
+			$etpl->exec('calendar.calendar_uiforms.process_edit', $content, $sel_options, $readonlys, $preserved, $preserved['no_popup'] ? 0 : 2);
 		}
 	}
 
@@ -1835,14 +1835,14 @@ 
 	 * @param int $id
 	 * @param string $token
 	 */
-	function ajax_unlock($id,$token)
+	function ajax_unlock($id, $token)
 	{
-		$lock_path = egw_vfs::app_entry_lock_path('calendar',$id);
+		$lock_path = egw_vfs::app_entry_lock_path('calendar', $id);
 		$lock_owner = 'mailto:'.$GLOBALS['egw_info']['user']['account_email'];
 
 		if (($lock = egw_vfs::checkLock($lock_path)) && $lock['owner'] == $lock_owner || $lock['token'] == $token)
 		{
-			egw_vfs::unlock($lock_path,$token,false);
+			egw_vfs::unlock($lock_path, $token, false);
 		}
 	}
 
@@ -1854,17 +1854,17 @@ 
 	 * 		are called by new mail-app; and we intend to use the stuff passed on by session
 	 * @param string $msg = null
 	 */
-	function meeting(array $event=null, $msg=null)
+	function meeting(array $event = null, $msg = null)
 	{
 		$user = $GLOBALS['egw_info']['user']['account_id'];
 		$readonlys['button[apply]'] = true;
-		$_usesession=!is_array($event);
+		$_usesession = !is_array($event);
 		//special usage if $event is array('event'=>null,'msg'=>'','useSession'=>true) we
 		//are called by new mail-app; and we intend to use the stuff passed on by session
-		if ($event == array('event'=>null,'msg'=>'','useSession'=>true))
+		if ($event == array('event'=>null, 'msg'=>'', 'useSession'=>true))
 		{
-			$event=null; // set to null
-			$_usesession=true; // trigger session read
+			$event = null; // set to null
+			$_usesession = true; // trigger session read
 		}
 		if (!is_array($event))
 		{
@@ -1893,7 +1893,7 @@ 
 
 			if (($existing_event = $this->bo->read($event['uid'])) && !$existing_event['deleted'])
 			{
-				switch(strtolower($ical_method))
+				switch (strtolower($ical_method))
 				{
 					case 'reply':
 						// first participant is the one replying (our iCal parser adds owner first!)
@@ -1947,19 +1947,19 @@ 
 			}
 			else	// event not in calendar
 			{
-				$readonlys['button[cancel]'] = true;	// no way to remove a canceled event not in calendar
+				$readonlys['button[cancel]'] = true; // no way to remove a canceled event not in calendar
 			}
 			$event['participant_types'] = array();
-			foreach($event['participants'] as $uid => $status)
+			foreach ($event['participants'] as $uid => $status)
 			{
 				$user_type = $user_id = null;
 				calendar_so::split_user($uid, $user_type, $user_id);
 				$event['participants'][$uid] = $event['participant_types'][$user_type][$user_id] =
-					$status && $status !== 'X' ? $status : 'U';	// X --> no status given --> U = unknown
+					$status && $status !== 'X' ? $status : 'U'; // X --> no status given --> U = unknown
 			}
 			//error_log(__METHOD__."(...) parsed as ".array2string($event));
 			$event['recure'] = $this->bo->recure2string($event);
-			$event['all_participants'] = implode(",\n",$this->bo->participants($event, true));
+			$event['all_participants'] = implode(",\n", $this->bo->participants($event, true));
 
 			// ignore events in the past (for recurring events check enddate!)
 			if ($this->bo->date2ts($event['start']) < $this->bo->now_su &&
@@ -1979,23 +1979,23 @@ 
 			// clear notification errors
 			notifications::errors(true);
 
-			switch($button)
+			switch ($button)
 			{
 				case 'reject':
 					if (!$event['id'])
 					{
 						// send reply to organizer
-						$this->bo->send_update(MSG_REJECTED,array('e'.$event['organizer'] => 'DCHAIR'),$event);
-						break;	// no need to store rejected event
+						$this->bo->send_update(MSG_REJECTED, array('e'.$event['organizer'] => 'DCHAIR'), $event);
+						break; // no need to store rejected event
 					}
 					// fall-through
 				case 'accept':
 				case 'tentativ':
-					$status = strtoupper($button[0]);	// A, R or T
+					$status = strtoupper($button[0]); // A, R or T
 					if (!$event['id'])
 					{
 						// if organizer is a EGroupware user, but we have no rights to organizers calendar
-						if (isset($event['owner']) && !$this->bo->check_perms(EGW_ACL_ADD,0,$event['owner']))
+						if (isset($event['owner']) && !$this->bo->check_perms(EGW_ACL_ADD, 0, $event['owner']))
 						{
 							// --> make organize a participant with role chair and current user the owner
 							$event['participant_types']['u'] = $event['participants'][$event['owner']] =
@@ -2003,7 +2003,7 @@ 
 							$event['owner'] = $this->user;
 						}
 						// store event without notifications!
-						if (($event['id'] = $this->bo->update($event, $ignore_conflicts=true, true, false, true, $msg, true)))
+						if (($event['id'] = $this->bo->update($event, $ignore_conflicts = true, true, false, true, $msg, true)))
 						{
 							$msg[] = lang('Event saved');
 						}
@@ -2041,7 +2041,7 @@ 
 		egw_framework::message(implode("\n", (array)$msg));
 		$readonlys['button[edit]'] = !$event['id'];
 		$event['ics_method'] = $readonlys['ics_method'] = strtolower($ical_method);
-		switch(strtolower($ical_method))
+		switch (strtolower($ical_method))
 		{
 			case 'reply':
 				$event['ics_method_label'] = lang('Reply to meeting request');
@@ -2065,37 +2065,37 @@ 
 	 * @param array $conflicts array with conflicting events, the events are not garantied to be readable by the user!
 	 * @param array $preserv data to preserv
 	 */
-	function conflicts($event,$conflicts,$preserv)
+	function conflicts($event, $conflicts, $preserv)
 	{
-		$etpl = CreateObject('etemplate.etemplate_new','calendar.conflicts');
+		$etpl = CreateObject('etemplate.etemplate_new', 'calendar.conflicts');
 		$allConflicts = array();
 
-		foreach($conflicts as $k => $conflict)
+		foreach ($conflicts as $k => $conflict)
 		{
-			$is_readable = $this->bo->check_perms(EGW_ACL_READ,$conflict);
+			$is_readable = $this->bo->check_perms(EGW_ACL_READ, $conflict);
 
 			$conflicts[$k] += array(
 				'icon_participants' => $is_readable ? (count($conflict['participants']) > 1 ? 'users' : 'single') : 'private',
-				'tooltip_participants' => $is_readable ? implode(', ',$this->bo->participants($conflict)) : '',
-				'time' => $this->bo->long_date($conflict['start'],$conflict['end'],true),
-				'conflicting_participants' => implode(",\n",$this->bo->participants(array(
-					'participants' => array_intersect_key((array)$conflict['participants'],$event['participants']),
-				),true,true)),	// show group invitations too
+				'tooltip_participants' => $is_readable ? implode(', ', $this->bo->participants($conflict)) : '',
+				'time' => $this->bo->long_date($conflict['start'], $conflict['end'], true),
+				'conflicting_participants' => implode(",\n", $this->bo->participants(array(
+					'participants' => array_intersect_key((array)$conflict['participants'], $event['participants']),
+				), true, true)), // show group invitations too
 				'icon_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? 'recur' : '',
 				'text_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? lang('Recurring event') : ' ',
 			);
-				$allConflicts += array_intersect_key((array)$conflict['participants'],$event['participants']);
+				$allConflicts += array_intersect_key((array)$conflict['participants'], $event['participants']);
 			}
 		$content = $event + array(
-			'conflicts' => array_values($conflicts),	// conflicts have id-start as key
+			'conflicts' => array_values($conflicts), // conflicts have id-start as key
 		);
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('Scheduling conflict');
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '.lang('Scheduling conflict');
 		$resources_config = config::read('resources');
 		$readonlys = array();
 
 		foreach (array_keys($allConflicts) as $pId)
 		{
-			if(substr($pId,0,1) == 'r' && $resources_config ) // resources Allow ignore conflicts
+			if (substr($pId, 0, 1) == 'r' && $resources_config) // resources Allow ignore conflicts
 			{
 
 				switch ($resources_config['ignoreconflicts'])
@@ -2115,7 +2115,7 @@ 
 				}
 			}
 		}
-		$etpl->exec('calendar.calendar_uiforms.process_edit',$content,array(),$readonlys,array_merge($event,$preserv),$preserv['no_popup'] ? 0 : 2);
+		$etpl->exec('calendar.calendar_uiforms.process_edit', $content, array(), $readonlys, array_merge($event, $preserv), $preserv['no_popup'] ? 0 : 2);
 	}
 
 	/**
@@ -2133,7 +2133,7 @@ 
 		//$response->addAlert(__METHOD__.'('.array2string($edit_content).')');
 
 		// convert start/end date-time values to timestamps
-		foreach(array('start', 'end') as $name)
+		foreach (array('start', 'end') as $name)
 		{
 			if (!empty($edit_content[$name]))
 			{
@@ -2163,7 +2163,7 @@ 
 			'recur_type'   => $edit_content['recur_type'],
 			'participants' => array(),
 		);
-		foreach($edit_content['participants'] as $key => $data)
+		foreach ($edit_content['participants'] as $key => $data)
 		{
 			if (is_numeric($key) && !$edit_content['participants']['delete'][$data['uid']] &&
 				!$edit_content['participants']['delete'][md5($data['uid'])])
@@ -2178,21 +2178,21 @@ 
 		// default search parameters
 		$content['start_time'] = $edit_content['whole_day'] ? 0 : $this->cal_prefs['workdaystarts'];
 		$content['end_time'] = $this->cal_prefs['workdayends'];
-		if ($this->cal_prefs['workdayends']*HOUR_s < $this->cal_prefs['workdaystarts']*HOUR_s+$content['duration'])
+		if ($this->cal_prefs['workdayends'] * HOUR_s < $this->cal_prefs['workdaystarts'] * HOUR_s + $content['duration'])
 		{
-			$content['end_time'] = 0;	// no end-time limit, as duration would never fit
+			$content['end_time'] = 0; // no end-time limit, as duration would never fit
 		}
 		$content['weekdays'] = MCAL_M_WEEKDAYS;
 
 		$content['search_window'] = 7 * DAY_s;
 
 		// store content in session
-		egw_cache::setSession('calendar','freetimesearch_args_'.(int)$edit_content['id'],$content);
+		egw_cache::setSession('calendar', 'freetimesearch_args_'.(int)$edit_content['id'], $content);
 
 		//menuaction=calendar.calendar_uiforms.freetimesearch&values2url('start,end,duration,participants,recur_type,whole_day'),ft_search,700,500
-		$link = 'calendar.calendar_uiforms.freetimesearch&cal_id='. $edit_content['id'];
+		$link = 'calendar.calendar_uiforms.freetimesearch&cal_id='.$edit_content['id'];
 
-		$response->call('app.calendar.freetime_search_popup',$link);
+		$response->call('app.calendar.freetime_search_popup', $link);
 
 		//$response->addScriptCall('egw_openWindowCentered2',$link,'ft_search',700,500);
 
@@ -2215,26 +2215,26 @@ 
 	{
 		$etpl = new etemplate_new('calendar.freetimesearch');
 		$sel_options['search_window'] = array(
-			7*DAY_s		=> lang('one week'),
-			14*DAY_s	=> lang('two weeks'),
-			31*DAY_s	=> lang('one month'),
-			92*DAY_s	=> lang('three month'),
-			365*DAY_s	=> lang('one year'),
+			7 * DAY_s		=> lang('one week'),
+			14 * DAY_s	=> lang('two weeks'),
+			31 * DAY_s	=> lang('one month'),
+			92 * DAY_s	=> lang('three month'),
+			365 * DAY_s	=> lang('one year'),
 		);
 		if (!is_array($content))
 		{
 			// get content from session (and delete it immediatly)
-			$content = egw_cache::getSession('calendar','freetimesearch_args_'.(int)$_GET['cal_id']);
-			egw_cache::unsetSession('calendar','freetimesearch_args_'.(int)$_GET['cal_id']);
+			$content = egw_cache::getSession('calendar', 'freetimesearch_args_'.(int)$_GET['cal_id']);
+			egw_cache::unsetSession('calendar', 'freetimesearch_args_'.(int)$_GET['cal_id']);
 			//Since the start_time and end_time from calendar_user_preferences are numbers, not timestamp, in order to show them on date-timeonly
 			//widget we need to convert them from numbers to timestamps, only for the first time when we have template without content
 			$sTime = $content['start_time'];
 			$eTime = $content['end_time'];
-			$content['start_time'] = strtotime(((strlen($content['start_time'])<2)?("0".$content['start_time']):$content['start_time']).":00");
-			$content['end_time'] = strtotime(((strlen($content['end_time'])<2)?("0".$content['end_time']):$content['end_time']).":00");
+			$content['start_time'] = strtotime(((strlen($content['start_time']) < 2) ? ("0".$content['start_time']) : $content['start_time']).":00");
+			$content['end_time'] = strtotime(((strlen($content['end_time']) < 2) ? ("0".$content['end_time']) : $content['end_time']).":00");
 
 			// pick a searchwindow fitting the duration (search for a 10 day slot in a one week window never succeeds)
-			foreach(array_keys($sel_options['search_window']) as $window)
+			foreach (array_keys($sel_options['search_window']) as $window)
 			{
 				if ($window > $content['duration'])
 				{
@@ -2261,19 +2261,19 @@ 
 		{
 			$content['msg'] .= lang('Only the initial date of that recuring event is checked!');
 		}
-		$content['freetime'] = $this->freetime($content['participants'],$content['start'],$content['start']+$content['search_window'],$content['duration'],$content['cal_id']);
-		$content['freetime'] = $this->split_freetime_daywise($content['freetime'],$content['duration'],(is_array($content['weekdays'])?$weekds:$content['weekdays']),$sTime,$eTime,$sel_options);
+		$content['freetime'] = $this->freetime($content['participants'], $content['start'], $content['start'] + $content['search_window'], $content['duration'], $content['cal_id']);
+		$content['freetime'] = $this->split_freetime_daywise($content['freetime'], $content['duration'], (is_array($content['weekdays']) ? $weekds : $content['weekdays']), $sTime, $eTime, $sel_options);
 
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('freetime search');
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '.lang('freetime search');
 
 		$sel_options['duration'] = $this->durations;
 		if ($content['duration'] && isset($sel_options['duration'][$content['duration']])) $content['end'] = '';
 
-		$etpl->exec('calendar.calendar_uiforms.freetimesearch',$content,$sel_options,NULL,array(
+		$etpl->exec('calendar.calendar_uiforms.freetimesearch', $content, $sel_options, NULL, array(
 				'participants'	=> $content['participants'],
 				'cal_id'		=> $content['cal_id'],
 				'recur_type'	=> $content['recur_type'],
-			),2);
+			), 2);
 	}
 
 	/**
@@ -2286,15 +2286,15 @@ 
 	 * @param int $cal_id own id for existing events, to exclude them from being busy-time, default 0
 	 * @return array of free time-slots: array with start and end values
 	 */
-	function freetime($participants,$start,$end,$duration=1,$cal_id=0)
+	function freetime($participants, $start, $end, $duration = 1, $cal_id = 0)
 	{
-		if ($this->debug > 2) $this->bo->debug_message(__METHOD__.'(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5)',true,$participants,$start,$end,$duration,$cal_id);
+		if ($this->debug > 2) $this->bo->debug_message(__METHOD__.'(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5)', true, $participants, $start, $end, $duration, $cal_id);
 
 		$busy = $this->bo->search(array(
 			'start' => $start,
 			'end'	=> $end,
 			'users'	=> $participants,
-			'ignore_acl' => true,	// otherwise we get only events readable by the user
+			'ignore_acl' => true, // otherwise we get only events readable by the user
 		));
 		$busy[] = array(	// add end-of-search-date as event, to cope with empty search and get freetime til that date
 			'start'	=> $end,
@@ -2303,15 +2303,15 @@ 
 		$ft_start = $start;
 		$freetime = array();
 		$n = 0;
-		foreach($busy as $event)
+		foreach ($busy as $event)
 		{
-			if ((int)$cal_id && $event['id'] == (int)$cal_id) continue;	// ignore our own event
+			if ((int)$cal_id && $event['id'] == (int)$cal_id) continue; // ignore our own event
 
  			if ($event['non_blocking']) continue; // ignore non_blocking events
 
 			// check if from all wanted participants at least one has a not rejected status in found event
 			$non_rejected_found = false;
-			foreach($participants as $uid)
+			foreach ($participants as $uid)
 			{
 				if ($event['participants'][$uid] == 'R') continue;
 
@@ -2327,10 +2327,10 @@ 
 
 			if ($this->debug)
 			{
-				echo "<p>ft_start=".date('D d.m.Y H:i',$ft_start)."<br>\n";
+				echo "<p>ft_start=".date('D d.m.Y H:i', $ft_start)."<br>\n";
 				echo "event[title]=$event[title]<br>\n";
-				echo "event[start]=".date('D d.m.Y H:i',$event['start'])."<br>\n";
-				echo "event[end]=".date('D d.m.Y H:i',$event['end'])."<br>\n";
+				echo "event[start]=".date('D d.m.Y H:i', $event['start'])."<br>\n";
+				echo "event[end]=".date('D d.m.Y H:i', $event['end'])."<br>\n";
 			}
 			// $events ends before our actual position ==> ignore it
 			if ($event['end'] < $ft_start)
@@ -2354,11 +2354,11 @@ 
 					'start'	=> $ft_start,
 					'end'	=> $ft_end,
 				);
-				if ($this->debug > 1) echo "<p>freetime: ".date('D d.m.Y H:i',$ft_start)." - ".date('D d.m.Y H:i',$ft_end)."</p>\n";
+				if ($this->debug > 1) echo "<p>freetime: ".date('D d.m.Y H:i', $ft_start)." - ".date('D d.m.Y H:i', $ft_end)."</p>\n";
 			}
 			$ft_start = $event['end'];
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6',true,$participants,$start,$end,$duration,$cal_id,$freetime);
+		if ($this->debug > 0) $this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6', true, $participants, $start, $end, $duration, $cal_id, $freetime);
 
 		return $freetime;
 	}
@@ -2378,46 +2378,46 @@ 
 	 */
 	function split_freetime_daywise($freetime, $duration, $weekdays, $_start_time, $_end_time, &$sel_options)
 	{
-		if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(freetime=%1, duration=%2, start_time=%3, end_time=%4)',true,$freetime,$duration,$_start_time,$_end_time);
+		if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(freetime=%1, duration=%2, start_time=%3, end_time=%4)', true, $freetime, $duration, $_start_time, $_end_time);
 
 		$freetime_daywise = array();
 		if (!is_array($sel_options)) $sel_options = array();
 		$time_format = $this->common_prefs['timeformat'] == 12 ? 'h:i a' : 'H:i';
 
-		$start_time = (int) $_start_time;	// ignore leading zeros
-		$end_time   = (int) $_end_time;
+		$start_time = (int)$_start_time; // ignore leading zeros
+		$end_time   = (int)$_end_time;
 
 		// ignore the end_time, if duration would never fit
-		if (($end_time - $start_time)*HOUR_s < $duration)
+		if (($end_time - $start_time) * HOUR_s < $duration)
 		{
 			$end_time = 0;
-			if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(, duration=%2, start_time=%3,..) end_time set to 0, it never fits durationn otherwise',true,$duration,$start_time);
+			if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(, duration=%2, start_time=%3,..) end_time set to 0, it never fits durationn otherwise', true, $duration, $start_time);
 		}
 		$n = 0;
-		foreach($freetime as $ft)
+		foreach ($freetime as $ft)
 		{
 			$adaybegin = $this->bo->date2array($ft['start']);
 			$adaybegin['hour'] = $adaybegin['minute'] = $adaybegin['second'] = 0;
 			unset($adaybegin['raw']);
 			$daybegin = $this->bo->date2ts($adaybegin);
 
-			for($t = $daybegin; $t < $ft['end']; $t += DAY_s,$daybegin += DAY_s)
+			for ($t = $daybegin; $t < $ft['end']; $t += DAY_s, $daybegin += DAY_s)
 			{
-				$dow = date('w',$daybegin+DAY_s/2);	// 0=Sun, .., 6=Sat
-				$mcal_dow = pow(2,$dow);
-				if (!($weekdays & $mcal_dow))
+				$dow = date('w', $daybegin + DAY_s / 2); // 0=Sun, .., 6=Sat
+				$mcal_dow = pow(2, $dow);
+				if (!($weekdays&$mcal_dow))
 				{
 					//echo "wrong day of week $dow<br>\n";
-					continue;	// wrong day of week
+					continue; // wrong day of week
 				}
 				$start = $t < $ft['start'] ? $ft['start'] : $t;
 
-				if ($start-$daybegin < $start_time*HOUR_s)	// start earlier then start_time
+				if ($start - $daybegin < $start_time * HOUR_s)	// start earlier then start_time
 				{
-					$start = $daybegin + $start_time*HOUR_s;
+					$start = $daybegin + $start_time * HOUR_s;
 				}
 				// if end_time given use it, else the original slot's end
-				$end = $end_time ? $daybegin + $end_time*HOUR_s : $ft['end'];
+				$end = $end_time ? $daybegin + $end_time * HOUR_s : $ft['end'];
 				if ($end > $ft['end']) $end = $ft['end'];
 
 				// slot to small for duration
@@ -2431,11 +2431,11 @@ 
 					'end'	=> $end,
 				);
 				$times = array();
-				for ($s = $start; $s+$duration <= $end && $s < $daybegin+DAY_s; $s += 60*$this->cal_prefs['interval'])
+				for ($s = $start; $s + $duration <= $end && $s < $daybegin + DAY_s; $s += 60 * $this->cal_prefs['interval'])
 				{
 					$e = $s + $duration;
-					$end_date = $e-$daybegin > DAY_s ? lang(date('l',$e)).' '.date($this->common_prefs['dateformat'],$e).' ' : '';
-					$times[$s] = date($time_format,$s).' - '.$end_date.date($time_format,$e);
+					$end_date = $e - $daybegin > DAY_s ? lang(date('l', $e)).' '.date($this->common_prefs['dateformat'], $e).' ' : '';
+					$times[$s] = date($time_format, $s).' - '.$end_date.date($time_format, $e);
 				}
 				$sel_options[$n.'start'] = $times;
 			}
@@ -2450,13 +2450,13 @@ 
 	 * @param boolean $return_error should an error-msg be returned or a regular page with it generated (default)
 	 * @return string error-msg if $return_error
 	 */
-	function export($content=0,$return_error=false)
+	function export($content = 0, $return_error = false)
 	{
         $boical = new calendar_ical();
 		#error_log(__METHOD__.print_r($content,true));
 		if (is_numeric($cal_id = $content ? $content : $_REQUEST['cal_id']))
 		{
-			if (!($ical =& $boical->exportVCal(array($cal_id),'2.0','PUBLISH',false)))
+			if (!($ical = & $boical->exportVCal(array($cal_id), '2.0', 'PUBLISH', false)))
 			{
 				$msg = lang('Permission denied');
 
@@ -2464,20 +2464,20 @@ 
 			}
 			else
 			{
-				html::content_header('event.ics','text/calendar',bytes($ical));
+				html::content_header('event.ics', 'text/calendar', bytes($ical));
 				echo $ical;
 				common::egw_exit();
 			}
 		}
 		if (is_array($content))
 		{
-			$events =& $this->bo->search(array(
+			$events = & $this->bo->search(array(
 				'start' => $content['start'],
 				'end'   => $content['end'],
 				'enum_recuring' => false,
 				'daywise'       => false,
 				'owner'         => $this->owner,
-				'date_format'   => 'server',	// timestamp in server time for boical class
+				'date_format'   => 'server', // timestamp in server time for boical class
 			));
 			if (!$events)
 			{
@@ -2485,8 +2485,8 @@ 
 			}
 			else
 			{
-				$ical =& $boical->exportVCal($events,'2.0','PUBLISH',false);
-				html::content_header($content['file'] ? $content['file'] : 'event.ics','text/calendar',bytes($ical));
+				$ical = & $boical->exportVCal($events, '2.0', 'PUBLISH', false);
+				html::content_header($content['file'] ? $content['file'] : 'event.ics', 'text/calendar', bytes($ical));
 				echo $ical;
 				common::egw_exit();
 			}
@@ -2502,9 +2502,9 @@ 
 		}
 		$content['msg'] = $msg;
 
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Export');
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '.lang('iCal Export');
 		$etpl = new etemplate_new('calendar.export');
-		$etpl->exec('calendar.calendar_uiforms.export',$content);
+		$etpl->exec('calendar.calendar_uiforms.export', $content);
 	}
 
 	/**
@@ -2512,25 +2512,25 @@ 
 	 *
 	 * @param array $content submitted content from etempalte::exec
 	 */
-	function import($content=null)
+	function import($content = null)
 	{
 		if (is_array($content))
 		{
 			if (is_array($content['ical_file']) && is_uploaded_file($content['ical_file']['tmp_name']))
 			{
-				@set_time_limit(0);	// try switching execution time limit off
+				@set_time_limit(0); // try switching execution time limit off
 				$start = microtime(true);
 
 				$calendar_ical = new calendar_ical;
 				$calendar_ical->setSupportedFields('file', '');
-				if (!$calendar_ical->importVCal($f=fopen($content['ical_file']['tmp_name'],'r')))
+				if (!$calendar_ical->importVCal($f = fopen($content['ical_file']['tmp_name'], 'r')))
 				{
 					$msg = lang('Error: importing the iCal');
 				}
 				else
 				{
 					$msg = lang('iCal successful imported').' '.lang('(%1 events in %2 seconds)',
-						$calendar_ical->events_imported,number_format(microtime(true)-$start,1));
+						$calendar_ical->events_imported, number_format(microtime(true) - $start, 1));
 				}
 				if ($f) fclose($f);
 			}
@@ -2539,7 +2539,7 @@ 
 				$msg = lang('You need to select an iCal file first');
 			}
 		}
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Import');
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '.lang('iCal Import');
 		$etpl = new etemplate_new('calendar.import');
 
 		$etpl->exec('calendar.calendar_uiforms.import', array(
@@ -2552,7 +2552,7 @@ 
 	 *
 	 * @param array $_content
 	 */
-	function cat_acl(array $_content=null)
+	function cat_acl(array $_content = null)
 	{
 		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
@@ -2564,15 +2564,15 @@ 
 			unset($_content['button']);
 			if ($button != 'cancel')	// store changed acl
 			{
-				foreach($_content as $data)
+				foreach ($_content as $data)
 				{
 					if (!($cat_id = $data['cat_id'])) continue;
-					foreach(array_merge((array)$data['add'],(array)$data['status'],array_keys((array)$data['old'])) as $account_id)
+					foreach (array_merge((array)$data['add'], (array)$data['status'], array_keys((array)$data['old'])) as $account_id)
 					{
 						$rights = 0;
-						if (in_array($account_id,(array)$data['add'])) $rights |= calendar_boupdate::CAT_ACL_ADD;
-						if (in_array($account_id,(array)$data['status'])) $rights |= calendar_boupdate::CAT_ACL_STATUS;
-						if ($account_id) $this->bo->set_cat_rights($cat_id,$account_id,$rights);
+						if (in_array($account_id, (array)$data['add'])) $rights |= calendar_boupdate::CAT_ACL_ADD;
+						if (in_array($account_id, (array)$data['status'])) $rights |= calendar_boupdate::CAT_ACL_STATUS;
+						if ($account_id) $this->bo->set_cat_rights($cat_id, $account_id, $rights);
 					}
 				}
 			}
@@ -2584,20 +2584,20 @@ 
 				), 'admin');
 			}
 		}
-		$content= $preserv = array();
+		$content = $preserv = array();
 		$n = 1;
-		foreach($this->bo->get_cat_rights() as $Lcat_id => $data)
+		foreach ($this->bo->get_cat_rights() as $Lcat_id => $data)
 		{
-			$cat_id = substr($Lcat_id,1);
+			$cat_id = substr($Lcat_id, 1);
 			$row = array(
 				'cat_id' => $cat_id,
 				'add' => array(),
 				'status' => array(),
 			);
-			foreach($data as $account_id => $rights)
+			foreach ($data as $account_id => $rights)
 			{
-				if ($rights & calendar_boupdate::CAT_ACL_ADD) $row['add'][] = $account_id;
-				if ($rights & calendar_boupdate::CAT_ACL_STATUS) $row['status'][] = $account_id;
+				if ($rights&calendar_boupdate::CAT_ACL_ADD) $row['add'][] = $account_id;
+				if ($rights&calendar_boupdate::CAT_ACL_STATUS) $row['status'][] = $account_id;
 			}
 			$content[$n] = $row;
 			$preserv[$n] = array(
@@ -2612,7 +2612,7 @@ 
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Calendar').' - '.lang('Category ACL');
 		$tmp = new etemplate_new('calendar.cat_acl');
-		$tmp->exec('calendar.calendar_uiforms.cat_acl',$content,null,$readonlys,$preserv);
+		$tmp->exec('calendar.calendar_uiforms.cat_acl', $content, null, $readonlys, $preserv);
 	}
 
 	/**
@@ -2662,18 +2662,18 @@ 
 
 
 		// Get participants for only this one, if it's recurring.  The date is on the end of the value.
-		if($content['recur_type'] || $content['recurrence'])
+		if ($content['recur_type'] || $content['recurrence'])
 		{
 			$content['history']['filter'] = array(
 				'(history_status NOT LIKE \'participants%\' OR (history_status LIKE \'participants%\' AND (
-					history_new_value LIKE \'%' . bo_tracking::ONE2N_SEPERATOR . $content['recurrence'] . '\' OR
-					history_old_value LIKE \'%' . bo_tracking::ONE2N_SEPERATOR . $content['recurrence'] . '\')))'
+					history_new_value LIKE \'%' . bo_tracking::ONE2N_SEPERATOR.$content['recurrence'].'\' OR
+					history_old_value LIKE \'%' . bo_tracking::ONE2N_SEPERATOR.$content['recurrence'].'\')))'
 			);
 		}
 
 		// Translate labels
 		$tracking = new calendar_tracking();
-		foreach($tracking->field2label as $field => $label)
+		foreach ($tracking->field2label as $field => $label)
 		{
 			$sel_options[$status][$field] = lang($label);
 		}
@@ -2690,20 +2690,20 @@ 
 	 * @param string $durationT the duration to support resizable calendar event
 	 * @return string XML response if no error occurs
 	 */
-	function ajax_moveEvent($_eventId,$calendarOwner,$targetDateTime,$targetOwner,$durationT=null)
+	function ajax_moveEvent($_eventId, $calendarOwner, $targetDateTime, $targetOwner, $durationT = null)
 	{
 		// we do not allow dragging into another users calendar ATM
-		if(!$calendarOwner == $targetOwner)
+		if (!$calendarOwner == $targetOwner)
 		{
 			return false;
 		}
 
-		list($eventId, $date) = explode(':', $_eventId,2);
+		list($eventId, $date) = explode(':', $_eventId, 2);
 
-		$old_event=$event=$this->bo->read($eventId);
+		$old_event = $event = $this->bo->read($eventId);
 		if (!$durationT)
 		{
-			$duration=$event['end']-$event['start'];
+			$duration = $event['end'] - $event['start'];
 		}
 		else
 		{
@@ -2712,13 +2712,13 @@ 
 
 		$event['start'] = $this->bo->date2ts($targetDateTime);
 
-		$event['end'] = $event['start']+$duration;
+		$event['end'] = $event['start'] + $duration;
 
 		if ($event['recur_type'] != MCAL_RECUR_NONE && $date)
 		{
 			// calculate offset against clicked recurrance,
 			// depending on which is smaller
-			$offset = egw_time::to($targetDateTime,'ts') - egw_time::to($date,'ts');
+			$offset = egw_time::to($targetDateTime, 'ts') - egw_time::to($date, 'ts');
 			$event['start'] = $old_event['start'] + $offset;
 			$event['duration'] = $duration;
 
@@ -2728,13 +2728,13 @@ 
 		}
 		$status_reset_to_unknown = false;
 		$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
-		foreach((array)$event['participants'] as $uid => $status)
+		foreach ((array)$event['participants'] as $uid => $status)
 		{
 			$q = $r = null;
-			calendar_so::split_status($status,$q,$r);
+			calendar_so::split_status($status, $q, $r);
 			if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
 			{
-				$preferences = CreateObject('phpgwapi.preferences',$uid);
+				$preferences = CreateObject('phpgwapi.preferences', $uid);
 				$part_prefs = $preferences->read_repository();
 				switch ($part_prefs['calendar']['reset_stati'])
 				{
@@ -2744,18 +2744,18 @@ 
 						if ($sameday) break;
 					default:
 						$status_reset_to_unknown = true;
-						$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
+						$event['participants'][$uid] = calendar_so::combine_status('U', $q, $r);
 						// todo: report reset status to user
 				}
 			}
 		}
 
-		$conflicts=$this->bo->update($event);
+		$conflicts = $this->bo->update($event);
 
 		$response = egw_json_response::get();
-		if(!is_array($conflicts))
+		if (!is_array($conflicts))
 		{
-			$response->redirect(egw::link('/index.php',array(
+			$response->redirect(egw::link('/index.php', array(
 				'menuaction' => $this->view_menuaction,
 			)));
 		}
@@ -2769,16 +2769,16 @@ 
 					.'&end='.$event['end']
 					.'&non_interactive=true'
 					.'&cancel_needs_refresh=true',
-				'',750,410);
+				'', 750, 410);
 		}
 		if ($status_reset_to_unknown)
 		{
-			foreach((array)$event['participants'] as $uid => $status)
+			foreach ((array)$event['participants'] as $uid => $status)
 			{
 				if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user)
 				{
-					calendar_so::split_status($status,$q,$r);
-					$status = calendar_so::combine_status('U',$q,$r);
+					calendar_so::split_status($status, $q, $r);
+					$status = calendar_so::combine_status('U', $q, $r);
 					$this->bo->set_status($event['id'], $uid, $status, 0, true);
 				}
 			}
@@ -2796,35 +2796,35 @@ 
 		// Arbitrarily limited to 50 / resource
 		$options = array('start' => 0, 'num_rows' => 50);
 		$results = array();
-		if($query)
+		if ($query)
 		{
-			$resources = array_merge(array('' => $this->bo->resources['']),$this->bo->resources);
-			foreach($resources as $type => $data)
+			$resources = array_merge(array('' => $this->bo->resources['']), $this->bo->resources);
+			foreach ($resources as $type => $data)
 			{
 				$mapped = array();
 				$_results = array();
 
 				// Handle accounts seperately
-				if($type == '')
+				if ($type == '')
 				{
 					$list = array('accounts', 'owngroups');
-					foreach($list as $a_type)
+					foreach ($list as $a_type)
 					{
 						$account_options = $options + array('account_type' => $a_type);
-						$_results += accounts::link_query('',$account_options);
+						$_results += accounts::link_query('', $account_options);
 					}
 					$_results = array_intersect_key($_results, $GLOBALS['egw']->acl->get_grants('calendar'));
 				}
 				else if ($data['app'] && egw_link::get_registry($data['app'], 'query'))
 				{
-					$_results = egw_link::query($data['app'], $query,$options);
+					$_results = egw_link::query($data['app'], $query, $options);
 				}
-				if(!$_results) continue;
+				if (!$_results) continue;
 				$_results = array_unique($_results);
 
-				foreach($_results as $id => $title)
+				foreach ($_results as $id => $title)
 				{
-					if($id && $title)
+					if ($id && $title)
 					{
 						// Magicsuggest uses id, not value.
 						$value = array(
@@ -2833,14 +2833,14 @@ 
 							'label' => $title,
 							'app'	=> lang($data['app'])
 						);
-						if(is_array($value['label']))
+						if (is_array($value['label']))
 						{
 							$value = array_merge($value, $value['label']);
 						}
 						$mapped[] = $value;
 					}
 				}
-				if(count($mapped))
+				if (count($mapped))
 				{
 					$results = array_merge($results, $mapped);
 				}
@@ -2860,13 +2860,13 @@ 
 	 * @param array $mailContent = null mail content
 	 * @return  array
 	 */
-	function mail_import(array $mailContent=null)
+	function mail_import(array $mailContent = null)
 	{
 		// It would get called from compose as a popup with egw_data
 		if (!is_array($mailContent) && ($_GET['egw_data']))
 		{
 			// get raw mail data
-			egw_link::get_data ($_GET['egw_data']);
+			egw_link::get_data($_GET['egw_data']);
 			return false;
 		}
 
@@ -2876,7 +2876,7 @@ 
 			$AB = new addressbook_bo();
 			$accounts = array(0 => $GLOBALS['egw_info']['user']['account_id']);
 
-			$participants[0] = array (
+			$participants[0] = array(
 				'uid' => $GLOBALS['egw_info']['user']['account_id'],
 				'delete_id' => $GLOBALS['egw_info']['user']['account_id'],
 				'status' => 'A',
@@ -2884,23 +2884,23 @@ 
 				'app' => 'User',
 				'role' => 'REQ-PARTICIPANT'
 			);
-			foreach($mailContent['addresses'] as $address)
+			foreach ($mailContent['addresses'] as $address)
 			{
 				// Get available contacts from the email
 				$contacts = $AB->search(array(
 						'email' => $address['email'],
 						'email_home' => $address['email']
-					),'contact_id,contact_email,contact_email_home,egw_addressbook.account_id as account_id','','','',false,'OR',false,array('owner' => 0),'',false);
+					), 'contact_id,contact_email,contact_email_home,egw_addressbook.account_id as account_id', '', '', '', false, 'OR', false, array('owner' => 0), '', false);
 				if (is_array($contacts))
 				{
-					foreach($contacts as $account)
+					foreach ($contacts as $account)
 					{
 						$accounts[] = $account['account_id'];
 					}
 				}
 				else
 				{
-					$participants []= array (
+					$participants [] = array(
 						'app' => 'email',
 						'uid' => 'e'.$address['email'],
 						'status' => 'U',
@@ -2908,7 +2908,7 @@ 
 					);
 				}
 			}
-			$participants = array_merge($participants , array(
+			$participants = array_merge($participants, array(
 				"account" => $accounts,
 				"role" => "REQ-PARTICIPANT",
 				"add" => "pressed"
@@ -2932,14 +2932,14 @@ 
 			{
 				foreach ($mailContent['attachments'] as $attachment)
 				{
-					if($attachment['egw_data'])
+					if ($attachment['egw_data'])
 					{
-						egw_link::link('calendar',$event['link_to']['to_id'],egw_link::DATA_APPNAME,  $attachment);
+						egw_link::link('calendar', $event['link_to']['to_id'], egw_link::DATA_APPNAME, $attachment);
 					}
-					else if(is_readable($attachment['tmp_name']) ||
+					else if (is_readable($attachment['tmp_name']) ||
 						(egw_vfs::is_readable($attachment['tmp_name']) && parse_url($attachment['tmp_name'], PHP_URL_SCHEME) === 'vfs'))
 					{
-						egw_link::link('calendar',$event['link_to']['to_id'],'file',  $attachment);
+						egw_link::link('calendar', $event['link_to']['to_id'], 'file', $attachment);
 					}
 				}
 			}

Braces +287 added lines, -73 removed lines

@@ -94,7 +94,9 @@ 
 		if (!$owner || !is_numeric($owner) || $GLOBALS['egw']->accounts->get_type($owner) != 'u' ||
 			!$this->bo->check_perms(EGW_ACL_ADD,0,$owner))
 		{
-			if ($owner)	// make an owner who is no user or we have no add-rights a participant
+			if ($owner)
+			{
+				// make an owner who is no user or we have no add-rights a participant
 			{
 				// if we come from ressources we don't need any users selected in calendar
 				if (!isset($_GET['participants']) || $_GET['participants'][0] != 'r')
@@ -105,6 +107,7 @@ 
 						if (is_numeric($uid) || $owner == $uid)
 						{
 							$extra_participants[] = $uid;
+			}
 						}
 					}
 				}
@@ -126,9 +129,17 @@ 
 		$participant_types['u'] = $participant_types = $participants = array();
 		foreach($extra_participants as $uid)
 		{
-			if (isset($participants[$uid])) continue;	// already included
+			if (isset($participants[$uid]))
+			{
+				continue;
+			}
+			// already included
 
-			if (!$this->bo->check_acl_invite($uid)) continue;	// no right to invite --> ignored
+			if (!$this->bo->check_acl_invite($uid))
+			{
+				continue;
+			}
+			// no right to invite --> ignored
 
 			if (is_numeric($uid))
 			{
@@ -156,10 +167,13 @@ 
 				}
 			}
 		}
-		if (!$participants)	// if all participants got removed, include current user
+		if (!$participants)
+		{
+			// if all participants got removed, include current user
 		{
 			$participants[$this->user] = $participant_types['u'][$this->user] = calendar_so::combine_status('A',1,'CHAIR');
 		}
+		}
 		$alarms = array();
 		// if default alarm set in prefs --> add it
 		// we assume here that user does NOT have a whole-day but no regular default-alarm, no whole-day!
@@ -198,16 +212,23 @@ 
 	 */
 	function process_edit($content)
 	{
-		if (!is_array($content))	// redirect from etemplate, if POST empty
+		if (!is_array($content))
+		{
+			// redirect from etemplate, if POST empty
 		{
 			return $this->edit(null,null,strip_tags($_GET['msg']));
 		}
+		}
 		// clear notification errors
 		notifications::errors(true);
 		$messages = null;
 		$msg_permission_denied_added = false;
 		list($button) = @each($content['button']);
-		if (!$button && $content['action']) $button = $content['action'];	// action selectbox
+		if (!$button && $content['action'])
+		{
+			$button = $content['action'];
+		}
+		// action selectbox
 		unset($content['button']); unset($content['action']);
 
 		$view = $content['view'];
@@ -220,7 +241,10 @@ 
 		{
 			list($date) = each($content['recur_exception']['delete_exception']);
 			// eT2 converts time to
-			if (!is_numeric($date)) $date = egw_time::to (str_replace('Z','', $date), 'ts');
+			if (!is_numeric($date))
+			{
+				$date = egw_time::to (str_replace('Z','', $date), 'ts');
+			}
 			unset($content['recur_exception']['delete_exception']);
 			if (($key = array_search($date,$content['recur_exception'])) !== false)
 			{
@@ -229,7 +253,10 @@ 
 				foreach ($recur_exceptions as $id)
 				{
 					if (!($exception = $this->bo->read($id)) ||
-							$exception['recurrence'] != $content['recur_exception'][$key]) continue;
+							$exception['recurrence'] != $content['recur_exception'][$key])
+					{
+						continue;
+					}
 					$exception['uid'] = common::generate_uid('calendar', $id);
 					$exception['reference'] = $exception['recurrence'] = 0;
 					$this->bo->update($exception, true, true,false,true,$messages,$content['no_notifications']);
@@ -303,7 +330,10 @@ 
 				$event['end'] = $this->bo->date2ts($event['end']);
 			}
 			// some checks for recurrences, if you give a date, make it a weekly repeating event and visa versa
-			if ($event['recur_type'] == MCAL_RECUR_NONE && $event['recur_data']) $event['recur_type'] = MCAL_RECUR_WEEKLY;
+			if ($event['recur_type'] == MCAL_RECUR_NONE && $event['recur_data'])
+			{
+				$event['recur_type'] = MCAL_RECUR_WEEKLY;
+			}
 			if ($event['recur_type'] == MCAL_RECUR_WEEKLY && !$event['recur_data'])
 			{
 				$event['recur_data'] = 1 << (int)date('w',$event['start']);
@@ -355,9 +385,12 @@ 
 							break;
 
 						case 'resource':
-							if (is_array($data))	// if $data['current'] is NOT set --> $app==''
+							if (is_array($data))
+							{
+								// if $data['current'] is NOT set --> $app==''
 							{
 								list($app,$id) = explode(':',$data['current']);
+							}
 								if(!$app && !$id)
 								{
 									$app = $data['app'];
@@ -370,7 +403,10 @@ 
 							}
 							foreach($this->bo->resources as $type => $data)
 							{
-								if ($data['app'] == $app) break;
+								if ($data['app'] == $app)
+								{
+									break;
+								}
 							}
 							$uid = $this->bo->resources[$type]['app'] == $app ? $type.$id : false;
 							if ($app == 'home-accounts')
@@ -432,7 +468,11 @@ 
 							break;
 
 						default:		// existing participant row
-							if (!is_array($data)) continue;	// widgets in participant tab, above participant list
+							if (!is_array($data))
+							{
+								continue;
+							}
+							// widgets in participant tab, above participant list
 							foreach(array('uid','status','quantity','role') as $name)
 							{
 								$$name = $data[$name];
@@ -561,7 +601,10 @@ 
 			{
 				foreach($participants as $id => &$response)
 				{
-					if($type == 'u' && $id == $event['owner']) continue;
+					if($type == 'u' && $id == $event['owner'])
+					{
+						continue;
+					}
 					calendar_so::split_status($response, $quantity, $role);
 					// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
 					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
@@ -643,17 +686,23 @@ 
 			{
 				foreach (array_keys($event['participants']) as $uid)
 				{
-					if ($uid[0] == 'r') //ressource detection
+					if ($uid[0] == 'r')
+					{
+						//ressource detection
 					{
 						$msg = lang('Error: ressources reservation in private events is not allowed!!!');
+					}
 						$button = '';
 						break 2; //break foreach and case
 					}
 				}
 			}
-			if ($content['edit_single'])	// we edited a single event from a series
+			if ($content['edit_single'])
+			{
+				// we edited a single event from a series
 			{
 				$event['reference'] = $event['id'];
+			}
 				$event['recurrence'] = $content['edit_single'];
 				unset($event['id']);
 				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
@@ -803,7 +852,10 @@ 
 										case 'no':
 											break;
 										case 'startday':
-											if ($sameday) break;
+											if ($sameday)
+											{
+												break;
+											}
 										default:
 											$status_reset_to_unknown = true;
 											$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
@@ -940,7 +992,10 @@ 
 				if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
 				{
 					$msg = lang('Series deleted');
-					if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					if ($exceptions_kept)
+					{
+						$msg .= lang(', exceptions preserved');
+					}
 				}
 				else
 				{
@@ -976,11 +1031,14 @@ 
 				{
 					$msg = lang("Can't add alarms in the past !!!");
 				}
-				elseif ($event['id'])	// save the alarm immediatly
+				elseif ($event['id'])
+				{
+					// save the alarm immediatly
 				{
 					if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
 					{
 						$alarm['id'] = $alarm_id;
+				}
 						$event['alarm'][$alarm_id] = $alarm;
 
 						$msg = lang('Alarm added');
@@ -993,7 +1051,9 @@ 
 				}
 				else
 				{
-					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
+					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++)
+					{
+}	// get a temporary non-conflicting, numeric id
 					$event['alarm'][$alarm['id']] = $alarm;
 				}
 			}
@@ -1010,10 +1070,13 @@ 
 		}
 		if (in_array($button,array('cancel','save','delete','delete_exceptions','delete_keep_exceptions')) && $noerror)
 		{
-			if ($content['lock_token'])	// remove an existing lock
+			if ($content['lock_token'])
+			{
+				// remove an existing lock
 			{
 				egw_vfs::unlock(egw_vfs::app_entry_lock_path('calendar',$content['id']),$content['lock_token'],false);
 			}
+			}
 			if ($content['no_popup'])
 			{
 				egw::redirect_link('/index.php',array(
@@ -1118,8 +1181,7 @@ 
 		if (egw_time::to($old_event['start'],'Ymd') < egw_time::to($as_of_date,'Ymd') ||
 			// Adjust for requested date in the past
 			egw_time::to($as_of_date,'ts') < time()
-		)
-		{
+		) {
 
 			unset($orig_event);
 			// copy event by unsetting the id(s)
@@ -1207,32 +1269,50 @@ 
 		foreach($event['participants'] as $uid => $status)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$uid.':'.array2string($status));
-			if (empty($status)) continue;
+			if (empty($status))
+			{
+				continue;
+			}
 			$toadd = '';
-			if ((isset($status['status']) && $status['status'] == 'R') || (isset($status['uid']) && $status['uid'] == $this->user)) continue;
+			if ((isset($status['status']) && $status['status'] == 'R') || (isset($status['uid']) && $status['uid'] == $this->user))
+			{
+				continue;
+			}
 
 			if (isset($status['uid']) && is_numeric($status['uid']) && $GLOBALS['egw']->accounts->get_type($status['uid']) == 'u')
 			{
-				if (!($email = $GLOBALS['egw']->accounts->id2name($status['uid'],'account_email'))) continue;
+				if (!($email = $GLOBALS['egw']->accounts->id2name($status['uid'],'account_email')))
+				{
+					continue;
+				}
 
 				$lid = $firstname = $lastname = null;
 				$GLOBALS['egw']->accounts->get_account_name($status['uid'],$lid,$firstname,$lastname);
 
 				$toadd = $firstname.' '.$lastname.' <'.$email.'>';
-				if (!in_array($toadd,$to)) $to[] = $toadd;
+				if (!in_array($toadd,$to))
+				{
+					$to[] = $toadd;
+				}
 				//error_log(__METHOD__.__LINE__.array2string($to));
 			}
 			elseif ($uid < 0)
 			{
 				foreach($GLOBALS['egw']->accounts->members($uid,true) as $uid)
 				{
-					if (!($email = $GLOBALS['egw']->accounts->id2name($uid,'account_email'))) continue;
+					if (!($email = $GLOBALS['egw']->accounts->id2name($uid,'account_email')))
+					{
+						continue;
+					}
 
 					$GLOBALS['egw']->accounts->get_account_name($uid,$lid,$firstname,$lastname);
 
 					$toadd = $firstname.' '.$lastname.' <'.$email.'>';
 					// dont add groupmembers if they already rejected the event, or are the current user
-					if (!in_array($toadd,$to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user)) $to[] = $toadd;
+					if (!in_array($toadd,$to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user))
+					{
+						$to[] = $toadd;
+					}
 					//error_log(__METHOD__.__LINE__.array2string($to));
 				}
 			}
@@ -1285,7 +1365,10 @@ 
 			'preset[type]'    => 'text/calendar'.($asrequest?'; method=REQUEST':''),
 			'preset[size]'    => filesize($ics_file),
 		);
-		if ($asrequest) $vars['preset[msg]'] = lang('You attempt to mail a meetingrequest to the recipients above. Depending on the client this mail is opened with, the recipient may or may not see the mailbody below, but only see the meeting request attached.');
+		if ($asrequest)
+		{
+			$vars['preset[msg]'] = lang('You attempt to mail a meetingrequest to the recipients above. Depending on the client this mail is opened with, the recipient may or may not see the mailbody below, but only see the meeting request attached.');
+		}
 		$response = egw_json_response::get();
 		$response->call('app.calendar.custom_mail', $vars);
 	}
@@ -1471,8 +1554,12 @@ 
 				}
 			}
 			// set new start and end if given by $_GET
-			if(isset($_GET['start'])) { $event['start'] = $_GET['start']; }
-			if(isset($_GET['end'])) { $event['end'] = $_GET['end']; }
+			if(isset($_GET['start']))
+			{
+$event['start'] = $_GET['start']; }
+			if(isset($_GET['end']))
+			{
+$event['end'] = $_GET['end']; }
 			// check if the event is the whole day
 			$start = $this->bo->date2array($event['start']);
 			$end = $this->bo->date2array($event['end']);
@@ -1485,10 +1572,13 @@ 
 				foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 				{
 					$link_id = $link_ids[$n];
-					if(!preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// guard against XSS
+					if(!preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))
+					{
+						// guard against XSS
 					{
 						continue;
 					}
+					}
 					if(!$n)
 					{
 						$event['title'] = egw_link::title($link_app,$link_id);
@@ -1497,7 +1587,10 @@ 
 						{
 							foreach((array)$set['link_app'] as $i => $l_app)
 							{
-								if (($l_id=$set['link_id'][$i])) egw_link::link('calendar',$event['link_to']['to_id'],$l_app,$l_id);
+								if (($l_id=$set['link_id'][$i]))
+								{
+									egw_link::link('calendar',$event['link_to']['to_id'],$l_app,$l_id);
+								}
 							}
 							unset($set['link_app']);
 							unset($set['link_id']);
@@ -1523,10 +1616,13 @@ 
 			$lock_path = egw_vfs::app_entry_lock_path('calendar',$event['id']);
 			$lock_owner = 'mailto:'.$GLOBALS['egw_info']['user']['account_email'];
 
-			if (($preserv['lock_token'] = $event['lock_token']))		// already locked --> refresh the lock
+			if (($preserv['lock_token'] = $event['lock_token']))
+			{
+				// already locked --> refresh the lock
 			{
 				egw_vfs::lock($lock_path,$preserv['lock_token'],$locktime,$lock_owner,$scope='shared',$type='write',true,false);
 			}
+			}
 			if (($lock = egw_vfs::checkLock($lock_path)) && $lock['owner'] != $lock_owner)
 			{
 				$msg .= ' '.lang('This entry is currently opened by %1!',
@@ -1559,14 +1655,20 @@ 
 		));
 		egw_framework::message($msg, $msg_type);
 		$content['duration'] = $content['end'] - $content['start'];
-		if (isset($this->durations[$content['duration']])) $content['end'] = '';
+		if (isset($this->durations[$content['duration']]))
+		{
+			$content['end'] = '';
+		}
 
 		$row = 3;
 		$readonlys = $content['participants'] = $preserv['participants'] = array();
 		// preserve some ui elements, if set eg. under error-conditions
 		foreach(array('quantity','resource','role') as $n)
 		{
-			if (isset($event['participants'][$n])) $content['participants'][$n] = $event['participants'][$n];
+			if (isset($event['participants'][$n]))
+			{
+				$content['participants'][$n] = $event['participants'][$n];
+			}
 		}
 		foreach($event['participant_types'] as $type => $participants)
 		{
@@ -1608,9 +1710,13 @@ 
 				//echo "<p>$uid ($quantity): $role --> {$content['participants'][$row]['role']}</p>\n";
 
 				if (($no_status = !$this->bo->check_status_perms($uid,$event)) || $view)
-					$readonlys['participants'][$row]['status'] = $no_status;
+				{
+									$readonlys['participants'][$row]['status'] = $no_status;
+				}
 				if ($preserv['hide_delete'] || !$this->bo->check_perms(EGW_ACL_EDIT,$event))
-					$readonlys['participants']['delete'][$uid] = true;
+				{
+									$readonlys['participants']['delete'][$uid] = true;
+				}
 				// todo: make the participants available as links with email as title
 				$content['participants'][$row++]['title'] = $this->get_title($uid);
 				// enumerate group-invitations, so people can accept/reject them
@@ -1641,7 +1747,11 @@ 
 			$content['participants']['cal_resources'] = '';
 			foreach($this->bo->resources as $data)
 			{
-				if ($data['app'] == 'email') continue;	// make no sense, as we cant search for email
+				if ($data['app'] == 'email')
+				{
+					continue;
+				}
+				// make no sense, as we cant search for email
 				$content['participants']['cal_resources'] .= ','.$data['app'];
 			}
 			// adding extra content for the resource link-entry widget to
@@ -1683,9 +1793,18 @@ 
 				$hours = (int) (($alarm['offset'] % DAY_s) / HOUR_s);
 				$minutes = (int) (($alarm['offset'] % HOUR_s) / 60);
 				$label = array();
-				if ($days) $label[] = $days.' '.lang('days');
-				if ($hours) $label[] = $hours.' '.lang('hours');
-				if ($minutes) $label[] = $minutes.' '.lang('Minutes');
+				if ($days)
+				{
+					$label[] = $days.' '.lang('days');
+				}
+				if ($hours)
+				{
+					$label[] = $hours.' '.lang('hours');
+				}
+				if ($minutes)
+				{
+					$label[] = $minutes.' '.lang('Minutes');
+				}
 				$alarm['offset'] = implode(', ',$label) . ' ' . ($after ? lang('after') : lang('before'));
 				$content['alarm'][] = $alarm;
 
@@ -1744,25 +1863,34 @@ 
 			'participants' => $this->accountsel->account_selection == 'none',
 			'history' => !$event['id'],
 		);
-		if (!isset($GLOBALS['egw_info']['user']['apps']['mail']))	// no mail without mail-app
+		if (!isset($GLOBALS['egw_info']['user']['apps']['mail']))
+		{
+			// no mail without mail-app
 		{
 			unset($sel_options['action']['mail']);
+		}
 			unset($sel_options['action']['sendmeetingrequest']);
 		}
-		if (!$event['id'])	// no ical export for new (not saved) events
+		if (!$event['id'])
+		{
+			// no ical export for new (not saved) events
 		{
 			$readonlys['action'] = true;
 		}
+		}
 		if (!($readonlys['button[exception]'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event) || $event['recur_type'] == MCAL_RECUR_NONE || ($event['recur_enddate'] &&$event['start'] > $event['recur_enddate'])))
 		{
 			$content['exception_label'] = $this->bo->long_date(max($preserved['actual_date'], $event['start']));
 		}
 		$readonlys['button[delete]'] = !$event['id'] || $preserved['hide_delete'] || !$this->bo->check_perms(EGW_ACL_DELETE,$event);
 
-		if (!$event['id'] || $this->bo->check_perms(EGW_ACL_EDIT,$event))	// new event or edit rights to the event ==> allow to add alarm for all users
+		if (!$event['id'] || $this->bo->check_perms(EGW_ACL_EDIT,$event))
+		{
+			// new event or edit rights to the event ==> allow to add alarm for all users
 		{
 			$sel_options['owner'][0] = lang('All participants');
 		}
+		}
 		if (isset($event['participant_types']['u'][$this->user]))
 		{
 			$sel_options['owner'][$this->user] = $this->bo->participant_name($this->user);
@@ -1808,7 +1936,10 @@ 
 
 		$content['cancel_needs_refresh'] = (bool)$_GET['cancel_needs_refresh'];
 
-		if (!empty($preserved['lock_token'])) $content['lock_token'] = $preserved['lock_token'];
+		if (!empty($preserved['lock_token']))
+		{
+			$content['lock_token'] = $preserved['lock_token'];
+		}
 
 		// disabling Apply button for IE 10/11 and Edge, because all but current tab fail to load
 		if (html::$user_agent == 'msie' || html::$user_agent == 'edge')
@@ -2016,7 +2147,10 @@ 
 					// set status and send notification / meeting response
 					if ($this->bo->set_status($event['id'], $user, $status))
 					{
-						if (!$msg) $msg = lang('Status changed');
+						if (!$msg)
+						{
+							$msg = lang('Status changed');
+						}
 					}
 					break;
 
@@ -2095,13 +2229,16 @@ 
 
 		foreach (array_keys($allConflicts) as $pId)
 		{
-			if(substr($pId,0,1) == 'r' && $resources_config ) // resources Allow ignore conflicts
+			if(substr($pId,0,1) == 'r' && $resources_config )
+			{
+				// resources Allow ignore conflicts
 			{
 
 				switch ($resources_config['ignoreconflicts'])
 				{
 					case 'no':
 						$readonlys['button[ignore]'] = true;
+			}
 						break;
 					case 'allusers':
 						$readonlys['button[ignore]'] = false;
@@ -2245,7 +2382,10 @@ 
 		}
 		else
 		{
-			if (!$content['duration']) $content['duration'] = $content['end'] - $content['start'];
+			if (!$content['duration'])
+			{
+				$content['duration'] = $content['end'] - $content['start'];
+			}
 			$weekds = 0;
 			foreach ($content['weekdays'] as &$wdays)
 			{
@@ -2267,7 +2407,10 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('freetime search');
 
 		$sel_options['duration'] = $this->durations;
-		if ($content['duration'] && isset($sel_options['duration'][$content['duration']])) $content['end'] = '';
+		if ($content['duration'] && isset($sel_options['duration'][$content['duration']]))
+		{
+			$content['end'] = '';
+		}
 
 		$etpl->exec('calendar.calendar_uiforms.freetimesearch',$content,$sel_options,NULL,array(
 				'participants'	=> $content['participants'],
@@ -2288,7 +2431,10 @@ 
 	 */
 	function freetime($participants,$start,$end,$duration=1,$cal_id=0)
 	{
-		if ($this->debug > 2) $this->bo->debug_message(__METHOD__.'(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5)',true,$participants,$start,$end,$duration,$cal_id);
+		if ($this->debug > 2)
+		{
+			$this->bo->debug_message(__METHOD__.'(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5)',true,$participants,$start,$end,$duration,$cal_id);
+		}
 
 		$busy = $this->bo->search(array(
 			'start' => $start,
@@ -2305,15 +2451,26 @@ 
 		$n = 0;
 		foreach($busy as $event)
 		{
-			if ((int)$cal_id && $event['id'] == (int)$cal_id) continue;	// ignore our own event
+			if ((int)$cal_id && $event['id'] == (int)$cal_id)
+			{
+				continue;
+			}
+			// ignore our own event
 
- 			if ($event['non_blocking']) continue; // ignore non_blocking events
+ 			if ($event['non_blocking'])
+ 			{
+ 				continue;
+ 			}
+ 			// ignore non_blocking events
 
 			// check if from all wanted participants at least one has a not rejected status in found event
 			$non_rejected_found = false;
 			foreach($participants as $uid)
 			{
-				if ($event['participants'][$uid] == 'R') continue;
+				if ($event['participants'][$uid] == 'R')
+				{
+					continue;
+				}
 
 				if (isset($event['participants'][$uid]) ||
 					$uid > 0 && array_intersect(array_keys((array)$event['participants']),
@@ -2323,7 +2480,10 @@ 
 					break;
 				}
 			}
-			if (!$non_rejected_found) continue;
+			if (!$non_rejected_found)
+			{
+				continue;
+			}
 
 			if ($this->debug)
 			{
@@ -2354,11 +2514,17 @@ 
 					'start'	=> $ft_start,
 					'end'	=> $ft_end,
 				);
-				if ($this->debug > 1) echo "<p>freetime: ".date('D d.m.Y H:i',$ft_start)." - ".date('D d.m.Y H:i',$ft_end)."</p>\n";
+				if ($this->debug > 1)
+				{
+					echo "<p>freetime: ".date('D d.m.Y H:i',$ft_start)." - ".date('D d.m.Y H:i',$ft_end)."</p>\n";
+				}
 			}
 			$ft_start = $event['end'];
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6',true,$participants,$start,$end,$duration,$cal_id,$freetime);
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6',true,$participants,$start,$end,$duration,$cal_id,$freetime);
+		}
 
 		return $freetime;
 	}
@@ -2378,10 +2544,16 @@ 
 	 */
 	function split_freetime_daywise($freetime, $duration, $weekdays, $_start_time, $_end_time, &$sel_options)
 	{
-		if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(freetime=%1, duration=%2, start_time=%3, end_time=%4)',true,$freetime,$duration,$_start_time,$_end_time);
+		if ($this->debug > 1)
+		{
+			$this->bo->debug_message('uiforms::split_freetime_daywise(freetime=%1, duration=%2, start_time=%3, end_time=%4)',true,$freetime,$duration,$_start_time,$_end_time);
+		}
 
 		$freetime_daywise = array();
-		if (!is_array($sel_options)) $sel_options = array();
+		if (!is_array($sel_options))
+		{
+			$sel_options = array();
+		}
 		$time_format = $this->common_prefs['timeformat'] == 12 ? 'h:i a' : 'H:i';
 
 		$start_time = (int) $_start_time;	// ignore leading zeros
@@ -2391,7 +2563,10 @@ 
 		if (($end_time - $start_time)*HOUR_s < $duration)
 		{
 			$end_time = 0;
-			if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(, duration=%2, start_time=%3,..) end_time set to 0, it never fits durationn otherwise',true,$duration,$start_time);
+			if ($this->debug > 1)
+			{
+				$this->bo->debug_message('uiforms::split_freetime_daywise(, duration=%2, start_time=%3,..) end_time set to 0, it never fits durationn otherwise',true,$duration,$start_time);
+			}
 		}
 		$n = 0;
 		foreach($freetime as $ft)
@@ -2412,13 +2587,19 @@ 
 				}
 				$start = $t < $ft['start'] ? $ft['start'] : $t;
 
-				if ($start-$daybegin < $start_time*HOUR_s)	// start earlier then start_time
+				if ($start-$daybegin < $start_time*HOUR_s)
+				{
+					// start earlier then start_time
 				{
 					$start = $daybegin + $start_time*HOUR_s;
 				}
+				}
 				// if end_time given use it, else the original slot's end
 				$end = $end_time ? $daybegin + $end_time*HOUR_s : $ft['end'];
-				if ($end > $ft['end']) $end = $ft['end'];
+				if ($end > $ft['end'])
+				{
+					$end = $ft['end'];
+				}
 
 				// slot to small for duration
 				if ($end - $start < $duration)
@@ -2460,7 +2641,10 @@ 
 			{
 				$msg = lang('Permission denied');
 
-				if ($return_error) return $msg;
+				if ($return_error)
+				{
+					return $msg;
+				}
 			}
 			else
 			{
@@ -2532,7 +2716,10 @@ 
 					$msg = lang('iCal successful imported').' '.lang('(%1 events in %2 seconds)',
 						$calendar_ical->events_imported,number_format(microtime(true)-$start,1));
 				}
-				if ($f) fclose($f);
+				if ($f)
+				{
+					fclose($f);
+				}
 			}
 			else
 			{
@@ -2562,27 +2749,42 @@ 
 		{
 			list($button) = each($_content['button']);
 			unset($_content['button']);
-			if ($button != 'cancel')	// store changed acl
+			if ($button != 'cancel')
+			{
+				// store changed acl
 			{
 				foreach($_content as $data)
 				{
 					if (!($cat_id = $data['cat_id'])) continue;
+			}
 					foreach(array_merge((array)$data['add'],(array)$data['status'],array_keys((array)$data['old'])) as $account_id)
 					{
 						$rights = 0;
-						if (in_array($account_id,(array)$data['add'])) $rights |= calendar_boupdate::CAT_ACL_ADD;
-						if (in_array($account_id,(array)$data['status'])) $rights |= calendar_boupdate::CAT_ACL_STATUS;
-						if ($account_id) $this->bo->set_cat_rights($cat_id,$account_id,$rights);
+						if (in_array($account_id,(array)$data['add']))
+						{
+							$rights |= calendar_boupdate::CAT_ACL_ADD;
+						}
+						if (in_array($account_id,(array)$data['status']))
+						{
+							$rights |= calendar_boupdate::CAT_ACL_STATUS;
+						}
+						if ($account_id)
+						{
+							$this->bo->set_cat_rights($cat_id,$account_id,$rights);
+						}
 					}
 				}
 			}
-			if ($button != 'apply')	// end dialog
+			if ($button != 'apply')
+			{
+				// end dialog
 			{
 				egw::redirect_link('/index.php', array(
 					'menuaction' => 'admin.admin_ui.index',
 					'ajax' => 'true'
 				), 'admin');
 			}
+			}
 		}
 		$content= $preserv = array();
 		$n = 1;
@@ -2596,8 +2798,14 @@ 
 			);
 			foreach($data as $account_id => $rights)
 			{
-				if ($rights & calendar_boupdate::CAT_ACL_ADD) $row['add'][] = $account_id;
-				if ($rights & calendar_boupdate::CAT_ACL_STATUS) $row['status'][] = $account_id;
+				if ($rights & calendar_boupdate::CAT_ACL_ADD)
+				{
+					$row['add'][] = $account_id;
+				}
+				if ($rights & calendar_boupdate::CAT_ACL_STATUS)
+				{
+					$row['status'][] = $account_id;
+				}
 			}
 			$content[$n] = $row;
 			$preserv[$n] = array(
@@ -2741,7 +2949,10 @@ 
 					case 'no':
 						break;
 					case 'startday':
-						if ($sameday) break;
+						if ($sameday)
+						{
+							break;
+						}
 					default:
 						$status_reset_to_unknown = true;
 						$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
@@ -2819,7 +3030,10 @@ 
 				{
 					$_results = egw_link::query($data['app'], $query,$options);
 				}
-				if(!$_results) continue;
+				if(!$_results)
+				{
+					continue;
+				}
 				$_results = array_unique($_results);
 
 				foreach($_results as $id => $title)

calendar/inc/class.calendar_uilist.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param array $set_states=null to manualy set / change one of the states, default NULL = use $_REQUEST
+	 * @param array $set_states to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
 	function __construct($set_states=null)
 	{
@@ -542,7 +542,7 @@ 
 	 * @param int &$success number of succeded actions
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 events 'deleted'
-	 * @param string/array $session_name 'calendar_list'
+	 * @param string $session_name 'calendar_list'
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
 	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg,$skip_notification=false)

Spacing +146 added lines, -146 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @var mixed
 	 */
-	var $debug=false;
+	var $debug = false;
 	/**
 	 * Filternames
 	 *
@@ -50,15 +50,15 @@ 
 	 *
 	 * @param array $set_states=null to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function __construct($set_states=null)
+	function __construct($set_states = null)
 	{
-		parent::__construct(true,$set_states);	// call the parent's constructor
+		parent::__construct(true, $set_states); // call the parent's constructor
 
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Listview').
 			// for a single owner we add it's name to the app-header
-			(count(explode(',',$this->owner)) == 1 ? ': '.$this->bo->participant_name($this->owner) : '');
+			(count(explode(',', $this->owner)) == 1 ? ': '.$this->bo->participant_name($this->owner) : '');
 
-		foreach($this->date_filters as $name => $label)
+		foreach ($this->date_filters as $name => $label)
 		{
 			$this->date_filters[$name] = lang($label);
 		}
@@ -82,15 +82,15 @@ 
 			'multiple'   => 0,
 			'view'	   => $this->bo->cal_prefs['mainscreen_showevents'],
 		));
-		egw_session::appsession('calendar_list','calendar','');	// in case there's already something set
+		egw_session::appsession('calendar_list', 'calendar', ''); // in case there's already something set
 
-		return $this->listview(null,'',true);
+		return $this->listview(null, '', true);
 	}
 
 	/**
 	 * Show the listview
 	 */
-	function listview($content=null,$msg='',$home=false)
+	function listview($content = null, $msg = '', $home = false)
 	{
 		if ($_GET['msg']) $msg .= $_GET['msg'];
 		if ($this->group_warning) $msg .= $this->group_warning;
@@ -98,7 +98,7 @@ 
 		$etpl = new etemplate_new('calendar.list');
 
 		// Handle merge from sidebox
-		if($_GET['merge'])
+		if ($_GET['merge'])
 		{
 			$content['nm']['action'] = 'document_'.$_GET['merge'];
 			$content['nm']['select_all'] = true;
@@ -107,7 +107,7 @@ 
 		if (is_array($content))
 		{
 			// handle a single button like actions
-			foreach(array('delete','timesheet','document') as $button)
+			foreach (array('delete', 'timesheet', 'document') as $button)
 			{
 				if ($content['nm']['rows'][$button])
 				{
@@ -120,7 +120,7 @@ 
 			if ($content['nm']['action'])
 			{
 				// Allow merge using the date range filter
-				if(strpos($content['nm']['action'],'document') !== false &&
+				if (strpos($content['nm']['action'], 'document') !== false &&
 					!count($content['nm']['selected']) && !$content['nm']['select_all']) {
 					$content['nm']['selected'][] = $this->get_merge_range($content['nm']);
 				}
@@ -130,42 +130,42 @@ 
 				}
 				else
 				{
-					if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-						$success,$failed,$action_msg,'calendar_list',$msg, $content['nm']['checkboxes']['no_notifications']))
+					if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+						$success, $failed, $action_msg, 'calendar_list', $msg, $content['nm']['checkboxes']['no_notifications']))
 					{
-						$msg .= lang('%1 event(s) %2',$success,$action_msg);
+						$msg .= lang('%1 event(s) %2', $success, $action_msg);
 					}
-					elseif(is_null($msg))
+					elseif (is_null($msg))
 					{
-						$msg .= lang('%1 event(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+						$msg .= lang('%1 event(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 					}
 				}
 			}
 		}
 		$content = array(
-			'nm'  => egw_session::appsession('calendar_list','calendar'),
+			'nm'  => egw_session::appsession('calendar_list', 'calendar'),
 		);
 		if (!is_array($content['nm']))
 		{
 			$content['nm'] = array(
 				'get_rows'        =>	'calendar.calendar_uilist.get_rows',
-	 			'filter_no_lang'  => True,	// I  set no_lang for filter (=dont translate the options)
-				'no_filter2'      => True,	// I  disable the 2. filter (params are the same as for filter)
-				'no_cat'          => True,	// I  disable the cat-selectbox
+	 			'filter_no_lang'  => True, // I  set no_lang for filter (=dont translate the options)
+				'no_filter2'      => True, // I  disable the 2. filter (params are the same as for filter)
+				'no_cat'          => True, // I  disable the cat-selectbox
 				'filter'          => 'after',
-				'order'           => 'cal_start',// IO name of the column to sort after (optional for the sortheaders)
-				'sort'            => 'ASC',// IO direction of the sort: 'ASC' or 'DESC'
+				'order'           => 'cal_start', // IO name of the column to sort after (optional for the sortheaders)
+				'sort'            => 'ASC', // IO direction of the sort: 'ASC' or 'DESC'
 				'default_cols'    => '!week,weekday,cal_title,cal_description,recure,cal_location,cal_owner,cat_id,pm_id',
 				'filter_onchange' => "app.calendar.filter_change",
 				'header_left'     => 'calendar.list.dates',
-				'row_id'          => 'row_id',	// set in get rows "$event[id]:$event[recur_date]"
+				'row_id'          => 'row_id', // set in get rows "$event[id]:$event[recur_date]"
 				'row_modified'    => 'modified',
 				'favorites'       => true
 			);
 		}
 		$content['nm']['actions'] = $this->get_actions();
 
-		if (isset($_GET['filter']) && in_array($_GET['filter'],array_keys($this->date_filters)))
+		if (isset($_GET['filter']) && in_array($_GET['filter'], array_keys($this->date_filters)))
 		{
 			$content['nm']['filter'] = $_GET['filter'];
 		}
@@ -177,7 +177,7 @@ 
 		if (isset($_REQUEST['json_data']) && ($json_data = json_decode($_REQUEST['json_data'], true)) &&
 			!empty($json_data['request']['parameters'][0]))
 		{
-			parse_str(substr($json_data['request']['parameters'][0], 10), $params);	// cut off "/index.php?"
+			parse_str(substr($json_data['request']['parameters'][0], 10), $params); // cut off "/index.php?"
 			if (isset($params['keywords']))	// new search => set filters so every match is shown
 			{
 				$this->adjust_for_search($params['keywords'], $content['nm']);
@@ -185,22 +185,22 @@ 
 		}
 		if (isset($_REQUEST['keywords']))	// new search => set filters so every match is shown
 		{
-			$this->adjust_for_search($_REQUEST['keywords'],$content['nm']);
+			$this->adjust_for_search($_REQUEST['keywords'], $content['nm']);
 		}
 		$sel_options['filter'] = &$this->date_filters;
 
 		// Send categories for row styling - calendar uses no_cat, so they don't go automatically
-		$sel_options['category'] = array('' => lang('all')) + etemplate_widget_menupopup::typeOptions('select-cat', ',,calendar',$no_lang,false,$value['cat_id']);
+		$sel_options['category'] = array('' => lang('all')) + etemplate_widget_menupopup::typeOptions('select-cat', ',,calendar', $no_lang, false, $value['cat_id']);
 		// Prevent double encoding - widget does this on its own, but we're just grabbing the options
-		foreach($sel_options['category'] as &$label)
+		foreach ($sel_options['category'] as &$label)
 		{
-			if(!is_array($label))
+			if (!is_array($label))
 			{
-				$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
+				$label = html_entity_decode($label, ENT_NOQUOTES, 'utf-8');
 			}
-			elseif($label['label'])
+			elseif ($label['label'])
 			{
-				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
+				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES, 'utf-8');
 			}
 		}
 
@@ -208,15 +208,15 @@ 
 		if ($this->prefs['limit_des_lines'] > 0 || (string)$this->prefs['limit_des_lines'] == '')
 		{
 			$content['css'] .= '<style type="text/css">@media screen { .listDescription {  max-height: '.
-				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).	   // dono why em is not real lines
+				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).// dono why em is not real lines
 				'em; overflow: auto; }}</style>';
 		}
 
-		if($msg)
+		if ($msg)
 		{
 			egw_framework::message($msg);
 		}
-		$html = $etpl->exec('calendar.calendar_uilist.listview',$content,$sel_options,$readonlys,array(),$home ? -1 : 0);
+		$html = $etpl->exec('calendar.calendar_uilist.listview', $content, $sel_options, $readonlys, array(), $home ? -1 : 0);
 
 		// Not sure why this has to be echoed instead of appended, but that's what works.
 		//echo calendar_uiviews::edit_series();
@@ -227,7 +227,7 @@ 
 	/**
 	 * set filter for search, so that everything is shown
 	 */
-	function adjust_for_search($keywords,&$params)
+	function adjust_for_search($keywords, &$params)
 	{
 		$params['search'] = $keywords;
 		$params['start']  = 0;
@@ -253,7 +253,7 @@ 
 	 * @param array &$rows returned rows/events
 	 * @param array &$readonlys eg. to disable buttons based on acl
 	 */
-	function get_rows(&$params,&$rows,&$readonlys)
+	function get_rows(&$params, &$rows, &$readonlys)
 	{
 		//echo "uilist::get_rows() params="; _debug_array($params);
 		if (isset($_GET['listview_days']) && is_numeric($_GET['listview_days']))
@@ -277,7 +277,7 @@ 
 				$this->manage_states(array('date' => $this->bo->date2string($params['startdate'])));
 			}
 		}
-		$old_params = egw_session::appsession('calendar_list','calendar');
+		$old_params = egw_session::appsession('calendar_list', 'calendar');
 		if (is_array($old_params))
 		{
 			if ($old_params['filter'] && $old_params['filter'] != $params['filter'])	// filter changed => order accordingly
@@ -287,58 +287,58 @@ 
 			}
 			if ($old_params['search'] != $params['search'])
 			{
-				$this->adjust_for_search($params['search'],$params);
+				$this->adjust_for_search($params['search'], $params);
 			}
 		}
-		if (!$params['csv_export']) egw_session::appsession('calendar_list','calendar',$params);
+		if (!$params['csv_export']) egw_session::appsession('calendar_list', 'calendar', $params);
 
 		// do we need to query custom fields and which
 		// Check stored preference if selectcols isn't available (ie: first call)
 		$select_cols = $params['selectcols'] ? $params['selectcols'] : $GLOBALS['egw_info']['user']['preferences']['calendar']['nextmatch-calendar.list.rows'];
-		if(!is_array($params['selectcols']))
+		if (!is_array($params['selectcols']))
 		{
-			$select_cols = explode(',',$select_cols);
+			$select_cols = explode(',', $select_cols);
 		}
-		if (in_array('cfs',$select_cols))
+		if (in_array('cfs', $select_cols))
 		{
 			$cfs = array();
-			foreach($select_cols as $col)
+			foreach ($select_cols as $col)
 			{
-				if ($col[0] == '#') $cfs[] = substr($col,1);
+				if ($col[0] == '#') $cfs[] = substr($col, 1);
 			}
 		}
 		$search_params = array(
-			'cat_id'  => $this->cat_id ? explode(',',$this->cat_id) : 0,
+			'cat_id'  => $this->cat_id ? explode(',', $this->cat_id) : 0,
 			'filter'  => $this->filter,
 			'query'   => $params['search'],
-			'offset'  => (int) $params['start'],
+			'offset'  => (int)$params['start'],
 			'num_rows'=> $params['num_rows'],
 			'order'   => $params['order'] ? $params['order'].' '.$params['sort'] : 'cal_start',
 			'cfs'	 => $params['csv_export'] ? array() : $cfs,
 		);
-		switch($params['filter'])
+		switch ($params['filter'])
 		{
 			case 'all':
 				break;
 			case 'before':
 				$search_params['end'] = $this->date;
-				$label = lang('Before %1',$this->bo->long_date($this->date));
+				$label = lang('Before %1', $this->bo->long_date($this->date));
 				break;
 			case 'custom':
 				$this->first = $search_params['start'] = $params['startdate'];
-				$this->last  = $search_params['end'] = strtotime('+1 day', $this->bo->date2ts($params['enddate']))-1;
-				$label = $this->bo->long_date($this->first,$this->last);
+				$this->last  = $search_params['end'] = strtotime('+1 day', $this->bo->date2ts($params['enddate'])) - 1;
+				$label = $this->bo->long_date($this->first, $this->last);
 				break;
 			case 'fixed':
 				if ($this->listview_days == 5 || $this->listview_days == 7)	// weekview
 				{
-					$this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
+					$this->first = $this->datetime->get_weekday_start($this->year, $this->month, $this->day);
 					$this->last = $this->bo->date2array($this->first);
-					$this->last['day'] += (int) $this->listview_days - 1;
+					$this->last['day'] += (int)$this->listview_days - 1;
 					$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
 					unset($this->last['raw']);
 					$this->last = $this->bo->date2ts($this->last);
-					$this->date_filters['fixed'] = $label = lang('Week').' '.adodb_date('W',$this->first).': '.$this->bo->long_date($this->first,$this->last);
+					$this->date_filters['fixed'] = $label = lang('Week').' '.adodb_date('W', $this->first).': '.$this->bo->long_date($this->first, $this->last);
 					$params['startdate'] = $search_params['start'] = $this->first;
 					$params['enddate'] = $search_params['end'] = $this->last;
 					break;
@@ -353,7 +353,7 @@ 
 					$this->first = $this->bo->date2ts($this->first);
 					$this->last = $this->bo->date2ts($this->last);
 					$this->last--;
-					$this->date_filters['fixed'] = $label = lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
+					$this->date_filters['fixed'] = $label = lang(adodb_date('F', $this->bo->date2ts($this->date))).' '.$this->year;
 					$params['startdate'] = $search_params['start'] = $this->first;
 					$params['enddate'] = $search_params['end'] = $this->last;
 					break;
@@ -361,24 +361,24 @@ 
 				// fall through to after given date
 			case 'after':
 			default:
-				$label = lang('After %1',$this->bo->long_date($this->date));
+				$label = lang('After %1', $this->bo->long_date($this->date));
 				$search_params['start'] = $this->date;
 				break;
 		}
-		if ((int) $params['col_filter']['participant'])
+		if ((int)$params['col_filter']['participant'])
 		{
-			$search_params['users'] = (int) $params['col_filter']['participant'];
+			$search_params['users'] = (int)$params['col_filter']['participant'];
 		}
-		elseif(empty($params['search']))	// active search displays entries from all users
+		elseif (empty($params['search']))	// active search displays entries from all users
 		{
-			$search_params['users'] = explode(',',$this->owner);
+			$search_params['users'] = explode(',', $this->owner);
 		}
 		if ($params['col_filter'])
 		{
 			$col_filter = array();
-			foreach($params['col_filter'] as $name => $val)
+			foreach ($params['col_filter'] as $name => $val)
 			{
-				if (!in_array($name, array('participant','row_id')) && (string)$val !== '')
+				if (!in_array($name, array('participant', 'row_id')) && (string)$val !== '')
 				{
 					$col_filter[$name] = $val;
 				}
@@ -392,15 +392,15 @@ 
 			$rows['sel_options']['filter'] = $this->date_filters;
 			$rows['sel_options']['filter'][$params['filter']] = $label;
 		}
-		foreach((array) $this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event)
+		foreach ((array)$this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event)
 		{
-			if (!$this->bo->check_perms(EGW_ACL_EDIT,$event))
+			if (!$this->bo->check_perms(EGW_ACL_EDIT, $event))
 			{
 				$event['class'] .= 'rowNoEdit ';
 			}
 
 			// Delete disabled for other applications
-			if (!$this->bo->check_perms(EGW_ACL_DELETE,$event) || !is_numeric($event['id']))
+			if (!$this->bo->check_perms(EGW_ACL_DELETE, $event) || !is_numeric($event['id']))
 			{
 				$event['class'] .= 'rowNoDelete ';
 			}
@@ -414,39 +414,39 @@ 
 			$event['recure'] = $this->bo->recure2string($event);
 			if ($params['csv_export'])
 			{
-				$event['participants'] = implode(",\n",$this->bo->participants($event,true));
+				$event['participants'] = implode(",\n", $this->bo->participants($event, true));
 			}
 			else
 			{
-				$event['parts'] = implode(",\n",$this->bo->participants($event,true));
+				$event['parts'] = implode(",\n", $this->bo->participants($event, true));
 				$event['date'] = $this->bo->date2string($event['start']);
 			}
-			if (empty($event['description'])) $event['description'] = ' ';	// no description screws the titles horz. alignment
-			if (empty($event['location'])) $event['location'] = ' ';	// no location screws the owner horz. alignment
+			if (empty($event['description'])) $event['description'] = ' '; // no description screws the titles horz. alignment
+			if (empty($event['location'])) $event['location'] = ' '; // no location screws the owner horz. alignment
 
 			// respect category permissions
-			if(!empty($event['category']))
+			if (!empty($event['category']))
 			{
 				$event['category'] = $this->categories->check_list(EGW_ACL_READ, $event['category']);
 			}
 
-			if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
+			if (!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i', $event['id'], $matches))
 			{
 				$app = $matches[1];
 				$app_id = $matches[2];
 				$icons = array();
-				if (($is_private = calendar_bo::integration_get_private($app,$app_id,$event)))
+				if (($is_private = calendar_bo::integration_get_private($app, $app_id, $event)))
 				{
-					$icons[] = html::image('calendar','private');
+					$icons[] = html::image('calendar', 'private');
 				}
 				else
 				{
-					$icons = calendar_uiviews::integration_get_icons($app,$app_id,$event);
+					$icons = calendar_uiviews::integration_get_icons($app, $app_id, $event);
 				}
 			}
 			else
 			{
-				$is_private = !$this->bo->check_perms(EGW_ACL_READ,$event);
+				$is_private = !$this->bo->check_perms(EGW_ACL_READ, $event);
 			}
 			if ($is_private)
 			{
@@ -457,9 +457,9 @@ 
 			$event['app_id'] = $event['id'];
 
 			// Edit link
-			if($app && $app_id)
+			if ($app && $app_id)
 			{
-				$popup = calendar_uiviews::integration_get_popup($app,$app_id);
+				$popup = calendar_uiviews::integration_get_popup($app, $app_id);
 
 				// Need to strip off 'onclick'
 				$event['edit_link'] = preg_replace('/ ?onclick="(.+)"/i', '$1', $popup);
@@ -470,7 +470,7 @@ 
 				// populate js_integration_data, if not already set
 				if (!isset($js_integration_data[$app]))
 				{
-					$js_integration_data[$app] = calendar_bo::integration_get_data($app,'edit_link');
+					$js_integration_data[$app] = calendar_bo::integration_get_data($app, 'edit_link');
 					if (!is_array($js_integration_data[$app]) || !isset($js_integration_data[$app]['edit']))
 					{
 						$js_integration_data[$app]['edit'] = egw_link::get_registry($app, 'edit');
@@ -486,7 +486,7 @@ 
 			}
 			else
 			{
-				$view_link = egw::link('/index.php',array('menuaction'=>'calendar.calendar_uiforms.edit','cal_id'=>$event['id'],'date'=>$this->bo->date2string($event['start'])));
+				$view_link = egw::link('/index.php', array('menuaction'=>'calendar.calendar_uiforms.edit', 'cal_id'=>$event['id'], 'date'=>$this->bo->date2string($event['start'])));
 				$event['edit_link'] = $this->popup($view_link).'; return false;';
 			}
 
@@ -494,9 +494,9 @@ 
 			$event['row_id'] = $event['id'].($event['recur_type'] ? ':'.$event['recur_date'] : '');
 
 			// Format start and end with timezone
-			foreach(array('start','end') as $time)
+			foreach (array('start', 'end') as $time)
 			{
-				$event[$time] = egw_time::to($event[$time],'Y-m-d\TH:i:s\Z');
+				$event[$time] = egw_time::to($event[$time], 'Y-m-d\TH:i:s\Z');
 			}
 
 			$rows[] = $event;
@@ -506,19 +506,19 @@ 
 		// set js_calendar_integration object, to use it in app.js cal_open() function
 		$params['js_integration_data'] = json_encode($js_integration_data);
 
-		$wv=0;
-		$dv=0;
+		$wv = 0;
+		$dv = 0;
 		$params['options-selectcols']['week'] = lang('Week');
 		$params['options-selectcols']['weekday'] = lang('Weekday');
-		if ((substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,4) == 'week' && strlen($this->cal_prefs['nextmatch-calendar.list.rows'])==4) || substr($this->cal_prefs['nextmatch-calendar.list.rows'],0,5) == 'week,')
+		if ((substr($this->cal_prefs['nextmatch-calendar.list.rows'], 0, 4) == 'week' && strlen($this->cal_prefs['nextmatch-calendar.list.rows']) == 4) || substr($this->cal_prefs['nextmatch-calendar.list.rows'], 0, 5) == 'week,')
 		{
-			$rows['format'] = '32';	// prefix date with week-number
-			$wv=1;
+			$rows['format'] = '32'; // prefix date with week-number
+			$wv = 1;
 		}
-		if (!(strpos($this->cal_prefs['nextmatch-calendar.list.rows'],'weekday')===FALSE))
+		if (!(strpos($this->cal_prefs['nextmatch-calendar.list.rows'], 'weekday') === FALSE))
 		{
 			$rows['format'] = '16';
-			$dv=1;
+			$dv = 1;
 		}
 		if ($wv && $dv)
 		{
@@ -545,35 +545,35 @@ 
 	 * @param string/array $session_name 'calendar_list'
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg,$skip_notification=false)
+	function action($action, $checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg, $skip_notification = false)
 	{
 		//error_log(__METHOD__."('$action', ".array2string($checked).', all='.(int)$use_all.", ...)");
 		$success = $failed = 0;
 		$msg = null;
 
 		// Split out combined values
-		if(strpos($action, 'status') !== false)
+		if (strpos($action, 'status') !== false)
 		{
 			list($action, $status) = explode('-', $action);
 		}
 		elseif (strpos($action, '_') !== false)
 		{
-			list($action, $settings) = explode('_', $action,2);
+			list($action, $settings) = explode('_', $action, 2);
 		}
 
 		if ($use_all)
 		{
 			// get the whole selection
-			$query = is_array($session_name) ? $session_name : egw_session::appsession($session_name,'calendar');
-			@set_time_limit(0);				// switch off the execution time limit, as for big selections it's too small
-			$query['num_rows'] = -1;		// all
-			$this->get_rows($query,$checked,$readonlys,!in_array($action,array('ical','document')));	   // true = only return the id's
+			$query = is_array($session_name) ? $session_name : egw_session::appsession($session_name, 'calendar');
+			@set_time_limit(0); // switch off the execution time limit, as for big selections it's too small
+			$query['num_rows'] = -1; // all
+			$this->get_rows($query, $checked, $readonlys, !in_array($action, array('ical', 'document'))); // true = only return the id's
 			// Get rid of any extras (rows that aren't events)
-			if(in_array($action,array('ical','document')))
+			if (in_array($action, array('ical', 'document')))
 			{
-				foreach($checked as $key => $event)
+				foreach ($checked as $key => $event)
 				{
-					if(!is_numeric($key))
+					if (!is_numeric($key))
 					{
 						unset($checked[$key]);
 					}
@@ -581,26 +581,26 @@ 
 			}
 		}
 		// for calendar integration we have to fetch all rows and unset the not selected ones, as we can not filter by id
-		elseif($action == 'document')
+		elseif ($action == 'document')
 		{
-			$query = is_array($session_name) ? $session_name : egw_session::appsession($session_name,'calendar');
-			@set_time_limit(0);				// switch off the execution time limit, as for big selections it's too small
-			$this->get_rows($query,$events,$readonlys);
-			foreach($events as $key => $event)
+			$query = is_array($session_name) ? $session_name : egw_session::appsession($session_name, 'calendar');
+			@set_time_limit(0); // switch off the execution time limit, as for big selections it's too small
+			$this->get_rows($query, $events, $readonlys);
+			foreach ($events as $key => $event)
 			{
-				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
+				if (!in_array($event['id'], $checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
 			}
 			$checked = array_values($events); // Clear keys
 		}
 
 		// Actions where one action is done to the group
-		switch($action)
+		switch ($action)
 		{
 			case 'ical':
 				// compile list of unique cal_id's, as iCal should contain whole series, not recurrences
 				// calendar_ical->exportVCal needs to read events again, to get them in server-time
 				$ids = array();
-				foreach($checked as $id)
+				foreach ($checked as $id)
 				{
 					if (is_array($id)) $id = $id['id'];
 					// get rid of recurrences, doublicate series and calendar-integration events
@@ -610,7 +610,7 @@ 
 					}
 				}
 				$boical = new calendar_ical();
-				$ical =& $boical->exportVCal($ids, '2.0', 'PUBLISH');
+				$ical = & $boical->exportVCal($ids, '2.0', 'PUBLISH');
 				html::content_header('event.ics', 'text/calendar', bytes($ical));
 				echo $ical;
 				common::egw_exit();
@@ -624,18 +624,18 @@ 
 		}
 
 		// Actions where the action is applied to each entry
-		if(strpos($action, 'timesheet') !== false)
+		if (strpos($action, 'timesheet') !== false)
 		{
 			$timesheet_bo = new timesheet_bo();
 		}
-		foreach($checked as &$id)
+		foreach ($checked as &$id)
 		{
 			$recur_date = $app = $app_id = null;
-			if(is_array($id) && $id['id'])
+			if (is_array($id) && $id['id'])
 			{
 				$id = $id['id'];
 			}
-			if(!(int)$id && preg_match('/^([a-z_-]+)([0-9]+)$/i',$id,$matches))
+			if (!(int)$id && preg_match('/^([a-z_-]+)([0-9]+)$/i', $id, $matches))
 			{
 				$app = $matches[1];
 				$app_id = $matches[2];
@@ -643,27 +643,27 @@ 
 			}
 			else
 			{
-				list($id,$recur_date) = explode(':',$id);
+				list($id, $recur_date) = explode(':', $id);
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'delete':
 					$action_msg = lang('deleted');
-					if($settings == 'series')
+					if ($settings == 'series')
 					{
 						// Delete the whole thing
 						$recur_date = 0;
 					}
-					if ($id && $this->bo->delete($id, $recur_date,false,$skip_notification))
+					if ($id && $this->bo->delete($id, $recur_date, false, $skip_notification))
 					{
 						$success++;
-						if(!$recur_date && $settings == 'series')
+						if (!$recur_date && $settings == 'series')
 						{
 							// If there are multiple events in a series selected, the next one could purge
-							foreach($checked as $key => $c_id)
+							foreach ($checked as $key => $c_id)
 							{
-								list($c_id,$recur_date) = explode(':',$c_id);
-								if($c_id == $id)
+								list($c_id, $recur_date) = explode(':', $c_id);
+								if ($c_id == $id)
 								{
 									unset($checked[$key]);
 								}
@@ -677,16 +677,16 @@ 
 					break;
 				case 'undelete':
 					$action_msg = lang('recovered');
-					if($settings == 'series')
+					if ($settings == 'series')
 					{
 						// unDelete the whole thing
 						$recur_date = 0;
 					}
-					if ($id && ($event = $this->bo->read($id, $recur_date)) && $this->bo->check_perms(EGW_ACL_EDIT,$id) &&
+					if ($id && ($event = $this->bo->read($id, $recur_date)) && $this->bo->check_perms(EGW_ACL_EDIT, $id) &&
 						is_array($event) && $event['deleted'])
 					{
 						$event['deleted'] = null;
-						if($this->bo->save($event))
+						if ($this->bo->save($event))
 						{
 							$success++;
 							break;
@@ -696,7 +696,7 @@ 
 					break;
 				case 'status':
 					$action_msg = lang('Status changed');
-					if($id && ($event = $this->bo->read($id, $recur_date)))
+					if ($id && ($event = $this->bo->read($id, $recur_date)))
 					{
 						$old_status = $event['participants'][$GLOBALS['egw_info']['user']['account_id']];
 						calendar_so::split_status($old_status, $quantity, $role);
@@ -704,8 +704,8 @@ 
 						{
 							//echo "<p>$uid: status changed '$data[old_status]' --> '$status<'/p>\n";
 							$new_status = calendar_so::combine_status($status, $quantity, $role);
-							if ($this->bo->set_status($event,$GLOBALS['egw_info']['user']['account_id'],$new_status,$recur_date,
-								false,true,$skip_notification))
+							if ($this->bo->set_status($event, $GLOBALS['egw_info']['user']['account_id'], $new_status, $recur_date,
+								false, true, $skip_notification))
 							{
 								$success++;
 								//$msg = lang('Status changed');
@@ -722,19 +722,19 @@ 
 					}
 					break;
 				case 'timesheet-add':
-					if($id && !$app)
+					if ($id && !$app)
 					{
 						$event = $this->bo->read($id, $recur_date);
 					}
 					elseif ($app)
 					{
-						$query = egw_session::appsession('calendar_list','calendar');
+						$query = egw_session::appsession('calendar_list', 'calendar');
 						$query['query'] = $app_id;
 						$query['search'] = $app_id;
 						$result = $this->bo->search($query);
 						$event = $result[$app.$app_id];
 					}
-					if(!$event)
+					if (!$event)
 					{
 						$failed++;
 						continue;
@@ -751,16 +751,16 @@ 
 					);
 
 					// Add global categories
-					$categories = explode(',',$event['category']);
+					$categories = explode(',', $event['category']);
 					$global_categories = array();
-					foreach($categories as $cat_id)
+					foreach ($categories as $cat_id)
 					{
-						if($GLOBALS['egw']->categories->is_global($cat_id))
+						if ($GLOBALS['egw']->categories->is_global($cat_id))
 						{
 							$global_categories[] = $cat_id;
 						}
 					}
-					if(count($global_categories))
+					if (count($global_categories))
 					{
 						$timesheet['cat_id'] = implode(',', $global_categories);
 					}
@@ -780,12 +780,12 @@ 
 						}
 					}
 
-					if(!$err)
+					if (!$err)
 					{
 						$success++;
 
 						// Can't link to just one of a recurring series of events
-						if(!$recur_date || $app) {
+						if (!$recur_date || $app) {
 							// Create link
 							$link_id = $app ? $app_id : $id;
 							egw_link::link($app ? $app : 'calendar', $link_id, 'timesheet', $timesheet_bo->data['ts_id']);
@@ -813,7 +813,7 @@ 
 	protected function get_merge_range($nm)
 	{
 		$checked = array();
-		if($nm['filter'] == 'fixed')
+		if ($nm['filter'] == 'fixed')
 		{
 			$checked['start'] = $nm['startdate'];
 			$last = $this->bo->date2array($nm['enddate']);
@@ -822,7 +822,7 @@ 
 		}
 		else
 		{
-			switch($nm['filter'])
+			switch ($nm['filter'])
 			{
 				case 'after':
 					$checked['start'] = $nm['startdate'] ? $nm['startdate'] : strtotime('today');
@@ -835,8 +835,8 @@ 
 					$checked['end'] = $nm['enddate'];
 					break;
 				default:
-					$date = date_create_from_format('Ymd',$this->date);
-					$checked['start']= $date->format('U');
+					$date = date_create_from_format('Ymd', $this->date);
+					$checked['start'] = $date->format('U');
 			}
 		}
 		return $checked;
@@ -860,7 +860,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=calendar.calendar_uiforms.edit&cal_id=$id',
 				'popup' => egw_link::get_registry('calendar', 'view_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'onExecute' => 'javaScript:app.calendar.cal_open',
 				'disableClass' => 'rowNoView',
 			),
@@ -885,7 +885,7 @@ 
 				'group' => $group,
 			),
 		);
-		$status = array_map('lang',$this->bo->verbose_status);
+		$status = array_map('lang', $this->bo->verbose_status);
 		unset($status['G']);
 		$actions['status'] = array(
 			'caption' => 'Change your status',
@@ -894,7 +894,7 @@ 
 			'children' => $status,
 			'group' => ++$group,
 		);
-		++$group;	// integration with other apps: infolog, calendar, filemanager
+		++$group; // integration with other apps: infolog, calendar, filemanager
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
 			$actions['filemanager'] = array(
@@ -926,7 +926,7 @@ 
 				'url' => 'menuaction=timesheet.timesheet_ui.edit&link_app[]=$app&link_id[]=$id',
 				'group' => $group,
 				'allowOnMultiple' => false,
-				'hideOnDisabled' => true,	// show only one timesheet action in context menu
+				'hideOnDisabled' => true, // show only one timesheet action in context menu
 				'onExecute' => 'javaScript:app.calendar.cal_fix_app_id',
 				'popup' => egw_link::get_registry('timesheet', 'add_popup'),
 			);
@@ -935,7 +935,7 @@ 
 				'caption' => 'Timesheet',
 				'group' => $group,
 				'allowOnMultiple' => 'only',
-				'hideOnDisabled' => true,	// show only one timesheet action in context menu
+				'hideOnDisabled' => true, // show only one timesheet action in context menu
 			);
 		}
 		$actions['ical'] = array(
@@ -944,11 +944,11 @@ 
 			'group' => ++$group,
 			'hint' => 'Download this event as iCal',
 			'disableClass' => 'rowNoView',
-			'postSubmit' => true,	// download needs post submit (not Ajax) to work
+			'postSubmit' => true, // download needs post submit (not Ajax) to work
 		);
 		$actions['documents'] = calendar_merge::document_action(
 			$this->bo->cal_prefs['document_dir'], ++$group, 'Insert in document', 'document_',
-			$this->bo->cal_prefs['default_document'],bo_merge::getExportLimit('calendar')
+			$this->bo->cal_prefs['default_document'], bo_merge::getExportLimit('calendar')
 		);
 		++$group;
 		$actions['delete'] = array(
@@ -958,7 +958,7 @@ 
 			'disableClass' => 'rowNoDelete',
 		);
 		// Add in deleted for admins
-		if($GLOBALS['egw_info']['server']['calendar_delete_history'])
+		if ($GLOBALS['egw_info']['server']['calendar_delete_history'])
 		{
 			$actions['undelete'] = array(
 				'caption' => 'Un-delete',

Braces +70 added lines, -18 removed lines

@@ -92,8 +92,14 @@ 
 	 */
 	function listview($content=null,$msg='',$home=false)
 	{
-		if ($_GET['msg']) $msg .= $_GET['msg'];
-		if ($this->group_warning) $msg .= $this->group_warning;
+		if ($_GET['msg'])
+		{
+			$msg .= $_GET['msg'];
+		}
+		if ($this->group_warning)
+		{
+			$msg .= $this->group_warning;
+		}
 
 		$etpl = new etemplate_new('calendar.list');
 
@@ -121,7 +127,8 @@ 
 			{
 				// Allow merge using the date range filter
 				if(strpos($content['nm']['action'],'document') !== false &&
-					!count($content['nm']['selected']) && !$content['nm']['select_all']) {
+					!count($content['nm']['selected']) && !$content['nm']['select_all'])
+				{
 					$content['nm']['selected'][] = $this->get_merge_range($content['nm']);
 				}
 				if (!count($content['nm']['selected']) && !$content['nm']['select_all'])
@@ -178,15 +185,21 @@ 
 			!empty($json_data['request']['parameters'][0]))
 		{
 			parse_str(substr($json_data['request']['parameters'][0], 10), $params);	// cut off "/index.php?"
-			if (isset($params['keywords']))	// new search => set filters so every match is shown
+			if (isset($params['keywords']))
+			{
+				// new search => set filters so every match is shown
 			{
 				$this->adjust_for_search($params['keywords'], $content['nm']);
 			}
+			}
 		}
-		if (isset($_REQUEST['keywords']))	// new search => set filters so every match is shown
+		if (isset($_REQUEST['keywords']))
+		{
+			// new search => set filters so every match is shown
 		{
 			$this->adjust_for_search($_REQUEST['keywords'],$content['nm']);
 		}
+		}
 		$sel_options['filter'] = &$this->date_filters;
 
 		// Send categories for row styling - calendar uses no_cat, so they don't go automatically
@@ -280,9 +293,12 @@ 
 		$old_params = egw_session::appsession('calendar_list','calendar');
 		if (is_array($old_params))
 		{
-			if ($old_params['filter'] && $old_params['filter'] != $params['filter'])	// filter changed => order accordingly
+			if ($old_params['filter'] && $old_params['filter'] != $params['filter'])
+			{
+				// filter changed => order accordingly
 			{
 				$params['order'] = 'cal_start';
+			}
 				$params['sort'] = $params['filter'] == 'after' ? 'ASC' : 'DESC';
 			}
 			if ($old_params['search'] != $params['search'])
@@ -290,7 +306,10 @@ 
 				$this->adjust_for_search($params['search'],$params);
 			}
 		}
-		if (!$params['csv_export']) egw_session::appsession('calendar_list','calendar',$params);
+		if (!$params['csv_export'])
+		{
+			egw_session::appsession('calendar_list','calendar',$params);
+		}
 
 		// do we need to query custom fields and which
 		// Check stored preference if selectcols isn't available (ie: first call)
@@ -304,7 +323,10 @@ 
 			$cfs = array();
 			foreach($select_cols as $col)
 			{
-				if ($col[0] == '#') $cfs[] = substr($col,1);
+				if ($col[0] == '#')
+				{
+					$cfs[] = substr($col,1);
+				}
 			}
 		}
 		$search_params = array(
@@ -330,9 +352,12 @@ 
 				$label = $this->bo->long_date($this->first,$this->last);
 				break;
 			case 'fixed':
-				if ($this->listview_days == 5 || $this->listview_days == 7)	// weekview
+				if ($this->listview_days == 5 || $this->listview_days == 7)
+				{
+					// weekview
 				{
 					$this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
+				}
 					$this->last = $this->bo->date2array($this->first);
 					$this->last['day'] += (int) $this->listview_days - 1;
 					$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
@@ -343,9 +368,12 @@ 
 					$params['enddate'] = $search_params['end'] = $this->last;
 					break;
 				}
-				elseif ((string)$this->listview_days === '0')	// monthview
+				elseif ((string)$this->listview_days === '0')
+				{
+					// monthview
 				{
 					$this->first = $this->bo->date2array($this->date);
+				}
 					$this->first['day'] = 1;
 					unset($this->first['raw']);
 					$this->last = $this->first;
@@ -369,10 +397,13 @@ 
 		{
 			$search_params['users'] = (int) $params['col_filter']['participant'];
 		}
-		elseif(empty($params['search']))	// active search displays entries from all users
+		elseif(empty($params['search']))
+		{
+			// active search displays entries from all users
 		{
 			$search_params['users'] = explode(',',$this->owner);
 		}
+		}
 		if ($params['col_filter'])
 		{
 			$col_filter = array();
@@ -421,8 +452,16 @@ 
 				$event['parts'] = implode(",\n",$this->bo->participants($event,true));
 				$event['date'] = $this->bo->date2string($event['start']);
 			}
-			if (empty($event['description'])) $event['description'] = ' ';	// no description screws the titles horz. alignment
-			if (empty($event['location'])) $event['location'] = ' ';	// no location screws the owner horz. alignment
+			if (empty($event['description']))
+			{
+				$event['description'] = ' ';
+			}
+			// no description screws the titles horz. alignment
+			if (empty($event['location']))
+			{
+				$event['location'] = ' ';
+			}
+			// no location screws the owner horz. alignment
 
 			// respect category permissions
 			if(!empty($event['category']))
@@ -524,7 +563,10 @@ 
 		{
 			$rows['format'] = '64';
 		}
-		if ($this->cat_id) $rows['no_cat_id'] = true;
+		if ($this->cat_id)
+		{
+			$rows['no_cat_id'] = true;
+		}
 		if (!$GLOBALS['egw_info']['user']['apps']['projectmanager'])
 		{
 			$params['options-selectcols']['pm_id'] = false;
@@ -588,7 +630,10 @@ 
 			$this->get_rows($query,$events,$readonlys);
 			foreach($events as $key => $event)
 			{
-				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
+				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked))
+				{
+					unset($events[$key]);
+				}
 			}
 			$checked = array_values($events); // Clear keys
 		}
@@ -602,7 +647,10 @@ 
 				$ids = array();
 				foreach($checked as $id)
 				{
-					if (is_array($id)) $id = $id['id'];
+					if (is_array($id))
+					{
+						$id = $id['id'];
+					}
 					// get rid of recurrences, doublicate series and calendar-integration events
 					if (($id = (int)$id))
 					{
@@ -616,7 +664,10 @@ 
 				common::egw_exit();
 
 			case 'document':
-				if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['calendar']['default_document'];
+				if (!$settings)
+				{
+					$settings = $GLOBALS['egw_info']['user']['preferences']['calendar']['default_document'];
+				}
 				$document_merge = new calendar_merge();
 				$msg = $document_merge->download($settings, $checked, '', $GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']);
 				$failed = count($checked);
@@ -785,7 +836,8 @@ 
 						$success++;
 
 						// Can't link to just one of a recurring series of events
-						if(!$recur_date || $app) {
+						if(!$recur_date || $app)
+						{
 							// Create link
 							$link_id = $app ? $app_id : $id;
 							egw_link::link($app ? $app : 'calendar', $link_id, 'timesheet', $timesheet_bo->data['ts_id']);

calendar/inc/class.calendar_uiviews.inc.php

Doc Comments +10 added lines, -5 removed lines

@@ -713,6 +713,8 @@ 
 	 * @param int &$first timestamp 0h of first day of week containing the first of the current month
 	 * @param int &$last timestamp 23:59:59 of last day of week containg the last day of the current month
 	 * @param int $day = 1 should the alignment be based on the 1. of the month or an other date, eg. the 15.
+	 * @param integer $first
+	 * @param integer $last
 	 */
 	function _week_align_month(&$first,&$last,$day=1)
 	{
@@ -741,6 +743,8 @@ 
 	 *
 	 * @param int &$first timestamp 0h of first day of week containing the first of the current year
 	 * @param int &$last timestamp 23:59:59 of last day of week containg the last day of the current year
+	 * @param integer $first
+	 * @param integer $last
 	 */
 	function _month_align_year(&$first,&$last)
 	{
@@ -1029,7 +1033,7 @@ 
 	 *
 	 * @param array/string $todo_label label for the todo-box or array with 2 values: the label and a boolean show_all
 	 *	On return $todo_label contains the label for the todo-box
-	 * @return string/boolean html with a table of open todo's or false if no hook availible
+	 * @return string html with a table of open todo's or false if no hook availible
 	 */
 	function get_todos(&$todo_label)
 	{
@@ -1580,6 +1584,7 @@ 
 	 * @param int $width width of the widget
 	 * @param string $indent string for correct indention
 	 * @param int $owner owner of the eventCol
+	 * @param double $z_index
 	 */
 	function eventColWidget($events,$left,$width,$indent,$owner,$z_index=null)
 	{
@@ -1607,7 +1612,7 @@ 
 	 * The display of the event and it's tooltip is done via the event_widget.tpl template
 	 *
 	 * @param $event array with the data of event to show
-	 * @param $width int width of the widget
+	 * @param integer $width int width of the widget
 	 * @param string $indent string for correct indention
 	 * @param int $owner owner of the calendar the event is in
 	 * @param boolean $return_array = false should an array with keys(tooltip,popup,html) be returned or the complete widget as string
@@ -1921,7 +1926,7 @@ 
 	 * - 'edit_popup' => '400x300' (optional)
 	 *
 	 * @param string $app
-	 * @param int|string $id
+	 * @param string $id
 	 * @return string
 	 */
 	function integration_get_popup($app,$id)
@@ -1963,7 +1968,7 @@ 
 	 * Icons specified in $events['icons'] are always displayed!
 	 *
 	 * @param string $app
-	 * @param int|string $id
+	 * @param string $id
 	 * @param array $event
 	 * @return array
 	 */
@@ -2072,7 +2077,7 @@ 
 	 * @param array $events events to show
 	 * @param mixed $start start-time of the grid
 	 * @param mixed $end end-time of the grid
-	 * @param string|int $by_cat rows by sub-categories of $by_cat (cat_id or 0 for upmost level) or by 'user' or 'month'
+	 * @param integer $by_cat rows by sub-categories of $by_cat (cat_id or 0 for upmost level) or by 'user' or 'month'
 	 * @param string $indent = '' string for correct indention
 	 * @return string with widget
 	 */

Indentation +6 added lines, -6 removed lines

@@ -2016,12 +2016,12 @@
 	}
 
 	/**
-	* Calculates a brighter color for a given color
-	*
-	* @param $rgb string color as #rrggbb value
-	* @param $decr int value to add to each component, default 64
-	* @return string the brighter color
-	*/
+	 * Calculates a brighter color for a given color
+	 *
+	 * @param $rgb string color as #rrggbb value
+	 * @param $decr int value to add to each component, default 64
+	 * @return string the brighter color
+	 */
 	static function brighter($rgb,$decr=64)
 	{
 		if (!preg_match('/^#?([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})$/',$rgb,$components))

Spacing +508 added lines, -512 removed lines

@@ -42,7 +42,7 @@ 
 	 *
 	 * @var mixed
 	 */
-	var $debug=false;
+	var $debug = false;
 
 	/**
 	 * minimum width for an event
@@ -100,21 +100,21 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $use_time_grid=true;
+	var $use_time_grid = true;
 
 	/**
 	 * Can we display the whole day in a timeGrid of the size of the workday and just scroll to workday start
 	 *
 	 * @var boolean
 	 */
-	var $scroll_to_wdstart=false;
+	var $scroll_to_wdstart = false;
 
 	/**
 	 * counter for the current whole day event of a single day
 	 *
 	 * @var int
 	 */
-	var $wholeDayPosCounter=1;
+	var $wholeDayPosCounter = 1;
 
 	/**
 	 * Switch to disable private data and possibility to view and edit events
@@ -137,9 +137,9 @@ 
 	 *
 	 * @param array $set_states = null to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function __construct($set_states=null)
+	function __construct($set_states = null)
 	{
-		parent::__construct(false,$set_states);	// call the parent's constructor
+		parent::__construct(false, $set_states); // call the parent's constructor
 		$this->extraRowsOriginal = $this->extraRows; //save original extraRows value
 
 		$GLOBALS['egw_info']['flags']['nonavbar'] = False;
@@ -154,14 +154,14 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].
 			(isset($app_header[$this->view]) ? ' - '.$app_header[$this->view] : '').
 			// for a single owner we add it's name to the app-header
-			(count(explode(',',$this->owner)) == 1 ? ': '.$this->bo->participant_name($this->owner) : '');
+			(count(explode(',', $this->owner)) == 1 ? ': '.$this->bo->participant_name($this->owner) : '');
 
 		// standard params for calling bocal::search for all views
-		$this->owner = str_replace('%2C',',',$this->owner);
+		$this->owner = str_replace('%2C', ',', $this->owner);
 		$this->search_params = array(
 			'start'   => $this->date,
-			'cat_id'  => $this->cat_id ? (is_array($this->cat_id)?$this->cat_id:explode(',',$this->cat_id)) : 0,
-			'users'   => explode(',',$this->owner),
+			'cat_id'  => $this->cat_id ? (is_array($this->cat_id) ? $this->cat_id : explode(',', $this->cat_id)) : 0,
+			'users'   => explode(',', $this->owner),
 			'filter'  => $this->filter,
 			'daywise' => True,
 			'use_so_events' => $this->test === 'true',
@@ -183,7 +183,7 @@ 
 	 */
 	public function week_number($time)
 	{
-		if (!is_a($time,'DateTime')) $time = new egw_time($time);
+		if (!is_a($time, 'DateTime')) $time = new egw_time($time);
 
 		// if week does not start Monday and $time is Sunday --> add one day
 		if ($this->cal_prefs['weekdaystarts'] != 'Monday' && !($wday = $time->format('w')))
@@ -208,7 +208,7 @@ 
 		// handle views in other files
 		if (!isset($this->public_functions[$this->view]))
 		{
-			$GLOBALS['egw']->redirect_link('/index.php',array('menuaction'=>$this->view_menuaction,'ajax'=>'true'),'calendar');
+			$GLOBALS['egw']->redirect_link('/index.php', array('menuaction'=>$this->view_menuaction, 'ajax'=>'true'), 'calendar');
 		}
 		// get manual to load the right page
 		$GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => 'ManualCalendar'.ucfirst($this->view));
@@ -228,7 +228,7 @@ 
 			'date'       => $this->bo->date2string($this->bo->now_su),
 			'cat_id'     => 0,
 			'filter'     => 'default',
-			'owner'      => substr($this->cal_prefs['mainscreen_showevents'],0,7) == 'planner' && $this->cal_prefs['planner_start_with_group'] ?
+			'owner'      => substr($this->cal_prefs['mainscreen_showevents'], 0, 7) == 'planner' && $this->cal_prefs['planner_start_with_group'] ?
 				$this->cal_prefs['planner_start_with_group'] : $this->user,
 			'multiple'   => 0,
 			'view'       => $this->bo->cal_prefs['mainscreen_showevents'],
@@ -242,7 +242,7 @@ 
 		{
 			$group_warning = '<p class="message" align="center">'.$this->group_warning."</p>\n";
 		}
-		switch($this->cal_prefs['mainscreen_showevents'])
+		switch ($this->cal_prefs['mainscreen_showevents'])
 		{
 			case 'planner_user':
 			case 'planner_cat':
@@ -253,20 +253,20 @@ 
 				return $group_warning.$this->year(true);
 
 			case 'month':
-				return $group_warning.$this->month(0,true);
+				return $group_warning.$this->month(0, true);
 
 			case 'weekN':
 				return $group_warning.$this->weekN(true);
 
 			default:
 			case 'week':
-				return $group_warning.$this->week(0,true);
+				return $group_warning.$this->week(0, true);
 
 			case 'day':
 				return $group_warning.$this->day(true);
 
 			case 'day4':
-				return $group_warning.$this->week(4,true);
+				return $group_warning.$this->week(4, true);
 		}
 	}
 
@@ -275,7 +275,7 @@ 
 	 *
 	 * @param boolean $home = false if true return content suitable for home-page
 	 */
-	function &planner($home=false)
+	function &planner($home = false)
 	{
 		if ($this->sortby == 'month')	// yearly planner with month rows
 		{
@@ -284,50 +284,50 @@ 
 			unset($this->first['raw']);
 			$this->last = $this->first;
 			$this->last['year']++;
-			$this->last = $this->bo->date2ts($this->last)-1;
+			$this->last = $this->bo->date2ts($this->last) - 1;
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('yearly planner').' '.
-				lang(egw_time::to($this->first,'F')).' '.egw_time::to($this->first,'Y').' - '.
-				lang(egw_time::to($this->last,'F')).' '.egw_time::to($this->last,'Y');
+				lang(egw_time::to($this->first, 'F')).' '.egw_time::to($this->first, 'Y').' - '.
+				lang(egw_time::to($this->last, 'F')).' '.egw_time::to($this->last, 'Y');
 		}
 		elseif (!$this->planner_days)	// planner monthview
 		{
 			if ($this->day < 15)	// show one complete month
 			{
-				$this->_week_align_month($this->first,$this->last);
-				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
+				$this->_week_align_month($this->first, $this->last);
+				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F', $this->bo->date2ts($this->date))).' '.$this->year;
 			}
 			else	// show 2 half month
 			{
-				$this->_week_align_month($this->first,$this->last,15);
-				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F',$this->first)).' / '.lang(adodb_date('F',$this->last)).' '.$this->year;
+				$this->_week_align_month($this->first, $this->last, 15);
+				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F', $this->first)).' / '.lang(adodb_date('F', $this->last)).' '.$this->year;
 			}
 		}
 		elseif ($this->planner_days >= 5)	// weeekview
 		{
-			$this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
+			$this->first = $this->datetime->get_weekday_start($this->year, $this->month, $this->day);
 			$this->last = $this->bo->date2array($this->first);
-			$this->last['day'] += (int) $this->planner_days - 1;
+			$this->last['day'] += (int)$this->planner_days - 1;
 			$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
 			unset($this->last['raw']);
 			$this->last = $this->bo->date2ts($this->last);
-			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Week').' '.$this->week_number($this->first).': '.$this->bo->long_date($this->first,$this->last);
+			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Week').' '.$this->week_number($this->first).': '.$this->bo->long_date($this->first, $this->last);
 		}
 		else // dayview
 		{
 			$this->first = $this->bo->date2ts($this->date);
 			$this->last = $this->bo->date2array($this->first);
-			$this->last['day'] += (int) $this->planner_days - 1;
+			$this->last['day'] += (int)$this->planner_days - 1;
 			$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
 			unset($this->last['raw']);
 			$this->last = $this->bo->date2ts($this->last);
-			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.($this->planner_days == 1 ? lang(date('l',$this->first)).', ' : '').
-				$this->bo->long_date($this->first,$this->planner_days > 1 ? $this->last : 0);
+			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.($this->planner_days == 1 ? lang(date('l', $this->first)).', ' : '').
+				$this->bo->long_date($this->first, $this->planner_days > 1 ? $this->last : 0);
 		}
 
 		$merge = $this->merge();
-		if($merge)
+		if ($merge)
 		{
-			egw::redirect_link('/index.php',array(
+			egw::redirect_link('/index.php', array(
 				'menuaction' => 'calendar.calendar_uiviews.index',
 				'msg'        => $merge,
 			));
@@ -338,11 +338,11 @@ 
 		$search_params['start'] = $this->first;
 		$search_params['end'] = $this->last;
 		$search_params['enum_groups'] = $this->sortby == 'user';
-		$events =& $this->bo->search($search_params);
+		$events = & $this->bo->search($search_params);
 
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3',False,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3', False, $this->date, $this->bo->date2string($this->first), $this->bo->date2string($this->last));
 
-		$content =& $this->plannerWidget($events,$this->first,$this->last,$this->sortby != 'category' ? $this->sortby : (int) $this->cat_id);
+		$content = & $this->plannerWidget($events, $this->first, $this->last, $this->sortby != 'category' ? $this->sortby : (int)$this->cat_id);
 
 
 		if (!$home)
@@ -359,11 +359,11 @@ 
 	 *
 	 * @param boolean $home = false if true return content suitable for home-page
 	 */
-	function &weekN($home=false)
+	function &weekN($home = false)
 	{
-		if (($num = (int)$this->cal_prefs['multiple_weeks']) < 2) $num = 3;	// default 3 weeks
+		if (($num = (int)$this->cal_prefs['multiple_weeks']) < 2) $num = 3; // default 3 weeks
 
-		return $this->month($num,$home);
+		return $this->month($num, $home);
 	}
 
 	/** Month column width (usually 3 or 4) in year view */
@@ -374,25 +374,25 @@ 
 	 *
 	 * @param boolean $home = false if true return content suitable for home-page
 	 */
-	function &year($home=false)
+	function &year($home = false)
 	{
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::year date=%2',True,$this->date);
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::year date=%2', True, $this->date);
 
 
-		$this->_month_align_year($this->first,$this->last);
+		$this->_month_align_year($this->first, $this->last);
 
 		$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$this->year;
 
 		$merge = $this->merge();
-		if($merge)
+		if ($merge)
 		{
-			egw::redirect_link('/index.php',array(
+			egw::redirect_link('/index.php', array(
 				'menuaction' => 'calendar.calendar_uiviews.index',
 				'msg'        => $merge,
 			));
 		}
 
-		$days =& $this->bo->search(array(
+		$days = & $this->bo->search(array(
 			'start'   => $this->first,
 			'end'     => $this->last,
 		) + $this->search_params);
@@ -407,14 +407,14 @@ 
 				$content .= "\t".'<div class="calDayColsNoGrip">'."\n";
 			}
 
-			$month_start = $this->datetime->get_weekday_start($this->year,$month,1);
+			$month_start = $this->datetime->get_weekday_start($this->year, $month, 1);
 			// Beginning of the last week in the month
 			$month_end = $this->datetime->get_weekday_start(
 							$this->year,
 							$month,
-							$this->datetime->days_in_month($month,$this->year));
+							$this->datetime->days_in_month($month, $this->year));
 			// End of the last week in month
-			$month_end = strtotime("+6 days",$month_end);
+			$month_end = strtotime("+6 days", $month_end);
 
 			$content .= "\t\t".'<div class="calendar_calDayCol" style="left: '.
 				((($month - 1) % self::YEARVIEW_COLS) * (100 / self::YEARVIEW_COLS)).'%; width: '.
@@ -422,26 +422,26 @@ 
 
 			// Year Header
 			$content .= "\t\t\t".'<div class="calendar_calDayColHeader '.($month % 2 == 0 ? "th" : "row_on").'"'.
-				' style="height: 20px; line-height: 20px; z-index: 0;" title="'.lang(adodb_date('F',strtotime("+1 week",$month_start))).' '.adodb_date('Y',strtotime("+1 week",$month_start)).'">'."\n";
+				' style="height: 20px; line-height: 20px; z-index: 0;" title="'.lang(adodb_date('F', strtotime("+1 week", $month_start))).' '.adodb_date('Y', strtotime("+1 week", $month_start)).'">'."\n";
 			if (($month) == 1)
 			{
 				$content .= '<span style="position: absolute; left: 0px;">';
-				$content .= html::a_href(html::image('phpgwapi','first',lang('previous'),$options=' alt="<<"'),array(
+				$content .= html::a_href(html::image('phpgwapi', 'first', lang('previous'), $options = ' alt="<<"'), array(
 					'menuaction' => $this->view_menuaction,
-					'date'       => date('Ymd',strtotime('-1 year',strtotime($this->date))),
+					'date'       => date('Ymd', strtotime('-1 year', strtotime($this->date))),
 				));
 				$content .= '</span>'."\n";
 			}
 			$content .= "\t\t\t\t".'<a href="'.$GLOBALS['egw']->link('/index.php',
 				array('menuaction'=>'calendar.calendar_uiviews.month',
 				'date'=>$this->year.($month < 10 ? '0' : '').$month.'01')).
-				'" title="'.lang('Monthview').'">'.lang(adodb_date('F',strtotime("+1 week",$month_start))).'</a>'."\n";
+				'" title="'.lang('Monthview').'">'.lang(adodb_date('F', strtotime("+1 week", $month_start))).'</a>'."\n";
 			if ($month == self::YEARVIEW_COLS)
 			{
 				$content .= '<span style="position: absolute; right: 0px;">';
-				$content .= html::a_href(html::image('phpgwapi','last',lang('next'),$options=' alt=">>"'),array(
+				$content .= html::a_href(html::image('phpgwapi', 'last', lang('next'), $options = ' alt=">>"'), array(
 					'menuaction' => $this->view_menuaction,
-					'date'       => date('Ymd',strtotime('+1 year',strtotime($this->date))),
+					'date'       => date('Ymd', strtotime('+1 year', strtotime($this->date))),
 				));
 				$content .= '</span>'."\n";
 			}
@@ -455,8 +455,8 @@ 
 			// Day Columns, Legend
 			for ($i = 0; $i <= 6; $i++)
 			{
-				$day_date = ($i ? strtotime("+$i days",$month_start) : $month_start);
-				if (adodb_date('w',$day_date) % 6 == 0)
+				$day_date = ($i ? strtotime("+$i days", $month_start) : $month_start);
+				if (adodb_date('w', $day_date) % 6 == 0)
 				{
 					$style = 'calendar_cal_year_legend_weekend';
 				}
@@ -467,13 +467,13 @@ 
 
 				$content .= "\t\t\t\t".'<div class="'.$style.'"'.
 					' style="text-align: center; position: absolute; width: 11.5%; height: 16px; left: '.((($i + 1) * 12.5) + 0.5).'%;">'.
-					lang(adodb_date('D',$day_date)).'</div>'."\n";
+					lang(adodb_date('D', $day_date)).'</div>'."\n";
 			}
 			$content .= "\t\t\t".'</div>'."\n";
 
 			// Week rows in month
 			$week_start = $month_start;
-			for ($week_in_month = 1; $week_in_month <= 6; $week_in_month ++)
+			for ($week_in_month = 1; $week_in_month <= 6; $week_in_month++)
 			{
 				$content .= "\t\t\t".'<div'.
 						' style="position: absolute; width: 100%; height: 16px;'.
@@ -481,7 +481,7 @@ 
 
 				$content .= "\t\t\t\t".'<div class="calendar_cal_year_legend"'.
 					' style="text-align: center;position: absolute; width: 11.5%; height: 16px; left: 0.5%;" '.
-					'title="'.lang('Wk').' '.$this->week_number($week_start).'/'.adodb_date('Y',$week_start).'">'."\n";
+					'title="'.lang('Wk').' '.$this->week_number($week_start).'/'.adodb_date('Y', $week_start).'">'."\n";
 				$content .= "\t\t\t\t\t".
 					'<a href="'.$GLOBALS['egw']->link('/index.php',
 								array('menuaction'=>'calendar.calendar_uiviews.week',
@@ -491,13 +491,13 @@ 
 				// Day columns in week row
 				for ($i = 0; $i <= 6; $i++)
 				{
-					$day_date = $i ? strtotime("+$i days",$week_start) : $week_start;
+					$day_date = $i ? strtotime("+$i days", $week_start) : $week_start;
 					$day_ymd = $this->bo->date2string($day_date);
 					$eventcount = count($days[$day_ymd]);
 					$in_month = true;
 					$css_class = "";
-					$this->_day_class_holiday($day_ymd,$class,$holidays,false,false);
-					if (adodb_date('n',$day_date) != $month)
+					$this->_day_class_holiday($day_ymd, $class, $holidays, false, false);
+					if (adodb_date('n', $day_date) != $month)
 					{
 						$css_class .= 'calendar_cal_year_legend';
 						$in_month = false;
@@ -505,7 +505,7 @@ 
 					else
 					{
 						$css_class .= 'calendar_calEvent calendar_calEventAllAccepted';
-						if (adodb_date('w',$day_date) % 6 == 0)
+						if (adodb_date('w', $day_date) % 6 == 0)
 						{
 							$css_class .= ' calendar_cal_year_weekend';
 						}
@@ -535,12 +535,12 @@ 
 					{
 						$content .= ' title="'.$holidays.'"';
 					}
-					$content .= '>'.adodb_date('d',$day_date).'</div>'."\n";
+					$content .= '>'.adodb_date('d', $day_date).'</div>'."\n";
 
 
 					if (($in_month) && (count($days[$day_ymd])))
 					{
-						$eventCols = $this->getEventCols($day_ymd,$days[$day_ymd]);
+						$eventCols = $this->getEventCols($day_ymd, $days[$day_ymd]);
 						// displaying all event columns of the day
 						$row_height = 100 / count($eventCols);
 						$space_left = 4; //%
@@ -549,19 +549,19 @@ 
 						// settings for time2pos
 						$this->scroll_to_wdstart = false;
 						$this->wd_start = 0;
-						$this->wd_end = 24*60;
+						$this->wd_end = 24 * 60;
 						$this->granularity_m = 24 * 60;
 						$this->extraRows = -1;
 						$this->remBotExtraRows = 0;
 						$this->rowHeight = $row_width;
-						foreach($eventCols as $n => $eventCol)
+						foreach ($eventCols as $n => $eventCol)
 						{
 							foreach ($eventCol as $event)
 							{
 								$indent = "\t\t\t\t";
 								// some fields set by the dayColWidget for the other views
 								unset($event['whole_day_on_top']);
-								$data = $this->eventWidget($event,25,$indent,$this->owner,true,'planner_event');
+								$data = $this->eventWidget($event, 25, $indent, $this->owner, true, 'planner_event');
 
 								$left = ((($i + 1) * 12.5) + 0.5 + $space_left + $this->time2pos($event['start_m']));
 								$width = $this->time2pos($event['end_m'] - $event['start_m']);
@@ -569,7 +569,7 @@ 
 
 								$tooltip = html::htmlspecialchars($data['tooltip']);
 								$content .= $indent.'<div class="calendar_plannerEvent'.($data['private'] ? 'Private' : '').
-									'" data-tooltip ="'.$tooltip .
+									'" data-tooltip ="'.$tooltip.
 									'" style="position: absolute; left: '.$left.'%; width: '.$width.'%; height: '.
 									$row_height.'%; top: '.($n * $row_height).'%;'.
 									'background-color: '.$color.';" '.'" data-date ="'.$this->bo->date2string($event['start']).'|'.$data['popup'].'" '.
@@ -578,7 +578,7 @@ 
 						}
 					}
 				}
-				$week_start = strtotime("+1 week",$week_start);
+				$week_start = strtotime("+1 week", $week_start);
 				$content .= "\t\t\t".'</div>'."\n";
 			}
 			$content .= "\t\t".'</div>'."\n";
@@ -606,35 +606,35 @@ 
 	 * @param int $weeks = 0 number of weeks to show, if 0 (default) all weeks of one month are shown
 	 * @param boolean $home = false if true return content suitable for home-page
 	 */
-	function &month($weeks=0,$home=false)
+	function &month($weeks = 0, $home = false)
 	{
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date);
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2', True, $weeks, $this->date);
 
-		$this->use_time_grid = !$this->cal_prefs['use_time_grid'] || $this->cal_prefs['use_time_grid'] == 'all'; 	// all views
+		$this->use_time_grid = !$this->cal_prefs['use_time_grid'] || $this->cal_prefs['use_time_grid'] == 'all'; // all views
 
 		// Merge print
-		if($weeks)
+		if ($weeks)
 		{
 			// Split up span into multiple weeks
 			$timespan = array();
-			$this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
-			for($i = 0; $i < $weeks; $i++)
+			$this->first = $this->datetime->get_weekday_start($this->year, $this->month, $this->day);
+			for ($i = 0; $i < $weeks; $i++)
 			{
 				$timespan[] = array(
 					'start' => strtotime("+$i weeks", $this->first),
-					'end' => strtotime('+' . ($i+1).' weeks', $this->first) -1
+					'end' => strtotime('+'.($i + 1).' weeks', $this->first) - 1
 				);
 			}
 		} else {
 			$timespan[] = array(
-				'start' => mktime(0,0,0,$this->month,1,$this->year),
-				'end' => mktime(0,0,0,$this->month+1,1,$this->year)-1
+				'start' => mktime(0, 0, 0, $this->month, 1, $this->year),
+				'end' => mktime(0, 0, 0, $this->month + 1, 1, $this->year) - 1
 			);
 		}
 		$merge = $this->merge($timespan);
-		if($merge)
+		if ($merge)
 		{
-			egw::redirect_link('/index.php',array(
+			egw::redirect_link('/index.php', array(
 				'menuaction' => 'calendar.calendar_uiviews.index',
 				'msg'        => $merge,
 			));
@@ -642,34 +642,34 @@ 
 
 		if ($weeks)
 		{
-			$this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
-			$this->last = strtotime("+$weeks weeks",$this->first) - 1;
+			$this->first = $this->datetime->get_weekday_start($this->year, $this->month, $this->day);
+			$this->last = strtotime("+$weeks weeks", $this->first) - 1;
 			$weekNavH = "$weeks weeks";
 			$navHeader = lang('Week').' '.$this->week_number($this->first).' - '.$this->week_number($this->last).': '.
-				$this->bo->long_date($this->first,$this->last);
+				$this->bo->long_date($this->first, $this->last);
 		}
 		else
 		{
-			$this->_week_align_month($this->first,$this->last);
+			$this->_week_align_month($this->first, $this->last);
 			$weekNavH = "1 month";
-			$navHeader = lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
+			$navHeader = lang(adodb_date('F', $this->bo->date2ts($this->date))).' '.$this->year;
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4',False,$weeks,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4', False, $weeks, $this->date, $this->bo->date2string($this->first), $this->bo->date2string($this->last));
 
 		$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$navHeader;
 
-		$days =& $this->bo->search(array(
+		$days = & $this->bo->search(array(
 			'start'   => $this->first,
 			'end'     => $this->last,
-		)+$this->search_params);
+		) + $this->search_params);
 
 		// we add DAY_s/2 to $this->first (using 12h), to deal with daylight saving changes
-		for ($week_start = $this->first; $week_start < $this->last; $week_start = strtotime("+1 week",$week_start))
+		for ($week_start = $this->first; $week_start < $this->last; $week_start = strtotime("+1 week", $week_start))
 		{
 			$week = array();
 			for ($i = 0; $i < 7; ++$i)
 			{
-				$day_ymd = $this->bo->date2string($i ? strtotime("+$i days",$week_start) : $week_start);
+				$day_ymd = $this->bo->date2string($i ? strtotime("+$i days", $week_start) : $week_start);
 				$week[$day_ymd] = array_shift($days);
 			}
 			$week_view = array(
@@ -679,21 +679,21 @@ 
 			$title = lang('Wk').' '.$this->week_number($week_start);
 			if ($this->allowEdit)
 			{
-				$title = html::a_href($title,$week_view,'',' title="'.lang('Weekview').'"');
+				$title = html::a_href($title, $week_view, '', ' title="'.lang('Weekview').'"');
 			}
 
-			$content .= $this->timeGridWidget($this->tagWholeDayOnTop($week),$weeks == 2 ? 30 : 60,200,'',$title,0,$week_start+WEEK_s >= $this->last);
+			$content .= $this->timeGridWidget($this->tagWholeDayOnTop($week), $weeks == 2 ? 30 : 60, 200, '', $title, 0, $week_start + WEEK_s >= $this->last);
 		}
 
 		$navHeader = '<div class="calendar_calMonthNavHeader calendar_calMonth">'
-				.html::a_href(html::image('phpgwapi','left',lang('previous'),$options=' alt="<<"'),array(
+				.html::a_href(html::image('phpgwapi', 'left', lang('previous'), $options = ' alt="<<"'), array(
 				'menuaction' => $this->view_menuaction,
-				'date'       => date('Ymd',strtotime("-".$weekNavH,  $weeks? $this->first: $this->bo->date2ts($this->date))),
-				)). ' <span>'.$navHeader;
+				'date'       => date('Ymd', strtotime("-".$weekNavH, $weeks ? $this->first : $this->bo->date2ts($this->date))),
+				)).' <span>'.$navHeader;
 
-		$navHeader = $navHeader.'</span> '.html::a_href(html::image('phpgwapi','right',lang('next'),$options=' alt=">>"'),array(
+		$navHeader = $navHeader.'</span> '.html::a_href(html::image('phpgwapi', 'right', lang('next'), $options = ' alt=">>"'), array(
 				'menuaction' => $this->view_menuaction,
-				'date'       => date('Ymd',strtotime("+".$weekNavH, $weeks? $this->first: $this->bo->date2ts($this->date))),
+				'date'       => date('Ymd', strtotime("+".$weekNavH, $weeks ? $this->first : $this->bo->date2ts($this->date))),
 				)).'</div>';
 		$content = $navHeader.$content;
 		if (!$home)
@@ -714,17 +714,17 @@ 
 	 * @param int &$last timestamp 23:59:59 of last day of week containg the last day of the current month
 	 * @param int $day = 1 should the alignment be based on the 1. of the month or an other date, eg. the 15.
 	 */
-	function _week_align_month(&$first,&$last,$day=1)
+	function _week_align_month(&$first, &$last, $day = 1)
 	{
-		$first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day=$day);
+		$first = $this->datetime->get_weekday_start($this->year, $this->month, $this->day = $day);
 		if ($day == 1)
 		{
-			$last = $this->datetime->get_weekday_start($this->year,$this->month,
-				$this->datetime->days_in_month($this->month,$this->year));
+			$last = $this->datetime->get_weekday_start($this->year, $this->month,
+				$this->datetime->days_in_month($this->month, $this->year));
 		}
 		else
 		{
-			$last = $this->datetime->get_weekday_start($this->year,$this->month+1,$day);
+			$last = $this->datetime->get_weekday_start($this->year, $this->month + 1, $day);
 		}
 		// now we need to calculate the end of the last day of that week
 		// as simple $last += WEEK_s - 1; does NOT work, if daylight saving changes in that week!!!
@@ -732,7 +732,7 @@ 
 		$last['day'] += 6;
 		$last['hour'] = 23;
 		$last['min'] = $last['sec'] = 59;
-		unset($last['raw']);	// otherwise date2ts does not calc raw new, but uses it
+		unset($last['raw']); // otherwise date2ts does not calc raw new, but uses it
 		$last = $this->bo->date2ts($last);
 	}
 
@@ -742,18 +742,18 @@ 
 	 * @param int &$first timestamp 0h of first day of week containing the first of the current year
 	 * @param int &$last timestamp 23:59:59 of last day of week containg the last day of the current year
 	 */
-	function _month_align_year(&$first,&$last)
+	function _month_align_year(&$first, &$last)
 	{
-		$first = $this->datetime->get_weekday_start($this->year,$this->month=1,$this->day=1);
-		$last = $this->datetime->get_weekday_start($this->year,$this->month+12,
-				$this->datetime->days_in_month($this->month+12,$this->year));
+		$first = $this->datetime->get_weekday_start($this->year, $this->month = 1, $this->day = 1);
+		$last = $this->datetime->get_weekday_start($this->year, $this->month + 12,
+				$this->datetime->days_in_month($this->month + 12, $this->year));
 		// now we need to calculate the end of the last day of that week
 		// as simple $last += WEEK_s - 1; does NOT work, if daylight saving changes in that week!!!
 		$last = $this->bo->date2array($last);
 		$last['day'] += 6;
 		$last['hour'] = 23;
 		$last['min'] = $last['sec'] = 59;
-		unset($last['raw']);	// otherwise date2ts does not calc raw new, but uses it
+		unset($last['raw']); // otherwise date2ts does not calc raw new, but uses it
 		$last = $this->bo->date2ts($last);
 	}
 
@@ -763,9 +763,9 @@ 
 	 * @param boolean $home = false if true return content suitable for home-page
 	 * @return string
 	 */
-	function day4($home=false)
+	function day4($home = false)
 	{
-		return $this->week(4,$home);
+		return $this->week(4, $home);
 	}
 
 	/**
@@ -777,7 +777,7 @@ 
 	 */
 	private function close_button($uid)
 	{
-		return html::a_href(html::image('phpgwapi', 'close.button', 'Close','style="width: 12px; padding-top: 1px;"'), array(
+		return html::a_href(html::image('phpgwapi', 'close.button', 'Close', 'style="width: 12px; padding-top: 1px;"'), array(
 			'menuaction' => 'calendar.calendar_uiviews.index',
 			'close' => $uid,
 		));
@@ -789,9 +789,9 @@ 
 	 * @param int $days = 0 number of days to show, if 0 (default) the value from the URL or the prefs is used
 	 * @param boolean $home = false if true return content suitable for home-page
 	 */
-	function week($days=0,$home=false)
+	function week($days = 0, $home = false)
 	{
-		$this->use_time_grid = $days != 4 && !in_array($this->cal_prefs['use_time_grid'],array('day','day4')) ||
+		$this->use_time_grid = $days != 4 && !in_array($this->cal_prefs['use_time_grid'], array('day', 'day4')) ||
 			$days == 4 && $this->cal_prefs['use_time_grid'] != 'day';
 
 		if (!$days)
@@ -800,55 +800,55 @@ 
 			if ($days != 5) $days = 7;
 			if ($days != $this->cal_prefs['days_in_weekview'])	// save the preference
 			{
-				$GLOBALS['egw']->preferences->add('calendar','days_in_weekview',$days);
+				$GLOBALS['egw']->preferences->add('calendar', 'days_in_weekview', $days);
 				$GLOBALS['egw']->preferences->save_repository();
 				$this->cal_prefs['days_in_weekview'] = $days;
 			}
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::week(days=%1) date=%2',True,$days,$this->date);
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::week(days=%1) date=%2', True, $days, $this->date);
 
 		if ($days == 4)		// next 4 days view
 		{
 			$wd_start = $this->first = $this->bo->date2ts($this->date);
-			$this->last = strtotime("+$days days",$this->first) - 1;
-			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Four days view').' '.$this->bo->long_date($this->first,$this->last);
-			$navHeader =lang('Four days view').' '.$this->bo->long_date($this->first,$this->last);
+			$this->last = strtotime("+$days days", $this->first) - 1;
+			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Four days view').' '.$this->bo->long_date($this->first, $this->last);
+			$navHeader = lang('Four days view').' '.$this->bo->long_date($this->first, $this->last);
 		}
 		else
 		{
-			$wd_start = $this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
+			$wd_start = $this->first = $this->datetime->get_weekday_start($this->year, $this->month, $this->day);
 			if ($days == 5)		// no weekend-days
 			{
-				switch($this->cal_prefs['weekdaystarts'])
+				switch ($this->cal_prefs['weekdaystarts'])
 				{
 					case 'Saturday':
-						$this->first = strtotime("+2 days",$this->first);
+						$this->first = strtotime("+2 days", $this->first);
 						break;
 					case 'Sunday':
-						$this->first = strtotime("+1 day",$this->first);
+						$this->first = strtotime("+1 day", $this->first);
 						break;
 				}
 			}
-			$this->last = strtotime("+$days days",$this->first) - 1;
-			$GLOBALS['egw_info']['flags']['app_header'] .=': ' .lang('Week').' '.$this->week_number($this->first).': '.$this->bo->long_date($this->first,$this->last);
-			$navHeader = lang('Week').' '.$this->week_number($this->first).': '.$this->bo->long_date($this->first,$this->last);
+			$this->last = strtotime("+$days days", $this->first) - 1;
+			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Week').' '.$this->week_number($this->first).': '.$this->bo->long_date($this->first, $this->last);
+			$navHeader = lang('Week').' '.$this->week_number($this->first).': '.$this->bo->long_date($this->first, $this->last);
 		}
 
 		$navHeader = '<div class="calendar_calWeek calendar_calWeekNavHeader">'
-				.html::a_href(html::image('phpgwapi','left',lang('previous'),$options=' alt="<<"'),array(
+				.html::a_href(html::image('phpgwapi', 'left', lang('previous'), $options = ' alt="<<"'), array(
 				'menuaction' => $this->view_menuaction,
-				'date'       => date('Ymd', strtotime("-$days days",$this->first)),
-				)). '<span>'.$navHeader;
+				'date'       => date('Ymd', strtotime("-$days days", $this->first)),
+				)).'<span>'.$navHeader;
 
-		$navHeader = $navHeader.'</span>'.html::a_href(html::image('phpgwapi','right',lang('next'),$options=' alt=">>"'),array(
+		$navHeader = $navHeader.'</span>'.html::a_href(html::image('phpgwapi', 'right', lang('next'), $options = ' alt=">>"'), array(
 				'menuaction' => $this->view_menuaction,
-				'date'       => date('Ymd', strtotime("+$days days",$this->last)),
+				'date'       => date('Ymd', strtotime("+$days days", $this->last)),
 				)).'</div>';
 
 		$merge = $this->merge();
-		if($merge)
+		if ($merge)
 		{
-			egw::redirect_link('/index.php',array(
+			egw::redirect_link('/index.php', array(
 				'menuaction' => 'calendar.calendar_uiviews.index',
 				'msg'        => $merge,
 			));
@@ -864,13 +864,13 @@ 
 
 		if (count($users) == 1 || count($users) > $this->bo->calview_no_consolidate)	// for more then X users, show all in one row
 		{
-			$content = $this->timeGridWidget($this->tagWholeDayOnTop($this->bo->search($search_params)),$this->cal_prefs['interval']);
+			$content = $this->timeGridWidget($this->tagWholeDayOnTop($this->bo->search($search_params)), $this->cal_prefs['interval']);
 		}
 		else
 		{
 			$content = '';
 			$headerCounter = 0;
-			foreach(explode(',',$this->owner) as $uid)
+			foreach (explode(',', $this->owner) as $uid)
 			{
 				$label = $this->bo->participant_name($uid);
 				$content .= '<div data-sortable-id="'.$uid.'">';
@@ -878,7 +878,7 @@ 
 				$content .= '<b>'.$label."</b>\n";
 				$content .= $this->close_button($uid);
 				$content .= $this->timeGridWidget($this->tagWholeDayOnTop($this->bo->search($search_params)),
-					count($users) * $this->cal_prefs['interval'],400 / count($users),'','',$uid);
+					count($users) * $this->cal_prefs['interval'], 400 / count($users), '', '', $uid);
 				++$headerCounter;
 				if (count($users) > $headerCounter)
 				{
@@ -907,21 +907,21 @@ 
 	 *
 	 * @param boolean $home = false if true return content suitable for home-page
 	 */
-	function &day($home=false)
+	function &day($home = false)
 	{
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::day() date=%1',True,$this->date);
+		if ($this->debug > 0) $this->bo->debug_message('uiviews::day() date=%1', True, $this->date);
 
 		$this->last = $this->first = $this->bo->date2ts((string)$this->date);
-		$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$this->bo->long_date($this->first,0,false,true);
+		$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$this->bo->long_date($this->first, 0, false, true);
 
-		$this->use_time_grid = true;    // day-view always uses a time-grid, independent what's set in the prefs!
+		$this->use_time_grid = true; // day-view always uses a time-grid, independent what's set in the prefs!
 
-		$this->search_params['end'] = $this->last = $this->first+DAY_s-1;
+		$this->search_params['end'] = $this->last = $this->first + DAY_s - 1;
 
 		$merge = $this->merge();
-		if($merge)
+		if ($merge)
 		{
-			egw::redirect_link('/index.php',array(
+			egw::redirect_link('/index.php', array(
 				'menuaction' => 'calendar.calendar_uiviews.index',
 				'msg'        => $merge,
 			));
@@ -937,14 +937,14 @@ 
 			// for more then X users, show all in one row
 			if (count($users) == 1 || count($users) > $this->bo->calview_no_consolidate)
 			{
-				$dayEvents =& $this->bo->search($this->search_params);
+				$dayEvents = & $this->bo->search($this->search_params);
 				$owner = 0;
 			}
 			else
 			{
 				$dayEvents = $owner = array();
 				$search_params = $this->search_params;
-				foreach($this->_get_planner_users(false) as $uid => $label)
+				foreach ($this->_get_planner_users(false) as $uid => $label)
 				{
 					$search_params['users'] = $uid;
 					list(,$dayEvents['<b>'.$label.'</b>'.$this->close_button($uid)]) = each($this->bo->search($search_params));
@@ -957,32 +957,32 @@ 
 			//types mask accordingly.
 			$display_holidays_event = $GLOBALS['egw_info']['user']['preferences']['calendar']['display_holidays_event'];
 			$this->display_holiday_event_types = array(
-				'bdays' => ((int)$display_holidays_event & 1) != 0,
-				'hdays' => ((int)$display_holidays_event & 2) != 0
+				'bdays' => ((int)$display_holidays_event&1) != 0,
+				'hdays' => ((int)$display_holidays_event&2) != 0
 			);
 
 			//Add the holiday events
 			$holidays = $this->_get_holiday_events($this->date, $this->display_holiday_event_types);
-			foreach($dayEvents as &$events)
+			foreach ($dayEvents as &$events)
 			{
-				$events = array_merge($events,$holidays);
+				$events = array_merge($events, $holidays);
 			}
 			unset($events);
 			unset($holidays);
 
-			$cols[0] =& $this->timeGridWidget($this->tagWholeDayOnTop($dayEvents),$this->cal_prefs['interval'],450,'','',$owner);
+			$cols[0] = & $this->timeGridWidget($this->tagWholeDayOnTop($dayEvents), $this->cal_prefs['interval'], 450, '', '', $owner);
 
 			if (count($users) > 1)
 			{
 				$navHeader = '<div class="calendar_calWeek calendar_calWeekNavHeader">'
-				.html::a_href(html::image('phpgwapi','left',lang('previous'),$options=' alt="<<"'),array(
+				.html::a_href(html::image('phpgwapi', 'left', lang('previous'), $options = ' alt="<<"'), array(
 				'menuaction' => $this->view_menuaction,
-				'date'       => date('Ymd',$this->first-1),
-				)). '<span>'.$this->bo->long_date($this->first,0,false,true);
+				'date'       => date('Ymd', $this->first - 1),
+				)).'<span>'.$this->bo->long_date($this->first, 0, false, true);
 
-				$navHeader = $navHeader.'</span>'.html::a_href(html::image('phpgwapi','right',lang('next'),$options=' alt=">>"'),array(
+				$navHeader = $navHeader.'</span>'.html::a_href(html::image('phpgwapi', 'right', lang('next'), $options = ' alt=">>"'), array(
 				'menuaction' => $this->view_menuaction,
-				'date'       => date('Ymd',$this->last+1),
+				'date'       => date('Ymd', $this->last + 1),
 				)).'</div>';
 			}
 
@@ -991,33 +991,33 @@ 
 			{
 				if ($GLOBALS['egw_info']['user']['apps']['infolog'])
 				{
-					foreach(array('task','phone','note') as $type)
+					foreach (array('task', 'phone', 'note') as $type)
 					{
-						$todo_label .= '&nbsp;'.html::a_href( html::image('infolog',$type,lang('Add')),'infolog.infolog_ui.edit',array(
+						$todo_label .= '&nbsp;'.html::a_href(html::image('infolog', $type, lang('Add')), 'infolog.infolog_ui.edit', array(
 							'type' => $type,
 							'start_time' => $ts,
-						),' data-todo="app|750x590"');
+						), ' data-todo="app|750x590"');
 					}
 				}
 				$cols[1] = html::div(
-					html::div($todo_label,'','calendar_calDayTodosHeader th')."\n".
-					html::div($todos,'','calendar_calDayTodosTable'),'','calendar_calDayTodos');
+					html::div($todo_label, '', 'calendar_calDayTodosHeader th')."\n".
+					html::div($todos, '', 'calendar_calDayTodosTable'), '', 'calendar_calDayTodos');
 				$cols['.1'] = 'width=30%';
 				echo html::table(array(
 					0 => $cols,
 					'.0' => 'valign="top"'
-				),'class="calendar_calDayView"');
+				), 'class="calendar_calDayView"');
 			}
 			else
 			{
-				$cols[0] = $navHeader . $cols[0];
+				$cols[0] = $navHeader.$cols[0];
 				echo $cols[0];
 			}
 
 		}
 		else
 		{
-			$content = $this->timeGridWidget($this->bo->search($this->search_params),$this->cal_prefs['interval'],300);
+			$content = $this->timeGridWidget($this->bo->search($this->search_params), $this->cal_prefs['interval'], 300);
 
 
 			return $content;
@@ -1041,56 +1041,55 @@ 
 			'owner'     => $this->owner == 0 ? $this->user : $this->owner	// num. id of the user, not necessary current user
 		));
 
-		if(is_array($todo_label))
+		if (is_array($todo_label))
 		{
-			list($label,$showall)=$todo_label;
+			list($label, $showall) = $todo_label;
 		}
 		else
 		{
-			$label=$todo_label;
-			$showall=true;
+			$label = $todo_label;
+			$showall = true;
 		}
 		$maxshow = (int)$GLOBALS['egw_info']['user']['preferences']['infolog']['mainscreen_maxshow'];
-		if($maxshow <= 0)
+		if ($maxshow <= 0)
 		{
-			$maxshow=10;
+			$maxshow = 10;
 		}
 		//print_debug("get_todos(): label=$label; showall=$showall; max=$maxshow");
 
 		$content = $todo_label = '';
 		if (is_array($todos_from_hook) && count($todos_from_hook))
 		{
-			foreach($todos_from_hook as $todos)
+			foreach ($todos_from_hook as $todos)
 			{
 				$i = 0;
 				if (is_array($todos))
 				{
 					$todo_label = !empty($label) ? $label : lang("open ToDo's:");
 
-					foreach($todos as $todo)
+					foreach ($todos as $todo)
 					{
-						if(!$showall && ($i++ > $maxshow))
+						if (!$showall && ($i++ > $maxshow))
 						{
 							break;
 						}
 						$icons = '';
-						foreach($todo['icons'] as $name => $app)
+						foreach ($todo['icons'] as $name => $app)
 						{
-							$icons .= ($icons?' ':'').$GLOBALS['egw']->html->image($app,$name,lang($name),'border="0" width="15" height="15"');
+							$icons .= ($icons ? ' ' : '').$GLOBALS['egw']->html->image($app, $name, lang($name), 'border="0" width="15" height="15"');
 						}
 						$class = $class == 'row_on' ? 'row_off' : 'row_on';
-						if($todo['edit']) {
+						if ($todo['edit']) {
 							list($width, $height) = explode('x', $todo['edit']['size']);
 							unset($todo['edit']['size']);
-							$edit_icon_href = html::a_href( $icons, $todo['edit'],'',' data-todo="app|'.$width.'x'.$height.'" ');
-							$edit_href = html::a_href( $todo['title'], $todo['edit'],'',' data-todo="app|750x590" ');
+							$edit_icon_href = html::a_href($icons, $todo['edit'], '', ' data-todo="app|'.$width.'x'.$height.'" ');
+							$edit_href = html::a_href($todo['title'], $todo['edit'], '', ' data-todo="app|750x590" ');
 						}
-						$icon_href = html::a_href($icons,$todo['view']);
+						$icon_href = html::a_href($icons, $todo['view']);
 						$href = html::a_href($todo['title'], $todo['view']);
 						$content .= " <tr class=\"$class\">\n  <td valign=\"top\" width=\"15%\" nowrap>".
-							($this->bo->printer_friendly?$icons:($edit_icon_href ? $edit_icon_href : $icon_href)).
-							"</td>\n  <td>".($this->printer_friendly?$todo['title']:
-							$edit_href)."</td>\n </tr>\n";
+							($this->bo->printer_friendly ? $icons : ($edit_icon_href ? $edit_icon_href : $icon_href)).
+							"</td>\n  <td>".($this->printer_friendly ? $todo['title'] : $edit_href)."</td>\n </tr>\n";
 						/**
 						 * ToDo: add delete and closing action
 						 */
@@ -1117,7 +1116,7 @@ 
 	{
 		if ($this->scroll_to_wdstart)	// we display the complete day - thought only workday is visible without scrolling
 		{
-			return $this->rowHeight * (1 + $this->extraRows + $time/$this->granularity_m);
+			return $this->rowHeight * (1 + $this->extraRows + $time / $this->granularity_m);
 		}
 		// time before workday => condensed in the first $this->extraRows rows
 		if ($this->wd_start > 0 && $time < $this->wd_start)
@@ -1125,18 +1124,18 @@ 
 			$pos = (($this->extraRows - $this->extraRowsOriginal + 1) + ($time / $this->wd_start * ($this->extraRowsOriginal - 1))) * $this->rowHeight;
 		}
 		// time after workday => condensed in the last row
-		elseif ($this->wd_end < 24*60 && $time > $this->wd_end+1*$this->granularity_m)
+		elseif ($this->wd_end < 24 * 60 && $time > $this->wd_end + 1 * $this->granularity_m)
 		{
-			$pos = 100 - (($this->extraRows - $this->remBotExtraRows) * $this->rowHeight * (1 - ($time - $this->wd_end) / (24*60 - $this->wd_end)));
+			$pos = 100 - (($this->extraRows - $this->remBotExtraRows) * $this->rowHeight * (1 - ($time - $this->wd_end) / (24 * 60 - $this->wd_end)));
 		}
 		// time during the workday => 2. row on (= + granularity)
 		else
 		{
-			$pos = $this->rowHeight * (1+$this->extraRows+($time-$this->wd_start)/$this->granularity_m);
+			$pos = $this->rowHeight * (1 + $this->extraRows + ($time - $this->wd_start) / $this->granularity_m);
 		}
-		$pos = round($pos,1);
+		$pos = round($pos, 1);
 
-		if ($this->debug > 3) $this->bo->debug_message('uiviews::time2pos(%1)=%2',False,$time,$pos);
+		if ($this->debug > 3) $this->bo->debug_message('uiviews::time2pos(%1)=%2', False, $time, $pos);
 
 		return $pos;
 	}
@@ -1151,12 +1150,12 @@ 
 	 * @param int $minimum = 0 minimum height
 	 * @return float height in percent
 	 */
-	function times2height($start,$end,$minimum=0)
+	function times2height($start, $end, $minimum = 0)
 	{
 		$minimum = $this->rowHeight;
 		$height = $this->time2pos($end) - $this->time2pos($start);
 
-		if ($this->debug > 3) $this->bo->debug_message('uiviews::times2height(%1,%2,min=%3)=%4',False,$start,$end,$minimum,$height);
+		if ($this->debug > 3) $this->bo->debug_message('uiviews::times2height(%1,%2,min=%3)=%4', False, $start, $end, $minimum, $height);
 
 		return $height >= $minimum ? $height : $minimum;
 	}
@@ -1174,36 +1173,36 @@ 
 	 * @param int/array $owner = 0 owner of the calendar (default 0 = $this->owner) or array with owner for each column
 	 * @param boolean $last = true last timeGrid displayed, default true
 	 */
-	function &timeGridWidget($daysEvents,$granularity_m=30,$height=400,$indent='',$title='',$owner=0,$last=true)
+	function &timeGridWidget($daysEvents, $granularity_m = 30, $height = 400, $indent = '', $title = '', $owner = 0, $last = true)
 	{
-		if ($this->debug > 1 || $this->debug==='timeGridWidget') $this->bo->debug_message('uiviews::timeGridWidget(events=%1,granularity_m=%2,height=%3,,title=%4)',True,$daysEvents,$granularity_m,$height,$title);
+		if ($this->debug > 1 || $this->debug === 'timeGridWidget') $this->bo->debug_message('uiviews::timeGridWidget(events=%1,granularity_m=%2,height=%3,,title=%4)', True, $daysEvents, $granularity_m, $height, $title);
 
 		// determine if the browser supports scrollIntoView: IE4+, firefox1.0+ and safari2.0+ does
 		// then show all hours in a div of the size of the workday and scroll to the workday start
 		// still disabled, as things need to be re-aranged first, to that the column headers are not scrolled
-		$this->scroll_to_wdstart = false;/*$this->use_time_grid && (html::$user_agent == 'msie' ||
+		$this->scroll_to_wdstart = false; /*$this->use_time_grid && (html::$user_agent == 'msie' ||
 			html::$user_agent == 'mozilla' && html::ua_version >= 5.0 ||
 			html::$user_agent == 'safari' && html::ua_version >= 2.0);*/
 
 		if ($this->scroll_to_wdstart)
 		{
-			$this->extraRows = 0;	// no extra rows necessary
+			$this->extraRows = 0; // no extra rows necessary
 			$this->remBotExtraRows = 0;
 			$overflow = 'overflow: scroll;';
 		}
 		$this->granularity_m = $granularity_m;
 		$this->display_start = $this->wd_start - ($this->extraRows * $this->granularity_m);
-		$this->display_end	= $this->wd_end + (($this->extraRows - $this->remBotExtraRows) * $this->granularity_m);
+		$this->display_end = $this->wd_end + (($this->extraRows - $this->remBotExtraRows) * $this->granularity_m);
 
 		if (!$this->wd_end) $this->wd_end = 1440;
 		$totalDisplayMinutes	= $this->wd_end - $this->wd_start;
-		$this->rowsToDisplay	= ($totalDisplayMinutes/$granularity_m)+2+2*$this->extraRows - $this->remBotExtraRows;
-		$this->rowHeight		= round(100/$this->rowsToDisplay,1);
+		$this->rowsToDisplay	= ($totalDisplayMinutes / $granularity_m) + 2 + 2 * $this->extraRows - $this->remBotExtraRows;
+		$this->rowHeight = round(100 / $this->rowsToDisplay, 1);
 
 		// ensure a minimum height of each row
-		if ($height < ($this->rowsToDisplay+1) * 12)
+		if ($height < ($this->rowsToDisplay + 1) * 12)
 		{
-			$height = ($this->rowsToDisplay+1) * 12;
+			$height = ($this->rowsToDisplay + 1) * 12;
 		}
 		$html = $indent.'<div class="calendar_calTimeGrid" style="height: '.$height.'px;'.$overflow.'">'."\n";
 
@@ -1212,13 +1211,13 @@ 
 
 		if ($this->use_time_grid)
 		{
-			$off = false;	// Off-row means a different bgcolor
+			$off = false; // Off-row means a different bgcolor
 			$add_links = count($daysEvents) == 1;
 
 			// the hour rows
-			for($t = $this->scroll_to_wdstart ? 0 : $this->wd_start,$i = 1+$this->extraRows;
-				$t <= $this->wd_end || $this->scroll_to_wdstart && $t < 24*60;
-				$t += $this->granularity_m,++$i)
+			for ($t = $this->scroll_to_wdstart ? 0 : $this->wd_start, $i = 1 + $this->extraRows;
+				$t <= $this->wd_end || $this->scroll_to_wdstart && $t < 24 * 60;
+				$t += $this->granularity_m, ++$i)
 			{
 				$set_id = '';
 				if ($t == $this->wd_start)
@@ -1231,29 +1230,29 @@ 
 					}
 				}
 				$html .= $indent."\t".'<div'.$set_id.' class="calendar_calTimeRow'.($off ? 'Off row_off' : ' row_on').
-					'" style="height: '.$this->rowHeight.'%; top:'. $i*$this->rowHeight .'%;">'."\n";
+					'" style="height: '.$this->rowHeight.'%; top:'.$i * $this->rowHeight.'%;">'."\n";
 				// show time for full hours, allways for 45min interval and at least on every 3 row
 				$time = '';
 				static $show = array(
-					5  => array(0,15,30,45),
-					10 => array(0,30),
-					15 => array(0,30),
-					45 => array(0,15,30,45),
+					5  => array(0, 15, 30, 45),
+					10 => array(0, 30),
+					15 => array(0, 30),
+					45 => array(0, 15, 30, 45),
 				);
-				if (!isset($show[$this->granularity_m]) ? $t % 60 == 0 : in_array($t % 60,$show[$this->granularity_m]))
+				if (!isset($show[$this->granularity_m]) ? $t % 60 == 0 : in_array($t % 60, $show[$this->granularity_m]))
 				{
-					$time = $GLOBALS['egw']->common->formattime(sprintf('%02d',$t/60),sprintf('%02d',$t%60));
+					$time = $GLOBALS['egw']->common->formattime(sprintf('%02d', $t / 60), sprintf('%02d', $t % 60));
 				}
-				if ($add_links) $time = $this->add_link($time,$this->date,(int) ($t/60),$t%60);
+				if ($add_links) $time = $this->add_link($time, $this->date, (int)($t / 60), $t % 60);
 				$html .= $indent."\t\t".'<div class="calendar_calTimeRowTime">'.$time."</div>\n";
-				$html .= $indent."\t</div>\n";	// calendar_calTimeRow
+				$html .= $indent."\t</div>\n"; // calendar_calTimeRow
 				$off = !$off;
 			}
 		}
 		if (is_array($daysEvents) && count($daysEvents))
 		{
-			$numberOfDays	= count($daysEvents);
-			$dayColWidth	= 100/$numberOfDays;
+			$numberOfDays = count($daysEvents);
+			$dayColWidth = 100 / $numberOfDays;
 
 			$dayCols_width = $width - $this->timeRow_width - 1;
 
@@ -1275,9 +1274,9 @@ 
 			}
 			$dayCol_width = $dayCols_width / count($daysEvents);
 			$n = 0;
-			foreach($daysEvents as $day => $events)
+			foreach ($daysEvents as $day => $events)
 			{
-				$this->wholeDayPosCounter=1;
+				$this->wholeDayPosCounter = 1;
 				$short_title = count($daysEvents) > 1;
 				$col_owner = $owner;
 				if (!is_numeric($day))
@@ -1286,15 +1285,15 @@ 
 					$day = $this->date;
 					$col_owner = $owner[$n];
 				}
-				$html .= $this->dayColWidget($day,$events,$n*$dayColWidth,
-					$dayColWidth,$indent."\t\t",$short_title,++$on_off & 1,$col_owner);
+				$html .= $this->dayColWidget($day, $events, $n * $dayColWidth,
+					$dayColWidth, $indent."\t\t", $short_title, ++$on_off&1, $col_owner);
 				++$n;
 			}
 			if (html::$user_agent == 'msie') $html .= "</div>\n";
 
-			$html .= $indent."\t</div>\n";	// calendar_calDayCols
+			$html .= $indent."\t</div>\n"; // calendar_calDayCols
 		}
-		$html .= $indent."</div>\n";	// calendar_calTimeGrid
+		$html .= $indent."</div>\n"; // calendar_calTimeGrid
 
 		if ($this->scroll_to_wdstart)
 		{
@@ -1322,13 +1321,13 @@ 
 
 		// if daylight saving is switched on or off, correct $day_start
 		// gives correct times after 2am, times between 0am and 2am are wrong
-		if(($daylight_diff = $day_start + 12*HOUR_s - ($this->bo->date2ts($day_ymd."T120000"))))
+		if (($daylight_diff = $day_start + 12 * HOUR_s - ($this->bo->date2ts($day_ymd."T120000"))))
 		{
 			$day_start -= $daylight_diff;
 		}
 
 		$eventCols = $col_ends = array();
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
 			$event['multiday'] = False;
 			$event['start_m'] = ($event['start'] - $day_start) / 60;
@@ -1338,19 +1337,19 @@ 
 				$event['multiday'] = True;
 			}
 			$event['end_m'] = ($event['end'] - $day_start) / 60;
-			if ($event['end_m'] >= 24*60)
+			if ($event['end_m'] >= 24 * 60)
 			{
-				$event['end_m'] = 24*60-1;
+				$event['end_m'] = 24 * 60 - 1;
 				$event['multiday'] = True;
 			}
 			if ($this->use_time_grid && !$event['whole_day_on_top'])
 			{
-				for($c = 0; $event['start_m'] < $col_ends[$c]; ++$c);
+				for ($c = 0; $event['start_m'] < $col_ends[$c]; ++$c);
 				$col_ends[$c] = $event['end_m'];
 			}
 			else
 			{
-				$c = 0;		// without grid we only use one column
+				$c = 0; // without grid we only use one column
 			}
 			$eventCols[$c][] = $event;
 		}
@@ -1371,23 +1370,22 @@ 
 	 * @param boolean $on_off = false start with row_on or row_off, default false=row_off
 	 * @param int $owner = 0 if != 0 owner to add to the add-event link
 	 */
-	function dayColWidget($day_ymd,$events,$pleft,$pwidth,$indent,$short_title=True,$on_off=False,$owner=0)
+	function dayColWidget($day_ymd, $events, $pleft, $pwidth, $indent, $short_title = True, $on_off = False, $owner = 0)
 	{
-		if ($this->debug > 1 || $this->debug==='dayColWidget') $this->bo->debug_message('uiviews::dayColWidget(%1,%2,left=%3,width=%4,)',False,$day_ymd,$events,$pleft,$pwidth);
+		if ($this->debug > 1 || $this->debug === 'dayColWidget') $this->bo->debug_message('uiviews::dayColWidget(%1,%2,left=%3,width=%4,)', False, $day_ymd, $events, $pleft, $pwidth);
 		
 		$html = $indent.'<div id="calColumn'.$this->calColumnCounter++.'" class="calendar_calDayCol" '.'data-sortable-id="'.$owner.'" style="left: '.$pleft.
 			'%;width: '.$pwidth.'%;">'."\n";
 
 		// Creation of the header-column with date, evtl. holiday-names and a matching background-color
 		$ts = $this->bo->date2ts((string)$day_ymd);
-		$title = !is_bool($short_title) ? $short_title :
-			($short_title ? lang(adodb_date('l',$ts)).' '.adodb_date('d.',$ts) : $this->bo->long_date($ts,0,false,true));
+		$title = !is_bool($short_title) ? $short_title : ($short_title ? lang(adodb_date('l', $ts)).' '.adodb_date('d.', $ts) : $this->bo->long_date($ts, 0, false, true));
 
 		$day_view = array(
 			'menuaction' => 'calendar.calendar_uiviews.day',
 			'date' => $day_ymd,
 		);
-		$this->_day_class_holiday($day_ymd,$class,$holidays);
+		$this->_day_class_holiday($day_ymd, $class, $holidays);
 		// the weekday and date
 		if (!$short_title && $holidays) $title .= html::htmlspecialchars(': '.$holidays);
 
@@ -1395,26 +1393,26 @@ 
 		{
 			if ($this->allowEdit)
 			{
-				$title = html::a_href($title,$day_view,'',
-					!isset($this->holidays[$day_ymd])?' title="'.$this->bo->long_date($ts,0,false,true).'"':'');
+				$title = html::a_href($title, $day_view, '',
+					!isset($this->holidays[$day_ymd]) ? ' title="'.$this->bo->long_date($ts, 0, false, true).'"' : '');
 			}
 		}
 		elseif ($short_title === false)
 		{
 			// add arrows to go to the previous and next day (dayview only)
-			$day_view['date'] = $this->bo->date2string($ts -= 12*HOUR_s);
+			$day_view['date'] = $this->bo->date2string($ts -= 12 * HOUR_s);
 			if ($this->allowEdit)
 			{
-				$title = html::a_href(html::image('phpgwapi','left',$this->bo->long_date($ts)),$day_view).' <span> '.$title;
+				$title = html::a_href(html::image('phpgwapi', 'left', $this->bo->long_date($ts)), $day_view).' <span> '.$title;
 			}
 			else
 			{
 				$title = $day_view.' <span> '.$title;
 			}
-			$day_view['date'] = $this->bo->date2string($ts += 48*HOUR_s);
+			$day_view['date'] = $this->bo->date2string($ts += 48 * HOUR_s);
 			if ($this->allowEdit)
 			{
-				$title .= ' </span> '.html::a_href(html::image('phpgwapi','right',$this->bo->long_date($ts)),$day_view);
+				$title .= ' </span> '.html::a_href(html::image('phpgwapi', 'right', $this->bo->long_date($ts)), $day_view);
 			}
 			else
 			{
@@ -1422,16 +1420,16 @@ 
 			}
 		}
 		if (is_bool($short_title) || ($short_title != "")) {
-			$html .= $indent."\t".'<div style="height: '. $this->rowHeight .'%;" class="calendar_calDayColHeader '.$class.'"'.
-				($holidays ? ' title="'.html::htmlspecialchars($holidays).'"':'').'>'.$title."</div>\n";
+			$html .= $indent."\t".'<div style="height: '.$this->rowHeight.'%;" class="calendar_calDayColHeader '.$class.'"'.
+				($holidays ? ' title="'.html::htmlspecialchars($holidays).'"' : '').'>'.$title."</div>\n";
 		}
 
 		if ($this->use_time_grid)
 		{
 			// drag and drop: check if the current user has EDIT permissions on the grid
-			if($owner)
+			if ($owner)
 			{
-				$dropPermission = $this->bo->check_perms(EGW_ACL_EDIT,0,$owner);
+				$dropPermission = $this->bo->check_perms(EGW_ACL_EDIT, 0, $owner);
 			}
 			else
 			{
@@ -1439,28 +1437,28 @@ 
 			}
 
 			// adding divs to click on for each row / time-span
-			for($t = $this->scroll_to_wdstart ? 0 : $this->wd_start,$i = 1 + $this->extraRows;
-				$t <= $this->wd_end || $this->scroll_to_wdstart && $t < 24*60;
-				$t += $this->granularity_m,++$i)
+			for ($t = $this->scroll_to_wdstart ? 0 : $this->wd_start, $i = 1 + $this->extraRows;
+				$t <= $this->wd_end || $this->scroll_to_wdstart && $t < 24 * 60;
+				$t += $this->granularity_m, ++$i)
 			{
 				$linkData = array(
 					'menuaction'	=>'calendar.calendar_uiforms.edit',
 					'date'		=> $day_ymd,
-					'hour'		=> sprintf("%02d",floor($t / 60)),
-					'minute'	=> sprintf("%02d",floor($t % 60)),
+					'hour'		=> sprintf("%02d", floor($t / 60)),
+					'minute'	=> sprintf("%02d", floor($t % 60)),
 				);
 				if ($owner) $linkData['owner'] = $owner;
 
-				$droppableDateTime = $linkData['date'] . "T" . $linkData['hour'] . $linkData['minute'];
-				$droppableID='drop_'.$droppableDateTime.'_O'.($owner<0?str_replace('-','group',$owner):$owner);
+				$droppableDateTime = $linkData['date']."T".$linkData['hour'].$linkData['minute'];
+				$droppableID = 'drop_'.$droppableDateTime.'_O'.($owner < 0 ? str_replace('-', 'group', $owner) : $owner);
 				
-				$html .= $indent."\t".'<div id="' . $droppableID . '" style="height:'. $this->rowHeight .'%; top: '. $i*$this->rowHeight .
+				$html .= $indent."\t".'<div id="'.$droppableID.'" style="height:'.$this->rowHeight.'%; top: '.$i * $this->rowHeight.
 					'%;" class="calendar_calAddEvent"';
 				if ($this->allowEdit)
 				{
-					$html .= ' data-date=' .$linkData['date'].'|'.$linkData['hour'].'|'.$linkData['minute'];
+					$html .= ' data-date='.$linkData['date'].'|'.$linkData['hour'].'|'.$linkData['minute'];
 				}
-				if($dropPermission && $owner)
+				if ($dropPermission && $owner)
 				{
 					$html .= ' data-owner ='.$owner;
 
@@ -1470,9 +1468,9 @@ 
 			}
 		}
 
-		$eventCols = $this->getEventCols($day_ymd,$events);
+		$eventCols = $this->getEventCols($day_ymd, $events);
 		// displaying all event columns of the day
-		foreach($eventCols as $n => $eventCol)
+		foreach ($eventCols as $n => $eventCol)
 		{
 			// equal sized columns
 			//$width = 95.0 / count($eventCols);
@@ -1486,14 +1484,14 @@ 
 			else
 			{
 				$width = !$n ? 70 : 50;
-				$left += $n * (100.0-$left) / count($eventCols);
+				$left += $n * (100.0 - $left) / count($eventCols);
 			}
 			if ($left + $width > 100.0) $width = 100.0 - $left;
 			//echo "<p>count(\$eventCols)=".count($eventCols).", n=$n, pWidth=$pwidth, pLeft=$pleft, width=$width, left=$left</p>\n";
-			$html .= $this->eventColWidget($eventCol,$left,$width,$indent."\t",
-				$owner ? $owner : $this->user, 20+10*$n);
+			$html .= $this->eventColWidget($eventCol, $left, $width, $indent."\t",
+				$owner ? $owner : $this->user, 20 + 10 * $n);
 		}
-		$html .= $indent."</div>\n";	// calendar_calDayCol
+		$html .= $indent."</div>\n"; // calendar_calDayCol
 
 		return $html;
 	}
@@ -1510,14 +1508,14 @@ 
 	 *        If the preferences allow birthdays to be displayed, they are cached within the holidays structure.
 	 *        This setting just suppressing the available data in the view.
 	 */
-	function _day_class_holiday($day_ymd,&$class,&$holidays,$only_weekend=false,$show_bdays=true)
+	function _day_class_holiday($day_ymd, &$class, &$holidays, $only_weekend = false, $show_bdays = true)
 	{
 		$class = $holidays = '';
 		$bday = false;
 		if (isset($this->holidays[$day_ymd]))
 		{
 			$h = array();
-			foreach($this->holidays[$day_ymd] as $holiday)
+			foreach ($this->holidays[$day_ymd] as $holiday)
 			{
 				if (isset($holiday['birthyear']))
 				{
@@ -1545,7 +1543,7 @@ 
 					}
 				}
 			}
-			$holidays = implode(', ',$h);
+			$holidays = implode(', ', $h);
 		}
 		if (!$class)
 		{
@@ -1555,7 +1553,7 @@ 
 			}
 			else
 			{
-				$day = (int) date('w',$this->bo->date2ts((string) $day_ymd));
+				$day = (int)date('w', $this->bo->date2ts((string)$day_ymd));
 
 				if ($only_weekend)
 				{
@@ -1563,7 +1561,7 @@ 
 				}
 				else
 				{
-					$class = $day & 1 ? 'row_on' : 'th';
+					$class = $day&1 ? 'row_on' : 'th';
 				}
 			}
 		}
@@ -1581,9 +1579,9 @@ 
 	 * @param string $indent string for correct indention
 	 * @param int $owner owner of the eventCol
 	 */
-	function eventColWidget($events,$left,$width,$indent,$owner,$z_index=null)
+	function eventColWidget($events, $left, $width, $indent, $owner, $z_index = null)
 	{
-		if ($this->debug > 1 || $this->debug==='eventColWidget') $this->bo->debug_message('uiviews::eventColWidget(%1,left=%2,width=%3,)',False,$events,$left,$width);
+		if ($this->debug > 1 || $this->debug === 'eventColWidget') $this->bo->debug_message('uiviews::eventColWidget(%1,left=%2,width=%3,)', False, $events, $left, $width);
 
 		$html = $indent.'<div class="calendar_calEventCol" style="left: '.$left.'%; width:'.$width.'%;'.
 			// the "calendar_calEventCol" spans across a whole column (as the name suggests) - setting the
@@ -1592,9 +1590,9 @@ 
 			// function.
 			//(!is_null($z_index) ? ' z-index:'.$z_index.';' : '').
 			(!$this->use_time_grid ? ' top: '.$this->rowHeight.'%;height: '.(100 - $this->rowHeight).'%;overflow-y:auto;' : '').'">'."\n";
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
-			$html .= $this->eventWidget($event,$width,$indent."\t",$owner,false,'event_widget',$z_index);
+			$html .= $this->eventWidget($event, $width, $indent."\t", $owner, false, 'event_widget', $z_index);
 		}
 		$html .= $indent."</div>\n";
 
@@ -1615,28 +1613,28 @@ 
 	 * @param int $z_index is the z-index of the drag-drobable outer box of the event.
 	 * @return string/array
 	 */
-	function eventWidget($event,$width,$indent,$owner,$return_array=false,$block='event_widget',$z_index=null)
+	function eventWidget($event, $width, $indent, $owner, $return_array = false, $block = 'event_widget', $z_index = null)
 	{
-		if ($this->debug > 1 || $this->debug==='eventWidget') $this->bo->debug_message('uiviews::eventWidget(%1,width=%2)',False,$event,$width);
+		if ($this->debug > 1 || $this->debug === 'eventWidget') $this->bo->debug_message('uiviews::eventWidget(%1,width=%2)', False, $event, $width);
 
-		if($this->use_time_grid && $event['whole_day_on_top']) $block = 'event_widget_wholeday_on_top';
+		if ($this->use_time_grid && $event['whole_day_on_top']) $block = 'event_widget_wholeday_on_top';
 
 		static $tpl = False;
 		if (!$tpl)
 		{
 			$tpl = new Template(common::get_tpl_dir('calendar'));
 
-			$tpl->set_file('event_widget_t','event_widget.tpl');
-			$tpl->set_block('event_widget_t','event_widget');
-			$tpl->set_block('event_widget_t','event_widget_wholeday_on_top');
-			$tpl->set_block('event_widget_t','event_tooltip');
-			$tpl->set_block('event_widget_t','planner_event');
+			$tpl->set_file('event_widget_t', 'event_widget.tpl');
+			$tpl->set_block('event_widget_t', 'event_widget');
+			$tpl->set_block('event_widget_t', 'event_widget_wholeday_on_top');
+			$tpl->set_block('event_widget_t', 'event_tooltip');
+			$tpl->set_block('event_widget_t', 'planner_event');
 		}
-		if (($return_array || $event['start_m'] == 0) && $event['end_m'] >= 24*60-1)
+		if (($return_array || $event['start_m'] == 0) && $event['end_m'] >= 24 * 60 - 1)
 		{
-			if ($return_array && $event['end_m'] > 24*60)
+			if ($return_array && $event['end_m'] > 24 * 60)
 			{
-				$timespan = $this->bo->format_date($event['start'],false).' - '.$this->bo->format_date($event['end']);
+				$timespan = $this->bo->format_date($event['start'], false).' - '.$this->bo->format_date($event['end']);
 			}
 			else
 			{
@@ -1645,49 +1643,49 @@ 
 		}
 		else
 		{
-			$timespan = $this->bo->timespan($event['start_m'],$event['end_m']);
+			$timespan = $this->bo->timespan($event['start_m'], $event['end_m']);
 		}
 		$icons = array();
-		if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
+		if (!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i', $event['id'], $matches))
 		{
 			$app = $matches[1];
 			$app_id = $matches[2];
-			if (($is_private = calendar_bo::integration_get_private($app,$app_id,$event)))
+			if (($is_private = calendar_bo::integration_get_private($app, $app_id, $event)))
 			{
-				$icons[] = html::image('calendar','private');
+				$icons[] = html::image('calendar', 'private');
 			}
 			else
 			{
-				$icons = self::integration_get_icons($app,$app_id,$event);
+				$icons = self::integration_get_icons($app, $app_id, $event);
 			}
 		}
-		elseif($event['id'])
+		elseif ($event['id'])
 		{
-			if (($is_private = !$this->bo->check_perms(EGW_ACL_READ,$event)))
+			if (($is_private = !$this->bo->check_perms(EGW_ACL_READ, $event)))
 			{
-				$icons = array(html::image('calendar','private'));
+				$icons = array(html::image('calendar', 'private'));
 			}
 			else
 			{
 				$icons = $this->event_icons($event);
 			}
 		}
-		$cats  = $this->bo->categories($this->categories->check_list(EGW_ACL_READ, $event['category']),$color);
+		$cats = $this->bo->categories($this->categories->check_list(EGW_ACL_READ, $event['category']), $color);
 		// these values control varius aspects of the geometry of the eventWidget
-		$small_trigger_width = 120 + 20*count($icons);
-		$corner_radius=$width > $small_trigger_width ? 10 : 5;
-		$header_height=$width > $small_trigger_width ? 19 : 12;	// multi_3 icon has a height of 19=16+2*1padding+1border !
+		$small_trigger_width = 120 + 20 * count($icons);
+		$corner_radius = $width > $small_trigger_width ? 10 : 5;
+		$header_height = $width > $small_trigger_width ? 19 : 12; // multi_3 icon has a height of 19=16+2*1padding+1border !
 		if (!$return_array)
 		{
-			$height = $this->times2height($event['start_m'],$event['end_m'],$header_height);
+			$height = $this->times2height($event['start_m'], $event['end_m'], $header_height);
 		}
 		//$body_height = max(0,$height - $header_height - $corner_radius);
-		$border=1;
+		$border = 1;
 		$headerbgcolor = $color ? $color : '#808080';
 		$headercolor = self::brightness($headerbgcolor) > 128 ? 'black' : 'white';
 		// the body-colors (gradient) are calculated from the headercolor, which depends on the cat of an event
-		$bodybgcolor1 = $this->brighter($headerbgcolor,$headerbgcolor == '#808080' ? 100 : 170);
-		$bodybgcolor2 = $this->brighter($headerbgcolor,220);
+		$bodybgcolor1 = $this->brighter($headerbgcolor, $headerbgcolor == '#808080' ? 100 : 170);
+		$bodybgcolor2 = $this->brighter($headerbgcolor, 220);
 
 		// mark event as invitation, by NOT using category based background color, but plain white
 		if ($event['participants'][$this->user][0] == 'U')
@@ -1697,11 +1695,11 @@ 
 
 		// get status class of event: calendar_calEventAllAccepted, calendar_calEventAllAnswered or calendar_calEventSomeUnknown
 		$status_class = 'calendar_calEventAllAccepted';
-		foreach($event['participants'] as $id => $status)
+		foreach ($event['participants'] as $id => $status)
 		{
-			if ($id < 0) continue;	// as we cant accept/reject groups, we dont care about them here
+			if ($id < 0) continue; // as we cant accept/reject groups, we dont care about them here
 
-			calendar_so::split_status($status,$quantity,$role);
+			calendar_so::split_status($status, $quantity, $role);
 
 			switch ($status)
 			{
@@ -1710,7 +1708,7 @@ 
 					break;
 				case 'U':
 					$status_class = 'calendar_calEventSomeUnknown';
-					break 2;	// break foreach
+					break 2; // break foreach
 				default:
 					$status_class = 'calendar_calEventAllAnswered';
 					break;
@@ -1720,48 +1718,46 @@ 
 		$part_array = array();
 		if ($this->allowEdit)
  		{
-			foreach($this->bo->participants($event) as $part_key => $participant)
+			foreach ($this->bo->participants($event) as $part_key => $participant)
  			{
-				if(is_numeric($part_key))
+				if (is_numeric($part_key))
 				{
 					$part_array[lang('Participants')][$part_key] = $participant;
 				}
-				elseif(isset($this->bo->resources[$part_key[0]]))
+				elseif (isset($this->bo->resources[$part_key[0]]))
 				{
 					 $part_array[((isset($this->bo->resources[$part_key[0]]['participants_header'])) ? $this->bo->resources[$part_key[0]]['participants_header'] : lang($this->bo->resources[$part_key[0]]['app']))][$part_key] = $participant;
 				}
  			}
-			foreach($part_array as $part_group => $participant)
+			foreach ($part_array as $part_group => $participant)
  			{
-				$participants .= $this->add_nonempty($participant,$part_group,True,False,false);
+				$participants .= $this->add_nonempty($participant, $part_group, True, False, false);
  			}
  		}
 		// as we only deal with percentual widht, we consider only the full dayview (1 colum) as NOT small
 		$small = $this->view != 'day' || $width < 50;
 		// $small = $width <= $small_trigger_width
 
-		$small_height = $this->use_time_grid && ( $event['end_m']-$event['start_m'] < 2*$this->granularity_m ||
+		$small_height = $this->use_time_grid && ($event['end_m'] - $event['start_m'] < 2 * $this->granularity_m ||
 			$event['end_m'] <= $this->wd_start || $event['start_m'] >= $this->wd_end);
 
 		$tpl->set_var(array(
 			// event-content, some of it displays only if it really has content or is needed
 			'owner' => $GLOBALS['egw']->common->grab_owner_name($event['owner']),
-			'header_icons' => $small ? '' : implode("",$icons),
-			'body_icons' => $small ? implode("\n",$icons) : '',
-			'icons' => implode('',$icons),
+			'header_icons' => $small ? '' : implode("", $icons),
+			'body_icons' => $small ? implode("\n", $icons) : '',
+			'icons' => implode('', $icons),
 			'timespan' => $timespan,
 			'title' => ($title = !$is_private ? html::htmlspecialchars($event['title']) : lang('private')),
 			'header' => $small_height ? $title : $timespan,
 			'description' => !$is_private ? nl2br(html::htmlspecialchars($event['description'])) : '',
-			'location'   => !$is_private ? $this->add_nonempty($event['location'],lang('Location')) : '',
+			'location'   => !$is_private ? $this->add_nonempty($event['location'], lang('Location')) : '',
 			'participants' => $participants,
-			'times' => !$event['multiday'] ? $this->add_nonempty($this->bo->timespan($event['start_m'],$event['end_m'],true),lang('Time')) :
-				$this->add_nonempty($this->bo->format_date($event['start']),lang('Start')).
-				$this->add_nonempty($this->bo->format_date($event['end']),lang('End')),
-			'multidaytimes' => !$event['multiday'] ? '' :
-				$this->add_nonempty($this->bo->format_date($event['start']),lang('Start')).
-				$this->add_nonempty($this->bo->format_date($event['end']),lang('End')),
-			'category' => !$is_private ? $this->add_nonempty($cats,lang('Category')) : '',
+			'times' => !$event['multiday'] ? $this->add_nonempty($this->bo->timespan($event['start_m'], $event['end_m'], true), lang('Time')) : $this->add_nonempty($this->bo->format_date($event['start']), lang('Start')).
+				$this->add_nonempty($this->bo->format_date($event['end']), lang('End')),
+			'multidaytimes' => !$event['multiday'] ? '' : $this->add_nonempty($this->bo->format_date($event['start']), lang('Start')).
+				$this->add_nonempty($this->bo->format_date($event['end']), lang('End')),
+			'category' => !$is_private ? $this->add_nonempty($cats, lang('Category')) : '',
 			// the tooltip is based on the content of the actual widget, this way it takes no extra bandwidth/volum
 //			'tooltip' => html::tooltip(False,False,array('BorderWidth'=>0,'Padding'=>0)),
 			// various aspects of the geometry or style
@@ -1769,7 +1765,7 @@ 
 			'header_height' => $header_height.'px',
 			//'body_height' => $body_height.'px',
 			'height' => $height,
-			'width' => ($width-20).'px',
+			'width' => ($width - 20).'px',
 			'border' => $border,
 			'bordercolor' => $headerbgcolor,
 			'headerbgcolor' => $headerbgcolor,
@@ -1777,7 +1773,7 @@ 
 			'bodybackground' => ($background = 'url('.$GLOBALS['egw_info']['server']['webserver_url'].
 				'/calendar/inc/gradient.php?color1='.urlencode($bodybgcolor1).'&color2='.urlencode($bodybgcolor2).
 				'&width='.$width.') repeat-y '.$bodybgcolor2),
-			'Small' => $small ? 'Small' : '',	// to use in css class-names
+			'Small' => $small ? 'Small' : '', // to use in css class-names
 			'indent' => $indent."\t",
 			'status_class' => $status_class,
 		));
@@ -1808,16 +1804,16 @@ 
 			$tpl->set_var('bodydescription', '');
 		}
 
-		$tooltip = $tpl->fp('tooltip','event_tooltip');
-		$html = $tpl->fp('out',$block);
+		$tooltip = $tpl->fp('tooltip', 'event_tooltip');
+		$html = $tpl->fp('out', $block);
 
 		if ($is_private || !$this->allowEdit)
 		{
 			$popup = '';
 		}
-		elseif($app && $app_id)
+		elseif ($app && $app_id)
 		{
-			$popup = $this->integration_get_popup($app,$app_id);
+			$popup = $this->integration_get_popup($app, $app_id);
 		}
 		else
 		{
@@ -1830,7 +1826,7 @@ 
 				$popup = $event['id']."|n";
 			}
 		}
-		$tooltip = html::htmlspecialchars($tooltip, true);	// true=need double-encoding, as it is transported as attribute!
+		$tooltip = html::htmlspecialchars($tooltip, true); // true=need double-encoding, as it is transported as attribute!
 		//_debug_array($event);
 
 		if ($return_array)
@@ -1845,17 +1841,17 @@ 
 		}
 
 		$draggableID = $event['id'].($event['recur_type'] ? ':'.$event['start'] : '').
-			'_O'.$event['owner'].'_C'.($owner<0?str_replace('-','group',$owner):$owner);
+			'_O'.$event['owner'].'_C'.($owner < 0 ? str_replace('-', 'group', $owner) : $owner);
 		
 		if ($this->use_time_grid)
 		{
-			if($event['whole_day_on_top'])
+			if ($event['whole_day_on_top'])
 			{
-					$style = 'top: '.($this->rowHeight*$this->wholeDayPosCounter).'%; height: '.$this->rowHeight.'%;';
+					$style = 'top: '.($this->rowHeight * $this->wholeDayPosCounter).'%; height: '.$this->rowHeight.'%;';
 					$this->wholeDayPosCounter++;
 			}
 			else
-			{		$view_link = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'calendar.calendar_uiforms.edit','cal_id'=>$event['id'],'date'=>$this->bo->date2string($event['start'])));
+			{		$view_link = $GLOBALS['egw']->link('/index.php', array('menuaction'=>'calendar.calendar_uiforms.edit', 'cal_id'=>$event['id'], 'date'=>$this->bo->date2string($event['start'])));
 
 					$style = 'top: '.$this->time2pos($event['start_m']).'%; height: '.$height.'%;';
 			}
@@ -1870,17 +1866,17 @@ 
 		$z_index = is_null($z_index) ? 20 : (int)$z_index;
 
 		if ($this->use_time_grid &&
-			((int)$event['id'] || substr($event['id'],0,7) == 'infolog') && $this->bo->check_perms(EGW_ACL_EDIT,$event))
+			((int)$event['id'] || substr($event['id'], 0, 7) == 'infolog') && $this->bo->check_perms(EGW_ACL_EDIT, $event))
 		{
 			if (!$event['whole_day_on_top'] &&
 				!$event['whole_day'] &&
 				!$event['recur_type'])
 			{
-				$draggableID = 'drag_'.$event['id'].($event['recur_type'] ? ':'.$event['start'] : '').'_O'.$event['owner'].'_C'.($owner<0?str_replace('-','group',$owner):$owner);
+				$draggableID = 'drag_'.$event['id'].($event['recur_type'] ? ':'.$event['start'] : '').'_O'.$event['owner'].'_C'.($owner < 0 ? str_replace('-', 'group', $owner) : $owner);
 			}
 			else
 			{
-				$draggableID = 'drag_'.$event['id'].($event['recur_type'] ? ':'.$event['start'] : '').'_O'.$event['owner'].'_C'.($owner<0?str_replace('-','group',$owner):$owner);
+				$draggableID = 'drag_'.$event['id'].($event['recur_type'] ? ':'.$event['start'] : '').'_O'.$event['owner'].'_C'.($owner < 0 ? str_replace('-', 'group', $owner) : $owner);
 
 			}
 		}
@@ -1889,7 +1885,7 @@ 
 		{
 			// S represents Series
 			// '' represents Single
-			$eventTypeTag = $event['recur_type']?'S':'';
+			$eventTypeTag = $event['recur_type'] ? 'S' : '';
 		}
 		else if (!$event['recur_type'])
 		{
@@ -1902,9 +1898,9 @@ 
 			$eventTypeTag = 'WDS';
 		}
 		// Helps client-side to bind handler to events with specific types tag
-		$resizableHelper = $this->bo->date2string($event['start']). '|' .$this->bo->format_date($event['start'],false) . '|' . $this->cal_prefs['interval'].'|'.$eventTypeTag;
+		$resizableHelper = $this->bo->date2string($event['start']).'|'.$this->bo->format_date($event['start'], false).'|'.$this->cal_prefs['interval'].'|'.$eventTypeTag;
 
-		$html = $indent.'<div id="'.$draggableID.'" data-tooltip ="'.$tooltip .'" data-resize="'.$resizableHelper.'" class="calendar_calEvent'.($is_private ? 'Private' : '').' '.$status_class.
+		$html = $indent.'<div id="'.$draggableID.'" data-tooltip ="'.$tooltip.'" data-resize="'.$resizableHelper.'" class="calendar_calEvent'.($is_private ? 'Private' : '').' '.$status_class.
 			'" style="'.$style.' border-color: '.$headerbgcolor.'; background: '.$background.'; z-index: '.$z_index.';"'.
 			'>'.$prefix_icon."\n".$html."\n".
 			$indent."</div>"."\n";
@@ -1924,9 +1920,9 @@ 
 	 * @param int|string $id
 	 * @return string
 	 */
-	function integration_get_popup($app,$id)
+	function integration_get_popup($app, $id)
 	{
-		$app_data = calendar_bo::integration_get_data($app,'edit_link');
+		$app_data = calendar_bo::integration_get_data($app, 'edit_link');
 
 		if (is_array($app_data) && isset($app_data['edit']))
 		{
@@ -1936,11 +1932,11 @@ 
 		}
 		else
 		{
-			$edit = egw_link::edit($app,$id,$popup_size);
+			$edit = egw_link::edit($app, $id, $popup_size);
 		}
 		if ($edit)
 		{
-			$view_link = egw::link('/index.php',$edit);
+			$view_link = egw::link('/index.php', $edit);
 
 			if ($popup_size)
 			{
@@ -1967,50 +1963,50 @@ 
 	 * @param array $event
 	 * @return array
 	 */
-	static function integration_get_icons($app,$id,$event)
+	static function integration_get_icons($app, $id, $event)
 	{
 		$icons = array();
 		if ($event['icons'])
 		{
-			foreach(explode(',',$event['icons']) as $icon)
+			foreach (explode(',', $event['icons']) as $icon)
 			{
-				list($icon_app,$icon) = explode(':',$icon);
-				if (common::find_image($icon_app,$icon))
+				list($icon_app, $icon) = explode(':', $icon);
+				if (common::find_image($icon_app, $icon))
 				{
-					$icons[] = html::image($icon_app,$icon);
+					$icons[] = html::image($icon_app, $icon);
 				}
 			}
 		}
-		$app_data = calendar_bo::integration_get_data($app,'icons');
+		$app_data = calendar_bo::integration_get_data($app, 'icons');
 		if (is_null($app_data))
 		{
-			$icons[] = html::image($app,'navbar');	// use navbar icon
+			$icons[] = html::image($app, 'navbar'); // use navbar icon
 		}
 		elseif ($app_data)
 		{
-			$icons += (array)ExecMethod2($app_data,$id,$event);
+			$icons += (array)ExecMethod2($app_data, $id, $event);
 		}
 		return $icons;
 	}
 
-	function add_nonempty($content,$label,$one_per_line=False,$space = True,$htmlspecialchars=true)
+	function add_nonempty($content, $label, $one_per_line = False, $space = True, $htmlspecialchars = true)
 	{
 		if (is_array($content))
 		{
-		   if($space)
+		   if ($space)
 		   {
-			  $content = implode($one_per_line ? ",\n" : ', ',$content);
+			  $content = implode($one_per_line ? ",\n" : ', ', $content);
 		   }
 		   else
 		   {
-			  $content = implode($one_per_line ? "\n" : ', ',$content);
+			  $content = implode($one_per_line ? "\n" : ', ', $content);
 		   }
 		}
 		if (!empty($content))
 		{
 			return '<span class="calendar_calEventLabel">'.$label.'</span>:'.
 				($one_per_line ? '<br>' : ' ').
-				nl2br($htmlspecialchars?html::htmlspecialchars($content):$content).'<br>';
+				nl2br($htmlspecialchars ? html::htmlspecialchars($content) : $content).'<br>';
 		}
 		return '';
 	}
@@ -2022,18 +2018,18 @@ 
 	* @param $decr int value to add to each component, default 64
 	* @return string the brighter color
 	*/
-	static function brighter($rgb,$decr=64)
+	static function brighter($rgb, $decr = 64)
 	{
-		if (!preg_match('/^#?([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})$/',$rgb,$components))
+		if (!preg_match('/^#?([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})([0-9A-Fa-f]{2})$/', $rgb, $components))
 		{
 			return '#ffffff';
 		}
 		$brighter = '#';
-		for ($i = 1; $i <=3; ++$i)
+		for ($i = 1; $i <= 3; ++$i)
 		{
 			$val = hexdec($components[$i]) + $decr;
 			if ($val > 255) $val = 255;
-			$brighter .= sprintf('%02x',$val);
+			$brighter .= sprintf('%02x', $val);
 		}
 		//echo "brighter($rgb=".print_r($components,True).")=$brighter</p>\n";
 		return $brighter;
@@ -2049,12 +2045,12 @@ 
 	{
 		if ($rgb[0] != '#' || strlen($rgb) != 7)
 		{
-			return 128;	// no rgb color, return some default
+			return 128; // no rgb color, return some default
 		}
-		$dec = hexdec(substr($rgb,1));
-		for($i = 0; $i < 24; $i += 8)
+		$dec = hexdec(substr($rgb, 1));
+		for ($i = 0; $i < 24; $i += 8)
 		{
-			$sum += ($dec >> $i) & 255;
+			$sum += ($dec >> $i)&255;
 		}
 		return (int)round($sum / 3.0, 0);
 	}
@@ -2076,7 +2072,7 @@ 
 	 * @param string $indent = '' string for correct indention
 	 * @return string with widget
 	 */
-	function &plannerWidget(&$events,$start,$end,$by_cat=0,$indent='')
+	function &plannerWidget(&$events, $start, $end, $by_cat = 0, $indent = '')
 	{
 		$content = $indent.'<div class="calendar_plannerWidget">'."\n";
 
@@ -2084,7 +2080,7 @@ 
 		$content .= $indent."\t".'<div class="calendar_plannerHeader">'."\n";
 
 		// display the headerTitle, and get sort2labels
-		switch($by_cat)
+		switch ($by_cat)
 		{
 			case 'user':
 				$title = lang('User');
@@ -2094,7 +2090,7 @@ 
 				$title = lang('Month');
 				$sort2label = array();
 				$time = new egw_time($start);
-				for($n = 0; $n < self::YEARLY_PLANNER_NUM_MONTH; ++$n)
+				for ($n = 0; $n < self::YEARLY_PLANNER_NUM_MONTH; ++$n)
 				{
 					$sort2label[$time->format('Y-m')] = lang($time->format('F')).' '.$time->format('Y');
 					$time->modify('+1 month');
@@ -2110,7 +2106,7 @@ 
 		// display the headerRows with the scales
 		$content .= $indent."\t\t".'<div class="calendar_plannerHeaderRows">'."\n";
 		// set start & end to timestamp and first & last to timestamp of 12h midday, to avoid trouble with daylight saving
-		foreach(array('start' => 'first','end' => 'last') as $t => $v)
+		foreach (array('start' => 'first', 'end' => 'last') as $t => $v)
 		{
 			$$t = $this->bo->date2ts($$t);
 			$$v = $this->bo->date2array($$t);
@@ -2125,23 +2121,23 @@ 
 		}
 		else
 		{
-			$days = 1 + (int) round(($last - $first) / DAY_s);	// we have to use round to get the right number if daylight saving changes
+			$days = 1 + (int)round(($last - $first) / DAY_s); // we have to use round to get the right number if daylight saving changes
 			if ($days >= 28)	// display the month scale
 			{
-				$content .= $this->plannerMonthScale($first,$days,$indent."\t\t\t");
+				$content .= $this->plannerMonthScale($first, $days, $indent."\t\t\t");
 			}
 			if ($days >= 5)	// display the week scale
 			{
-				$content .= $this->plannerWeekScale($first,$days,$indent."\t\t\t");
+				$content .= $this->plannerWeekScale($first, $days, $indent."\t\t\t");
 			}
-			$content .= $this->plannerDayScale($first,$days,$indent."\t\t\t");		// day-scale, always displayed
+			$content .= $this->plannerDayScale($first, $days, $indent."\t\t\t"); // day-scale, always displayed
 			if ($days <= 7)	// display the hour scale
 			{
-				$content .= $this->plannerHourScale($start,$days,$indent."\t\t\t");
+				$content .= $this->plannerHourScale($start, $days, $indent."\t\t\t");
 			}
 		}
-		$content .= $indent."\t\t</div>\n";	// end of the plannerHeaderRows
-		$content .= $indent."\t</div>\n";	// end of the plannerHeader
+		$content .= $indent."\t\t</div>\n"; // end of the plannerHeaderRows
+		$content .= $indent."\t</div>\n"; // end of the plannerHeader
 
 		// sort the events after user or category
 		$rows = array();
@@ -2150,10 +2146,10 @@ 
 		if ($by_cat === 'user')	// planner by user
 		{
 			// convert filter to allowed status
-			switch($this->filter)
+			switch ($this->filter)
 			{
 				case 'unknown':
-					$status_to_show = array('U','G'); break;
+					$status_to_show = array('U', 'G'); break;
 				case 'accepted':
 					$status_to_show = array('A'); break;
 				case 'tentative':
@@ -2163,65 +2159,65 @@ 
 				case 'delegated':
 					$status_to_show = array('D'); break;
 				case 'all':
-					$status_to_show = array('U','A','T','D','G','R'); break;
+					$status_to_show = array('U', 'A', 'T', 'D', 'G', 'R'); break;
 				default:
-					$status_to_show = array('U','A','T','D','G'); break;
+					$status_to_show = array('U', 'A', 'T', 'D', 'G'); break;
 			}
 		}
-		foreach($events as $key => $event)
+		foreach ($events as $key => $event)
 		{
 			if ($by_cat === 'user')	// planner by user
 			{
-				foreach($event['participants'] as $sort => $status)
+				foreach ($event['participants'] as $sort => $status)
 				{
-					calendar_so::split_status($status,$nul,$nul);
+					calendar_so::split_status($status, $nul, $nul);
 					// only show if participant with status visible with current filter
-					if (isset($sort2label[$sort]) && (in_array($status,$status_to_show) ||
+					if (isset($sort2label[$sort]) && (in_array($status, $status_to_show) ||
 						$this->filter == 'owner' && $event['owner'] == $sort))	// owner too additionally uses owner
 					{
-						$rows[$sort][] =& $events[$key];
+						$rows[$sort][] = & $events[$key];
 					}
 				}
 			}
 			elseif ($by_cat === 'month')	// planner by month / yearly planner
 			{
-				$sort = date('Y-m',$event['start']);
-				$rows[$sort][] =& $events[$key];
+				$sort = date('Y-m', $event['start']);
+				$rows[$sort][] = & $events[$key];
 				// end in a different month?
-				if ($sort != ($end_sort = date('Y-m',$event['end'])))
+				if ($sort != ($end_sort = date('Y-m', $event['end'])))
 				{
-					while($sort != $end_sort)
+					while ($sort != $end_sort)
 					{
-						list($y,$m) = explode('-',$sort);
+						list($y, $m) = explode('-', $sort);
 						if (++$m > 12)
 						{
 							++$y;
 							$m = 1;
 						}
-						$sort = sprintf('%04d-%02d',$y,$m);
-						$rows[$sort][] =& $events[$key];
+						$sort = sprintf('%04d-%02d', $y, $m);
+						$rows[$sort][] = & $events[$key];
 					}
 				}
 			}
 			else	// planner by cat
 			{
-				foreach($this->_get_planner_cats($event['category'],$sort2label,$sort2color) as $sort)
+				foreach ($this->_get_planner_cats($event['category'], $sort2label, $sort2color) as $sort)
 				{
 					if (!is_array($rows[$sort])) $rows[$sort] = array();
 
-					$rows[$sort][] =& $events[$key];
+					$rows[$sort][] = & $events[$key];
 				}
 			}
 		}
-		$owners = explode(',',$this->owner);
+		$owners = explode(',', $this->owner);
 		// display a plannerRowWidget for each row (user or category)
-		foreach($sort2label as $sort => $label)
+		foreach ($sort2label as $sort => $label)
 		{
 			if (!isset($rows[$sort]) && (!$this->cal_prefs['planner_show_empty_rows'] ||
 				$by_cat === 'user' && $this->cal_prefs['planner_show_empty_rows'] == 'cat' ||
 				is_int($by_cat) && $this->cal_prefs['planner_show_empty_rows'] == 'user'))
 			{
-				continue;		// dont show empty categories or user rows
+				continue; // dont show empty categories or user rows
 			}
 			$class = $class == 'row_on' ? 'row_off' : 'row_on';
 			if ($by_cat === 'month')
@@ -2236,9 +2232,9 @@ 
 			{
 				$label .= $this->close_button($sort);
 			}
-			$content .= $this->plannerRowWidget(isset($rows[$sort]) ? $rows[$sort] : array(),$start,$end,$label,$class,$indent."\t");
+			$content .= $this->plannerRowWidget(isset($rows[$sort]) ? $rows[$sort] : array(), $start, $end, $label, $class, $indent."\t");
 		}
-		$content .= $indent."</div>\n";		// end of the plannerWidget
+		$content .= $indent."</div>\n"; // end of the plannerWidget
 
 		return $content;
 	}
@@ -2249,12 +2245,12 @@ 
 	 * @param boolean $enum_groups = true should groups be returned as there members (eg. planner) or not (day & week)
 	 * @return array with uid => label pairs, first all users alphabetically sorted, then all resources
 	 */
-	function _get_planner_users($enum_groups=true)
+	function _get_planner_users($enum_groups = true)
 	{
 		$users = $resources = array();
-		foreach(explode(',',$this->owner) as $user)
+		foreach (explode(',', $this->owner) as $user)
 		{
-			if($user === '0')
+			if ($user === '0')
 			{
 				// 0 means current user
 				$user = $this->user;
@@ -2265,10 +2261,10 @@ 
 			}
 			elseif ($enum_groups && $GLOBALS['egw']->accounts->get_type($user) == 'g')	// groups
 			{
-				foreach((array) $GLOBALS['egw']->accounts->member($user) as $data)
+				foreach ((array)$GLOBALS['egw']->accounts->member($user) as $data)
 				{
 					$user = $data['account_id'];
-					if ($this->bo->check_perms(EGW_ACL_READ | EGW_ACL_FREEBUSY,0,$user))
+					if ($this->bo->check_perms(EGW_ACL_READ|EGW_ACL_FREEBUSY, 0, $user))
 					{
 						$users[$user] = $this->bo->participant_name($user);
 					}
@@ -2286,7 +2282,7 @@ 
 			asort($resources);
 		}
 
-		return $users+$resources;
+		return $users + $resources;
 	}
 
 	/**
@@ -2298,7 +2294,7 @@ 
 	 * @param array &$sort2label labels for the returned cats
 	 * @return array with cat_id's
 	 */
-	function _get_planner_cats($cats,&$sort2label)
+	function _get_planner_cats($cats, &$sort2label)
 	{
 		static $cat2sort;
 
@@ -2306,7 +2302,7 @@ 
 		{
 			$cat2sort = array();
 			$cat_filter = $this->cat_id ? (array)$this->cat_id : array();
-			foreach((array)$this->categories->return_sorted_array(0,false,'','','',true) as $data)
+			foreach ((array)$this->categories->return_sorted_array(0, false, '', '', '', true) as $data)
 			{
 				if (in_array($data['parent'], $cat_filter) || in_array($data['id'], $cat_filter) ||
 					!$data['parent'] && !$cat_filter)	// cat is a direct sub of $this->cat_id
@@ -2314,16 +2310,16 @@ 
 					$cat2sort[$data['id']] = $data['id'];
 					$sort2label[$data['id']] = stripslashes($data['name']);
 				}
-				elseif(isset($cat2sort[$data['parent']]))	// parent is already in the array => add us with same target
+				elseif (isset($cat2sort[$data['parent']]))	// parent is already in the array => add us with same target
 				{
 					$cat2sort[$data['id']] = $cat2sort[$data['parent']];
 				}
 			}
 		}
 		$ret = array();
-		foreach(!is_array($cats) ? explode(',',$cats) : $cats as $cat)
+		foreach (!is_array($cats) ? explode(',', $cats) : $cats as $cat)
 		{
-			if (isset($cat2sort[$cat]) && !in_array($cat2sort[$cat],$ret))
+			if (isset($cat2sort[$cat]) && !in_array($cat2sort[$cat], $ret))
 			{
 				$ret[] = $cat2sort[$cat];
 			}
@@ -2345,24 +2341,24 @@ 
 	 * @param string $indent = '' string for correct indention
 	 * @return string with scale
 	 */
-	function plannerMonthScale($start,$days,$indent)
+	function plannerMonthScale($start, $days, $indent)
 	{
-		$day_width = round(100 / $days,2);
+		$day_width = round(100 / $days, 2);
 
 		$content .= $indent.'<div class="calendar_plannerScale">'."\n";
-		for($t = $start,$left = 0,$i = 0; $i < $days; $t += $days_in_month*DAY_s,$left += $days_in_month*$day_width,$i += $days_in_month)
+		for ($t = $start, $left = 0, $i = 0; $i < $days; $t += $days_in_month * DAY_s, $left += $days_in_month * $day_width, $i += $days_in_month)
 		{
 			$t_arr = $this->bo->date2array($t);
-			unset($t_arr['raw']);	// force recalculation
+			unset($t_arr['raw']); // force recalculation
 			unset($t_arr['full']);
-			$days_in_month = $this->datetime->days_in_month($t_arr['month'],$t_arr['year']) - ($t_arr['day']-1);
+			$days_in_month = $this->datetime->days_in_month($t_arr['month'], $t_arr['year']) - ($t_arr['day'] - 1);
 			if ($i + $days_in_month > $days)
 			{
 				$days_in_month = $days - $i;
 			}
 			if ($days_in_month > 10)
 			{
-				$title = lang(date('F',$t)).' '.$t_arr['year'];
+				$title = lang(date('F', $t)).' '.$t_arr['year'];
 				// previous links
 				$prev = $t_arr;
 				$prev['day'] = 1;
@@ -2371,21 +2367,21 @@ 
 					$prev['month'] = 12;
 					$prev['year']--;
 				}
-				if ($this->bo->date2ts($prev) < $start-20*DAY_s)
+				if ($this->bo->date2ts($prev) < $start - 20 * DAY_s)
 				{
 					$prev['day'] = $this->day;
 					$full = $this->bo->date2string($prev);
-					if ($this->day >= 15) $prev = $t_arr;		// we stay in the same month
+					if ($this->day >= 15) $prev = $t_arr; // we stay in the same month
 					$prev['day'] = $this->day < 15 ? 15 : 1;
 					$half = $this->bo->date2string($prev);
-					$title = html::a_href(html::image('phpgwapi','first',lang('back one month'),$options=' alt="<<"'),array(
+					$title = html::a_href(html::image('phpgwapi', 'first', lang('back one month'), $options = ' alt="<<"'), array(
 						'menuaction' => $this->view_menuaction,
 						'date'       => $full,
-					)) . ' &nbsp; '.
-					html::a_href(html::image('phpgwapi','left',lang('back half a month'),$options=' alt="<"'),array(
+					)).' &nbsp; '.
+					html::a_href(html::image('phpgwapi', 'left', lang('back half a month'), $options = ' alt="<"'), array(
 						'menuaction' => $this->view_menuaction,
 						'date'       => $half,
-					)) . ' &nbsp; '.$title;
+					)).' &nbsp; '.$title;
 				}
 				// next links
 				$next = $t_arr;
@@ -2395,20 +2391,20 @@ 
 					$next['year']++;
 				}
 				// dont show next scales, if there are more then 10 days in the next month or there is no next month
-				$days_in_next_month = (int) date('d',$end = $start+$days*DAY_s);
-				if ($days_in_next_month <= 10 || date('m',$end) == date('m',$t))
+				$days_in_next_month = (int)date('d', $end = $start + $days * DAY_s);
+				if ($days_in_next_month <= 10 || date('m', $end) == date('m', $t))
 				{
-					if ($this->day >= 15) $next = $t_arr;		// we stay in the same month
+					if ($this->day >= 15) $next = $t_arr; // we stay in the same month
 					$next['day'] = $this->day;
 					$full = $this->bo->date2string($next);
-					if ($this->day < 15) $next = $t_arr;		// we stay in the same month
+					if ($this->day < 15) $next = $t_arr; // we stay in the same month
 					$next['day'] = $this->day < 15 ? 15 : 1;
 					$half = $this->bo->date2string($next);
-					$title .= ' &nbsp; '.html::a_href(html::image('phpgwapi','right',lang('forward half a month'),$options=' alt=">>"'),array(
+					$title .= ' &nbsp; '.html::a_href(html::image('phpgwapi', 'right', lang('forward half a month'), $options = ' alt=">>"'), array(
 						'menuaction' => $this->view_menuaction,
 						'date'       => $half,
-					)). ' &nbsp; '.
-					html::a_href(html::image('phpgwapi','last',lang('forward one month'),$options=' alt=">>"'),array(
+					)).' &nbsp; '.
+					html::a_href(html::image('phpgwapi', 'last', lang('forward one month'), $options = ' alt=">>"'), array(
 						'menuaction' => $this->view_menuaction,
 						'date'       => $full,
 					));
@@ -2419,10 +2415,10 @@ 
 				$title = '&nbsp;';
 			}
 			$class = $class == 'row_on' ? 'th' : 'row_on';
-			$content .= $indent."\t".'<div class="calendar_plannerMonthScale '.$class.'" style="left: '.$left.'%; width: '.($day_width*$days_in_month).'%;">'.
+			$content .= $indent."\t".'<div class="calendar_plannerMonthScale '.$class.'" style="left: '.$left.'%; width: '.($day_width * $days_in_month).'%;">'.
 				$title."</div>\n";
 		}
-		$content .= $indent."</div>\n";		// end of plannerScale
+		$content .= $indent."</div>\n"; // end of plannerScale
 
 		return $content;
 	}
@@ -2435,39 +2431,39 @@ 
 	 * @param string $indent = '' string for correct indention
 	 * @return string with scale
 	 */
-	function plannerWeekScale($start,$days,$indent)
+	function plannerWeekScale($start, $days, $indent)
 	{
-		$week_width = round(100 / $days * ($days <= 7 ? $days : 7),2);
+		$week_width = round(100 / $days * ($days <= 7 ? $days : 7), 2);
 
 		$content .= $indent.'<div class="calendar_plannerScale">'."\n";
-		for($t = $start,$left = 0,$i = 0; $i < $days; $t += 7*DAY_s,$left += $week_width,$i += 7)
+		for ($t = $start, $left = 0, $i = 0; $i < $days; $t += 7 * DAY_s, $left += $week_width, $i += 7)
 		{
 			$title = lang('Week').' '.$this->week_number($t);
 			if ($days > 7)
 			{
-				$title = html::a_href($title,array(
+				$title = html::a_href($title, array(
 					'menuaction' => 'calendar.calendar_uiviews.planner',
 					'planner_days' => 7,
-					'date'       => date('Ymd',$t),
-				),false,' title="'.html::htmlspecialchars(lang('Weekview')).'"');
+					'date'       => date('Ymd', $t),
+				), false, ' title="'.html::htmlspecialchars(lang('Weekview')).'"');
 			}
 			else
 			{
 				// prev. week
-				$title = html::a_href(html::image('phpgwapi','first',lang('previous'),$options=' alt="<<"'),array(
+				$title = html::a_href(html::image('phpgwapi', 'first', lang('previous'), $options = ' alt="<<"'), array(
 					'menuaction' => $this->view_menuaction,
-					'date'       => date('Ymd',$t-7*DAY_s),
-				)) . ' &nbsp; <b>'.$title;
+					'date'       => date('Ymd', $t - 7 * DAY_s),
+				)).' &nbsp; <b>'.$title;
 				// next week
-				$title .= '</b> &nbsp; '.html::a_href(html::image('phpgwapi','last',lang('next'),$options=' alt=">>"'),array(
+				$title .= '</b> &nbsp; '.html::a_href(html::image('phpgwapi', 'last', lang('next'), $options = ' alt=">>"'), array(
 					'menuaction' => $this->view_menuaction,
-					'date'       => date('Ymd',$t+7*DAY_s),
+					'date'       => date('Ymd', $t + 7 * DAY_s),
 				));
 			}
 			$class = $class == 'row_on' ? 'th' : 'row_on';
 			$content .= $indent."\t".'<div class="calendar_plannerWeekScale '.$class.'" style="left: '.$left.'%; width: '.$week_width.'%;">'.$title."</div>\n";
 		}
-		$content .= $indent."</div>\n";		// end of plannerScale
+		$content .= $indent."</div>\n"; // end of plannerScale
 
 		return $content;
 	}
@@ -2480,56 +2476,56 @@ 
 	 * @param string $indent = '' string for correct indention
 	 * @return string with scale
 	 */
-	function plannerDayScale($start,$days,$indent)
+	function plannerDayScale($start, $days, $indent)
 	{
-		$day_width = round(100 / $days,2);
+		$day_width = round(100 / $days, 2);
 
 		$content .= $indent.'<div class="calendar_plannerScale'.($days > 3 ? 'Day' : '').'">'."\n";
-		for($t = $start,$left = 0,$i = 0; $i < $days; $t += DAY_s,$left += $day_width,++$i)
+		for ($t = $start, $left = 0, $i = 0; $i < $days; $t += DAY_s, $left += $day_width, ++$i)
 		{
-			$this->_day_class_holiday($this->bo->date2string($t),$class,$holidays,$days > 7);
+			$this->_day_class_holiday($this->bo->date2string($t), $class, $holidays, $days > 7);
 
 			if ($days <= 3)
 			{
-				$title = '<b>'.lang(date('l',$t)).', '.date('j',$t).'. '.lang(date('F',$t)).'</b>';
+				$title = '<b>'.lang(date('l', $t)).', '.date('j', $t).'. '.lang(date('F', $t)).'</b>';
 			}
 			elseif ($days <= 7)
 			{
-				$title = lang(date('l',$t)).'<br />'.date('j',$t).'. '.lang(date('F',$t));
+				$title = lang(date('l', $t)).'<br />'.date('j', $t).'. '.lang(date('F', $t));
 			}
 			else
 			{
-				$title = substr(lang(date('D',$t)),0,2).'<br />'.date('j',$t);
+				$title = substr(lang(date('D', $t)), 0, 2).'<br />'.date('j', $t);
 			}
 			if ($days > 1)
 			{
-				$title = html::a_href($title,array(
+				$title = html::a_href($title, array(
 					'menuaction'   => 'calendar.calendar_uiviews.planner',
 					'planner_days' => 1,
-					'date'         => date('Ymd',$t),
-				),false,strpos($class,'calendar_calHoliday') !== false || strpos($class,'calendar_calBirthday') !== false ? '' : ' title="'.html::htmlspecialchars(lang('Dayview')).'"');
+					'date'         => date('Ymd', $t),
+				), false, strpos($class, 'calendar_calHoliday') !== false || strpos($class, 'calendar_calBirthday') !== false ? '' : ' title="'.html::htmlspecialchars(lang('Dayview')).'"');
 			}
 			if ($days < 5)
 			{
 				if (!$i)	// prev. day only for the first day
 				{
-					$title = html::a_href(html::image('phpgwapi','first',lang('previous'),$options=' alt="<<"'),array(
+					$title = html::a_href(html::image('phpgwapi', 'first', lang('previous'), $options = ' alt="<<"'), array(
 						'menuaction' => $this->view_menuaction,
-						'date'       => date('Ymd',$start-DAY_s),
-					)) . ' &nbsp; '.$title;
+						'date'       => date('Ymd', $start - DAY_s),
+					)).' &nbsp; '.$title;
 				}
-				if ($i == $days-1)	// next day only for the last day
+				if ($i == $days - 1)	// next day only for the last day
 				{
-					$title .= ' &nbsp; '.html::a_href(html::image('phpgwapi','last',lang('next'),$options=' alt=">>"'),array(
+					$title .= ' &nbsp; '.html::a_href(html::image('phpgwapi', 'last', lang('next'), $options = ' alt=">>"'), array(
 						'menuaction' => $this->view_menuaction,
-						'date'       => date('Ymd',$start+DAY_s),
+						'date'       => date('Ymd', $start + DAY_s),
 					));
 				}
 			}
 			$content .= $indent."\t".'<div class="calendar_plannerDayScale '.$class.'" style="left: '.$left.'%; width: '.$day_width.'%;"'.
 				($holidays ? ' title="'.html::htmlspecialchars($holidays).'"' : '').'>'.$title."</div>\n";
 		}
-		$content .= $indent."</div>\n";		// end of plannerScale
+		$content .= $indent."</div>\n"; // end of plannerScale
 
 		return $content;
 	}
@@ -2542,13 +2538,13 @@ 
 	 */
 	function plannerDayOfMonthScale($indent)
 	{
-		$day_width = round(100 / 31,2);
+		$day_width = round(100 / 31, 2);
 
 		// month scale with navigation
 		$content .= $indent.'<div class="calendar_plannerScale">'."\n";
 
-		$title = lang(egw_time::to($this->first,'F')).' '.egw_time::to($this->first,'Y').' - '.
-			lang(egw_time::to($this->last,'F')).' '.egw_time::to($this->last,'Y');
+		$title = lang(egw_time::to($this->first, 'F')).' '.egw_time::to($this->first, 'Y').' - '.
+			lang(egw_time::to($this->last, 'F')).' '.egw_time::to($this->last, 'Y');
 
 		// calculate date for navigation links
 		$time = new egw_time($this->first);
@@ -2561,37 +2557,37 @@ 
 		$time->modify('+11month');
 		$next_year = $time->format('Ymd');
 
-		$title = html::a_href(html::image('phpgwapi','first',lang('back one year'),$options=' alt="<<"'),array(
+		$title = html::a_href(html::image('phpgwapi', 'first', lang('back one year'), $options = ' alt="<<"'), array(
 				'menuaction' => $this->view_menuaction,
 				'date'       => $last_year,
-			)) . ' &nbsp; '.
-			html::a_href(html::image('phpgwapi','left',lang('back one month'),$options=' alt="<"'),array(
+			)).' &nbsp; '.
+			html::a_href(html::image('phpgwapi', 'left', lang('back one month'), $options = ' alt="<"'), array(
 				'menuaction' => $this->view_menuaction,
 				'date'       => $last_month,
-			)) . ' &nbsp; '.$title;
-			$title .= ' &nbsp; '.html::a_href(html::image('phpgwapi','right',lang('forward one month'),$options=' alt=">>"'),array(
+			)).' &nbsp; '.$title;
+			$title .= ' &nbsp; '.html::a_href(html::image('phpgwapi', 'right', lang('forward one month'), $options = ' alt=">>"'), array(
 					'menuaction' => $this->view_menuaction,
 					'date'       => $next_month,
-				)). ' &nbsp; '.
-				html::a_href(html::image('phpgwapi','last',lang('forward one year'),$options=' alt=">>"'),array(
+				)).' &nbsp; '.
+				html::a_href(html::image('phpgwapi', 'last', lang('forward one year'), $options = ' alt=">>"'), array(
 					'menuaction' => $this->view_menuaction,
 					'date'       => $next_year,
 				));
 
 		$content .= $indent."\t".'<div class="calendar_plannerMonthScale th" style="left: 0; width: 100%;">'.
 				$title."</div>\n";
-		$content .= $indent."</div>\n";		// end of plannerScale
+		$content .= $indent."</div>\n"; // end of plannerScale
 
 		// day of month scale
 		$content .= $indent.'<div class="calendar_plannerScale">'."\n";
-		$today = egw_time::to('now','d');
-		for($left = 0,$i = 0; $i < 31; $left += $day_width,++$i)
+		$today = egw_time::to('now', 'd');
+		for ($left = 0, $i = 0; $i < 31; $left += $day_width, ++$i)
 		{
-			$class = $i & 1 ? 'row_on' : 'row_off';
+			$class = $i&1 ? 'row_on' : 'row_off';
 			$content .= $indent."\t".'<div class="calendar_plannerDayOfMonthScale '.$class.'" style="left: '.$left.'%; width: '.$day_width.'%;">'.
-				(1+$i)."</div>\n";
+				(1 + $i)."</div>\n";
 		}
-		$content .= $indent."</div>\n";		// end of plannerScale
+		$content .= $indent."</div>\n"; // end of plannerScale
 
 		return $content;
 	}
@@ -2604,9 +2600,9 @@ 
 	 * @param string $indent = '' string for correct indention
 	 * @return string with scale
 	 */
-	function plannerHourScale($start,$days,$indent)
+	function plannerHourScale($start, $days, $indent)
 	{
-		foreach(array(1,2,3,4,6,8,12) as $d)	// numbers dividing 24 without rest
+		foreach (array(1, 2, 3, 4, 6, 8, 12) as $d)	// numbers dividing 24 without rest
 		{
 			if ($d > $days) break;
 			$decr = $d;
@@ -2621,17 +2617,17 @@ 
 			$t_arr['hour'] = 23; $t_arr['minute'] = $t_arr['second'] = 59;
 			$hours = ($this->bo->date2ts($t_arr) - $s) / HOUR_s;
 		}
-		$cell_width = round(100 / $hours * $decr,2);
+		$cell_width = round(100 / $hours * $decr, 2);
 
 		$content .= $indent.'<div class="calendar_plannerScale">'."\n";
-		for($t = $start,$left = 0,$i = 0; $i < $hours; $t += $decr*HOUR_s,$left += $cell_width,$i += $decr)
+		for ($t = $start, $left = 0, $i = 0; $i < $hours; $t += $decr * HOUR_s, $left += $cell_width, $i += $decr)
 		{
-			$title = date($this->cal_prefs['timeformat'] == 12 ? 'ha' : 'H',$t);
+			$title = date($this->cal_prefs['timeformat'] == 12 ? 'ha' : 'H', $t);
 
 			$class = $class == 'row_on' ? 'th' : 'row_on';
 			$content .= $indent."\t".'<div class="calendar_plannerHourScale '.$class.'" style="left: '.$left.'%; width: '.($cell_width).'%;">'.$title."</div>\n";
 		}
-		$content .= $indent."</div>\n";		// end of plannerScale
+		$content .= $indent."</div>\n"; // end of plannerScale
 
 		return $content;
 	}
@@ -2649,7 +2645,7 @@ 
 	 * @param string $indent = '' string for correct indention
 	 * @return string with widget
 	 */
-	function plannerRowWidget($events,$start,$end,$header,$class,$indent='')
+	function plannerRowWidget($events, $start, $end, $header, $class, $indent = '')
 	{
 		$content = $indent.'<div class="calendar_plannerRowWidget '.$class.'">'."\n";
 
@@ -2659,19 +2655,19 @@ 
 		// sorting the events in non-overlapping rows
 		$rows = array(array());
 		$row_end = array();
-		foreach($events as $n => $event)
+		foreach ($events as $n => $event)
 		{
-			for($row = 0; (int) $row_end[$row] > $event['start']; ++$row);	// find a "free" row (no other event)
-			$rows[$row][] =& $events[$n];
+			for ($row = 0; (int)$row_end[$row] > $event['start']; ++$row); // find a "free" row (no other event)
+			$rows[$row][] = & $events[$n];
 			$row_end[$row] = $event['end'];
 		}
 		//echo $header; _debug_array($rows);
 		// display the rows
 		$content .= $indent."\t".'<div class="calendar_eventRows"';
 
-		if ($this->sortby == 'month' && ($days = date('j',$end)) < 31)
+		if ($this->sortby == 'month' && ($days = date('j', $end)) < 31)
 		{
-			$width = round(85*$days/31,2);
+			$width = round(85 * $days / 31, 2);
 			$content .= ' style="width: '.$width.'%;"';
 		}
 		$content .= ">\n";
@@ -2679,21 +2675,21 @@ 
 		// mark weekends and other special days in yearly planner
 		if ($this->sortby == 'month')
 		{
-			$content .= $this->yearlyPlannerMarkDays($start,$days,$indent."\t\t");
+			$content .= $this->yearlyPlannerMarkDays($start, $days, $indent."\t\t");
 		}
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		{
-			$content .= $this->eventRowWidget($row,$start,$end,$indent."\t\t");
+			$content .= $this->eventRowWidget($row, $start, $end, $indent."\t\t");
 		}
-		$content .= $indent."\t</div>\n";	// end of the eventRows
+		$content .= $indent."\t</div>\n"; // end of the eventRows
 
 		if ($this->sortby == 'month' && $days < 31)
 		{
 			// add a filler for non existing days in that month
 			$content .= $indent."\t".'<div class="calendar_eventRowsFiller"'.
-				' style="left:'.(15+$width).'%; width:'.(85-$width).'%;" ></div>'."\n";
+				' style="left:'.(15 + $width).'%; width:'.(85 - $width).'%;" ></div>'."\n";
 		}
-		$content .= $indent."</div>\n";		// end of the plannerRowWidget
+		$content .= $indent."</div>\n"; // end of the plannerRowWidget
 
 		return $content;
 	}
@@ -2706,14 +2702,14 @@ 
 	 * @param string $indent = ''
 	 * @return string
 	 */
-	function yearlyPlannerMarkDays($start,$days,$indent='')
+	function yearlyPlannerMarkDays($start, $days, $indent = '')
 	{
-		$day_width = round(100/$days,2);
-		for($t = $start,$left = 0,$i = 0; $i < $days; $t += DAY_s,$left += $day_width,++$i)
+		$day_width = round(100 / $days, 2);
+		for ($t = $start, $left = 0, $i = 0; $i < $days; $t += DAY_s, $left += $day_width, ++$i)
 		{
-			$this->_day_class_holiday($this->bo->date2string($t),$class,$holidays,true);
+			$this->_day_class_holiday($this->bo->date2string($t), $class, $holidays, true);
 
-			$class = trim(str_replace(array('row_on','row_off'),'',$class));
+			$class = trim(str_replace(array('row_on', 'row_off'), '', $class));
 			if ($class)	// no regular weekday
 			{
 				$content .= $indent.'<div class="calendar_eventRowsMarkedDay '.$class.
@@ -2736,13 +2732,13 @@ 
 	 * @param string $indent = '' string for correct indention
 	 * @return string with widget
 	 */
-	function eventRowWidget($events,$start,$end,$indent='')
+	function eventRowWidget($events, $start, $end, $indent = '')
 	{
 		$content = $indent.'<div class="calendar_eventRowWidget">'."\n";
 
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
-			$content .= $this->plannerEventWidget($event,$start,$end,$indent."\t");
+			$content .= $this->plannerEventWidget($event, $start, $end, $indent."\t");
 		}
 		$content .= $indent."</div>\n";
 
@@ -2760,10 +2756,10 @@ 
 	 * @param int $end end-time of the planner
 	 * @return float percentage position between 0-100
 	 */
-	function _planner_pos($time,$start,$end)
+	function _planner_pos($time, $start, $end)
 	{
-		if ($time <= $start) return 0;	// we are left of our scale
-		if ($time >= $end) return 100;	// we are right of our scale
+		if ($time <= $start) return 0; // we are left of our scale
+		if ($time >= $end) return 100; // we are right of our scale
 
 		if ($this->planner_days || $this->sortby == 'month')
 		{
@@ -2785,14 +2781,14 @@ 
 				else
 				{
 					$wd_lenght = $this->wd_end - $this->wd_start;
-					if ($wd_lenght <= 0) $wd_lenght = 24*60;
-					$day_percentage = ($time_of_day-$this->wd_start) / $wd_lenght;		// between 0 and 1
+					if ($wd_lenght <= 0) $wd_lenght = 24 * 60;
+					$day_percentage = ($time_of_day - $this->wd_start) / $wd_lenght; // between 0 and 1
 				}
 				$days = ($end - $start) / DAY_s;
 				$percent += $day_percentage / $days;
 			}
 		}
-		$percent = round(100 * $percent,2);
+		$percent = round(100 * $percent, 2);
 
 		//echo "<p>_planner_pos(".date('Y-m-d H:i',$time).', '.date('Y-m-d H:i',$start).', '.date('Y-m-d H:i',$end).") = $percent</p>\n";
 		return $percent;
@@ -2806,7 +2802,7 @@ 
 	 * @param int $end end-time of the planner
 	 * @return string with widget
 	 */
-	function plannerEventWidget($event,$start,$end,$indent='')
+	function plannerEventWidget($event, $start, $end, $indent = '')
 	{
 		// some fields set by the dayColWidget for the other views
 		$day_start = $this->bo->date2ts((string)$this->bo->date2string($event['start']));
@@ -2815,15 +2811,15 @@ 
 		$event['multiday'] = true;
 		unset($event['whole_day_on_top']);
 
-		$data = $this->eventWidget($event,200,$indent,$this->owner,true,'planner_event');
+		$data = $this->eventWidget($event, 200, $indent, $this->owner, true, 'planner_event');
 
-		$left = $this->_planner_pos($event['start'],$start,$end);
-		$width = $this->_planner_pos($event['end'],$start,$end) - $left;
+		$left = $this->_planner_pos($event['start'], $start, $end);
+		$width = $this->_planner_pos($event['end'], $start, $end) - $left;
 		$color = $data['color'] ? $data['color'] : 'gray';
 
-		$tooltip = html::htmlspecialchars(str_replace(array("\n","\r","'",'"'),array('','',"\\'",'&quot;'),$data['tooltip']));
+		$tooltip = html::htmlspecialchars(str_replace(array("\n", "\r", "'", '"'), array('', '', "\\'", '&quot;'), $data['tooltip']));
 		return $indent.'<div class="calendar_plannerEvent'.($data['private'] ? 'Private' : '').'" style="left: '.$left.
-			'%; width: '.$width.'%; background-color: '.$color.';"'.'data-tooltip="'. $tooltip.'" '.
+			'%; width: '.$width.'%; background-color: '.$color.';"'.'data-tooltip="'.$tooltip.'" '.
 			'" data-date ="'.$this->bo->date2string($event['start']).'|'.$data['popup'].'">'."\n".$data['html'].$indent."</div>\n";
 	}
 
@@ -2847,25 +2843,25 @@ 
 				{
 					$start = $this->bo->date2array($event['start']);
 					$end = $this->bo->date2array($event['end']);
-					if(!$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59)
+					if (!$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59)
 					{
-						if($event['non_blocking'])
+						if ($event['non_blocking'])
 						{
-							$dayEvents[$day][$num]['whole_day_on_top']=true;
-							$this->whole_day_positions[$num]=($this->rowHeight*($num+2));
+							$dayEvents[$day][$num]['whole_day_on_top'] = true;
+							$this->whole_day_positions[$num] = ($this->rowHeight * ($num + 2));
 							$extraRowsToAdd++;
 						}
 						else
 						{
-							$dayEvents[$day][$num]['whole_day']=true;
+							$dayEvents[$day][$num]['whole_day'] = true;
 						}
 					}
 				}
 				// check after every day if we have to increase $this->extraRows
-				if(($this->extraRowsOriginal+$extraRowsToAdd) > $this->extraRows)
+				if (($this->extraRowsOriginal + $extraRowsToAdd) > $this->extraRows)
 				{
 					$this->remBotExtraRows = $extraRowsToAdd;
-					$this->extraRows = ($this->extraRowsOriginal+$extraRowsToAdd);
+					$this->extraRows = ($this->extraRowsOriginal + $extraRowsToAdd);
 				}
 			}
 		}
@@ -2942,7 +2938,7 @@ 
 			$day_start = $this->bo->date2ts((string)$day_ymd);
 
 			//Iterate over the holidays array and add those the the events list
-			foreach($this->holidays[$day_ymd] as $holiday)
+			foreach ($this->holidays[$day_ymd] as $holiday)
 			{
 				if (isset($holiday['birthyear']))
 				{

Braces +271 added lines, -71 removed lines

@@ -183,7 +183,10 @@ 
 	 */
 	public function week_number($time)
 	{
-		if (!is_a($time,'DateTime')) $time = new egw_time($time);
+		if (!is_a($time,'DateTime'))
+		{
+			$time = new egw_time($time);
+		}
 
 		// if week does not start Monday and $time is Sunday --> add one day
 		if ($this->cal_prefs['weekdaystarts'] != 'Monday' && !($wday = $time->format('w')))
@@ -203,7 +206,10 @@ 
 	 */
 	function index()
 	{
-		if (!$this->view) $this->view = 'week';
+		if (!$this->view)
+		{
+			$this->view = 'week';
+		}
 
 		// handle views in other files
 		if (!isset($this->public_functions[$this->view]))
@@ -277,9 +283,12 @@ 
 	 */
 	function &planner($home=false)
 	{
-		if ($this->sortby == 'month')	// yearly planner with month rows
+		if ($this->sortby == 'month')
+		{
+			// yearly planner with month rows
 		{
 			$this->first = $this->bo->date2array($this->date);
+		}
 			$this->first['day'] = 1;
 			unset($this->first['raw']);
 			$this->last = $this->first;
@@ -289,11 +298,14 @@ 
 				lang(egw_time::to($this->first,'F')).' '.egw_time::to($this->first,'Y').' - '.
 				lang(egw_time::to($this->last,'F')).' '.egw_time::to($this->last,'Y');
 		}
-		elseif (!$this->planner_days)	// planner monthview
+		elseif (!$this->planner_days)
+		{
+			// planner monthview
 		{
 			if ($this->day < 15)	// show one complete month
 			{
 				$this->_week_align_month($this->first,$this->last);
+		}
 				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
 			}
 			else	// show 2 half month
@@ -302,9 +314,12 @@ 
 				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F',$this->first)).' / '.lang(adodb_date('F',$this->last)).' '.$this->year;
 			}
 		}
-		elseif ($this->planner_days >= 5)	// weeekview
+		elseif ($this->planner_days >= 5)
+		{
+			// weeekview
 		{
 			$this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
+		}
 			$this->last = $this->bo->date2array($this->first);
 			$this->last['day'] += (int) $this->planner_days - 1;
 			$this->last['hour'] = 23; $this->last['minute'] = $this->last['sec'] = 59;
@@ -340,7 +355,10 @@ 
 		$search_params['enum_groups'] = $this->sortby == 'user';
 		$events =& $this->bo->search($search_params);
 
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3',False,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::planner() date=%1: first=%2, last=%3',False,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		}
 
 		$content =& $this->plannerWidget($events,$this->first,$this->last,$this->sortby != 'category' ? $this->sortby : (int) $this->cat_id);
 
@@ -361,7 +379,11 @@ 
 	 */
 	function &weekN($home=false)
 	{
-		if (($num = (int)$this->cal_prefs['multiple_weeks']) < 2) $num = 3;	// default 3 weeks
+		if (($num = (int)$this->cal_prefs['multiple_weeks']) < 2)
+		{
+			$num = 3;
+		}
+		// default 3 weeks
 
 		return $this->month($num,$home);
 	}
@@ -376,7 +398,10 @@ 
 	 */
 	function &year($home=false)
 	{
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::year date=%2',True,$this->date);
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::year date=%2',True,$this->date);
+		}
 
 
 		$this->_month_align_year($this->first,$this->last);
@@ -608,7 +633,10 @@ 
 	 */
 	function &month($weeks=0,$home=false)
 	{
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date);
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date);
+		}
 
 		$this->use_time_grid = !$this->cal_prefs['use_time_grid'] || $this->cal_prefs['use_time_grid'] == 'all'; 	// all views
 
@@ -625,7 +653,9 @@ 
 					'end' => strtotime('+' . ($i+1).' weeks', $this->first) -1
 				);
 			}
-		} else {
+		}
+		else
+		{
 			$timespan[] = array(
 				'start' => mktime(0,0,0,$this->month,1,$this->year),
 				'end' => mktime(0,0,0,$this->month+1,1,$this->year)-1
@@ -654,7 +684,10 @@ 
 			$weekNavH = "1 month";
 			$navHeader = lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4',False,$weeks,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::month(%1) date=%2: first=%3, last=%4',False,$weeks,$this->date,$this->bo->date2string($this->first),$this->bo->date2string($this->last));
+		}
 
 		$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$navHeader;
 
@@ -797,19 +830,31 @@ 
 		if (!$days)
 		{
 			$days = isset($_GET['days']) ? $_GET['days'] : $this->cal_prefs['days_in_weekview'];
-			if ($days != 5) $days = 7;
-			if ($days != $this->cal_prefs['days_in_weekview'])	// save the preference
+			if ($days != 5)
+			{
+				$days = 7;
+			}
+			if ($days != $this->cal_prefs['days_in_weekview'])
+			{
+				// save the preference
 			{
 				$GLOBALS['egw']->preferences->add('calendar','days_in_weekview',$days);
+			}
 				$GLOBALS['egw']->preferences->save_repository();
 				$this->cal_prefs['days_in_weekview'] = $days;
 			}
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::week(days=%1) date=%2',True,$days,$this->date);
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::week(days=%1) date=%2',True,$days,$this->date);
+		}
 
-		if ($days == 4)		// next 4 days view
+		if ($days == 4)
+		{
+			// next 4 days view
 		{
 			$wd_start = $this->first = $this->bo->date2ts($this->date);
+		}
 			$this->last = strtotime("+$days days",$this->first) - 1;
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('Four days view').' '.$this->bo->long_date($this->first,$this->last);
 			$navHeader =lang('Four days view').' '.$this->bo->long_date($this->first,$this->last);
@@ -817,12 +862,15 @@ 
 		else
 		{
 			$wd_start = $this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
-			if ($days == 5)		// no weekend-days
+			if ($days == 5)
+			{
+				// no weekend-days
 			{
 				switch($this->cal_prefs['weekdaystarts'])
 				{
 					case 'Saturday':
 						$this->first = strtotime("+2 days",$this->first);
+			}
 						break;
 					case 'Sunday':
 						$this->first = strtotime("+1 day",$this->first);
@@ -860,12 +908,18 @@ 
 			) + $this->search_params;
 
 		$users = $this->search_params['users'];
-		if (!is_array($users)) $users = array($users);
+		if (!is_array($users))
+		{
+			$users = array($users);
+		}
 
-		if (count($users) == 1 || count($users) > $this->bo->calview_no_consolidate)	// for more then X users, show all in one row
+		if (count($users) == 1 || count($users) > $this->bo->calview_no_consolidate)
+		{
+			// for more then X users, show all in one row
 		{
 			$content = $this->timeGridWidget($this->tagWholeDayOnTop($this->bo->search($search_params)),$this->cal_prefs['interval']);
 		}
+		}
 		else
 		{
 			$content = '';
@@ -909,7 +963,10 @@ 
 	 */
 	function &day($home=false)
 	{
-		if ($this->debug > 0) $this->bo->debug_message('uiviews::day() date=%1',True,$this->date);
+		if ($this->debug > 0)
+		{
+			$this->bo->debug_message('uiviews::day() date=%1',True,$this->date);
+		}
 
 		$this->last = $this->first = $this->bo->date2ts((string)$this->date);
 		$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$this->bo->long_date($this->first,0,false,true);
@@ -932,7 +989,10 @@ 
 			$this->do_header();
 
 			$users = $this->search_params['users'];
-			if (!is_array($users)) $users = array($users);
+			if (!is_array($users))
+			{
+				$users = array($users);
+			}
 
 			// for more then X users, show all in one row
 			if (count($users) == 1 || count($users) > $this->bo->calview_no_consolidate)
@@ -1079,7 +1139,8 @@ 
 							$icons .= ($icons?' ':'').$GLOBALS['egw']->html->image($app,$name,lang($name),'border="0" width="15" height="15"');
 						}
 						$class = $class == 'row_on' ? 'row_off' : 'row_on';
-						if($todo['edit']) {
+						if($todo['edit'])
+						{
 							list($width, $height) = explode('x', $todo['edit']['size']);
 							unset($todo['edit']['size']);
 							$edit_icon_href = html::a_href( $icons, $todo['edit'],'',' data-todo="app|'.$width.'x'.$height.'" ');
@@ -1115,10 +1176,13 @@ 
 	 */
 	function time2pos($time)
 	{
-		if ($this->scroll_to_wdstart)	// we display the complete day - thought only workday is visible without scrolling
+		if ($this->scroll_to_wdstart)
+		{
+			// we display the complete day - thought only workday is visible without scrolling
 		{
 			return $this->rowHeight * (1 + $this->extraRows + $time/$this->granularity_m);
 		}
+		}
 		// time before workday => condensed in the first $this->extraRows rows
 		if ($this->wd_start > 0 && $time < $this->wd_start)
 		{
@@ -1136,7 +1200,10 @@ 
 		}
 		$pos = round($pos,1);
 
-		if ($this->debug > 3) $this->bo->debug_message('uiviews::time2pos(%1)=%2',False,$time,$pos);
+		if ($this->debug > 3)
+		{
+			$this->bo->debug_message('uiviews::time2pos(%1)=%2',False,$time,$pos);
+		}
 
 		return $pos;
 	}
@@ -1156,7 +1223,10 @@ 
 		$minimum = $this->rowHeight;
 		$height = $this->time2pos($end) - $this->time2pos($start);
 
-		if ($this->debug > 3) $this->bo->debug_message('uiviews::times2height(%1,%2,min=%3)=%4',False,$start,$end,$minimum,$height);
+		if ($this->debug > 3)
+		{
+			$this->bo->debug_message('uiviews::times2height(%1,%2,min=%3)=%4',False,$start,$end,$minimum,$height);
+		}
 
 		return $height >= $minimum ? $height : $minimum;
 	}
@@ -1176,7 +1246,10 @@ 
 	 */
 	function &timeGridWidget($daysEvents,$granularity_m=30,$height=400,$indent='',$title='',$owner=0,$last=true)
 	{
-		if ($this->debug > 1 || $this->debug==='timeGridWidget') $this->bo->debug_message('uiviews::timeGridWidget(events=%1,granularity_m=%2,height=%3,,title=%4)',True,$daysEvents,$granularity_m,$height,$title);
+		if ($this->debug > 1 || $this->debug==='timeGridWidget')
+		{
+			$this->bo->debug_message('uiviews::timeGridWidget(events=%1,granularity_m=%2,height=%3,,title=%4)',True,$daysEvents,$granularity_m,$height,$title);
+		}
 
 		// determine if the browser supports scrollIntoView: IE4+, firefox1.0+ and safari2.0+ does
 		// then show all hours in a div of the size of the workday and scroll to the workday start
@@ -1195,7 +1268,10 @@ 
 		$this->display_start = $this->wd_start - ($this->extraRows * $this->granularity_m);
 		$this->display_end	= $this->wd_end + (($this->extraRows - $this->remBotExtraRows) * $this->granularity_m);
 
-		if (!$this->wd_end) $this->wd_end = 1440;
+		if (!$this->wd_end)
+		{
+			$this->wd_end = 1440;
+		}
 		$totalDisplayMinutes	= $this->wd_end - $this->wd_start;
 		$this->rowsToDisplay	= ($totalDisplayMinutes/$granularity_m)+2+2*$this->extraRows - $this->remBotExtraRows;
 		$this->rowHeight		= round(100/$this->rowsToDisplay,1);
@@ -1244,7 +1320,10 @@ 
 				{
 					$time = $GLOBALS['egw']->common->formattime(sprintf('%02d',$t/60),sprintf('%02d',$t%60));
 				}
-				if ($add_links) $time = $this->add_link($time,$this->date,(int) ($t/60),$t%60);
+				if ($add_links)
+				{
+					$time = $this->add_link($time,$this->date,(int) ($t/60),$t%60);
+				}
 				$html .= $indent."\t\t".'<div class="calendar_calTimeRowTime">'.$time."</div>\n";
 				$html .= $indent."\t</div>\n";	// calendar_calTimeRow
 				$off = !$off;
@@ -1260,7 +1339,9 @@ 
 			$html .= $indent."\t".'<div id="calendar_calDayCols" class="calendar_calDayCols'.
 				($this->use_time_grid ? ($this->bo->common_prefs['timeformat'] == 12 ? '12h' : '') : 'NoTime').'">'."\n";
 
-			if (html::$user_agent == 'msie')	// necessary IE hack - stupid thing ...
+			if (html::$user_agent == 'msie')
+			{
+				// necessary IE hack - stupid thing ...
 			{
 				// Lars Kneschke 2005-08-28
 				// why do we use a div in a div which has the same height and width???
@@ -1273,6 +1354,7 @@ 
 				// means you width: 100% does NOT work, you need no width!
 				$html .= '<div style="height: 100%;">'."\n";
 			}
+			}
 			$dayCol_width = $dayCols_width / count($daysEvents);
 			$n = 0;
 			foreach($daysEvents as $day => $events)
@@ -1290,7 +1372,10 @@ 
 					$dayColWidth,$indent."\t\t",$short_title,++$on_off & 1,$col_owner);
 				++$n;
 			}
-			if (html::$user_agent == 'msie') $html .= "</div>\n";
+			if (html::$user_agent == 'msie')
+			{
+				$html .= "</div>\n";
+			}
 
 			$html .= $indent."\t</div>\n";	// calendar_calDayCols
 		}
@@ -1299,10 +1384,13 @@ 
 		if ($this->scroll_to_wdstart)
 		{
 			$html .= "<script>\n\tdocument.getElementById('$id').scrollIntoView();\n";
-			if ($last)	// last timeGrid --> scroll whole document back up
+			if ($last)
+			{
+				// last timeGrid --> scroll whole document back up
 			{
 				$html .= "\tdocument.getElementById('divMain').scrollIntoView();\n";
 			}
+			}
 			$html .= "</script>\n";
 		}
 
@@ -1373,7 +1461,10 @@ 
 	 */
 	function dayColWidget($day_ymd,$events,$pleft,$pwidth,$indent,$short_title=True,$on_off=False,$owner=0)
 	{
-		if ($this->debug > 1 || $this->debug==='dayColWidget') $this->bo->debug_message('uiviews::dayColWidget(%1,%2,left=%3,width=%4,)',False,$day_ymd,$events,$pleft,$pwidth);
+		if ($this->debug > 1 || $this->debug==='dayColWidget')
+		{
+			$this->bo->debug_message('uiviews::dayColWidget(%1,%2,left=%3,width=%4,)',False,$day_ymd,$events,$pleft,$pwidth);
+		}
 		
 		$html = $indent.'<div id="calColumn'.$this->calColumnCounter++.'" class="calendar_calDayCol" '.'data-sortable-id="'.$owner.'" style="left: '.$pleft.
 			'%;width: '.$pwidth.'%;">'."\n";
@@ -1389,7 +1480,10 @@ 
 		);
 		$this->_day_class_holiday($day_ymd,$class,$holidays);
 		// the weekday and date
-		if (!$short_title && $holidays) $title .= html::htmlspecialchars(': '.$holidays);
+		if (!$short_title && $holidays)
+		{
+			$title .= html::htmlspecialchars(': '.$holidays);
+		}
 
 		if ($short_title === true)
 		{
@@ -1421,7 +1515,8 @@ 
 				$title .= ' </span> '.$day_view;
 			}
 		}
-		if (is_bool($short_title) || ($short_title != "")) {
+		if (is_bool($short_title) || ($short_title != ""))
+		{
 			$html .= $indent."\t".'<div style="height: '. $this->rowHeight .'%;" class="calendar_calDayColHeader '.$class.'"'.
 				($holidays ? ' title="'.html::htmlspecialchars($holidays).'"':'').'>'.$title."</div>\n";
 		}
@@ -1449,7 +1544,10 @@ 
 					'hour'		=> sprintf("%02d",floor($t / 60)),
 					'minute'	=> sprintf("%02d",floor($t % 60)),
 				);
-				if ($owner) $linkData['owner'] = $owner;
+				if ($owner)
+				{
+					$linkData['owner'] = $owner;
+				}
 
 				$droppableDateTime = $linkData['date'] . "T" . $linkData['hour'] . $linkData['minute'];
 				$droppableID='drop_'.$droppableDateTime.'_O'.($owner<0?str_replace('-','group',$owner):$owner);
@@ -1488,7 +1586,10 @@ 
 				$width = !$n ? 70 : 50;
 				$left += $n * (100.0-$left) / count($eventCols);
 			}
-			if ($left + $width > 100.0) $width = 100.0 - $left;
+			if ($left + $width > 100.0)
+			{
+				$width = 100.0 - $left;
+			}
 			//echo "<p>count(\$eventCols)=".count($eventCols).", n=$n, pWidth=$pwidth, pLeft=$pleft, width=$width, left=$left</p>\n";
 			$html .= $this->eventColWidget($eventCol,$left,$width,$indent."\t",
 				$owner ? $owner : $this->user, 20+10*$n);
@@ -1567,7 +1668,10 @@ 
 				}
 			}
 		}
-		if ($bday) $class .= ' calendar_calBirthday';
+		if ($bday)
+		{
+			$class .= ' calendar_calBirthday';
+		}
 	}
 
 	/**
@@ -1583,7 +1687,10 @@ 
 	 */
 	function eventColWidget($events,$left,$width,$indent,$owner,$z_index=null)
 	{
-		if ($this->debug > 1 || $this->debug==='eventColWidget') $this->bo->debug_message('uiviews::eventColWidget(%1,left=%2,width=%3,)',False,$events,$left,$width);
+		if ($this->debug > 1 || $this->debug==='eventColWidget')
+		{
+			$this->bo->debug_message('uiviews::eventColWidget(%1,left=%2,width=%3,)',False,$events,$left,$width);
+		}
 
 		$html = $indent.'<div class="calendar_calEventCol" style="left: '.$left.'%; width:'.$width.'%;'.
 			// the "calendar_calEventCol" spans across a whole column (as the name suggests) - setting the
@@ -1617,9 +1724,15 @@ 
 	 */
 	function eventWidget($event,$width,$indent,$owner,$return_array=false,$block='event_widget',$z_index=null)
 	{
-		if ($this->debug > 1 || $this->debug==='eventWidget') $this->bo->debug_message('uiviews::eventWidget(%1,width=%2)',False,$event,$width);
+		if ($this->debug > 1 || $this->debug==='eventWidget')
+		{
+			$this->bo->debug_message('uiviews::eventWidget(%1,width=%2)',False,$event,$width);
+		}
 
-		if($this->use_time_grid && $event['whole_day_on_top']) $block = 'event_widget_wholeday_on_top';
+		if($this->use_time_grid && $event['whole_day_on_top'])
+		{
+			$block = 'event_widget_wholeday_on_top';
+		}
 
 		static $tpl = False;
 		if (!$tpl)
@@ -1699,7 +1812,11 @@ 
 		$status_class = 'calendar_calEventAllAccepted';
 		foreach($event['participants'] as $id => $status)
 		{
-			if ($id < 0) continue;	// as we cant accept/reject groups, we dont care about them here
+			if ($id < 0)
+			{
+				continue;
+			}
+			// as we cant accept/reject groups, we dont care about them here
 
 			calendar_so::split_status($status,$quantity,$role);
 
@@ -1719,9 +1836,9 @@ 
 		// seperate each participant types
 		$part_array = array();
 		if ($this->allowEdit)
- 		{
+		{
 			foreach($this->bo->participants($event) as $part_key => $participant)
- 			{
+			{
 				if(is_numeric($part_key))
 				{
 					$part_array[lang('Participants')][$part_key] = $participant;
@@ -1732,7 +1849,7 @@ 
 				}
  			}
 			foreach($part_array as $part_group => $participant)
- 			{
+			{
 				$participants .= $this->add_nonempty($participant,$part_group,True,False,false);
  			}
  		}
@@ -1855,7 +1972,8 @@ 
 					$this->wholeDayPosCounter++;
 			}
 			else
-			{		$view_link = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'calendar.calendar_uiforms.edit','cal_id'=>$event['id'],'date'=>$this->bo->date2string($event['start'])));
+			{
+$view_link = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'calendar.calendar_uiforms.edit','cal_id'=>$event['id'],'date'=>$this->bo->date2string($event['start'])));
 
 					$style = 'top: '.$this->time2pos($event['start_m']).'%; height: '.$height.'%;';
 			}
@@ -2032,7 +2150,10 @@ 
 		for ($i = 1; $i <=3; ++$i)
 		{
 			$val = hexdec($components[$i]) + $decr;
-			if ($val > 255) $val = 255;
+			if ($val > 255)
+			{
+				$val = 255;
+			}
 			$brighter .= sprintf('%02x',$val);
 		}
 		//echo "brighter($rgb=".print_r($components,True).")=$brighter</p>\n";
@@ -2126,34 +2247,50 @@ 
 		else
 		{
 			$days = 1 + (int) round(($last - $first) / DAY_s);	// we have to use round to get the right number if daylight saving changes
-			if ($days >= 28)	// display the month scale
+			if ($days >= 28)
+			{
+				// display the month scale
 			{
 				$content .= $this->plannerMonthScale($first,$days,$indent."\t\t\t");
 			}
-			if ($days >= 5)	// display the week scale
+			}
+			if ($days >= 5)
+			{
+				// display the week scale
 			{
 				$content .= $this->plannerWeekScale($first,$days,$indent."\t\t\t");
 			}
+			}
 			$content .= $this->plannerDayScale($first,$days,$indent."\t\t\t");		// day-scale, always displayed
-			if ($days <= 7)	// display the hour scale
+			if ($days <= 7)
+			{
+				// display the hour scale
 			{
 				$content .= $this->plannerHourScale($start,$days,$indent."\t\t\t");
 			}
+			}
 		}
 		$content .= $indent."\t\t</div>\n";	// end of the plannerHeaderRows
 		$content .= $indent."\t</div>\n";	// end of the plannerHeader
 
 		// sort the events after user or category
 		$rows = array();
-		if (!is_array($events)) $events = array();
+		if (!is_array($events))
+		{
+			$events = array();
+		}
 
-		if ($by_cat === 'user')	// planner by user
+		if ($by_cat === 'user')
+		{
+			// planner by user
 		{
 			// convert filter to allowed status
 			switch($this->filter)
 			{
 				case 'unknown':
-					$status_to_show = array('U','G'); break;
+					$status_to_show = array('U','G');
+		}
+		break;
 				case 'accepted':
 					$status_to_show = array('A'); break;
 				case 'tentative':
@@ -2170,22 +2307,31 @@ 
 		}
 		foreach($events as $key => $event)
 		{
-			if ($by_cat === 'user')	// planner by user
+			if ($by_cat === 'user')
+			{
+				// planner by user
 			{
 				foreach($event['participants'] as $sort => $status)
 				{
 					calendar_so::split_status($status,$nul,$nul);
+			}
 					// only show if participant with status visible with current filter
 					if (isset($sort2label[$sort]) && (in_array($status,$status_to_show) ||
-						$this->filter == 'owner' && $event['owner'] == $sort))	// owner too additionally uses owner
+						$this->filter == 'owner' && $event['owner'] == $sort))
+					{
+						// owner too additionally uses owner
 					{
 						$rows[$sort][] =& $events[$key];
 					}
+					}
 				}
 			}
-			elseif ($by_cat === 'month')	// planner by month / yearly planner
+			elseif ($by_cat === 'month')
+			{
+				// planner by month / yearly planner
 			{
 				$sort = date('Y-m',$event['start']);
+			}
 				$rows[$sort][] =& $events[$key];
 				// end in a different month?
 				if ($sort != ($end_sort = date('Y-m',$event['end'])))
@@ -2207,7 +2353,10 @@ 
 			{
 				foreach($this->_get_planner_cats($event['category'],$sort2label,$sort2color) as $sort)
 				{
-					if (!is_array($rows[$sort])) $rows[$sort] = array();
+					if (!is_array($rows[$sort]))
+					{
+						$rows[$sort] = array();
+					}
 
 					$rows[$sort][] =& $events[$key];
 				}
@@ -2259,15 +2408,21 @@ 
 				// 0 means current user
 				$user = $this->user;
 			}
-			if (!is_numeric($user))		// resources
+			if (!is_numeric($user))
+			{
+				// resources
 			{
 				$resources[$user] = $this->bo->participant_name($user);
 			}
-			elseif ($enum_groups && $GLOBALS['egw']->accounts->get_type($user) == 'g')	// groups
+			}
+			elseif ($enum_groups && $GLOBALS['egw']->accounts->get_type($user) == 'g')
+			{
+				// groups
 			{
 				foreach((array) $GLOBALS['egw']->accounts->member($user) as $data)
 				{
 					$user = $data['account_id'];
+			}
 					if ($this->bo->check_perms(EGW_ACL_READ | EGW_ACL_FREEBUSY,0,$user))
 					{
 						$users[$user] = $this->bo->participant_name($user);
@@ -2309,15 +2464,21 @@ 
 			foreach((array)$this->categories->return_sorted_array(0,false,'','','',true) as $data)
 			{
 				if (in_array($data['parent'], $cat_filter) || in_array($data['id'], $cat_filter) ||
-					!$data['parent'] && !$cat_filter)	// cat is a direct sub of $this->cat_id
+					!$data['parent'] && !$cat_filter)
+				{
+					// cat is a direct sub of $this->cat_id
 				{
 					$cat2sort[$data['id']] = $data['id'];
+				}
 					$sort2label[$data['id']] = stripslashes($data['name']);
 				}
-				elseif(isset($cat2sort[$data['parent']]))	// parent is already in the array => add us with same target
+				elseif(isset($cat2sort[$data['parent']]))
+				{
+					// parent is already in the array => add us with same target
 				{
 					$cat2sort[$data['id']] = $cat2sort[$data['parent']];
 				}
+				}
 			}
 		}
 		$ret = array();
@@ -2375,7 +2536,11 @@ 
 				{
 					$prev['day'] = $this->day;
 					$full = $this->bo->date2string($prev);
-					if ($this->day >= 15) $prev = $t_arr;		// we stay in the same month
+					if ($this->day >= 15)
+					{
+						$prev = $t_arr;
+					}
+					// we stay in the same month
 					$prev['day'] = $this->day < 15 ? 15 : 1;
 					$half = $this->bo->date2string($prev);
 					$title = html::a_href(html::image('phpgwapi','first',lang('back one month'),$options=' alt="<<"'),array(
@@ -2398,10 +2563,18 @@ 
 				$days_in_next_month = (int) date('d',$end = $start+$days*DAY_s);
 				if ($days_in_next_month <= 10 || date('m',$end) == date('m',$t))
 				{
-					if ($this->day >= 15) $next = $t_arr;		// we stay in the same month
+					if ($this->day >= 15)
+					{
+						$next = $t_arr;
+					}
+					// we stay in the same month
 					$next['day'] = $this->day;
 					$full = $this->bo->date2string($next);
-					if ($this->day < 15) $next = $t_arr;		// we stay in the same month
+					if ($this->day < 15)
+					{
+						$next = $t_arr;
+					}
+					// we stay in the same month
 					$next['day'] = $this->day < 15 ? 15 : 1;
 					$half = $this->bo->date2string($next);
 					$title .= ' &nbsp; '.html::a_href(html::image('phpgwapi','right',lang('forward half a month'),$options=' alt=">>"'),array(
@@ -2511,20 +2684,26 @@ 
 			}
 			if ($days < 5)
 			{
-				if (!$i)	// prev. day only for the first day
+				if (!$i)
+				{
+					// prev. day only for the first day
 				{
 					$title = html::a_href(html::image('phpgwapi','first',lang('previous'),$options=' alt="<<"'),array(
 						'menuaction' => $this->view_menuaction,
 						'date'       => date('Ymd',$start-DAY_s),
 					)) . ' &nbsp; '.$title;
 				}
-				if ($i == $days-1)	// next day only for the last day
+				}
+				if ($i == $days-1)
+				{
+					// next day only for the last day
 				{
 					$title .= ' &nbsp; '.html::a_href(html::image('phpgwapi','last',lang('next'),$options=' alt=">>"'),array(
 						'menuaction' => $this->view_menuaction,
 						'date'       => date('Ymd',$start+DAY_s),
 					));
 				}
+				}
 			}
 			$content .= $indent."\t".'<div class="calendar_plannerDayScale '.$class.'" style="left: '.$left.'%; width: '.$day_width.'%;"'.
 				($holidays ? ' title="'.html::htmlspecialchars($holidays).'"' : '').'>'.$title."</div>\n";
@@ -2606,15 +2785,21 @@ 
 	 */
 	function plannerHourScale($start,$days,$indent)
 	{
-		foreach(array(1,2,3,4,6,8,12) as $d)	// numbers dividing 24 without rest
+		foreach(array(1,2,3,4,6,8,12) as $d)
+		{
+			// numbers dividing 24 without rest
 		{
 			if ($d > $days) break;
+		}
 			$decr = $d;
 		}
 		$hours = $days * 24;
-		if ($days == 1)			// for a single day we calculate the hours of a days, to take into account daylight saving changes (23 or 25 hours)
+		if ($days == 1)
+		{
+			// for a single day we calculate the hours of a days, to take into account daylight saving changes (23 or 25 hours)
 		{
 			$t_arr = $this->bo->date2array($start);
+		}
 			unset($t_arr['raw']);
 			$t_arr['hour'] = $t_arr['minute'] = $t_arr['second'] = 0;
 			$s = $this->bo->date2ts($t_arr);
@@ -2714,13 +2899,16 @@ 
 			$this->_day_class_holiday($this->bo->date2string($t),$class,$holidays,true);
 
 			$class = trim(str_replace(array('row_on','row_off'),'',$class));
-			if ($class)	// no regular weekday
+			if ($class)
+			{
+				// no regular weekday
 			{
 				$content .= $indent.'<div class="calendar_eventRowsMarkedDay '.$class.
 					'" style="left: '.$left.'%; width:'.$day_width.'%;"'.
 					($holidays ? ' title="'.html::htmlspecialchars($holidays).'"' : '').
 					' ></div>'."\n";
 			}
+			}
 		}
 		return $content;
 	}
@@ -2762,8 +2950,16 @@ 
 	 */
 	function _planner_pos($time,$start,$end)
 	{
-		if ($time <= $start) return 0;	// we are left of our scale
-		if ($time >= $end) return 100;	// we are right of our scale
+		if ($time <= $start)
+		{
+			return 0;
+		}
+		// we are left of our scale
+		if ($time >= $end)
+		{
+			return 100;
+		}
+		// we are right of our scale
 
 		if ($this->planner_days || $this->sortby == 'month')
 		{
@@ -2785,7 +2981,10 @@ 
 				else
 				{
 					$wd_lenght = $this->wd_end - $this->wd_start;
-					if ($wd_lenght <= 0) $wd_lenght = 24*60;
+					if ($wd_lenght <= 0)
+					{
+						$wd_lenght = 24*60;
+					}
 					$day_percentage = ($time_of_day-$this->wd_start) / $wd_lenght;		// between 0 and 1
 				}
 				$days = ($end - $start) / DAY_s;
@@ -2882,7 +3081,8 @@ 
 	function _get_holiday_icon($type)
 	{
 		//Set the special icon which will be prepended to the event
-		switch ($type) {
+		switch ($type)
+		{
 			case "bday":
 				return html::image('calendar', 'cake', '', "style=\"float:left; padding: 1px 2px 0px 2px;\"");
 			case "hday":

calendar/inc/class.soholiday.inc.php

Doc Comments +3 added lines

@@ -78,6 +78,9 @@
 		}
 	}
 
+	/**
+	 * @param ADORecordSet $rs
+	 */
 	function store_to_array(&$holidays,$rs)
 	{
 		foreach($rs as $row)

Spacing +33 added lines, -33 removed lines

@@ -39,9 +39,9 @@ 
 		$holiday['observance_rule'] = @$holiday['observance_rule'] ? 1 : 0;
 		$holiday['locale'] = strtoupper($holiday['locale']);
 
-		foreach($holiday as $name => $val)
+		foreach ($holiday as $name => $val)
 		{
-			if (substr($name,0,4) != 'hol_')
+			if (substr($name, 0, 4) != 'hol_')
 			{
 				if (!is_numeric($name))
 				{
@@ -56,15 +56,15 @@ 
 
 		if ($hol_id)
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Updating LOCALE='".$holiday['locale']."' NAME='".$holiday['name']."' extra=(".$holiday['mday'].'/'.$holiday['month_num'].'/'.$holiday['occurence'].'/'.$holiday['dow'].'/'.$holiday['observance_rule'].")<br>\n";
 			}
-			$this->db->update($this->table,$holiday,array('hol_id' => $hol_id),__LINE__,__FILE__,'calendar');
+			$this->db->update($this->table, $holiday, array('hol_id' => $hol_id), __LINE__, __FILE__, 'calendar');
 		}
 		else
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Inserting LOCALE='".$holiday['locale']."' NAME='".$holiday['name']."' extra=(".$holiday['mday'].'/'.$holiday['month_num'].'/'.$holiday['occurence'].'/'.$holiday['dow'].'/'.$holiday['observance_rule'].")<br>\n";
 			}
@@ -74,13 +74,13 @@ 
 				'hol_occurence' => $holiday['hol_occurence'],
 				'hol_locale' => $holiday['hol_locale'],
 			), __LINE__, __FILES__, 'calendar');
-			$this->db->insert($this->table,$holiday,False,__LINE__,__FILE__,'calendar');
+			$this->db->insert($this->table, $holiday, False, __LINE__, __FILE__, 'calendar');
 		}
 	}
 
-	function store_to_array(&$holidays,$rs)
+	function store_to_array(&$holidays, $rs)
 	{
-		foreach($rs as $row)
+		foreach ($rs as $row)
 		{
 			$holidays[] = Array(
 				'index'			=> $row['hol_id'],
@@ -92,31 +92,31 @@ 
 				'dow'			=> (int)$row['hol_dow'],
 				'observance_rule'	=> $row['hol_observance_rule']
 			);
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo 'Holiday ID: '.$row['hol_id'].'<br>'."\n";
 			}
 		}
 	}
 
-	function read_holidays($locales='',$query='',$order='',$year=0)
+	function read_holidays($locales = '', $query = '', $order = '', $year = 0)
 	{
 		$holidays = Array();
 
-		if($locales == '')
+		if ($locales == '')
 		{
 			return $holidays;
 		}
 
-		$where = $this->_build_where($locales,$query,$order,$year);
+		$where = $this->_build_where($locales, $query, $order, $year);
 
-		if($this->debug)
+		if ($this->debug)
 		{
 			echo 'Read Holidays : '.$where.'<br>'."\n";
 		}
 
-		$rs = $this->db->select($this->table,'*',$where,__LINE__,__FILE__,false,'','calendar');
-		$this->store_to_array($holidays,$rs);
+		$rs = $this->db->select($this->table, '*', $where, __LINE__, __FILE__, false, '', 'calendar');
+		$this->store_to_array($holidays, $rs);
 
 		return $holidays;
 	}
@@ -124,38 +124,38 @@ 
 	function read_holiday($id)
 	{
 		$holidays = Array();
-		if($this->debug)
+		if ($this->debug)
 		{
 			echo 'Reading Holiday ID : '.$id.'<br>'."\n";
 		}
-		$rs = $this->db->select($this->table,'*',array('hol_id'=>$id),__LINE__,__FILE__,false,'','calendar');
-		$this->store_to_array($holidays,$rs);
+		$rs = $this->db->select($this->table, '*', array('hol_id'=>$id), __LINE__, __FILE__, false, '', 'calendar');
+		$this->store_to_array($holidays, $rs);
 		return $holidays[0];
 	}
 
 	function delete_holiday($id)
 	{
-		$this->db->delete($this->table,array('hol_id' => $id),__LINE__,__FILE__,'calendar');
+		$this->db->delete($this->table, array('hol_id' => $id), __LINE__, __FILE__, 'calendar');
 	}
 
 	function delete_locale($locale)
 	{
-		$this->db->delete($this->table,array('hol_locale' => $locale),__LINE__,__FILE__,'calendar');
+		$this->db->delete($this->table, array('hol_locale' => $locale), __LINE__, __FILE__, 'calendar');
 	}
 
 	/* Private functions */
-	function _build_where($locales,$query='',$order='',$year=0,$add_order_by=True)
+	function _build_where($locales, $query = '', $order = '', $year = 0, $add_order_by = True)
 	{
 		$querymethod = 'hol_locale';
 		if (is_array($locales))
 		{
-			$querymethod .= ' IN ('.$this->db->column_data_implode(',',$locales,False).')';
+			$querymethod .= ' IN ('.$this->db->column_data_implode(',', $locales, False).')';
 		}
 		else
 		{
 			$querymethod .= '='.$this->db->quote($locales);
 		}
-		if($query)
+		if ($query)
 		{
 			$querymethod .= " AND hol_name LIKE ".$this->db->quote('%'.$query.'%');
 		}
@@ -165,44 +165,44 @@ 
 		}
 		if ($add_order_by)
 		{
-			$querymethod .= ' ORDER BY '.(preg_match('/^[a-zA-Z0-9_,]+$/',$order) ? $order : 'hol_month_num,hol_mday');
+			$querymethod .= ' ORDER BY '.(preg_match('/^[a-zA-Z0-9_,]+$/', $order) ? $order : 'hol_month_num,hol_mday');
 		}
 		return $querymethod;
 	}
 
-	function get_locale_list($sort='', $order='', $query='')
+	function get_locale_list($sort = '', $order = '', $query = '')
 	{
 		$querymethod = '';
-		if($query)
+		if ($query)
 		{
 			$querymethod = 'hol_locale LIKE '.$this->db->quote('%'.$query.'%');
 		}
 
-		if(!preg_match('/^[a-zA-Z0-9_,]+$/',$order))
+		if (!preg_match('/^[a-zA-Z0-9_,]+$/', $order))
 		{
 			$order = 'hol_locale';
 		}
 		if (strtoupper($sort) != 'DESC') $sort = 'ASC';
 		if (strpos($order, ',') === false) $order .= ' '.$sort;
-		foreach($this->db->select($this->table,'DISTINCT hol_locale',$querymethod,__LINE__,__FILE__,false,'ORDER BY '.$order,'calendar') as $row)
+		foreach ($this->db->select($this->table, 'DISTINCT hol_locale', $querymethod, __LINE__, __FILE__, false, 'ORDER BY '.$order, 'calendar') as $row)
 		{
 			$locale[] = $row['hol_locale'];
 		}
 		return $locale;
 	}
 
-	function holiday_total($locale,$query='',$year=0)
+	function holiday_total($locale, $query = '', $year = 0)
 	{
-		$where = $this->_build_where($locale,$query,'',$year,False);
+		$where = $this->_build_where($locale, $query, '', $year, False);
 
-		if($this->debug)
+		if ($this->debug)
 		{
 			echo 'HOLIDAY_TOTAL : '.$where.'<br>'."\n";
 		}
 
-		$retval = $this->db->select($this->table,'count(*)',$where,__LINE__,__FILE__,false,'','calendar')->fetchColumn();
+		$retval = $this->db->select($this->table, 'count(*)', $where, __LINE__, __FILE__, false, '', 'calendar')->fetchColumn();
 
-		if($this->debug)
+		if ($this->debug)
 		{
 			echo 'Total Holidays for : '.$locale.' : '.$retval."<br>\n";
 		}

Braces +8 added lines, -2 removed lines

@@ -182,8 +182,14 @@
 		{
 			$order = 'hol_locale';
 		}
-		if (strtoupper($sort) != 'DESC') $sort = 'ASC';
-		if (strpos($order, ',') === false) $order .= ' '.$sort;
+		if (strtoupper($sort) != 'DESC')
+		{
+			$sort = 'ASC';
+		}
+		if (strpos($order, ',') === false)
+		{
+			$order .= ' '.$sort;
+		}
 		foreach($this->db->select($this->table,'DISTINCT hol_locale',$querymethod,__LINE__,__FILE__,false,'ORDER BY '.$order,'calendar') as $row)
 		{
 			$locale[] = $row['hol_locale'];

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

@@ -82,7 +82,7 @@ 
 	{
 		foreach($rs as $row)
 		{
-			$holidays[] = Array(
+			$holidays[] = array(
 				'index'			=> $row['hol_id'],
 				'locale'		=> $row['hol_locale'],
 				'name'			=> $GLOBALS['egw']->strip_html($row['hol_name']),
@@ -101,7 +101,7 @@ 
 
 	function read_holidays($locales='',$query='',$order='',$year=0)
 	{
-		$holidays = Array();
+		$holidays = array();
 
 		if($locales == '')
 		{
@@ -123,7 +123,7 @@ 
 
 	function read_holiday($id)
 	{
-		$holidays = Array();
+		$holidays = array();
 		if($this->debug)
 		{
 			echo 'Reading Holiday ID : '.$id.'<br>'."\n";

emailadmin/inc/class.defaultimap.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -116,7 +116,7 @@ 
 	 * opens a connection to a imap server
 	 *
 	 * @param bool $_adminConnection create admin connection if true
-	 * @param int $_timeout=null timeout in secs, if none given fmail pref or default of 20 is used
+	 * @param integer $_timeout timeout in secs, if none given fmail pref or default of 20 is used
 	 * @throws Exception on error
 	 */
 	function openConnection($_adminConnection=false, $_timeout=null);
@@ -143,7 +143,7 @@ 
 	 *
 	 * @param int|string $_euser nummeric account_id or imap username
 	 * @param array $_vacation
-	 * @param string $_scriptName=null
+	 * @param string $_scriptName
 	 * @return boolean
 	 */
 	public function setVacationUser($_euser, array $_vacation, $_scriptName=null);
@@ -152,7 +152,7 @@ 
 	 * Get vacation message for given user
 	 *
 	 * @param int|string $_euser nummeric account_id or imap username
-	 * @param string $_scriptName=null
+	 * @param string $_scriptName
 	 * @throws Exception on connection error or authentication failure
 	 * @return array
 	 */

Spacing +8 added lines, -8 removed lines

@@ -14,9 +14,9 @@ 
 namespace EGroupware\Api\Mail\Imap;
 
 define('IMAP_NAMESPACE_PERSONAL', 'personal');
-define('IMAP_NAMESPACE_OTHERS'	, 'others');
-define('IMAP_NAMESPACE_SHARED'	, 'shared');
-define('IMAP_NAMESPACE_ALL'	, 'all');
+define('IMAP_NAMESPACE_OTHERS', 'others');
+define('IMAP_NAMESPACE_SHARED', 'shared');
+define('IMAP_NAMESPACE_ALL', 'all');
 
 /**
  * This class holds all information about the imap connection.
@@ -87,7 +87,7 @@ 
 	 * @param string $_folderName=''
 	 * @return string utf-7 encoded (done in getMailboxName)
 	 */
-	function getUserMailboxString($_username, $_folderName='');
+	function getUserMailboxString($_username, $_folderName = '');
 
 	/**
 	 * get list of namespaces
@@ -103,7 +103,7 @@ 
 	 * @param string $_what - what to retrieve either QMAX, USED or ALL is supported
 	 * @return mixed the quota for specified user (by what) or array with all available Quota Information, or false
 	 */
-	function getQuotaByUser($_username, $_what='QMAX');
+	function getQuotaByUser($_username, $_what = 'QMAX');
 
 	/**
 	 * returns information about a user
@@ -122,7 +122,7 @@ 
 	 * @param int $_timeout =null timeout in secs, if none given fmail pref or default of 20 is used
 	 * @throws Exception on error
 	 */
-	function openConnection($_adminConnection=false, $_timeout=null);
+	function openConnection($_adminConnection = false, $_timeout = null);
 
 	/**
 	 * set userdata
@@ -149,7 +149,7 @@ 
 	 * @param string $_scriptName =null
 	 * @return boolean
 	 */
-	public function setVacationUser($_euser, array $_vacation, $_scriptName=null);
+	public function setVacationUser($_euser, array $_vacation, $_scriptName = null);
 
 	/**
 	 * Get vacation message for given user
@@ -159,5 +159,5 @@ 
 	 * @throws Exception on connection error or authentication failure
 	 * @return array
 	 */
-	public function getVacationUser($_euser, $_scriptName=null);
+	public function getVacationUser($_euser, $_scriptName = null);
 }

emailadmin/inc/class.emailadmin_account.inc.php

Doc Comments +13 added lines, -15 removed lines

@@ -517,11 +517,9 @@ 
 	 *
 	 * Standard identity is always first (as it has account_id=0 and we order account_id ASC).
 	 *
-	 * @param int|array|emailadmin_account $account=null default this account, empty array() to get all identities of current user
-	 * @param boolean $replace_placeholders=false should placeholders like {{n_fn}} be replaced
-	 * @param string $field='name' what to return as value: "ident_(realname|org|email|signature)" or default "name"=result from identity_name
-	 * @param int $user=null account_id to use if not current user
-	 * @return Iterator ident_id => identity_name of identity
+	 * @param int|array|emailadmin_account $account default this account, empty array() to get all identities of current user
+	 * @param boolean $replace_placeholders should placeholders like {{n_fn}} be replaced
+	 * @return Traversable ident_id => identity_name of identity
 	 */
 	public /*static*/ function identities($account=null, $replace_placeholders=true, $field='name', $user=null)
 	{
@@ -645,7 +643,7 @@ 
 	/**
 	 * Return list of identities/signatures for given account ordered by give email on top and then by identity name
 	 *
-	 * @param int|array|emailadmin_account $account=null default this account, empty array() to get all identities of current user
+	 * @param int|array|emailadmin_account $account default this account, empty array() to get all identities of current user
 	 * @param string $order_email_top email address to order top
 	 * @return array ident_id => ident_name pairs
 	 */
@@ -674,8 +672,8 @@ 
 	 *
 	 * For full list of placeholders see addressbook_merge.
 	 *
-	 * @param array|emailadmin_account $identity=null
-	 * @param int $account_id=null account_id of user, or current user
+	 * @param array|emailadmin_account $identity
+	 * @param int $account_id account_id of user, or current user
 	 * @return array with modified fields
 	 */
 	public /*static*/ function replace_placeholders($identity=null, $account_id=null)
@@ -772,7 +770,7 @@ 
 	 *
 	 * Can be called static, if identity is given as parameter
 	 *
-	 * @param array|emailadmin_account $identity=null default standard identity of current account
+	 * @param array|emailadmin_account $identity default standard identity of current account
 	 * @return int ident_id of new/updated identity
 	 */
 	public /*static*/ function save_identity($identity=null)
@@ -833,7 +831,7 @@ 
 	 *
 	 * To get $this->params you need to call getUserData before! It is never automatically loaded.
 	 *
-	 * @param type $name
+	 * @param string $name
 	 * @return mixed
 	 */
 	public function __get($name)
@@ -857,8 +855,8 @@ 
 	/**
 	 * Give read access to protected parameters in $this->params
 	 *
-	 * @param type $name
-	 * @return mixed
+	 * @param string $name
+	 * @return boolean
 	 */
 	public function __isset($name)
 	{
@@ -931,7 +929,7 @@ 
 	 * Check which rights current user has on mail-account
 	 *
 	 * @param int $rights EGW_ACL_(READ|EDIT|DELETE)
-	 * @param array|emailadmin_account $account=null default use this
+	 * @param array|emailadmin_account $account default use this
 	 * @return boolean
 	 */
 	public /*static*/ function check_access($rights, $account=null)
@@ -1289,10 +1287,10 @@ 
 	 * @param boolean|string $just_name =true true: return self::identity_name, false: return emailadmin_account objects,
 	 *	string with attribute-name: return that attribute, eg. acc_imap_host or 'params' to return all attributes as array
 	 * @param string $order_by ='acc_name ASC'
-	 * @param int|boolean $offset =false offset or false to return all
+	 * @param boolean $offset =false offset or false to return all
 	 * @param int $num_rows =0 number of rows to return, 0=default from prefs (if $offset !== false)
 	 * @param boolean $replace_placeholders =true should placeholders like {{n_fn}} be replaced
-	 * @return Iterator with acc_id => acc_name or emailadmin_account objects
+	 * @return Traversable with acc_id => acc_name or emailadmin_account objects
 	 */
 	public static function search($only_current_user=true, $just_name=true, $order_by=null, $offset=false, $num_rows=0, $replace_placeholders=true)
 	{

Spacing +67 added lines, -70 removed lines

@@ -186,7 +186,7 @@ 
 	/**
 	 * Path to log smtp comunication to or null to not log
 	 */
-	const SMTP_DEBUG_LOG = null;//'/tmp/smtp.log';
+	const SMTP_DEBUG_LOG = null; //'/tmp/smtp.log';
 
 	/**
 	 * Instanciated account object by acc_id, read acts as singelton
@@ -234,7 +234,7 @@ 
 	 * @param int $called_for=null if set access to given user (without smtp credentials!),
 	 *	default current user AND read username/password from current users session
 	 */
-	/*protected*/ function __construct(array $params, $called_for=null)
+	/*protected*/ function __construct(array $params, $called_for = null)
 	{
 		// read credentials from database
 		$params += emailadmin_credentials::read($params['acc_id'], null, $called_for ? array(0, $called_for) : $called_for);
@@ -283,15 +283,15 @@ 
 				$this->params = array_merge($this->params, $data);
 			}
 		}
-		catch(Horde_Imap_Client_Exception $e) {
+		catch (Horde_Imap_Client_Exception $e) {
 			unset($e);
 			// ignore eg. connection errors
 		}
-		catch(InvalidArgumentException $e) {
+		catch (InvalidArgumentException $e) {
 			unset($e);
 			// ignore eg. missing admin user
 		}
-		$this->params += array_fill_keys(self::$user_data, null);	// make sure all keys exist now
+		$this->params += array_fill_keys(self::$user_data, null); // make sure all keys exist now
 
 		return (array)$data + (array)$smtp_data;
 	}
@@ -325,7 +325,7 @@ 
 	 * @param int $_timeout =null timeout in secs, if none given fmail pref or default of 20 is used
 	 * @return emailadmin_imap
 	 */
-	public function imapServer($_adminConnection=false, $_timeout=null)
+	public function imapServer($_adminConnection = false, $_timeout = null)
 	{
 		if (!isset($this->imapServer) || $this->imapServer->isAdminConnection !== $_adminConnection)
 		{
@@ -349,11 +349,11 @@ 
 	 *	(matters only for imap servers managed by EGroupware!)
 	 * @return boolean
 	 */
-	public function is_imap($try_connect=true)
+	public function is_imap($try_connect = true)
 	{
 		if (empty($this->acc_imap_host) || empty($this->acc_imap_username) || empty($this->acc_imap_password))
 		{
-			return false;	// no imap host or credentials
+			return false; // no imap host or credentials
 		}
 		// if we are not managing the mail-server, we do NOT need to check deliveryMode and accountStatus
 		if ($this->acc_smtp_type == 'emailadmin_smtp')
@@ -383,7 +383,7 @@ 
 	 * @param boolean $old_ic_server =false true: return emailadmin_oldimap as icServer, false: use new emailadmin_imap
 	 * @return string
 	 */
-	public static function getIcClass($imap_type, $old_ic_server=false)
+	public static function getIcClass($imap_type, $old_ic_server = false)
 	{
 		static $old2new_icClass = array(
 			'defaultimap' => 'emailadmin_imap',
@@ -408,7 +408,7 @@ 
 		// fetch the IMAP / incomming server data
 		if (!class_exists($icClass))
 		{
-			if (file_exists($file=EGW_INCLUDE_ROOT.'/emailadmin/inc/class.'.$icClass.'.inc.php'))
+			if (file_exists($file = EGW_INCLUDE_ROOT.'/emailadmin/inc/class.'.$icClass.'.inc.php'))
 			{
 				include_once($file);
 			}
@@ -444,9 +444,9 @@ 
 	protected static function _smtp(array $params)
 	{
 		$class = $params['acc_smtp_type'];
-		if ($class=='defaultsmtp') $class='emailadmin_smtp';
+		if ($class == 'defaultsmtp') $class = 'emailadmin_smtp';
 		// not all smtp plugins are autoloadable eg. postifxldap (qmailUser)
-		if (!class_exists($class) && file_exists($file=EGW_INCLUDE_ROOT.'/emailadmin/inc/class.'.$class.'.inc.php'))
+		if (!class_exists($class) && file_exists($file = EGW_INCLUDE_ROOT.'/emailadmin/inc/class.'.$class.'.inc.php'))
 		{
 			require_once($file);
 		}
@@ -454,7 +454,7 @@ 
 		$smtp->editForwardingAddress = false;
 		$smtp->host = $params['acc_smtp_host'];
 		$smtp->port = $params['acc_smtp_port'];
-		switch($params['acc_smtp_ssl'])
+		switch ($params['acc_smtp_ssl'])
 		{
 			case self::SSL_TLS:			// requires modified PHPMailer, or comment next two lines to use just ssl!
 				$smtp->host = 'tlsv1://'.$smtp->host;
@@ -484,16 +484,16 @@ 
 		if (!isset($this->smtpTransport))
 		{
 			$secure = false;
-			switch($this->acc_smtp_ssl & ~self::SSL_VERIFY)
+			switch ($this->acc_smtp_ssl&~self::SSL_VERIFY)
 			{
 				case self::SSL_STARTTLS:
-					$secure = 'tls';	// Horde uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
+					$secure = 'tls'; // Horde uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
 					break;
 				case self::SSL_SSL:
 					$secure = 'ssl';
 					break;
 				case self::SSL_TLS:
-					$secure = 'tlsv1';	// since Horde_Smtp-1.3.0 requiring Horde_Socket_Client-1.1.0
+					$secure = 'tlsv1'; // since Horde_Smtp-1.3.0 requiring Horde_Socket_Client-1.1.0
 					break;
 			}
 			// Horde use locale for translation of error messages
@@ -523,7 +523,7 @@ 
 	 * @param int $user=null account_id to use if not current user
 	 * @return Iterator ident_id => identity_name of identity
 	 */
-	public /*static*/ function identities($account=null, $replace_placeholders=true, $field='name', $user=null)
+	public /*static*/ function identities($account = null, $replace_placeholders = true, $field = 'name', $user = null)
 	{
 		if (is_null($account)) $account = $this;
 		if (!isset($user)) $user = $GLOBALS['egw_info']['user']['account_id'];
@@ -574,7 +574,7 @@ 
 				}
 				return emailadmin_account::identity_name($row, $replace_placeholders);
 			}, array(),
-			function($row) { return $row['ident_id'];});
+			function($row) { return $row['ident_id']; });
 	}
 
 	/**
@@ -617,17 +617,17 @@ 
 	 * @return array acc_id:ident_id:email => rfc822 address pairs, eg. '1:1:rb@stylite.de' => 'Ralf Becker Stylite AG <rb@stylite.de>'
 	 * @todo add aliases for manged mail servers
 	 */
-	public static function rfc822_addresses($formatter=null)
+	public static function rfc822_addresses($formatter = null)
 	{
 		if (!$formatter || !is_callable($formatter))
 		{
 			$formatter = __CLASS__.'::rfc822';
 		}
 		$addresses = array();
-		foreach(self::search(true, false) as $acc_id => $account)
+		foreach (self::search(true, false) as $acc_id => $account)
 		{
-			$added = false;	// make sure each account get's at least added once, even if it uses an identical email address
-			foreach($account->identities(null, true, 'params') as $identity)
+			$added = false; // make sure each account get's at least added once, even if it uses an identical email address
+			foreach ($account->identities(null, true, 'params') as $identity)
 			{
 				if (($address = call_user_func($formatter, $identity)) && (!$added || !in_array($address, $addresses)))
 				{
@@ -661,7 +661,7 @@ 
 			}
 			return $cmp;
 		});
-		foreach($identities as &$identity)
+		foreach ($identities as &$identity)
 		{
 			$identity = self::identity_name($identity);
 		}
@@ -678,9 +678,9 @@ 
 	 * @param int $account_id=null account_id of user, or current user
 	 * @return array with modified fields
 	 */
-	public /*static*/ function replace_placeholders($identity=null, $account_id=null)
+	public /*static*/ function replace_placeholders($identity = null, $account_id = null)
 	{
-		static $fields = array('ident_name','ident_realname','ident_org','ident_email','ident_signature');
+		static $fields = array('ident_name', 'ident_realname', 'ident_org', 'ident_email', 'ident_signature');
 
 		if (!$identity && isset($this)) $identity = $this;
 		if (!is_array($identity) && !is_a($identity, 'emailadmin_account'))
@@ -688,7 +688,7 @@ 
 			throw new egw_exception_wrong_parameter(__METHOD__."() requires an identity or account as first parameter!");
 		}
 		$to_replace = array();
-		foreach($fields as $name)
+		foreach ($fields as $name)
 		{
 			if (strpos($identity[$name], '{{') !== false || strpos($identity[$name], '$$') !== false)
 			{
@@ -697,10 +697,10 @@ 
 		}
 		if ($to_replace)
 		{
-			static $merge=null;
+			static $merge = null;
 			if (!isset($merge)) $merge = new addressbook_merge();
 			if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
-			foreach($to_replace as $name => &$value)
+			foreach ($to_replace as $name => &$value)
 			{
 				$err = null;
 				$value = $merge->merge_string($value,
@@ -722,7 +722,7 @@ 
 	 * @return array
 	 * @throws egw_exception_not_found
 	 */
-	public static function read_identity($ident_id, $replace_placeholders=false, $user=null, $account=null)
+	public static function read_identity($ident_id, $replace_placeholders = false, $user = null, $account = null)
 	{
 		if (($account && $account['ident_id'] == $ident_id))
 		{
@@ -775,7 +775,7 @@ 
 	 * @param array|emailadmin_account $identity=null default standard identity of current account
 	 * @return int ident_id of new/updated identity
 	 */
-	public /*static*/ function save_identity($identity=null)
+	public /*static*/ function save_identity($identity = null)
 	{
 		if (!$identity && isset($this)) $identity = $this;
 		if (!is_array($identity) && !is_a($identity, 'emailadmin_account'))
@@ -793,8 +793,7 @@ 
 			'ident_org' => $identity['ident_org'],
 			'ident_email' => $identity['ident_email'],
 			'ident_signature' => $identity['ident_signature'],
-			'account_id' => self::is_multiple($identity) ? 0 :
-				(is_array($identity['account_id']) ? $identity['account_id'][0] : $identity['account_id']),
+			'account_id' => self::is_multiple($identity) ? 0 : (is_array($identity['account_id']) ? $identity['account_id'][0] : $identity['account_id']),
 		);
 		if ($identity['ident_id'] > 0)
 		{
@@ -838,7 +837,7 @@ 
 	 */
 	public function __get($name)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'acc_imap_administration':	// no longer stored in database
 				return !empty($this->params['acc_imap_admin_username']);
@@ -862,7 +861,7 @@ 
 	 */
 	public function __isset($name)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'acc_imap_administration':	// no longer stored in database
 				return true;
@@ -934,7 +933,7 @@ 
 	 * @param array|emailadmin_account $account=null default use this
 	 * @return boolean
 	 */
-	public /*static*/ function check_access($rights, $account=null)
+	public /*static*/ function check_access($rights, $account = null)
 	{
 		if (!isset($account)) $account = $this;
 
@@ -954,11 +953,11 @@ 
 		{
 			// check if account is for current user, if not deny access
 			$memberships = self::memberships();
-			$memberships[] = '';	// edit uses '' for everyone
+			$memberships[] = ''; // edit uses '' for everyone
 
 			if (array_intersect((array)$account['account_id'], $memberships))
 			{
-				switch($rights)
+				switch ($rights)
 				{
 					case EGW_ACL_READ:
 						$access = true;
@@ -1003,7 +1002,7 @@ 
 	 * @return email_account
 	 * @throws egw_exception_not_found if account was not found (or not valid for current user)
 	 */
-	public static function read($acc_id, $called_for=null)
+	public static function read($acc_id, $called_for = null)
 	{
 		//error_log(__METHOD__."($acc_id, ".array2string($called_for).")");
 		// some caching, but only for regular usage/users
@@ -1021,7 +1020,7 @@ 
 				//error_log(__METHOD__."($acc_id) created instance from cached data");
 				return self::$instances[$acc_id] = new emailadmin_account(self::$cache[$acc_id]);
 			}
-			$data =& self::$cache[$acc_id];
+			$data = & self::$cache[$acc_id];
 		}
 		$where = array(self::TABLE.'.acc_id='.(int)$acc_id);
 		if (!isset($called_for) || $called_for !== '0')
@@ -1045,7 +1044,7 @@ 
 		if (!$valid_account_id_sql)
 		{
 			$data['account_id'] = array();
-			foreach(self::$db->select(self::VALID_TABLE, 'account_id', array('acc_id' => $acc_id),
+			foreach (self::$db->select(self::VALID_TABLE, 'account_id', array('acc_id' => $acc_id),
 				__LINE__, __FILE__, false, '', self::APP) as $row)
 			{
 				$data['account_id'][] = $row['account_id'];
@@ -1057,7 +1056,7 @@ 
 		if (!isset($called_for))
 		{
 			//error_log(__METHOD__."($acc_id) creating instance and caching data read from db");
-			$ret =& self::$instances[$acc_id];
+			$ret = & self::$instances[$acc_id];
 		}
 		return $ret = new emailadmin_account($data, $called_for);
 	}
@@ -1070,7 +1069,7 @@ 
 	 */
 	protected static function db2data(array $data)
 	{
-		foreach(array('acc_sieve_enabled','acc_further_identities','acc_user_editable','acc_smtp_auth_session','acc_user_forward') as $name)
+		foreach (array('acc_sieve_enabled', 'acc_further_identities', 'acc_user_editable', 'acc_smtp_auth_session', 'acc_user_forward') as $name)
 		{
 			if (isset($data[$name]))
 			{
@@ -1093,7 +1092,7 @@ 
 	 * @throws egw_exception_wrong_parameter if called static without data-array
 	 * @throws egw_exception_db
 	 */
-	public static function write(array $data, $user=null)
+	public static function write(array $data, $user = null)
 	{
 		//error_log(__METHOD__."(".array2string($data).")");
 		$data['acc_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
@@ -1104,7 +1103,7 @@ 
 		{
 			// set not set values which, are NOT NULL and therefore would give an SQL error
 			$td = self::$db->get_table_definitions('emailadmin', self::TABLE);
-			foreach($td['fd'] as $col => $def)
+			foreach ($td['fd'] as $col => $def)
 			{
 				if (!isset($data[$col]) && $def['nullable'] === false && !isset($def['default']))
 				{
@@ -1138,19 +1137,19 @@ 
 		$old_account_ids = array();
 		if ($where)
 		{
-			foreach(self::$db->select(self::VALID_TABLE, 'account_id', $where,
+			foreach (self::$db->select(self::VALID_TABLE, 'account_id', $where,
 				__LINE__, __FILE__, false, '', self::APP) as $row)
 			{
 				$old_account_ids[] = $row['account_id'];
 			}
 			if (($ids_to_remove = array_diff($old_account_ids, (array)$data['account_id'])))
 			{
-				self::$db->delete(self::VALID_TABLE, $where+array(
+				self::$db->delete(self::VALID_TABLE, $where + array(
 					'account_id' => $ids_to_remove,
 				), __LINE__, __FILE__, self::APP);
 			}
 		}
-		foreach((array)$data['account_id'] as $account_id)
+		foreach ((array)$data['account_id'] as $account_id)
 		{
 			if (!in_array($account_id, $old_account_ids))
 			{
@@ -1187,8 +1186,7 @@ 
 		}
 
 		// store notification folders
-		emailadmin_notifications::write($data['acc_id'], $data['notify_save_default'] ? 0 :
-			($data['called_for'] ? $data['called_for'] : $GLOBALS['egw_info']['user']['account_id']),
+		emailadmin_notifications::write($data['acc_id'], $data['notify_save_default'] ? 0 : ($data['called_for'] ? $data['called_for'] : $GLOBALS['egw_info']['user']['account_id']),
 			(array)$data['notify_folders']);
 
 		// store domain of an account for all user like before as "mail_suffix" config
@@ -1214,7 +1212,7 @@ 
 	 * @param int $account_id =null
 	 * @return boolean
 	 */
-	protected static function credentials_valid_for($account, $account_id=null)
+	protected static function credentials_valid_for($account, $account_id = null)
 	{
 		if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
 
@@ -1240,7 +1238,7 @@ 
 	 * @param int $account_id =null user or group
 	 * @return int number of deleted mail accounts or null if only user-data was deleted and no full mail accounts
 	 */
-	public static function delete($acc_id, $account_id=null)
+	public static function delete($acc_id, $account_id = null)
 	{
 		if (is_array($acc_id) || $acc_id > 0)
 		{
@@ -1251,7 +1249,7 @@ 
 			self::$db->delete(self::TABLE, array('acc_id' => $acc_id), __LINE__, __FILE__, self::APP);
 
 			// invalidate caches
-			foreach((array)$acc_id as $acc_id)
+			foreach ((array)$acc_id as $acc_id)
 			{
 				self::cache_invalidate($acc_id);
 			}
@@ -1270,7 +1268,7 @@ 
 		self::$db->delete(self::IDENTITIES_TABLE, array('account_id' => $account_id), __LINE__, __FILE__, self::APP);
 		// find profiles not belonging to anyone else and delete them
 		$acc_ids = array();
-		foreach(self::$db->select(self::TABLE, self::TABLE.'.acc_id', 'account_id IS NULL', __LINE__, __FILE__,
+		foreach (self::$db->select(self::TABLE, self::TABLE.'.acc_id', 'account_id IS NULL', __LINE__, __FILE__,
 			false, 'GROUP BY '.self::TABLE.'.acc_id', self::APP, 0, 'LEFT '.self::VALID_JOIN) as $row)
 		{
 			$acc_ids[] = $row['acc_id'];
@@ -1294,7 +1292,7 @@ 
 	 * @param boolean $replace_placeholders =true should placeholders like {{n_fn}} be replaced
 	 * @return Iterator with acc_id => acc_name or emailadmin_account objects
 	 */
-	public static function search($only_current_user=true, $just_name=true, $order_by=null, $offset=false, $num_rows=0, $replace_placeholders=true)
+	public static function search($only_current_user = true, $just_name = true, $order_by = null, $offset = false, $num_rows = 0, $replace_placeholders = true)
 	{
 		//error_log(__METHOD__."($only_current_user, $just_name, '$order_by', $offset, $num_rows)");
 		$where = array();
@@ -1340,19 +1338,19 @@ 
 				$cols[] = self::ADMIN_COL;
 				$join .= ' '.self::ADMIN_JOIN;
 			}
-			$rs = self::$db->select(self::TABLE, $cols,	$where, __LINE__, __FILE__,
+			$rs = self::$db->select(self::TABLE, $cols, $where, __LINE__, __FILE__,
 				$offset, so_sql::fix_group_by_columns($group_by, $cols, self::TABLE, 'acc_id').' ORDER BY '.$order_by,
 				self::APP, $num_rows, $join);
 
 			$ids = array();
-			foreach($rs as $row)
+			foreach ($rs as $row)
 			{
 				$row = self::db2data($row);
 
 				if ($only_current_user === true)
 				{
 					//error_log(__METHOD__."(TRUE, $just_name) caching data for acc_id=$row[acc_id]");
-					self::$search_cache[$cache_key][$row['acc_id']] =& self::$cache[$row['acc_id']];
+					self::$search_cache[$cache_key][$row['acc_id']] = & self::$cache[$row['acc_id']];
 					self::$cache[$row['acc_id']] = $row;
 				}
 				else
@@ -1364,14 +1362,14 @@ 
 			// fetch valid_id, if not yet fetched
 			if (!$valid_account_id_sql && $ids)
 			{
-				foreach(self::$db->select(self::VALID_TABLE, 'account_id', array('acc_id' => $ids),
+				foreach (self::$db->select(self::VALID_TABLE, 'account_id', array('acc_id' => $ids),
 					__LINE__, __FILE__, false, '', self::APP) as $row)
 				{
 					self::$cache[$row['acc_id']]['account_id'][] = $row['account_id'];
 				}
 			}
 		}
-		if (is_null(self::$search_cache[$cache_key])) self::$search_cache[$cache_key]=array();
+		if (is_null(self::$search_cache[$cache_key])) self::$search_cache[$cache_key] = array();
 		return new egw_db_callback_iterator(new ArrayIterator(self::$search_cache[$cache_key]),
 			// process each row
 			function($row) use ($just_name, $replace_placeholders, $account_id)
@@ -1405,11 +1403,11 @@ 
 	 * @param boolean $log_no_default =true true: error_log if no default found, false be silent
 	 * @return emailadmin_account|null
 	 */
-	static function get_default($smtp=false, $return_id=false, $log_no_default=true)
+	static function get_default($smtp = false, $return_id = false, $log_no_default = true)
 	{
 		try
 		{
-			foreach(emailadmin_account::search(true, 'params') as $acc_id => $params)
+			foreach (emailadmin_account::search(true, 'params') as $acc_id => $params)
 			{
 				if ($smtp)
 				{
@@ -1456,7 +1454,7 @@ 
 	 * @param boolean $smtp =false false: usable for IMAP, true: usable for SMTP
 	 * @return int
 	 */
-	static function get_default_acc_id($smtp=false)
+	static function get_default_acc_id($smtp = false)
 	{
 		return self::get_default($smtp, true);
 	}
@@ -1469,7 +1467,7 @@ 
 	 * @param int $account_id =null account_id of user we are called for
 	 * @return string with htmlencoded angle brackets
 	 */
-	public static function identity_name($account, $replace_placeholders=true, $account_id=null)
+	public static function identity_name($account, $replace_placeholders = true, $account_id = null)
 	{
 		if ($replace_placeholders)
 		{
@@ -1496,7 +1494,7 @@ 
 				{
 					if (!isset($account['acc_imap_username']))
 					{
-						$account += emailadmin_credentials::read($account['acc_id'], null, ($account_id?array($account_id, 0):null));
+						$account += emailadmin_credentials::read($account['acc_id'], null, ($account_id ? array($account_id, 0) : null));
 					}
 					if (empty($account['acc_imap_username']) && $account['acc_imap_logintype'] &&
 						(!isset($account_id) || $account_id == $GLOBALS['egw_info']['user']['account_id']))
@@ -1515,7 +1513,7 @@ 
 					$account['ident_email'] = $account['acc_imap_username'];
 				}
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				_egw_log_exception($e);
 			}
 
@@ -1532,7 +1530,7 @@ 
 		{
 			$name .= ' <'.$account['ident_email'].'>';
 		}
-		elseif(strpos($account['acc_imap_username'], '@') !== false)
+		elseif (strpos($account['acc_imap_username'], '@') !== false)
 		{
 			$name .= ' <'.$account['acc_imap_username'].'>';
 		}
@@ -1555,8 +1553,7 @@ 
 	 */
 	public static function is_multiple($account)
 	{
-		$is_multiple = !is_array($account['account_id']) ? $account['account_id'] <= 0 :
-			(count($account['account_id']) > 1 || $account['account_id'][0] <= 0);
+		$is_multiple = !is_array($account['account_id']) ? $account['account_id'] <= 0 : (count($account['account_id']) > 1 || $account['account_id'][0] <= 0);
 		//error_log(__METHOD__."(account_id=".array2string($account['account_id']).") returning ".array2string($is_multiple));
 		return $is_multiple;
 	}
@@ -1577,13 +1574,13 @@ 
 	 * @param type $user
 	 * @return array
 	 */
-	protected static function memberships($user=null)
+	protected static function memberships($user = null)
 	{
 		if (!$user) $user = $GLOBALS['egw_info']['user']['account_id'];
 
 		$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 		$memberships[] = $user;
-		$memberships[] = 0;	// marks accounts valid for everyone
+		$memberships[] = 0; // marks accounts valid for everyone
 
 		return $memberships;
 	}

Braces +103 added lines, -26 removed lines

@@ -331,8 +331,14 @@ 
 		{
 			// make sure mbstring.func_overload=0
 			static $func_overload = null;
-			if (is_null($func_overload)) $func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
-			if ($func_overload) throw new egw_exception_assertion_failed('Fatal Error: EGroupware requires mbstring.func_overload=0 set in your php.ini!');
+			if (is_null($func_overload))
+			{
+				$func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+			}
+			if ($func_overload)
+			{
+				throw new egw_exception_assertion_failed('Fatal Error: EGroupware requires mbstring.func_overload=0 set in your php.ini!');
+			}
 
 			$class = self::getIcClass($this->params['acc_imap_type']);
 			$this->imapServer = new $class($this->params, $_adminConnection, $_timeout);
@@ -444,7 +450,10 @@ 
 	protected static function _smtp(array $params)
 	{
 		$class = $params['acc_smtp_type'];
-		if ($class=='defaultsmtp') $class='emailadmin_smtp';
+		if ($class=='defaultsmtp')
+		{
+			$class='emailadmin_smtp';
+		}
 		// not all smtp plugins are autoloadable eg. postifxldap (qmailUser)
 		if (!class_exists($class) && file_exists($file=EGW_INCLUDE_ROOT.'/emailadmin/inc/class.'.$class.'.inc.php'))
 		{
@@ -525,8 +534,14 @@ 
 	 */
 	public /*static*/ function identities($account=null, $replace_placeholders=true, $field='name', $user=null)
 	{
-		if (is_null($account)) $account = $this;
-		if (!isset($user)) $user = $GLOBALS['egw_info']['user']['account_id'];
+		if (is_null($account))
+		{
+			$account = $this;
+		}
+		if (!isset($user))
+		{
+			$user = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		$acc_id = is_scalar($account) ? $account : $account['acc_id'];
 
 		$cols = array('ident_id', 'ident_name', 'ident_realname', 'ident_org', 'ident_email', 'ident_signature', 'acc_id', 'acc_imap_username', 'acc_imap_logintype', 'acc_domain');
@@ -564,8 +579,14 @@ 
 				// fill an empty ident_realname or ident_email of current user with data from user account
 				if ($replace_placeholders && (!isset($user) || $user == $GLOBALS['egw_info']['user']['acount_id']))
 				{
-					if (empty($row['ident_realname'])) $row['ident_realname'] = $GLOBALS['egw_info']['user']['account_fullname'];
-					if (empty($row['ident_email'])) $row['ident_email'] = $GLOBALS['egw_info']['user']['account_email'];
+					if (empty($row['ident_realname']))
+					{
+						$row['ident_realname'] = $GLOBALS['egw_info']['user']['account_fullname'];
+					}
+					if (empty($row['ident_email']))
+					{
+						$row['ident_email'] = $GLOBALS['egw_info']['user']['account_email'];
+					}
 				}
 				if ($field != 'name')
 				{
@@ -574,7 +595,9 @@ 
 				}
 				return emailadmin_account::identity_name($row, $replace_placeholders);
 			}, array(),
-			function($row) { return $row['ident_id'];});
+			function($row)
+			{
+return $row['ident_id'];});
 	}
 
 	/**
@@ -590,10 +613,13 @@ 
 		{
 			$address .= ($address && $identity['ident_org'] ? ' ' : '').$identity['ident_org'];
 		}
-		if (strpos($address, ',') !== false)	// need to quote comma
+		if (strpos($address, ',') !== false)
+		{
+			// need to quote comma
 		{
 			$address = '"'.str_replace('"', '\\"', $address).'"';
 		}
+		}
 		if (!strpos($identity['ident_email'], '@'))
 		{
 			$address = null;
@@ -682,7 +708,10 @@ 
 	{
 		static $fields = array('ident_name','ident_realname','ident_org','ident_email','ident_signature');
 
-		if (!$identity && isset($this)) $identity = $this;
+		if (!$identity && isset($this))
+		{
+			$identity = $this;
+		}
 		if (!is_array($identity) && !is_a($identity, 'emailadmin_account'))
 		{
 			throw new egw_exception_wrong_parameter(__METHOD__."() requires an identity or account as first parameter!");
@@ -698,8 +727,14 @@ 
 		if ($to_replace)
 		{
 			static $merge=null;
-			if (!isset($merge)) $merge = new addressbook_merge();
-			if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
+			if (!isset($merge))
+			{
+				$merge = new addressbook_merge();
+			}
+			if (!isset($account_id))
+			{
+				$account_id = $GLOBALS['egw_info']['user']['account_id'];
+			}
 			foreach($to_replace as $name => &$value)
 			{
 				$err = null;
@@ -777,7 +812,10 @@ 
 	 */
 	public /*static*/ function save_identity($identity=null)
 	{
-		if (!$identity && isset($this)) $identity = $this;
+		if (!$identity && isset($this))
+		{
+			$identity = $this;
+		}
 		if (!is_array($identity) && !is_a($identity, 'emailadmin_account'))
 		{
 			throw new egw_exception_wrong_parameter(__METHOD__."() requires an identity or account as first parameter!");
@@ -936,7 +974,10 @@ 
 	 */
 	public /*static*/ function check_access($rights, $account=null)
 	{
-		if (!isset($account)) $account = $this;
+		if (!isset($account))
+		{
+			$account = $this;
+		}
 
 		if (!is_array($account) && !is_a($account, 'emailadmin_account'))
 		{
@@ -1216,7 +1257,10 @@ 
 	 */
 	protected static function credentials_valid_for($account, $account_id=null)
 	{
-		if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
+		if (!isset($account_id))
+		{
+			$account_id = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		// if account valid for multiple users
 		if (self::is_multiple($account))
@@ -1335,9 +1379,12 @@ 
 				$cols[] = $valid_account_id_sql.' AS account_id';
 				$join .= ' '.self::ALL_VALID_JOIN;
 			}
-			if ($just_name == 'params')	// join in acc_imap_admin_username
+			if ($just_name == 'params')
+			{
+				// join in acc_imap_admin_username
 			{
 				$cols[] = self::ADMIN_COL;
+			}
 				$join .= ' '.self::ADMIN_JOIN;
 			}
 			$rs = self::$db->select(self::TABLE, $cols,	$where, __LINE__, __FILE__,
@@ -1371,7 +1418,10 @@ 
 				}
 			}
 		}
-		if (is_null(self::$search_cache[$cache_key])) self::$search_cache[$cache_key]=array();
+		if (is_null(self::$search_cache[$cache_key]))
+		{
+			self::$search_cache[$cache_key]=array();
+		}
 		return new egw_db_callback_iterator(new ArrayIterator(self::$search_cache[$cache_key]),
 			// process each row
 			function($row) use ($just_name, $replace_placeholders, $account_id)
@@ -1413,12 +1463,18 @@ 
 			{
 				if ($smtp)
 				{
-					if (!$params['acc_smtp_host'] || !$params['acc_smtp_port']) continue;
+					if (!$params['acc_smtp_host'] || !$params['acc_smtp_port'])
+					{
+						continue;
+					}
 					// check requirement of session, which is not available in async service!
 					if (isset($GLOBALS['egw_info']['flags']['async-service']) ||
-						empty($GLOBALS['egw_info']['user']['account_id']))	// happens during login when notifying about blocked accounts
+						empty($GLOBALS['egw_info']['user']['account_id']))
+					{
+						// happens during login when notifying about blocked accounts
 					{
 						if ($params['acc_smtp_auth_session']) continue;
+					}
 						// may fail because of smtp only profile, or no session password, etc
 						try
 						{
@@ -1429,15 +1485,24 @@ 
 							unset($x);
 							continue;
 						}
-						if ($account->acc_smtp_pw_enc == emailadmin_credentials::USER) continue;
+						if ($account->acc_smtp_pw_enc == emailadmin_credentials::USER)
+						{
+							continue;
+						}
 					}
 				}
 				else
 				{
-					if (!$params['acc_imap_host'] || !$params['acc_imap_port']) continue;
+					if (!$params['acc_imap_host'] || !$params['acc_imap_port'])
+					{
+						continue;
+					}
 					$account = new emailadmin_account($params);
 					// continue if we have either no imap username or password
-					if (!$account->is_imap()) continue;
+					if (!$account->is_imap())
+					{
+						continue;
+					}
 				}
 				return $return_id ? $acc_id : (isset($account) && $account->acc_id == $acc_id ?
 					$account : new emailadmin_account($params));
@@ -1445,7 +1510,10 @@ 
 		}
 		catch (Exception $e)
 		{
-			if ($log_no_default) error_log(__METHOD__.__LINE__.' Error no Default available.'.$e->getMessage());
+			if ($log_no_default)
+			{
+				error_log(__METHOD__.__LINE__.' Error no Default available.'.$e->getMessage());
+			}
 		}
 		return null;
 	}
@@ -1507,8 +1575,14 @@ 
 				// fill an empty ident_realname or ident_email of current user with data from user account
 				if ($replace_placeholders && (!isset($account_id) || $account_id == $GLOBALS['egw_info']['user']['acount_id']))
 				{
-					if (empty($account['ident_realname'])) $account['ident_realname'] = $GLOBALS['egw_info']['user']['account_fullname'];
-					if (empty($account['ident_email'])) $account['ident_email'] = $GLOBALS['egw_info']['user']['account_email'];
+					if (empty($account['ident_realname']))
+					{
+						$account['ident_realname'] = $GLOBALS['egw_info']['user']['account_fullname'];
+					}
+					if (empty($account['ident_email']))
+					{
+						$account['ident_email'] = $GLOBALS['egw_info']['user']['account_email'];
+					}
 				}
 				if (empty($account['ident_email']) && !empty($account['acc_imap_username']) && strpos($account['acc_imap_username'], '@') !== false)
 				{
@@ -1579,7 +1653,10 @@ 
 	 */
 	protected static function memberships($user=null)
 	{
-		if (!$user) $user = $GLOBALS['egw_info']['user']['account_id'];
+		if (!$user)
+		{
+			$user = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 		$memberships[] = $user;

emailadmin/inc/class.emailadmin_base.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	 *
 	 * Calls hook "imap_server_types" to allow applications to supply own server-types
 	 *
-	 * @param boolean $extended=true
+	 * @param boolean $extended
 	 * @return array classname => label pairs
 	 */
 	static public function getIMAPServerTypes($extended=true)

Spacing +4 added lines, -4 removed lines

@@ -20,10 +20,10 @@ 
 	 *
 	 * @return array classname => label pairs
 	 */
-	static public function getSMTPServerTypes($extended=true)
+	static public function getSMTPServerTypes($extended = true)
 	{
 		$retData = array();
-		foreach($GLOBALS['egw']->hooks->process(array(
+		foreach ($GLOBALS['egw']->hooks->process(array(
 			'location' => 'smtp_server_types',
 			'extended' => $extended,
 		), array('managementserver', 'emailadmin'), true) as $data)
@@ -49,10 +49,10 @@ 
 	 * @param boolean $extended=true
 	 * @return array classname => label pairs
 	 */
-	static public function getIMAPServerTypes($extended=true)
+	static public function getIMAPServerTypes($extended = true)
 	{
 		$retData = array();
-		foreach($GLOBALS['egw']->hooks->process(array(
+		foreach ($GLOBALS['egw']->hooks->process(array(
 			'location' => 'imap_server_types',
 			'extended' => $extended,
 		), array('managementserver', 'emailadmin'), true) as $data)

Braces +12 added lines, -4 removed lines

@@ -28,9 +28,13 @@ 
 			'extended' => $extended,
 		), array('managementserver', 'emailadmin'), true) as $data)
 		{
-			if ($data) $retData += $data;
+			if ($data)
+			{
+				$retData += $data;
+			}
 		}
-		uksort($retData, function($a, $b) {
+		uksort($retData, function($a, $b)
+		{
 			static $prio = array(	// not explicitly mentioned get 0
 				'emailadmin_smtp' => 9,
 				'emailadmin_smtp_sql' => 8,
@@ -57,9 +61,13 @@ 
 			'extended' => $extended,
 		), array('managementserver', 'emailadmin'), true) as $data)
 		{
-			if ($data) $retData += $data;
+			if ($data)
+			{
+				$retData += $data;
+			}
 		}
-		uksort($retData, function($a, $b) {
+		uksort($retData, function($a, $b)
+		{
 			static $prio = array(	// not explicitly mentioned get 0
 				'emailadmin_imap' => 9,
 				'emailadmin_oldimap' => 9,

emailadmin/inc/class.emailadmin_credentials.inc.php

Doc Comments +1 added lines

@@ -322,6 +322,7 @@
 	 * @param int $account_id user-account password is for
 	 * @param int &$pw_enc on return encryption used
 	 * @param ressource $mcrypt =null mcrypt ressource for user, default calling self::init_crypt(true)
+	 * @param integer $pw_enc
 	 * @return string encrypted password
 	 */
 	protected static function encrypt($password, $account_id, &$pw_enc, $mcrypt=null)

Spacing +28 added lines, -31 removed lines

@@ -106,7 +106,7 @@ 
 	 * @param int|array $account_id =null default use current user or all (in that order)
 	 * @return array with values for (imap|smtp|admin)_(username|password|cred_id)
 	 */
-	public static function read($acc_id, $type=null, $account_id=null)
+	public static function read($acc_id, $type = null, $account_id = null)
 	{
 		if (is_null($type)) $type = self::ALL;
 		if (is_null($account_id))
@@ -122,7 +122,7 @@ 
 			$rows = self::$db->select(self::TABLE, '*', array(
 				'acc_id' => $acc_id,
 				'account_id' => $account_id,
-				'(cred_type & '.(int)$type.') > 0',	// postgreSQL require > 0, or gives error as it expects boolean
+				'(cred_type & '.(int)$type.') > 0', // postgreSQL require > 0, or gives error as it expects boolean
 			), __LINE__, __FILE__, false,
 				// account_id DESC ensures 0=all allways overwrite (old user-specific credentials)
 				'ORDER BY account_id ASC', self::APP);
@@ -130,14 +130,14 @@ 
 		}
 		else
 		{
-			ksort($rows);	// ORDER BY account_id ASC
+			ksort($rows); // ORDER BY account_id ASC
 
 			// flatten account_id => cred_type => row array again, to have format like from database
 			$rows = call_user_func_array('array_merge', $rows);
 			//error_log(__METHOD__."($acc_id, $type, ".array2string($account_id).") read from cache ".array2string($rows));
 		}
 		$results = array();
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		{
 			// update cache (only if we have database-iterator and all credentials asked!)
 			if (!is_array($rows) && $type == self::ALL)
@@ -147,9 +147,9 @@ 
 			}
 			$password = self::decrypt($row);
 
-			foreach(self::$type2prefix as $pattern => $prefix)
+			foreach (self::$type2prefix as $pattern => $prefix)
 			{
-				if ($row['cred_type'] & $pattern)
+				if ($row['cred_type']&$pattern)
 				{
 					$results[$prefix.'username'] = $row['cred_username'];
 					$results[$prefix.'password'] = $password;
@@ -169,9 +169,9 @@ 
 	 * @param boolean $set_identity =true true: also set identity values realname&email, if not yet set
 	 * @return array with values for keys 'acc_(imap|smtp)_(username|password|cred_id)'
 	 */
-	public static function from_session(array $data, $set_identity=true)
+	public static function from_session(array $data, $set_identity = true)
 	{
-		switch($data['acc_imap_logintype'])
+		switch ($data['acc_imap_logintype'])
 		{
 			case 'standard':
 				$username = $GLOBALS['egw_info']['user']['account_lid'];
@@ -197,23 +197,21 @@ 
 				throw new egw_exception_wrong_parameter("Unknown data[acc_imap_logintype]=".array2string($data['acc_imap_logintype']).'!');
 		}
 		$password = base64_decode(egw_cache::getSession('phpgwapi', 'password'));
-		$realname = !$set_identity || $data['ident_realname'] ? $data['ident_realname'] :
-			$GLOBALS['egw_info']['user']['account_fullname'];
-		$email = !$set_identity || $data['ident_email'] ? $data['ident_email'] :
-			$GLOBALS['egw_info']['user']['account_email'];
+		$realname = !$set_identity || $data['ident_realname'] ? $data['ident_realname'] : $GLOBALS['egw_info']['user']['account_fullname'];
+		$email = !$set_identity || $data['ident_email'] ? $data['ident_email'] : $GLOBALS['egw_info']['user']['account_email'];
 
 		return array(
 			'ident_realname' => $realname,
 			'ident_email' => $email,
 			'acc_imap_username' => $username,
 			'acc_imap_password' => $password,
-			'acc_imap_cred_id'  => $data['acc_imap_logintype'],	// to NOT store it
+			'acc_imap_cred_id'  => $data['acc_imap_logintype'], // to NOT store it
 			'acc_imap_account_id' => 'c',
 		) + ($data['acc_smtp_auth_session'] ? array(
 			// only set smtp
 			'acc_smtp_username' => $username,
 			'acc_smtp_password' => $password,
-			'acc_smtp_cred_id'  => $data['acc_imap_logintype'],	// to NOT store it
+			'acc_smtp_cred_id'  => $data['acc_imap_logintype'], // to NOT store it
 			'acc_smtp_account_id' => 'c',
 		) : array());
 	}
@@ -230,27 +228,26 @@ 
 	 * @param ressource $mcrypt =null mcrypt ressource for user, default calling self::init_crypt(true)
 	 * @return int cred_id
 	 */
-	public static function write($acc_id, $username, $password, $type, $account_id=0, $cred_id=null, $mcrypt=null)
+	public static function write($acc_id, $username, $password, $type, $account_id = 0, $cred_id = null, $mcrypt = null)
 	{
 		//error_log(__METHOD__."(acc_id=$acc_id, '$username', \$password, type=$type, account_id=$account_id, cred_id=$cred_id)");
 		if (!empty($cred_id) && !is_numeric($cred_id) || !is_numeric($account_id))
 		{
 			//error_log(__METHOD__."($acc_id, '$username', \$password, $type, $account_id, ".array2string($cred_id).") not storing session credentials!");
-			return;	// do NOT store credentials from session of current user!
+			return; // do NOT store credentials from session of current user!
 		}
 		// no need to write empty usernames, but delete existing row
 		if ((string)$username === '')
 		{
 			if ($cred_id) self::$db->delete(self::TABLE, array('cred_id' => $cred_id), __LINE__, __FILE__, self::APP);
-			return;	// nothing to save
+			return; // nothing to save
 		}
 		$pw_enc = self::CLEARTEXT;
 		$data = array(
 			'acc_id' => $acc_id,
 			'account_id' => $account_id,
 			'cred_username' => $username,
-			'cred_password' => (string)$password === '' ? '' :
-				self::encrypt($password, $account_id, $pw_enc, $mcrypt),
+			'cred_password' => (string)$password === '' ? '' : self::encrypt($password, $account_id, $pw_enc, $mcrypt),
 			'cred_type' => $type,
 			'cred_pw_enc' => $pw_enc,
 		);
@@ -290,7 +287,7 @@ 
 	 * @param boolean $exact_type =false true: delete only cred_type=$type, false: delete cred_type&$type
 	 * @return int number of rows deleted
 	 */
-	public static function delete($acc_id, $account_id=null, $type=self::ALL, $exact_type=false)
+	public static function delete($acc_id, $account_id = null, $type = self::ALL, $exact_type = false)
 	{
 		if (!($acc_id > 0) && !isset($account_id))
 		{
@@ -305,12 +302,12 @@ 
 		}
 		elseif ($type != self::ALL)
 		{
-			$where[] = '(cred_type & '.(int)$type.') > 0';	// postgreSQL require > 0, or gives error as it expects boolean
+			$where[] = '(cred_type & '.(int)$type.') > 0'; // postgreSQL require > 0, or gives error as it expects boolean
 		}
 		self::$db->delete(self::TABLE, $where, __LINE__, __FILE__, self::APP);
 
 		// invalidate cache: we allways unset everything about an account to simplify cache handling
-		foreach($acc_id > 0 ? (array)$acc_id : array_keys(self::$cache) as $acc_id)
+		foreach ($acc_id > 0 ? (array)$acc_id : array_keys(self::$cache) as $acc_id)
 		{
 			unset(self::$cache[$acc_id]);
 		}
@@ -328,7 +325,7 @@ 
 	 * @param ressource $mcrypt =null mcrypt ressource for user, default calling self::init_crypt(true)
 	 * @return string encrypted password
 	 */
-	protected static function encrypt($password, $account_id, &$pw_enc, $mcrypt=null)
+	protected static function encrypt($password, $account_id, &$pw_enc, $mcrypt = null)
 	{
 		if ($account_id > 0 && $account_id == $GLOBALS['egw_info']['user']['account_id'] &&
 			($mcrypt || ($mcrypt = self::init_crypt(true))))
@@ -355,7 +352,7 @@ 
 	 * @param array $row database row
 	 * @param ressource $mcrypt =null mcrypt ressource for user, default calling self::init_crypt(true)
 	 */
-	protected static function decrypt(array $row, $mcrypt=null)
+	protected static function decrypt(array $row, $mcrypt = null)
 	{
 		switch ($row['cred_pw_enc'])
 		{
@@ -394,9 +391,9 @@ 
 		if (empty($data['old_passwd'])) return;
 
 		$old_mcrypt = null;
-		foreach(self::$db->select(self::TABLE, self::TABLE.'.*', array(
+		foreach (self::$db->select(self::TABLE, self::TABLE.'.*', array(
 			'account_id' => $data['account_id']
-		),__LINE__, __FILE__, false, '', 'emailadmin', 0, self::USER_EDITABLE_JOIN.self::$db->quote(true, 'bool')) as $row)
+		), __LINE__, __FILE__, false, '', 'emailadmin', 0, self::USER_EDITABLE_JOIN.self::$db->quote(true, 'bool')) as $row)
 		{
 			if (!isset($old_mcrypt))
 			{
@@ -420,7 +417,7 @@ 
 	 * @param string $mode ='ecb'
 	 * @return ressource|boolean mcrypt ressource to use or false if not available
 	 */
-	static public function init_crypt($user=false, $algo='tripledes',$mode='ecb')
+	static public function init_crypt($user = false, $algo = 'tripledes', $mode = 'ecb')
 	{
 		if (is_string($user))
 		{
@@ -428,11 +425,11 @@ 
 		}
 		elseif ($user)
 		{
-			$mcrypt =& self::$user_mcrypt;
+			$mcrypt = & self::$user_mcrypt;
 		}
 		else
 		{
-			$mcrypt =& self::$system_mcrypt;
+			$mcrypt = & self::$system_mcrypt;
 		}
 		if (!isset($mcrypt))
 		{
@@ -468,10 +465,10 @@ 
 			{
 				$iv_size = mcrypt_enc_get_iv_size($mcrypt);
 				$iv = !isset($GLOBALS['egw_info']['server']['mcrypt_iv']) || strlen($GLOBALS['egw_info']['server']['mcrypt_iv']) < $iv_size ?
-					mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'],0,$iv_size);
+					mcrypt_create_iv($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'], 0, $iv_size);
 
 				$key_size = mcrypt_enc_get_key_size($mcrypt);
-				if (bytes($key) > $key_size) $key = cut_bytes($key,0,$key_size-1);
+				if (bytes($key) > $key_size) $key = cut_bytes($key, 0, $key_size - 1);
 
 				if (mcrypt_generic_init($mcrypt, $key, $iv) < 0)
 				{

Braces +28 added lines, -7 removed lines

@@ -122,7 +122,10 @@ 
 	 */
 	public static function read($acc_id, $type=null, $account_id=null)
 	{
-		if (is_null($type)) $type = self::ALL;
+		if (is_null($type))
+		{
+			$type = self::ALL;
+		}
 		if (is_null($account_id))
 		{
 			$account_id = array(0, $GLOBALS['egw_info']['user']['account_id']);
@@ -255,7 +258,10 @@ 
 		// no need to write empty usernames, but delete existing row
 		if ((string)$username === '')
 		{
-			if ($cred_id) self::$db->delete(self::TABLE, array('cred_id' => $cred_id), __LINE__, __FILE__, self::APP);
+			if ($cred_id)
+			{
+				self::$db->delete(self::TABLE, array('cred_id' => $cred_id), __LINE__, __FILE__, self::APP);
+			}
 			return;	// nothing to save
 		}
 		$pw_enc = self::CLEARTEXT;
@@ -311,8 +317,14 @@ 
 			throw new Api\Exception\WrongParameter(__METHOD__."() no acc_id AND no account_id parameter!");
 		}
 		$where = array();
-		if ($acc_id > 0) $where['acc_id'] = $acc_id;
-		if (isset($account_id)) $where['account_id'] = $account_id;
+		if ($acc_id > 0)
+		{
+			$where['acc_id'] = $acc_id;
+		}
+		if (isset($account_id))
+		{
+			$where['account_id'] = $account_id;
+		}
 		if ($exact_type)
 		{
 			$where['cred_type'] = $type;
@@ -405,7 +417,10 @@ 
 	 */
 	static public function changepassword(array $data)
 	{
-		if (empty($data['old_passwd'])) return;
+		if (empty($data['old_passwd']))
+		{
+			return;
+		}
 
 		$old_mcrypt = null;
 		foreach(self::$db->select(self::TABLE, self::TABLE.'.*', array(
@@ -416,7 +431,10 @@ 
 			{
 				$old_mcrypt = self::init_crypt($data['old_passwd']);
 				$new_mcrypt = self::init_crypt($data['new_passwd']);
-				if (!$old_mcrypt && !$new_mcrypt) return;
+				if (!$old_mcrypt && !$new_mcrypt)
+				{
+					return;
+				}
 			}
 			$password = self::decrypt($row, $old_mcrypt);
 
@@ -485,7 +503,10 @@ 
 					mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'],0,$iv_size);
 
 				$key_size = mcrypt_enc_get_key_size($mcrypt);
-				if (bytes($key) > $key_size) $key = cut_bytes($key,0,$key_size-1);
+				if (bytes($key) > $key_size)
+				{
+					$key = cut_bytes($key,0,$key_size-1);
+				}
 
 				if (mcrypt_generic_init($mcrypt, $key, $iv) < 0)
 				{

emailadmin/inc/class.emailadmin_hooks.inc.php

Doc Comments -9 removed lines

@@ -20,7 +20,6 @@ 
      * Hook called to add action to user
      *
      * @param array $data
-     * @param int $data['account_id'] numerical id
      */
 	static function edit_user($data)
 	{
@@ -81,9 +80,6 @@ 
      * Hook called before an account get deleted
      *
      * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_lid'] account-name
-     * @param int $data['new_owner'] account-id of new owner, or false if data should get deleted
      */
 	static function deleteaccount(array $data)
 	{
@@ -97,8 +93,6 @@ 
      * Hook called before a group get deleted
      *
      * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_name'] account-name
      */
 	static function deletegroup(array $data)
 	{
@@ -109,9 +103,6 @@ 
      * Hook called when an account get added or edited
      *
      * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_lid'] account-name
-     * @param string $data['account_email'] email
 	 */
 	static function addaccount(array $data)
 	{

Indentation +27 added lines, -27 removed lines

@@ -16,12 +16,12 @@ 
  */
 class emailadmin_hooks
 {
-    /**
-     * Hook called to add action to user
-     *
-     * @param array $data
-     * @param int $data['account_id'] numerical id
-     */
+	/**
+	 * Hook called to add action to user
+	 *
+	 * @param array $data
+	 * @param int $data['account_id'] numerical id
+	 */
 	static function edit_user($data)
 	{
 		unset($data);	// not used
@@ -77,14 +77,14 @@ 
 		}
 	}
 
-    /**
-     * Hook called before an account get deleted
-     *
-     * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_lid'] account-name
-     * @param int $data['new_owner'] account-id of new owner, or false if data should get deleted
-     */
+	/**
+	 * Hook called before an account get deleted
+	 *
+	 * @param array $data
+	 * @param int $data['account_id'] numerical id
+	 * @param string $data['account_lid'] account-name
+	 * @param int $data['new_owner'] account-id of new owner, or false if data should get deleted
+	 */
 	static function deleteaccount(array $data)
 	{
 		self::run_plugin_hooks('deleteAccount', $data);
@@ -93,25 +93,25 @@ 
 		emailadmin_account::delete(0, $data['account_id']);
 	}
 
-    /**
-     * Hook called before a group get deleted
-     *
-     * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_name'] account-name
-     */
+	/**
+	 * Hook called before a group get deleted
+	 *
+	 * @param array $data
+	 * @param int $data['account_id'] numerical id
+	 * @param string $data['account_name'] account-name
+	 */
 	static function deletegroup(array $data)
 	{
 		emailadmin_account::delete(0, $data['account_id']);
 	}
 
 	/**
-     * Hook called when an account get added or edited
-     *
-     * @param array $data
-     * @param int $data['account_id'] numerical id
-     * @param string $data['account_lid'] account-name
-     * @param string $data['account_email'] email
+	 * Hook called when an account get added or edited
+	 *
+	 * @param array $data
+	 * @param int $data['account_id'] numerical id
+	 * @param string $data['account_lid'] account-name
+	 * @param string $data['account_email'] email
 	 */
 	static function addaccount(array $data)
 	{

Spacing +12 added lines, -12 removed lines

@@ -24,7 +24,7 @@ 
      */
 	static function edit_user($data)
 	{
-		unset($data);	// not used
+		unset($data); // not used
 
 		$actions = array();
 
@@ -41,17 +41,17 @@ 
 			$emailadmin = emailadmin_account::get_default();
 			if ($emailadmin->acc_smtp_type && $emailadmin->acc_smtp_type !== 'emailadmin_smtp')
 			{
-				$actions[] = array (
+				$actions[] = array(
 					'id'       => 'mail_activeAccounts',
 					'caption'  => '(de)activate mail accounts',
-					'children' => array (
-						'active' => array (
+					'children' => array(
+						'active' => array(
 							'caption'		  => 'activate',
 							'onExecute'	  	  => 'javaScript:app.admin.emailadminActiveAccounts',
 							'icon'			  => 'emailadmin/navbar',
 							'allowOnMultiple' => true
 						),
-						'inactive' => array (
+						'inactive' => array(
 							'caption'		  => 'deactivate',
 							'onExecute'		  => 'javaScript:app.admin.emailadminActiveAccounts',
 							'icon'			  => 'emailadmin/navbar',
@@ -127,9 +127,9 @@ 
 	 */
 	protected static function run_plugin_hooks($method, array $data)
 	{
-		foreach(emailadmin_account::search((int)$data['account_id'], 'params') as $params)
+		foreach (emailadmin_account::search((int)$data['account_id'], 'params') as $params)
 		{
-			if (!emailadmin_account::is_multiple($params)) continue;	// no need to waste time on personal accounts
+			if (!emailadmin_account::is_multiple($params)) continue; // no need to waste time on personal accounts
 
 			try {
 				$account = new emailadmin_account($params);
@@ -145,7 +145,7 @@ 
 					$imap->$method($data);
 				}
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				_egw_log_exception($e);
 				// ignore exception, without stalling other hooks
 			}
@@ -164,7 +164,7 @@ 
 		$extended = is_array($data) ? $data['extended'] : false;
 
 		$types = array();
-		foreach(scandir($dir=EGW_INCLUDE_ROOT.'/emailadmin/inc') as $file)
+		foreach (scandir($dir = EGW_INCLUDE_ROOT.'/emailadmin/inc') as $file)
 		{
 			$matches = null;
 			if (!preg_match('/^class\.([^.]*(smtp|imap|postfix|dovecot|dbmail)[^.*]*)\.inc\.php$/', $file, $matches)) continue;
@@ -178,11 +178,11 @@ 
 			if ($is_smtp && $location == 'smtp_server_types' || $is_imap && $location == 'imap_server_types')
 			{
 				// only register new imap-class-names
-				if ($is_imap && $class_name == emailadmin_account::getIcClass ($class_name, true)) continue;
+				if ($is_imap && $class_name == emailadmin_account::getIcClass($class_name, true)) continue;
 
 				$type = array(
 					'classname' => $class_name,
-					'description' => is_callable($function=$class_name.'::description') ? call_user_func($function) : $class_name,
+					'description' => is_callable($function = $class_name.'::description') ? call_user_func($function) : $class_name,
 				);
 
 				if ($is_imap) $type['protocol'] = 'imap';
@@ -192,7 +192,7 @@ 
 		}
 		if (!$extended)
 		{
-			foreach($types as $class_name => &$type)
+			foreach ($types as $class_name => &$type)
 			{
 				$type = $type['description'];
 			}

Braces +21 added lines, -5 removed lines

@@ -129,7 +129,11 @@ 
 	{
 		foreach(emailadmin_account::search((int)$data['account_id'], 'params') as $params)
 		{
-			if (!emailadmin_account::is_multiple($params)) continue;	// no need to waste time on personal accounts
+			if (!emailadmin_account::is_multiple($params))
+			{
+				continue;
+			}
+			// no need to waste time on personal accounts
 
 			try {
 				$account = new emailadmin_account($params);
@@ -167,10 +171,16 @@ 
 		foreach(scandir($dir=EGW_INCLUDE_ROOT.'/emailadmin/inc') as $file)
 		{
 			$matches = null;
-			if (!preg_match('/^class\.([^.]*(smtp|imap|postfix|dovecot|dbmail)[^.*]*)\.inc\.php$/', $file, $matches)) continue;
+			if (!preg_match('/^class\.([^.]*(smtp|imap|postfix|dovecot|dbmail)[^.*]*)\.inc\.php$/', $file, $matches))
+			{
+				continue;
+			}
 			$class_name = $matches[1];
 			include_once($dir.'/'.$file);
-			if (!class_exists($class_name)) continue;
+			if (!class_exists($class_name))
+			{
+				continue;
+			}
 
 			$is_imap = $class_name == 'emailadmin_imap' || is_subclass_of($class_name, 'emailadmin_imap');
 			$is_smtp = $class_name == 'emailadmin_smtp' || is_subclass_of($class_name, 'emailadmin_smtp') && $class_name != 'defaultsmtp';
@@ -178,14 +188,20 @@ 
 			if ($is_smtp && $location == 'smtp_server_types' || $is_imap && $location == 'imap_server_types')
 			{
 				// only register new imap-class-names
-				if ($is_imap && $class_name == emailadmin_account::getIcClass ($class_name, true)) continue;
+				if ($is_imap && $class_name == emailadmin_account::getIcClass ($class_name, true))
+				{
+					continue;
+				}
 
 				$type = array(
 					'classname' => $class_name,
 					'description' => is_callable($function=$class_name.'::description') ? call_user_func($function) : $class_name,
 				);
 
-				if ($is_imap) $type['protocol'] = 'imap';
+				if ($is_imap)
+				{
+					$type['protocol'] = 'imap';
+				}
 
 				$types[$class_name] = $type;
 			}