EGroupware / egroupware

calendar/inc/class.calendar_rrule.inc.php

Spacing +90 added lines, -90 removed lines

@@ -76,8 +76,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',
 	);
 
@@ -87,8 +87,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',
 	);
 
@@ -138,7 +138,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
@@ -166,14 +166,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
@@ -216,9 +216,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;
@@ -232,7 +232,7 @@ 
 
 		$this->time = $time instanceof Api\DateTime ? $time : new Api\DateTime($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 Api\Exception\WrongParameter(__METHOD__."($time,$type,$interval,$enddate,$weekdays,...) type $type is NOT valid!");
 		}
@@ -242,16 +242,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
@@ -268,7 +268,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;
 
@@ -297,7 +297,7 @@ 
 		}
 		if ($exceptions)
 		{
-			foreach($exceptions as $exception)
+			foreach ($exceptions as $exception)
 			{
 				$exception->setTimezone($this->time->getTimezone());
 				$this->exceptions[] = $exception->format('Ymd');
@@ -313,22 +313,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;
@@ -344,9 +344,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 Api\DateTime();
-		$last_day->setDate($year,$month+1,0);
+		$last_day->setDate($year, $month + 1, 0);
 
 		return (int)$last_day->format('d');
 	}
@@ -376,7 +376,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:
@@ -391,28 +391,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";
@@ -420,10 +420,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;
 
@@ -445,7 +445,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));
 	}
 
 	/**
@@ -477,7 +477,7 @@ 
 		if (isset($this->current)) $backup = $this->current;
 		$this->rewind();
 
-		while(--$count > 0)
+		while (--$count > 0)
 		{
 			$this->next_no_exception();
 		}
@@ -502,7 +502,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;
 		}
@@ -521,7 +521,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();
 		}
@@ -533,7 +533,7 @@ 
 	 * @param boolean $use_just_date =false default use also time
 	 * @return boolean
 	 */
-	public function valid($use_just_date=false)
+	public function valid($use_just_date = false)
 	{
 		if ($use_just_date)
 		{
@@ -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 ? Api\DateTime::$user_timezone : Api\DateTime::$server_timezone;
-		$time = is_a($event['start'],'DateTime') ? $event['start'] : new Api\DateTime($event['start'],$timestamp_tz);
+		$time = is_a($event['start'], 'DateTime') ? $event['start'] : new Api\DateTime($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 Api\DateTime($event['recur_enddate'],$timestamp_tz);
+			$enddate = is_a($event['recur_enddate'], 'DateTime') ? $event['recur_enddate'] : new Api\DateTime($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 Api\DateTime($exception,$timestamp_tz);
+				$exceptions[] = is_a($exception, 'DateTime') ? $exception : new Api\DateTime($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 Api\DateTime($starttime, Api\DateTime::$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,15 +828,15 @@ 
 
 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('../../api/src/autoload.php');
 
 	if (!isset($_REQUEST['time']))
 	{
-		$now = new Api\DateTime('now',new DateTimeZone($_REQUEST['tz'] = 'UTC'));
+		$now = new Api\DateTime('now', new DateTimeZone($_REQUEST['tz'] = 'UTC'));
 		$_REQUEST['time'] = $now->format();
 		$_REQUEST['type'] = calendar_rrule::WEEKLY;
 		$_REQUEST['interval'] = 2;
@@ -845,29 +845,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: ".Api\Html::input('time',$_REQUEST['time']).
-		Api\Html::select('tz',$_REQUEST['tz'],Api\DateTime::getTimezones())."</p>\n";
-	echo "<p>Type: ".Api\Html::select('type',$_REQUEST['type'],calendar_rrule::$types)."\n".
-		"Interval: ".Api\Html::input('interval',$_REQUEST['interval'])."</p>\n";
+	echo "<p>Date+Time: ".Api\Html::input('time', $_REQUEST['time']).
+		Api\Html::select('tz', $_REQUEST['tz'], Api\DateTime::getTimezones())."</p>\n";
+	echo "<p>Type: ".Api\Html::select('type', $_REQUEST['type'], calendar_rrule::$types)."\n".
+		"Interval: ".Api\Html::input('interval', $_REQUEST['interval'])."</p>\n";
 	echo "<table><tr><td>\n";
-	echo "Weekdays:<br />".Api\Html::checkbox_multiselect('weekdays',$_REQUEST['weekdays'],calendar_rrule::$days,false,'','7',false,'height: 150px;')."\n";
+	echo "Weekdays:<br />".Api\Html::checkbox_multiselect('weekdays', $_REQUEST['weekdays'], calendar_rrule::$days, false, '', '7', false, 'height: 150px;')."\n";
 	echo "</td><td>\n";
-	echo "<p>Exceptions:<br />".Api\Html::textarea('exceptions',$_REQUEST['exceptions'],'style="height: 150px;"')."\n";
+	echo "<p>Exceptions:<br />".Api\Html::textarea('exceptions', $_REQUEST['exceptions'], 'style="height: 150px;"')."\n";
 	echo "</td></tr></table>\n";
-	echo "<p>Enddate: ".Api\Html::input('enddate',$_REQUEST['enddate'])."</p>\n";
-	echo "<p>Display recurances in ".Api\Html::select('user-tz',$_REQUEST['user-tz'],Api\DateTime::getTimezones())."</p>\n";
-	echo "<p>".Api\Html::submit_button('calc','Calculate')."</p>\n";
+	echo "<p>Enddate: ".Api\Html::input('enddate', $_REQUEST['enddate'])."</p>\n";
+	echo "<p>Display recurances in ".Api\Html::select('user-tz', $_REQUEST['user-tz'], Api\DateTime::getTimezones())."</p>\n";
+	echo "<p>".Api\Html::submit_button('calc', 'Calculate')."</p>\n";
 	echo "</form>\n";
 
 	$tz = new DateTimeZone($_REQUEST['tz']);
-	$time = new Api\DateTime($_REQUEST['time'],$tz);
-	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_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 Api\DateTime($exception); }
+	$time = new Api\DateTime($_REQUEST['time'], $tz);
+	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_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 Api\DateTime($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(Api\DateTime::$user_timezone);
 		echo ++$n.': '.$rtime->format('l').', '.$rtime."<br />\n";