extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 12:30:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

"human readable string representation of rrule:

Browse Source 
- added timezone (if different from user timezone)
- moved monthly rule to first argument in brackets"
This commit is contained in:
Ralf Becker 2009-11-12 19:39:46 +00:00
parent b7c5dd63dc
commit d1f233d141
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
calendar/inc/class.calendar_rrule.inc.php
View File

@ -104,7 +104,7 @@ class calendar_rrule implements Iterator
public $interval = 1; public $interval = 1;
/** /**
* Number for monthly byday: 1, ..., 5, -1=last workday of month * Number for monthly byday: 1, ..., 5, -1=last weekday of month
* *
* EGroupware Calendar does NOT explicitly store it, it's only implicitly defined by series start date * EGroupware Calendar does NOT explicitly store it, it's only implicitly defined by series start date
* *
@ -208,8 +208,7 @@ class calendar_rrule implements Iterator
*/ */
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)
{ {
$weekdaystarts = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts']; switch($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
switch($weekdaystarts)
{ {
case 'Sunday': case 'Sunday':
$this->lastdayofweek = self::SATURDAY; $this->lastdayofweek = self::SATURDAY;
@ -453,11 +452,6 @@ class calendar_rrule implements Iterator
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(); $str_extra = array();
if ($this->enddate)
{
if ($this->enddate->getTimezone() != egw_time::$user_timezone) $this->enddate->setTimezone(egw_time::$user_timezone);
$str_extra[] = lang('ends').': '.lang($this->enddate->format('l')).', '.$this->enddate->format(egw_time::$user_dateformat);
}
switch ($this->type) switch ($this->type)
{ {
case self::MONTHLY_MDAY: case self::MONTHLY_MDAY:
@ -500,7 +494,18 @@ class calendar_rrule implements Iterator
{ {
$str_extra[] = lang('Interval').': '.$this->interval; $str_extra[] = lang('Interval').': '.$this->interval;
} }
if ($this->enddate)
{
if ($this->enddate->getTimezone()->getName() != egw_time::$user_timezone->getName())
{
$this->enddate->setTimezone(egw_time::$user_timezone);
}
$str_extra[] = lang('ends').': '.lang($this->enddate->format('l')).', '.$this->enddate->format(egw_time::$user_dateformat);
}
if ($this->time->getTimezone()->getName() != egw_time::$user_timezone->getName())
{
$str_extra[] = $this->time->getTimezone()->getName();
}
if(count($str_extra)) if(count($str_extra))
{ {
$str .= ' ('.implode(', ',$str_extra).')'; $str .= ' ('.implode(', ',$str_extra).')';