summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/jabber.php9
-rw-r--r--lib/mail.php6
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/jabber.php b/lib/jabber.php
index 3d388bd01..ab0fd6af8 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -207,7 +207,7 @@ function jabber_broadcast_notice($notice) {
$profile->free();
unset($profile);
-
+
$sent_to = array();
$conn = jabber_connect();
@@ -230,7 +230,7 @@ function jabber_broadcast_notice($notice) {
}
$user->free();
-
+
# Now, get users subscribed to this profile
$user = new User();
@@ -238,7 +238,8 @@ function jabber_broadcast_notice($notice) {
'FROM user JOIN subscription ON user.id = subscription.subscriber ' .
'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
'AND user.jabber is not null ' .
- 'AND user.jabbernotify = 1 ');
+ 'AND user.jabbernotify = 1 ' .
+ 'AND subscription.jabber = 1 ');
while ($user->fetch()) {
if (!array_key_exists($user->id, $sent_to)) {
@@ -252,7 +253,7 @@ function jabber_broadcast_notice($notice) {
}
$user->free();
-
+
return true;
}
diff --git a/lib/mail.php b/lib/mail.php
index 313040ca2..a7cbab858 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -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)) {