Complete documentation for the Date and Date API modules is available at !link.
', array('!link' => l('http://drupal.org/node/92460', 'http://drupal.org/node/92460'))); break; Index: date/date_admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/date/date/date_admin.inc,v retrieving revision 1.40.2.3.2.17 diff -u -p -r1.40.2.3.2.17 date_admin.inc --- date/date_admin.inc 2 Oct 2008 20:22:49 -0000 1.40.2.3.2.17 +++ date/date_admin.inc 3 Oct 2008 23:12:17 -0000 @@ -45,26 +45,25 @@ function _date_widget_settings($op, &$fi * so do it in a custom function. */ function date_widget_settings_validate(&$form, &$form_state) { - $form_values = $form_state['values']; - if ($form_values['widget_type'] == 'date_popup') { + if ($form_state['values']['widget_type'] == 'date_popup') { // Only a limited set of formats is available for the Date Popup module - if (!empty($form_values['input_format_custom']) || !in_array($form_values['input_format'], date_popup_formats())) { + if (!empty($form_state['values']['input_format_custom']) || !in_array($form_state['values']['input_format'], date_popup_formats())) { form_set_value($form['input_format_custom'], NULL, $form_state); form_set_value($form['input_format'], DATE_FORMAT_DATETIME, $form_state); } // The jQuery calendar requires year, month, and day or it won't work. $date_parts = array('year', 'month', 'day'); - $intersection = array_intersect($date_parts, $form_values['granularity']); + $intersection = array_intersect($date_parts, $form_state['values']['granularity']); if ($intersection != $date_parts) { form_set_error('granularity', t('The Date Popup widget will not work unless granularity includes year, month, and day.')); } } - if (isset($form_values['advanced']['label_position'])) { - form_set_value($form['label_position'], $form_values['advanced']['label_position'], $form_state); + if (isset($form_state['values']['advanced']['label_position'])) { + form_set_value($form['label_position'], $form_state['values']['advanced']['label_position'], $form_state); } // Munge the table display for text parts back into an array of text parts. - if (is_array($form_values['advanced']['text_parts'])) { - form_set_value($form['text_parts'], array_keys(array_filter($form_values['advanced']['text_parts'])), $form_state); + if (is_array($form_state['values']['advanced']['text_parts'])) { + form_set_value($form['text_parts'], array_keys(array_filter($form_state['values']['advanced']['text_parts'])), $form_state); } } Index: date_copy/date_copy.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/date/date_copy/date_copy.module,v retrieving revision 1.16.2.1.2.5 diff -u -p -r1.16.2.1.2.5 date_copy.module --- date_copy/date_copy.module 2 Oct 2008 20:22:49 -0000 1.16.2.1.2.5 +++ date_copy/date_copy.module 3 Oct 2008 23:12:18 -0000 @@ -281,19 +281,17 @@ function date_copy_import_csv_form() { /** * iCal import form. */ -function date_copy_import_ical_form($form_values = NULL) { - if (!empty($form_values)) { - foreach ($form_values as $key => $value) { +function date_copy_import_ical_form($form_state) { + if (!empty($form_state['values'])) { + foreach ($form_state['values'] as $key => $value) { $form[$key] = array('#type' => 'hidden', '#default_value' => $value); } } - $step = intval($form_values['step'] + 1); + $step = intval($form_state['values']['step'] + 1); $form['step'] = array( '#type' => 'hidden', '#value' => $step, ); - $form['#multistep'] = TRUE; - $form['#redirect'] = FALSE; switch ($step) { case 1: // Select a content type to import into. @@ -309,13 +307,13 @@ function date_copy_import_ical_form($for case 2: // Select the fields to import into. $node_types = node_get_types('names'); - $type = $form_values['target_type']; + $type = $form_state['values']['target_type']; $form['target_type'] = array( '#value' => $type, '#type' => 'hidden', ); $form['source_file'] = array( - '#value' => $form_values['source_file'], + '#value' => $form_state['values']['source_file'], '#type' => 'hidden', ); $form['fields'] = array( @@ -331,8 +329,9 @@ function date_copy_import_ical_form($for return $form; } -function date_copy_import_ical_form_submit($form_id, $form_values) { - extract($form_values); +function date_copy_import_ical_form_submit($form, &$form_state) { + $form_state['rebuild'] = TRUE; + extract($form_state['values']); if ($step < 2) { return; } @@ -443,7 +442,7 @@ function date_copy_import_ical_form_subm /** * Event import form. */ -function date_copy_import_event_form($form_values = NULL) { +function date_copy_import_event_form($form_state) { // We can do an import if there are event fields available whether or not the event module is enabled // so we just check whether the table exists. if (!db_table_exists('event')) { @@ -451,13 +450,11 @@ function date_copy_import_event_form($fo return array(); } - $step = intval($form_values['step'] + 1); + $step = intval($form_state['values']['step'] + 1); $form['step'] = array( '#type' => 'hidden', '#value' => $step, ); - $form['#multistep'] = TRUE; - $form['#redirect'] = FALSE; switch ($step) { case 1: // Select a content type to import into. @@ -484,13 +481,13 @@ function date_copy_import_event_form($fo return $form; case 2: // Select the fields to import into. - $type = $form_values['target_type']; + $type = $form_state['values']['target_type']; $form['target_type'] = array( '#value' => $type, '#type' => 'hidden', ); $form['source_type'] = array( - '#value' => $form_values['source_type'], + '#value' => $form_state['values']['source_type'], '#type' => 'hidden', ); $form['fields'] = array( @@ -510,8 +507,9 @@ function date_copy_import_event_form($fo /** * Event import processing. */ -function date_copy_import_event_form_submit($form_id, $form_values) { - extract($form_values); +function date_copy_import_event_form_submit($form, &$form_state) { + $form_state['rebuild'] = TRUE; + extract($form_state['values']); if ($step != 2) return; // workaround to disable drupal messages when nodes are created or deleted Index: date_php4/date_php4.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/date/date_php4/date_php4.module,v retrieving revision 1.4.6.2 diff -u -p -r1.4.6.2 date_php4.module --- date_php4/date_php4.module 3 Oct 2008 14:06:35 -0000 1.4.6.2 +++ date_php4/date_php4.module 3 Oct 2008 23:12:18 -0000 @@ -57,6 +57,5 @@ function date_php4_settings_form() { } function date_php4_settings_form_submit($form, &$form_state) { - $form_values = $form_state['values']; - variable_set('date_use_server_zone', $form_values['date_use_server_zone']); + variable_set('date_use_server_zone', $form_state['values']['date_use_server_zone']); } Index: date_popup/date_popup.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/date/date_popup/date_popup.install,v retrieving revision 1.5 diff -u -p -r1.5 date_popup.install --- date_popup/date_popup.install 29 Sep 2007 16:30:16 -0000 1.5 +++ date_popup/date_popup.install 3 Oct 2008 23:12:18 -0000 @@ -11,7 +11,7 @@ function date_popup_requirements($phase) case 'runtime': $error = FALSE; if (!file_exists(drupal_get_path('module', 'date_popup') .'/lib/jquery.timeentry.pack.js')) { - $message .= t('Download jquery.timeentry.pack.js and jquery.timeentry.css from the jquery-timeentry home page at !link and install them in the /lib/ folder of the Date Popup module.
', array('!link' => l('http://home.iprimus.com.au/kbwood/jquery/timeEntry.html', 'http://home.iprimus.com.au/kbwood/jquery/timeEntry.html', array(), NULL, NULL, FALSE, TRUE))); + $message .= t('Download jquery.timeentry.pack.js and jquery.timeentry.css from the jquery-timeentry home page at !link and install them in the /lib/ folder of the Date Popup module.
', array('!link' => l('http://home.iprimus.com.au/kbwood/jquery/timeEntry.html', 'http://home.iprimus.com.au/kbwood/jquery/timeEntry.html', array('html' => TRUE)))); } if (!empty($message)) { $requirements['date_popup_files'] = array(