}
function mail_subscribe_notify($listenee, $listener) {
+ $other = $listener->getProfile();
+ mail_subscribe_notify_profile($listenee, $other);
+}
+
+function mail_subscribe_notify_profile($listenee, $other) {
if ($listenee->email && $listenee->emailnotifysub) {
$profile = $listenee->getProfile();
- $other = $listener->getProfile();
$name = $profile->getBestName();
$long_name = ($other->fullname) ? ($other->fullname . ' (' . $other->nickname . ')') : $other->nickname;
$recipients = $listenee->email;
"\t".'%3$s'."\n\n".
'Faithfully yours,'."\n".'%4$s.'."\n"),
$long_name,
- common_config('site', 'name'),
+ common_config('site', 'name'),
$other->profileurl,
common_config('site', 'name'));
mail_send($recipients, $headers, $body);
$profile = $user->getProfile();
$name = $profile->getBestName();
-
+
$headers['From'] = $user->incomingemail;
$headers['To'] = $name . ' <' . $user->email . '>';
$headers['Subject'] = sprintf(_('New email address for posting to %s'),
common_config('site', 'name'));
-
+
$body = sprintf(_("You have a new posting address on %1\$s.\n\n".
"Send email to %2\$s to post new messages.\n\n".
"More email instructions at %3\$s.\n\n".
$user->incomingemail,
common_local_url('doc', array('title' => 'email')),
common_config('site', 'name'));
-
+
mail_send($user->email, $headers, $body);
}
}
function mail_broadcast_notice_sms($notice) {
- $user = new User();
- $user->smsnotify = 1;
- $user->whereAdd('EXISTS (select subscriber from subscriptions where ' .
- ' subscriber = user.id and subscribed = ' . $notice->profile_id);
- $user->whereAdd('sms is not null');
-
- $cnt = $user->find();
+
+ # Now, get users subscribed to this profile
+ # XXX: use a join here rather than looping through results
- while ($user->fetch()) {
- mail_send_sms_notice($notice, $user);
+ $sub = new Subscription();
+ $sub->subscribed = $notice->profile_id;
+
+ if ($sub->find()) {
+ while ($sub->fetch()) {
+ $user = User::staticGet($sub->subscriber);
+ if ($user && $user->smsemail && $user->smsnotify) {
+ common_log(LOG_INFO,
+ 'Sending notice ' . $notice->id . ' to ' . $user->smsemail,
+ __FILE__);
+ $success = mail_send_sms_notice($notice, $user);
+ if (!$success) {
+ # XXX: Not sure, but I think that's the right thing to do
+ common_log(LOG_WARNING,
+ 'Sending notice ' . $notice->id . ' to ' . $user->smsemail . ' FAILED, cancelling.',
+ __FILE__);
+ return false;
+ }
+ }
+ }
}
+
+ return true;
}
-function mail_send_notice($notice, $user) {
+function mail_send_sms_notice($notice, $user) {
$profile = $user->getProfile();
$name = $profile->getBestName();
- $carrier = Sms_carrier::staticGet($user->carrier);
- $sms_email = $carrier->toEmailAddress($user->sms);
- $to = $name . ' <' . $sms_email . '>';
+ $to = $name . ' <' . $user->smsemail . '>';
$other = $notice->getProfile();
+ common_log(LOG_INFO, "Sending notice " . $notice->id . " to " . $user->smsemail, __FILE__);
+
$headers = array();
- $headers['From'] = $user->incomingemail;
- $headers['To'] = $name . ' <' . $sms_email . '>';
- $headers['Subject'] = sprintf(_('%s status on %s'),
- $other->getBestName(),
- common_exact_date($notice->created));
+ $headers['From'] = (isset($user->incomingemail)) ? $user->incomingemail : mail_notify_from();
+ $headers['To'] = $to;
+ $headers['Subject'] = sprintf(_('%s status'),
+ $other->getBestName());
$body = $notice->content;
- mail_send($sms_email, $headers, $body);
+
+ return mail_send($user->smsemail, $headers, $body);
+}
+
+function mail_confirm_sms($code, $nickname, $address) {
+
+ $recipients = $address;
+
+ $headers['From'] = mail_notify_from();
+ $headers['To'] = $nickname . ' <' . $address . '>';
+ $headers['Subject'] = _('SMS confirmation');
+
+ $body = "$nickname: confirm you own this phone number with this code:";
+ $body .= "\n\n";
+ $body .= $code;
+ $body .= "\n\n";
+
+ mail_send($recipients, $headers, $body);
}