Index: resource_conflict.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/resource_conflict/resource_conflict.module,v
retrieving revision 1.1.2.5.2.15
diff -u -r1.1.2.5.2.15 resource_conflict.module
--- resource_conflict.module	12 Sep 2008 17:13:12 -0000	1.1.2.5.2.15
+++ resource_conflict.module	18 Jun 2009 16:53:31 -0000
@@ -16,8 +16,6 @@
         break;
       }
 
-      require_once(drupal_get_path('module', 'date_api') .'/date.inc');
-
       // Find the date field to use for time overlapping_node_ids detection.
       $date_field = variable_get('rc_date_field_' . $type, FALSE);
 
@@ -33,7 +31,7 @@
           $overlapping_node_ids = _resource_conflict_overlaps_from_date($start, $end);
         }
         else {
-          // If we got here, someone broke the requirements, so turn of
+          // If we got here, someone broke the requirements, so turn off
           // resource conflict for this type and notify an admin
           _resource_conflict_disable($type);
         }
@@ -84,8 +82,8 @@
     foreach ($conflicting_resources as $conflicting_resource) {
       $date_field = variable_get('rc_date_field_'. $conflicting_node->type, FALSE);
       if (strpos($date_field, 'field_', 0) === 0) {
-        $start = format_date(date_iso2unix($conflicting_node->{$date_field}[0]['value']));
-        $end   = format_date(date_iso2unix($conflicting_node->{$date_field}[0]['value2']));
+        $start = format_date(date_convert($conflicting_node->{$date_field}[0]['value'], DATE_ISO, DATE_UNIX));
+        $end   = format_date(date_convert($conflicting_node->{$date_field}[0]['value2'], DATE_ISO, DATE_UNIX));
       }
       else {
         $start = format_date($conflicting_node->event_start);
@@ -328,8 +326,8 @@
  *   An array of node ID's
  */
 function _resource_conflict_overlaps_from_date($date_start, $date_end) {
-  $start = date_make_date($date_start, 'GMT', 'db', DATE_ISO);
-  $end = date_make_date($date_end, 'GMT', 'db', DATE_ISO);
+  $start = date_make_date($date_start, 'GMT', DATE_ISO);
+  $end = date_make_date($date_end, 'GMT', DATE_ISO);
   return _resource_conflict_get_overlaps($start, $end);
 }
 
@@ -344,8 +342,8 @@
  *   An array of node ID's
  */
 function _resource_conflict_overlaps_from_event($event_start, $event_end) {
-  $start = date_make_date($event_start, 'GMT', 'db', DATE_UNIX);
-  $end = date_make_date($event_end, 'GMT', 'db', DATE_UNIX);
+  $start = date_make_date($event_start, 'GMT', DATE_UNIX);
+  $end = date_make_date($event_end, 'GMT', DATE_UNIX);
   return _resource_conflict_get_overlaps($start, $end);
 }
 
@@ -365,10 +363,10 @@
  *   An array of node ID's
  */
 function _resource_conflict_get_overlaps($start, $end) {
-  $date_start = date_show_value($start, 'db', DATE_ISO);
-  $date_end = date_show_value($end, 'db', DATE_ISO);
-  $event_start = date_show_value($start, 'db', DATE_UNIX);
-  $event_end = date_show_value($end, 'db', DATE_UNIX);
+  $date_start = date_convert($start, DATE_OBJECT, DATE_ISO);
+  $date_end = date_convert($end, DATE_OBJECT, DATE_ISO);
+  $event_start = date_convert($start, DATE_OBJECT, DATE_UNIX);
+  $event_end = date_convert($end, DATE_OBJECT, DATE_UNIX);
 
   $rows = array();
   $conflict_types = _resource_conflict_get_conflict_enabled_types();
@@ -376,7 +374,7 @@
   foreach ($conflict_types as $type) {
     $date_field = variable_get('rc_date_field_' . $type, FALSE);
 
-    if(strpos($date_field, 'field_', 0) === 0) {      
+    if(strpos($date_field, 'field_', 0) === 0) {
       $date_db_info = content_database_info(content_fields($date_field));
       $date_table = '{' . $date_db_info['table'] . '}';