From 0e1f2d4b47e5e340679c4245b62e1d64c6b9c9b9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 13 Jan 2010 18:17:36 +0000
Subject: Fix regressions in XMPP output during inbox refactoring -
 NOTICE_INBOX_SOURCE_* constants moved to common.php since Notice_inbox.php
 not always loaded - fixed typo in User::staticGet() call which caused user #1
 to receive messages once for each subscriber instead of for him/herself -
 'continue' -> 'continue 2' inside switch() statement to fix loop escape (PHP
 considers switch() a looping construct for break & continue)

---
 lib/common.php | 6 ++++++
 lib/jabber.php | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/common.php b/lib/common.php
index 61decebb7..00e80373e 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -41,6 +41,12 @@ define('FOREIGN_NOTICE_SEND_REPLY', 4);
 define('FOREIGN_FRIEND_SEND', 1);
 define('FOREIGN_FRIEND_RECV', 2);
 
+define('NOTICE_INBOX_SOURCE_SUB', 1);
+define('NOTICE_INBOX_SOURCE_GROUP', 2);
+define('NOTICE_INBOX_SOURCE_REPLY', 3);
+define('NOTICE_INBOX_SOURCE_FORWARD', 4);
+define('NOTICE_INBOX_SOURCE_GATEWAY', -1);
+
 # append our extlib dir as the last-resort place to find libs
 
 set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
diff --git a/lib/jabber.php b/lib/jabber.php
index 69f0d3570..4cdfa6746 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -359,7 +359,7 @@ function jabber_broadcast_notice($notice)
     $ni = $notice->whoGets();
 
     foreach ($ni as $user_id => $reason) {
-        $user = User::staticGet('user_id', $user_id);
+        $user = User::staticGet($user_id);
         if (empty($user) ||
             empty($user->jabber) ||
             !$user->jabbernotify) {
@@ -369,20 +369,20 @@ function jabber_broadcast_notice($notice)
         switch ($reason) {
         case NOTICE_INBOX_SOURCE_REPLY:
             if (!$user->jabberreplies) {
-                continue;
+                continue 2;
             }
             break;
         case NOTICE_INBOX_SOURCE_SUB:
             $sub = Subscription::pkeyGet(array('subscriber' => $user->id,
                                                'subscribed' => $notice->profile_id));
             if (empty($sub) || !$sub->jabber) {
-                continue;
+                continue 2;
             }
             break;
         case NOTICE_INBOX_SOURCE_GROUP:
             break;
         default:
-            throw new Exception(_("Unknown inbox source."));
+            throw new Exception(sprintf(_("Unknown inbox source %d."), $reason));
         }
 
         common_log(LOG_INFO,
-- 
cgit v1.2.3-54-g00ecf