Index: INSTALL.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/INSTALL.txt,v retrieving revision 1.1.2.3 diff -u -F^f -r1.1.2.3 INSTALL.txt --- INSTALL.txt 6 Jun 2006 08:42:21 -0000 1.1.2.3 +++ INSTALL.txt 15 Jun 2006 00:36:33 -0000 @@ -34,10 +34,8 @@ allow signups: allows the selected role to sign up for nodes - NOTE: Enabling 'allow signups' for the anonymous user will only place a - login/register link in any signup node that an anonymous user may - visit. Signup module does not currently support signups for - anonymous users. + NOTE: Enabling 'allow signups' for the anonymous user will allow anonymous + users to sign up by entering an email address. admin signups: allows the selected role to view who has signed up for nodes Index: README.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/README.txt,v retrieving revision 1.3.2.1 diff -u -F^f -r1.3.2.1 README.txt --- README.txt 6 Jun 2006 08:30:43 -0000 1.3.2.1 +++ README.txt 15 Jun 2006 00:36:33 -0000 @@ -8,9 +8,18 @@ the event.module installed), it can also send out reminder emails to all signups X days before the start of the event (per node setting), and automatically close event signups X hours before their start -(general setting). Settings exist for resticting signups to selected +(general setting). Settings exist for restricting signups to selected roles and content types. +Support exists for both registered and anonymous users to sign up for +events. Both can receive confirmation and reminder emails, and +registered users are also able to cancel their signups and view listings +of their current signups. + +Conflict resolution features for registered users is also available by +enabling the signup_conflicts module, located in the contrib folder of the +signup module. + For installation instructions, see INSTALL.txt. Send feature requests and bug reports to the issue tracking system for Index: TODO.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/TODO.txt,v retrieving revision 1.1.2.2 diff -u -F^f -r1.1.2.2 TODO.txt --- TODO.txt 6 Jun 2006 08:30:43 -0000 1.1.2.2 +++ TODO.txt 15 Jun 2006 00:36:33 -0000 @@ -6,8 +6,6 @@ features, please email signup@dwwright.n * add support limiting signups to certain roles, per node -* veiwing/manual opening of closed signups - * make datetime display dependent on medium date format display setting in admin/settings @@ -26,11 +24,6 @@ features, please email signup@dwwright.n * support for admin own signups -* user page support where users can see a list of the events they've - signed up for - -* ability for admins to cancel signups from the signup tab - * feature to allow event admins to email signup group * fix reminder message notification so it doesn't display on signups Index: signup.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/signup.install,v retrieving revision 1.2.2.3 diff -u -F^f -r1.2.2.3 signup.install --- signup.install 6 Jun 2006 22:02:22 -0000 1.2.2.3 +++ signup.install 15 Jun 2006 00:36:33 -0000 @@ -1,6 +1,6 @@ TRUE, 'default' => '')); + $ret[] = update_sql("DROP INDEX {signup_log}_uid_nid_idx;"); + $ret[] = update_sql("CREATE INDEX {signup_log}_uid_idx ON {signup_log}(uid);"); + $ret[] = update_sql("CREATE INDEX {signup_log}_nid_idx ON {signup_log}(nid);"); + break; + + } + return $ret; +} Index: signup.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/signup.module,v retrieving revision 1.45.2.16 diff -u -F^f -r1.45.2.16 signup.module --- signup.module 14 Jun 2006 18:36:20 -0000 1.45.2.16 +++ signup.module 15 Jun 2006 00:36:33 -0000 @@ -1,7 +1,7 @@ forwarding_email ? $event->forwarding_email : $site_mail; $header = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"; $subject = t('Event reminder: %event', array('%event' => $event->title)); - $signups = db_query("SELECT u.name, u.mail FROM {signup_log} s_l INNER JOIN {users} u ON u.uid = s_l.uid + $signups = db_query("SELECT u.name, u.mail, s_l.anon_mail FROM {signup_log} s_l INNER JOIN {users} u ON u.uid = s_l.uid WHERE s_l.nid = %d", $event->nid); //get timezone offset @@ -69,11 +72,12 @@ function signup_cron() { //loop through the users, composing their customized message and sending the email while ($signup = db_fetch_object($signups)) { + $mail_address = $signup->anon_mail ? $signup->anon_mail : $signup->mail; $trans = array("%event" => $event->title, "%time" => _event_date(variable_get('signup_date_string', 'D, M jS, g:i A'), - $event->event_start, $offset), "%username" => $signup->name, "%useremail" => $signup->mail); + $event->event_start, $offset), "%username" => $signup->name, "%useremail" => $mail_address); $message = strtr($event->reminder_email, $trans); - user_mail($signup->mail, $subject, $message, $header); - watchdog('signup', t('Reminder for %event sent to %useremail.', array('%event' => $event->title, '%useremail' => $signup->mail))); + user_mail($mail_address, $subject, $message, $header); + watchdog('signup', t('Reminder for %event sent to %useremail.', array('%event' => $event->title, '%useremail' => $mail_address))); } //reminders for this event are all sent, so mark it in the database so they're not sent again @@ -141,9 +145,6 @@ function signup_menu($may_cache) { $items[] = array('path' => 'admin/signup/overview', 'title' => t('overview'), 'access' => $access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - //user signup callbacks - $items[] = array('path' => 'signup', 'access' => TRUE, 'type' => MENU_CALLBACK, 'callback' => 'signup_user_signup'); - //close signup callback $items[] = array('path' => 'closesignup', 'access' => $access, 'type' => MENU_CALLBACK, 'callback' => 'signup_close_signup'); @@ -215,9 +216,9 @@ function signup_user($op, &$edit, &$user } /** - * @defgroup signup_nodeapi Functions for nodeapi integration + * Implementation of hook_form_alter(). + * @ingroup signup_core */ - function signup_form_alter($form_id, &$form) { if (isset($form['type']) && $form['type']['#value'] .'_node_settings' == $form_id) { $type = $form['type']['#value']; @@ -265,6 +266,61 @@ function signup_form_alter($form_id, &$f } } +/** + * Submits the cancel signup form + * + * @ingroup signup_core + * @param $form_id The ID of the form being submitted. + * @param $form_values The constructed form values array of the submitted form. + */ +function signup_form_cancel_submit($form_id, $form_values) { + + signup_cancel_signup($form_values['uid'], $form_values['nid'], $form_values['signup_anon_mail']); +} + +/** + * Executes the user signup form + * + * @ingroup signup_core + * @param $form_id The ID of the form being submitted. + * @param $form_values The constructed form values array of the submitted form. + */ +function signup_form_view_submit($form_id, $form_values) { + + signup_sign_up_user($form_values); +} + +/** + * Validates the user signup form + * + * @ingroup signup_core + * @param $form_id The ID of the form being submitted. + * @param $form_values The constructed form values array of the submitted form. + */ +function signup_form_view_validate($form_id, $form_values) { + + //if it's an anon signup... + $anon_mail = $form_values['signup_anon_mail'] ? trim($form_values['signup_anon_mail']) : ''; + if ($anon_mail) { + //validate the email address + if (!valid_email_address($anon_mail)) { + form_set_error('signup_anon_mail', t('Invalid email address entered for signup.')); + } + //throw an error if the email is already taken by a registered user + if (db_num_rows(db_query("SELECT mail FROM {users} WHERE mail = '%s'", $anon_mail))) { + form_set_error('signup_anon_mail', t('The email address entered for signup belongs to a registered user.')); + } + //throw an error if the email is already taken by an anon user + if (db_num_rows(db_query("SELECT anon_mail FROM {signup_log} WHERE anon_mail = '%s' AND nid = %d", $anon_mail, $form_values['nid']))) { + form_set_error('signup_anon_mail', t('The email address entered has already been used to sign up for this event.')); + } + } +} + +/** + * @defgroup signup_nodeapi Functions for nodeapi integration + */ + /** * hook_nodeapi implementation * @@ -356,28 +412,52 @@ function signup_nodeapi(&$node, $op, $ar } } else { - //this is an anonymous user. if they have signup permissions, then display a login link + //build some initial form elements + $form['nid'] = array('#type' => 'value', '#value' => $node->nid); + $form['uid'] = array('#type' => 'value', '#value' => $user->uid); + + //this is an anonymous user. if they have signup permissions, then build the anon portion + //of the sigup form. if not, then display the login link if ($user->uid == 0) { - $node->body .= user_access('allow signups') ? '
'. t('

