From 809482b5fbdc964db2501ca10efc16d0769b3152 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 21 Jun 2011 10:03:39 -0700 Subject: [PATCH 1/3] Update subject of one-time email reminders --- plugins/EmailReminder/lib/userconfirmregreminderhandler.php | 2 +- plugins/EmailReminder/lib/userinvitereminderhandler.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/EmailReminder/lib/userconfirmregreminderhandler.php b/plugins/EmailReminder/lib/userconfirmregreminderhandler.php index f5f3091b6f..89dad0e424 100644 --- a/plugins/EmailReminder/lib/userconfirmregreminderhandler.php +++ b/plugins/EmailReminder/lib/userconfirmregreminderhandler.php @@ -83,7 +83,7 @@ class UserConfirmRegReminderHandler extends UserReminderHandler { // we've already pestered her at all before if (Email_reminder::needsReminder(self::REGISTER_REMINDER, $confirm)) { common_log(LOG_INFO, "Sending one-time registration confirmation reminder to {$confirm->address}", __FILE__); - $subject = _m("One time reminder - please confirm your registration!"); + $subject = _m("Reminder - please confirm your registration!"); return EmailReminderPlugin::sendReminder( self::REGISTER_REMINDER, $confirm, diff --git a/plugins/EmailReminder/lib/userinvitereminderhandler.php b/plugins/EmailReminder/lib/userinvitereminderhandler.php index 70c666178c..cb19a1fe78 100644 --- a/plugins/EmailReminder/lib/userinvitereminderhandler.php +++ b/plugins/EmailReminder/lib/userinvitereminderhandler.php @@ -84,7 +84,7 @@ class UserInviteReminderHandler extends UserReminderHandler { // we've already pestered her at all before if (Email_reminder::needsReminder(self::INVITE_REMINDER, $invitation)) { common_log(LOG_INFO, "Sending one-time invitation reminder to {$invitation->address}", __FILE__); - $subject = _m("One time reminder - you have been invited to join {$siteName}!"); + $subject = _m("Reminder - you have been invited to join {$siteName}!"); return EmailReminderPlugin::sendReminder( self::INVITE_REMINDER, $invitation, From 9051417605d14edaf2eac0d55842d0b795ddfc62 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 21 Jun 2011 10:35:20 -0700 Subject: [PATCH 2/3] Fix output bug in email reminder script --- plugins/EmailReminder/scripts/sendemailreminder.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/EmailReminder/scripts/sendemailreminder.php b/plugins/EmailReminder/scripts/sendemailreminder.php index 6c5ad63f4d..21b3dbe42e 100644 --- a/plugins/EmailReminder/scripts/sendemailreminder.php +++ b/plugins/EmailReminder/scripts/sendemailreminder.php @@ -99,8 +99,9 @@ if (have_option('u', 'universe')) { foreach ($reminders as $reminder) { extract($reminder); $qm->enqueue(array($type, $opts), 'siterem'); - if (!$quiet) { print "Sent pending {$type} reminders to all unconfirmed addresses in the known universe.\n"; } + if (!$quiet) { print "Sent pending {$type} reminders for {$server}.\n"; } } + if (!$quiet) { print "Done! Reminders sent to all unconfirmed addresses in the known universe.\n"; } } } } else { From e53dad35b806e0b4974588f140ea5dff8a8d0453 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 21 Jun 2011 10:42:01 -0700 Subject: [PATCH 3/3] Move print statement --- plugins/EmailReminder/scripts/sendemailreminder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/EmailReminder/scripts/sendemailreminder.php b/plugins/EmailReminder/scripts/sendemailreminder.php index 21b3dbe42e..4bfa811e10 100644 --- a/plugins/EmailReminder/scripts/sendemailreminder.php +++ b/plugins/EmailReminder/scripts/sendemailreminder.php @@ -101,8 +101,8 @@ if (have_option('u', 'universe')) { $qm->enqueue(array($type, $opts), 'siterem'); if (!$quiet) { print "Sent pending {$type} reminders for {$server}.\n"; } } - if (!$quiet) { print "Done! Reminders sent to all unconfirmed addresses in the known universe.\n"; } } + if (!$quiet) { print "Done! Reminders sent to all unconfirmed addresses in the known universe.\n"; } } } else { $qm = QueueManager::get();