Profile block base style

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

diff --git a/lib/mail.php b/lib/mail.php
index e627730a7a6169945eb34ccc5eacdb0fd19e8e7a..a7cbab8589665daa7343ce171d892e66d5947037 100644 (file)
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -85,8 +85,8 @@ function mail_to_user(&$user, $subject, $body, $address=NULL) {
 
 # For confirming a Jabber address
 
-function mail_confirm_address($code, $nickname, $address) {
-    $user = common_current_user();
+function mail_confirm_address($user, $code, $nickname, $address) {
+
        $subject = _('Email address confirmation');
 
     $body = sprintf(_("Hey, %s.\n\nSomeone just entered this email address on %s.\n\n" .
@@ -167,7 +167,8 @@ function mail_broadcast_notice_sms($notice) {
                                 'ON user.id = subscription.subscriber ' .
                                 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
                                 'AND user.smsemail IS NOT NULL ' .
-                                'AND user.smsnotify = 1');
+                                'AND user.smsnotify = 1 ' .
+                 'AND subscription.sms = 1 ');
 
        while ($user->fetch()) {
                common_log(LOG_INFO,
@@ -226,7 +227,6 @@ function mail_confirm_sms($code, $nickname, $address) {
        mail_send($recipients, $headers, $body);
 }
 
-
 function mail_notify_nudge($from, $to) {
     common_init_locale($to->language);
        $subject = sprintf(_('You\'ve been nudged by %s'), $from->nickname);
@@ -247,8 +247,6 @@ function mail_notify_nudge($from, $to) {
        return mail_to_user($to, $subject, $body);
 }
 
-
-
 function mail_notify_message($message, $from=NULL, $to=NULL) {
 
        if (is_null($from)) {