}
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;
function mail_broadcast_notice_sms($notice) {
- $user = new User();
+ # Now, get users subscribed to this profile
- $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');
+ $user = new User();
- $cnt = $user->find();
+ $user->query('SELECT nickname, smsemail, incomingemail ' .
+ 'FROM user JOIN subscription ' .
+ 'ON user.id = subscription.subscriber ' .
+ 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
+ 'AND user.smsemail IS NOT NULL ' .
+ 'AND user.smsnotify = 1');
while ($user->fetch()) {
- $success = mail_send_sms_notice($notice, $user);
+ common_log(LOG_INFO,
+ 'Sending notice ' . $notice->id . ' to ' . $user->smsemail,
+ __FILE__);
+ $success = mail_send_sms_notice_address($notice, $user->smsemail, $user->incomingemail);
if (!$success) {
- common_log(LOG_ERR, 'Could not send SMS message to user', __FILE__);
+ # 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;
}
}
+
+ $user->free();
+ unset($user);
return true;
}
function mail_send_sms_notice($notice, $user) {
- $profile = $user->getProfile();
- $name = $profile->getBestName();
- $to = $name . ' <' . $user->smsemail . '>';
+ return mail_send_sms_notice_address($notice, $user->smsemail, $user->incomingemail);
+}
+
+function mail_send_sms_notice_address($notice, $smsemail, $incomingemail) {
+
+ $to = $nickname . ' <' . $smsemail . '>';
$other = $notice->getProfile();
+ common_log(LOG_INFO, "Sending notice " . $notice->id . " to " . $smsemail, __FILE__);
+
$headers = array();
- $headers['From'] = $user->incomingemail;
+ $headers['From'] = (isset($incomingemail)) ? $incomingemail : mail_notify_from();
$headers['To'] = $to;
$headers['Subject'] = sprintf(_('%s status'),
$other->getBestName());
$body = $notice->content;
-
- return mail_send($user->smsemail, $headers, $body);
+
+ return mail_send($smsemail, $headers, $body);
}
function mail_confirm_sms($code, $nickname, $address) {