Get correct configured language when all else fails

[quix0rs-gnu-social.git] / lib / mail.php

diff --git a/lib/mail.php b/lib/mail.php
index c229414b077ff44a8159a0970a4e2b4c028858a7..162669eaaa7c7b707f882faf2215f2224933f617 100644 (file)
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -109,9 +109,13 @@ function mail_confirm_address($code, $nickname, $address) {
 }
 
 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;
@@ -123,7 +127,7 @@ function mail_subscribe_notify($listenee, $listener) {
                                                   "\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);
@@ -134,12 +138,12 @@ function mail_new_incoming_notify($user) {
 
        $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".
@@ -148,7 +152,7 @@ function mail_new_incoming_notify($user) {
                                         $user->incomingemail,
                                         common_local_url('doc', array('title' => 'email')),
                                         common_config('site', 'name'));
-       
+
        mail_send($user->email, $headers, $body);
 }
 
@@ -159,33 +163,71 @@ function mail_new_incoming_address() {
 }
 
 function mail_broadcast_notice_sms($notice) {
+
+    # Now, get users subscribed to this profile
+
        $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();
-       
+
+       $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()) {
-               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) {
+                       # 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_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 . '>';
+function mail_send_sms_notice($notice, $user) {
+       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['To'] = $name . ' <' . $sms_email . '>';
-       $headers['Subject'] = sprintf(_('%s status on %s'), 
-                                                                 $other->getBestName(),
-                                                                 common_exact_date($notice->created));
+       $headers['From'] = (isset($incomingemail)) ? $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($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);
 }