Index: publicbookings.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/publicbookings/publicbookings.admin.inc,v
retrieving revision 1.12
diff -u -p -r1.12 publicbookings.admin.inc
--- publicbookings.admin.inc	1 Oct 2008 03:10:08 -0000	1.12
+++ publicbookings.admin.inc	2 Apr 2009 14:25:19 -0000
@@ -108,11 +108,14 @@ function publicbookings_booking_form(&$f
 function publicbookings_booking_form_validate($form, &$form_state) {
   // If we're deleting, conflicts and validity don't matter.
   if ($form_state['values']['op'] == t('Delete')) return;
-
-  if (!empty($form_state['values']['ical_rrule'])) {
-    $form_state['values']['ical_rrule_until'] = bookingsapi_rrule_until_as_dt($form_state['values']['ical_rrule']);
-    if(empty($form_state['values']['ical_rrule_until'])) {
-      form_set_error('ical_rrule', t('Recurrences must have an end date.'));
+  
+  if ( $form_state['values']['INTERVAL'] != 0 ) {
+    $form_state['values']['rrule_until'] = $form_state['values']['UNTIL']['datetime'];
+    if (empty($form_state['values']['rrule_until'])) {
+      form_set_error('rrule', t('Recurrences must have an end date.'));
+    }
+    else {
+      $form_state['values']['rrule'] = date_api_ical_build_rrule($form_state['values']);
     }
   }
   publicbookings_conflict_check($form_state['values']);
@@ -459,4 +462,4 @@ function publicbookings_settings_submit(
   variable_set('publicbookings_enabled', (bool) $form_state['values']['publicbookings_enabled']);
   variable_set('bookingsapi_time_granularity', (int) $form_state['values']['bookingsapi_time_granularity']);
   variable_set('bookingsapi_using_sql_ts_triggers', (bool) $form_state['values']['bookingsapi_using_sql_ts_triggers']);
-}
\ No newline at end of file
+}