Index: resource_conflict.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/resource_conflict/resource_conflict.module,v retrieving revision 1.1 diff -u -p -r1.1 resource_conflict.module --- resource_conflict.module 19 Sep 2007 18:26:05 -0000 1.1 +++ resource_conflict.module 13 Aug 2008 01:19:01 -0000 @@ -11,14 +11,14 @@ function resource_conflict_nodeapi(&$nod // Get all overlapping events $overlap = _resource_conflict_event_overlap($node->event_start, $node->event_end); - foreach($overlap as $nid) { + foreach ($overlap as $nid) { $overlap_nodes[] = node_load($nid); } - foreach($fields as $field) { - foreach($node->{$field} as $instance) { + foreach ($fields as $field) { + foreach ($node->{$field} as $instance) { foreach ($overlap_nodes as $conflict) { - foreach($conflict->{$field} as $conflict_instance) { + foreach ($conflict->{$field} as $conflict_instance) { if ($instance['nid'] == $conflict_instance['nid']) { $booked_resource = node_load($instance['nid']); form_set_error('Resource Conflict', @@ -41,7 +41,7 @@ function resource_conflict_form_alter($f $form['resource_conflict_set'] = array( '#type' => 'fieldset', '#title' => t('Resource Conflict'), - '#collapsible' => 1, + '#collapsible' => TRUE, ); $form['resource_conflict_set']['resource_conflict'] = array( @@ -63,7 +63,7 @@ function resource_conflict_form_alter($f if (empty($nodereference_fields)) { $form['resource_conflict_set']['no_nodreference_fields'] = array( - '#value' => t('Please create some nodereference fields for this content type.') + '#value' => t('Please create some nodereference fields for this content type.'), ); } else { @@ -73,7 +73,7 @@ function resource_conflict_form_alter($f '#options' => $nodereference_fields, '#multiple' => TRUE, '#default_value' => variable_get('resource_conflict_fields_equipment_booking', FALSE), - '#description' => t("Select the node reference resources which can't be booked at the same time.") + '#description' => t("Select the node reference resources which can't be booked at the same time."), ); } } @@ -102,4 +102,4 @@ function _resource_conflict_event_overla OR (event_start > %d AND event_end < %d)"; $result = db_query($query, $start, $start, $end, $end, $start, $end); return db_fetch_array($result); -} \ No newline at end of file +}