cvs diff: Diffing modules
cvs diff: Diffing modules/signup_confirm_email
Index: modules/signup_confirm_email/signup_confirm_email.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/signup/modules/signup_confirm_email/signup_confirm_email.inc,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 signup_confirm_email.inc
--- modules/signup_confirm_email/signup_confirm_email.inc	23 Aug 2009 15:33:29 -0000	1.1.2.2
+++ modules/signup_confirm_email/signup_confirm_email.inc	21 Sep 2009 06:54:12 -0000
@@ -16,9 +16,17 @@ function signup_confirm_email_alter_sign
   global $user;
 
   if ($form_id == 'signup_edit_form') {
+    $signup = $form['#signup'];
+
+    // Only display the email confirmation fields if an authenticated user is
+    // editing their own signup (anonymous signups already provide an email,
+    // and we shouldn't confirm email when an admin is editing another signup).
+    if (empty($user->uid) || $user->uid != $signup->uid) {
+      return;
+    } 
+    
     // Ensure the user has permission to edit their own signups, or the rest
     // of this is wasted effort for a form that can't be submitted.
-    $signup = $form['#signup'];
     $node = node_load($signup->nid);
     $admin = _signup_menu_access($node, 'admin');
     $own = !empty($user->uid) && $user->uid == $signup->uid;
@@ -59,6 +67,7 @@ function signup_confirm_email_alter_sign
     }
     elseif ($form_id == 'signup_edit_form') {
       $form['elements']['email'] = $email;
+      $form['elements']['header']['#weight'] = -2;
       $form['elements']['save']['#submit'][] = 'signup_email_confirm_submit';
     }
     $form['#validate'][] = 'signup_email_confirm_validate';
cvs diff: Diffing modules/signup_confirm_email/translations