Please %login to sign up for this event.

', - array("%login"=> l(t('login/register'), 'user/login', array(), drupal_get_destination()))) .'
' : ''; - break; - } + $login_array = array('%login' => l(t('login'), 'user/login', array(), drupal_get_destination()), '%register' => l(t('register'), 'user/register', array(), drupal_get_destination())); + if (user_access('allow signups')) { + $needs_signup_form = TRUE; + $anon_signup_form['signup_anon_mail'] = array('#type' => 'textfield', + '#title' => t('Email'), + '#description' => t('An e-mail address is required for users who are not registered at this site. If you are a registered user at this site, please %login to sign up for this event.', $login_array), + '#size' => 40, + '#maxlength' => 255, + '#required' => TRUE, + ); + } else { + $needs_signup_form = FALSE; + $node->body .= '
'. t('

Please %login or %register to sign up for this event.

', + $login_array) .'
'; - //check here to see if the user is already signed up for this node - $result = db_query("SELECT signup_time, form_data FROM {signup_log} WHERE uid = %d AND nid =%d", - $user->uid, $node->nid); - $form['nid'] = array('#type' => 'hidden', '#value' => $node->nid); - $form['uid'] = array('#type' => 'hidden', '#value' => $user->uid); - $form['#action'] = url('signup', drupal_get_destination()); + break; + } + } else { + //check here to see if the user is already signed up for this node + $result = db_query("SELECT signup_time, form_data FROM {signup_log} WHERE uid = %d AND nid =%d", + $user->uid, $node->nid); + $needs_signup_form = !db_num_rows($result); + } - if(db_num_rows($result) == 0) { + if($needs_signup_form) { //user isn't signed up, so check to make sure they have signup //permissions. if this is the case, then print the themed signup form if (user_access('allow signups')) { $form['collapse'] = array('#type' => 'fieldset', '#title' => t('Sign up for %title', array('%title' => check_plain($node->title))), '#collapsible' => TRUE, '#collapsed' => TRUE); - $form['collapse']['signup_user_form'] = theme('signup_user_form'); + //build the themed signup form. if the anon signup form is present, merge it in at the end + //of the form. + $signup_themed_form = theme('signup_user_form'); + if (isset($anon_signup_form)) { + $signup_themed_form = array_merge($signup_themed_form, $anon_signup_form); + } + $form['collapse']['signup_user_form'] = $signup_themed_form; + $form['collapse']['submit'] = array('#type' => 'submit', '#value' => t('Sign up')); $output = drupal_get_form('signup_form_view', $form); } @@ -394,24 +474,28 @@ function signup_nodeapi(&$node, $op, $ar } } $form['submit'] = array('#type' => 'submit', '#value' => t('Cancel Signup')); - $output = theme('table', $header, $rows) . drupal_get_form('signup_form_view', $form); + $output = theme('table', $header, $rows) . drupal_get_form('signup_form_cancel', $form); } } //if user has signup perm, and signup_user_view is enabled, then display the current signups //pull all user signed up for this event, and start table creation if (user_access('allow signups') && variable_get('signup_user_view', 0)) { - $signups = db_query("SELECT u.uid, u.name, s.signup_time, s.form_data FROM {signup_log} s INNER JOIN {users} u ON - u.uid = s.uid WHERE s.nid =%d", $node->nid); - $header = array(array('data' => t('%users signed up', array('%users' => format_plural(db_num_rows($signups), '1 individual', '%count individuals'))))); + $registered_signups = db_query("SELECT u.uid, u.name, s.signup_time, s.form_data FROM {signup_log} s INNER JOIN {users} u ON + u.uid = s.uid WHERE s.nid =%d AND u.uid != 0", $node->nid); + $anon_signups = db_num_rows(db_query("SELECT anon_mail FROM {signup_log} WHERE nid =%d AND uid = 0", $node->nid)); + $header = array(array('data' => t('%users signed up', array('%users' => format_plural((db_num_rows($registered_signups) + $anon_signups), '1 individual', '%count individuals'))))); $rows = array(); //loop through the users - while ($signed_up_user = db_fetch_object($signups)) { + while ($signed_up_user = db_fetch_object($registered_signups)) { //build the row for this user $rows[] = array(l(check_plain($signed_up_user->name), "user/$signed_up_user->uid")); } + if ($anon_signups) { + $rows[] = array(t('%count anonymous', array('%count' => $anon_signups))); + } $output .= theme('table', $header, $rows); } $node->body .= $output; @@ -471,6 +555,9 @@ function signup_admin_page() { while ($signup_event = db_fetch_object($result)) { $row = array(); if ($_EVENT) { + //must include this here as event module doesn't include timezone support on all page requests + include_once(drupal_get_path('module', 'event') .'/event_timezones.inc'); + $offset = $signup_event->event_start ? event_get_offset($signup_event->timezone, $signup_event->event_start) : ''; $row[] = $signup_event->event_start ?_event_date(variable_get('signup_date_string', 'D, M jS, g:i A'), $signup_event->event_start, $offset) : ''; @@ -494,17 +581,20 @@ function signup_admin_page() { * Callback function for canceling signups * @ingroup signup_callback */ -function signup_cancel_signup($uid, $nid) { +function signup_cancel_signup($uid, $nid, $anon_mail = NULL) { //delete the selected user from the log table and return to the previous page - db_query("DELETE FROM {signup_log} WHERE uid = %d AND nid = %d", $uid, $nid); + if ($anon_mail) { + db_query("DELETE FROM {signup_log} WHERE anon_mail = '%s'", $anon_mail); + } else { + db_query('DELETE FROM {signup_log} WHERE uid = %d AND nid = %d', $uid, $nid); + } $node = node_load($nid); foreach (module_implements('signup_cancel') as $module) { $function = $module .'_signup_cancel'; $function($node); } drupal_set_message(t('Signup to %title cancelled.', array('%title' => l($node->title, "node/$node->nid")))); - drupal_goto(); } @@ -598,88 +688,99 @@ function signup_list_user_signups($uid) $titles = array(); - //tests for optional support of event.module - $_EVENT = module_exist('event'); - $event_join = $_EVENT ? ' LEFT JOIN {event} e ON e.nid = n.nid' : ''; - $event_where = $_EVENT ? ' AND (e.event_start >= '. time() . ' OR e.event_start IS NULL)' : ''; - $order_by = $_EVENT ? 'e.event_start' : 'n.title'; + //we don't want to return anything for anon users... + if ($uid != 0) { + //tests for optional support of event.module + $_EVENT = module_exist('event'); + $event_join = $_EVENT ? ' LEFT JOIN {event} e ON e.nid = n.nid' : ''; + $event_where = $_EVENT ? ' AND (e.event_start >= '. time() . ' OR e.event_start IS NULL)' : ''; + $order_by = $_EVENT ? 'e.event_start' : 'n.title'; + + //pull all open signup nodes for this user + $result = db_query("SELECT n.title, n.nid FROM {signup_log} s_l INNER JOIN {node} n ON n.nid = s_l.nid + $event_join WHERE s_l.uid = '%s'$event_where ORDER BY $order_by", $uid); - //pull all open signup nodes for this user - $result = db_query("SELECT n.title, n.nid FROM {signup_log} s_l INNER JOIN {node} n ON n.nid = s_l.nid - $event_join WHERE s_l.uid = '%s'$event_where ORDER BY $order_by", $uid); - - while ($node = db_fetch_array($result)) { - $titles[$node['nid']] = l($node['title'], 'node/'. $node['nid']); + while ($node = db_fetch_array($result)) { + $titles[$node['nid']] = l($node['title'], 'node/'. $node['nid']); + } } return $titles; } /** - * Signs up a user to a node. NOTE: other modules can call this function. To do so, edit must be as follows: + * Signs up a user to a node. NOTE: other modules can call this function. To do so, $signup_form must be as follows: * - * edit['nid'] : nid of the node to which the user will be signed up - * edit['uid'] : uid of the user to sign up - * $edit['signup_form_data'] : an array of key/value pairs -- key is the data category, value is the user input + * $signup_form['nid'] : nid of the node to which the user will be signed up + * $signup_form['uid'] : uid of the user to sign up + * $signup_form['signup_form_data'] : an array of key/value pairs -- key is the data category, value is the user input * */ -function signup_sign_up_user($edit = NULL) { +function signup_sign_up_user($signup_form) { - $edit = $edit ? $edit : $_POST['edit']; - $user = user_load(array('uid' => $edit['uid'])); + $user = user_load(array('uid' => $signup_form['uid'])); if (user_access('allow signups')) { //this check is in case a node type was enabled, and the node the user is trying to sign up for is not in //the signup table. this would be the case for all nodes created when signup.module was not enabled. if //no row exists for this node, then grab the signup defaults and create a new row before proceeding - if (db_num_rows(db_query("SELECT * FROM {signup} WHERE nid = %d", $edit['nid'])) == 0) { + if (db_num_rows(db_query("SELECT * FROM {signup} WHERE nid = %d", $signup_form['nid'])) == 0) { $defaults = db_fetch_object(db_query("SELECT * FROM {signup} WHERE nid = 0")); db_query("INSERT INTO {signup} (nid, forwarding_email, send_confirmation, confirmation_email, send_reminder, reminder_days_before, reminder_email) VALUES (%d, '%s', %d, '%s', %d, %d, '%s')", - $edit['nid'], $defaults->signup_forwarding_email, $defaults->signup_send_confirmation, + $signup_form['nid'], $defaults->signup_forwarding_email, $defaults->signup_send_confirmation, $defaults->signup_confirmation_email, $defaults->signup_send_reminder, $defaults->signup_reminder_days_before, $defaults->signup_reminder_email); } - //get current time and serialize the user's signup data + //get current time. $curtime = time(); //allow other modules to inject data into the user's signup data. - $node = node_load($edit['nid']); + $node = node_load($signup_form['nid']); $extra = module_invoke_all('signup_sign_up', $node); - $signup_form_data = serialize(array_merge($edit['signup_form_data'], $extra)); + $signup_form_data = serialize(array_merge($signup_form['signup_form_data'], $extra)); //pull this event from the signup table, determine if reminder/confirmation emails are going to be sent, //and inform the user - $event = db_fetch_object(db_query("SELECT * FROM {signup} WHERE nid = %d", $edit['nid'])); + $event = db_fetch_object(db_query("SELECT * FROM {signup} WHERE nid = %d", $signup_form['nid'])); $confirmation_email = $event->send_confirmation ? ' ' . t('You will receive a confirmation email shortly which contains further event information.') : ''; $reminder_email = $event->send_reminder ? ' ' . t('You will receive a reminder email %number %days before the event.', array('%number' => $event->reminder_days_before, '%days' => format_plural($event->reminder_days_before, t('day'), t('days')))) : ''; //insert the user into the signup_log - db_query("INSERT INTO {signup_log} (uid, nid, signup_time, form_data) VALUES - (%d, %d, %d, '%s')", $edit['uid'], $edit['nid'], $curtime, $signup_form_data); + db_query("INSERT INTO {signup_log} (uid, nid, anon_mail, signup_time, form_data) VALUES + (%d, %d, '%s', %d, '%s')", $signup_form['uid'], $signup_form['nid'], $signup_form['signup_anon_mail'], $curtime, $signup_form_data); - //load the node, format the start time, and compose the user's signup data for later use in the emails + //must include this here as event module doesn't include timezone support on all page requests + if (module_exist('event')) { + include_once(drupal_get_path('module', 'event') .'/event_timezones.inc'); + } + + //format the start time, and compose the user's signup data for later use in the emails $offset = $node->event_start ? event_get_offset($node->timezone, $node->event_start) : ''; $starttime = $node->event_start ? _event_date(variable_get('signup_date_string', 'D, M jS, g:i A'), - $node->event_start, $offset) : t('[Untimed]'); + $node->event_start, $offset) : t('[Untimed]'); $signup_data_array = array(); - foreach ($edit['signup_form_data'] as $key => $value) { + foreach ($signup_form['signup_form_data'] as $key => $value) { $signup_data_array[] = $key . ': ' . $value; } $signup_data = t('SIGNUP INFORMATION') . "\n\r\n\r" . implode("\n\r", $signup_data_array); + + //determine if this is an anon signup or not, and get the appropriate email address + $user_mail = $signup_form['signup_anon_mail'] ? $signup_form['signup_anon_mail'] : $user->mail; + $trans = array("%event" => $node->title, "%time" => $starttime, "%username" => $user->name, - "%useremail" => $user->mail, "%info" => $signup_data); + "%useremail" => $user_mail, "%info" => $signup_data); $site_mail = variable_get('site_mail', 'noadmin@noadmin.com'); $from = $event->forwarding_email ? $event->forwarding_email : $site_mail; //if a confirmation is to be sent, compose the mail message, translate the string substitutions, and send it - if ($event->send_confirmation && $user->mail) { + if ($event->send_confirmation && $user_mail) { $header = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"; $subject = t('Signup confirmation for event: %event', array('%event' => $node->title)); $message = strtr($event->confirmation_email, $trans); - user_mail($user->mail, $subject, $message, $header); + user_mail($user_mail, $subject, $message, $header); } //if a forwarding email is to be sent, compose the mail message, translate the string substitutions, and send it @@ -688,7 +789,7 @@ function signup_sign_up_user($edit = NUL $subject = t('Signup confirmation for event: %title', array('%title' => $node->title)); $message = t('The following information was submitted as a signup for %title', array('%title' => $node->title)) . "\n\r" . t('Date/Time: %time', array('%time'=>$starttime)) . ":\n\r\n\r\n\r" . t('username:') . $user->name . - "\n\r" . t('email:') . $user->mail . "\n\r\n\r" . $signup_data; + "\n\r" . t('email:') . $user_mail . "\n\r\n\r" . $signup_data; user_mail($event->forwarding_email, $subject, $message, $header); } drupal_set_message(t('Signup to %title confirmed.', array('%title' => l($node->title, "node/$node->nid"))) . $confirmation_email . $reminder_email); @@ -719,49 +820,13 @@ function signup_user_schedule() { } /** - * Callback function which handles sending of emails upon user signup, and signup cancellations - * @ingroup signup_callback - */ -function signup_user_signup() { - - $op = $_POST['op']; - $edit = $_POST['edit']; - - global $user; - - switch ($op) { - case t("Sign up"): - signup_sign_up_user(); - - break; - - //user has elected to cancel their signup, so delete them from the log, and warn - case t('Cancel Signup'): - signup_cancel_signup($edit['uid'], $edit['nid']); - break; - } - - //send the user back to the same page, or to node if it's not available - $dest = $_REQUEST['destination']; - unset($_REQUEST['destination']); - if ($dest) { - //go back to the original node... - drupal_goto($dest); - } else { - // last resort - drupal_goto('node'); - } - -} - -/** * Prints the signup details for a single node when the signups tab is clicked * @ingroup signup_callback */ function signup_user_signups_form($node) { //pull all user signed up for this event, and start table creation - $result = db_query("SELECT u.uid, u.name, s.signup_time, s.form_data FROM {signup_log} s INNER JOIN {users} u ON + $result = db_query("SELECT u.uid, u.name, s.anon_mail, s.signup_time, s.form_data FROM {signup_log} s INNER JOIN {users} u ON u.uid = s.uid WHERE s.nid =%d", $node->nid); $output = "

