GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

on broadcast jabber and sms to people with the flags set 

darcs-hash:20081210024706-5ed1f-fd54b76630656f7d4f7617309d2e4f87f25b006b.gz
This commit is contained in:
Evan Prodromou 2008-12-09 21:47:06 -05:00
parent 3210cd69cc
commit 4b93bc9924
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/jabber.php
View File

@ -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;
}

6
lib/mail.php
View File

@ -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)) {