EGroupware / egroupware

calendar/inc/class.calendar_rrule.inc.php

Spacing +90 added lines, -90 removed lines

@@ -74,8 +74,8 @@ 
 	static private $recur_egw2ical_2_0 = array(
 		self::DAILY        => 'DAILY',
 		self::WEEKLY       => 'WEEKLY',
-		self::MONTHLY_WDAY => 'MONTHLY',	// BYDAY={1..7, -1}{MO..SO, last workday}
-		self::MONTHLY_MDAY => 'MONTHLY',	// BYMONHTDAY={1..31, -1 for last day of month}
+		self::MONTHLY_WDAY => 'MONTHLY', // BYDAY={1..7, -1}{MO..SO, last workday}
+		self::MONTHLY_MDAY => 'MONTHLY', // BYMONHTDAY={1..31, -1 for last day of month}
 		self::YEARLY       => 'YEARLY',
 	);
 
@@ -85,8 +85,8 @@ 
 	static private $recur_egw2ical_1_0 = array(
 		self::DAILY        => 'D',
 		self::WEEKLY       => 'W',
-		self::MONTHLY_WDAY => 'MP',	// BYDAY={1..7,-1}{MO..SO, last workday}
-		self::MONTHLY_MDAY => 'MD',	// BYMONHTDAY={1..31,-1}
+		self::MONTHLY_WDAY => 'MP', // BYDAY={1..7,-1}{MO..SO, last workday}
+		self::MONTHLY_MDAY => 'MD', // BYMONHTDAY={1..31,-1}
 		self::YEARLY       => 'YM',
 	);
 
@@ -142,7 +142,7 @@ 
 	const THURSDAY  = 16;
 	const FRIDAY    = 32;
 	const SATURDAY  = 64;
-	const WORKDAYS  = 62;	// Mo, ..., Fr
+	const WORKDAYS  = 62; // Mo, ..., Fr
 	const ALLDAYS   = 127;
 	/**
 	 * Translate weekday bitmasks to labels
@@ -170,14 +170,14 @@ 
 	 *
 	 * @var array
 	 */
-	public $exceptions=array();
+	public $exceptions = array();
 
 	/**
 	 * Array of exceptions as DateTime/egw_time objects
 	 *
 	 * @var array
 	 */
-	public $exceptions_objs=array();
+	public $exceptions_objs = array();
 
 	/**
 	 * Starttime of series
@@ -220,9 +220,9 @@ 
 	 * @param int $weekdays =0 self::SUNDAY=1|self::MONDAY=2|...|self::SATURDAY=64
 	 * @param array $exceptions =null DateTime objects with exceptions
 	 */