" . check_plain($node->title) . "

"; $header = array(array('data' => t('%users signed up', array('%users' => format_plural(db_num_rows($result), '1 individual', '%count individuals'))), 'colspan' => 3)); @@ -783,15 +848,26 @@ function signup_user_signups_form($node) // build the form for this row $form = array(); - $form['#action'] = url('signup', drupal_get_destination()); - $form['nid'] = array('#type' => 'hidden', '#value' => $node->nid); - $form['uid'] = array('#type' => 'hidden', '#value' => $signed_up_user->uid); + $form['nid'] = array('#type' => 'value', '#value' => $node->nid); + $form['uid'] = array('#type' => 'value', '#value' => $signed_up_user->uid); + $form['signup_anon_mail'] = array('#type' => 'value', '#value' => $signed_up_user->anon_mail); $form['submit'] = array('#type' => 'submit', '#value' => t('Cancel Signup')); + //the username and the unique form identifier are different for anon signups and registered user signups + //for registered users, provide a link to the user profile, and use the uid as the identifier. for anon, + //use the site 'anonymous' setting, and the user's email address as the identifier. + if ($signed_up_user->uid == 0) { + $username = check_plain($signed_up_user->anon_mail) .'
('. check_plain(variable_get('anonymous', t('Anonymous'))) . ')'; + $id = $signed_up_user->anon_mail; + } else { + $username = l($signed_up_user->name, "user/$signed_up_user->uid"); + $id = $signed_up_user->uid; + } + //build the row for this user - $rows[] = array(l(check_plain($signed_up_user->name), "user/$signed_up_user->uid") .'
'. + $rows[] = array($username .'
'. gmdate(variable_get('signup_date_string', 'M jS, g:i A'), $signed_up_user->signup_time + $offset), - implode('
', $table_data), drupal_get_form('signup_user_signups_form_'. $node->nid, $form)); + implode('
', $table_data), drupal_get_form('signup_user_signups_form_'. $id, $form, 'signup_form_cancel')); } $output .= theme('table', $header, $rows); print theme('page', $output); Index: signup.theme =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/signup.theme,v retrieving revision 1.4.2.2 diff -u -F^f -r1.4.2.2 signup.theme --- signup.theme 6 Jun 2006 21:35:43 -0000 1.4.2.2 +++ signup.theme 15 Jun 2006 00:36:33 -0000 @@ -42,7 +42,6 @@ function theme_signup_user_schedule($nod function theme_signup_user_form() { $form['signup_form_data']['#tree'] = TRUE; $form['signup_form_data']['Name'] = array('#type' => 'textfield', '#title' => t('Name'), '#size' => 40, '#maxlength' => 64); - $form['signup_form_data']['Email'] = array('#type' => 'textfield', '#title' => t('Email'), '#size' => 40, '#maxlength' => 64); $form['signup_form_data']['Phone'] = array('#type' => 'textfield', '#title' => t('Phone'), '#size' => 40, '#maxlength' => 64); return $form; Index: contrib/signup_conflicts/signup_conflicts.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/contrib/signup_conflicts/signup_conflicts.module,v retrieving revision 1.3 diff -u -F^f -r1.3 signup_conflicts.module --- contrib/signup_conflicts/signup_conflicts.module 17 Apr 2006 00:13:57 -0000 1.3 +++ contrib/signup_conflicts/signup_conflicts.module 15 Jun 2006 00:36:34 -0000 @@ -138,7 +138,7 @@ function signup_conflicts_user($op, &$ed function signup_conflicts_detail() { //pull all users who have signed up for a node - $result = db_query('SELECT DISTINCT u.uid, u.name FROM {users} u INNER JOIN {signup_log} s on u.uid = s.uid ORDER BY u.name'); + $result = db_query('SELECT DISTINCT u.uid, u.name FROM {users} u INNER JOIN {signup_log} s on u.uid = s.uid WHERE u.uid != 0 ORDER BY u.name'); //for each user, build a conflict detail section, and add their number of conflicts to the total while ($user = db_fetch_object($result)) { @@ -167,7 +167,7 @@ function signup_conflicts_detail() { function signup_conflicts_summary() { //pull all users who have signed up for a node - $result = db_query('SELECT DISTINCT u.uid, u.name FROM {users} u INNER JOIN {signup_log} s on u.uid = s.uid ORDER BY u.name'); + $result = db_query('SELECT DISTINCT u.uid, u.name FROM {users} u INNER JOIN {signup_log} s on u.uid = s.uid WHERE u.uid != 0 ORDER BY u.name'); //for each user, build summary table row, and add their number of conflicts to the total while ($user = db_fetch_object($result)) { @@ -199,7 +199,7 @@ function signup_conflicts_summary() { function _signup_conflicts_get_conflicts($uid) { $conflicts = array(); - if (module_exist('event')) { + if (module_exist('event') && $uid != 0) { //pull all signup nodes for the specified user $signups = db_query('SELECT n.nid, n.title, e.event_start AS start, e.event_end AS end FROM {signup_log} s INNER JOIN {node} n ON s.nid = n.nid INNER JOIN {event} e ON n.nid = e.nid WHERE s.uid = %d', $uid);