Merge branch '1.0.x' into testing

* 1.0.x:
  * only send the one invitation reminder per email address, regardless of how many invitations there are * don't send invitations converted invitations * better error checking * more logging

plugins/EmailReminder/EmailReminderPlugin.php

@@ -135,6 +135,11 @@ class EmailReminderPlugin extends Plugin
         if (self::sendReminderEmail($type, $object, $subject, $title)) {
             try {
                 Email_reminder::recordReminder($type, $object, $day);
+                common_log(
+                    LOG_INFO,
+                    "Sent {$type} reminder to {$object->address}.",
+                    __FILE__
+                );
             } catch (Exception $e) {
                 // oh noez
                 common_log(LOG_ERR, $e->getMessage(), __FILE__);

plugins/EmailReminder/lib/siteconfirmreminderhandler.php

@@ -86,7 +86,9 @@ class SiteConfirmReminderHandler extends QueueHandler
                 break;
             case UserInviteReminderHandler::INVITE_REMINDER:
                 $invitation = new Invitation();
-                $invitation->find();
+                // Only send one reminder (the latest one), regardless of how many invitations a user has
+                $sql = 'SELECT * FROM (SELECT * FROM invitation WHERE registered_user_id IS NULL ORDER BY created DESC) invitees GROUP BY invitees.address';
+                $invitation->query($sql);
                 while ($invitation->fetch()) {
                     try {
                         $qm->enqueue(array($invitation, $opts), 'uinvrem');

plugins/EmailReminder/lib/userconfirmregreminderhandler.php

@@ -141,6 +141,9 @@ class UserConfirmRegReminderHandler extends UserReminderHandler {
                 return true;
             }
             break;
+        default:
+            common_log(LOG_INFO, "No need to send registration reminder to {$confirm->address}.", __FILE__);
+            break;
         }
         return true;
     }

plugins/EmailReminder/lib/userinvitereminderhandler.php

@@ -124,6 +124,9 @@ class UserInviteReminderHandler extends UserReminderHandler {
                     return true;
                 }
             break;
+        default:
+            common_log(LOG_INFO, "No need to send invitation reminder to {$invitation->address}.", __FILE__);
+            break;
         }
         return true;
     }

plugins/EmailReminder/scripts/sendemailreminder.php

@@ -90,8 +90,10 @@ case 'all':
 
 if (have_option('u', 'universe')) {
     $sn = new Status_network();
+    try {
         if ($sn->find()) {
             while ($sn->fetch()) {
+                try {
                     $server = $sn->getServerName();
                     StatusNet::init($server);
                     // Different queue manager, maybe!
@@ -101,9 +103,20 @@ if (have_option('u', 'universe')) {
                         $qm->enqueue(array($type, $opts), 'siterem');
                         if (!$quiet) { print "Sent pending {$type} reminders for {$server}.\n"; }
                     }
+                } catch (Exception $e) {
+                    // keep going
+                    common_log(LOG_ERR, "Couldn't init {$server}.\n", __FILE__);
+                    if (!$quiet) { print "Couldn't init {$server}.\n"; }
+                    continue;
+                }
             }
            if (!$quiet) { print "Done! Reminders sent to all unconfirmed addresses in the known universe.\n"; }
         }
+    } catch (Exception $e) {
+        if (!$quiet) { print $e->getMessage() . "\n"; }
+        common_log(LOG_ERR, $e->getMessage(), __FILE__);
+        exit(1);
+    }
 } else {
     $qm = QueueManager::get();
     try {