extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-24 23:59:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed usage of MCAL_ constants in favor of own class-constants

Browse Source
This commit is contained in:
Ralf Becker 2012-09-18 11:39:00 +00:00
parent 31d0d47988
commit d18c8b3fda
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -541,7 +541,7 @@ class calendar_rrule implements Iterator
* *
* $return array vCalendar RRULE * $return array vCalendar RRULE
*/ */
public function generate_rrule($version='1.0') public function generate_rrule($version='2.0')
{ {
$repeat_days = array(); $repeat_days = array();
$rrule = array(); $rrule = array();
@ -601,7 +601,7 @@ class calendar_rrule implements Iterator
$rrule['BYMONTHDAY'] = $this->monthly_bymonthday; $rrule['BYMONTHDAY'] = $this->monthly_bymonthday;
break; break;
case MCAL_RECUR_MONTHLY_WDAY: // weekday of the month: BDAY={1..5}{MO..SO} case self::MONTHLY_WDAY: // weekday of the month: BDAY={1..5}{MO..SO}
$rrule['BYDAY'] = $this->monthly_byday_num . $rrule['BYDAY'] = $this->monthly_byday_num .
strtoupper(substr($this->time->format('l'),0,2)); strtoupper(substr($this->time->format('l'),0,2));
break; break;
@ -697,7 +697,7 @@ class calendar_rrule implements Iterator
if (!is_array($event) || if (!is_array($event) ||
!isset($event['recur_type']) || !isset($event['recur_type']) ||
$event['recur_type'] == MCAL_RECUR_NONE || $event['recur_type'] == self::NONE ||
empty($event['recur_data']) || $event['recur_data'] == ALLDAYS || empty($event['recur_data']) || $event['recur_data'] == ALLDAYS ||
empty($event['tzid']) || empty($to_tz) || empty($event['tzid']) || empty($to_tz) ||
$event['tzid'] == $to_tz) return; $event['tzid'] == $to_tz) return;