Index: signup.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/signup/signup.module,v
retrieving revision 1.184
diff -u -p -r1.184 signup.module
--- signup.module	7 Nov 2008 22:12:36 -0000	1.184
+++ signup.module	8 Nov 2008 08:29:26 -0000
@@ -367,12 +367,15 @@ function signup_help($path, $arg) {
   // CCK node types for signup.  We only want to do this if the $path
   // doesn't contain 'help#' since hook_help() is invoked twice on admin
   // pages.
-  if (arg(0) == 'admin' && arg(1) == 'content' && arg(2) == 'types'
-    && !preg_match('/.*help#.*/', $path)
+  if (!empty($arg[0]) && $arg[0] == 'admin' && $arg[1] == 'content'
     && function_exists('signup_date_check_node_types')
   ) {
-    $type = arg(3);
-    signup_date_check_node_types($type);
+    if ($arg[2] == 'types' && $arg[3] != 'add') {
+      signup_date_check_node_types();
+    }
+    elseif ($arg[2] == 'node-type') {
+      signup_date_check_node_types($arg[3]);
+    }
   }
 }
 
@@ -580,8 +583,8 @@ function signup_form_node_type_form_alte
     '#description' => t('If %disabled is selected, signups will not be possible for this content type. If %allowed_off is selected, signups will be off by default, but users with the %admin_all_signups permission will be able to allow signups for specific posts of this content type. If %enabled_on is selected, users will be allowed to signup for this content type unless an administrator disbles signups on specific posts.', array('%disabled' => t('Disabled'), '%allowed_off' => t('Allowed (off by default)'), '%enabled_on' => t('Enabled (on by default)'), '%admin_all_signups' => t('administer all signups'))),
   );
 
-  if (function_exists('_signup_date_alter_node_type_form')) {
-    _signup_date_alter_node_type_form($form_id, $form);
+  if (!empty($type) && function_exists('_signup_date_alter_node_type_form')) {
+    _signup_date_alter_node_type_form($form, $form_state);
   }
 }
 
@@ -1983,7 +1986,7 @@ function signup_sign_up_user($signup_for
     if ($node->signup_forwarding_email) {
       $message = t('The following information was submitted as a signup for !title', array('!title' => $node->title));
       if (_signup_get_node_scheduler($node) != 'none') {
-        $message .= "\n\r". t('Date/Time: !time', array('!time' => $signup_tokens['%time']));
+        $message .= "\n\r". t('Date/Time: !time', array('!time' => signup_format_date($node)));
       }
 
       $message .= "\n\r\n\r". t('Username: !name', array('!name' => empty($user->uid) ? variable_get('anonymous', t('Anonymous')) : $user->name));
Index: includes/date.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/signup/includes/date.inc,v
retrieving revision 1.6
diff -u -p -r1.6 date.inc
--- includes/date.inc	6 Nov 2008 10:20:48 -0000	1.6
+++ includes/date.inc	8 Nov 2008 08:29:26 -0000
@@ -24,7 +24,7 @@ function signup_field_names($content_typ
   $content_type_info = _content_type_info();
   if ($content_type_info['content types'][$content_type]) {
     foreach ($content_type_info['content types'][$content_type]['fields'] as $field) {
-      if (in_array($field['type'], array('date', 'datestamp'))) {
+      if (in_array($field['type'], array('date', 'datestamp', 'datetime'))) {
         $fields[$field['field_name']] = $field['widget']['label'];
       }
     }
@@ -84,9 +84,9 @@ function _signup_date_get_node_scheduler
  * field as the Signup date field (for autoclose and reminder emails).
  *
  */
-function signup_form_content_admin_field_alter(&$form, &$form_state) {
+function signup_form_content_field_edit_form_alter(&$form, &$form_state) {
   $type = $form['type_name']['#value'];
-  if (in_array($form['field_type']['#value'], array('date', 'datestamp')) && variable_get('signup_node_default_state_'. $type, 'disabled') != 'disabled') {
+  if (in_array($form['#field']['type'], array('date', 'datestamp', 'datetime')) && variable_get('signup_node_default_state_'. $type, 'disabled') != 'disabled') {
     $form['signup'] = array(
       '#type' => 'fieldset',
       '#title' => t('Signup settings'),
@@ -120,7 +120,7 @@ function _signup_date_field_form_submit(
  *
  * @see signup_alter_node_type_form()
  */
-function _signup_date_alter_node_type_form($form_id, &$form) {
+function _signup_date_alter_node_type_form(&$form, &$form_state) {
   drupal_add_js(drupal_get_path('module', 'signup') .'/js/admin.content_types.js');
   drupal_add_css(drupal_get_path('module', 'signup') .'/signup.css');
 
@@ -189,7 +189,7 @@ function _signup_date_field_element($typ
  * @see signup_help()
  * @see signup_date_field_check_config()
  */
-function signup_date_check_node_types($type) {
+function signup_date_check_node_types($type = NULL) {
   $names = node_get_types('names');
   if (!empty($type)) {
     signup_date_field_check_config($type, $names[$type]);
@@ -231,8 +231,8 @@ function signup_date_field_check_config(
       $placeholders = array(
         '%node_type' => $name,
         '%signup_date_field' => t('Date field to use with signup'),
-        '@type_admin_url' => url('admin/content/types/'. $type),
-        '@type_add_field_url' => url('admin/content/types/'. $type .'/add_field'),
+        '@type_admin_url' => url('admin/content/node-type/'. $type),
+        '@type_add_field_url' => url('admin/content/node-type/'. $type .'/fields'),
         '%none' => t('<none>'),
       );
       // Administrator hasn't specifically turned off date support...