}
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();
-
- $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();
-
- while ($user->fetch()) {
- $success = mail_send_sms_notice($notice, $user);
- if (!$success) {
- common_log(LOG_ERR, 'Could not send SMS message to user', __FILE__);
- return false;
+ # Now, get users subscribed to this profile
+ # XXX: use a join here rather than looping through results
+
+ $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;
+ }
+ }
}
}
$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['From'] = (isset($user->incomingemail)) ? $user->incomingemail : mail_notify_from();
$headers['To'] = $to;
$headers['Subject'] = sprintf(_('%s status'),
$other->getBestName());