From 4d8569d6454f4f4995bcb84e2efb448ca58e4b3b Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Mon, 19 Jan 2009 14:04:02 -0500 Subject: [PATCH] More Horde_Date class constants --- kronolith/lib/Block/month.php | 6 +++--- kronolith/lib/Driver.php | 14 +++++++------- kronolith/lib/Driver/kolab.php | 14 +++++++------- kronolith/lib/Views/Month.php | 8 ++++---- kronolith/lib/Views/Week.php | 10 +++++----- kronolith/lib/Views/WorkWeek.php | 4 ++-- kronolith/lib/Views/Year.php | 6 +++--- kronolith/templates/edit/edit.inc | 12 ++++++------ kronolith/templates/view/view.inc | 14 +++++++------- 9 files changed, 44 insertions(+), 44 deletions(-) diff --git a/kronolith/lib/Block/month.php b/kronolith/lib/Block/month.php index bc4c366c1..eef1bb975 100644 --- a/kronolith/lib/Block/month.php +++ b/kronolith/lib/Block/month.php @@ -91,18 +91,18 @@ class Horde_Block_Kronolith_month extends Horde_Block { // We may need to adjust the number of days in the view if // we're starting weeks on Sunday. - if ($startday == HORDE_DATE_SUNDAY) { + if ($startday == Horde_Date::Date_SUNDAY) { $daysInView -= 7; } $endday = new Horde_Date(array('mday' => Horde_Date::daysInMonth($month, $year), 'month' => $month, 'year' => $year)); $endday = $endday->dayOfWeek(); - if ($endday == HORDE_DATE_SUNDAY) { + if ($endday == Horde_Date::Date_SUNDAY) { $daysInView += 7; } } else { - if ($startday == HORDE_DATE_SUNDAY) { + if ($startday == Horde_Date::Date_SUNDAY) { $startOfView = -5; } else { $startOfView = 2 - $startday; diff --git a/kronolith/lib/Driver.php b/kronolith/lib/Driver.php index 3ba40e35b..97e3e5bce 100644 --- a/kronolith/lib/Driver.php +++ b/kronolith/lib/Driver.php @@ -1927,13 +1927,13 @@ class Kronolith_Event { if ($weekdays == 0) { // Sunday starts at 0. switch ($this->start->dayOfWeek()) { - case 0: $weekdays |= HORDE_DATE_MASK_SUNDAY; break; - case 1: $weekdays |= HORDE_DATE_MASK_MONDAY; break; - case 2: $weekdays |= HORDE_DATE_MASK_TUESDAY; break; - case 3: $weekdays |= HORDE_DATE_MASK_WEDNESDAY; break; - case 4: $weekdays |= HORDE_DATE_MASK_THURSDAY; break; - case 5: $weekdays |= HORDE_DATE_MASK_FRIDAY; break; - case 6: $weekdays |= HORDE_DATE_MASK_SATURDAY; break; + case 0: $weekdays |= Horde_Date::MASK_SUNDAY; break; + case 1: $weekdays |= Horde_Date::MASK_MONDAY; break; + case 2: $weekdays |= Horde_Date::MASK_TUESDAY; break; + case 3: $weekdays |= Horde_Date::MASK_WEDNESDAY; break; + case 4: $weekdays |= Horde_Date::MASK_THURSDAY; break; + case 5: $weekdays |= Horde_Date::MASK_FRIDAY; break; + case 6: $weekdays |= Horde_Date::MASK_SATURDAY; break; } } diff --git a/kronolith/lib/Driver/kolab.php b/kronolith/lib/Driver/kolab.php index 4a6bd2f85..d41d7bef9 100644 --- a/kronolith/lib/Driver/kolab.php +++ b/kronolith/lib/Driver/kolab.php @@ -864,13 +864,13 @@ class Kronolith_Event_kolab_old extends Kronolith_Event { $mask = 0; $bits = array( - 'monday' => HORDE_DATE_MASK_MONDAY, - 'tuesday' => HORDE_DATE_MASK_TUESDAY, - 'wednesday' => HORDE_DATE_MASK_WEDNESDAY, - 'thursday' => HORDE_DATE_MASK_THURSDAY, - 'friday' => HORDE_DATE_MASK_FRIDAY, - 'saturday' => HORDE_DATE_MASK_SATURDAY, - 'sunday' => HORDE_DATE_MASK_SUNDAY, + 'monday' => Horde_Date::MASK_MONDAY, + 'tuesday' => Horde_Date::MASK_TUESDAY, + 'wednesday' => Horde_Date::MASK_WEDNESDAY, + 'thursday' => Horde_Date::MASK_THURSDAY, + 'friday' => Horde_Date::MASK_FRIDAY, + 'saturday' => Horde_Date::MASK_SATURDAY, + 'sunday' => Horde_Date::MASK_SUNDAY, ); $days = $kolab->getAllElems('day', $recurrence); diff --git a/kronolith/lib/Views/Month.php b/kronolith/lib/Views/Month.php index 47502e159..f53dec974 100644 --- a/kronolith/lib/Views/Month.php +++ b/kronolith/lib/Views/Month.php @@ -69,18 +69,18 @@ class Kronolith_View_Month { // We may need to adjust the number of days in the view if // we're starting weeks on Sunday. - if ($this->_startday == HORDE_DATE_SUNDAY) { + if ($this->_startday == Horde_Date::DATE_SUNDAY) { $this->_daysInView -= 7; } $endday = new Horde_Date(array('mday' => Horde_Date::daysInMonth($this->month, $this->year), 'month' => $this->month, 'year' => $this->year)); $endday = $endday->dayOfWeek(); - if ($endday == HORDE_DATE_SUNDAY) { + if ($endday == Horde_Date::DATE_SUNDAY) { $this->_daysInView += 7; } } else { - if ($this->_startday == HORDE_DATE_SUNDAY) { + if ($this->_startday == Horde_Date::DATE_SUNDAY) { $this->_startOfView = -5; } else { $this->_startOfView = 2 - $this->_startday; @@ -192,7 +192,7 @@ class Kronolith_View_Month { Horde::img('new_small.png', '+') . ''; } - if ($date->dayOfWeek() == HORDE_DATE_MONDAY) { + if ($date->dayOfWeek() == Horde_Date::DATE_MONDAY) { $url = Util::addParameter('week.php', 'date', $date->dateString()); $html .= Horde::link(Horde::applicationUrl($url), '', 'week') . sprintf(_("Week %d"), $week) . ''; } diff --git a/kronolith/lib/Views/Week.php b/kronolith/lib/Views/Week.php index 46856afa6..d9ac5033f 100644 --- a/kronolith/lib/Views/Week.php +++ b/kronolith/lib/Views/Week.php @@ -42,7 +42,7 @@ class Kronolith_View_Week { $week = $date->weekOfYear(); $year = $date->year; if (!$GLOBALS['prefs']->getValue('week_start_monday') && - $date->dayOfWeek() == HORDE_DATE_SUNDAY) { + $date->dayOfWeek() == Horde_Date::DATE_SUNDAY) { ++$week; } if ($week > 51 && $date->month == 1) { @@ -57,12 +57,12 @@ class Kronolith_View_Week { if (!isset($this->startDay)) { if ($GLOBALS['prefs']->getValue('week_start_monday')) { - $this->startDay = HORDE_DATE_MONDAY; - $this->endDay = HORDE_DATE_SUNDAY + 7; + $this->startDay = Horde_Date::DATE_MONDAY; + $this->endDay = Horde_Date::DATE_SUNDAY + 7; } else { $day->mday--; - $this->startDay = HORDE_DATE_SUNDAY; - $this->endDay = HORDE_DATE_SATURDAY; + $this->startDay = Horde_Date::DATE_SUNDAY; + $this->endDay = Horde_Date::DATE_SATURDAY; } } diff --git a/kronolith/lib/Views/WorkWeek.php b/kronolith/lib/Views/WorkWeek.php index 572dad91d..60d9ba65c 100644 --- a/kronolith/lib/Views/WorkWeek.php +++ b/kronolith/lib/Views/WorkWeek.php @@ -11,8 +11,8 @@ require_once dirname(__FILE__) . '/Week.php'; */ class Kronolith_View_WorkWeek extends Kronolith_View_Week { - var $startDay = HORDE_DATE_MONDAY; - var $endDay = HORDE_DATE_FRIDAY; + var $startDay = Horde_Date::DATE_MONDAY; + var $endDay = Horde_Date::DATE_FRIDAY; var $_controller = 'workweek.php'; function getName() diff --git a/kronolith/lib/Views/Year.php b/kronolith/lib/Views/Year.php index 3482f1d65..7506b4009 100644 --- a/kronolith/lib/Views/Year.php +++ b/kronolith/lib/Views/Year.php @@ -78,18 +78,18 @@ class Kronolith_View_Year { // We may need to adjust the number of days in the // view if we're starting weeks on Sunday. - if ($startday == HORDE_DATE_SUNDAY) { + if ($startday == Horde_Date::DATE_SUNDAY) { $daysInView -= 7; } $endday = new Horde_Date(array('mday' => Horde_Date::daysInMonth($month, $this->year), 'month' => $month, 'year' => $this->year)); $endday = $endday->dayOfWeek(); - if ($endday == HORDE_DATE_SUNDAY) { + if ($endday == Horde_Date::DATE_SUNDAY) { $daysInView += 7; } } else { - if ($startday == HORDE_DATE_SUNDAY) { + if ($startday == Horde_Date::DATE_SUNDAY) { $startOfView = -5; } else { $startOfView = 2 - $startday; diff --git a/kronolith/templates/edit/edit.inc b/kronolith/templates/edit/edit.inc index 9d574c074..92d6fc37a 100644 --- a/kronolith/templates/edit/edit.inc +++ b/kronolith/templates/edit/edit.inc @@ -233,12 +233,12 @@  
recurs() && $event->recurrence->recurOnDay(Horde_Date_Recurrence::MASK_MONDAY)) echo ' checked="checked"' ?> />  - recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_TUESDAY)) echo ' checked="checked"' ?> />  - recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_WEDNESDAY)) echo ' checked="checked"' ?> />  - recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_THURSDAY)) echo ' checked="checked"' ?> />  - recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_FRIDAY)) echo ' checked="checked"' ?> />  - recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_SATURDAY)) echo ' checked="checked"' ?> />  - recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_SUNDAY)) echo ' checked="checked"' ?> />  + recurs() && $event->recurrence->recurOnDay(Horde_Date::MASK_TUESDAY)) echo ' checked="checked"' ?> />  + recurs() && $event->recurrence->recurOnDay(Horde_Date::MASK_WEDNESDAY)) echo ' checked="checked"' ?> />  + recurs() && $event->recurrence->recurOnDay(Horde_Date::MASK_THURSDAY)) echo ' checked="checked"' ?> />  + recurs() && $event->recurrence->recurOnDay(Horde_Date::MASK_FRIDAY)) echo ' checked="checked"' ?> />  + recurs() && $event->recurrence->recurOnDay(Horde_Date::MASK_SATURDAY)) echo ' checked="checked"' ?> />  + recurs() && $event->recurrence->recurOnDay(Horde_Date::MASK_SUNDAY)) echo ' checked="checked"' ?> />  diff --git a/kronolith/templates/view/view.inc b/kronolith/templates/view/view.inc index 4b498469b..9c8f424de 100644 --- a/kronolith/templates/view/view.inc +++ b/kronolith/templates/view/view.inc @@ -98,13 +98,13 @@ if ($this->event->isInitialized() && $this->event->alarm > 0): event->recurrence->getRecurInterval() . ' ' . _("day(s)") ?> event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_WEEKLY)): $weekdays = array(); - if ($this->event->recurrence->recurOnDay(HORDE_DATE_MASK_MONDAY)) $weekdays[] = _("Monday"); - if ($this->event->recurrence->recurOnDay(HORDE_DATE_MASK_TUESDAY)) $weekdays[] = _("Tuesday"); - if ($this->event->recurrence->recurOnDay(HORDE_DATE_MASK_WEDNESDAY)) $weekdays[] = _("Wednesday"); - if ($this->event->recurrence->recurOnDay(HORDE_DATE_MASK_THURSDAY)) $weekdays[] = _("Thursday"); - if ($this->event->recurrence->recurOnDay(HORDE_DATE_MASK_FRIDAY)) $weekdays[] = _("Friday"); - if ($this->event->recurrence->recurOnDay(HORDE_DATE_MASK_SATURDAY)) $weekdays[] = _("Saturday"); - if ($this->event->recurrence->recurOnDay(HORDE_DATE_MASK_SUNDAY)) $weekdays[] = _("Sunday"); + if ($this->event->recurrence->recurOnDay(Horde_Date::MASK_MONDAY)) $weekdays[] = _("Monday"); + if ($this->event->recurrence->recurOnDay(Horde_Date::MASK_TUESDAY)) $weekdays[] = _("Tuesday"); + if ($this->event->recurrence->recurOnDay(Horde_Date::MASK_WEDNESDAY)) $weekdays[] = _("Wednesday"); + if ($this->event->recurrence->recurOnDay(Horde_Date::MASK_THURSDAY)) $weekdays[] = _("Thursday"); + if ($this->event->recurrence->recurOnDay(Horde_Date::MASK_FRIDAY)) $weekdays[] = _("Friday"); + if ($this->event->recurrence->recurOnDay(Horde_Date::MASK_SATURDAY)) $weekdays[] = _("Saturday"); + if ($this->event->recurrence->recurOnDay(Horde_Date::MASK_SUNDAY)) $weekdays[] = _("Sunday"); echo _("Weekly: Recurs every") . ' ' . $this->event->recurrence->getRecurInterval() . ' ' . _("week(s) on:") . ' ' . implode(', ', $weekdays) ?> event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_MONTHLY_DATE)): ?> event->recurrence->getRecurInterval() . ' ' . _("month(s)") . ' ' . _("on the same date") ?> -- 2.11.0