? .svn
? node_invite_users.patch
Index: node_invite.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/node_invite/node_invite.install,v
retrieving revision 1.9.2.2
diff -u -p -r1.9.2.2 node_invite.install
--- node_invite.install	3 Sep 2009 00:17:30 -0000	1.9.2.2
+++ node_invite.install	4 Sep 2009 17:59:30 -0000
@@ -156,7 +156,6 @@ function node_invite_update_6003() {
   );
 
   // Now that we have the new column... populate it.
-  $hashes = array();
   $invites = db_query('SELECT iid, email_invitee, sent FROM {node_invites}');
   while ($invite = db_fetch_object($invites)) {
     $hash = md5($invite->email_invitee . $invite->sent);
@@ -167,6 +166,50 @@ function node_invite_update_6003() {
   return $ret;
 }
 
+/**
+ * Add more invitee data to the database
+ */
+function node_invite_update_6004() {
+  $ret = array();
+  db_add_field($ret, 'node_invites', 'name_invitee',
+    array(
+      'description' => t('Recipient name'),
+      'type' => 'varchar',
+      'length' => 255,
+      'default' => '',
+    )
+  );
+  db_add_field($ret, 'node_invites', 'uid_invitee',
+    array(
+      'description' => t('The UID of the recipient'),
+      'type'    => 'int',
+      'unsigned'  => TRUE,
+      'default' => 0,
+    )
+  );
+
+  // Now that we have our new columns, we need to split up the old email_invitee
+  // column
+  $invites = db_query('SELECT iid, email_invitee FROM {node_invites}');
+  while ($invite = db_fetch_object($invites)) {
+    $matches = array();
+    if (preg_match('/^(.*) <(.*)>$/', $invite->email_invitee, $matches)) {
+      $email = $matches[2];
+      $ret[] = update_sql(
+        "UPDATE {node_invites} SET email_invitee = '$email', name_invitee = '$matches[1]' WHERE iid = $invite->iid");
+    }
+    else {
+      $email = $invite->email_invitee;
+    }
+    // Find and update existing users' UIDs
+    if ($uid = db_result(db_query('SELECT uid FROM {users} WHERE mail = "%s"', $email))) {
+      $ret[] = update_sql(
+        "UPDATE {node_invites} SET uid_invitee = $uid WHERE iid = $invite->iid");
+    }
+  }
+  return $ret;
+}
+
 function node_invite_uninstall() {
   drupal_uninstall_schema('node_invite');
   variable_del('node_invite_node_types');
Index: node_invite.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/node_invite/node_invite.module,v
retrieving revision 1.11.2.4
diff -u -p -r1.11.2.4 node_invite.module
--- node_invite.module	4 Sep 2009 08:40:48 -0000	1.11.2.4
+++ node_invite.module	4 Sep 2009 17:59:31 -0000
@@ -525,7 +525,7 @@ function node_invite_rsvp_path($invite) 
 }
 
 function node_invite_save($invite, $params = array()) {
-  $ni_fields = array('iid', 'nid', 'email_invitee', 'uid_inviter', 'status', 'sent', 'acted_upon', 'notes_invitee', 'notes_inviter', 'hash');
+  $ni_fields = array('iid', 'nid', 'email_invitee', 'name_invitee', 'uid_invitee', 'uid_inviter', 'status', 'sent', 'acted_upon', 'notes_invitee', 'notes_inviter', 'hash');
   
   if (is_object($invite) && $invite->iid) {
     $query = array();
@@ -585,10 +585,11 @@ function node_invite_save($invite, $para
 }
 
 function node_invite_specific_info(&$node, $invite, $account) {
+  $name = $invite->name_invitee ? $invite->name_invitee : $invitee->email_invitee;
   $node->invite_specific_info = array(
     'node-invite-iid' => $invite->iid,
     'node-invite-hash' => $invite->hash,
-    'node-invite-recip-name' => $invite->email_invitee,
+    'node-invite-recip-name' => $name,
     'node-invite-recip-mail' => $invite->email_invitee,
     'inviter-name' => $account->name,
     'inviter-mail' => $account->mail,
Index: node_invite.send.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/node_invite/node_invite.send.inc,v
retrieving revision 1.4.2.4
diff -u -p -r1.4.2.4 node_invite.send.inc
--- node_invite.send.inc	4 Sep 2009 08:40:49 -0000	1.4.2.4
+++ node_invite.send.inc	4 Sep 2009 17:59:31 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: node_invite.send.inc,v 1.4.2.4 2009/09/04 08:40:49 hadsie Exp $
+// $Id: node_invite.send.inc,v 1.4.2. hadsie Exp $
 /**
  * @file
  * Provides the invite sending form.
@@ -127,9 +127,12 @@ function node_invite_send_submit($form, 
 
       // 3. store a record in {node_invites} and get insert_id
       // (which we use to build the message)
+      $account = user_load(array('mail' => $recip_email));
       $params = array(
           'nid' => $node->nid,
-          'email_invitee' => $email,
+          'email_invitee' => $recip_email,
+          'name_invitee' => $recip_name,
+          'uid_invitee' => $account ? $account->uid : 0,
           'uid_inviter' => $user->uid,
           'status' => 'NEW',
       );