-	public function __construct(DateTime $time,$type,$interval=1,DateTime $enddate=null,$weekdays=0,array $exceptions=null)
+	public function __construct(DateTime $time, $type, $interval = 1, DateTime $enddate = null, $weekdays = 0, array $exceptions = null)
 	{
-		switch($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
+		switch ($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
 		{
 			case 'Sunday':
 				$this->lastdayofweek = self::SATURDAY;
@@ -236,7 +236,7 @@ 
 
 		$this->time = $time instanceof egw_time ? $time : new egw_time($time);
 
-		if (!in_array($type,array(self::NONE, self::DAILY, self::WEEKLY, self::MONTHLY_MDAY, self::MONTHLY_WDAY, self::YEARLY)))
+		if (!in_array($type, array(self::NONE, self::DAILY, self::WEEKLY, self::MONTHLY_MDAY, self::MONTHLY_WDAY, self::YEARLY)))
 		{
 			throw new egw_exception_wrong_parameter(__METHOD__."($time,$type,$interval,$enddate,$weekdays,...) type $type is NOT valid!");
 		}
@@ -246,16 +246,16 @@ 
 		if ($type == self::MONTHLY_WDAY)
 		{
 			// check for last week of month
-			if (($day = $this->time->format('d')) >= 21 && $day > self::daysInMonth($this->time)-7)
+			if (($day = $this->time->format('d')) >= 21 && $day > self::daysInMonth($this->time) - 7)
 			{
 				$this->monthly_byday_num = -1;
 			}
 			else
 			{
-				$this->monthly_byday_num = 1 + floor(($this->time->format('d')-1) / 7);
+				$this->monthly_byday_num = 1 + floor(($this->time->format('d') - 1) / 7);
 			}
 		}
-		elseif($type == self::MONTHLY_MDAY)
+		elseif ($type == self::MONTHLY_MDAY)
 		{
 			$this->monthly_bymonthday = (int)$this->time->format('d');
 			// check for last day of month
@@ -272,7 +272,7 @@ 
 
 		if ((int)$interval < 1)
 		{
-			$interval = 1;	// calendar stores no (extra) interval as null, so using default 1 here
+			$interval = 1; // calendar stores no (extra) interval as null, so using default 1 here
 		}
 		$this->interval = (int)$interval;
 
@@ -302,7 +302,7 @@ 
 		}
 		if ($exceptions)
 		{
-			foreach($exceptions as $exception)
+			foreach ($exceptions as $exception)
 			{
 				$exception->setTimezone($this->time->getTimezone());
 				$this->exceptions[] = $exception->format('Ymd');
@@ -318,22 +318,22 @@ 
 	 * @param int $interval =1
 	 * @return int
 	 */
-	public static function recurrence_interval($type, $interval=1)
+	public static function recurrence_interval($type, $interval = 1)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case self::DAILY:
-				$duration = 24*3600;
+				$duration = 24 * 3600;
 				break;
 			case self::WEEKLY:
-				$duration = 7*24*3600;
+				$duration = 7 * 24 * 3600;
 				break;
 			case self::MONTHLY_MDAY:
 			case self::MONTHLY_WDAY:
-				$duration = 31*24*3600;
+				$duration = 31 * 24 * 3600;
 				break;
 			case self::YEARLY:
-				$duration = 366*24*3600;
+				$duration = 366 * 24 * 3600;
 				break;
 		}
 		if ($interval > 1) $duration *= $interval;
@@ -349,9 +349,9 @@ 
 	 */
 	private static function daysInMonth(DateTime $time)
 	{
-		list($year,$month) = explode('-',$time->format('Y-m'));
+		list($year, $month) = explode('-', $time->format('Y-m'));
 		$last_day = new egw_time();
-		$last_day->setDate($year,$month+1,0);
+		$last_day->setDate($year, $month + 1, 0);
 
 		return (int)$last_day->format('d');
 	}
@@ -381,7 +381,7 @@ 
 	 */
 	public function next_no_exception()
 	{
-		switch($this->type)
+		switch ($this->type)
 		{
 			case self::NONE:	// need to add at least one day, to end "series", as enddate == current date
 			case self::DAILY:
@@ -396,28 +396,28 @@ 
 					// --> on the last day of the week we have to additionally advance interval-1 weeks
 					if ($this->interval > 1 && self::getWeekday($this->current) == $this->lastdayofweek)
 					{
-						$this->current->modify(($this->interval-1).' week');
+						$this->current->modify(($this->interval - 1).' week');
 					}
 					$this->current->modify('1 day');
 					//echo __METHOD__.'() '.$this->current->format('l').', '.$this->current.": $this->weekdays & ".self::getWeekday($this->current)."<br />\n";
 				}
-				while(!($this->weekdays & self::getWeekday($this->current)));
+				while (!($this->weekdays&self::getWeekday($this->current)));
 				break;
 
 			case self::MONTHLY_WDAY:	// iCal: BYDAY={1, ..., 5, -1}{MO..SO}
 				// advance to start of next month
-				list($year,$month) = explode('-',$this->current->format('Y-m'));
-				$month += $this->interval+($this->monthly_byday_num < 0 ? 1 : 0);
-				$this->current->setDate($year,$month,$this->monthly_byday_num < 0 ? 0 : 1);
+				list($year, $month) = explode('-', $this->current->format('Y-m'));
+				$month += $this->interval + ($this->monthly_byday_num < 0 ? 1 : 0);
+				$this->current->setDate($year, $month, $this->monthly_byday_num < 0 ? 0 : 1);
 				//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).": setDate($year,$month,1): ".$this->current->format('l').', '.$this->current."<br />\n";
 				// now advance to n-th week
 				if ($this->monthly_byday_num > 1)
 				{
-					$this->current->modify(($this->monthly_byday_num-1).' week');
+					$this->current->modify(($this->monthly_byday_num - 1).' week');
 					//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).': modify('.($this->monthly_byday_num-1).' week): '.$this->current->format('l').', '.$this->current."<br />\n";
 				}
 				// advance to given weekday
-				while(!($this->weekdays & self::getWeekday($this->current)))
+				while (!($this->weekdays&self::getWeekday($this->current)))
 				{
 					$this->current->modify(($this->monthly_byday_num < 0 ? -1 : 1).' day');
 					//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).': modify(1 day): '.$this->current->format('l').', '.$this->current."<br />\n";
@@ -425,10 +425,10 @@ 
 				break;
 
 			case self::MONTHLY_MDAY:	// iCal: monthly_bymonthday={1, ..., 31, -1}
-				list($year,$month) = explode('-',$this->current->format('Y-m'));
-				$day = $this->monthly_bymonthday+($this->monthly_bymonthday < 0 ? 1 : 0);
-				$month += $this->interval+($this->monthly_bymonthday < 0 ? 1 : 0);
-				$this->current->setDate($year,$month,$day);
+				list($year, $month) = explode('-', $this->current->format('Y-m'));
+				$day = $this->monthly_bymonthday + ($this->monthly_bymonthday < 0 ? 1 : 0);
+				$month += $this->interval + ($this->monthly_bymonthday < 0 ? 1 : 0);
+				$this->current->setDate($year, $month, $day);
 				//echo __METHOD__."() setDate($year,$month,$day): ".$this->current->format('l').', '.$this->current."<br />\n";
 				break;
 
@@ -450,7 +450,7 @@ 
 		{
 			$this->next_no_exception();
 		}
-		while($this->exceptions && in_array($this->current->format('Ymd'),$this->exceptions));
+		while ($this->exceptions && in_array($this->current->format('Ymd'), $this->exceptions));
 	}
 
 	/**
@@ -482,7 +482,7 @@ 
 		if (isset($this->current)) $backup = $this->current;
 		$this->rewind();
 
-		while(--$count > 0)
+		while (--$count > 0)
 		{
 			$this->next_no_exception();
 		}
@@ -507,7 +507,7 @@ 
 		// if enddate is now before next acurrence, but not on same day, we use previous recurrence
 		// this can happen if client gives an enddate which is NOT a recurrence date
 		// eg. for a on Monday recurring weekly event a Tuesday as enddate
-		if ($this->enddate < $this->current  && $this->current->format('Ymd') != $this->enddate->format('Ymd'))
+		if ($this->enddate < $this->current && $this->current->format('Ymd') != $this->enddate->format('Ymd'))
 		{
 			$last = $previous;
 		}
@@ -526,7 +526,7 @@ 
 		$this->current = clone $this->time;
 		while ($this->valid() &&
 			$this->exceptions &&
-			in_array($this->current->format('Ymd'),$this->exceptions))
+			in_array($this->current->format('Ymd'), $this->exceptions))
 		{
 			$this->next_no_exception();
 		}
@@ -537,7 +537,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		return $this->current->format('Ymd') <= $this->enddate_ymd;
 	}
@@ -551,9 +551,9 @@ 
 	{
 		$str = '';
 		// Repeated Events
-		if($this->type != self::NONE)
+		if ($this->type != self::NONE)
 		{
-			list($str) = explode(' (',lang(self::$types[$this->type]));	// remove (by day/date) from Monthly
+			list($str) = explode(' (', lang(self::$types[$this->type])); // remove (by day/date) from Monthly
 
 			$str_extra = array();
 			switch ($this->type)
@@ -569,7 +569,7 @@ 
 					{
 						$repeat_days[] = $this->type == self::WEEKLY ? lang('all') : lang('day');
 					}
-					elseif($this->weekdays == self::WORKDAYS)
+					elseif ($this->weekdays == self::WORKDAYS)
 					{
 						$repeat_days[] = $this->type == self::WEEKLY ? lang('workdays') : lang('workday');
 					}
@@ -577,24 +577,24 @@ 
 					{
 						foreach (self::$days as $mask => $label)
 						{
-							if ($this->weekdays & $mask)
+							if ($this->weekdays&$mask)
 							{
 								$repeat_days[] = lang($label);
 							}
 						}
 					}
-					if($this->type == self::WEEKLY && count($repeat_days))
+					if ($this->type == self::WEEKLY && count($repeat_days))
 					{
-						$str_extra[] = lang('days repeated').': '.implode(', ',$repeat_days);
+						$str_extra[] = lang('days repeated').': '.implode(', ', $repeat_days);
 					}
-					elseif($this->type == self::MONTHLY_WDAY)
+					elseif ($this->type == self::MONTHLY_WDAY)
 					{
-						$str_extra[] = ($this->monthly_byday_num == -1 ? lang('last') : $this->monthly_byday_num.'.').' '.implode(', ',$repeat_days);
+						$str_extra[] = ($this->monthly_byday_num == -1 ? lang('last') : $this->monthly_byday_num.'.').' '.implode(', ', $repeat_days);
 					}
 					break;
 
 			}
-			if($this->interval > 1)
+			if ($this->interval > 1)
 			{
 				$str_extra[] = lang('Interval').': '.$this->interval;
 			}
@@ -610,9 +610,9 @@ 
 			{
 				$str_extra[] = $this->time->getTimezone()->getName();
 			}
-			if(count($str_extra))
+			if (count($str_extra))
 			{
-				$str .= ' ('.implode(', ',$str_extra).')';
+				$str .= ' ('.implode(', ', $str_extra).')';
 			}
 		}
 		return $str;
@@ -624,24 +624,24 @@ 
 	 *
 	 * $return array	vCalendar RRULE
 	 */
-	public function generate_rrule($version='2.0')
+	public function generate_rrule($version = '2.0')
 	{
 		$repeat_days = array();
 		$rrule = array();
 
-		if ($this->type == self::NONE) return false;	// no recuring event
+		if ($this->type == self::NONE) return false; // no recuring event
 
 		if ($version == '1.0')
 		{
-			$rrule['FREQ'] = self::$recur_egw2ical_1_0[$this->type] . $this->interval;
+			$rrule['FREQ'] = self::$recur_egw2ical_1_0[$this->type].$this->interval;
 			switch ($this->type)
 			{
 				case self::WEEKLY:
 					foreach (self::$days as $mask => $label)
 					{
-						if ($this->weekdays & $mask)
+						if ($this->weekdays&$mask)
 						{
-							$repeat_days[] = strtoupper(substr($label,0,2));
+							$repeat_days[] = strtoupper(substr($label, 0, 2));
 						}
 					}
 					$rrule['BYDAY'] = implode(' ', $repeat_days);
@@ -654,7 +654,7 @@ 
 				case self::MONTHLY_WDAY:	// weekday of the month: BDAY={1..5}+ {MO..SO}
 					$rrule['BYDAY'] = abs($this->monthly_byday_num);
 					$rrule['BYDAY'] .= ($this->monthly_byday_num < 0) ? '- ' : '+ ';
-					$rrule['BYDAY'] .= strtoupper(substr($this->time->format('l'),0,2));
+					$rrule['BYDAY'] .= strtoupper(substr($this->time->format('l'), 0, 2));
 					$rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY'];
 					break;
 			}
@@ -672,9 +672,9 @@ 
 				case self::WEEKLY:
 					foreach (self::$days as $mask => $label)
 					{
-						if ($this->weekdays & $mask)
+						if ($this->weekdays&$mask)
 						{
-							$repeat_days[] = strtoupper(substr($label,0,2));
+							$repeat_days[] = strtoupper(substr($label, 0, 2));
 						}
 					}
 					$rrule['BYDAY'] = implode(',', $repeat_days);
@@ -685,8 +685,8 @@ 
 					break;
 
 				case self::MONTHLY_WDAY:	// weekday of the month: BDAY={1..5}{MO..SO}
-					$rrule['BYDAY'] = $this->monthly_byday_num .
-						strtoupper(substr($this->time->format('l'),0,2));
+					$rrule['BYDAY'] = $this->monthly_byday_num.
+						strtoupper(substr($this->time->format('l'), 0, 2));
 					break;
 			}
 			if ($this->interval > 1)
@@ -721,12 +721,12 @@ 
 	 *
 	 * @return calendar_rrule		false on error
 	 */
-	public static function event2rrule(array $event,$usertime=true,$to_tz=null)
+	public static function event2rrule(array $event, $usertime = true, $to_tz = null)
 	{
-		if (!is_array($event)  || !isset($event['tzid'])) return false;
+		if (!is_array($event) || !isset($event['tzid'])) return false;
 		if (!$to_tz) $to_tz = $event['tzid'];
 		$timestamp_tz = $usertime ? egw_time::$user_timezone : egw_time::$server_timezone;
-		$time = is_a($event['start'],'DateTime') ? $event['start'] : new egw_time($event['start'],$timestamp_tz);
+		$time = is_a($event['start'], 'DateTime') ? $event['start'] : new egw_time($event['start'], $timestamp_tz);
 
 		if (!isset(self::$tz_cache[$to_tz]))
 		{
@@ -739,16 +739,16 @@ 
 
 		if ($event['recur_enddate'])
 		{
-			$enddate = is_a($event['recur_enddate'],'DateTime') ? $event['recur_enddate'] : new egw_time($event['recur_enddate'],$timestamp_tz);
+			$enddate = is_a($event['recur_enddate'], 'DateTime') ? $event['recur_enddate'] : new egw_time($event['recur_enddate'], $timestamp_tz);
 		}
 		if (is_array($event['recur_exception']))
 		{
-			foreach($event['recur_exception'] as $exception)
+			foreach ($event['recur_exception'] as $exception)
 			{
-				$exceptions[] = is_a($exception,'DateTime') ? $exception : new egw_time($exception,$timestamp_tz);
+				$exceptions[] = is_a($exception, 'DateTime') ? $exception : new egw_time($exception, $timestamp_tz);
 			}
 		}
-		return new calendar_rrule($time,$event['recur_type'],$event['recur_interval'],$enddate,$event['recur_data'],$exceptions);
+		return new calendar_rrule($time, $event['recur_type'], $event['recur_interval'], $enddate, $event['recur_data'], $exceptions);
 	}
 
 	/**
@@ -774,7 +774,7 @@ 
 	 * @param DateTime/string		starttime of the event (in servertime)
 	 * @param string $to_tz			new timezone
 	 */
-	public static function rrule2tz(array &$event,$starttime,$to_tz)
+	public static function rrule2tz(array &$event, $starttime, $to_tz)
 	{
 		// We assume that the difference between timezones can result
 		// in a maximum of one day
@@ -795,7 +795,7 @@ 
 			self::$tz_cache[$to_tz] = calendar_timezones::DateTimeZone($to_tz);
 		}
 
-		$time = is_a($starttime,'DateTime') ?
+		$time = is_a($starttime, 'DateTime') ?
 			$starttime : new egw_time($starttime, egw_time::$server_timezone);
 		$time->setTimezone(self::$tz_cache[$event['tzid']]);
 		$remote = clone $time;
@@ -813,11 +813,11 @@ 
 					if ($delta == 1 || $delta == -6)
 					{
 						$mask = $mask << 1;
-						if ($mask & 128) $mask = $mask - 127; // overflow
+						if ($mask&128) $mask = $mask - 127; // overflow
 					}
 					else
 					{
-						if ($mask & 1) $mask = $mask + 128; // underflow
+						if ($mask&1) $mask = $mask + 128; // underflow
 						$mask = $mask >> 1;
 					}
 					$event['recur_data'] = $mask;
@@ -828,8 +828,8 @@ 
 
 if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
 {
-	ini_set('display_errors',1);
-	error_reporting(E_ALL & ~E_NOTICE);
+	ini_set('display_errors', 1);
+	error_reporting(E_ALL&~E_NOTICE);
 	function lang($str) { return $str; }
 	$GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $_REQUEST['user-tz'] ? $_REQUEST['user-tz'] : 'Europe/Berlin';
 	require_once('../../phpgwapi/inc/class.egw_time.inc.php');
@@ -838,7 +838,7 @@ 
 
 	if (!isset($_REQUEST['time']))
 	{
-		$now = new egw_time('now',new DateTimeZone($_REQUEST['tz'] = 'UTC'));
+		$now = new egw_time('now', new DateTimeZone($_REQUEST['tz'] = 'UTC'));
 		$_REQUEST['time'] = $now->format();
 		$_REQUEST['type'] = calendar_rrule::WEEKLY;
 		$_REQUEST['interval'] = 2;
@@ -847,29 +847,29 @@ 
 		$_REQUEST['user-tz'] = 'Europe/Berlin';
 	}
 	echo "<html>\n<head>\n\t<title>Test calendar_rrule class</title>\n</head>\n<body>\n<form method='GET'>\n";
-	echo "<p>Date+Time: ".html::input('time',$_REQUEST['time']).
-		html::select('tz',$_REQUEST['tz'],egw_time::getTimezones())."</p>\n";
-	echo "<p>Type: ".html::select('type',$_REQUEST['type'],calendar_rrule::$types)."\n".
-		"Interval: ".html::input('interval',$_REQUEST['interval'])."</p>\n";
+	echo "<p>Date+Time: ".html::input('time', $_REQUEST['time']).
+		html::select('tz', $_REQUEST['tz'], egw_time::getTimezones())."</p>\n";
+	echo "<p>Type: ".html::select('type', $_REQUEST['type'], calendar_rrule::$types)."\n".
+		"Interval: ".html::input('interval', $_REQUEST['interval'])."</p>\n";
 	echo "<table><tr><td>\n";
-	echo "Weekdays:<br />".html::checkbox_multiselect('weekdays',$_REQUEST['weekdays'],calendar_rrule::$days,false,'','7',false,'height: 150px;')."\n";
+	echo "Weekdays:<br />".html::checkbox_multiselect('weekdays', $_REQUEST['weekdays'], calendar_rrule::$days, false, '', '7', false, 'height: 150px;')."\n";
 	echo "</td><td>\n";
-	echo "<p>Exceptions:<br />".html::textarea('exceptions',$_REQUEST['exceptions'],'style="height: 150px;"')."\n";
+	echo "<p>Exceptions:<br />".html::textarea('exceptions', $_REQUEST['exceptions'], 'style="height: 150px;"')."\n";
 	echo "</td></tr></table>\n";
-	echo "<p>Enddate: ".html::input('enddate',$_REQUEST['enddate'])."</p>\n";
-	echo "<p>Display recurances in ".html::select('user-tz',$_REQUEST['user-tz'],egw_time::getTimezones())."</p>\n";
-	echo "<p>".html::submit_button('calc','Calculate')."</p>\n";
+	echo "<p>Enddate: ".html::input('enddate', $_REQUEST['enddate'])."</p>\n";
+	echo "<p>Display recurances in ".html::select('user-tz', $_REQUEST['user-tz'], egw_time::getTimezones())."</p>\n";
+	echo "<p>".html::submit_button('calc', 'Calculate')."</p>\n";
 	echo "</form>\n";
 
 	$tz = new DateTimeZone($_REQUEST['tz']);
-	$time = new egw_time($_REQUEST['time'],$tz);
-	if ($_REQUEST['enddate']) $enddate = new egw_time($_REQUEST['enddate'],$tz);
-	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
-	if ($_REQUEST['exceptions']) foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) { $exceptions[] = new egw_time($exception); }
+	$time = new egw_time($_REQUEST['time'], $tz);
+	if ($_REQUEST['enddate']) $enddate = new egw_time($_REQUEST['enddate'], $tz);
+	$weekdays = 0; foreach ((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
+	if ($_REQUEST['exceptions']) foreach (preg_split("/[,\r\n]+ ?/", $_REQUEST['exceptions']) as $exception) { $exceptions[] = new egw_time($exception); }
 
-	$rrule = new calendar_rrule($time,$_REQUEST['type'],$_REQUEST['interval'],$enddate,$weekdays,$exceptions);
+	$rrule = new calendar_rrule($time, $_REQUEST['type'], $_REQUEST['interval'], $enddate, $weekdays, $exceptions);
 	echo "<h3>".$time->format('l').', '.$time.' ('.$tz->getName().') '.$rrule."</h3>\n";
-	foreach($rrule as $rtime)
+	foreach ($rrule as $rtime)
 	{
 		$rtime->setTimezone(egw_time::$user_timezone);
 		echo ++$n.': '.$rtime->format('l').', '.$rtime."<br />\n";

calendar/inc/class.calendar_uiviews.inc.php

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']))
 				{

calendar/inc/class.calendar_datasource.inc.php

Spacing +8 added lines, -8 removed lines

@@ -44,14 +44,14 @@ 
 
 		if (!is_array($data_id))
 		{
-			if (!(int) $data_id || !($data = $cal->read((int) $data_id)))
+			if (!(int)$data_id || !($data = $cal->read((int)$data_id)))
 			{
 				return false;
 			}
 		}
 		else
 		{
-			$data =& $data_id;
+			$data = & $data_id;
 		}
 		$ds = array(
 			'pe_title' => $cal->link_title($data),
@@ -61,7 +61,7 @@ 
 			'pe_details'       => $data['description'] ? nl2br($data['description']) : '',
 		);
 		// return first global category, as PM only supports one
-		foreach($data['category'] ? explode(',', $data['category']) : array() as $cat_id)
+		foreach ($data['category'] ? explode(',', $data['category']) : array() as $cat_id)
 		{
 			if (categories::is_global($cat_id))
 			{
@@ -70,12 +70,12 @@ 
 			}
 		}
 		// calculation of the time
-		$ds['pe_planned_time'] = (int) (($ds['pe_planned_end'] - $ds['pe_planned_start'])/60);	// time is in minutes
+		$ds['pe_planned_time'] = (int)(($ds['pe_planned_end'] - $ds['pe_planned_start']) / 60); // time is in minutes
 
 		// if the event spans multiple days, we have to substract the nights (24h - daily working time specified in PM)
-		if (($ds['pe_planned_time']/ 60 > 24) && date('Y-m-d',$ds['pe_planned_end']) != date('Y-m-d',$ds['pe_planned_start']))
+		if (($ds['pe_planned_time'] / 60 > 24) && date('Y-m-d', $ds['pe_planned_end']) != date('Y-m-d', $ds['pe_planned_start']))
 		{
-			foreach(array('start','end') as $name)
+			foreach (array('start', 'end') as $name)
 			{
 				$$name = $cal->date2array($ds['pe_planned_'.$name]);
 				${$name}['hour'] = 12;
@@ -87,7 +87,7 @@ 
 
 			if (!is_array($this->pm_config))
 			{
-				$c =& CreateObject('phpgwapi.config','projectmanager');
+				$c = & CreateObject('phpgwapi.config', 'projectmanager');
 				$c->read_repository();
 				$this->pm_config = $c->config_data;
 				unset($c);
@@ -95,7 +95,7 @@ 
 			}
 			$ds['pe_planned_time'] -= $nights * 60 * (24 - $this->pm_config['hours_per_workday']);
 		}
-		foreach($data['participants'] as $uid => $status)
+		foreach ($data['participants'] as $uid => $status)
 		{
 			if ($status != 'R' && is_numeric($uid))	// only users for now
 			{

calendar/inc/class.calendar_boupdate.inc.php

Spacing +300 added lines, -302 removed lines

@@ -12,15 +12,15 @@ 
  */
 
 // types of messsages send by calendar_boupdate::send_update
-define('MSG_DELETED',0);
-define('MSG_MODIFIED',1);
-define('MSG_ADDED',2);
-define('MSG_REJECTED',3);
-define('MSG_TENTATIVE',4);
-define('MSG_ACCEPTED',5);
-define('MSG_ALARM',6);
-define('MSG_DISINVITE',7);
-define('MSG_DELEGATED',8);
+define('MSG_DELETED', 0);
+define('MSG_MODIFIED', 1);
+define('MSG_ADDED', 2);
+define('MSG_REJECTED', 3);
+define('MSG_TENTATIVE', 4);
+define('MSG_ACCEPTED', 5);
+define('MSG_ALARM', 6);
+define('MSG_DISINVITE', 7);
+define('MSG_DELEGATED', 8);
 
 /**
  * Class to access AND manipulate all calendar data (business object)
@@ -81,11 +81,11 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started',True);
+		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started', True);
 
-		parent::__construct();	// calling the parent constructor
+		parent::__construct(); // calling the parent constructor
 
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished',True);
+		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished', True);
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 * +      + +  C   +	which is clearly wrong for everything with a maximum quantity > 1
 	 * ++++++++ ++++++++
 	 */
-	function update(&$event,$ignore_conflicts=false,$touch_modified=true,$ignore_acl=false,$updateTS=true,&$messages=null, $skip_notification=false)
+	function update(&$event, $ignore_conflicts = false, $touch_modified = true, $ignore_acl = false, $updateTS = true, &$messages = null, $skip_notification = false)
 	{
 		//error_log(__METHOD__."(".array2string($event).",$ignore_conflicts,$touch_modified,$ignore_acl)");
 		if (!is_array($messages)) $messages = $messages ? (array)$messages : array();
@@ -120,7 +120,7 @@ 
 		if ($this->debug > 1 || $this->debug == 'update')
 		{
 			$this->debug_message('calendar_boupdate::update(%1,ignore_conflict=%2,touch_modified=%3,ignore_acl=%4)',
-				false,$event,$ignore_conflicts,$touch_modified,$ignore_acl);
+				false, $event, $ignore_conflicts, $touch_modified, $ignore_acl);
 		}
 		// check some minimum requirements:
 		// - new events need start, end and title
@@ -148,11 +148,11 @@ 
 		}
 
 		// check if user has the permission to update / create the event
-		if (!$ignore_acl && (!$new_event && !$this->check_perms(EGW_ACL_EDIT,$event['id']) ||
-			$new_event && !$this->check_perms(EGW_ACL_EDIT,0,$event['owner'])) &&
-			!$this->check_perms(EGW_ACL_ADD,0,$event['owner']))
+		if (!$ignore_acl && (!$new_event && !$this->check_perms(EGW_ACL_EDIT, $event['id']) ||
+			$new_event && !$this->check_perms(EGW_ACL_EDIT, 0, $event['owner'])) &&
+			!$this->check_perms(EGW_ACL_ADD, 0, $event['owner']))
 		{
-			$messages[] = lang('Access to calendar of %1 denied!',common::grab_owner_name($event['owner']));
+			$messages[] = lang('Access to calendar of %1 denied!', common::grab_owner_name($event['owner']));
 			return false;
 		}
 		if ($new_event)
@@ -161,24 +161,24 @@ 
 		}
 		else
 		{
-			$old_event = $this->read((int)$event['id'],null,$ignore_acl);
+			$old_event = $this->read((int)$event['id'], null, $ignore_acl);
 		}
 
 		// do we need to check, if user is allowed to invite the invited participants
-		if ($this->require_acl_invite && ($removed = $this->remove_no_acl_invite($event,$old_event)))
+		if ($this->require_acl_invite && ($removed = $this->remove_no_acl_invite($event, $old_event)))
 		{
 			// report removed participants back to user
-			foreach($removed as $key => $account_id)
+			foreach ($removed as $key => $account_id)
 			{
 				$removed[$key] = $this->participant_name($account_id);
 			}
-			$messages[] = lang('%1 participants removed because of missing invite grants',count($removed)).
-				': '.implode(', ',$removed);
+			$messages[] = lang('%1 participants removed because of missing invite grants', count($removed)).
+				': '.implode(', ', $removed);
 		}
 		// check category based ACL
 		if ($event['category'])
 		{
-			if (!is_array($event['category'])) $event['category'] = explode(',',$event['category']);
+			if (!is_array($event['category'])) $event['category'] = explode(',', $event['category']);
 			if (!$old_event || !isset($old_event['category']))
 			{
 				$old_event['category'] = array();
@@ -187,38 +187,38 @@ 
 			{
 				$old_event['category'] = explode(',', $old_event['category']);
 			}
-			foreach($event['category'] as $key => $cat_id)
+			foreach ($event['category'] as $key => $cat_id)
 			{
 				// check if user is allowed to update event categories
-				if ((!$old_event || !in_array($cat_id,$old_event['category'])) &&
-					self::has_cat_right(self::CAT_ACL_ADD,$cat_id,$this->user) === false)
+				if ((!$old_event || !in_array($cat_id, $old_event['category'])) &&
+					self::has_cat_right(self::CAT_ACL_ADD, $cat_id, $this->user) === false)
 				{
 					unset($event['category'][$key]);
 					// report removed category to user
 					$removed_cats[$cat_id] = $this->categories->id2name($cat_id);
-					continue;	// no further check, as cat was removed
+					continue; // no further check, as cat was removed
 				}
 				// for new or moved events check status of participants, if no category status right --> set all status to 'U' = unknown
 				if (!$status_reset_to_unknown &&
-					self::has_cat_right(self::CAT_ACL_STATUS,$cat_id,$this->user) === false &&
+					self::has_cat_right(self::CAT_ACL_STATUS, $cat_id, $this->user) === false &&
 					(!$old_event || $old_event['start'] != $event['start'] || $old_event['end'] != $event['end']))
 				{
-					foreach((array)$event['participants'] as $uid => $status)
+					foreach ((array)$event['participants'] as $uid => $status)
 					{
 						$q = $r = null;
-						calendar_so::split_status($status,$q,$r);
+						calendar_so::split_status($status, $q, $r);
 						if ($status != 'U')
 						{
-							$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
+							$event['participants'][$uid] = calendar_so::combine_status('U', $q, $r);
 							// todo: report reset status to user
 						}
 					}
-					$status_reset_to_unknown = true;	// once is enough
+					$status_reset_to_unknown = true; // once is enough
 				}
 			}
 			if ($removed_cats)
 			{
-				$messages[] = lang('Category %1 removed because of missing rights',implode(', ',$removed_cats));
+				$messages[] = lang('Category %1 removed because of missing rights', implode(', ', $removed_cats));
 			}
 			if ($status_reset_to_unknown)
 			{
@@ -229,61 +229,61 @@ 
 		if (!$ignore_conflicts && !$event['non_blocking'] && isset($event['start']) && isset($event['end']))
 		{
 			$types_with_quantity = array();
-			foreach($this->resources as $type => $data)
+			foreach ($this->resources as $type => $data)
 			{
 				if ($data['max_quantity']) $types_with_quantity[] = $type;
 			}
 			// get all NOT rejected participants and evtl. their quantity
 			$quantity = $users = array();
-			foreach($event['participants'] as $uid => $status)
+			foreach ($event['participants'] as $uid => $status)
 			{
-				calendar_so::split_status($status,$q,$r);
-				if ($status[0] == 'R') continue;	// ignore rejected participants
+				calendar_so::split_status($status, $q, $r);
+				if ($status[0] == 'R') continue; // ignore rejected participants
 
 				if ($uid < 0)	// group, check it's members too
 				{
-					$users += (array)$GLOBALS['egw']->accounts->members($uid,true);
+					$users += (array)$GLOBALS['egw']->accounts->members($uid, true);
 					$users = array_unique($users);
 				}
 				$users[] = $uid;
-				if (in_array($uid[0],$types_with_quantity))
+				if (in_array($uid[0], $types_with_quantity))
 				{
 					$quantity[$uid] = $q;
 				}
 			}
 			//$start = microtime(true);
-			$overlapping_events =& $this->search(array(
+			$overlapping_events = & $this->search(array(
 				'start' => $event['start'],
 				'end'   => $event['end'],
 				'users' => $users,
-				'ignore_acl' => true,	// otherwise we get only events readable by the user
-				'enum_groups' => true,	// otherwise group-events would not block time
+				'ignore_acl' => true, // otherwise we get only events readable by the user
+				'enum_groups' => true, // otherwise group-events would not block time
 				'query' => array(
 					'cal_non_blocking' => 0,
 				),
-				'no_integration' => true,	// do NOT use integration of other apps
+				'no_integration' => true, // do NOT use integration of other apps
 			));
 			//error_log(__METHOD__."() conflict check took ".number_format(microtime(true)-$start, 3).'s');
 			if ($this->debug > 2 || $this->debug == 'update')
 			{
-				$this->debug_message('calendar_boupdate::update() checking for potential overlapping events for users %1 from %2 to %3',false,$users,$event['start'],$event['end']);
+				$this->debug_message('calendar_boupdate::update() checking for potential overlapping events for users %1 from %2 to %3', false, $users, $event['start'], $event['end']);
 			}
 			$max_quantity = $possible_quantity_conflicts = $conflicts = array();
-			foreach((array) $overlapping_events as $k => $overlap)
+			foreach ((array)$overlapping_events as $k => $overlap)
 			{
-				if ($overlap['id'] == $event['id'] ||	// that's the event itself
-					$overlap['id'] == $event['reference'] ||	// event is an exception of overlap
+				if ($overlap['id'] == $event['id'] || // that's the event itself
+					$overlap['id'] == $event['reference'] || // event is an exception of overlap
 					$overlap['non_blocking'])			// that's a non_blocking event
 				{
 					continue;
 				}
 				if ($this->debug > 3 || $this->debug == 'update')
 				{
-					$this->debug_message('calendar_boupdate::update() checking overlapping event %1',false,$overlap);
+					$this->debug_message('calendar_boupdate::update() checking overlapping event %1', false, $overlap);
 				}
 				// check if the overlap is with a rejected participant or within the allowed quantity
-				$common_parts = array_intersect($users,array_keys($overlap['participants']));
-				foreach($common_parts as $n => $uid)
+				$common_parts = array_intersect($users, array_keys($overlap['participants']));
+				foreach ($common_parts as $n => $uid)
 				{
 					$status = $overlap['participants'][$uid];
 					calendar_so::split_status($status, $q, $r);
@@ -292,9 +292,9 @@ 
 						unset($common_parts[$n]);
 						continue;
 					}
-					if (is_numeric($uid) || !in_array($uid[0],$types_with_quantity))
+					if (is_numeric($uid) || !in_array($uid[0], $types_with_quantity))
 					{
-						continue;	// no quantity check: quantity allways 1 ==> conflict
+						continue; // no quantity check: quantity allways 1 ==> conflict
 					}
 					if (!isset($max_quantity[$uid]))
 					{
@@ -304,7 +304,7 @@ 
 					$quantity[$uid] += $q;
 					if ($quantity[$uid] <= $max_quantity[$uid])
 					{
-						$possible_quantity_conflicts[$uid][] =& $overlapping_events[$k];	// an other event can give the conflict
+						$possible_quantity_conflicts[$uid][] = & $overlapping_events[$k]; // an other event can give the conflict
 						unset($common_parts[$n]);
 						continue;
 					}
@@ -314,20 +314,20 @@ 
 				{
 					if ($this->debug > 3 || $this->debug == 'update')
 					{
-						$this->debug_message('calendar_boupdate::update() conflicts with the following participants found %1',false,$common_parts);
+						$this->debug_message('calendar_boupdate::update() conflicts with the following participants found %1', false, $common_parts);
 					}
-					$conflicts[$overlap['id'].'-'.$this->date2ts($overlap['start'])] =& $overlapping_events[$k];
+					$conflicts[$overlap['id'].'-'.$this->date2ts($overlap['start'])] = & $overlapping_events[$k];
 				}
 			}
 			// check if we are withing the allowed quantity and if not add all events using that resource
 			// seems this function is doing very strange things, it gives empty conflicts
-			foreach($max_quantity as $uid => $max)
+			foreach ($max_quantity as $uid => $max)
 			{
 				if ($quantity[$uid] > $max)
 				{
-					foreach((array)$possible_quantity_conflicts[$uid] as $conflict)
+					foreach ((array)$possible_quantity_conflicts[$uid] as $conflict)
 					{
-						$conflicts[$conflict['id'].'-'.$this->date2ts($conflict['start'])] =& $possible_quantity_conflicts[$k];
+						$conflicts[$conflict['id'].'-'.$this->date2ts($conflict['start'])] = & $possible_quantity_conflicts[$k];
 					}
 				}
 			}
@@ -335,10 +335,10 @@ 
 
 			if (count($conflicts))
 			{
-				foreach($conflicts as $key => $conflict)
+				foreach ($conflicts as $key => $conflict)
 				{
-						$conflict['participants'] = array_intersect_key((array)$conflict['participants'],$event['participants']);
-					if (!$this->check_perms(EGW_ACL_READ,$conflict))
+						$conflict['participants'] = array_intersect_key((array)$conflict['participants'], $event['participants']);
+					if (!$this->check_perms(EGW_ACL_READ, $conflict))
 					{
 						$conflicts[$key] = array(
 							'id'    => $conflict['id'],
@@ -351,7 +351,7 @@ 
 				}
 				if ($this->debug > 2 || $this->debug == 'update')
 				{
-					$this->debug_message('calendar_boupdate::update() %1 conflicts found %2',false,count($conflicts),$conflicts);
+					$this->debug_message('calendar_boupdate::update() %1 conflicts found %2', false, count($conflicts), $conflicts);
 				}
 				return $conflicts;
 			}
@@ -365,33 +365,33 @@ 
 			return $cal_id;
 		}
 
-		$event = $this->read($cal_id);	// we re-read the event, in case only partial information was update and we need the full info for the notifies
+		$event = $this->read($cal_id); // we re-read the event, in case only partial information was update and we need the full info for the notifies
 		//echo "new $cal_id="; _debug_array($event);
 
-		if($old_event['deleted'] && $event['deleted'] == null)
+		if ($old_event['deleted'] && $event['deleted'] == null)
 		{
 			// Restored, bring back links
 			egw_link::restore('calendar', $cal_id);
 		}
 		if ($this->log_file)
 		{
-			$this->log2file($event2save,$event,$old_event);
+			$this->log2file($event2save, $event, $old_event);
 		}
 		// send notifications
-		if(!$skip_notification)
+		if (!$skip_notification)
 		{
 			if ($new_event)
 			{
-				$this->send_update(MSG_ADDED,$event['participants'],'',$event);
+				$this->send_update(MSG_ADDED, $event['participants'], '', $event);
 			}
 			else // update existing event
 			{
-				$this->check4update($event,$old_event);
+				$this->check4update($event, $old_event);
 			}
 		}
 
 		// notify the link-class about the update, as other apps may be subscribt to it
-		egw_link::notify_update('calendar',$cal_id,$event);
+		egw_link::notify_update('calendar', $cal_id, $event);
 
 		return $cal_id;
 	}
@@ -403,22 +403,22 @@ 
 	 * @param array $old_event =null old event with already invited participants
 	 * @return array removed participants because of missing invite grants
 	 */
-	public function remove_no_acl_invite(array &$event,array $old_event=null)
+	public function remove_no_acl_invite(array &$event, array $old_event = null)
 	{
 		if (!$this->require_acl_invite)
 		{
-			return array();	// nothing to check, everyone can invite everyone else
+			return array(); // nothing to check, everyone can invite everyone else
 		}
 		if ($event['id'] && is_null($old_event))
 		{
 			$old_event = $this->read($event['id']);
 		}
 		$removed = array();
-		foreach(array_keys((array)$event['participants']) as $uid)
+		foreach (array_keys((array)$event['participants']) as $uid)
 		{
 			if ((is_null($old_event) || !isset($old_event['participants'][$uid])) && !$this->check_acl_invite($uid))
 			{
-				unset($event['participants'][$uid]);	// remove participant
+				unset($event['participants'][$uid]); // remove participant
 				$removed[] = $uid;
 			}
 		}
@@ -434,19 +434,19 @@ 
 	 */
 	public function check_acl_invite($uid)
 	{
-		if (!is_numeric($uid)) return true;	// nothing implemented for resources so far
+		if (!is_numeric($uid)) return true; // nothing implemented for resources so far
 
 		if (!$this->require_acl_invite)
 		{
-			$ret = true;	// no grant required
+			$ret = true; // no grant required
 		}
 		elseif ($this->require_acl_invite == 'groups' && $GLOBALS['egw']->accounts->get_type($uid) != 'g')
 		{
-			$ret = true;	// grant only required for groups
+			$ret = true; // grant only required for groups
 		}
 		else
 		{
-			$ret = $this->check_perms(EGW_ACL_INVITE,0,$uid);
+			$ret = $this->check_perms(EGW_ACL_INVITE, 0, $uid);
 		}
 		//error_log(__METHOD__."($uid) = ".array2string($ret));
 		//echo "<p>".__METHOD__."($uid) require_acl_invite=$this->require_acl_invite returning ".array2string($ret)."</p>\n";
@@ -460,7 +460,7 @@ 
 	 * @param array $old_event the event before the update
 	 * @todo check if there is a real change, not assume every save is a change
 	 */
-	function check4update($new_event,$old_event)
+	function check4update($new_event, $old_event)
 	{
 		//error_log(__METHOD__."($new_event[title])");
 		$modified = $added = $deleted = array();
@@ -468,9 +468,9 @@ 
 		//echo "<p>calendar_boupdate::check4update() new participants = ".print_r($new_event['participants'],true).", old participants =".print_r($old_event['participants'],true)."</p>\n";
 
 		// Find modified and deleted participants ...
-		foreach($old_event['participants'] as $old_userid => $old_status)
+		foreach ($old_event['participants'] as $old_userid => $old_status)
 		{
-			if(isset($new_event['participants'][$old_userid]))
+			if (isset($new_event['participants'][$old_userid]))
 			{
 				$modified[$old_userid] = $new_event['participants'][$old_userid];
 			}
@@ -480,27 +480,27 @@ 
 			}
 		}
 		// Find new participants ...
-		foreach(array_keys((array)$new_event['participants']) as $new_userid)
+		foreach (array_keys((array)$new_event['participants']) as $new_userid)
 		{
-			if(!isset($old_event['participants'][$new_userid]))
+			if (!isset($old_event['participants'][$new_userid]))
 			{
 				$added[$new_userid] = 'U';
 			}
 		}
 		//echo "<p>calendar_boupdate::check4update() added=".print_r($added,true).", modified=".print_r($modified,true).", deleted=".print_r($deleted,true)."</p>\n";
-		if(count($added) || count($modified) || count($deleted))
+		if (count($added) || count($modified) || count($deleted))
 		{
-			if(count($added))
+			if (count($added))
 			{
-				$this->send_update(MSG_ADDED,$added,$old_event,$new_event);
+				$this->send_update(MSG_ADDED, $added, $old_event, $new_event);
 			}
-			if(count($modified))
+			if (count($modified))
 			{
-				$this->send_update(MSG_MODIFIED,$modified,$old_event,$new_event);
+				$this->send_update(MSG_MODIFIED, $modified, $old_event, $new_event);
 			}
-			if(count($deleted))
+			if (count($deleted))
 			{
-				$this->send_update(MSG_DISINVITE,$deleted,$new_event);
+				$this->send_update(MSG_DISINVITE, $deleted, $new_event);
 			}
 		}
 	}
@@ -517,11 +517,11 @@ 
 	 * @param string $status of current user
 	 * @return boolean true = update requested, false otherwise
 	 */
-	public static function update_requested($userid, $part_prefs, &$msg_type, $old_event ,$new_event, $role, $status=null)
+	public static function update_requested($userid, $part_prefs, &$msg_type, $old_event, $new_event, $role, $status = null)
 	{
 		if ($msg_type == MSG_ALARM)
 		{
-			return True;	// always True for now
+			return True; // always True for now
 		}
 		$want_update = 0;
 
@@ -529,7 +529,7 @@ 
 		//
 		$msg_is_response = $msg_type == MSG_REJECTED || $msg_type == MSG_ACCEPTED || $msg_type == MSG_TENTATIVE || $msg_type == MSG_DELEGATED;
 
-		switch($ru = $part_prefs['calendar']['receive_updates'])
+		switch ($ru = $part_prefs['calendar']['receive_updates'])
 		{
 			case 'responses':
 				++$want_update;
@@ -543,8 +543,8 @@ 
 			default:
 				if (is_array($new_event) && is_array($old_event))
 				{
-					$diff = max(abs(self::date2ts($old_event['start'])-self::date2ts($new_event['start'])),
-						abs(self::date2ts($old_event['end'])-self::date2ts($new_event['end'])));
+					$diff = max(abs(self::date2ts($old_event['start']) - self::date2ts($new_event['start'])),
+						abs(self::date2ts($old_event['end']) - self::date2ts($new_event['end'])));
 					$check = $ru == 'time_change_4h' ? 4 * 60 * 60 - 1 : 0;
 					if ($msg_type == MSG_MODIFIED && $diff > $check)
 					{
@@ -564,13 +564,13 @@ 
 				if (!is_numeric($userid) && $role == 'CHAIR' &&
 					($msg_is_response || in_array($msg_type, array(MSG_ADDED, MSG_DELETED))))
 				{
-					switch($msg_type)
+					switch ($msg_type)
 					{
 						case MSG_DELETED:	// treat deleting event as rejection to organizer
 							$msg_type = MSG_REJECTED;
 							break;
 						case MSG_ADDED:		// new events use added, but organizer needs status
-							switch($status[0])
+							switch ($status[0])
 							{
 								case 'A': $msg_type = MSG_ACCEPTED; break;
 								case 'R': $msg_type = MSG_REJECTED; break;
@@ -595,7 +595,7 @@ 
 	 * @param string $role ='REQ-PARTICIPANT'
 	 * @return boolean true if user requested to be notified, false if not
 	 */
-	static public function email_update_requested($user_or_email, $ical_method='REQUEST', $role='REQ-PARTICIPANT')
+	static public function email_update_requested($user_or_email, $ical_method = 'REQUEST', $role = 'REQ-PARTICIPANT')
 	{
 		// check if email is from a user
 		if (is_numeric($user_or_email))
@@ -619,7 +619,7 @@ 
 				)
 			);
 		}
-		switch($ical_method)
+		switch ($ical_method)
 		{
 			default:
 			case 'REQUEST':
@@ -644,9 +644,9 @@ 
 	 * @param string& $action=null on return verbose name
 	 * @param string& $msg=null on return notification message
 	 */
-	function msg_type2ical_method($msg_type, &$action=null, &$msg=null)
+	function msg_type2ical_method($msg_type, &$action = null, &$msg = null)
 	{
-		switch($msg_type)
+		switch ($msg_type)
 		{
 			case MSG_DELETED:
 				$action = 'Canceled';
@@ -698,7 +698,7 @@ 
 		$msg = $this->cal_prefs['notify'.$pref];
 		if (empty($msg))
 		{
-			$msg = $this->cal_prefs['notifyAdded'];	// use a default
+			$msg = $this->cal_prefs['notifyAdded']; // use a default
 		}
 		//error_log(__METHOD__."($msg_type) action='$action', $msg='$msg' returning '$method'");
 		return $method;
@@ -714,7 +714,7 @@ 
 	 * @param int $user =0 User who started the notify, default current user
 	 * @return bool true/false
 	 */
-	function send_update($msg_type,$to_notify,$old_event,$new_event=null,$user=0)
+	function send_update($msg_type, $to_notify, $old_event, $new_event = null, $user = 0)
 	{
 		//error_log(__METHOD__."($msg_type,".array2string($to_notify).",...) ".array2string($new_event));
 		if (!is_array($to_notify))
@@ -726,11 +726,11 @@ 
 		$owner = $old_event ? $old_event['owner'] : $new_event['owner'];
 		if ($owner && !isset($to_notify[$owner]) && $msg_type != MSG_ALARM)
 		{
-			$to_notify[$owner] = 'OCHAIR';	// always include the event-owner
+			$to_notify[$owner] = 'OCHAIR'; // always include the event-owner
 		}
 
 		// ignore events in the past (give a tolerance of 10 seconds for the script)
-		if($old_event && $this->date2ts($old_event['start']) < ($this->now_su - 10))
+		if ($old_event && $this->date2ts($old_event['start']) < ($this->now_su - 10))
 		{
 			return False;
 		}
@@ -740,7 +740,7 @@ 
 			$restore_tz = $tz;
 			date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
 		}
-		$temp_user = $GLOBALS['egw_info']['user'];	// save user-date of the enviroment to restore it after
+		$temp_user = $GLOBALS['egw_info']['user']; // save user-date of the enviroment to restore it after
 
 		if (!$user)
 		{
@@ -756,17 +756,17 @@ 
 		$event = $msg_type == MSG_ADDED || $msg_type == MSG_MODIFIED ? $new_event : $old_event;
 
 		// add all group-members to the notification, unless they are already participants
-		foreach($to_notify as $userid => $statusid)
+		foreach ($to_notify as $userid => $statusid)
 		{
 			if (is_numeric($userid) && $GLOBALS['egw']->accounts->get_type($userid) == 'g' &&
 				($members = $GLOBALS['egw']->accounts->member($userid)))
 			{
-				foreach($members as $member)
+				foreach ($members as $member)
 				{
 					$member = $member['account_id'];
 					if (!isset($to_notify[$member]))
 					{
-						$to_notify[$member] = 'G';	// Group-invitation
+						$to_notify[$member] = 'G'; // Group-invitation
 					}
 				}
 			}
@@ -778,7 +778,7 @@ 
 		if ($old_event) $olddate = new egw_time($old_event['start']);
 		//error_log(__METHOD__."() date_default_timezone_get()=".date_default_timezone_get().", user-timezone=".egw_time::$user_timezone->getName().", startdate=".$startdate->format().", enddate=".$enddate->format().", updated=".$modified->format().", olddate=".($olddate ? $olddate->format() : ''));
 		$owner_prefs = $ics = null;
-		foreach($to_notify as $userid => $statusid)
+		foreach ($to_notify as $userid => $statusid)
 		{
 			$res_info = $quantity = $role = null;
 			calendar_so::split_status($statusid, $quantity, $role);
@@ -801,14 +801,14 @@ 
 
 				if (!isset($userid))
 				{
-					if (empty($res_info['email'])) continue;	// no way to notify
+					if (empty($res_info['email'])) continue; // no way to notify
 					// check if event-owner wants non-EGroupware users notified
 					if (is_null($owner_prefs))
 					{
 						$preferences = new preferences($owner);
 						$owner_prefs = $preferences->read_repository();
 					}
-					if ($role != 'CHAIR' &&		// always notify externals CHAIRs
+					if ($role != 'CHAIR' && // always notify externals CHAIRs
 						(empty($owner_prefs['calendar']['notify_externals']) ||
 						$owner_prefs['calendar']['notify_externals'] == 'no'))
 					{
@@ -820,12 +820,12 @@ 
 
 			if ($statusid == 'R' || $GLOBALS['egw']->accounts->get_type($userid) == 'g')
 			{
-				continue;	// dont notify rejected participants or groups
+				continue; // dont notify rejected participants or groups
 			}
 
-			if($userid != $GLOBALS['egw_info']['user']['account_id'] ||
+			if ($userid != $GLOBALS['egw_info']['user']['account_id'] ||
 				($userid == $GLOBALS['egw_info']['user']['account_id'] &&
-					$user_prefs['calendar']['receive_own_updates']==1) ||
+					$user_prefs['calendar']['receive_own_updates'] == 1) ||
 				$msg_type == MSG_ALARM)
 			{
 				$tfn = $tln = $lid = null; //cleanup of lastname and fullname (in case they are set in a previous loop)
@@ -833,8 +833,8 @@ 
 				{
 					$preferences = new preferences($userid);
 					$GLOBALS['egw_info']['user']['preferences'] = $part_prefs = $preferences->read_repository();
-					$GLOBALS['egw']->accounts->get_account_name($userid,$lid,$tfn,$tln);
-					$fullname = common::display_fullname('',$tfn,$tln);
+					$GLOBALS['egw']->accounts->get_account_name($userid, $lid, $tfn, $tln);
+					$fullname = common::display_fullname('', $tfn, $tln);
 				}
 				else	// external email address: use preferences of event-owner, plus some hardcoded settings (eg. ical notification)
 				{
@@ -845,7 +845,7 @@ 
 					}
 					$part_prefs = $owner_prefs;
 					$part_prefs['calendar']['receive_updates'] = $owner_prefs['calendar']['notify_externals'];
-					$part_prefs['calendar']['update_format'] = 'ical';	// use ical format
+					$part_prefs['calendar']['update_format'] = 'ical'; // use ical format
 					$fullname = $res_info && !empty($res_info['name']) ? $res_info['name'] : $userid;
 				}
 				$m_type = $msg_type;
@@ -873,7 +873,7 @@ 
 				if (!isset($part_prefs['common']['tz'])) $part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];
 				$timezone = new DateTimeZone($part_prefs['common']['tz']);
 				$timeformat = $part_prefs['common']['timeformat'];
-				switch($timeformat)
+				switch ($timeformat)
 				{
 			  		case '24':
 						$timeformat = 'H:i';
@@ -882,7 +882,7 @@ 
 						$timeformat = 'h:i a';
 						break;
 				}
-				$timeformat = $part_prefs['common']['dateformat'] . ', ' . $timeformat;
+				$timeformat = $part_prefs['common']['dateformat'].', '.$timeformat;
 
 				$startdate->setTimezone($timezone);
 				$details['startdate'] = $startdate->format($timeformat);
@@ -891,7 +891,7 @@ 
 				$details['enddate'] = $enddate->format($timeformat);
 
 				$modified->setTimezone($timezone);
-				$details['updated'] = $modified->format($timeformat) . ', ' . common::grab_owner_name($event['modifier']);
+				$details['updated'] = $modified->format($timeformat).', '.common::grab_owner_name($event['modifier']);
 
 				if ($old_event != False)
 				{
@@ -900,15 +900,14 @@ 
 				}
 				//error_log(__METHOD__."() userid=$userid, timezone=".$timezone->getName().", startdate=$details[startdate], enddate=$details[enddate], updated=$details[updated], olddate=$details[olddate]");
 
-				list($subject,$notify_body) = explode("\n",$GLOBALS['egw']->preferences->parse_notify($notify_msg,$details),2);
+				list($subject, $notify_body) = explode("\n", $GLOBALS['egw']->preferences->parse_notify($notify_msg, $details), 2);
 				// alarm is NOT an iCal method, therefore we have to use extened (no iCal)
-				switch($msg_type == MSG_ALARM ? 'extended' : $part_prefs['calendar']['update_format'])
+				switch ($msg_type == MSG_ALARM ? 'extended' : $part_prefs['calendar']['update_format'])
 				{
-					case 'ical':
-						if (is_null($ics) || $m_type != $msg_type)	// need different ical for organizer notification
+					case 'ical' : if (is_null($ics) || $m_type != $msg_type)	// need different ical for organizer notification
 						{
 							$calendar_ical = new calendar_ical();
-							$calendar_ical->setSupportedFields('full');	// full iCal fields+event TZ
+							$calendar_ical->setSupportedFields('full'); // full iCal fields+event TZ
 							// we need to pass $event[id] so iCal class reads event again,
 							// as event is in user TZ, but iCal class expects server TZ!
 							$ics = $calendar_ical->exportVCal(array(isset($cleared_event) ? $cleared_event : $event['id']),
@@ -927,11 +926,11 @@ 
 					case 'extended':
 
 						$details_body = lang('Event Details follow').":\n";
-						foreach($event_arr as $key => $val)
+						foreach ($event_arr as $key => $val)
 						{
-							if(!empty($details[$key]))
+							if (!empty($details[$key]))
 							{
-								switch($key)
+								switch ($key)
 								{
 							 		case 'access':
 									case 'priority':
@@ -940,7 +939,7 @@ 
 									case 'title':
 										break;
 									default:
-										$details_body .= sprintf("%-20s %s\n",$val['field'].':',$details[$key]);
+										$details_body .= sprintf("%-20s %s\n", $val['field'].':', $details[$key]);
 										break;
 							 	}
 							}
@@ -948,7 +947,7 @@ 
 						break;
 				}
 				// send via notification_app
-				if($GLOBALS['egw_info']['apps']['notifications']['enabled'])
+				if ($GLOBALS['egw_info']['apps']['notifications']['enabled'])
 				{
 					try {
 						//error_log(__METHOD__."() notifying $userid from $senderid: $subject");
@@ -972,7 +971,7 @@ 
 						$notification->set_popupmessage($notify_body."\n\n".$details['description']."\n\n".$details_body);
 						$notification->set_popuplinks(array($details['link_arr']));
 
-						if(is_array($attachment)) { $notification->set_attachments(array($attachment)); }
+						if (is_array($attachment)) { $notification->set_attachments(array($attachment)); }
 						$notification->send();
 					}
 					catch (Exception $exception) {
@@ -1004,14 +1003,14 @@ 
 		return true;
 	}
 
-	function get_update_message($event,$added)
+	function get_update_message($event, $added)
 	{
 		$nul = null;
-		$details = $this->_get_event_details($event,$added ? lang('Added') : lang('Modified'),$nul);
+		$details = $this->_get_event_details($event, $added ? lang('Added') : lang('Modified'), $nul);
 
 		$notify_msg = $this->cal_prefs[$added || empty($this->cal_prefs['notifyModified']) ? 'notifyAdded' : 'notifyModified'];
 
-		return explode("\n",$GLOBALS['egw']->preferences->parse_notify($notify_msg,$details),2);
+		return explode("\n", $GLOBALS['egw']->preferences->parse_notify($notify_msg, $details), 2);
 	}
 
 	/**
@@ -1025,37 +1024,37 @@ 
 		//echo "<p>bocalendar::send_alarm("; print_r($alarm); echo ")</p>\n";
 		$GLOBALS['egw_info']['user']['account_id'] = $this->owner = $alarm['owner'];
 
-		$event_time_user = egw_time::server2user($alarm['time'] + $alarm['offset']);	// alarm[time] is in server-time, read requires user-time
-		if (!$alarm['owner'] || !$alarm['cal_id'] || !($event = $this->read($alarm['cal_id'],$event_time_user)))
+		$event_time_user = egw_time::server2user($alarm['time'] + $alarm['offset']); // alarm[time] is in server-time, read requires user-time
+		if (!$alarm['owner'] || !$alarm['cal_id'] || !($event = $this->read($alarm['cal_id'], $event_time_user)))
 		{
-			return False;	// event not found
+			return False; // event not found
 		}
 		if ($alarm['all'])
 		{
 			$to_notify = $event['participants'];
 		}
-		elseif ($this->check_perms(EGW_ACL_READ,$event))	// checks agains $this->owner set to $alarm[owner]
+		elseif ($this->check_perms(EGW_ACL_READ, $event))	// checks agains $this->owner set to $alarm[owner]
 		{
 			$to_notify[$alarm['owner']] = 'A';
 		}
 		else
 		{
-			return False;	// no rights
+			return False; // no rights
 		}
 		// need to load calendar translations and set currentapp, so calendar can reload a different lang
 		translation::add_app('calendar');
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'calendar';
 
-		$ret = $this->send_update(MSG_ALARM,$to_notify,$event,False,$alarm['owner']);
+		$ret = $this->send_update(MSG_ALARM, $to_notify, $event, False, $alarm['owner']);
 
 		// create a new alarm for recuring events for the next event, if one exists
-		if ($event['recur_type'] != MCAL_RECUR_NONE && ($event = $this->read($alarm['cal_id'],$event_time_user+1)))
+		if ($event['recur_type'] != MCAL_RECUR_NONE && ($event = $this->read($alarm['cal_id'], $event_time_user + 1)))
 		{
 			$alarm['time'] = $this->date2ts($event['start']) - $alarm['offset'];
 			unset($alarm['times']);
 			unset($alarm['next']);
 			//error_log(__METHOD__."() moving alarm to next recurrence ".array2string($alarm));
-			$this->save_alarm($alarm['cal_id'], $alarm, false);	// false = do NOT update timestamp, as nothing changed for iCal clients
+			$this->save_alarm($alarm['cal_id'], $alarm, false); // false = do NOT update timestamp, as nothing changed for iCal clients
 		}
 		return $ret;
 	}
@@ -1071,15 +1070,15 @@ 
 	 * DEPRECATED: we allways (have to) update timestamp, as they are required for sync!
 	 * @return int|boolean $cal_id > 0 or false on error (eg. permission denied)
 	 */
-	function save($event,$ignore_acl=false,$updateTS=true)
+	function save($event, $ignore_acl = false, $updateTS = true)
 	{
 		unset($updateTS);
 		//error_log(__METHOD__.'('.array2string($event).", $ignore_acl, $updateTS)");
 
 		// check if user has the permission to update / create the event
-		if (!$ignore_acl && ($event['id'] && !$this->check_perms(EGW_ACL_EDIT,$event['id']) ||
-			!$event['id'] && !$this->check_perms(EGW_ACL_EDIT,0,$event['owner']) &&
-			!$this->check_perms(EGW_ACL_ADD,0,$event['owner'])))
+		if (!$ignore_acl && ($event['id'] && !$this->check_perms(EGW_ACL_EDIT, $event['id']) ||
+			!$event['id'] && !$this->check_perms(EGW_ACL_EDIT, 0, $event['owner']) &&
+			!$this->check_perms(EGW_ACL_ADD, 0, $event['owner'])))
 		{
 			return false;
 		}
@@ -1124,19 +1123,19 @@ 
 				$time->setUser();
 				$save_event['recur_enddate'] = egw_time::to($time, 'ts');
 			}
-			$timestamps = array('modified','created');
+			$timestamps = array('modified', 'created');
 			// all-day events are handled in server time
 			$event['tzid'] = $save_event['tzid'] = egw_time::$server_timezone->getName();
 		}
 		else
 		{
-			$timestamps = array('start','end','modified','created','recur_enddate','recurrence');
+			$timestamps = array('start', 'end', 'modified', 'created', 'recur_enddate', 'recurrence');
 		}
 		// we run all dates through date2ts, to adjust to server-time and the possible date-formats
-		foreach($timestamps as $ts)
+		foreach ($timestamps as $ts)
 		{
 			// we convert here from user-time to timestamps in server-time!
-			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
+			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts], true) : 0;
 		}
 		// convert tzid name to integer tz_id, of set user default
 		if (empty($event['tzid']) || !($event['tz_id'] = calendar_timezones::tz2id($event['tzid'])))
@@ -1146,7 +1145,7 @@ 
 		// same with the recur exceptions
 		if (isset($event['recur_exception']) && is_array($event['recur_exception']))
 		{
-			foreach($event['recur_exception'] as &$date)
+			foreach ($event['recur_exception'] as &$date)
 			{
 				if ($event['whole_day'])
 				{
@@ -1155,7 +1154,7 @@ 
 				}
 				else
 				{
-					$date = $this->date2ts($date,true);
+					$date = $this->date2ts($date, true);
 				}
 			}
 			unset($date);
@@ -1163,7 +1162,7 @@ 
 		// same with the alarms
 		if (isset($event['alarm']) && is_array($event['alarm']) && isset($event['start']))
 		{
-			foreach($event['alarm'] as $id => &$alarm)
+			foreach ($event['alarm'] as $id => &$alarm)
 			{
 				// remove alarms belonging to not longer existing or rejected participants
 				if ($alarm['owner'] && isset($event['participants']))
@@ -1181,15 +1180,14 @@ 
 		// update all existing alarm times, in case alarm got moved and alarms are not include in $event
 		if ($old_event && is_array($old_event['alarm']) && isset($event['start']))
 		{
-			foreach($old_event['alarm'] as $id => &$alarm)
+			foreach ($old_event['alarm'] as $id => &$alarm)
 			{
 				if (!isset($event['alarm'][$id]))
 				{
 					$alarm['time'] = $event['start'] - $alarm['offset'];
 					if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
 						// remove (not store) alarms belonging to not longer existing or rejected participants
-					$status = isset($event['participants']) ? $event['participants'][$alarm['owner']] :
-						$old_event['participants'][$alarm['owner']];
+					$status = isset($event['participants']) ? $event['participants'][$alarm['owner']] : $old_event['participants'][$alarm['owner']];
 					if (!$alarm['owner'] || isset($status) && calendar_so::split_status($status) !== 'R')
 					{
 						$this->so->save_alarm($event['id'], $alarm);
@@ -1215,7 +1213,7 @@ 
 		}
 		$set_recurrences = false;
 		$set_recurrences_start = 0;
-		if (($cal_id = $this->so->save($event,$set_recurrences,$set_recurrences_start,0,$event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
+		if (($cal_id = $this->so->save($event, $set_recurrences, $set_recurrences_start, 0, $event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
 		{
 			$save_event['id'] = $cal_id;
 			// unset participants to enforce the default stati for all added recurrences
@@ -1227,7 +1225,7 @@ 
 		// create links for new participants from addressbook, if configured
 		if ($cal_id && $GLOBALS['egw_info']['server']['link_contacts'] && $event['participants'])
 		{
-			foreach($event['participants'] as $uid => $status)
+			foreach ($event['participants'] as $uid => $status)
 			{
 				$user_type = $user_id = null;
 				calendar_so::split_user($uid, $user_type, $user_id);
@@ -1240,7 +1238,7 @@ 
 
 		// Update history
 		$tracking = new calendar_tracking($this);
-		if (empty($event['id']) && !empty($cal_id)) $event['id']=$cal_id;
+		if (empty($event['id']) && !empty($cal_id)) $event['id'] = $cal_id;
 		$tracking->track($event, $old_event);
 
 		return $cal_id;
@@ -1255,16 +1253,16 @@ 
 	 * @param array|int $event event array or id of the event
 	 * @return boolean
 	 */
-	function check_status_perms($uid,$event)
+	function check_status_perms($uid, $event)
 	{
 		if ($uid[0] == 'c' || $uid[0] == 'e')	// for contact we use the owner of the event
 		{
 			if (!is_array($event) && !($event = $this->read($event))) return false;
 
-			return $this->check_perms(EGW_ACL_EDIT,0,$event['owner']);
+			return $this->check_perms(EGW_ACL_EDIT, 0, $event['owner']);
 		}
 		// check if we have a category acl for the event or not (null)
-		$access = $this->check_cat_acl(self::CAT_ACL_STATUS,$event);
+		$access = $this->check_cat_acl(self::CAT_ACL_STATUS, $event);
 		if (!is_null($access))
 		{
 			return $access;
@@ -1274,17 +1272,17 @@ 
 		{
 			$resource = $this->resource_info($uid);
 
-			return EGW_ACL_EDIT & $resource['rights'];
+			return EGW_ACL_EDIT&$resource['rights'];
 		}
 		if (!is_array($event) && !($event = $this->read($event))) return false;
 
 		// regular user and groups (need to check memberships too)
 		if (!isset($event['participants'][$uid]))
 		{
-			$memberships = $GLOBALS['egw']->accounts->memberships($uid,true);
+			$memberships = $GLOBALS['egw']->accounts->memberships($uid, true);
 		}
 		$memberships[] = $uid;
-		return array_intersect($memberships, array_keys($event['participants'])) && $this->check_perms(EGW_ACL_EDIT,0,$uid);
+		return array_intersect($memberships, array_keys($event['participants'])) && $this->check_perms(EGW_ACL_EDIT, 0, $uid);
 	}
 
 	/**
@@ -1298,16 +1296,16 @@ 
 	 * @return boolean false=access denied because of cat acl, true access granted because of cat acl,
 	 * 	null = cat has no acl
 	 */
-	function check_cat_acl($right,$event)
+	function check_cat_acl($right, $event)
 	{
 		if (!is_array($event)) $event = $this->read($event);
 
 		$ret = null;
 		if ($event['category'])
 		{
-			foreach(is_array($event['category']) ? $event['category'] : explode(',',$event['category']) as $cat_id)
+			foreach (is_array($event['category']) ? $event['category'] : explode(',', $event['category']) as $cat_id)
 			{
-				$access = self::has_cat_right($right,$cat_id,$this->user);
+				$access = self::has_cat_right($right, $cat_id, $this->user);
 				if ($access === true)
 				{
 					$ret = true;
@@ -1315,7 +1313,7 @@ 
 				}
 				if ($access === false)
 				{
-					$ret = false;	// cat denies access --> check further cats
+					$ret = false; // cat denies access --> check further cats
 				}
 			}
 		}
@@ -1336,12 +1334,12 @@ 
 	 * @param int $cat_id =null null to return array with all cats
 	 * @return array with account_id => right pairs
 	 */
-	public static function get_cat_rights($cat_id=null)
+	public static function get_cat_rights($cat_id = null)
 	{
 		if (!isset(self::$cat_rights_cache))
 		{
-			self::$cat_rights_cache = egw_cache::getSession('calendar','cat_rights',
-				array($GLOBALS['egw']->acl,'get_location_grants'),array('L%','calendar'));
+			self::$cat_rights_cache = egw_cache::getSession('calendar', 'cat_rights',
+				array($GLOBALS['egw']->acl, 'get_location_grants'), array('L%', 'calendar'));
 		}
 		//echo "<p>".__METHOD__."($cat_id) = ".array2string($cat_id ? self::$cat_rights_cache['L'.$cat_id] : self::$cat_rights_cache)."</p>\n";
 		return $cat_id ? self::$cat_rights_cache['L'.$cat_id] : self::$cat_rights_cache;
@@ -1354,7 +1352,7 @@ 
 	 * @param int $user
 	 * @param int $rights self::CAT_ACL_{ADD|STATUS} or'ed together
 	 */
-	public static function set_cat_rights($cat_id,$user,$rights)
+	public static function set_cat_rights($cat_id, $user, $rights)
 	{
 		//echo "<p>".__METHOD__."($cat_id,$user,$rights)</p>\n";
 		if (!isset(self::$cat_rights_cache)) self::get_cat_rights($cat_id);
@@ -1364,15 +1362,15 @@ 
 			if ($rights)
 			{
 				self::$cat_rights_cache['L'.$cat_id][$user] = $rights;
-				$GLOBALS['egw']->acl->add_repository('calendar','L'.$cat_id,$user,$rights);
+				$GLOBALS['egw']->acl->add_repository('calendar', 'L'.$cat_id, $user, $rights);
 			}
 			else
 			{
 				unset(self::$cat_rights_cache['L'.$cat_id][$user]);
 				if (!self::$cat_rights_cache['L'.$cat_id]) unset(self::$cat_rights_cache['L'.$cat_id]);
-				$GLOBALS['egw']->acl->delete_repository('calendar','L'.$cat_id,$user);
+				$GLOBALS['egw']->acl->delete_repository('calendar', 'L'.$cat_id, $user);
 			}
-			egw_cache::setSession('calendar','cat_rights',self::$cat_rights_cache);
+			egw_cache::setSession('calendar', 'cat_rights', self::$cat_rights_cache);
 		}
 	}
 
@@ -1383,9 +1381,9 @@ 
 	 * @return boolean false=access denied because of cat acl, true access granted because of cat acl,
 	 * 	null = cat has no acl
 	 */
-	public static function has_cat_right($right,$cat_id,$user)
+	public static function has_cat_right($right, $cat_id, $user)
 	{
-		static $cache=null;
+		static $cache = null;
 
 		if (!isset($cache[$cat_id]))
 		{
@@ -1393,21 +1391,21 @@ 
 			$cat_rights = self::get_cat_rights($cat_id);
 			if (!is_null($cat_rights))
 			{
-				static $memberships=null;
+				static $memberships = null;
 				if (is_null($memberships))
 				{
-					$memberships = $GLOBALS['egw']->accounts->memberships($user,true);
+					$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 					$memberships[] = $user;
 				}
-				foreach($cat_rights as $uid => $value)
+				foreach ($cat_rights as $uid => $value)
 				{
 					$all |= $value;
-					if (in_array($uid,$memberships)) $own |= $value;
+					if (in_array($uid, $memberships)) $own |= $value;
 				}
 			}
-			foreach(array(self::CAT_ACL_ADD,self::CAT_ACL_STATUS) as $mask)
+			foreach (array(self::CAT_ACL_ADD, self::CAT_ACL_STATUS) as $mask)
 			{
-				$cache[$cat_id][$mask] = !($all & $mask) ? null : !!($own & $mask);
+				$cache[$cat_id][$mask] = !($all&$mask) ? null : !!($own&$mask);
 			}
 		}
 		//echo "<p>".__METHOD__."($right,$cat_id) all=$all, own=$own returning ".array2string($cache[$cat_id][$right])."</p>\n";
@@ -1427,13 +1425,13 @@ 
 	 * @param boolean $skip_notification =false true: do not send notification messages
 	 * @return int number of changed recurrences
 	 */
-	function set_status($event,$uid,$status,$recur_date=0,$ignore_acl=false,$updateTS=true,$skip_notification=false)
+	function set_status($event, $uid, $status, $recur_date = 0, $ignore_acl = false, $updateTS = true, $skip_notification = false)
 	{
 		unset($updateTS);
 
 		$cal_id = is_array($event) ? $event['id'] : $event;
 		//echo "<p>calendar_boupdate::set_status($cal_id,$uid,$status,$recur_date)</p>\n";
-		if (!$cal_id || (!$ignore_acl && !$this->check_status_perms($uid,$event)))
+		if (!$cal_id || (!$ignore_acl && !$this->check_status_perms($uid, $event)))
 		{
 			return false;
 		}
@@ -1442,16 +1440,16 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				"($cal_id, $uid, $status, $recur_date)\n",3,$this->logfile);
+				"($cal_id, $uid, $status, $recur_date)\n", 3, $this->logfile);
 		}
 		$old_event = $this->read($cal_id, $recur_date, false, 'server');
-		if (($Ok = $this->so->set_status($cal_id,is_numeric($uid)?'u':$uid[0],
-				is_numeric($uid)?$uid:substr($uid,1),$status,
-				$recur_date?$this->date2ts($recur_date,true):0,$role)))
+		if (($Ok = $this->so->set_status($cal_id, is_numeric($uid) ? 'u' : $uid[0],
+				is_numeric($uid) ? $uid : substr($uid, 1), $status,
+				$recur_date ? $this->date2ts($recur_date, true) : 0, $role)))
 		{
 			if ($status == 'R')	// remove alarms belonging to rejected participants
 			{
-				foreach(isset($event['alarm']) ? $event['alarm'] : $old_event['alarm'] as $id => $alarm)
+				foreach (isset($event['alarm']) ? $event['alarm'] : $old_event['alarm'] as $id => $alarm)
 				{
 					if ((string)$alarm['owner'] === (string)$uid)
 					{
@@ -1474,8 +1472,8 @@ 
 			if (isset($status2msg[$status]) && !$skip_notification)
 			{
 				if (!is_array($event)) $event = $this->read($cal_id);
-				if (isset($recur_date)) $event = $this->read($event['id'],$recur_date); //re-read the actually edited recurring event
-				$this->send_update($status2msg[$status],$event['participants'],$event);
+				if (isset($recur_date)) $event = $this->read($event['id'], $recur_date); //re-read the actually edited recurring event
+				$this->send_update($status2msg[$status], $event['participants'], $event);
 			}
 
 			// Update history
@@ -1495,14 +1493,14 @@ 
 	 * @param int $recur_date =0 date to change, or 0 = all since now
 	 * @param boolean $skip_notification Do not send notifications.  Parameter passed on to set_status().
 	 */
-	function update_status($new_event, $old_event , $recur_date=0, $skip_notification=false)
+	function update_status($new_event, $old_event, $recur_date = 0, $skip_notification = false)
 	{
 		if (!isset($new_event['participants'])) return;
 
 		// check the old list against the new list
 		foreach ($old_event['participants'] as $userid => $status)
   		{
-            if (!isset($new_event['participants'][$userid])){
+            if (!isset($new_event['participants'][$userid])) {
             	// Attendee will be deleted this way
             	$new_event['participants'][$userid] = 'G';
             }
@@ -1515,7 +1513,7 @@ 
 		// write the changes
 		foreach ($new_event['participants'] as $userid => $status)
 		{
-			$this->set_status($old_event, $userid, $status, $recur_date, true, false,$skip_notification);
+			$this->set_status($old_event, $userid, $status, $recur_date, true, false, $skip_notification);
 		}
     }
 
@@ -1530,43 +1528,43 @@ 
 	 * @param int &$exceptions_kept=null on return number of kept exceptions
 	 * @return boolean true on success, false on error (usually permission denied)
 	 */
-	function delete($cal_id, $recur_date=0, $ignore_acl=false, $skip_notification=false,
-		$delete_exceptions=true, &$exceptions_kept=null)
+	function delete($cal_id, $recur_date = 0, $ignore_acl = false, $skip_notification = false,
+		$delete_exceptions = true, &$exceptions_kept = null)
 	{
 		//error_log(__METHOD__."(cal_id=$cal_id, recur_date=$recur_date, ignore_acl=$ignore_acl, skip_notifications=$skip_notification)");
-		if (!($event = $this->read($cal_id,$recur_date)) ||
-			!$ignore_acl && !$this->check_perms(EGW_ACL_DELETE,$event))
+		if (!($event = $this->read($cal_id, $recur_date)) ||
+			!$ignore_acl && !$this->check_perms(EGW_ACL_DELETE, $event))
 		{
 			return false;
 		}
 
 		// Don't send notification if the event has already been deleted
-		if(!$event['deleted'] && !$skip_notification)
+		if (!$event['deleted'] && !$skip_notification)
 		{
-			$this->send_update(MSG_DELETED,$event['participants'],$event);
+			$this->send_update(MSG_DELETED, $event['participants'], $event);
 		}
 
 		if (!$recur_date || $event['recur_type'] == MCAL_RECUR_NONE)
 		{
 			$config = config::read('phpgwapi');
-			if(!$config['calendar_delete_history'] || $event['deleted'])
+			if (!$config['calendar_delete_history'] || $event['deleted'])
 			{
 				$this->so->delete($cal_id);
 
 				// delete all links to the event
-				egw_link::unlink(0,'calendar',$cal_id);
+				egw_link::unlink(0, 'calendar', $cal_id);
 			}
 			elseif ($config['calendar_delete_history'])
 			{
 				// mark all links to the event as deleted, but keep them
-				egw_link::unlink(0,'calendar',$cal_id,'','','',true);
+				egw_link::unlink(0, 'calendar', $cal_id, '', '', '', true);
 
 				$event['deleted'] = $this->now;
 				$this->save($event, $ignore_acl);
 				// Actually delete alarms
 				if (isset($event['alarm']) && is_array($event['alarm']))
 				{
-					foreach($event['alarm'] as $id => $alarm)
+					foreach ($event['alarm'] as $id => $alarm)
 					{
 						$this->delete_alarm($id);
 					}
@@ -1589,7 +1587,7 @@ 
 						if (!($exception = $this->read($id))) continue;
 						$exception['uid'] = common::generate_uid('calendar', $id);
 						$exception['reference'] = $exception['recurrence'] = 0;
-						$this->update($exception, true, true, false, true, $msg=null, true);
+						$this->update($exception, true, true, false, true, $msg = null, true);
 						++$exceptions_kept;
 					}
 				}
@@ -1601,9 +1599,9 @@ 
 			if ($event['alarm'])
 			{
 				$next_recurrance = null;
-				foreach($event['alarm'] as &$alarm)
+				foreach ($event['alarm'] as &$alarm)
 				{
-					if (($alarm['time'] == $recur_date) || ($alarm['time']+$alarm['offset'] == $recur_date))
+					if (($alarm['time'] == $recur_date) || ($alarm['time'] + $alarm['offset'] == $recur_date))
 					{
 						//error_log(__METHOD__.__LINE__.'->'.array2string($recur_date));
 						//error_log(__METHOD__.__LINE__.array2string($event));
@@ -1611,12 +1609,12 @@ 
 						{
 							$checkdate = $recur_date;
 							//if ($alarm['time']+$alarm['offset'] == $recur_date) $checkdate = $recur_date + $alarm['offset'];
-							if (($e = $this->read($cal_id,$checkdate+1)))
+							if (($e = $this->read($cal_id, $checkdate + 1)))
 							{
 								$next_recurrance = $this->date2ts($e['start']);
 							}
 						}
-						$alarm['time'] = $this->date2ts($next_recurrance, true);	// user to server-time
+						$alarm['time'] = $this->date2ts($next_recurrance, true); // user to server-time
 						$alarm['cal_id'] = $cal_id;
 						unset($alarm['times']);
 						unset($alarm['next']);
@@ -1630,7 +1628,7 @@ 
 			$event = $this->read($cal_id);
 			//if (isset($alarmbuffer)) $event['alarm'] = $alarmbuffer;
 			$event['recur_exception'][] = $recur_date;
-			$this->save($event);// updates the content-history
+			$this->save($event); // updates the content-history
 		}
 		if ($event['reference'])
 		{
@@ -1648,19 +1646,19 @@ 
 	 * @param array $disinvited
 	 * @return array
 	 */
-	function _get_event_details($event,$action,&$event_arr,$disinvited=array())
+	function _get_event_details($event, $action, &$event_arr, $disinvited = array())
 	{
 		$details = array(			// event-details for the notify-msg
 			'id'          => $event['id'],
 			'action'      => lang($action),
 		);
 		$event_arr = $this->event2array($event);
-		foreach($event_arr as $key => $val)
+		foreach ($event_arr as $key => $val)
 		{
 			if ($key == 'recur_type') $key = 'repetition';
 			$details[$key] = $val['data'];
 		}
-		$details['participants'] = $details['participants'] ? implode("\n",$details['participants']) : '';
+		$details['participants'] = $details['participants'] ? implode("\n", $details['participants']) : '';
 
 		$event_arr['link']['field'] = lang('URL');
 		$eventStart_arr = $this->date2array($event['start']); // give this as 'date' to the link to pick the right recurrence for the participants state
@@ -1681,7 +1679,7 @@ 
 		 */
 		$link_arr = array();
 		$link_arr['text'] = $event['title'];
-		$link_arr['view'] = array(	'menuaction' => 'calendar.calendar_uiforms.edit',
+		$link_arr['view'] = array('menuaction' => 'calendar.calendar_uiforms.edit',
 									'cal_id' => $event['id'],
 									'date' => $eventStart_arr['full'],
 									);
@@ -1689,11 +1687,11 @@ 
 		$details['link_arr'] = $link_arr;
 
 		$dis = array();
-		foreach($disinvited as $uid)
+		foreach ($disinvited as $uid)
 		{
 			$dis[] = $this->participant_name($uid);
 		}
-		$details['disinvited'] = implode(', ',$dis);
+		$details['disinvited'] = implode(', ', $dis);
 		return $details;
 	}
 
@@ -1717,14 +1715,14 @@ 
 			'data'	=> $event['description']
 		);
 
-		foreach(explode(',',$event['category']) as $cat_id)
+		foreach (explode(',', $event['category']) as $cat_id)
 		{
 			list($cat) = $GLOBALS['egw']->categories->return_single($cat_id);
 			$cat_string[] = stripslashes($cat['name']);
 		}
 		$var['category'] = Array(
 			'field'	=> lang('Category'),
-			'data'	=> implode(', ',$cat_string)
+			'data'	=> implode(', ', $cat_string)
 		);
 
 		$var['location'] = Array(
@@ -1770,7 +1768,7 @@ 
 
 		if (isset($event['participants']) && is_array($event['participants']) && !empty($event['participants']))
 		{
-			$participants = $this->participants($event,true);
+			$participants = $this->participants($event, true);
 		}
 		$var['participants'] = Array(
 			'field'	=> lang('Participants'),
@@ -1793,26 +1791,26 @@ 
 	 * @param array $old_event =null event-data in the DB before calling save
 	 * @param string $type ='update'
 	 */
-	function log2file($event2save,$event_saved,$old_event=null,$type='update')
+	function log2file($event2save, $event_saved, $old_event = null, $type = 'update')
 	{
-		if (!($f = fopen($this->log_file,'a')))
+		if (!($f = fopen($this->log_file, 'a')))
 		{
 			echo "<p>error opening '$this->log_file' !!!</p>\n";
 			return false;
 		}
-		fwrite($f,$type.': '.common::grab_owner_name($this->user).': '.date('r')."\n");
-		fwrite($f,"Time: time to save / saved time read back / old time before save\n");
-		foreach(array('start','end') as $name)
+		fwrite($f, $type.': '.common::grab_owner_name($this->user).': '.date('r')."\n");
+		fwrite($f, "Time: time to save / saved time read back / old time before save\n");
+		foreach (array('start', 'end') as $name)
 		{
-			fwrite($f,$name.': '.(isset($event2save[$name]) ? $this->format_date($event2save[$name]) : 'not set').' / '.
-				$this->format_date($event_saved[$name]) .' / '.
+			fwrite($f, $name.': '.(isset($event2save[$name]) ? $this->format_date($event2save[$name]) : 'not set').' / '.
+				$this->format_date($event_saved[$name]).' / '.
 				(is_null($old_event) ? 'no old event' : $this->format_date($old_event[$name]))."\n");
 		}
-		foreach(array('event2save','event_saved','old_event') as $name)
+		foreach (array('event2save', 'event_saved', 'old_event') as $name)
 		{
-			fwrite($f,$name.' = '.print_r($$name,true));
+			fwrite($f, $name.' = '.print_r($$name, true));
 		}
-		fwrite($f,"\n");
+		fwrite($f, "\n");
 		fclose($f);
 
 		return true;
@@ -1833,14 +1831,14 @@ 
 		if ($old_event !== null && $event['start'] == $old_event['start']) return;
 
 		$time = new egw_time($event['start']);
-		if(!is_array($event['alarm']))
+		if (!is_array($event['alarm']))
 		{
 			$event['alarm'] = $this->so->read_alarms($event['id']);
 		}
 
-		foreach($event['alarm'] as $id => &$alarm)
+		foreach ($event['alarm'] as $id => &$alarm)
 		{
-			if($event['recur_type'] != MCAL_RECUR_NONE)
+			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
 				calendar_so::shift_alarm($event, $alarm, $instance_date->format('ts'));
 			}
@@ -1860,14 +1858,14 @@ 
 	 * @param boolean $update_modified =true call update modified, default true
 	 * @return string id of the alarm, or false on error (eg. no perms)
 	 */
-	function save_alarm($cal_id, $alarm, $update_modified=true)
+	function save_alarm($cal_id, $alarm, $update_modified = true)
 	{
-		if (!$cal_id || !$this->check_perms(EGW_ACL_EDIT,$alarm['all'] ? $cal_id : 0,!$alarm['all'] ? $alarm['owner'] : 0))
+		if (!$cal_id || !$this->check_perms(EGW_ACL_EDIT, $alarm['all'] ? $cal_id : 0, !$alarm['all'] ? $alarm['owner'] : 0))
 		{
 			//echo "<p>no rights to save the alarm=".print_r($alarm,true)." to event($cal_id)</p>";
-			return false;	// no rights to add the alarm
+			return false; // no rights to add the alarm
 		}
-		$alarm['time'] = $this->date2ts($alarm['time'],true);	// user to server-time
+		$alarm['time'] = $this->date2ts($alarm['time'], true); // user to server-time
 
 		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, 'modify', $this->now);
 
@@ -1882,11 +1880,11 @@ 
 	 */
 	function delete_alarm($id)
 	{
-		list(,$cal_id) = explode(':',$id);
+		list(,$cal_id) = explode(':', $id);
 
-		if (!($alarm = $this->so->read_alarm($id)) || !$cal_id || !$this->check_perms(EGW_ACL_EDIT,$alarm['all'] ? $cal_id : 0,!$alarm['all'] ? $alarm['owner'] : 0))
+		if (!($alarm = $this->so->read_alarm($id)) || !$cal_id || !$this->check_perms(EGW_ACL_EDIT, $alarm['all'] ? $cal_id : 0, !$alarm['all'] ? $alarm['owner'] : 0))
 		{
-			return false;	// no rights to delete the alarm
+			return false; // no rights to delete the alarm
 		}
 
 		$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, 'modify', $this->now);
@@ -1903,13 +1901,13 @@ 
 	 *  by the ones the user normally does not see due to category permissions - used to preserve categories
 	 * @return array category ids (found, added and preserved categories)
 	 */
-	function find_or_add_categories($catname_list, $old_event=null)
+	function find_or_add_categories($catname_list, $old_event = null)
 	{
 		if (is_array($old_event) || $old_event > 0)
 		{
 			// preserve categories without users read access
 			if (!is_array($old_event)) $old_event = $this->read($old_event);
-			$old_categories = explode(',',$old_event['category']);
+			$old_categories = explode(',', $old_event['category']);
 			$old_cats_preserve = array();
 			if (is_array($old_categories) && count($old_categories) > 0)
 			{
@@ -1963,7 +1961,7 @@ 
 	{
 		if (!is_array($cat_id_list))
 		{
-			$cat_id_list = explode(',',$cat_id_list);
+			$cat_id_list = explode(',', $cat_id_list);
 		}
 		$cat_list = array();
 		foreach ($cat_id_list as $cat_id)
@@ -1988,7 +1986,7 @@ 
 	 *                              master	-> try to find a releated series master
 	 * @return array calendar_ids of matching entries
 	 */
-	function find_event($event, $filter='exact')
+	function find_event($event, $filter = 'exact')
 	{
 		$matchingEvents = array();
 		$query = array();
@@ -1996,14 +1994,14 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				"($filter)[EVENT]:" . array2string($event)."\n",3,$this->logfile);
+				"($filter)[EVENT]:".array2string($event)."\n", 3, $this->logfile);
 		}
 
 		if (!isset($event['recurrence'])) $event['recurrence'] = 0;
 
 		if ($filter == 'master')
 		{
-			$query[] = 'recur_type!='. MCAL_RECUR_NONE;
+			$query[] = 'recur_type!='.MCAL_RECUR_NONE;
 			$query['cal_recurrence'] = 0;
 		}
 		elseif ($filter == 'exact')
@@ -2024,14 +2022,14 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'(' . $event['id'] . ")[EventID]\n",3,$this->logfile);
+					'('.$event['id'].")[EventID]\n", 3, $this->logfile);
 			}
 			if (($egwEvent = $this->read($event['id'], 0, false, 'server')))
 			{
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-						'()[FOUND]:' . array2string($egwEvent)."\n",3,$this->logfile);
+						'()[FOUND]:'.array2string($egwEvent)."\n", 3, $this->logfile);
 				}
 				if ($egwEvent['recur_type'] != MCAL_RECUR_NONE &&
 					(empty($event['uid']) || $event['uid'] == $egwEvent['uid']))
@@ -2050,7 +2048,7 @@ 
 						$exceptions = $this->so->get_recurrence_exceptions($egwEvent, $event['tzid']);
 						if (in_array($event['recurrence'], $exceptions))
 						{
-							$matchingEvents[] = $egwEvent['id'] . ':' . (int)$event['recurrence'];
+							$matchingEvents[] = $egwEvent['id'].':'.(int)$event['recurrence'];
 						}
 					}
 				} elseif ($filter != 'master' && ($filter == 'exact' ||
@@ -2069,19 +2067,19 @@ 
 
 		// only query calendars of users, we have READ-grants from
 		$users = array();
-		foreach(array_keys($this->grants) as $user)
+		foreach (array_keys($this->grants) as $user)
 		{
 			$user = trim($user);
-			if ($this->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY,0,$user))
+			if ($this->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY, 0, $user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user, $users))	// already added?
 				{
 					$users[] = $user;
 				}
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
-				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
+				continue; // for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
 			if (!is_numeric($user)) continue;
@@ -2092,11 +2090,11 @@ 
 				$members = $GLOBALS['egw']->accounts->member($user);
 				if (is_array($members))
 				{
-					foreach($members as $member)
+					foreach ($members as $member)
 					{
 						// use only members which gave the user a read-grant
-						if (!in_array($member['account_id'],$users) &&
-								$this->check_perms(EGW_ACL_READ|EGW_ACL_FREEBUSY,0,$member['account_id']))
+						if (!in_array($member['account_id'], $users) &&
+								$this->check_perms(EGW_ACL_READ|EGW_ACL_FREEBUSY, 0, $member['account_id']))
 						{
 							$users[] = $member['account_id'];
 						}
@@ -2108,9 +2106,9 @@ 
 				$memberships = $GLOBALS['egw']->accounts->membership($user);
 				if (is_array($memberships))
 				{
-					foreach($memberships as $group)
+					foreach ($memberships as $group)
 					{
-						if (!in_array($group['account_id'],$users))
+						if (!in_array($group['account_id'], $users))
 						{
 							$users[] = $group['account_id'];
 						}
@@ -2134,24 +2132,24 @@ 
 
 				// check length with some tolerance
 				$length = $event['end'] - $event['start'] - $delta;
-				$query[] = ('(cal_end-cal_start)>' . $length);
+				$query[] = ('(cal_end-cal_start)>'.$length);
 				$length += 2 * $delta;
-				$query[] = ('(cal_end-cal_start)<' . $length);
-				$query[] = ('cal_start>' . ($event['start'] - 86400));
-				$query[] = ('cal_start<' . ($event['start'] + 86400));
+				$query[] = ('(cal_end-cal_start)<'.$length);
+				$query[] = ('cal_start>'.($event['start'] - 86400));
+				$query[] = ('cal_start<'.($event['start'] + 86400));
 			}
 			elseif (isset($event['start']))
 			{
 				if ($filter == 'relax')
 				{
-					$query[] = ('cal_start>' . ($event['start'] - 3600));
-					$query[] = ('cal_start<' . ($event['start'] + 3600));
+					$query[] = ('cal_start>'.($event['start'] - 3600));
+					$query[] = ('cal_start<'.($event['start'] + 3600));
 				}
 				else
 				{
 					// we accept a tiny tolerance
-					$query[] = ('cal_start>' . ($event['start'] - 2));
-					$query[] = ('cal_start<' . ($event['start'] + 2));
+					$query[] = ('cal_start>'.($event['start'] - 2));
+					$query[] = ('cal_start<'.($event['start'] + 2));
 				}
 			}
 			if ($filter == 'relax')
@@ -2174,14 +2172,14 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'(' . $event['uid'] . ")[EventUID]\n",3,$this->logfile);
+					'('.$event['uid'].")[EventUID]\n", 3, $this->logfile);
 			}
 		}
 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'[QUERY]: ' . array2string($query)."\n",3,$this->logfile);
+				'[QUERY]: '.array2string($query)."\n", 3, $this->logfile);
 		}
 		if (!count($users) || !($foundEvents =
 			$this->so->search(null, null, $users, 0, 'owner', false, 0, array('query' => $query))))
@@ -2189,19 +2187,19 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				"[NO MATCH]\n",3,$this->logfile);
+				"[NO MATCH]\n", 3, $this->logfile);
 			}
 			return $matchingEvents;
 		}
 
 		$pseudos = array();
 
-		foreach($foundEvents as $egwEvent)
+		foreach ($foundEvents as $egwEvent)
 		{
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'[FOUND]: ' . array2string($egwEvent)."\n",3,$this->logfile);
+					'[FOUND]: '.array2string($egwEvent)."\n", 3, $this->logfile);
 			}
 
 			if (in_array($egwEvent['id'], $matchingEvents)) continue;
@@ -2275,7 +2273,7 @@ 
 						if (in_array($event['recurrence'], $exceptions))
 						{
 							// We found a pseudo exception
-							$matchingEvents = array($egwEvent['id'] . ':' . (int)$event['recurrence']);
+							$matchingEvents = array($egwEvent['id'].':'.(int)$event['recurrence']);
 							break;
 						}
 					}
@@ -2293,7 +2291,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() egwEvent length does not match!\n",3,$this->logfile);
+							"() egwEvent length does not match!\n", 3, $this->logfile);
 						}
 						continue;
 					}
@@ -2305,7 +2303,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() egwEvent is not a whole-day event!\n",3,$this->logfile);
+							"() egwEvent is not a whole-day event!\n", 3, $this->logfile);
 						}
 						continue;
 					}
@@ -2326,8 +2324,8 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() event[$key] differ: '" . $event[$key] .
-							"' <> '" . $egwEvent[$key] . "'\n",3,$this->logfile);
+							"() event[$key] differ: '".$event[$key].
+							"' <> '".$egwEvent[$key]."'\n", 3, $this->logfile);
 					}
 					continue 2; // next foundEvent
 				}
@@ -2345,7 +2343,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() egwEvent category $cat_id is missing!\n",3,$this->logfile);
+							"() egwEvent category $cat_id is missing!\n", 3, $this->logfile);
 						}
 						continue 2;
 					}
@@ -2357,7 +2355,7 @@ 
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 							'() event has additional categories:'
-							. array2string($newCategories)."\n",3,$this->logfile);
+							. array2string($newCategories)."\n", 3, $this->logfile);
 					}
 					continue;
 				}
@@ -2377,7 +2375,7 @@ 
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								"() additional event['participants']: $attendee\n",3,$this->logfile);
+								"() additional event['participants']: $attendee\n", 3, $this->logfile);
 							}
 							continue 2;
 						}
@@ -2400,8 +2398,8 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								'() missing event[participants]: ' .
-								array2string($egwEvent['participants'])."\n",3,$this->logfile);
+								'() missing event[participants]: '.
+								array2string($egwEvent['participants'])."\n", 3, $this->logfile);
 						}
 						continue;
 					}
@@ -2413,7 +2411,7 @@ 
 				if ($egwEvent['recur_type'] != MCAL_RECUR_NONE)
 				{
 					// We found a pseudo Exception
-					$pseudos[] = $egwEvent['id'] . ':' . $event['start'];
+					$pseudos[] = $egwEvent['id'].':'.$event['start'];
 					continue;
 				}
 			}
@@ -2435,7 +2433,7 @@ 
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								"() additional event['recur_exception']: $day\n",3,$this->logfile);
+								"() additional event['recur_exception']: $day\n", 3, $this->logfile);
 							}
 							continue 2;
 						}
@@ -2445,8 +2443,8 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								'() missing event[recur_exception]: ' .
-								array2string($event['recur_exception'])."\n",3,$this->logfile);
+								'() missing event[recur_exception]: '.
+								array2string($event['recur_exception'])."\n", 3, $this->logfile);
 						}
 						continue;
 					}
@@ -2461,8 +2459,8 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								"() events[$key] differ: " . $event[$key] .
-								' <> ' . $egwEvent[$key]."\n",3,$this->logfile);
+								"() events[$key] differ: ".$event[$key].
+								' <> '.$egwEvent[$key]."\n", 3, $this->logfile);
 						}
 						continue 2;
 					}
@@ -2478,7 +2476,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"() new exception for series found.\n",3,$this->logfile);
+					"() new exception for series found.\n", 3, $this->logfile);
 			}
 			$matchingEvents = array();
 		}
@@ -2489,7 +2487,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'[MATCHES]:' . array2string($matches)."\n",3,$this->logfile);
+				'[MATCHES]:'.array2string($matches)."\n", 3, $this->logfile);
 		}
 		return $matches;
 	}
@@ -2562,7 +2560,7 @@ 
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"()[MASTER]: $eventID\n",3,$this->logfile);
+					"()[MASTER]: $eventID\n", 3, $this->logfile);
 				}
 				$type = 'SERIES-EXCEPTION';
 				if (($master_event = $this->read($eventID, 0, false, 'server')))
@@ -2583,7 +2581,7 @@ 
 					}
 					elseif (in_array($event['start'], $master_event['recur_exception']))
 					{
-						$type='SERIES-PSEUDO-EXCEPTION'; // new pseudo exception?
+						$type = 'SERIES-PSEUDO-EXCEPTION'; // new pseudo exception?
 						$recurrence_event = $master_event;
 						$recurrence_event['start'] = $event['start'];
 						$recurrence_event['end'] -= $master_event['start'] - $event['start'];
@@ -2600,8 +2598,8 @@ 
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-									'() try occurrence ' . $egw_rrule->current()
-									. " ($occurrence)\n",3,$this->logfile);
+									'() try occurrence '.$egw_rrule->current()
+									. " ($occurrence)\n", 3, $this->logfile);
 							}
 							if ($event['start'] == $occurrence)
 							{
@@ -2634,8 +2632,8 @@ 
 			// default if we cannot find a proof for a fundamental change
 			// the recurrence_event is the master event with start and end adjusted to the recurrence
 			// check for changed data
-			foreach (array('start','end','uid','title','location','description',
-				'priority','public','special','non_blocking') as $key)
+			foreach (array('start', 'end', 'uid', 'title', 'location', 'description',
+				'priority', 'public', 'special', 'non_blocking') as $key)
 			{
 				if (!empty($event[$key]) && $recurrence_event[$key] != $event[$key])
 				{
@@ -2693,10 +2691,10 @@ 
      * @param &$event	the event we are working on
      *
      */
-    function server2usertime (&$event)
+    function server2usertime(&$event)
     {
 		// we run all dates through date2usertime, to adjust to user-time
-		foreach(array('start','end','recur_enddate','recurrence') as $ts)
+		foreach (array('start', 'end', 'recur_enddate', 'recurrence') as $ts)
 		{
 			// we convert here from server-time to timestamps in user-time!
 			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2usertime($event[$ts]) : 0;
@@ -2704,7 +2702,7 @@ 
 		// same with the recur exceptions
 		if (isset($event['recur_exception']) && is_array($event['recur_exception']))
 		{
-			foreach($event['recur_exception'] as $n => $date)
+			foreach ($event['recur_exception'] as $n => $date)
 			{
 				$event['recur_exception'][$n] = $this->date2usertime($date);
 			}
@@ -2712,7 +2710,7 @@ 
 		// same with the alarms
 		if (isset($event['alarm']) && is_array($event['alarm']))
 		{
-			foreach($event['alarm'] as $id => $alarm)
+			foreach ($event['alarm'] as $id => $alarm)
 			{
 				$event['alarm'][$id]['time'] = $this->date2usertime($alarm['time']);
 			}
@@ -2729,7 +2727,7 @@ 
 	{
 		if (is_numeric($age) && $age > 0)	// just make sure bogus values dont delete everything
 		{
-			$this->so->purge(time() - 365*24*3600*(float)$age);
+			$this->so->purge(time() - 365 * 24 * 3600 * (float)$age);
 		}
 	}
 }

calendar/inc/class.calendar_ui.inc.php

Spacing +147 added lines, -148 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * @var $debug mixed integer level or string function-name
 	 */
-	var $debug=false;
+	var $debug = false;
 	/**
 	 * instance of the bocal or bocalupdate class
 	 *
@@ -127,7 +127,7 @@ 
 	/**
 	 * @var array $states_to_save all states that will be saved to the user prefs
 	 */
-	var $states_to_save = array('owner','filter','cat_id','view','sortby','planner_days');
+	var $states_to_save = array('owner', 'filter', 'cat_id', 'view', 'sortby', 'planner_days');
 
 	/**
 	 * Constructor
@@ -135,7 +135,7 @@ 
 	 * @param boolean $use_boupdate use bocalupdate as parenent instead of bocal
 	 * @param array $set_states to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function __construct($use_boupdate=false,$set_states=NULL)
+	function __construct($use_boupdate = false, $set_states = NULL)
 	{
 		if ($use_boupdate)
 		{
@@ -149,27 +149,27 @@ 
 		$this->datetime = $GLOBALS['egw']->datetime;
 		$this->accountsel = $GLOBALS['egw']->uiaccountsel;
 
-		$this->categories = new categories($this->user,'calendar');
+		$this->categories = new categories($this->user, 'calendar');
 
-		$this->common_prefs	= &$GLOBALS['egw_info']['user']['preferences']['common'];
+		$this->common_prefs = &$GLOBALS['egw_info']['user']['preferences']['common'];
 		$this->cal_prefs	= &$GLOBALS['egw_info']['user']['preferences']['calendar'];
 		$this->bo->check_set_default_prefs();
 
-		$this->wd_start		= 60*$this->cal_prefs['workdaystarts'];
-		$this->wd_end		= 60*$this->cal_prefs['workdayends'];
-		$this->interval_m	= $this->cal_prefs['interval'];
+		$this->wd_start		= 60 * $this->cal_prefs['workdaystarts'];
+		$this->wd_end = 60 * $this->cal_prefs['workdayends'];
+		$this->interval_m = $this->cal_prefs['interval'];
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->manage_states($set_states);
 
-		$GLOBALS['uical'] = &$this;	// make us available for ExecMethod, else it creates a new instance
+		$GLOBALS['uical'] = &$this; // make us available for ExecMethod, else it creates a new instance
 
 		// calendar does not work with hidden sidebox atm.
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 
 		// make sure the hook for export_limit is registered
-		if (!$GLOBALS['egw']->hooks->hook_exists('export_limit','calendar')) $GLOBALS['egw']->hooks->register_single_app_hook('calendar','export_limit');
+		if (!$GLOBALS['egw']->hooks->hook_exists('export_limit', 'calendar')) $GLOBALS['egw']->hooks->register_single_app_hook('calendar', 'export_limit');
 	}
 
 	/**
@@ -182,28 +182,28 @@ 
 	function check_owners_access()
 	{
 		$no_access = $no_access_group = array();
-		foreach(explode(',',$this->owner) as $owner)
+		foreach (explode(',', $this->owner) as $owner)
 		{
 			$owner = trim($owner);
 			if (is_numeric($owner) && $GLOBALS['egw']->accounts->get_type($owner) == 'g')
 			{
-				foreach($GLOBALS['egw']->accounts->member($owner) as $member)
+				foreach ($GLOBALS['egw']->accounts->member($owner) as $member)
 				{
 					$member = $member['account_id'];
-					if (!$this->bo->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY,0,$member))
+					if (!$this->bo->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY, 0, $member))
 					{
 						$no_access_group[$member] = $this->bo->participant_name($member);
 					}
 				}
 			}
-			elseif (!$this->bo->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY,0,$owner))
+			elseif (!$this->bo->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY, 0, $owner))
 			{
 				$no_access[$owner] = $this->bo->participant_name($owner);
 			}
 		}
 		if (count($no_access))
 		{
-			$msg = '<p class="message" align="center">'.htmlspecialchars(lang('Access denied to the calendar of %1 !!!',implode(', ',$no_access)))."</p>\n";
+			$msg = '<p class="message" align="center">'.htmlspecialchars(lang('Access denied to the calendar of %1 !!!', implode(', ', $no_access)))."</p>\n";
 
 			if ($GLOBALS['egw_info']['flags']['currentapp'] == 'home')
 			{
@@ -219,7 +219,7 @@ 
 		}
 		if (count($no_access_group))
 		{
-			$this->bo->warnings['groupmembers'] = lang('Groupmember(s) %1 not included, because you have no access.',implode(', ',$no_access_group));
+			$this->bo->warnings['groupmembers'] = lang('Groupmember(s) %1 not included, because you have no access.', implode(', ', $no_access_group));
 		}
 		return false;
 	}
@@ -243,7 +243,7 @@ 
 
 		common::egw_header();
 
-		if ($this->bo->warnings) echo '<pre class="message" align="center">'.html::htmlspecialchars(implode("\n",$this->bo->warnings))."</pre>\n";
+		if ($this->bo->warnings) echo '<pre class="message" align="center">'.html::htmlspecialchars(implode("\n", $this->bo->warnings))."</pre>\n";
 	}
 
 	/**
@@ -260,12 +260,12 @@ 
 	 *	- view: the actual view, where dialogs should return to or which they refresh
 	 * @param array $set_states array to manualy set / change one of the states, default NULL = use $_REQUEST
 	 */
-	function manage_states($set_states=NULL)
+	function manage_states($set_states = NULL)
 	{
-		$states = $states_session = $GLOBALS['egw']->session->appsession('session_data','calendar');
+		$states = $states_session = $GLOBALS['egw']->session->appsession('session_data', 'calendar');
 
 		// retrieve saved states from prefs
-		if(!$states)
+		if (!$states)
 		{
 			$states = unserialize($this->bo->cal_prefs['saved_states']);
 		}
@@ -283,12 +283,12 @@ 
 				}
 				else
 				{
-					parse_str(substr($json_data['request']['parameters'][0], 10), $set_states);	// cut off "/index.php?"
+					parse_str(substr($json_data['request']['parameters'][0], 10), $set_states); // cut off "/index.php?"
 				}
 			}
 			else
 			{
-				$set_states = substr($_GET['menuaction'],0,9) == 'calendar.' ? $_REQUEST : array();
+				$set_states = substr($_GET['menuaction'], 0, 9) == 'calendar.' ? $_REQUEST : array();
 			}
 		}
 		if (!$states['date'] && $states['year'] && $states['month'] && $states['day'])
@@ -296,16 +296,16 @@ 
 			$states['date'] = $this->bo->date2string($states);
 		}
 
-		foreach(array(
+		foreach (array(
 			'date'       => $this->bo->date2string($this->bo->now_su),
 			'cat_id'     => 0,
 			'filter'     => 'default',
 			'owner'      => $this->user,
 			'save_owner' => 0,
 			'sortby'     => 'category',
-			'planner_days'=> 0,	// full month
-			'view'       => ($this->bo->cal_prefs['defaultcalendar']?$this->bo->cal_prefs['defaultcalendar']:'day'), // use pref, if exists else use the dayview
-			'listview_days'=> '',	// no range
+			'planner_days'=> 0, // full month
+			'view'       => ($this->bo->cal_prefs['defaultcalendar'] ? $this->bo->cal_prefs['defaultcalendar'] : 'day'), // use pref, if exists else use the dayview
+			'listview_days'=> '', // no range
 			'test'       => 'false',
 		) as $state => $default)
 		{
@@ -314,38 +314,38 @@ 
 				if ($state == 'owner')
 				{
 					// only change the owners of the same resource-type as given in set_state[owner]
-					$set_owners = explode(',',$set_states['owner']);
+					$set_owners = explode(',', $set_states['owner']);
 					if ((string)$set_owners[0] === '0')	// set exactly the specified owners (without the 0)
 					{
 						if ($set_states['owner'] === '0,r0')	// small fix for resources
 						{
-							$set_states['owner'] = $default;	// --> set default, instead of none
+							$set_states['owner'] = $default; // --> set default, instead of none
 						}
 						else
 						{
-							$set_states['owner'] = substr($set_states['owner'],2);
+							$set_states['owner'] = substr($set_states['owner'], 2);
 						}
 					}
 					else	// change only the owners of the given type
 					{
 						$res_type = is_numeric($set_owners[0]) ? false : $set_owners[0][0];
-						$owners = explode(',',$states['owner'] ? $states['owner'] : $default);
-						foreach($owners as $key => $owner)
+						$owners = explode(',', $states['owner'] ? $states['owner'] : $default);
+						foreach ($owners as $key => $owner)
 						{
 							if (!$res_type && is_numeric($owner) || $res_type && $owner[0] == $res_type)
 							{
 								unset($owners[$key]);
 							}
 						}
-						if (!$res_type || !in_array($res_type.'0',$set_owners))
+						if (!$res_type || !in_array($res_type.'0', $set_owners))
 						{
-							$owners = array_merge($owners,$set_owners);
+							$owners = array_merge($owners, $set_owners);
 						}
-						$set_states['owner'] = implode(',',$owners);
+						$set_states['owner'] = implode(',', $owners);
 					}
 				}
 				// for the uiforms class (eg. edit), dont store the (new) owner, as it might change the view
-				if (substr($_GET['menuaction'],0,25) == 'calendar.calendar_uiforms')
+				if (substr($_GET['menuaction'], 0, 25) == 'calendar.calendar_uiforms')
 				{
 					$this->owner = $set_states[$state];
 					continue;
@@ -359,7 +359,7 @@ 
 			if ($state == 'date')
 			{
 				$date_arr = $this->bo->date2array($states['date']);
-				foreach(array('year','month','day') as $name)
+				foreach (array('year', 'month', 'day') as $name)
 				{
 					$this->$name = $states[$name] = $date_arr[$name];
 				}
@@ -367,13 +367,13 @@ 
 			$this->$state = $states[$state];
 		}
 		// remove a given calendar from the view
-		if (isset($_GET['close']) && ($k = array_search($_GET['close'], $owners=explode(',',$this->owner))) !== false)
+		if (isset($_GET['close']) && ($k = array_search($_GET['close'], $owners = explode(',', $this->owner))) !== false)
 		{
 			unset($owners[$k]);
-			$this->owner = $states['owner'] = implode(',',$owners);
+			$this->owner = $states['owner'] = implode(',', $owners);
 		}
 
-		if (substr($this->view,0,8) == 'planner_')
+		if (substr($this->view, 0, 8) == 'planner_')
 		{
 			$states['sortby'] = $this->sortby = $this->view == 'planner_cat' ? 'category' : 'user';
 			$states['view'] = $this->view = 'planner';
@@ -381,10 +381,10 @@ 
 		// set the actual view as return_to
 		if (isset($_GET['menuaction']))
 		{
-			list(,$class,$func) = explode('.',$_GET['menuaction']);
+			list(,$class, $func) = explode('.', $_GET['menuaction']);
 			if ($func == 'index')
 			{
-				$func = $this->view; $this->view = 'index';	// switch to the default view
+				$func = $this->view; $this->view = 'index'; // switch to the default view
 			}
 		}
 		else	// eg. calendar/index.php
@@ -397,9 +397,9 @@ 
 			// if planner_start_with_group is set in the users prefs: switch owner for planner to planner_start_with_group and back
 			if ($this->cal_prefs['planner_start_with_group'])
 			{
-				if ($this->cal_prefs['planner_start_with_group'] > 0) $this->cal_prefs['planner_start_with_group'] *= -1;	// fix old 1.0 pref
+				if ($this->cal_prefs['planner_start_with_group'] > 0) $this->cal_prefs['planner_start_with_group'] *= -1; // fix old 1.0 pref
 
-				if (!$states_session && !$_GET['menuaction']) $this->view = '';		// first call to calendar
+				if (!$states_session && !$_GET['menuaction']) $this->view = ''; // first call to calendar
 
 				if ($func == 'planner' && $this->view != 'planner' && $this->owner == $this->user)
 				{
@@ -418,24 +418,24 @@ 
 		}
 		$this->view_menuaction = $this->view == 'listview' ? 'calendar.calendar_uilist.listview' : 'calendar.calendar_uiviews.'.$this->view;
 
-		if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1) session was %2, states now %3',True,$set_states,$states_session,$states);
+		if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1) session was %2, states now %3', True, $set_states, $states_session, $states);
 		// save the states in the session only when we are in calendar
-		if ($GLOBALS['egw_info']['flags']['currentapp']=='calendar')
+		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'calendar')
 		{
-			$GLOBALS['egw']->session->appsession('session_data','calendar',$states);
+			$GLOBALS['egw']->session->appsession('session_data', 'calendar', $states);
 			// save defined states into the user-prefs
-			if(!empty($states) && is_array($states))
+			if (!empty($states) && is_array($states))
 			{
-				$saved_states = serialize(array_intersect_key($states,array_flip($this->states_to_save)));
+				$saved_states = serialize(array_intersect_key($states, array_flip($this->states_to_save)));
 				if ($saved_states != $this->cal_prefs['saved_states'])
 				{
-					$GLOBALS['egw']->preferences->add('calendar','saved_states',$saved_states);
-					$GLOBALS['egw']->preferences->save_repository(false,'user',true);
+					$GLOBALS['egw']->preferences->add('calendar', 'saved_states', $saved_states);
+					$GLOBALS['egw']->preferences->save_repository(false, 'user', true);
 				}
 
 				// store state in request for clientside favorites to use
 				// remove date and other states never stored in a favorite
-				$states = array_diff_key($states,array('date'=>false,'year'=>false,'month'=>false,'day'=>false,'save_owner'=>false));
+				$states = array_diff_key($states, array('date'=>false, 'year'=>false, 'month'=>false, 'day'=>false, 'save_owner'=>false));
 				if (strpos($_GET['menuaction'], 'ajax_sidebox') !== false)
 				{
 					// sidebox request is from top frame, which has app.calendar NOT loaded by time response arrives
@@ -462,35 +462,35 @@ 
 	*/
 	function event_icons($event)
 	{
-		$is_private = !$event['public'] && !$this->bo->check_perms(EGW_ACL_READ,$event);
+		$is_private = !$event['public'] && !$this->bo->check_perms(EGW_ACL_READ, $event);
 
 		$icons = array();
 		if (!$is_private)
 		{
-			if($event['priority'] == 3)
+			if ($event['priority'] == 3)
 			{
-				$icons[] = html::image('calendar','high',lang('high priority'));
+				$icons[] = html::image('calendar', 'high', lang('high priority'));
 			}
-			if($event['recur_type'] != MCAL_RECUR_NONE)
+			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$icons[] = html::image('calendar','recur',lang('recurring event'));
+				$icons[] = html::image('calendar', 'recur', lang('recurring event'));
 			}
 			// icons for single user, multiple users or group(s) and resources
-			foreach(array_keys($event['participants']) as  $uid)
+			foreach (array_keys($event['participants']) as  $uid)
 			{
-				if(is_numeric($uid) || !isset($this->bo->resources[$uid[0]]['icon']))
+				if (is_numeric($uid) || !isset($this->bo->resources[$uid[0]]['icon']))
 				{
 					if (isset($icons['single']) || $GLOBALS['egw']->accounts->get_type($uid) == 'g')
 					{
 						unset($icons['single']);
-						$icons['multiple'] = html::image('calendar','users');
+						$icons['multiple'] = html::image('calendar', 'users');
 					}
 					elseif (!isset($icons['multiple']))
 					{
-						$icons['single'] = html::image('calendar','single');
+						$icons['single'] = html::image('calendar', 'single');
 					}
 				}
-				elseif(!isset($icons[$uid[0]]) && isset($this->bo->resources[$uid[0]]) && isset($this->bo->resources[$uid[0]]['icon']))
+				elseif (!isset($icons[$uid[0]]) && isset($this->bo->resources[$uid[0]]) && isset($this->bo->resources[$uid[0]]['icon']))
 				{
 				 	$icons[$uid[0]] = html::image($this->bo->resources[$uid[0]]['app'],
 				 		($this->bo->resources[$uid[0]]['icon'] ? $this->bo->resources[$uid[0]]['icon'] : 'navbar'),
@@ -499,21 +499,21 @@ 
 				}
 			}
 		}
-		if($event['non_blocking'])
+		if ($event['non_blocking'])
 		{
-			$icons[] = html::image('calendar','nonblocking',lang('non blocking'));
+			$icons[] = html::image('calendar', 'nonblocking', lang('non blocking'));
 		}
-		if($event['public'] == 0)
+		if ($event['public'] == 0)
 		{
-			$icons[] = html::image('calendar','private',lang('private'));
+			$icons[] = html::image('calendar', 'private', lang('private'));
 		}
-		if(isset($event['alarm']) && count($event['alarm']) >= 1 && !$is_private)
+		if (isset($event['alarm']) && count($event['alarm']) >= 1 && !$is_private)
 		{
-			$icons[] = html::image('calendar','alarm',lang('alarm'));
+			$icons[] = html::image('calendar', 'alarm', lang('alarm'));
 		}
-		if($event['participants'][$this->user][0] == 'U')
+		if ($event['participants'][$this->user][0] == 'U')
 		{
-			$icons[] = html::image('calendar','needs-action',lang('Needs action'));
+			$icons[] = html::image('calendar', 'needs-action', lang('Needs action'));
 		}
 		return $icons;
 	}
@@ -522,10 +522,10 @@ 
 	* Create a select-box item in the sidebox-menu
 	* @privat used only by sidebox_menu !
 	*/
-	function _select_box($title,$name,$options,$width='99%')
+	function _select_box($title, $name, $options, $width = '99%')
 	{
 		$select = " <select style=\"width: $width;\" name=\"".$name.'" id="calendar_'.$name.'" title="'.
-			lang('Select a %1',lang($title)).'">'.
+			lang('Select a %1', lang($title)).'">'.
 			$options."</select>\n";
 
 		return array(
@@ -546,17 +546,17 @@ 
 	 * @param array $vars
 	 * @return string the link incl. content
 	 */
-	function add_link($content,$date=null,$hour=null,$minute=0,array $vars=null)
+	function add_link($content, $date = null, $hour = null, $minute = 0, array $vars = null)
 	{
 		$vars['menuaction'] = 'calendar.calendar_uiforms.edit';
-		$vars['date'] =  $date ? $date : $this->date;
+		$vars['date'] = $date ? $date : $this->date;
 
 		if (!is_null($hour))
 		{
 			$vars['hour'] = $hour;
 			$vars['minute'] = $minute;
 		}
-		return html::a_href($content,'',$vars,' data-date="' .$vars['date'].'|'.$vars['hour'].'|'.$vars['minute']
+		return html::a_href($content, '', $vars, ' data-date="'.$vars['date'].'|'.$vars['hour'].'|'.$vars['minute']
 				. '" title="'.html::htmlspecialchars(lang('Add')).'"');
 	}
 
@@ -569,7 +569,7 @@ 
 	 * @param int $height height of the window
 	 * @return string javascript (using single quotes)
 	 */
-	function popup($link,$target='_blank',$width=750,$height=410)
+	function popup($link, $target = '_blank', $width = 750, $height = 410)
  	{
 		return 'egw_openWindowCentered2('.($link == 'this.href' ? $link : "'".$link."'").','.
 			($target == 'this.target' ? $target : "'".$target."'").",$width,$height,'yes')";
@@ -584,11 +584,11 @@ 
 		// Magic etemplate2 favorites menu (from nextmatch widget)
 		display_sidebox('calendar', lang('Favorites'), egw_framework::favorite_list('calendar'));
 
-		$file = array('menuOpened' => true);	// menu open by default
-		$n = 0;	// index for file-array
+		$file = array('menuOpened' => true); // menu open by default
+		$n = 0; // index for file-array
 
 		$planner_days_for_view = false;
-		switch($this->view)
+		switch ($this->view)
 		{
 			case 'month': $planner_days_for_view = 0; break;
 			case 'week':  $planner_days_for_view = $this->cal_prefs['days_in_weekview'] == 5 ? 5 : 7; break;
@@ -596,31 +596,31 @@ 
 		}
 		// Toolbar with the views
 		$views = '<table style="width: 100%;"><tr>'."\n";
-		foreach(array(
-			'add' => array('icon'=>'new','text'=>'add'),
-			'day' => array('icon'=>'today','text'=>'Today','menuaction' => 'calendar.calendar_uiviews.day','date' => $this->bo->date2string($this->bo->now_su)),
-			'week' => array('icon'=>'week','text'=>'Weekview','menuaction' => 'calendar.calendar_uiviews.week'),
-			'weekN' => array('icon'=>'multiweek','text'=>'Multiple week view','menuaction' => 'calendar.calendar_uiviews.weekN'),
-			'month' => array('icon'=>'month','text'=>'Monthview','menuaction' => 'calendar.calendar_uiviews.month'),
+		foreach (array(
+			'add' => array('icon'=>'new', 'text'=>'add'),
+			'day' => array('icon'=>'today', 'text'=>'Today', 'menuaction' => 'calendar.calendar_uiviews.day', 'date' => $this->bo->date2string($this->bo->now_su)),
+			'week' => array('icon'=>'week', 'text'=>'Weekview', 'menuaction' => 'calendar.calendar_uiviews.week'),
+			'weekN' => array('icon'=>'multiweek', 'text'=>'Multiple week view', 'menuaction' => 'calendar.calendar_uiviews.weekN'),
+			'month' => array('icon'=>'month', 'text'=>'Monthview', 'menuaction' => 'calendar.calendar_uiviews.month'),
 			//'year' => array('icon'=>'year','text'=>'yearview','menuaction' => 'calendar.calendar_uiviews.year'),
-			'planner' => array('icon'=>'planner','text'=>'Group planner','menuaction' => 'calendar.calendar_uiviews.planner','sortby' => $this->sortby),
-			'list' => array('icon'=>'list','text'=>'Listview','menuaction'=>'calendar.calendar_uilist.listview','ajax'=>'true'),
+			'planner' => array('icon'=>'planner', 'text'=>'Group planner', 'menuaction' => 'calendar.calendar_uiviews.planner', 'sortby' => $this->sortby),
+			'list' => array('icon'=>'list', 'text'=>'Listview', 'menuaction'=>'calendar.calendar_uilist.listview', 'ajax'=>'true'),
 		) as $view => $data)
 		{
 			$icon_name = array_shift($data);
 			$title = array_shift($data);
-			$vars = array_merge($link_vars,$data);
+			$vars = array_merge($link_vars, $data);
 
-			$icon = html::image('calendar',$icon_name,lang($title),"class=sideboxstar");  //to avoid jscadender from not displaying with pngfix
+			$icon = html::image('calendar', $icon_name, lang($title), "class=sideboxstar"); //to avoid jscadender from not displaying with pngfix
 			if ($view == 'add')
 			{
-				$link = html::a_href($icon,'javascript:'.$this->popup(egw::link('/index.php',array(
+				$link = html::a_href($icon, 'javascript:'.$this->popup(egw::link('/index.php', array(
 					'menuaction' => 'calendar.calendar_uiforms.edit',
-				),false)));
+				), false)));
 			}
 			else
 			{
-				$link = html::a_href($icon,'/index.php',$vars);
+				$link = html::a_href($icon, '/index.php', $vars);
 			}
 			$views .= '<td align="center">'.$link."</td>\n";
 		}
@@ -633,11 +633,11 @@ 
 			$views .= "<style type='text/css'>\n\t.aclInviteColumn { display: none; }\n</style>\n";
 		}
 
-		$file[++$n] = array('text' => $views,'no_lang' => True,'link' => False,'icon' => False);
+		$file[++$n] = array('text' => $views, 'no_lang' => True, 'link' => False, 'icon' => False);
 
 		// special views and view-options menu
 		$options = '';
-		foreach(array(
+		foreach (array(
 			array(
 				'text' => lang('dayview'),
 				'value' => 'menuaction=calendar.calendar_uiviews.day',
@@ -699,7 +699,7 @@ 
 		{
 			$options .= '<option value="'.$data['value'].'"'.($data['selected'] ? ' selected="1"' : '').'>'.html::htmlspecialchars($data['text'])."</option>\n";
 		}
-		$file[++$n] = $this->_select_box('displayed view','view',$options);
+		$file[++$n] = $this->_select_box('displayed view', 'view', $options);
 
 		// Search
 		$file[++$n] = array(
@@ -711,15 +711,15 @@ 
 		);
 		// Minicalendar
 		$link = array();
-		foreach(array(
+		foreach (array(
 			'day'   => 'calendar.calendar_uiviews.day',
 			'week'  => 'calendar.calendar_uiviews.week',
 			'month' => 'calendar.calendar_uiviews.month') as $view => $menuaction)
 		{
 			if ($this->view == 'planner' || $this->view == 'listview')
 			{
-				$link_vars['menuaction'] = $this->view_menuaction;	// must be first one
-				switch($view)
+				$link_vars['menuaction'] = $this->view_menuaction; // must be first one
+				switch ($view)
 				{
 					case 'day':   $link_vars[$this->view.'_days'] = $this->view == 'planner' ? 1 : ''; break;
 					case 'week':  $link_vars[$this->view.'_days'] = $this->cal_prefs['days_in_weekview'] == 5 ? 5 : 7; break;
@@ -727,44 +727,43 @@ 
 				}
 				if ($this->view == 'listview') $link_vars['ajax'] = 'true';
 			}
-			elseif(substr($this->view,0,4) == 'week' && $view == 'week')
+			elseif (substr($this->view, 0, 4) == 'week' && $view == 'week')
 			{
-				$link_vars['menuaction'] = $this->view_menuaction;	// stay in the N-week-view
+				$link_vars['menuaction'] = $this->view_menuaction; // stay in the N-week-view
 			}
 			elseif ($view == 'day' && $this->view == 'day4')
 			{
-				$link_vars['menuaction'] = $this->view_menuaction;	// stay in the day-view
+				$link_vars['menuaction'] = $this->view_menuaction; // stay in the day-view
 			}
 			else
 			{
 				$link_vars['menuaction'] = $menuaction;
 			}
-			unset($link_vars['date']);	// gets set in jscal
-			$link[$view] = $l = egw::link('/index.php',$link_vars,false);
+			unset($link_vars['date']); // gets set in jscal
+			$link[$view] = $l = egw::link('/index.php', $link_vars, false);
 		}
 
 		if (($flatdate = $this->date))	// string if format YYYYmmdd or timestamp
 		{
-			$flatdate = is_int($flatdate) ? adodb_date('m/d/Y',$flatdate) :
-			substr($flatdate,4,2).'/'.substr($flatdate,6,2).'/'.substr($flatdate,0,4);
+			$flatdate = is_int($flatdate) ? adodb_date('m/d/Y', $flatdate) : substr($flatdate, 4, 2).'/'.substr($flatdate, 6, 2).'/'.substr($flatdate, 0, 4);
 		}
 		$jscalendar = '<div id="calendar-container"></div>';
 
-		$file[++$n] = array('text' => $jscalendar,'no_lang' => True,'link' => False,'icon' => False);
+		$file[++$n] = array('text' => $jscalendar, 'no_lang' => True, 'link' => False, 'icon' => False);
 
 		// Category Selection
-		$cat_id = explode(',',$this->cat_id);
+		$cat_id = explode(',', $this->cat_id);
 
-		$current_view_url = egw::link('/index.php',array(
+		$current_view_url = egw::link('/index.php', array(
 			'menuaction' => $this->view_menuaction,
 			'date' => $this->date,
-		)+($this->view == 'listview' ? array('ajax' => 'true') : array()),false);
+		) + ($this->view == 'listview' ? array('ajax' => 'true') : array()), false);
 
 		$select = ' <select style="width: 86%;" id="calendar_cat_id" name="cat_id" title="'.
-			lang('Select a %1',lang('Category')). '"'.($cat_id && count($cat_id) > 1 ? ' multiple=true size=4':''). '>'.
+			lang('Select a %1', lang('Category')).'"'.($cat_id && count($cat_id) > 1 ? ' multiple=true size=4' : '').'>'.
 			'<option value="0">'.lang('All categories').'</option>'.
-				$this->categories->formatted_list('select','all',$cat_id,'True').
-			"</select>\n" . html::image('phpgwapi','category','','id="calendar_cat_id_multiple"')."
+				$this->categories->formatted_list('select', 'all', $cat_id, 'True').
+			"</select>\n".html::image('phpgwapi', 'category', '', 'id="calendar_cat_id_multiple"')."
 			<script type=\"text/javascript\" src=\"{$GLOBALS['egw_info']['server']['webserver_url']}/calendar/js/navigation.js\" id=\"calendar-navigation-script\"".
 			" data-link-day-url =\"".htmlspecialchars($link['day']).
 			"\" data-link-week-url=\"".htmlspecialchars($link['week']).
@@ -773,7 +772,7 @@ 
 			"\" data-current-date=\"".htmlspecialchars(egw_time::to('now', 'Ymd')).
 			"\" data-current-view-url=\"".htmlspecialchars($current_view_url)."\"/></script>\n";
 
-		$file[++$n] =  array(
+		$file[++$n] = array(
 			'text' => $select,
 			'no_lang' => True,
 			'link' => False,
@@ -781,27 +780,27 @@ 
 		);
 
 		// Calendarselection: User or Group
-		if(count($this->bo->grants) > 0 && $this->accountsel->account_selection != 'none')
+		if (count($this->bo->grants) > 0 && $this->accountsel->account_selection != 'none')
 		{
 			$grants = array();
-			foreach($this->bo->list_cals() as $grant)
+			foreach ($this->bo->list_cals() as $grant)
 			{
 				$grants[] = $grant['grantor'];
 			}
 			// we no longer exclude non-accounts from the account-selection: it shows all types of participants
-			$accounts = explode(',',$this->owner);
+			$accounts = explode(',', $this->owner);
 
 			// Remove '0' - it means current user but will show as #0 with some account selection options
-			$zero_index = array_search('0',$accounts);
-			if($zero_index !== FALSE)
+			$zero_index = array_search('0', $accounts);
+			if ($zero_index !== FALSE)
 			{
 				$accounts[$zero_index] = $this->user;
 			}
 			$file[] = array(
 				'text' =>
-				$this->accountsel->selection('owner','uical_select_owner',$accounts,'calendar+',count($accounts) > 1 ? 4 : 1,False,
-					' style="width: '.(count($accounts) > 1 && in_array($this->common_prefs['account_selection'],array('selectbox','groupmembers')) ? '86%' : '86%').';"'.
-					' title="'.lang('select a %1',lang('user')).'"','',$grants,false,array($this->bo,'participant_name')),
+				$this->accountsel->selection('owner', 'uical_select_owner', $accounts, 'calendar+', count($accounts) > 1 ? 4 : 1, False,
+					' style="width: '.(count($accounts) > 1 && in_array($this->common_prefs['account_selection'], array('selectbox', 'groupmembers')) ? '86%' : '86%').';"'.
+					' title="'.lang('select a %1', lang('user')).'"', '', $grants, false, array($this->bo, 'participant_name')),
 				'no_lang' => True,
 				'link' => False,
 				'icon' => false,
@@ -810,30 +809,30 @@ 
 
 		// Filter all or hideprivate
 		$filter_options = '';
-		foreach(array(
+		foreach (array(
 			'default'     => array(lang('Not rejected'), lang('Show all status, but rejected')),
 			'accepted'    => array(lang('Accepted'), lang('Show only accepted events')),
 			'unknown'     => array(lang('Invitations'), lang('Show only invitations, not yet accepted or rejected')),
 			'tentative'   => array(lang('Tentative'), lang('Show only tentative accepted events')),
 			'delegated'   => array(lang('Delegated'), lang('Show only delegated events')),
-			'rejected'    => array(lang('Rejected'),lang('Show only rejected events')),
-			'owner'       => array(lang('Owner too'),lang('Show also events just owned by selected user')),
-			'all'         => array(lang('All incl. rejected'),lang('Show all status incl. rejected events')),
-			'hideprivate' => array(lang('Hide private infos'),lang('Show all events, as if they were private')),
-			'showonlypublic' =>  array(lang('Hide private events'),lang('Show only events flagged as public, (not checked as private)')),
-			'no-enum-groups' => array(lang('only group-events'),lang('Do not include events of group members')),
-			'not-unknown' => array(lang('No meeting requests'),lang('Show all status, but unknown')),
+			'rejected'    => array(lang('Rejected'), lang('Show only rejected events')),
+			'owner'       => array(lang('Owner too'), lang('Show also events just owned by selected user')),
+			'all'         => array(lang('All incl. rejected'), lang('Show all status incl. rejected events')),
+			'hideprivate' => array(lang('Hide private infos'), lang('Show all events, as if they were private')),
+			'showonlypublic' =>  array(lang('Hide private events'), lang('Show only events flagged as public, (not checked as private)')),
+			'no-enum-groups' => array(lang('only group-events'), lang('Do not include events of group members')),
+			'not-unknown' => array(lang('No meeting requests'), lang('Show all status, but unknown')),
 		) as $value => $label)
 		{
-			list($label,$title) = $label;
+			list($label, $title) = $label;
 			$filter_options .= '<option value="'.$value.'"'.($this->filter == $value ? ' selected="selected"' : '').' title="'.$title.'">'.$label.'</options>'."\n";
 		}
 		// add deleted filter, if history logging is activated
-		if($GLOBALS['egw_info']['server']['calendar_delete_history'])
+		if ($GLOBALS['egw_info']['server']['calendar_delete_history'])
 		{
 			$filter_options .= '<option value="deleted"'.($this->filter == 'deleted' ? ' selected="selected"' : '').' title="'.lang('Show events that have been deleted').'">'.lang('Deleted').'</options>'."\n";
 		}
-		$file[] = $this->_select_box('Filter','filter',$filter_options,'86%');
+		$file[] = $this->_select_box('Filter', 'filter', $filter_options, '86%');
 		// enable this to get checkbox setting $this->test eg. usable to trigger different code in calendar_so
 		//$file[count($file)-1]['text'] .= html::checkbox('test', $this->test==='true', 'true', 'id="calendar_test"');
 
@@ -842,15 +841,15 @@ 
 		{
 			$options = '';
 
-			$documents = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'], '', null,'calendar');
-			foreach($documents as $key => $value)
+			$documents = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'], '', null, 'calendar');
+			foreach ($documents as $key => $value)
 			{
 				$options .= '<option value="'.html::htmlspecialchars($key).'">'.html::htmlspecialchars($value)."</option>\n";
 			}
-			if($options != '') {
-				$options = '<option value="">'.lang('Insert in document')."</option>\n" . $options;
+			if ($options != '') {
+				$options = '<option value="">'.lang('Insert in document')."</option>\n".$options;
 				$select = ' <select style="width: 86%;" name="merge" id="calendar_merge" title="'.
-					html::htmlspecialchars(lang('Select a %1',lang('merge document...'))).'">'.
+					html::htmlspecialchars(lang('Select a %1', lang('merge document...'))).'">'.
 					$options."</select>\n";
 
 				$file[] = array(
@@ -860,43 +859,43 @@ 
 					'icon' => false,
 				);
 			}
-			$file['Placeholders'] = egw::link('/index.php','menuaction=calendar.calendar_merge.show_replacements');
+			$file['Placeholders'] = egw::link('/index.php', 'menuaction=calendar.calendar_merge.show_replacements');
 		}
 
 		$appname = 'calendar';
 		$menu_title = lang('Calendar Menu');
-		display_sidebox($appname,$menu_title,$file);
+		display_sidebox($appname, $menu_title, $file);
 
 		// resources menu hooks
  		foreach ($this->bo->resources as $resource)
 		{
-			if(!is_array($resource['cal_sidebox'])) continue;
+			if (!is_array($resource['cal_sidebox'])) continue;
 			$menu_title = $resource['cal_sidebox']['menu_title'] ? $resource['cal_sidebox']['menu_title'] : lang($resource['app']);
-			$file = ExecMethod($resource['cal_sidebox']['file'],array(
+			$file = ExecMethod($resource['cal_sidebox']['file'], array(
 				'menuaction' => $this->view_menuaction,
 				'owner' => $this->owner,
 			));
-			display_sidebox($appname,$menu_title,$file);
+			display_sidebox($appname, $menu_title, $file);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$file = Array(
-				'Configuration'=>egw::link('/index.php','menuaction=admin.uiconfig.index&appname=calendar'),
-				'Custom Fields'=>egw::link('/index.php','menuaction=admin.customfields.index&appname=calendar'),
-				'Holiday Management'=>egw::link('/index.php','menuaction=calendar.uiholiday.admin'),
-				'Global Categories' =>egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar'),
+				'Configuration'=>egw::link('/index.php', 'menuaction=admin.uiconfig.index&appname=calendar'),
+				'Custom Fields'=>egw::link('/index.php', 'menuaction=admin.customfields.index&appname=calendar'),
+				'Holiday Management'=>egw::link('/index.php', 'menuaction=calendar.uiholiday.admin'),
+				'Global Categories' =>egw::link('/index.php', 'menuaction=admin.admin_categories.index&appname=calendar'),
 			);
-			$GLOBALS['egw']->framework->sidebox($appname,lang('Admin'),$file,'admin');
+			$GLOBALS['egw']->framework->sidebox($appname, lang('Admin'), $file, 'admin');
 		}
 	}
 
 	public function merge($timespan = array())
 	{
 		// Merge print
-		if($_GET['merge'])
+		if ($_GET['merge'])
 		{
-			if(!$timespan)
+			if (!$timespan)
 			{
 				$timespan = array(array(
 					'start' => is_array($this->first) ? $this->bo->date2ts($this->first) : $this->first,

calendar/inc/class.calendar_export_csv.inc.php

Spacing +56 added lines, -56 removed lines

@@ -27,15 +27,15 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$limit_exception = bo_merge::is_export_limit_excepted();
 		if (!$limit_exception) $export_limit = bo_merge::getExportLimit('calendar');
 		// Custom fields need to be specifically requested
 		$cfs = array();
-		foreach($options['mapping'] + (array)$_definition->filter as $key => $label) {
-			if($key[0] == '#') $cfs[] = substr($key,1);
+		foreach ($options['mapping'] + (array)$_definition->filter as $key => $label) {
+			if ($key[0] == '#') $cfs[] = substr($key, 1);
 		}
 
 		$query = array(
@@ -43,48 +43,48 @@ 
 			'num_rows'	=> -1,
 			'csv_export'	=> true
 		);
-		switch($options['selection'])
+		switch ($options['selection'])
 		{
 			case 'criteria':
 				$query = array(
 					'start' => $options['criteria']['start'],
-					'end'   => strtotime('+1 day',$options['criteria']['end'])-1,
+					'end'   => strtotime('+1 day', $options['criteria']['end']) - 1,
 					'categories'	=> $options['categories'] ? $options['categories'] : $options['criteria']['categories'],
 					//'enum_recuring' => false, // we want the recurring events enumerated for csv export
 					'daywise'       => false,
 					'users'         => $options['criteria']['owner'],
 					'cfs'		=> $cfs // Otherwise we shouldn't get any custom fields
 				);
-				if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+				if (bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
 					$query['offset'] = 0;
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
-				$events =& $this->bo->search($query);
+				$events = & $this->bo->search($query);
 				break;
 			case 'search_results':
-				$states = $GLOBALS['egw']->session->appsession('session_data','calendar');
-				if($states['view'] == 'listview') {
-					$query = $GLOBALS['egw']->session->appsession('calendar_list','calendar');
-					$query['num_rows'] = -1;        // all
-					$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
+				$states = $GLOBALS['egw']->session->appsession('session_data', 'calendar');
+				if ($states['view'] == 'listview') {
+					$query = $GLOBALS['egw']->session->appsession('calendar_list', 'calendar');
+					$query['num_rows'] = -1; // all
+					$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
 					$query['start'] = 0;
 					$query['cfs'] = $cfs;
 
-					if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+					if (bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
 						$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 					}
 					$ui = new calendar_uilist();
 					$ui->get_rows($query, $events, $unused);
 				} else {
-					$query = $GLOBALS['egw']->session->appsession('session_data','calendar');
+					$query = $GLOBALS['egw']->session->appsession('session_data', 'calendar');
 					$query['users'] = explode(',', $query['owner']);
 					$query['num_rows'] = -1;
-					if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
-						$query['num_rows'] = (int)$export_limit;  // ! int of 'no' is 0
+					if (bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+						$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 					}
 
 					$events = array();
-					switch($states['view']) {
+					switch ($states['view']) {
 						case 'month':
 							$query += $this->get_query_month($states);
 							break;
@@ -98,7 +98,7 @@ 
 						default:
 							// Let UI set the date ranges
 							$ui = new calendar_uiviews($query);
-							if(method_exists($ui, $states['view']))
+							if (method_exists($ui, $states['view']))
 							{
 								ob_start();
 								$ui->$states['view']();
@@ -122,35 +122,35 @@ 
 				$filter = $_definition->filter;
 
 				// Handle ranges
-				foreach($filter as $field => $value)
+				foreach ($filter as $field => $value)
 				{
-					if($field == 'filter' && $value)
+					if ($field == 'filter' && $value)
 					{
 						$query['filter'] = $value;
 						continue;
 					}
-					if(!is_array($value) || (!$value['from'] && !$value['to']))
+					if (!is_array($value) || (!$value['from'] && !$value['to']))
 					{
 						$query['query']["cal_$field"] = $value;
 						continue;
 					}
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['sql_filter'][] = "cal_$field >= " . (int)$value['from'];
-					if($value['to']) $query['sql_filter'][] = "cal_$field <= " . (int)$value['to'];
+					if ($value['from']) $query['sql_filter'][] = "cal_$field >= ".(int)$value['from'];
+					if ($value['to']) $query['sql_filter'][] = "cal_$field <= ".(int)$value['to'];
 
 				}
-				if($query['sql_filter'] && is_array($query['sql_filter']))
+				if ($query['sql_filter'] && is_array($query['sql_filter']))
 				{
 					// Set as an extra parameter
-					$sql_filter = implode(' AND ',$query['sql_filter']);
+					$sql_filter = implode(' AND ', $query['sql_filter']);
 				}
 
 			case 'all':
 				$events = $this->bo->search($query + array(
 					'offset' => 0,
 					'order' => 'cal_start',
-				),$sql_filter);
+				), $sql_filter);
 				break;
 		}
 
@@ -167,24 +167,24 @@ 
 			// Get rid of yearly recurring events that don't belong
 			//if($options['selection']['select'] == 'criteria' && ($event['start'] > $query['end'] || $event['end'] < $query['start'])) continue;
 			// Add in participants
-			if($options['mapping']['participants']) {
-				$event['participants'] = implode(", ",$this->bo->participants($event,true));
+			if ($options['mapping']['participants']) {
+				$event['participants'] = implode(", ", $this->bo->participants($event, true));
 			}
 			if (is_array($event))
 			{
 				$record->set_record($event);
-				if($options['mapping']['recurrence']) {
+				if ($options['mapping']['recurrence']) {
 					$record->recurrence = $recurrence[$record->recur_type];
-					if($record->recur_type != MCAL_RECUR_NONE) $record->recurrence .= ' / '. $record->recur_interval;
+					if ($record->recur_type != MCAL_RECUR_NONE) $record->recurrence .= ' / '.$record->recur_interval;
 				}
 
 				// Standard stuff
-				if($options['convert']) {
+				if ($options['convert']) {
 					importexport_export_csv::convert($record, $convert_fields, 'calendar', $this->selects);
 				} else {
 					// Implode arrays, so they don't say 'Array'
-					foreach($record->get_record_array() as $key => $value) {
-						if(is_array($value)) $record->$key = implode(',', $value);
+					foreach ($record->get_record_array() as $key => $value) {
+						if (is_array($value)) $record->$key = implode(',', $value);
 					}
 	 			}
 				$export_object->export_record($record);
@@ -237,8 +237,8 @@ 
 	 *
 	 */
 	public function get_selectors_etpl($definition = null) {
-		$states = $GLOBALS['egw']->session->appsession('session_data','calendar');
-		switch($states['view']) {
+		$states = $GLOBALS['egw']->session->appsession('session_data', 'calendar');
+		switch ($states['view']) {
 			case 'month':
 				$query = $this->get_query_month($states);
 				break;
@@ -250,32 +250,32 @@ 
 				$query = $this->get_query_day($states);
 				break;
 		}
-		$start= new egw_time($query['start']);
+		$start = new egw_time($query['start']);
 		$end = new egw_time($query['end']);
 		if ($states['view'] == 'listview')
 		{
-			$list = $GLOBALS['egw']->session->appsession('calendar_list','calendar');
+			$list = $GLOBALS['egw']->session->appsession('calendar_list', 'calendar');
 
 			// Use UI to get dates
 			$ui = new calendar_uilist();
-			$list['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$ui->get_rows($list,$rows,$readonlys);
+			$list['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$ui->get_rows($list, $rows, $readonlys);
 			$start = $ui->first ? $ui->first : new egw_time($ui->date);
 			$end = $ui->last;
 
 			// Special handling
-			if($list['filter'] == 'all') $start = $end = null;
-			if($list['filter'] == 'before')
+			if ($list['filter'] == 'all') $start = $end = null;
+			if ($list['filter'] == 'before')
 			{
 				$end = $start;
 				$start = null;
 			}
 			$ui = null;
 		}
-		elseif(!$end)
+		elseif (!$end)
 		{
-			$end = '+1 ' . $states['view'];
-			$end = strtotime($end, $start->format('ts'))-1;
+			$end = '+1 '.$states['view'];
+			$end = strtotime($end, $start->format('ts')) - 1;
 		}
 		$prefs = unserialize($GLOBALS['egw_info']['user']['preferences']['importexport'][$definition->definition_id]);
 		$data = array(
@@ -300,8 +300,8 @@ 
 	public static function get_query_month($states)
 	{
 		$timespan = array(
-			'start' => mktime(0,0,0,$states['month'],1,$states['year']),
-			'end' => mktime(0,0,0,$states['month']+1,1,$states['year'])-1
+			'start' => mktime(0, 0, 0, $states['month'], 1, $states['year']),
+			'end' => mktime(0, 0, 0, $states['month'] + 1, 1, $states['year']) - 1
 		);
 		return $timespan;
 	}
@@ -319,24 +319,24 @@ 
 		if ($states['view'] == 'week' && $days == 4)         // next 4 days view
                 {
                         $query['start'] = $this->bo->date2ts($states['date']);
-                        $query['end'] = strtotime("+$days days",$query['start']) - 1;
+                        $query['end'] = strtotime("+$days days", $query['start']) - 1;
                 }
                 else
                 {
-			$query['start'] = $ui->datetime->get_weekday_start($states['year'],$states['month'],$states['day']);
+			$query['start'] = $ui->datetime->get_weekday_start($states['year'], $states['month'], $states['day']);
 			if ($days == 5)         // no weekend-days
 			{
-				switch($ui->cal_prefs['weekdaystarts'])
+				switch ($ui->cal_prefs['weekdaystarts'])
 				{
 					case 'Saturday':
-						$query['start'] = strtotime("+2 days",$query['start']);
+						$query['start'] = strtotime("+2 days", $query['start']);
 						break;
 					case 'Sunday':
-						$query['start'] = strtotime("+1 day",$query['start']);
+						$query['start'] = strtotime("+1 day", $query['start']);
 						break;
 				}
 			}
-			$query['end'] = strtotime($states['view'] == 'week' ? "+$days days" : "+{$ui->cal_prefs['multiple_weeks']} weeks",$query['start']) - 1;
+			$query['end'] = strtotime($states['view'] == 'week' ? "+$days days" : "+{$ui->cal_prefs['multiple_weeks']} weeks", $query['start']) - 1;
 		}
 		return $query;
 	}
@@ -346,7 +346,7 @@ 
 		$query = array();
 		$bo = new calendar_bo();
 		$query['start'] = $bo->date2ts((string)$states['date']);
-		$query['end'] = $query['start']+DAY_s-1;
+		$query['end'] = $query['start'] + DAY_s - 1;
 		return $query;
 	}
 
@@ -395,17 +395,17 @@ 
 		);
 		$filters = array_reverse($filters, true);
 
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
 			// Can't filter on a custom field
-			if(strpos($field_name, '#') === 0)
+			if (strpos($field_name, '#') === 0)
 			{
 				unset($filters[$field_name]);
 				continue;
 			}
 
 			// Pass on select options
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 
 	}

calendar/inc/class.soholiday.inc.php

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

calendar/inc/class.calendar_hooks.inc.php

Spacing +36 added lines, -36 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	static function search_link($location)
 	{
-		unset($location);	// not used, but in function signature for hooks
+		unset($location); // not used, but in function signature for hooks
 		return array(
 			'query' => 'calendar.calendar_bo.link_query',
 			'title' => 'calendar.calendar_bo.link_title',
@@ -41,7 +41,7 @@ 
 			'add_id'     => 'link_id',
 			'add_popup'  => '750x400',
 			'file_access' => 'calendar.calendar_bo.file_access',
-			'file_access_user' => true,	// file_access supports 4th parameter $user
+			'file_access_user' => true, // file_access supports 4th parameter $user
 			'mime' => array(
 				'text/calendar' => array(
 					'menuaction' => 'calendar.calendar_uiforms.edit',
@@ -65,7 +65,7 @@ 
 	 */
 	static function getAppExportLimit($location)
 	{
-		unset($location);	// not used, but in function signature for hooks
+		unset($location); // not used, but in function signature for hooks
 		return $GLOBALS['egw_info']['server']['calendar_export_limit'];
 	}
 
@@ -75,14 +75,14 @@ 
 	static function admin()
 	{
 		$file = Array(
-			'Site Configuration' => egw::link('/index.php','menuaction=admin.uiconfig.index&appname=calendar'),
-			'Custom fields' => egw::link('/index.php','menuaction=admin.customfields.index&appname=calendar'),
-			'Calendar Holiday Management' => egw::link('/index.php','menuaction=calendar.uiholiday.admin'),
-			'Global Categories' => egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar'),
-			'Category ACL' => egw::link('/index.php','menuaction=calendar.calendar_uiforms.cat_acl'),
-			'Update timezones' => egw::link('/index.php','menuaction=calendar.calendar_timezones.update'),
+			'Site Configuration' => egw::link('/index.php', 'menuaction=admin.uiconfig.index&appname=calendar'),
+			'Custom fields' => egw::link('/index.php', 'menuaction=admin.customfields.index&appname=calendar'),
+			'Calendar Holiday Management' => egw::link('/index.php', 'menuaction=calendar.uiholiday.admin'),
+			'Global Categories' => egw::link('/index.php', 'menuaction=admin.admin_categories.index&appname=calendar'),
+			'Category ACL' => egw::link('/index.php', 'menuaction=calendar.calendar_uiforms.cat_acl'),
+			'Update timezones' => egw::link('/index.php', 'menuaction=calendar.calendar_timezones.update'),
 		);
-		display_section('calendar','calendar',$file);
+		display_section('calendar', 'calendar', $file);
 	}
 
 	/**
@@ -163,14 +163,14 @@ 
 			'Saturday' => lang('Saturday')
 		);
 
-		for ($i=0; $i < 24; ++$i)
+		for ($i = 0; $i < 24; ++$i)
 		{
-			$times[$i] = $GLOBALS['egw']->common->formattime($i,'00');
+			$times[$i] = $GLOBALS['egw']->common->formattime($i, '00');
 		}
 
 		for ($i = 2; $i <= 9; ++$i)
 		{
-			$muliple_weeks[$i] = lang('%1 weeks',$i);
+			$muliple_weeks[$i] = lang('%1 weeks', $i);
 		}
 
 		$intervals = array(
@@ -202,14 +202,14 @@ 
 		if (!$hook_data['setup'])	// does not work at setup time
 		{
 			$options = array('0' => lang('none'));
-			foreach($GLOBALS['egw']->accounts->search(array('type' => 'owngroups','app' => 'calendar')) as $group)
+			foreach ($GLOBALS['egw']->accounts->search(array('type' => 'owngroups', 'app' => 'calendar')) as $group)
 			{
 				$options[$group['account_id']] = common::grab_owner_name($group['account_id']);
 			}
-			$freebusy_url = calendar_bo::freebusy_url($GLOBALS['egw_info']['user']['account_lid'],$GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy_pw']);
+			$freebusy_url = calendar_bo::freebusy_url($GLOBALS['egw_info']['user']['account_lid'], $GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy_pw']);
 			$freebusy_url = '<a href="'.$freebusy_url.'" target="_blank">'.$freebusy_url.'</a>';
 			$freebusy_help = lang('Should not loged in persons be able to see your freebusy information? You can set an extra password, different from your normal password, to protect this informations. The freebusy information is in iCal format and only include the times when you are busy. It does not include the event-name, description or locations. The URL to your freebusy information is');
-			$freebusy_help .= ' ' . $freebusy_url;
+			$freebusy_help .= ' '.$freebusy_url;
 
 			// Timezone for file exports
 			$export_tzs = array('0' => 'Use Event TZ');
@@ -382,7 +382,7 @@ 
 				'default'=> 60,
 			),
 			'default-alarm' => array(
-				'type'   => 'date-duration',//'select',
+				'type'   => 'date-duration', //'select',
 				'label'  => lang('Default alarm for regular events').' ('.lang('empty = no alarm').')',
 				'name'   => 'default-alarm',
 				'help'   => 'Alarm added automatic to new events before event start-time',
@@ -391,7 +391,7 @@ 
 				'default' => '',
 			),
 			'default-alarm-wholeday' => array(
-				'type'   => 'date-duration',//'select',
+				'type'   => 'date-duration', //'select',
 				'label'  => lang('Default alarm for whole-day events').' ('.lang('empty = no alarm').')',
 				'name'   => 'default-alarm-wholeday',
 				'help'   => lang('Alarm added automatic to new events before event start-time').' ('.lang('Midnight').')',
@@ -404,7 +404,7 @@ 
 		{
 			$prefs = $GLOBALS['egw_info']['user']['preferences']['calendar'];
 			$data = array(
-				'prefs' => &$prefs,	// use reference to get preference value back
+				'prefs' => &$prefs, // use reference to get preference value back
 				'preprocess' => true,
 				'type' => 'user',
 			);
@@ -577,9 +577,9 @@ 
 				'size'   => 60,
 				'label'  => 'Default document to insert entries',
 				'name'   => 'default_document',
-				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.',lang('calendar')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','calendar_title').' '.
-					lang('The following document-types are supported:'). implode(',',bo_merge::get_file_extensions()),
+				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.', lang('calendar')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'calendar_title').' '.
+					lang('The following document-types are supported:').implode(',', bo_merge::get_file_extensions()),
 				'run_lang' => false,
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -589,9 +589,9 @@ 
 				'size'   => 60,
 				'label'  => 'Directory with documents to insert entries',
 				'name'   => 'document_dir',
-				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.',lang('calendar')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','calendar_title').' '.
-					lang('The following document-types are supported:'). implode(',',bo_merge::get_file_extensions()),
+				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.', lang('calendar')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'calendar_title').' '.
+					lang('The following document-types are supported:').implode(',', bo_merge::get_file_extensions()),
 				'run_lang' => false,
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -616,7 +616,7 @@ 
 				}
 				catch (Exception $e)
 				{
-					unset($e);	// not used
+					unset($e); // not used
 					// permission error
 					continue;
 				}
@@ -704,14 +704,14 @@ 
 		if ($data['type'] != 'user') return;
 
 		$account_lid = $GLOBALS['egw_info']['user']['account_lid'];
-		foreach(array(
+		foreach (array(
 			'default-alarm' => 'default-alarm-vevent-datetime:/'.$account_lid.'/:urn:ietf:params:xml:ns:caldav',
 			'default-alarm-wholeday' => 'default-alarm-vevent-date:/'.$account_lid.'/:urn:ietf:params:xml:ns:caldav',
 		) as $name => $dav)
 		{
-			$pref =& $GLOBALS['egw_info']['user']['preferences']['groupdav'][$dav];
-			if (true) $pref = str_replace("\r", '', $pref);	// remove CR messing up multiline preg_match
-			$val =& $data['prefs'][$name];
+			$pref = & $GLOBALS['egw_info']['user']['preferences']['groupdav'][$dav];
+			if (true) $pref = str_replace("\r", '', $pref); // remove CR messing up multiline preg_match
+			$val = & $data['prefs'][$name];
 
 			//error_log(__METHOD__."() groupdav[$dav]=$pref, calendar[$name]=$val");
 
@@ -732,7 +732,7 @@ 
 							'D' => 1440,
 						);
 						$factor = $factors[strtoupper($matches[2])];
-						$val = $factor*(int)$matches[1];
+						$val = $factor * (int)$matches[1];
 					}
 					else
 					{
@@ -763,7 +763,7 @@ 
 				}
 				else
 				{
-					$pref = preg_replace('/^TRIGGER:.*$/m', $trigger.number_format(abs($val)/60, 0).'H', $pref);
+					$pref = preg_replace('/^TRIGGER:.*$/m', $trigger.number_format(abs($val) / 60, 0).'H', $pref);
 				}
 				$GLOBALS['egw']->preferences->add('groupdav', $dav, $pref, 'user');
 				//error_log(__METHOD__."() storing $name=$val --> $dav='$pref'");
@@ -824,7 +824,7 @@ 
 	 */
 	public static function categories($data)
 	{
-		unset($data);	// not used, but in function signature for hooks
+		unset($data); // not used, but in function signature for hooks
 		return true;
 	}
 	
@@ -835,7 +835,7 @@ 
 	 */
 	public static function mail_import($args)
 	{
-		return array (
+		return array(
 			'menuaction' => 'calendar.calendar_uiforms.mail_import',
 			'popup' => egw_link::get_registry('calendar', 'edit_popup')
 		);
@@ -850,7 +850,7 @@ 
 	// Cancel old purge
 	ExecMethod('phpgwapi.asyncservice.cancel_timer', $id);
 
-	if((float)$config > 0)
+	if ((float)$config > 0)
 	{
 		$result = ExecMethod2('phpgwapi.asyncservice.set_timer',
 			array('month' => '*', 'day' => 1),
@@ -858,7 +858,7 @@ 
 			'calendar.calendar_boupdate.purge',
 			(float)$config
 		);
-		if(!$result)
+		if (!$result)
 		{
 			$GLOBALS['config_error'] = 'Unable to schedule purge';
 		}

calendar/inc/class.uiholiday.inc.php

Spacing +105 added lines, -105 removed lines

@@ -43,26 +43,26 @@ 
 		function uiholiday()
 		{
 			egw_framework::csp_script_src_attrs('unsafe-inline');
-			$this->bo =& CreateObject('calendar.boholiday');
+			$this->bo = & CreateObject('calendar.boholiday');
 			$this->bo->check_admin();
 			$this->base_url = $this->bo->base_url;
 			$this->template_dir = common::get_tpl_dir('calendar');
-			$this->sb =& CreateObject('calendar.sbox');
+			$this->sb = & CreateObject('calendar.sbox');
 
 			// calendar does not work with hidden sidebox atm.
 			unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 
 			$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Holiday Management');
 
-			$GLOBALS['egw']->template->set_var('help_msg',lang('<b>Please note</b>: The calendar use the holidays of your country, which is set to %1. You can change it in your %2.<br />Holidays are %3 automatic installed from %4. You can changed it in %5.',
-				'<b>'.$GLOBALS['egw_info']['user']['preferences']['common']['country'].'</b>',lang('common preferences'),
+			$GLOBALS['egw']->template->set_var('help_msg', lang('<b>Please note</b>: The calendar use the holidays of your country, which is set to %1. You can change it in your %2.<br />Holidays are %3 automatic installed from %4. You can changed it in %5.',
+				'<b>'.$GLOBALS['egw_info']['user']['preferences']['common']['country'].'</b>', lang('common preferences'),
 				$GLOBALS['egw_info']['server']['auto_load_holidays'] ? '' : '<b>'.lang('not').'</b>',
 				'<b>'.$GLOBALS['egw_info']['server']['holidays_url_path'].'</b>',
-				'<a href="'.$GLOBALS['egw']->link('/index.php',array(
+				'<a href="'.$GLOBALS['egw']->link('/index.php', array(
 					'menuaction' => 'admin.uiconfig.index',
 					'appname'    => 'calendar',
 				)).'">'.lang('admin').' >> '.lang('calendar').' >> '.lang('site configuration').'</a>'));
-			$GLOBALS['egw']->template->set_var('total','');
+			$GLOBALS['egw']->template->set_var('total', '');
 		}
 
 		function admin()
@@ -74,16 +74,16 @@ 
 
 			$p = &$GLOBALS['egw']->template;
 			$p->set_file(Array('locales'=>'locales.tpl'));
-			$p->set_block('locales','list','list');
-			$p->set_block('locales','row','row');
-			$p->set_block('locales','row_empty','row_empty');
+			$p->set_block('locales', 'list', 'list');
+			$p->set_block('locales', 'row', 'row');
+			$p->set_block('locales', 'row_empty', 'row_empty');
 
 			$var = Array(
 				'th_bg'		=> $GLOBALS['egw_info']['theme']['th_bg'],
-				'left_next_matchs'	=> $GLOBALS['egw']->nextmatchs->left('/index.php?menuaction=calendar.uiholiday.admin',$this->bo->start,$this->bo->total),
-				'right_next_matchs'	=> $GLOBALS['egw']->nextmatchs->right('/index.php?menuaction=calendar.uiholiday.admin',$this->bo->start,$this->bo->total),
+				'left_next_matchs'	=> $GLOBALS['egw']->nextmatchs->left('/index.php?menuaction=calendar.uiholiday.admin', $this->bo->start, $this->bo->total),
+				'right_next_matchs'	=> $GLOBALS['egw']->nextmatchs->right('/index.php?menuaction=calendar.uiholiday.admin', $this->bo->start, $this->bo->total),
 				'center'			=> '<td align="center">'.lang('Countries').'</td>',
-				'sort_name'		=> $GLOBALS['egw']->nextmatchs->show_sort_order($this->bo->sort,'hol_locale',$this->bo->order,'/calendar/'.basename($SCRIPT_FILENAME),lang('Country')),
+				'sort_name'		=> $GLOBALS['egw']->nextmatchs->show_sort_order($this->bo->sort, 'hol_locale', $this->bo->order, '/calendar/'.basename($SCRIPT_FILENAME), lang('Country')),
 				'header_edit'	=> lang('Edit'),
 				'header_delete'	=> lang('Delete'),
 				'header_extra'	=> lang('Submit to Repository'),
@@ -99,42 +99,42 @@ 
 			@reset($locales);
 			if (!$locales)
 			{
-				$p->set_var('message',lang('no matches found'));
-				$p->parse('rows','row_empty',True);
+				$p->set_var('message', lang('no matches found'));
+				$p->parse('rows', 'row_empty', True);
 			}
 			else
 			{
-				$p->set_var('submit_extra',' width="5%"');
+				$p->set_var('submit_extra', ' width="5%"');
 				while (list(,$value) = each($locales))
 				{
 					$tr_color = $GLOBALS['egw']->nextmatchs->alternate_row_color($tr_color);
-					if (! $value)  $value  = '&nbsp;';
+					if (!$value)  $value = '&nbsp;';
 
 					$var = Array(
 						'tr_color'		=> $tr_color,
 						'group_name'	=> $value,
-						'edit_link'		=> '<a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_locale','locale'=>$value)) . '"> '.lang('Edit').' </a>',
-						'delete_link'	=> '<a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.delete_locale','locale'=>$value)).'"> '.lang('Delete').' </a>',
-						'extra_link'	=> '<a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.submit','locale'=>$value)).'"> '.lang('Submit').' </a>'.
-							' &nbsp; &nbsp; <a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.submit','locale'=>$value,'download'=>1)).'"> '.lang('Download').' </a>'
+						'edit_link'		=> '<a href="'.$GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.edit_locale', 'locale'=>$value)).'"> '.lang('Edit').' </a>',
+						'delete_link'	=> '<a href="'.$GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.delete_locale', 'locale'=>$value)).'"> '.lang('Delete').' </a>',
+						'extra_link'	=> '<a href="'.$GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.submit', 'locale'=>$value)).'"> '.lang('Submit').' </a>'.
+							' &nbsp; &nbsp; <a href="'.$GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.submit', 'locale'=>$value, 'download'=>1)).'"> '.lang('Download').' </a>'
 					);
 					$p->set_var($var);
-					$p->parse('rows','row',True);
+					$p->parse('rows', 'row', True);
 				}
 			}
 
 			$var = Array(
-				'new_action'		=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_holiday','id'=>0)),
+				'new_action'		=> $GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.edit_holiday', 'id'=>0)),
 				'lang_add'			=> lang('add'),
-				'search_action'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.admin')),
+				'search_action'	=> $GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.admin')),
 				'lang_search'		=> lang('search')
 			);
 
 			$p->set_var($var);
-			$p->pparse('out','list');
+			$p->pparse('out', 'list');
 		}
 
-		function edit_locale($locale='')
+		function edit_locale($locale = '')
 		{
 			if ($locale === '')
 			{
@@ -143,33 +143,33 @@ 
 			if ($locale)
 			{
 				$this->bo->locales = array($locale);
-				$this->bo->total = $this->bo->so->holiday_total($locale,$this->bo->query);
+				$this->bo->total = $this->bo->so->holiday_total($locale, $this->bo->query);
 			}
-			if(!$this->bo->total && !isset($this->bo->query))
+			if (!$this->bo->total && !isset($this->bo->query))
 			{
 				$link_params = Array(
 					'menuaction'	=> 'calendar.uiholiday.admin'
 				);
-				$GLOBALS['egw']->redirect_link($this->base_url,$link_params);
+				$GLOBALS['egw']->redirect_link($this->base_url, $link_params);
 			}
 			unset($GLOBALS['egw_info']['flags']['noheader']);
 			unset($GLOBALS['egw_info']['flags']['nonavbar']);
 			$GLOBALS['egw_info']['flags']['noappfooter'] = True;
 			common::egw_header();
-			$p =& $GLOBALS['egw']->template;
+			$p = & $GLOBALS['egw']->template;
 			$p->set_file(Array('locale'=>'locales.tpl'));
-			$p->set_block('locale','list','list');
-			$p->set_block('locale','row','row');
-			$p->set_block('locale','row_empty','row_empty');
-			$p->set_block('locale','back_button_form','back_button_form');
+			$p->set_block('locale', 'list', 'list');
+			$p->set_block('locale', 'row', 'row');
+			$p->set_block('locale', 'row_empty', 'row_empty');
+			$p->set_block('locale', 'back_button_form', 'back_button_form');
 
 			if (!is_object($GLOBALS['egw']->html))
 			{
-				$GLOBALS['egw']->html =& CreateObject('phpgwapi.html');
+				$GLOBALS['egw']->html = & CreateObject('phpgwapi.html');
 			}
 			$html = &$GLOBALS['egw']->html;
-			$year_form = str_replace('<option value=""></option>','',$html->form($html->sbox_submit($this->sb->getYears('year',$this->bo->year),true),array(),
-				$this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_locale','locale'=>$this->bo->locales[0])));
+			$year_form = str_replace('<option value=""></option>', '', $html->form($html->sbox_submit($this->sb->getYears('year', $this->bo->year), true), array(),
+				$this->base_url, Array('menuaction'=>'calendar.uiholiday.edit_locale', 'locale'=>$this->bo->locales[0])));
 			unset($html);
 
 			$holidays = $this->bo->get_holiday_list();
@@ -177,13 +177,13 @@ 
 
 			$var = Array(
 				'th_bg'				=> $GLOBALS['egw_info']['theme']['th_bg'],
-				'left_next_matchs'	=> $GLOBALS['egw']->nextmatchs->left('/index.php',$this->bo->start,$total,'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year),
-				'right_next_matchs'	=> $GLOBALS['egw']->nextmatchs->right('/index.php',$this->bo->start,$total,'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year),
+				'left_next_matchs'	=> $GLOBALS['egw']->nextmatchs->left('/index.php', $this->bo->start, $total, '&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year),
+				'right_next_matchs'	=> $GLOBALS['egw']->nextmatchs->right('/index.php', $this->bo->start, $total, '&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year),
 				'center'			=> '<td align="right">'.lang('Holidays').' ('.$this->bo->locales[0].')</td><td align="left">'.$year_form.'</td>',
-				'sort_name'			=> $GLOBALS['egw']->nextmatchs->show_sort_order($this->bo->sort,'hol_name',$this->bo->order,'/index.php',lang('Holiday'),'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year),
+				'sort_name'			=> $GLOBALS['egw']->nextmatchs->show_sort_order($this->bo->sort, 'hol_name', $this->bo->order, '/index.php', lang('Holiday'), '&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year),
 				'header_edit'		=> lang('Edit'),
 				'header_delete'		=> lang('Delete'),
-				'header_rule'		=> '<td>'.$GLOBALS['egw']->nextmatchs->show_sort_order($this->bo->sort,'hol_month_num,hol_mday',$this->bo->order,'/index.php',lang('Rule'),'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year).'</td>',
+				'header_rule'		=> '<td>'.$GLOBALS['egw']->nextmatchs->show_sort_order($this->bo->sort, 'hol_month_num,hol_mday', $this->bo->order, '/index.php', lang('Rule'), '&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year).'</td>',
 				'header_extra'		=> lang('Copy'),
 				'extra_width'		=> 'width="5%"'
 			);
@@ -192,16 +192,16 @@ 
 
 			if (!count($holidays))
 			{
-				$p->set_var('total',lang('no matches found'));
+				$p->set_var('total', lang('no matches found'));
 				//$p->parse('rows','row_empty',True);
 			}
 			else
 			{
 				$maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
-				$end = min($total,$this->bo->start+$maxmatchs);
-				$p->set_var('total',lang('showing %1 - %2 of %3',1+$this->bo->start,$end,$total));
+				$end = min($total, $this->bo->start + $maxmatchs);
+				$p->set_var('total', lang('showing %1 - %2 of %3', 1 + $this->bo->start, $end, $total));
 				//$p->parse('rows','row_empty',True);
-				for($i=$this->bo->start; $i < $end; $i++)
+				for ($i = $this->bo->start; $i < $end; $i++)
 				{
 					$tr_color = $GLOBALS['egw']->nextmatchs->alternate_row_color($tr_color);
 					if (!$holidays[$i]['name'])
@@ -214,32 +214,32 @@ 
 						'header_delete'=> lang('Delete'),
 						'group_name'	=> $holidays[$i]['name'],
 						'rule'			=> '<td>'.$this->bo->rule_string($holidays[$i]).'</td>',
-						'edit_link'		=> '<a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_holiday','locale'=>$this->bo->locales[0],'id'=>$holidays[$i]['index'],'year'=>$this->bo->year)).'"> '.lang('Edit').' </a>',
-						'extra_link'	=> '<a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.copy_holiday','locale'=>$this->bo->locales[0],'id'=>$holidays[$i]['index'],'year'=>$this->bo->year)).'"> '.lang('Copy').' </a>',
-						'delete_link'	=> '<a href="'.$GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.delete_holiday','locale'=>$this->bo->locales[0],'id'=>$holidays[$i]['index'],'year'=>$this->bo->year)).'"> '.lang('Delete').' </a>'
+						'edit_link'		=> '<a href="'.$GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.edit_holiday', 'locale'=>$this->bo->locales[0], 'id'=>$holidays[$i]['index'], 'year'=>$this->bo->year)).'"> '.lang('Edit').' </a>',
+						'extra_link'	=> '<a href="'.$GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.copy_holiday', 'locale'=>$this->bo->locales[0], 'id'=>$holidays[$i]['index'], 'year'=>$this->bo->year)).'"> '.lang('Copy').' </a>',
+						'delete_link'	=> '<a href="'.$GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.delete_holiday', 'locale'=>$this->bo->locales[0], 'id'=>$holidays[$i]['index'], 'year'=>$this->bo->year)).'"> '.lang('Delete').' </a>'
 					);
 
 					$p->set_var($var);
-					$p->parse('rows','row',True);
+					$p->parse('rows', 'row', True);
 				}
 			}
 
 			$var = Array(
-				'new_action'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_holiday','locale'=>$this->bo->locales[0],'id'=>0,'year'=>$this->bo->year)),
+				'new_action'	=> $GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.edit_holiday', 'locale'=>$this->bo->locales[0], 'id'=>0, 'year'=>$this->bo->year)),
 				'lang_add'		=> lang('add'),
-				'back_action'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.admin')),
+				'back_action'	=> $GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.admin')),
 				'lang_back'		=> lang('Back'),
-				'search_action'=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_locale','locale'=>$this->bo->locales[0],'year'=>$this->bo->year)),
+				'search_action'=> $GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.edit_locale', 'locale'=>$this->bo->locales[0], 'year'=>$this->bo->year)),
 				'lang_search'	=> lang('search')
 			);
 			$p->set_var($var);
-			$p->parse('back_button','back_button_form',False);
-			$p->pparse('out','list');
+			$p->parse('back_button', 'back_button_form', False);
+			$p->pparse('out', 'list');
 		}
 
 		function copy_holiday()
 		{
-			if(@$this->bo->id)
+			if (@$this->bo->id)
 			{
 				$holiday = $this->bo->read_entry($this->bo->id);
 			}
@@ -249,12 +249,12 @@ 
 			{
 				$holiday['occurence'] = date('Y');
 			}
-			$this->edit_holiday('',$holiday);
+			$this->edit_holiday('', $holiday);
 		}
 
-		function edit_holiday($error='',$holiday='')
+		function edit_holiday($error = '', $holiday = '')
 		{
-			if(@$this->bo->id && !$holiday)
+			if (@$this->bo->id && !$holiday)
 			{
 				$holiday = $this->bo->read_entry($this->bo->id);
 			}
@@ -269,9 +269,9 @@ 
 			common::egw_header();
 
 			$t = &$GLOBALS['egw']->template;
-			$t->set_file(Array('holiday'=>'holiday.tpl','form_button'=>'form_button_script.tpl'));
-			$t->set_block('holiday','form','form');
-			$t->set_block('holiday','list','list');
+			$t->set_file(Array('holiday'=>'holiday.tpl', 'form_button'=>'form_button_script.tpl'));
+			$t->set_block('holiday', 'form', 'form');
+			$t->set_block('holiday', 'list', 'list');
 
 			if (@count($error))
 			{
@@ -285,20 +285,20 @@ 
 			$var = Array(
 				'title_holiday' => ($this->bo->id ? lang('Edit') : lang('Add')).' '.lang('Holiday'),
 				'message'       => $message,
-				'actionurl'     => $GLOBALS['egw']->link($this->base_url,'menuaction=calendar.boholiday.add&year='.$this->bo->year),
+				'actionurl'     => $GLOBALS['egw']->link($this->base_url, 'menuaction=calendar.boholiday.add&year='.$this->bo->year),
 				'hidden_vars'   => '<input type="hidden" name="holiday[hol_id]" value="'.$this->bo->id.'">'."\n"
 					. '<input type="hidden" name="holiday[locales]" value="'.$this->bo->locales[0].'">'."\n"
 			);
 			$t->set_var($var);
 
 // Locale
-			$this->display_item($t,lang('Country'),$this->sb->form_select($holiday['locale'],'holiday[locale]'));
+			$this->display_item($t, lang('Country'), $this->sb->form_select($holiday['locale'], 'holiday[locale]'));
 
 // Title/Name
-			$this->display_item($t,lang('title'),'<input name="holiday[name]" size="60" maxlength="50" value="'.$holiday['name'].'">');
+			$this->display_item($t, lang('title'), '<input name="holiday[name]" size="60" maxlength="50" value="'.$holiday['name'].'">');
 
 // Date
-			$this->display_item($t,lang('Date'),common::dateformatorder($this->sb->getYears('holiday[year]',$holiday['occurence']>1900?$holiday['occurence']:0),$this->sb->getMonthText('holiday[month_num]',$holiday['month']),$this->sb->getDays('holiday[mday]',$holiday['day'])).
+			$this->display_item($t, lang('Date'), common::dateformatorder($this->sb->getYears('holiday[year]', $holiday['occurence'] > 1900 ? $holiday['occurence'] : 0), $this->sb->getMonthText('holiday[month_num]', $holiday['month']), $this->sb->getDays('holiday[mday]', $holiday['day'])).
 				'&nbsp;'.lang('Set a Year only for one-time / non-regular holidays.'));
 
 // Occurence
@@ -312,9 +312,9 @@ 
 				99	=> lang('Last')
 			);
 			$out = '';
-			while(list($key,$value) = each($occur))
+			while (list($key, $value) = each($occur))
 			{
-				$out .= '<option value="'.$key.'"'.($holiday['occurence']==$key?' selected':'').'>'.$value.'</option>'."\n";
+				$out .= '<option value="'.$key.'"'.($holiday['occurence'] == $key ? ' selected' : '').'>'.$value.'</option>'."\n";
 			}
 			$occurence_html = '<select name="holiday[occurence]">'."\n".$out.'</select>'."\n";
 
@@ -328,20 +328,20 @@ 
 				6	=> lang('Sat')
 			);
 			$out = '';
-			for($i=0;$i<7;$i++)
+			for ($i = 0; $i < 7; $i++)
 			{
-				$out .= '<option value="'.$i.'"'.($holiday['dow']==$i?' selected':'').'>'.$dow[$i].'</option>'."\n";
+				$out .= '<option value="'.$i.'"'.($holiday['dow'] == $i ? ' selected' : '').'>'.$dow[$i].'</option>'."\n";
 			}
 			$dow_html = '<select name="holiday[dow]">'."\n".$out.'</select>'."\n";
-			$this->display_item($t,lang('Occurence'),$occurence_html.'&nbsp;'.$dow_html.
+			$this->display_item($t, lang('Occurence'), $occurence_html.'&nbsp;'.$dow_html.
 				'&nbsp;'.lang('You can either set a Year or a Occurence, not both !!!'));
-			$this->display_item($t,lang('Observance Rule'),'<input type="checkbox" name="holiday[observance_rule]" value="True"'.($holiday['observance_rule']?' checked':'').'>'.
+			$this->display_item($t, lang('Observance Rule'), '<input type="checkbox" name="holiday[observance_rule]" value="True"'.($holiday['observance_rule'] ? ' checked' : '').'>'.
 				'&nbsp;'.lang('If checked holidays falling on a weekend, are taken on the monday after.'));
 
-			$t->set_var('lang_add',lang('Save'));
-			$t->set_var('lang_reset',lang('Reset'));
+			$t->set_var('lang_add', lang('Save'));
+			$t->set_var('lang_reset', lang('Reset'));
 
-			if(@$this->bo->locales[0])
+			if (@$this->bo->locales[0])
 			{
 				$link_params = Array(
 					'menuaction'	=> 'calendar.uiholiday.edit_locale',
@@ -357,12 +357,12 @@ 
 			}
 
 			$t->set_var(Array(
-				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url,$link_params),
+				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url, $link_params),
 				'action_text_button'	=> lang('Cancel'),
 				'action_confirm_button'	=> '',
 				'action_extra_field'	=> ''
 			));
-			$t->parse('cancel_button','form_button');
+			$t->parse('cancel_button', 'form_button');
 
 			if ($this->bo->id)
 			{
@@ -373,18 +373,18 @@ 
 					'id'			=> $this->bo->id
 				);
 				$t->set_var(Array(
-					'action_url_button'	=> $GLOBALS['egw']->link($this->base_url,$link_params),
+					'action_url_button'	=> $GLOBALS['egw']->link($this->base_url, $link_params),
 					'action_text_button'	=> lang('Delete'),
 					'action_confirm_button'	=> '',
 					'action_extra_field'	=> ''
 				));
-				$t->parse('delete_button','form_button');
+				$t->parse('delete_button', 'form_button');
 			}
 			else
 			{
-				$t->set_var('delete_button','&nbsp;');
+				$t->set_var('delete_button', '&nbsp;');
 			}
-			$t->pparse('out','form');
+			$t->pparse('out', 'form');
 		}
 
 
@@ -392,37 +392,37 @@ 
 		{
 			$this->admin();
 
-			$p =& CreateObject('phpgwapi.Template',$this->template_dir);
-			$p->set_file(Array('form'=>'delete_common.tpl','form_button'=>'form_button_script.tpl'));
+			$p = & CreateObject('phpgwapi.Template', $this->template_dir);
+			$p->set_file(Array('form'=>'delete_common.tpl', 'form_button'=>'form_button_script.tpl'));
 
-			$p->set_var('messages',lang('Are you sure you want to delete this Country ?')."<br>".$this->bo->locales[0]);
+			$p->set_var('messages', lang('Are you sure you want to delete this Country ?')."<br>".$this->bo->locales[0]);
 
 			$var = Array(
-				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.admin')),
+				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.admin')),
 				'action_text_button'	=> lang('No'),
 				'action_confirm_button'	=> '',
 				'action_extra_field'	=> ''
 			);
 			$p->set_var($var);
-			$p->parse('no','form_button');
+			$p->parse('no', 'form_button');
 
 			$var = Array(
-				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.boholiday.delete_locale','locale'=>$this->bo->locales[0])),
+				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.boholiday.delete_locale', 'locale'=>$this->bo->locales[0])),
 				'action_text_button'	=> lang('Yes'),
 				'action_confirm_button'	=> '',
 				'action_extra_field'	=> ''
 			);
 			$p->set_var($var);
-			$p->parse('yes','form_button');
+			$p->parse('yes', 'form_button');
 
-			$p->pparse('out','form');
+			$p->pparse('out', 'form');
 		}
 
 		function delete_holiday()
 		{
 			$holiday = $this->bo->read_entry($this->bo->id);
 
-			if(!$holiday)
+			if (!$holiday)
 			{
 				return $this->edit_locale();
 			}
@@ -432,39 +432,39 @@ 
 			$GLOBALS['egw_info']['flags']['noappfooter'] = True;
 			common::egw_header();
 
-			$p =& CreateObject('phpgwapi.Template',$this->template_dir);
-			$p->set_file(Array('form'=>'delete_common.tpl','form_button'=>'form_button_script.tpl'));
+			$p = & CreateObject('phpgwapi.Template', $this->template_dir);
+			$p->set_file(Array('form'=>'delete_common.tpl', 'form_button'=>'form_button_script.tpl'));
 
-			$p->set_var('messages',lang('Are you sure you want to delete this holiday ?')."<br>".$holiday['name'].' ('.$this->bo->locales[0].') '.$this->bo->rule_string($holiday));
+			$p->set_var('messages', lang('Are you sure you want to delete this holiday ?')."<br>".$holiday['name'].' ('.$this->bo->locales[0].') '.$this->bo->rule_string($holiday));
 
 			$var = Array(
-				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.uiholiday.edit_locale','locale'=>$this->bo->locales[0],'year'=>$this->bo->year)),
+				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.uiholiday.edit_locale', 'locale'=>$this->bo->locales[0], 'year'=>$this->bo->year)),
 				'action_text_button'	=> lang('No'),
 				'action_confirm_button'	=> '',
 				'action_extra_field'	=> ''
 			);
 			$p->set_var($var);
-			$p->parse('no','form_button');
+			$p->parse('no', 'form_button');
 
 			$var = Array(
-				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url,Array('menuaction'=>'calendar.boholiday.delete_holiday','locale'=>$this->bo->locales[0],'id'=>$this->bo->id,'year'=>$this->bo->year)),
+				'action_url_button'	=> $GLOBALS['egw']->link($this->base_url, Array('menuaction'=>'calendar.boholiday.delete_holiday', 'locale'=>$this->bo->locales[0], 'id'=>$this->bo->id, 'year'=>$this->bo->year)),
 				'action_text_button'	=> lang('Yes'),
 				'action_confirm_button'	=> '',
 				'action_extra_field'	=> ''
 			);
 			$p->set_var($var);
-			$p->parse('yes','form_button');
+			$p->parse('yes', 'form_button');
 
-			$p->pparse('out','form');
+			$p->pparse('out', 'form');
 		}
 
 		function submit()
 		{
-			if(!@$this->bo->locales[0])
+			if (!@$this->bo->locales[0])
 			{
 				return $this->admin();
 			}
-			$this->bo->year = 0;	// for a complete list with all years
+			$this->bo->year = 0; // for a complete list with all years
 			$holidays = $this->bo->get_holiday_list();
 
 			if (!is_array($holidays) || !count($holidays))
@@ -472,16 +472,16 @@ 
 				$this->admin();
 			}
 			// sort holidays by year / occurence:
-			usort($holidays,'_holiday_cmp');
+			usort($holidays, '_holiday_cmp');
 
 			if (isset($_GET['download']))
 			{
 				$locale = $this->bo->locales[0];
-				html::content_header("holidays.$locale.csv",'text/text');
+				html::content_header("holidays.$locale.csv", 'text/text');
 
 				echo "charset\t".translation::charset()."\n";
 				$last_year = -1;
-				foreach($holidays as $holiday)
+				foreach ($holidays as $holiday)
 				{
 					$year = $holiday['occurence'] <= 0 ? 0 : $holiday['occurence'];
 					if ($year != $last_year)
@@ -493,7 +493,7 @@ 
 				}
 				common::egw_exit();
 			}
-			if($this->debug)
+			if ($this->debug)
 			{
 				$action = $GLOBALS['egw']->link('/calendar/egroupware.org/accept_holiday.php');
 			}
@@ -511,7 +511,7 @@ 
 
 			echo '<input type="hidden" name="locale" value="'.$this->bo->locales[0].'">'."\n";
 			echo '<input type="hidden" name="charset" value="'.translation::charset().'">'."\n";
-			foreach($holidays as $holiday)
+			foreach ($holidays as $holiday)
 			{
 				echo '<input type="hidden" name="name[]" value="'.htmlspecialchars($holiday['name']).'">'."\n"
 					. '<input type="hidden" name="day[]" value="'.$holiday['day'].'">'."\n"
@@ -524,7 +524,7 @@ 
 		}
 
 		/* private functions */
-		function display_item(&$p,$field,$data)
+		function display_item(&$p, $field, $data)
 		{
 			$var = Array(
 				'tr_color' => $GLOBALS['egw']->nextmatchs->alternate_row_color(),
@@ -532,7 +532,7 @@ 
 				'data'	=> $data
 			);
 			$p->set_var($var);
-			$p->parse('rows','list',True);
+			$p->parse('rows', 'list', True);
 		}
 	}
 ?>