Index: invite.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/invite/invite.module,v retrieving revision 1.9.2.4 diff -u -p -r1.9.2.4 invite.module --- invite.module 19 Nov 2006 10:26:53 -0000 1.9.2.4 +++ invite.module 27 Nov 2006 23:47:04 -0000 @@ -1,4 +1,5 @@ uid); while ($invite = db_fetch_object($result)){ - $items[] = array($invite->email, (($invite->expiry + (variable_get('invite_expiry', '30')* 24 * 60 * 60))< time()) ? "Expired" :($invite->timestamp ? t('Joined') : t('Pending')),$invite->timestamp ? "delete" : l("delete",'invite/delete/'.urlencode($invite->email))); + $expiry = $invite->expiry + (variable_get('invite_expiry', '30') * 24 * 60 * 60); + if (!$invite->timestamp) { + $email_cell = $invite->email; + if ($expiry < time()) { + $status_cell = t('Expired'); + $action_cell = ' '; + } + else { + $status_cell = t('Pending'); + $action_cell = l("Delete",'invite/delete/'.urlencode($invite->email)); + } + } + else { + $account = user_load(array('mail' => $invite->email)); + $email_cell = l($invite->email, 'user/'.$account->uid); + $status_cell = t('Joined'); + $action_cell = ' '; + } + $items[] = array($email_cell, $status_cell, $action_cell); $inc++; } if (count($items) > 0) { - $headers = array(t('Email'), t('Status'), ''); + $headers = array(t('Email'), t('Status'), ' '); $table = theme('table', $headers, $items, array('id' => 'invite_table')); } else {