Use Horde_Date_Recurrence::RECUR_* class constants so the can be

autoloaded.

diff --git a/kronolith/edit.php b/kronolith/edit.php
index c4a793c..372df15 100644 (file)
--- a/kronolith/edit.php
+++ b/kronolith/edit.php
@@ -89,7 +89,7 @@ if ($exception = Util::getFormData('del_exception')) {
                 $kronolith_driver->open($target);
                 $event = &$kronolith_driver->getEvent();
                 $event->readForm();
-                $event->recurrence->setRecurType(HORDE_DATE_RECUR_NONE);
+                $event->recurrence->setRecurType(Horde_Date_Recurrence::RECUR_NONE);
 
                 break;
 

diff --git a/kronolith/lib/Driver.php b/kronolith/lib/Driver.php
index de218bc..3ba40e3 100644 (file)
--- a/kronolith/lib/Driver.php
+++ b/kronolith/lib/Driver.php
@@ -1341,7 +1341,7 @@ class Kronolith_Event {
     function recurs()
     {
         return isset($this->recurrence) &&
-            !$this->recurrence->hasRecurType(HORDE_DATE_RECUR_NONE);
+            !$this->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_NONE);
     }
 
     /**
@@ -1911,11 +1911,11 @@ class Kronolith_Event {
 
             $this->recurrence->setRecurType($recur);
             switch ($recur) {
-            case HORDE_DATE_RECUR_DAILY:
+            case Horde_Date_Recurrence::RECUR_DAILY:
                 $this->recurrence->setRecurInterval(Util::getFormData('recur_daily_interval', 1));
                 break;
 
-            case HORDE_DATE_RECUR_WEEKLY:
+            case Horde_Date_Recurrence::RECUR_WEEKLY:
                 $weekly = Util::getFormData('weekly');
                 $weekdays = 0;
                 if (is_array($weekly)) {
@@ -1941,23 +1941,23 @@ class Kronolith_Event {
                 $this->recurrence->setRecurOnDay($weekdays);
                 break;
 
-            case HORDE_DATE_RECUR_MONTHLY_DATE:
+            case Horde_Date_Recurrence::RECUR_MONTHLY_DATE:
                 $this->recurrence->setRecurInterval(Util::getFormData('recur_day_of_month_interval', 1));
                 break;
 
-            case HORDE_DATE_RECUR_MONTHLY_WEEKDAY:
+            case Horde_Date_Recurrence::RECUR_MONTHLY_WEEKDAY:
                 $this->recurrence->setRecurInterval(Util::getFormData('recur_week_of_month_interval', 1));
                 break;
 
-            case HORDE_DATE_RECUR_YEARLY_DATE:
+            case Horde_Date_Recurrence::RECUR_YEARLY_DATE:
                 $this->recurrence->setRecurInterval(Util::getFormData('recur_yearly_interval', 1));
                 break;
 
-            case HORDE_DATE_RECUR_YEARLY_DAY:
+            case Horde_Date_Recurrence::RECUR_YEARLY_DAY:
                 $this->recurrence->setRecurInterval(Util::getFormData('recur_yearly_day_interval', 1));
                 break;
 
-            case HORDE_DATE_RECUR_YEARLY_WEEKDAY:
+            case Horde_Date_Recurrence::RECUR_YEARLY_WEEKDAY:
                 $this->recurrence->setRecurInterval(Util::getFormData('recur_yearly_weekday_interval', 1));
                 break;
             }

diff --git a/kronolith/lib/Driver/kolab.php b/kronolith/lib/Driver/kolab.php
index dc8163d..4a6bd2f 100644 (file)
--- a/kronolith/lib/Driver/kolab.php
+++ b/kronolith/lib/Driver/kolab.php
@@ -561,11 +561,11 @@ class Kronolith_Driver_kolab_wrapper_old extends Kronolith_Driver_kolab_wrapper
             $this->_kolab->setElemVal($recurrence, 'interval', $event->recurrence->getRecurInterval());
 
             switch ($event->recurrence->getRecurType()) {
-                case HORDE_DATE_RECUR_DAILY:
+                case Horde_Date_Recurrence::RECUR_DAILY:
                     $recurrence->set_attribute('cycle', 'daily');
                     break;
 
-                case HORDE_DATE_RECUR_WEEKLY:
+                case Horde_Date_Recurrence::RECUR_WEEKLY:
                     $recurrence->set_attribute('cycle', 'weekly');
 
                     $days = array('sunday', 'monday', 'tuesday', 'wednesday',
@@ -579,13 +579,13 @@ class Kronolith_Driver_kolab_wrapper_old extends Kronolith_Driver_kolab_wrapper
                     }
                     break;
 
-                case HORDE_DATE_RECUR_MONTHLY_DATE:
+                case Horde_Date_Recurrence::RECUR_MONTHLY_DATE:
                     $recurrence->set_attribute('cycle', 'monthly');
                     $recurrence->set_attribute('type', 'daynumber');
                     $this->_kolab->setElemVal($recurrence, 'daynumber', $event->start->mday);
                     break;
 
-                case HORDE_DATE_RECUR_MONTHLY_WEEKDAY:
+                case Horde_Date_Recurrence::RECUR_MONTHLY_WEEKDAY:
                     $recurrence->set_attribute('cycle', 'monthly');
                     $recurrence->set_attribute('type', 'weekday');
                     $this->_kolab->setElemVal($recurrence, 'daynumber', (int)(($event->start->mday - 1) / 7));
@@ -595,7 +595,7 @@ class Kronolith_Driver_kolab_wrapper_old extends Kronolith_Driver_kolab_wrapper
                     $this->_kolab->setElemVal($recurrence, 'day', $days[$start->dayOfWeek()]);
                     break;
 
-                case HORDE_DATE_RECUR_YEARLY_DATE:
+                case Horde_Date_Recurrence::RECUR_YEARLY_DATE:
                     $recurrence->set_attribute('cycle', 'yearly');
                     $recurrence->set_attribute('type', 'monthday');
 
@@ -607,13 +607,13 @@ class Kronolith_Driver_kolab_wrapper_old extends Kronolith_Driver_kolab_wrapper
                     $this->_kolab->setElemVal($recurrence, 'daynumber', $event->start->mday);
                     break;
 
-                case HORDE_DATE_RECUR_YEARLY_DAY:
+                case Horde_Date_Recurrence::YEARLY_DAY:
                     $recurrence->set_attribute('cycle', 'yearly');
                     $recurrence->set_attribute('type', 'yearday');
                     $this->_kolab->setElemVal($recurrence, 'daynumber', $event->start->dayOfYear());
                     break;
 
-                case HORDE_DATE_RECUR_YEARLY_WEEKDAY:
+                case Horde_Date_Recurrence::YEARLY_WEEKDAY:
                     $recurrence->set_attribute('cycle', 'yearly');
                     $recurrence->set_attribute('type', 'weekday');
                     $this->_kolab->setElemVal($recurrence, 'daynumber', (int)(($event->start->mday - 1) / 7));
@@ -856,11 +856,11 @@ class Kronolith_Event_kolab_old extends Kronolith_Event {
 
             switch ($cycle) {
             case 'daily':
-                $this->recurrence->setRecurType(HORDE_DATE_RECUR_DAILY);
+                $this->recurrence->setRecurType(Horde_Date_Recurrence::RECUR_DAILY);
                 break;
 
             case 'weekly':
-                $this->recurrence->setRecurType(HORDE_DATE_RECUR_WEEKLY);
+                $this->recurrence->setRecurType(Horde_Date_Recurrence::RECUR_WEEKLY);
 
                 $mask = 0;
                 $bits = array(
@@ -890,11 +890,11 @@ class Kronolith_Event_kolab_old extends Kronolith_Event {
             case 'monthly':
                 switch ($recurrence->get_attribute('type')) {
                 case 'daynumber':
-                    $this->recurrence->setRecurType(HORDE_DATE_RECUR_MONTHLY_DATE);
+                    $this->recurrence->setRecurType(Horde_Date_Recurrence::RECUR_MONTHLY_DATE);
                     break;
 
                 case 'weekday':
-                    $this->recurrence->setRecurType(HORDE_DATE_RECUR_MONTHLY_DATE);
+                    $this->recurrence->setRecurType(Horde_Date_Recurrence::RECUR_MONTHLY_DATE);
                     break;
                 }
                 break;
@@ -902,13 +902,13 @@ class Kronolith_Event_kolab_old extends Kronolith_Event {
             case 'yearly':
                 switch ($recurrence->get_attribute('type')) {
                 case 'monthday':
-                    $this->recurrence->setRecurType(HORDE_DATE_RECUR_YEARLY_DATE);
+                    $this->recurrence->setRecurType(Horde_Date_Recurrence::RECUR_YEARLY_DATE);
                     break;
                 case 'daynumber':
-                    $this->recurrence->setRecurType(HORDE_DATE_RECUR_YEARLY_DAY);
+                    $this->recurrence->setRecurType(Horde_Date_Recurrence::RECUR_YEARLY_DAY);
                     break;
                 case 'weekday':
-                    $this->recurrence->setRecurType(HORDE_DATE_RECUR_YEARLY_WEEKDAY);
+                    $this->recurrence->setRecurType(Horde_Date_Recurrence::RECUR_YEARLY_WEEKDAY);
                     break;
                 }
             }

diff --git a/kronolith/lib/Driver/sql.php b/kronolith/lib/Driver/sql.php
index 076269b..396dedb 100644 (file)
--- a/kronolith/lib/Driver/sql.php
+++ b/kronolith/lib/Driver/sql.php
@@ -306,7 +306,7 @@ class Kronolith_Driver_sql extends Kronolith_Driver {
         }
         $q .= 'event_start <= ?' .
             ' AND event_recurtype <> ?))';
-        array_push($values, $etime, HORDE_DATE_RECUR_NONE);
+        array_push($values, $etime, Horde_Date_Recurrence::RECUR_NONE);
 
         /* Log the query at a DEBUG log level. */
         Horde::logMessage(sprintf('Kronolith_Driver_sql::listEventsConditional(): user = "%s"; query = "%s"; values = "%s"',
@@ -346,7 +346,7 @@ class Kronolith_Driver_sql extends Kronolith_Driver {
             /* We have all the information we need to create an event
              * object for this event, so go ahead and cache it. */
             $this->_cache[$this->_calendar][$row['event_id']] = &new Kronolith_Event_sql($this, $row);
-            if ($row['event_recurtype'] == HORDE_DATE_RECUR_NONE) {
+            if ($row['event_recurtype'] == Horde_Date_Recurrence::RECUR_NONE) {
                 $events[$row['event_uid']] = $row['event_id'];
             } else {
                 $next = $this->nextRecurrence($row['event_id'], $startInterval);
@@ -1012,7 +1012,7 @@ class Kronolith_Event_sql extends Kronolith_Event {
             $this->_properties['event_recurcount'] = $this->recurrence->getRecurCount();
 
             switch ($recur) {
-            case HORDE_DATE_RECUR_WEEKLY:
+            case Horde_Date_Recurrence::RECUR_WEEKLY:
                 $this->_properties['event_recurdays'] = $this->recurrence->getRecurOnDays();
                 break;
             }

diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index d46b279..ba37c65 100644 (file)
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -1507,29 +1507,29 @@ class Kronolith {
      * display.
      *
      * @param integer $type  The recurrence value; one of the
-     *                       HORDE_DATE_RECUR_XXX constants.
+     *                       Horde_Date_Recurrence::RECUR_XXX constants.
      *
      * @return string  The translated displayable recurrence value string.
      */
     function recurToString($type)
     {
         switch ($type) {
-        case HORDE_DATE_RECUR_NONE:
+        case Horde_Date_Recurrence::RECUR_NONE:
             return _("Does not recur");
 
-        case HORDE_DATE_RECUR_DAILY:
+        case Horde_Date_Recurrence::RECUR_DAILY:
             return _("Recurs daily");
 
-        case HORDE_DATE_RECUR_WEEKLY:
+        case Horde_Date_Recurrence::RECUR_WEEKLY:
             return _("Recurs weekly");
 
-        case HORDE_DATE_RECUR_MONTHLY_DATE:
-        case HORDE_DATE_RECUR_MONTHLY_WEEKDAY:
+        case Horde_Date_Recurrence::RECUR_MONTHLY_DATE:
+        case Horde_Date_Recurrence::RECUR_MONTHLY_WEEKDAY:
             return _("Recurs monthly");
 
-        case HORDE_DATE_RECUR_YEARLY_DATE:
-        case HORDE_DATE_RECUR_YEARLY_DAY:
-        case HORDE_DATE_RECUR_YEARLY_WEEKDAY:
+        case Horde_Date_Recurrence::RECUR_YEARLY_DATE:
+        case Horde_Date_Recurrence::RECUR_YEARLY_DAY:
+        case Horde_Date_Recurrence::RECUR_YEARLY_WEEKDAY:
             return _("Recurs yearly");
         }
     }

diff --git a/kronolith/lib/tests/toicalendar.phpt b/kronolith/lib/tests/toicalendar.phpt
index 914a0b8..37f2a83 100644 (file)
--- a/kronolith/lib/tests/toicalendar.phpt
+++ b/kronolith/lib/tests/toicalendar.phpt
@@ -21,7 +21,7 @@ $object->setCategory('Sch
 $object->setLocation('Allgäu');
 $object->setAlarm(10);
 $object->recurrence = new Horde_Date_Recurrence($object->start);
-$object->recurrence->setRecurType(HORDE_DATE_RECUR_DAILY);
+$object->recurrence->setRecurType(Horde_Date_Recurrence::RECUR_DAILY);
 $object->recurrence->setRecurInterval(2);
 $object->recurrence->addException(2007, 3, 19);
 $object->initialized = true;
@@ -39,7 +39,7 @@ echo $ical->exportvCalendar() . "\n";
 $object->setPrivate(true);
 $object->setStatus(KRONOLITH_STATUS_TENTATIVE);
 $object->recurrence = new Horde_Date_Recurrence($object->start);
-$object->recurrence->setRecurType(HORDE_DATE_RECUR_MONTHLY_DATE);
+$object->recurrence->setRecurType(Horde_Date_Recurrence::RECUR_MONTHLY_DATE);
 $object->recurrence->setRecurInterval(1);
 $object->recurrence->addException(2007, 4, 15);
 $object->setAttendees(

diff --git a/kronolith/templates/edit/edit.inc b/kronolith/templates/edit/edit.inc
index c5f37c4..9d574c0 100644 (file)
--- a/kronolith/templates/edit/edit.inc
+++ b/kronolith/templates/edit/edit.inc
@@ -218,21 +218,21 @@
   <table cellspacing="0" width="100%">
    <tr>
     <td class="nowrap">
-     <input id="recurnone" type="radio" class="checkbox" name="recur" onclick="clearFields(0);" value="<?php echo HORDE_DATE_RECUR_NONE ?>"<?php if (!$event->recurs()) echo ' checked="checked"' ?> /><label for="recurnone"> <?php echo _("No recurrence") ?></label>
+     <input id="recurnone" type="radio" class="checkbox" name="recur" onclick="clearFields(0);" value="<?php echo Horde_Date_Recurrence::RECUR_NONE ?>"<?php if (!$event->recurs()) echo ' checked="checked"' ?> /><label for="recurnone"> <?php echo _("No recurrence") ?></label>
     </td>
    </tr>
    <tr>
     <td class="nowrap">
-     <input id="recurdaily" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_daily_interval');" value="<?php echo HORDE_DATE_RECUR_DAILY ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_DAILY)) echo ' checked="checked"' ?> /><label for="recurdaily"> <?php echo _("Daily: Recurs every") ?>&nbsp;</label>
-     <input type="text" id="recur_daily_interval" name="recur_daily_interval" size="2" onkeypress="setRecur(1);" onchange="setRecur(1);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_DAILY) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;<?php echo Horde::label('recur_daily_interval', _("day(s)")) ?>
+     <input id="recurdaily" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_daily_interval');" value="<?php echo Horde_Date_Recurrence::RECUR_DAILY ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_DAILY)) echo ' checked="checked"' ?> /><label for="recurdaily"> <?php echo _("Daily: Recurs every") ?>&nbsp;</label>
+     <input type="text" id="recur_daily_interval" name="recur_daily_interval" size="2" onkeypress="setRecur(1);" onchange="setRecur(1);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_DAILY) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;<?php echo Horde::label('recur_daily_interval', _("day(s)")) ?>
     </td>
    </tr>
    <tr>
     <td class="nowrap">
-     <input id="recurweekly" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_weekly_interval');" value="<?php echo HORDE_DATE_RECUR_WEEKLY ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_WEEKLY)) echo ' checked="checked"' ?> /><label for="recurweekly"> <?php echo _("Weekly: Recurs every") ?>&nbsp;</label>
-     <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_RECUR_WEEKLY) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;
+     <input id="recurweekly" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_weekly_interval');" value="<?php echo Horde_Date_Recurrence::RECUR_WEEKLY ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_WEEKLY)) echo ' checked="checked"' ?> /><label for="recurweekly"> <?php echo _("Weekly: Recurs every") ?>&nbsp;</label>
+     <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_MASK_MONDAY ?>"<?php if ($event->recurs() && $event->recurrence->recurOnDay(HORDE_DATE_MASK_MONDAY)) echo ' checked="checked"' ?> />&nbsp;
+     <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;
@@ -243,32 +243,32 @@
    </tr>
    <tr>
     <td class="nowrap">
-     <input id="recurmonthday" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_day_of_month_interval');" value="<?php echo HORDE_DATE_RECUR_MONTHLY_DATE ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_MONTHLY_DATE)) echo ' checked="checked"' ?> /><label for="recurmonthday"> <?php echo _("Monthly: Recurs every") ?>&nbsp;</label>
-     <input type="text" id="recur_day_of_month_interval" name="recur_day_of_month_interval" size="2" onkeypress="setRecur(3);" onchange="setRecur(3);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_MONTHLY_DATE) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;<?php echo Horde::label('recur_day_of_month_interval', _("month(s)") . ' ' . _("on the same date")) ?>
+     <input id="recurmonthday" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_day_of_month_interval');" value="<?php echo Horde_Date_Recurrence::RECUR_MONTHLY_DATE ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_MONTHLY_DATE)) echo ' checked="checked"' ?> /><label for="recurmonthday"> <?php echo _("Monthly: Recurs every") ?>&nbsp;</label>
+     <input type="text" id="recur_day_of_month_interval" name="recur_day_of_month_interval" size="2" onkeypress="setRecur(3);" onchange="setRecur(3);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_MONTHLY_DATE) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;<?php echo Horde::label('recur_day_of_month_interval', _("month(s)") . ' ' . _("on the same date")) ?>
     </td>
    </tr>
    <tr>
     <td class="nowrap">
-     <input id="recurmonthweek" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_week_of_month_interval');" value="<?php echo HORDE_DATE_RECUR_MONTHLY_WEEKDAY ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_MONTHLY_WEEKDAY)) echo ' checked="checked"' ?> /><label for="recurmonthweek"> <?php echo _("Monthly: Recurs every") ?>&nbsp;</label>
-     <input type="text" id="recur_week_of_month_interval" name="recur_week_of_month_interval" size="2" onkeypress="setRecur(4);" onchange="setRecur(4);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_MONTHLY_WEEKDAY) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;<?php echo Horde::label('recur_week_of_month_interval', _("month(s)") . ' ' . _("on the same weekday")) ?>
+     <input id="recurmonthweek" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_week_of_month_interval');" value="<?php echo Horde_Date_Recurrence::RECUR_MONTHLY_WEEKDAY ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_MONTHLY_WEEKDAY)) echo ' checked="checked"' ?> /><label for="recurmonthweek"> <?php echo _("Monthly: Recurs every") ?>&nbsp;</label>
+     <input type="text" id="recur_week_of_month_interval" name="recur_week_of_month_interval" size="2" onkeypress="setRecur(4);" onchange="setRecur(4);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_MONTHLY_WEEKDAY) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;<?php echo Horde::label('recur_week_of_month_interval', _("month(s)") . ' ' . _("on the same weekday")) ?>
     </td>
    </tr>
    <tr>
     <td class="nowrap">
-     <input id="recuryear" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_yearly_interval');" value="<?php echo HORDE_DATE_RECUR_YEARLY_DATE ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_YEARLY_DATE)) echo ' checked="checked"' ?> /><label for="recuryear"> <?php echo _("Yearly: Recurs every") ?>&nbsp;</label>
-     <input type="text" id="recur_yearly_interval" name="recur_yearly_interval" size="2" onkeypress="setRecur(5);" onchange="setRecur(5);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_YEARLY_DATE) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;<?php echo Horde::label('recur_yearly_interval', _("year(s) on the same date")) ?>
+     <input id="recuryear" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_yearly_interval');" value="<?php echo Horde_Date_Recurrence::RECUR_YEARLY_DATE ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_YEARLY_DATE)) echo ' checked="checked"' ?> /><label for="recuryear"> <?php echo _("Yearly: Recurs every") ?>&nbsp;</label>
+     <input type="text" id="recur_yearly_interval" name="recur_yearly_interval" size="2" onkeypress="setRecur(5);" onchange="setRecur(5);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_YEARLY_DATE) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;<?php echo Horde::label('recur_yearly_interval', _("year(s) on the same date")) ?>
     </td>
    </tr>
    <tr>
     <td class="nowrap">
-     <input id="recuryearday" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_yearly_day_interval');" value="<?php echo HORDE_DATE_RECUR_YEARLY_DAY ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_YEARLY_DAY)) echo ' checked="checked"' ?> /><label for="recuryearday"> <?php echo _("Yearly: Recurs every") ?>&nbsp;</label>
-     <input type="text" id="recur_yearly_day_interval" name="recur_yearly_day_interval" size="2" onkeypress="setRecur(6);" onchange="setRecur(6);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_YEARLY_DAY) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;<?php echo Horde::label('recur_yearly_day_interval', _("year(s) on the same day of the year")) ?>
+     <input id="recuryearday" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_yearly_day_interval');" value="<?php echo Horde_Date_Recurrence::RECUR_YEARLY_DAY ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_YEARLY_DAY)) echo ' checked="checked"' ?> /><label for="recuryearday"> <?php echo _("Yearly: Recurs every") ?>&nbsp;</label>
+     <input type="text" id="recur_yearly_day_interval" name="recur_yearly_day_interval" size="2" onkeypress="setRecur(6);" onchange="setRecur(6);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_YEARLY_DAY) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;<?php echo Horde::label('recur_yearly_day_interval', _("year(s) on the same day of the year")) ?>
     </td>
    </tr>
    <tr>
     <td class="nowrap">
-     <input id="recuryearweekday" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_yearly_weekday_interval');" value="<?php echo HORDE_DATE_RECUR_YEARLY_WEEKDAY ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_YEARLY_WEEKDAY)) echo ' checked="checked"' ?> /><label for="recuryearweekday"> <?php echo _("Yearly: Recurs every") ?>&nbsp;</label>
-     <input type="text" id="recur_yearly_weekday_interval" name="recur_yearly_weekday_interval" size="2" onkeypress="setRecur(7);" onchange="setRecur(7);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(HORDE_DATE_RECUR_YEARLY_WEEKDAY) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;<?php echo Horde::label('recur_yearly_weekday_interval', _("year(s) on the same weekday and month of the year")) ?>
+     <input id="recuryearweekday" type="radio" class="checkbox" name="recur" onclick="setInterval('recur_yearly_weekday_interval');" value="<?php echo Horde_Date_Recurrence::RECUR_YEARLY_WEEKDAY ?>"<?php if ($event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_YEARLY_WEEKDAY)) echo ' checked="checked"' ?> /><label for="recuryearweekday"> <?php echo _("Yearly: Recurs every") ?>&nbsp;</label>
+     <input type="text" id="recur_yearly_weekday_interval" name="recur_yearly_weekday_interval" size="2" onkeypress="setRecur(7);" onchange="setRecur(7);" value="<?php echo $event->recurs() && $event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_YEARLY_WEEKDAY) ? $event->recurrence->getRecurInterval() : '' ?>" />&nbsp;<?php echo Horde::label('recur_yearly_weekday_interval', _("year(s) on the same weekday and month of the year")) ?>
     </td>
    </tr>
   </table>

diff --git a/kronolith/templates/view/view.inc b/kronolith/templates/view/view.inc
index 970ab3a..4b49846 100644 (file)
--- a/kronolith/templates/view/view.inc
+++ b/kronolith/templates/view/view.inc
@@ -94,9 +94,9 @@ if ($this->event->isInitialized() && $this->event->alarm > 0):
 <tr>
  <td class="rightAlign" valign="top"><strong><?php echo _("Pattern") ?>&nbsp;&nbsp;</strong></td>
  <td valign="top">
-<?php if ($this->event->recurrence->hasRecurType(HORDE_DATE_RECUR_DAILY)): ?>
+<?php if ($this->event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_DAILY)): ?>
    <?php echo _("Daily: Recurs every") . ' ' . $this->event->recurrence->getRecurInterval() . ' ' . _("day(s)") ?>
-<?php elseif ($this->event->recurrence->hasRecurType(HORDE_DATE_RECUR_WEEKLY)):
+<?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");
@@ -106,15 +106,15 @@ if ($this->event->isInitialized() && $this->event->alarm > 0):
     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_RECUR_MONTHLY_DATE)): ?>
+<?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") ?>
-<?php elseif ($this->event->recurrence->hasRecurType(HORDE_DATE_RECUR_MONTHLY_WEEKDAY)): ?>
+<?php elseif ($this->event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_MONTHLY_WEEKDAY)): ?>
    <?php echo _("Monthly: Recurs every") . ' ' . $this->event->recurrence->getRecurInterval() . ' ' . _("month(s)") . ' ' . _("on the same weekday") ?>
-<?php elseif ($this->event->recurrence->hasRecurType(HORDE_DATE_RECUR_YEARLY_DATE)): ?>
+<?php elseif ($this->event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_YEARLY_DATE)): ?>
    <?php echo _("Yearly: Recurs every") . ' ' . $this->event->recurrence->getRecurInterval() . ' ' . _("year(s) on the same date") ?>
-<?php elseif ($this->event->recurrence->hasRecurType(HORDE_DATE_RECUR_YEARLY_DAY)): ?>
+<?php elseif ($this->event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_YEARLY_DAY)): ?>
    <?php echo _("Yearly: Recurs every") . ' ' . $this->event->recurrence->getRecurInterval() . ' ' . _("year(s) on the same day of the year") ?>
-<?php elseif ($this->event->recurrence->hasRecurType(HORDE_DATE_RECUR_YEARLY_WEEKDAY)): ?>
+<?php elseif ($this->event->recurrence->hasRecurType(Horde_Date_Recurrence::RECUR_YEARLY_WEEKDAY)): ?>
    <?php echo _("Yearly: Recurs every") . ' ' . $this->event->recurrence->getRecurInterval() . ' ' . _("year(s) on the same weekday and month of the year") ?>
 <?php endif; ?>
  </td>