More Horde_Date class constants

diff --git a/kronolith/lib/Block/month.php b/kronolith/lib/Block/month.php
index bc4c366..eef1bb9 100644 (file)
--- 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 3ba40e3..97e3e5b 100644 (file)
--- 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 4a6bd2f..d41d7be 100644 (file)
--- 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 47502e1..f53dec9 100644 (file)
--- 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', '+') . '</a>';
                 }
 
-                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) . '</a>';
                 }

diff --git a/kronolith/lib/Views/Week.php b/kronolith/lib/Views/Week.php
index 46856af..d9ac503 100644 (file)
--- 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 572dad9..60d9ba6 100644 (file)
--- 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 3482f1d..7506b40 100644 (file)
--- 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 9d574c0..92d6fc3 100644 (file)
--- a/kronolith/templates/edit/edit.inc
+++ b/kronolith/templates/edit/edit.inc
@@ -233,12 +233,12 @@
      <input type="text" id="recur_weekly_interval" name="recur_weekly_interval" size="2" onkeypress="setRecur(2);" onchange="setRecur(2);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_WEEKLY) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;
      <?php echo Horde::label('recur_weekly_interval', _("week(s) on:")) ?><br />
      <label for="mo"><?php echo _("Mo") ?></label><input id="mo" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo Horde_Date_Recurrence::MASK_MONDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(Horde_Date_Recurrence::MASK_MONDAY)) echo ' checked="checked"' ?> />&nbsp;
-     <label for="tu"><?php echo _("Tu") ?></label><input id="tu" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo HORDE_DATE_MASK_TUESDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_TUESDAY)) echo ' checked="checked"' ?> />&nbsp;
-     <label for="we"><?php echo _("We") ?></label><input id="we" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo HORDE_DATE_MASK_WEDNESDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_WEDNESDAY)) echo ' checked="checked"' ?> />&nbsp;
-     <label for="th"><?php echo _("Th") ?></label><input id="th" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo HORDE_DATE_MASK_THURSDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_THURSDAY)) echo ' checked="checked"' ?> />&nbsp;
-     <label for="fr"><?php echo _("Fr") ?></label><input id="fr" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo HORDE_DATE_MASK_FRIDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_FRIDAY)) echo ' checked="checked"' ?> />&nbsp;
-     <label for="sa"><?php echo _("Sa") ?></label><input id="sa" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo HORDE_DATE_MASK_SATURDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_SATURDAY)) echo ' checked="checked"' ?> />&nbsp;
-     <label for="su"><?php echo _("Su") ?></label><input id="su" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo HORDE_DATE_MASK_SUNDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_SUNDAY)) echo ' checked="checked"' ?> />&nbsp;
+     <label for="tu"><?php echo _("Tu") ?></label><input id="tu" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo Horde_Date::MASK_TUESDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(Horde_Date::MASK_TUESDAY)) echo ' checked="checked"' ?> />&nbsp;
+     <label for="we"><?php echo _("We") ?></label><input id="we" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo Horde_Date::MASK_WEDNESDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(Horde_Date::MASK_WEDNESDAY)) echo ' checked="checked"' ?> />&nbsp;
+     <label for="th"><?php echo _("Th") ?></label><input id="th" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo Horde_Date::MASK_THURSDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(Horde_Date::MASK_THURSDAY)) echo ' checked="checked"' ?> />&nbsp;
+     <label for="fr"><?php echo _("Fr") ?></label><input id="fr" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo Horde_Date::MASK_FRIDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(Horde_Date::MASK_FRIDAY)) echo ' checked="checked"' ?> />&nbsp;
+     <label for="sa"><?php echo _("Sa") ?></label><input id="sa" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo Horde_Date::MASK_SATURDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(Horde_Date::MASK_SATURDAY)) echo ' checked="checked"' ?> />&nbsp;
+     <label for="su"><?php echo _("Su") ?></label><input id="su" type="checkbox" class="checkbox" name="weekly[]" onclick="setInterval('recur_weekly_interval');setRecur(2);" value="<?php echo Horde_Date::MASK_SUNDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(Horde_Date::MASK_SUNDAY)) echo ' checked="checked"' ?> />&nbsp;
     </td>
    </tr>
    <tr>

diff --git a/kronolith/templates/view/view.inc b/kronolith/templates/view/view.inc
index 4b49846..9c8f424 100644 (file)
--- a/kronolith/templates/view/view.inc
+++ b/kronolith/templates/view/view.inc
@@ -98,13 +98,13 @@ if ($this->event->isInitialized() && $this->event->alarm > 0):
    <?php echo _("Daily: Recurs every") . ' ' . $this->event->recurrence->getRecurInterval() . ' ' . _("day(s)") ?>
 <?php elseif ($this->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) ?>
 <?php elseif ($this->event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_MONTHLY_DATE)): ?>
    <?php echo _("Monthly: Recurs every") . ' ' . $this->event->recurrence->getRecurInterval() . ' ' . _("month(s)") . ' ' . _("on the same date") ?>