Index: event.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/event/event.module,v
retrieving revision 1.181
diff -u -r1.181 event.module
--- event.module 9 Dec 2005 17:32:22 -0000 1.181
+++ event.module 11 Dec 2005 02:46:12 -0000
@@ -703,7 +703,6 @@
function _event_node_ical($node) {
$event = array();
// Allow modules to affect item fields
- node_invoke_nodeapi($node, 'view', 'ical item');
node_invoke_nodeapi($node, 'ical item');
$event['start'] = $node->event_start;
$event['end'] = $node->event_end;
@@ -1715,22 +1714,12 @@
*/
function event_form_alter($form_id, &$form) {
- if (isset($form['type']) && $form['type']['#value'] .'_node_settings' == $form_id) {
- $type = $form['type']['#value'];
- $form['workflow']['event_nodeapi_'. $type] = array(
- '#type' => 'radios',
- '#title' => t('Show in event calendar'),
- '#default_value' => variable_get('event_nodeapi_'. $type, 'never'),
- '#options' => array('all' => t('All views'), 'solo' => t('Only in views for this type'), 'never' => t('Never')),
- '#description' => t('All views: This content type will be available for display on all calendar views, including with other events.
Only in views for this type: This content type will only appear in calendar views specific to this type and never with other events.
Never: This content type will not be associated with the events calendar.')
- );
- }
-
- if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
- $node = $form['#node'];
+ $type = $form['type']['#value'];
- if (variable_get('event_nodeapi_'. $node->type, 'never') != 'never') {
- global $user;
+ switch ($form_id) {
+ // node edit form
+ case $type .'_node_form':
+ if (variable_get('event_nodeapi_'. $type, 'never') != 'never') {
$form['event_start'] = array(
'#type' => 'fieldset',
'#title' => t('Start'),
@@ -1770,6 +1759,18 @@
);
}
}
+ break;
+
+ // node settings form
+ case $type .'_node_settings':
+ $form['workflow']['event_nodeapi_'. $type] = array(
+ '#type' => 'radios',
+ '#title' => t('Show in event calendar'),
+ '#default_value' => variable_get('event_nodeapi_'. $type, 'never'),
+ '#options' => array('all' => t('All views'), 'solo' => t('Only in views for this type'), 'never' => t('Never')),
+ '#description' => t('All views: This content type will be available for display on all calendar views, including with other events.
Only in views for this type: This content type will only appear in calendar views specific to this type and never with other events.
Never: This content type will not be associated with the events calendar.')
+ );
+ break;
}
}
@@ -1778,10 +1779,13 @@
*
* @ingroup event_nodeapi
*/
-function event_nodeapi(&$node, $op, $arg = 0) {
- if(variable_get('event_nodeapi_'. $node->type, 'never') != 'never') {
+function event_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
+ // make sure it's an event enabled node
+ if (variable_get('event_nodeapi_'. $node->type, 'never') != 'never') {
switch ($op) {
- case 'execute':
+ case 'validate':
+ // no break, both need the same tweaking
+ case 'execute':
event_validate_form_date($node, 'start');
event_validate_form_date($node, 'end');
if ($node->event_end < $node->event_start) {
@@ -1810,15 +1814,13 @@
break;
case 'update':
- if (variable_get('event_nodeapi_'. $node->type, 'never') != 'never') {
- // While the DELETE/INSERT is less efficient than single UPDATE, the
- // UPDATE only works if there's an existing record in the events
- // table. I.e. if you create a node and then enable the event module,
- // there will be no record in the event table, so the dates cannot be
- // changed.
- db_query('DELETE FROM {event} WHERE nid = %d', $node->nid);
- db_query('INSERT INTO {event} (nid, event_start, event_end, timezone) VALUES (%d, %d, %d, %d)', $node->nid, $node->event_start, $node->event_end, $node->timezone);
- }
+ // While the DELETE/INSERT is less efficient than single UPDATE, the
+ // UPDATE only works if there's an existing record in the events
+ // table. I.e. if you create a node and then enable the event module,
+ // there will be no record in the event table, so the dates cannot be
+ // changed.
+ db_query('DELETE FROM {event} WHERE nid = %d', $node->nid);
+ db_query('INSERT INTO {event} (nid, event_start, event_end, timezone) VALUES (%d, %d, %d, %d)', $node->nid, $node->event_start, $node->event_end, $node->timezone);
event_set_range();
break;
@@ -1846,25 +1848,24 @@
}
$ctype = module_invoke('flexinode', 'load_content_type', $node->ctype_id);
- return array('event_start' => $object->event_start,
- 'event_end' => $object->event_end,
- 'start_offset' => $start_offset,
- 'end_offset' => $end_offset,
- 'timezone' => $object->timezone,
- 'start_format' => format_date($object->event_start, 'small', '', $start_offset),
- 'end_format' => format_date($object->event_end, 'small', '', $end_offset),
- 'start_time_format' => format_date($object->event_start, 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'), $start_offset),
- 'end_time_format' => format_date($object->event_end, 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'), $end_offset),
- 'event_node_title' => ($ctype->name ? $ctype->name : $node->type));
+ return array(
+ 'event_start' => $object->event_start,
+ 'event_end' => $object->event_end,
+ 'timezone' => $object->timezone,
+ 'start_offset' => $start_offset,
+ 'start_format' => format_date($object->event_start, 'small', '', $start_offset),
+ 'start_time_format' => format_date($object->event_start, 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'), $start_offset),
+ 'end_offset' => $end_offset,
+ 'end_format' => format_date($object->event_end, 'small', '', $end_offset),
+ 'end_time_format' => format_date($object->event_end, 'custom', (variable_get('event_ampm', '0') ? 'g:i a' : 'H:i'), $end_offset),
+ 'event_node_title' => ($ctype->name ? $ctype->name : $node->type));
break;
- case 'view':
- if ($arg != 'ical item') {
- $node->body = theme('event_nodeapi', $node). $node->body;
- $node->teaser = theme('event_nodeapi', $node). $node->teaser;
- }
+ case 'ical item':
break;
+ case 'view':
+ // no break, use the same case
case 'rss item':
$node->body = theme('event_nodeapi', $node). $node->body;
$node->teaser = theme('event_nodeapi', $node). $node->teaser;