From 042c61ed6de1bbc993eefe47552028157f3e1e28 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 13 Mar 2009 13:21:35 +0100
Subject: [PATCH 01/49] Piwik Analytics Plugin

This is a rewrite of the Google Analytics Plugin to support Piwik.
---
 plugins/PiwikAnalyticsPlugin.php | 86 ++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 plugins/PiwikAnalyticsPlugin.php

diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
new file mode 100644
index 0000000000..458b577fa0
--- /dev/null
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Plugin to use Piwik Analytics
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Plugin to use Piwik Analytics (based on the Google Analytics plugin by Evan)
+ *
+ * This plugin will spoot out the correct JavaScript spell to invoke Piwik Analytics on a page.
+ *
+ * To use this plugin please add the following three lines to your config.php
+#Add Piwik Analytics
+require_once('plugins/PiwikAnalyticsPlugin.php');
+$pa = new PiwikAnalyticsPlugin("example.com/piwik/","id");
+ *
+ * exchange example.com/piwik/ with the url (without http:// or https:// !) to your
+ *          piwik installation and make sure you don't forget the final /
+ * exchange id with the ID your laconica installation has in your Piwik analytics
+ *
+ * @category Plugin
+ * @package  Laconica
+ * @author   Tobias Diekershoff <tobias.diekershoff@gmx.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      Event
+ */
+
+class PiwikAnalyticsPlugin extends Plugin
+{
+    // the base of your Piwik installation
+    var $piwikroot = null;
+    // the Piwik Id of your laconica installation
+    var $piwikId   = null;
+
+    function __construct($root=null, $id=null)
+    {
+        $this->piwikroot = $root;
+        $this->piwikid = $id;
+        parent::__construct();
+    }
+
+    function onEndShowScripts($action)
+    {
+        $js1 = 'var pkBaseURL = (("https:" == document.location.protocol) ? "https://'.
+                $this->piwikroot.'" : "http://'.$this->piwikroot.
+                '"); document.write(unescape("%3Cscript src=\'" + pkBaseURL + "piwik.js\''.
+                ' type=\'text/javascript\'%3E%3C/script%3E"));';
+        $js2 = 'piwik_action_name = ""; piwik_idsite = '.$this->piwikid.
+               '; piwik_url = pkBaseURL + "piwik.php"; piwik_log(piwik_action_name, piwik_idsite, piwik_url);';
+        $action->elementStart('script', array('type' => 'text/javascript'));
+        $action->raw($js1);
+        $action->elementEnd('script');
+        $action->elementStart('script', array('type' => 'text/javascript'));
+        $action->raw($js2);
+        $action->elementEnd('script');
+    }
+}
\ No newline at end of file

From 3081b2e31708520e6ed83041ce3ba04329d3ec90 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 16 Apr 2009 08:44:48 -0400
Subject: [PATCH 02/49] start of querybyid

---
 classes/User.php | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/classes/User.php b/classes/User.php
index 3b9b5cd839..098381f738 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -444,21 +444,42 @@ class User extends Memcached_DataObject
               'SELECT notice.* ' .
               'FROM notice JOIN subscription ON notice.profile_id = subscription.subscribed ' .
               'WHERE subscription.subscriber = %d ';
-            $order = null;
+            return Notice::getStream(sprintf($qry, $this->id),
+                                     'user:notices_with_friends:' . $this->id,
+                                     $offset, $limit, $since_id, $before_id,
+                                     $order, $since);
         } else if ($enabled === true ||
                    ($enabled == 'transitional' && $this->inboxed == 1)) {
 
-            $qry =
-              'SELECT notice.* ' .
-              'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' .
-              'WHERE notice_inbox.user_id = %d ';
-            // NOTE: we override ORDER
-            $order = null;
+            $cache = common_memcache();
+
+            if (!empty($cache)) {
+
+                # Get the notices out of the cache
+
+                $notices = $cache->get(common_cache_key($cachekey));
+
+                # On a cache hit, return a DB-object-like wrapper
+
+                if ($notices !== false) {
+                    $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit));
+                    return $wrapper;
+                }
+            }
+
+            $inbox = Notice_inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since);
+
+            $ids = array();
+
+            while ($inbox->fetch()) {
+                $ids[] = $inbox->notice_id;
+            }
+
+            $inbox->free();
+            unset($inbox);
+
+            return Notice::getStreamByIds($ids, 'user:notices_with_friends:' . $this->id);
         }
-        return Notice::getStream(sprintf($qry, $this->id),
-                                 'user:notices_with_friends:' . $this->id,
-                                 $offset, $limit, $since_id, $before_id,
-                                 $order, $since);
     }
 
     function blowFavesCache()

From 7196410bb0398c15fbab767a9b7cedc513e6520b Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 18 Apr 2009 19:00:20 +0200
Subject: [PATCH 03/49] shortening links in notices from XMPP

This patch enables shortening of links, that where send from XMPP.
The problem was, that in util.php common_current_user() is not
finding the user account from which is posted, so the service to
shorten is not known, so no shortening at all...

This patch cleans up the xmppdaemon a little bit and hard codes ur1.ca
as shortening service _if_ the user is not set. Ugly but working.
---
 lib/util.php           | 20 ++++++--------------
 scripts/xmppdaemon.php | 17 +++++------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 675ff51f01..ab5e99593e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -519,11 +519,16 @@ function common_shorten_links($text)
 
 function common_shorten_link($url, $reverse = false)
 {
+
     static $url_cache = array();
     if ($reverse) return isset($url_cache[$url]) ? $url_cache[$url] : $url;
 
     $user = common_current_user();
-
+    if (!isset($user)) {
+      // common current user does not find a user when called from the XMPP daemon
+      // therefore we'll set one here fix, so that XMPP given URLs may be shortened
+      $user->urlshorteningservice = 'ur1.ca';
+    }
     $curlh = curl_init();
     curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 20); // # seconds to wait
     curl_setopt($curlh, CURLOPT_USERAGENT, 'Laconica');
@@ -1321,16 +1326,3 @@ function common_compatible_license($from, $to)
     // XXX: better compatibility check needed here!
     return ($from == $to);
 }
-
-/**
- * returns a quoted table name, if required according to config
- */
-function common_database_tablename($tablename)
-{
-  
-  if(common_config('db','quote_identifiers')) {
-      $tablename = '"'. $tablename .'"';
-  }
-  //table prefixes could be added here later
-  return $tablename;
-}
\ No newline at end of file
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index ef3f8c63d8..5711f715df 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -152,11 +152,6 @@ class XMPPDaemon extends Daemon
             $body = preg_replace('/d[\ ]*('. $to .')[\ ]*/', '', $pl['body']);
             $this->add_direct($user, $body, $to, $from);
         } else {
-            $len = mb_strlen($pl['body']);
-            if($len > 140) {
-                $this->from_site($from, 'Message too long - maximum is 140 characters, you sent ' . $len);
-                return;
-            }
             $this->add_notice($user, $pl);
         }
 
@@ -255,15 +250,13 @@ class XMPPDaemon extends Daemon
     function add_notice(&$user, &$pl)
     {
         $body = trim($pl['body']);
-        $content_shortened = common_shorten_link($body);
+        $content_shortened = common_shorten_links($body);
         if (mb_strlen($content_shortened) > 140) {
-            $content = trim(mb_substr($body, 0, 140));
-            $content_shortened = common_shorten_link($content);
+          $from = jabber_normalize_jid($pl['from']);
+          $this->from_site($from, "Message too long - maximum is 140 characters, you sent ".mb_strlen($content_shortened));
+          return;
         }
-        else {
-            $content = $body;
-        }
-        $notice = Notice::saveNew($user->id, $content, 'xmpp');
+        $notice = Notice::saveNew($user->id, $content_shortened, 'xmpp');
         if (is_string($notice)) {
             $this->log(LOG_ERR, $notice);
             return;

From 90fb7be99a74689de0d0e2409230d8bd515ac5c3 Mon Sep 17 00:00:00 2001
From: Dan Moore <dan@moore.cx>
Date: Sat, 18 Apr 2009 15:33:36 -0400
Subject: [PATCH 04/49] Bringing the presentation of boolean variables
 (favorited, truncated, profile_background_tile) and the result from
 friendships/exist in JSON results from the Twitter Compatible API in line
 with what the real Twitter API does.

Currently, laconica returns text strings enclosed in quotes instead of bare Javascript booleans.  This change fixes that.

See http://laconi.ca/trac/ticket/1326 for one open issue related to this.
---
 actions/twitapifriendships.php |  6 +-----
 actions/twitapiusers.php       |  2 +-
 lib/twitterapi.php             | 29 ++++++++++++++++++++++++-----
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index c50c5e84a9..2f8250e0dc 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -133,11 +133,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
             return;
         }
 
-        if ($user_a->isSubscribed($user_b)) {
-            $result = 'true';
-        } else {
-            $result = 'false';
-        }
+        $result = $user_a->isSubscribed($user_b);
 
         switch ($apidata['content-type']) {
          case 'xml':
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 2894b7486d..41d0d955b1 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -83,7 +83,7 @@ class TwitapiusersAction extends TwitterapiAction
 		$twitter_user['profile_link_color'] = '';
 		$twitter_user['profile_sidebar_fill_color'] = '';
         $twitter_user['profile_sidebar_border_color'] = '';
-        $twitter_user['profile_background_tile'] = 'false';
+        $twitter_user['profile_background_tile'] = false;
 
 		$faves = DB_DataObject::factory('fave');
 		$faves->user_id = $user->id;
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 6a90b4e288..caf8c07163 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -51,6 +51,26 @@ class TwitterapiAction extends Action
         parent::handle($args);
     }
 
+    /**
+     * Overrides XMLOutputter::element to write booleans as strings (true|false).
+     * See that method's documentation for more info.
+     * 
+     * @param string $tag     Element type or tagname
+     * @param array  $attrs   Array of element attributes, as
+     *                        key-value pairs
+     * @param string $content string content of the element
+     *
+     * @return void
+     */
+    function element($tag, $attrs=null, $content=null)
+    {
+        if (is_bool($content)) {
+            $content = ($content ? 'true' : 'false');
+        }
+
+        return parent::element($tag, $attrs, $content);
+    }
+    
     function twitter_user_array($profile, $get_notice=false)
     {
 
@@ -66,7 +86,7 @@ class TwitterapiAction extends Action
         $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
 
         $twitter_user['profile_image_url'] = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE);
-        $twitter_user['protected'] = 'false'; # not supported by Laconica yet
+        $twitter_user['protected'] = false; # not supported by Laconica yet
         $twitter_user['url'] = ($profile->homepage) ? $profile->homepage : null;
 
         if ($get_notice) {
@@ -86,7 +106,7 @@ class TwitterapiAction extends Action
 
         $twitter_status = array();
         $twitter_status['text'] = $notice->content;
-        $twitter_status['truncated'] = 'false'; # Not possible on Laconica
+        $twitter_status['truncated'] = false; # Not possible on Laconica
         $twitter_status['created_at'] = $this->date_twitter($notice->created);
         $twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ?
             intval($notice->reply_to) : null;
@@ -108,10 +128,9 @@ class TwitterapiAction extends Action
             ($replier_profile) ? $replier_profile->nickname : null;
 
         if (isset($this->auth_user)) {
-            $twitter_status['favorited'] =
-                ($this->auth_user->hasFave($notice)) ? 'true' : 'false';
+            $twitter_status['favorited'] = $this->auth_user->hasFave($notice);
         } else {
-            $twitter_status['favorited'] = 'false';
+            $twitter_status['favorited'] = false;
         }
 
         if ($include_user) {

From b764c3be78aef4305b75b14d7f3e8c9f1c552f9e Mon Sep 17 00:00:00 2001
From: Dan Moore <dan@moore.cx>
Date: Sat, 18 Apr 2009 15:42:44 -0400
Subject: [PATCH 05/49] This should change the JSON representation of the
 booleans 'following' and 'notifications', but unlike the previous change, I
 was unable to test this.

---
 actions/twitapiusers.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 41d0d955b1..92d67454cc 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -103,22 +103,14 @@ class TwitapiusersAction extends TwitterapiAction
 
 		if (isset($apidata['user'])) {
 
-			if ($apidata['user']->isSubscribed($profile)) {
-				$twitter_user['following'] = 'true';
-			} else {
-				$twitter_user['following'] = 'false';
-			}
+            $twitter_user['following'] = $apidata['user']->isSubscribed($profile);
             
             // Notifications on?
 		    $sub = Subscription::pkeyGet(array('subscriber' =>
 		        $apidata['user']->id, 'subscribed' => $profile->id));
             
             if ($sub) {
-                if ($sub->jabber || $sub->sms) {
-                    $twitter_user['notifications'] = 'true';
-                } else {
-                    $twitter_user['notifications'] = 'false';
-                }
+                $twitter_user['notifications'] = ($sub->jabber || $sub->sms);
             }
         }
         

From 48846c38057b20bb51814c22456d6907cc2a99e8 Mon Sep 17 00:00:00 2001
From: Dan Moore <dan@moore.cx>
Date: Sat, 18 Apr 2009 15:54:23 -0400
Subject: [PATCH 06/49] Fixing spaces/tabs.

---
 actions/twitapiusers.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 92d67454cc..1542cfb33e 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -82,8 +82,8 @@ class TwitapiusersAction extends TwitterapiAction
 		$twitter_user['profile_text_color'] = '';
 		$twitter_user['profile_link_color'] = '';
 		$twitter_user['profile_sidebar_fill_color'] = '';
-        $twitter_user['profile_sidebar_border_color'] = '';
-        $twitter_user['profile_background_tile'] = false;
+		$twitter_user['profile_sidebar_border_color'] = '';
+		$twitter_user['profile_background_tile'] = false;
 
 		$faves = DB_DataObject::factory('fave');
 		$faves->user_id = $user->id;
@@ -103,16 +103,16 @@ class TwitapiusersAction extends TwitterapiAction
 
 		if (isset($apidata['user'])) {
 
-            $twitter_user['following'] = $apidata['user']->isSubscribed($profile);
+			$twitter_user['following'] = $apidata['user']->isSubscribed($profile);
             
-            // Notifications on?
-		    $sub = Subscription::pkeyGet(array('subscriber' =>
-		        $apidata['user']->id, 'subscribed' => $profile->id));
+			// Notifications on?
+			$sub = Subscription::pkeyGet(array('subscriber' =>
+				$apidata['user']->id, 'subscribed' => $profile->id));
             
-            if ($sub) {
-                $twitter_user['notifications'] = ($sub->jabber || $sub->sms);
-            }
-        }
+			if ($sub) {
+				$twitter_user['notifications'] = ($sub->jabber || $sub->sms);
+			}
+		}
         
 		if ($apidata['content-type'] == 'xml') {
 			$this->init_document('xml');

From 4cb0a929806869b09d4325c1464fc2ecb7b5a76e Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Tue, 21 Apr 2009 20:43:57 +0100
Subject: [PATCH 07/49] Add feed2omb to notice sources

---
 db/notice_source.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/notice_source.sql b/db/notice_source.sql
index d5124e223a..ce44f32354 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -8,6 +8,7 @@ VALUES
     ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
     ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()),
     ('Facebook','Facebook','http://apps.facebook.com/identica/', now()),
+    ('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()),
     ('Gwibber','Gwibber','http://launchpad.net/gwibber', now()),
     ('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
     ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),

From ec5e06a542d6b06ea9b1d3de7cb309dd1088b4d4 Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Tue, 21 Apr 2009 23:36:15 +0100
Subject: [PATCH 08/49] Suppress errors when checking for the existence of
 files that might be restricted by open_basedir - should resolve issue #1310

---
 lib/common.php | 2 +-
 lib/util.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/common.php b/lib/common.php
index b3882d2079..f983c4d168 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -192,7 +192,7 @@ $_config_files[] = INSTALLDIR.'/config.php';
 $_have_a_config = false;
 
 foreach ($_config_files as $_config_file) {
-    if (file_exists($_config_file)) {
+    if (@file_exists($_config_file)) {
         include_once($_config_file);
         $_have_a_config = true;
     }
diff --git a/lib/util.php b/lib/util.php
index e0eda0114b..e1dd238ba8 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -966,7 +966,7 @@ function common_root_url($ssl=false)
 function common_good_rand($bytes)
 {
     // XXX: use random.org...?
-    if (file_exists('/dev/urandom')) {
+    if (@file_exists('/dev/urandom')) {
         return common_urandom($bytes);
     } else { // FIXME: this is probably not good enough
         return common_mtrand($bytes);

From fe3241183e3559442003b9b70435d59126e11b7e Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Thu, 23 Apr 2009 01:03:17 +0000
Subject: [PATCH 09/49] fix join a group link from user homepage when he hasn't
 posted anything yet

---
 actions/all.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/all.php b/actions/all.php
index a92e554623..a53bbea07b 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -93,7 +93,7 @@ class AllAction extends ProfileAction
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
-                $message .= _('Try subscribing to more people, [join a group](%%action.groups) or post something yourself.');
+                $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
             } else {
                 $message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
             }

From c4941e904316ef98582290602f8cba1d220b873a Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Thu, 23 Apr 2009 02:17:58 +0000
Subject: [PATCH 10/49] Added ajax responses

---
 actions/newmessage.php | 45 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/actions/newmessage.php b/actions/newmessage.php
index 82276ff341..52d4899ba2 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -172,15 +172,54 @@ class NewmessageAction extends Action
 
         $this->notify($user, $this->other, $message);
 
-        $url = common_local_url('outbox', array('nickname' => $user->nickname));
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            $this->element('title', null, _('Message sent'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->element('p', array('id' => 'command_result'),
+                sprintf(_('Direct message to %s sent'),
+                    $this->other->nickname));
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            $url = common_local_url('outbox',
+                array('nickname' => $user->nickname));
+            common_redirect($url, 303);
+        }
+    }
 
-        common_redirect($url, 303);
+    /**
+     * Show an Ajax-y error message
+     *
+     * Goes back to the browser, where it's shown in a popup.
+     *
+     * @param string $msg Message to show
+     *
+     * @return void
+     */
+
+    function ajaxErrorMsg($msg)
+    {
+        $this->startHTML('text/xml;charset=utf-8', true);
+        $this->elementStart('head');
+        $this->element('title', null, _('Ajax Error'));
+        $this->elementEnd('head');
+        $this->elementStart('body');
+        $this->element('p', array('id' => 'error'), $msg);
+        $this->elementEnd('body');
+        $this->elementEnd('html');
     }
 
     function showForm($msg = null)
     {
-        $this->msg = $msg;
+        if ($msg && $this->boolean('ajax')) {
+            $this->ajaxErrorMsg($msg);
+            return;
+        }
 
+        $this->msg = $msg;
         $this->showPage();
     }
 

From 63c52784c7acc54b0b7b39ff3ca7763774e4ab9a Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 23 Apr 2009 02:22:00 +0000
Subject: [PATCH 11/49] Allowing XHR for Inbox/Outbox pages.

---
 js/util.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/js/util.js b/js/util.js
index 53e6eb7923..13036f7caf 100644
--- a/js/util.js
+++ b/js/util.js
@@ -192,10 +192,8 @@ $(document).ready(function(){
 												$("#notice_action-submit").removeClass("disabled");
 											 }
 					   };
-    if (document.body.id  != 'inbox' && document.body.id != 'outbox') {
-	    $("#form_notice").ajaxForm(PostNotice);
-	    $("#form_notice").each(addAjaxHidden);
-    }
+	$("#form_notice").ajaxForm(PostNotice);
+	$("#form_notice").each(addAjaxHidden);
     NoticeHover();
     NoticeReply();
 });

From 640628de2d593933e810b4785dfe38923b979713 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 05:03:19 -0400
Subject: [PATCH 12/49] A queuehandler for blowing caches offline

We add a queuehandler for blowing the memcached caches off-line. This
should speed up the processing of new notices.
---
 classes/Notice.php                | 25 ++++++++++++-
 lib/util.php                      | 14 ++++++--
 scripts/memcachedqueuehandler.php | 58 +++++++++++++++++++++++++++++++
 scripts/startdaemons.sh           |  3 +-
 scripts/stopdaemons.sh            |  2 +-
 5 files changed, 97 insertions(+), 5 deletions(-)
 create mode 100644 scripts/memcachedqueuehandler.php

diff --git a/classes/Notice.php b/classes/Notice.php
index 5fa0d79a16..fbfeb94899 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -207,7 +207,11 @@ class Notice extends Memcached_DataObject
         # XXX: someone clever could prepend instead of clearing the cache
 
         if (common_config('memcached', 'enabled')) {
-            $notice->blowCaches();
+            if (common_config('queues', 'enabled')) {
+                $notice->blowAuthorCaches();
+            } else {
+                $notice->blowCaches();
+            }
         }
 
         return $notice;
@@ -271,6 +275,25 @@ class Notice extends Memcached_DataObject
         $this->blowGroupCache($blowLast);
     }
 
+    function blowAuthorCaches($blowLast=false)
+    {
+        // Clear the user's cache
+        $cache = common_memcache();
+        if ($cache) {
+            $user = User::staticGet($this->profile_id);
+            if (!empty($user)) {
+                $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+                if ($blowLast) {
+                    $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id . ';last'));
+                }
+            }
+            $user->free();
+            unset($user);
+        }
+        $this->blowNoticeCache($blowLast);
+        $this->blowPublicCache($blowLast);
+    }
+
     function blowGroupCache($blowLast=false)
     {
         $cache = common_memcache();
diff --git a/lib/util.php b/lib/util.php
index e0eda0114b..12797891cf 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -879,7 +879,17 @@ function common_broadcast_notice($notice, $remote=false)
 
 function common_enqueue_notice($notice)
 {
-    foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook', 'ping') as $transport) {
+    $transports = array('omb', 'sms', 'twitter', 'facebook', 'ping');
+
+    if (common_config('xmpp', 'enabled')) {
+        $transports = array_merge($transports, array('jabber', 'public'));
+    }
+
+    if (common_config('memcached', 'enabled')) {
+        $transports[] = 'memcached';
+    }
+
+    foreach ($transports as $transport) {
         $qi = new Queue_item();
         $qi->notice_id = $notice->id;
         $qi->transport = $transport;
@@ -1332,7 +1342,7 @@ function common_compatible_license($from, $to)
  */
 function common_database_tablename($tablename)
 {
-  
+
   if(common_config('db','quote_identifiers')) {
       $tablename = '"'. $tablename .'"';
   }
diff --git a/scripts/memcachedqueuehandler.php b/scripts/memcachedqueuehandler.php
new file mode 100644
index 0000000000..3fcebcfc30
--- /dev/null
+++ b/scripts/memcachedqueuehandler.php
@@ -0,0 +1,58 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008,2009 Control Yourself, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Abort if called from a web server
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+
+set_error_handler('common_error_handler');
+
+class MemcachedQueueHandler extends QueueHandler
+{
+    function transport()
+    {
+        return 'memcached';
+    }
+
+    function handle_notice($notice)
+    {
+        // XXX: fork here
+        common_log(LOG_INFO, "Blowing memcached for $notice->id\n";
+        $notice->blowCaches();
+        return true;
+    }
+}
+
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
+mb_internal_encoding('UTF-8');
+
+$handler = new MemcachedQueueHandler($resource);
+
+$handler->runOnce();
diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index c3729761d0..08de6d954a 100755
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -24,7 +24,8 @@ DIR=`dirname $0`
 
 for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
          xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
-         twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php; do
+         twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php \
+	 memcachedqueuehandler.php; do
 
          echo -n "Starting $f...";
 	 php $DIR/$f
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index 2bb8f9ecb2..e5a181cd12 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -24,7 +24,7 @@ SDIR=`dirname $0`
 DIR=`php $SDIR/getpiddir.php`
 
 for f in jabberhandler ombhandler publichandler smshandler pinghandler \
-	 xmppconfirmhandler xmppdaemon twitterhandler facebookhandler ; do
+	 xmppconfirmhandler xmppdaemon twitterhandler facebookhandler memcachedhandler; do
 
 	FILES="$DIR/$f.*.pid"
 	for ff in "$FILES" ; do

From aee45ea91dcec4736d8b9befe17e030b873d9226 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 05:08:48 -0400
Subject: [PATCH 13/49] Add an inbox queue handler

Handle distributing a notice to multiple inboxes in a queue handler
rather than in the Web action.
---
 classes/Notice.php            |  5 ++-
 lib/util.php                  |  4 +++
 scripts/inboxqueuehandler.php | 57 +++++++++++++++++++++++++++++++++++
 scripts/startdaemons.sh       |  2 +-
 scripts/stopdaemons.sh        |  3 +-
 5 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 scripts/inboxqueuehandler.php

diff --git a/classes/Notice.php b/classes/Notice.php
index fbfeb94899..ff00f2a946 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -197,7 +197,10 @@ class Notice extends Memcached_DataObject
             $notice->saveTags();
             $notice->saveGroups();
 
-            $notice->addToInboxes();
+            if (!common_config('queues', 'enabled')) {
+                $notice->addToInboxes();
+            }
+
             $notice->query('COMMIT');
 
             Event::handle('EndNoticeSave', array($notice));
diff --git a/lib/util.php b/lib/util.php
index 12797891cf..9b6d2941a0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -889,6 +889,10 @@ function common_enqueue_notice($notice)
         $transports[] = 'memcached';
     }
 
+    if (common_config('queues', 'enabled')) {
+        $transports[] = 'inbox';
+    }
+
     foreach ($transports as $transport) {
         $qi = new Queue_item();
         $qi->notice_id = $notice->id;
diff --git a/scripts/inboxqueuehandler.php b/scripts/inboxqueuehandler.php
new file mode 100644
index 0000000000..16e334b83e
--- /dev/null
+++ b/scripts/inboxqueuehandler.php
@@ -0,0 +1,57 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008,2009 Control Yourself, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Abort if called from a web server
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+
+set_error_handler('common_error_handler');
+
+class InboxQueueHandler extends QueueHandler
+{
+    function transport()
+    {
+        return 'inbox';
+    }
+
+    function handle_notice($notice)
+    {
+        common_log(LOG_INFO, "Distributing notice to inboxes for $notice->id");
+        $notice->addToInboxes();
+        return true;
+    }
+}
+
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
+mb_internal_encoding('UTF-8');
+
+$handler = new InboxQueueHandler($resource);
+
+$handler->runOnce();
diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 08de6d954a..66f9ed4e0c 100755
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -25,7 +25,7 @@ DIR=`dirname $0`
 for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
          xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
          twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php \
-	 memcachedqueuehandler.php; do
+	 memcachedqueuehandler.php inboxqueuehandler.php; do
 
          echo -n "Starting $f...";
 	 php $DIR/$f
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index e5a181cd12..196991de0f 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -24,7 +24,8 @@ SDIR=`dirname $0`
 DIR=`php $SDIR/getpiddir.php`
 
 for f in jabberhandler ombhandler publichandler smshandler pinghandler \
-	 xmppconfirmhandler xmppdaemon twitterhandler facebookhandler memcachedhandler; do
+	 xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
+         memcachedhandler inboxhandler; do
 
 	FILES="$DIR/$f.*.pid"
 	for ff in "$FILES" ; do

From 2053bdabef929f4a095d91fbdd3fa62646e9f332 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 05:23:59 -0400
Subject: [PATCH 14/49] fix parse error in memcachedqueuehandler

---
 scripts/memcachedqueuehandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/memcachedqueuehandler.php b/scripts/memcachedqueuehandler.php
index 3fcebcfc30..43231fa2c6 100644
--- a/scripts/memcachedqueuehandler.php
+++ b/scripts/memcachedqueuehandler.php
@@ -42,7 +42,7 @@ class MemcachedQueueHandler extends QueueHandler
     function handle_notice($notice)
     {
         // XXX: fork here
-        common_log(LOG_INFO, "Blowing memcached for $notice->id\n";
+        common_log(LOG_INFO, "Blowing memcached for $notice->id");
         $notice->blowCaches();
         return true;
     }

From 31b04220bd9fbadbfac01b60276a9c14896b6a45 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 09:34:56 +0000
Subject: [PATCH 15/49] incorrect config setting for queues

---
 classes/Notice.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index ff00f2a946..ebed0b8af5 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -197,7 +197,7 @@ class Notice extends Memcached_DataObject
             $notice->saveTags();
             $notice->saveGroups();
 
-            if (!common_config('queues', 'enabled')) {
+            if (!common_config('queue', 'enabled')) {
                 $notice->addToInboxes();
             }
 
@@ -210,7 +210,7 @@ class Notice extends Memcached_DataObject
         # XXX: someone clever could prepend instead of clearing the cache
 
         if (common_config('memcached', 'enabled')) {
-            if (common_config('queues', 'enabled')) {
+            if (common_config('queue', 'enabled')) {
                 $notice->blowAuthorCaches();
             } else {
                 $notice->blowCaches();

From ece70bf326fa680ec7acdef00751e2bb71bceee1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 09:35:10 +0000
Subject: [PATCH 16/49] incorrect config setting for inboxes

---
 lib/util.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index af4db4f02d..d77039b747 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -889,7 +889,8 @@ function common_enqueue_notice($notice)
         $transports[] = 'memcached';
     }
 
-    if (common_config('queues', 'enabled')) {
+    if (common_config('inboxes', 'enabled') === true ||
+        common_config('inboxes', 'enabled') === 'transitional') {
         $transports[] = 'inbox';
     }
 

From a3e727823d01ed9fd5f440eeaf27449092309865 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 09:52:21 +0000
Subject: [PATCH 17/49] some basic fixes for inbox and memcached queue handlers

---
 scripts/inboxqueuehandler.php     | 15 +++++++++++++--
 scripts/memcachedqueuehandler.php | 16 ++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 scripts/inboxqueuehandler.php
 mode change 100644 => 100755 scripts/memcachedqueuehandler.php

diff --git a/scripts/inboxqueuehandler.php b/scripts/inboxqueuehandler.php
old mode 100644
new mode 100755
index 16e334b83e..c76b803898
--- a/scripts/inboxqueuehandler.php
+++ b/scripts/inboxqueuehandler.php
@@ -29,6 +29,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('LACONICA', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
+require_once(INSTALLDIR . '/lib/queuehandler.php');
 
 set_error_handler('common_error_handler');
 
@@ -39,12 +40,20 @@ class InboxQueueHandler extends QueueHandler
         return 'inbox';
     }
 
+	function start() {
+		$this->log(LOG_INFO, "INITIALIZE");
+		return true;
+	}
+
     function handle_notice($notice)
     {
-        common_log(LOG_INFO, "Distributing notice to inboxes for $notice->id");
+        $this->log(LOG_INFO, "Distributing notice to inboxes for $notice->id");
         $notice->addToInboxes();
         return true;
     }
+
+	function finish() {
+	}
 }
 
 ini_set("max_execution_time", "0");
@@ -52,6 +61,8 @@ ini_set("max_input_time", "0");
 set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
-$handler = new InboxQueueHandler($resource);
+$id = ($argc > 1) ? $argv[1] : null;
+
+$handler = new InboxQueueHandler($id);
 
 $handler->runOnce();
diff --git a/scripts/memcachedqueuehandler.php b/scripts/memcachedqueuehandler.php
old mode 100644
new mode 100755
index 43231fa2c6..6e819b41f1
--- a/scripts/memcachedqueuehandler.php
+++ b/scripts/memcachedqueuehandler.php
@@ -29,6 +29,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('LACONICA', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
+require_once(INSTALLDIR . '/lib/queuehandler.php');
 
 set_error_handler('common_error_handler');
 
@@ -39,13 +40,22 @@ class MemcachedQueueHandler extends QueueHandler
         return 'memcached';
     }
 
+	function start() {
+		$this->log(LOG_INFO, "INITIALIZE");
+		return true;
+	}
+
     function handle_notice($notice)
     {
         // XXX: fork here
-        common_log(LOG_INFO, "Blowing memcached for $notice->id");
+        $this->log(LOG_INFO, "Blowing memcached for $notice->id");
         $notice->blowCaches();
         return true;
     }
+
+	function finish() {
+	}
+
 }
 
 ini_set("max_execution_time", "0");
@@ -53,6 +63,8 @@ ini_set("max_input_time", "0");
 set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
-$handler = new MemcachedQueueHandler($resource);
+$id = ($argc > 1) ? $argv[1] : null;
+
+$handler = new MemcachedQueueHandler($id);
 
 $handler->runOnce();

From 7c383dc1d46cae8abc6d1e5c7eb93ad7cdd91f63 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 10:08:26 +0000
Subject: [PATCH 18/49] alert to what transport we're checking for

---
 lib/queuehandler.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/queuehandler.php b/lib/queuehandler.php
index 9ce9e32b3b..fde650d9ed 100644
--- a/lib/queuehandler.php
+++ b/lib/queuehandler.php
@@ -36,7 +36,7 @@ class QueueHandler extends Daemon
             $this->set_id($id);
         }
     }
-    
+
     function class_name()
     {
         return ucfirst($this->transport()) . 'Handler';
@@ -46,7 +46,7 @@ class QueueHandler extends Daemon
     {
         return strtolower($this->class_name().'.'.$this->get_id());
     }
-    
+
     function get_id()
     {
         return $this->_id;
@@ -56,16 +56,16 @@ class QueueHandler extends Daemon
     {
         $this->_id = $id;
     }
-    
+
     function transport()
     {
         return null;
     }
-    
+
     function start()
     {
     }
-    
+
     function finish()
     {
     }
@@ -74,14 +74,14 @@ class QueueHandler extends Daemon
     {
         return true;
     }
-    
+
     function run()
     {
         if (!$this->start()) {
             return false;
         }
-        $this->log(LOG_INFO, 'checking for queued notices');
         $transport = $this->transport();
+        $this->log(LOG_INFO, 'checking for queued notices for "' . $transport . '"');
         do {
             $qi = Queue_item::top($transport);
             if ($qi) {
@@ -113,7 +113,7 @@ class QueueHandler extends Daemon
             } else {
                 $this->clear_old_claims();
                 $this->idle(5);
-            }    
+            }
         } while (true);
         if (!$this->finish()) {
             return false;
@@ -127,7 +127,7 @@ class QueueHandler extends Daemon
             sleep($timeout);
         }
     }
-    
+
     function clear_old_claims()
     {
         $qi = new Queue_item();
@@ -137,10 +137,9 @@ class QueueHandler extends Daemon
         $qi->free();
         unset($qi);
     }
-    
+
     function log($level, $msg)
     {
         common_log($level, $this->class_name() . ' ('. $this->get_id() .'): '.$msg);
     }
 }
-    
\ No newline at end of file

From 290ae7888c4d8dbcb703920960b10bca635563ed Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 10:08:51 +0000
Subject: [PATCH 19/49] blow subs cache after updating inboxes

---
 scripts/inboxqueuehandler.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/inboxqueuehandler.php b/scripts/inboxqueuehandler.php
index c76b803898..73d31e8542 100755
--- a/scripts/inboxqueuehandler.php
+++ b/scripts/inboxqueuehandler.php
@@ -49,6 +49,7 @@ class InboxQueueHandler extends QueueHandler
     {
         $this->log(LOG_INFO, "Distributing notice to inboxes for $notice->id");
         $notice->addToInboxes();
+        $notice->blowSubsCache();
         return true;
     }
 

From 1c0d82de3bb7f75649a017a7d5632a6e070876c2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 10:09:08 +0000
Subject: [PATCH 20/49] 8-char limit on transports

---
 lib/util.php                      | 3 ++-
 scripts/memcachedqueuehandler.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index d77039b747..f862d7fcc2 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -886,7 +886,8 @@ function common_enqueue_notice($notice)
     }
 
     if (common_config('memcached', 'enabled')) {
-        $transports[] = 'memcached';
+        // Note: limited to 8 chars
+        $transports[] = 'memcache';
     }
 
     if (common_config('inboxes', 'enabled') === true ||
diff --git a/scripts/memcachedqueuehandler.php b/scripts/memcachedqueuehandler.php
index 6e819b41f1..185b781f75 100755
--- a/scripts/memcachedqueuehandler.php
+++ b/scripts/memcachedqueuehandler.php
@@ -37,7 +37,7 @@ class MemcachedQueueHandler extends QueueHandler
 {
     function transport()
     {
-        return 'memcached';
+        return 'memcache';
     }
 
 	function start() {

From a9df5eab100bce97da3e028851d224ea2e9fff80 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 10:38:51 +0000
Subject: [PATCH 21/49] insert into user's inbox at Web time

---
 classes/Notice.php | 76 +++++++++++++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 25 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index ebed0b8af5..27b98de1cc 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -197,7 +197,9 @@ class Notice extends Memcached_DataObject
             $notice->saveTags();
             $notice->saveGroups();
 
-            if (!common_config('queue', 'enabled')) {
+            if (common_config('queue', 'enabled')) {
+                $notice->addToAuthorInbox();
+            } else {
                 $notice->addToInboxes();
             }
 
@@ -282,16 +284,8 @@ class Notice extends Memcached_DataObject
     {
         // Clear the user's cache
         $cache = common_memcache();
-        if ($cache) {
-            $user = User::staticGet($this->profile_id);
-            if (!empty($user)) {
-                $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
-                if ($blowLast) {
-                    $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id . ';last'));
-                }
-            }
-            $user->free();
-            unset($user);
+        if (!empty($cache)) {
+            $cache->delete(common_cache_key('user:notices_with_friends:' . $this->profile_id));
         }
         $this->blowNoticeCache($blowLast);
         $this->blowPublicCache($blowLast);
@@ -665,6 +659,33 @@ class Notice extends Memcached_DataObject
         return;
     }
 
+    function addToAuthorInbox()
+    {
+        $enabled = common_config('inboxes', 'enabled');
+
+        if ($enabled === true || $enabled === 'transitional') {
+            $user = User::staticGet('id', $this->profile_id);
+            if (empty($user)) {
+                return;
+            }
+            $inbox = new Notice_inbox();
+            $UT = common_config('db','type')=='pgsql'?'"user"':'user';
+            $qry = 'INSERT INTO notice_inbox (user_id, notice_id, created) ' .
+              "SELECT $UT.id, " . $this->id . ", '" . $this->created . "' " .
+              "FROM $UT " .
+              "WHERE $UT.id = " . $this->profile_id . ' ' .
+              'AND NOT EXISTS (SELECT user_id, notice_id ' .
+              'FROM notice_inbox ' .
+              "WHERE user_id = " . $this->profile_id . ' '.
+              'AND notice_id = ' . $this->id . ' )';
+            if ($enabled === 'transitional') {
+                $qry .= " AND $UT.inboxed = 1";
+            }
+            $inbox->query($qry);
+        }
+        return;
+    }
+
     function saveGroups()
     {
         $enabled = common_config('inboxes', 'enabled');
@@ -717,24 +738,29 @@ class Notice extends Memcached_DataObject
 
                 // FIXME: do this in an offline daemon
 
-                $inbox = new Notice_inbox();
-                $UT = common_config('db','type')=='pgsql'?'"user"':'user';
-                $qry = 'INSERT INTO notice_inbox (user_id, notice_id, created, source) ' .
-                  "SELECT $UT.id, " . $this->id . ", '" . $this->created . "', 2 " .
-                  "FROM $UT JOIN group_member ON $UT.id = group_member.profile_id " .
-                  'WHERE group_member.group_id = ' . $group->id . ' ' .
-                  'AND NOT EXISTS (SELECT user_id, notice_id ' .
-                  'FROM notice_inbox ' .
-                  "WHERE user_id = $UT.id " .
-                  'AND notice_id = ' . $this->id . ' )';
-                if ($enabled === 'transitional') {
-                    $qry .= " AND $UT.inboxed = 1";
-                }
-                $result = $inbox->query($qry);
+                $this->addToGroupInboxes($group);
             }
         }
     }
 
+    function addToGroupInboxes($group)
+    {
+        $inbox = new Notice_inbox();
+        $UT = common_config('db','type')=='pgsql'?'"user"':'user';
+        $qry = 'INSERT INTO notice_inbox (user_id, notice_id, created, source) ' .
+          "SELECT $UT.id, " . $this->id . ", '" . $this->created . "', 2 " .
+          "FROM $UT JOIN group_member ON $UT.id = group_member.profile_id " .
+          'WHERE group_member.group_id = ' . $group->id . ' ' .
+          'AND NOT EXISTS (SELECT user_id, notice_id ' .
+          'FROM notice_inbox ' .
+          "WHERE user_id = $UT.id " .
+          'AND notice_id = ' . $this->id . ' )';
+        if ($enabled === 'transitional') {
+            $qry .= " AND $UT.inboxed = 1";
+        }
+        $result = $inbox->query($qry);
+    }
+
     function saveReplies()
     {
         // Alternative reply format

From 2bdf192dabb9dfbbc889c3387bf5261a2d4166ce Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 23 Apr 2009 21:35:21 +0000
Subject: [PATCH 22/49] XHR alerts for server-side errors: 404, 502, 503, 504.
 There is also a 7 second timeout if the server doesn't get back with a
 response.

---
 js/util.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/js/util.js b/js/util.js
index 13036f7caf..c7b1272c8d 100644
--- a/js/util.js
+++ b/js/util.js
@@ -166,6 +166,25 @@ $(document).ready(function(){
 																		   $("#notice_action-submit").addClass("disabled");
 																		   return true;
 												 						 },
+					   timeout: 1000,
+					   error: function (xhr, textStatus, errorThrown) {	$("#form_notice").removeClass("processing");
+																		$("#notice_action-submit").removeAttr("disabled");
+																		$("#notice_action-submit").removeClass("disabled");
+
+																		if (textStatus == "timeout") {
+																			alert ("Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists");
+																		}
+																		else {
+																			switch(xhr.status) {
+																				default: case 404:
+																					alert("Sorry! We had trouble sending your notice.  Please report the problem to the site administrator if this happens again.");
+																					break;
+																				case 502: case 503: case 504:
+																					alert("Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.");
+																					break;
+																			}
+																		}
+																	  },
 					   success: function(xml) {	if ($("#error", xml).length > 0) {
 													var result = document._importNode($("p", xml).get(0), true);
 													result = result.textContent || result.innerHTML;

From 83ba1b0b5ef10dc1101ba35bcde4710fd13179cc Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 23 Apr 2009 21:51:49 +0000
Subject: [PATCH 23/49] The real 7 seconds (7000) timeout for XHR posting.

---
 js/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/util.js b/js/util.js
index c7b1272c8d..16422df579 100644
--- a/js/util.js
+++ b/js/util.js
@@ -166,7 +166,7 @@ $(document).ready(function(){
 																		   $("#notice_action-submit").addClass("disabled");
 																		   return true;
 												 						 },
-					   timeout: 1000,
+					   timeout: 7000,
 					   error: function (xhr, textStatus, errorThrown) {	$("#form_notice").removeClass("processing");
 																		$("#notice_action-submit").removeAttr("disabled");
 																		$("#notice_action-submit").removeClass("disabled");

From 12867d114d8d40bf9a45b3e1eb9b0e50d736d333 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Fri, 24 Apr 2009 17:22:43 +0000
Subject: [PATCH 24/49] UI for server errors.

---
 js/util.js                 | 15 +++------------
 theme/base/css/display.css | 11 +++++++++--
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/js/util.js b/js/util.js
index 16422df579..15a14625c7 100644
--- a/js/util.js
+++ b/js/util.js
@@ -166,23 +166,14 @@ $(document).ready(function(){
 																		   $("#notice_action-submit").addClass("disabled");
 																		   return true;
 												 						 },
-					   timeout: 7000,
 					   error: function (xhr, textStatus, errorThrown) {	$("#form_notice").removeClass("processing");
 																		$("#notice_action-submit").removeAttr("disabled");
 																		$("#notice_action-submit").removeClass("disabled");
-
-																		if (textStatus == "timeout") {
-																			alert ("Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists");
+																		if ($(".error", xhr.responseXML).length > 0) {
+																			$('#form_notice').append(document._importNode($(".error", xhr.responseXML).get(0), true));
 																		}
 																		else {
-																			switch(xhr.status) {
-																				default: case 404:
-																					alert("Sorry! We had trouble sending your notice.  Please report the problem to the site administrator if this happens again.");
-																					break;
-																				case 502: case 503: case 504:
-																					alert("Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.");
-																					break;
-																			}
+																			alert("Sorry! We had trouble sending your notice ("+xhr.status+" "+xhr.statusText+"). Please report the problem to the site administrator if this happens again.");
 																		}
 																	  },
 					   success: function(xml) {	if ($("#error", xml).length > 0) {
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 2fb1c007fc..0bc2e68b65 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -86,7 +86,7 @@ border:0;
 
 .error,
 .success {
-padding:4px 7px;
+padding:4px 1.55%;
 border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
@@ -426,6 +426,7 @@ line-height:1;
 #form_notice fieldset {
 border:0;
 padding:0;
+position:relative;
 }
 #form_notice legend {
 display:none;
@@ -480,7 +481,13 @@ margin-bottom:7px;
 margin-left:18px;
 float:left;
 }
-
+#form_notice .error {
+float:left;
+clear:both;
+width:96.9%;
+margin-bottom:0;
+line-height:1.618;
+}
 
 /* entity_profile */
 .entity_profile {

From ecb09fb8646def7f6a7c5fc0fc2d4df6676edd06 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 24 Apr 2009 13:31:03 -0400
Subject: [PATCH 25/49] check for existence of xmlrpc extension in
 LinkbackPlugin

---
 plugins/LinkbackPlugin.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php
index 881ead99ec..93a0294c4c 100644
--- a/plugins/LinkbackPlugin.php
+++ b/plugins/LinkbackPlugin.php
@@ -121,6 +121,12 @@ class LinkbackPlugin extends Plugin
     {
         $args = array($this->notice->uri, $url);
 
+        if (!extension_loaded('xmlrpc')) {
+            if (!dl('xmlrpc.so')) {
+                common_log(LOG_ERR, "Can't pingback; xmlrpc extension not available.");
+            }
+        }
+
         $request = xmlrpc_encode_request('pingback.ping', $args);
         $context = stream_context_create(array('http' => array('method' => "POST",
                                                                'header' =>
@@ -141,7 +147,7 @@ class LinkbackPlugin extends Plugin
     }
 
     // Largely cadged from trackback_cls.php by
-    // Ran Aroussi <ran@blogish.org>, GPL2
+    // Ran Aroussi <ran@blogish.org>, GPL2 or any later version
     // http://phptrackback.sourceforge.net/
 
     function getTrackback($text, $url)

From c008c0d4a56ec265ba6e10d208f9954510296f12 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Fri, 24 Apr 2009 20:01:03 +0000
Subject: [PATCH 26/49] fixed trac#1215, 1216, 1217 and 1219:
 subscribers/subscriptions people tagclouds.

---
 lib/subpeopletagcloudsection.php               |  1 +
 lib/subscriberspeopleselftagcloudsection.php   | 10 +++++++++-
 lib/subscriberspeopletagcloudsection.php       |  5 +++--
 lib/subscriptionspeopleselftagcloudsection.php |  9 ++++++++-
 lib/subscriptionspeopletagcloudsection.php     |  4 +++-
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/lib/subpeopletagcloudsection.php b/lib/subpeopletagcloudsection.php
index d98f28afa7..9f6948dc92 100644
--- a/lib/subpeopletagcloudsection.php
+++ b/lib/subpeopletagcloudsection.php
@@ -74,3 +74,4 @@ class SubPeopleTagCloudSection extends TagCloudSection
         $this->out->elementEnd('li');
     }
 }
+
diff --git a/lib/subscriberspeopleselftagcloudsection.php b/lib/subscriberspeopleselftagcloudsection.php
index b5a39c6de6..115241a53f 100644
--- a/lib/subscriberspeopleselftagcloudsection.php
+++ b/lib/subscriberspeopleselftagcloudsection.php
@@ -49,6 +49,14 @@ class SubscribersPeopleSelfTagCloudSection extends SubPeopleTagCloudSection
     }
 
     function query() {
-        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscribed != subscriber and tagger = tagged group by tag order by weight desc';
+//        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscribed != subscriber and tagger = tagged group by tag order by weight desc';
+
+
+        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscribed != subscriber and tagger = tagged and tag is not null group by tag order by weight desc';
+
+//        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscribed where subscriber=%d and subscribed != subscriber and tagger = tagged and tag is not null group by tag order by weight desc';
+
+
     }
 }
+
diff --git a/lib/subscriberspeopletagcloudsection.php b/lib/subscriberspeopletagcloudsection.php
index 23011efdd3..4dafbc1c7d 100644
--- a/lib/subscriberspeopletagcloudsection.php
+++ b/lib/subscriberspeopletagcloudsection.php
@@ -53,8 +53,9 @@ class SubscribersPeopleTagCloudSection extends SubPeopleTagCloudSection
         return common_local_url('subscribers', array('nickname' => $nickname, 'tag' => $tag));
     }
 
-
     function query() {
-        return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagged and subscribed=tagger where subscribed=%d and subscriber != subscribed group by tag order by weight desc';
+//        return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagged and subscribed=tagger where subscribed=%d and subscriber != subscribed group by tag order by weight desc';
+        return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagged and subscribed=tagger where subscribed=%d and subscriber != subscribed and tag is not null group by tag order by weight desc';
     }
 }
+
diff --git a/lib/subscriptionspeopleselftagcloudsection.php b/lib/subscriptionspeopleselftagcloudsection.php
index 8ac65adb05..3896294d28 100644
--- a/lib/subscriptionspeopleselftagcloudsection.php
+++ b/lib/subscriptionspeopleselftagcloudsection.php
@@ -49,6 +49,13 @@ class SubscriptionsPeopleSelfTagCloudSection extends SubPeopleTagCloudSection
     }
 
     function query() {
-        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscriber != subscribed and tagger = tagged group by tag order by weight desc';
+//        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscriber != subscribed and tagger = tagged group by tag order by weight desc';
+
+
+
+        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscribed where subscriber=%d and subscribed != subscriber and tagger = tagged and tag is not null group by tag order by weight desc';
+
+//        return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscribed != subscriber and tagger = tagged and tag is not null group by tag order by weight desc';
     }
 }
+
diff --git a/lib/subscriptionspeopletagcloudsection.php b/lib/subscriptionspeopletagcloudsection.php
index c3f7d1763e..f9c8672e36 100644
--- a/lib/subscriptionspeopletagcloudsection.php
+++ b/lib/subscriptionspeopletagcloudsection.php
@@ -54,6 +54,8 @@ class SubscriptionsPeopleTagCloudSection extends SubPeopleTagCloudSection
     }
 
     function query() {
-        return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagger and subscribed=tagged where subscriber=%d and subscriber != subscribed group by tag order by weight desc';
+//        return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagger and subscribed=tagged where subscriber=%d and subscriber != subscribed group by tag order by weight desc';
+        return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagger and subscribed=tagged where subscriber=%d and subscriber != subscribed and tag is not null group by tag order by weight desc';
     }
 }
+

From d71fbe9d9693cd5426be74807ff8f18fc6376c56 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Fri, 24 Apr 2009 20:28:39 +0000
Subject: [PATCH 27/49] fixed subscriptions dropdown action

---
 lib/galleryaction.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index 0484918ce2..8fa11a7562 100644
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -134,9 +134,11 @@ class GalleryAction extends Action
             $this->elementStart('li', array('id'=>'filter_tags_item'));
             $this->elementStart('form', array('name' => 'bytag',
                                                'id' => 'bytag',
+                                               'action' => common_path('?action=' . $this->trimmed('action')),
                                                'method' => 'post'));
             $this->dropdown('tag', _('Tag'), $content,
                             _('Choose a tag to narrow list'), false, $tag);
+            $this->hidden('nickname', $this->user->nickname);
             $this->submit('submit', _('Go'));
             $this->elementEnd('form');
             $this->elementEnd('li');
@@ -169,4 +171,4 @@ class GalleryAction extends Action
     {
         return array();
     }
-}
\ No newline at end of file
+}

From 5e6eb27f843a22b80ac114f382682fba0c37589e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sat, 25 Apr 2009 14:20:24 -0400
Subject: [PATCH 28/49] first pass at Comet plugin; doesn't yet update

---
 plugins/Comet/CometPlugin.php       | 138 +++++++++++
 plugins/Comet/bayeux.class.inc.php  | 129 ++++++++++
 plugins/Comet/bayeux.class.inc.phps | 123 ++++++++++
 plugins/Comet/jquery.comet.js       | 363 ++++++++++++++++++++++++++++
 plugins/Comet/updatetimeline.js     |   3 +
 5 files changed, 756 insertions(+)
 create mode 100644 plugins/Comet/CometPlugin.php
 create mode 100644 plugins/Comet/bayeux.class.inc.php
 create mode 100644 plugins/Comet/bayeux.class.inc.phps
 create mode 100644 plugins/Comet/jquery.comet.js
 create mode 100644 plugins/Comet/updatetimeline.js

diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
new file mode 100644
index 0000000000..10f8c198c3
--- /dev/null
+++ b/plugins/Comet/CometPlugin.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Plugin to do "real time" updates using Comet/Bayeux
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Plugin to do realtime updates using Comet
+ *
+ * @category Plugin
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class CometPlugin extends Plugin
+{
+    var $server = null;
+
+    function __construct($server=null)
+    {
+        $this->server = $server;
+
+        parent::__construct();
+    }
+
+    function onEndShowScripts($action)
+    {
+        $timeline = null;
+
+        switch ($action->trimmed('action')) {
+         case 'public':
+            $timeline = '/timelines/public';
+            break;
+         default:
+            return true;
+        }
+
+        $action->element('script', array('type' => 'text/javascript',
+                                         'src' => common_path('plugins/Comet/jquery.comet.js')),
+                         ' ');
+        $action->elementStart('script', array('type' => 'text/javascript'));
+        $action->raw("var _timelineServer = \"$this->server\"; ".
+                     "var _timeline = \"$timeline\";");
+        $action->elementEnd('script');
+        $action->element('script', array('type' => 'text/javascript',
+                                         'src' => common_path('plugins/Comet/updatetimeline.js')),
+                         ' ');
+        return true;
+    }
+
+    function onEndNoticeSave($notice)
+    {
+        $this->log(LOG_INFO, "Called for save notice.");
+
+        $timelines = array();
+
+        // XXX: Add other timelines; this is just for the public one
+
+        if ($notice->is_local ||
+            ($notice->is_local == 0 && !common_config('public', 'localonly'))) {
+            $timelines[] = '/timelines/public';
+        }
+
+        if (count($timelines) > 0) {
+            // Require this, since we need it
+            require_once(INSTALLDIR.'/plugins/Comet/bayeux.class.inc.php');
+
+            $json = $this->noticeAsJson($notice);
+
+            $this->log(LOG_DEBUG, "JSON = '$json'");
+
+            // Bayeux? Comet? Huh? These terms confuse me
+            $bay = new Bayeux($this->server);
+
+            foreach ($timelines as $timeline) {
+                $this->log(LOG_INFO, "Posting notice $notice->id to '$timeline'.");
+                $bay->publish($timeline, $json);
+                $this->log(LOG_DEBUG, "Done posting notice $notice->id to '$timeline'.");
+            }
+
+            $bay = NULL;
+        }
+
+        $this->log(LOG_DEBUG, "All done.");
+        return true;
+    }
+
+    function noticeAsJson($notice)
+    {
+        // FIXME: this code should be abstracted to a neutral third
+        // party, like Notice::asJson(). I'm not sure of the ethics
+        // of refactoring from within a plugin, so I'm just abusing
+        // the TwitterApiAction method. Don't do this unless you're me!
+
+        require_once(INSTALLDIR.'/lib/twitterapi.php');
+
+        $act = new TwitterApiAction('/dev/null');
+
+        $arr = $act->twitter_status_array($notice, true);
+        return $arr;
+    }
+
+    // Push this up to Plugin
+
+    function log($level, $msg)
+    {
+        common_log($level, get_class($this) . ': '.$msg);
+    }
+}
diff --git a/plugins/Comet/bayeux.class.inc.php b/plugins/Comet/bayeux.class.inc.php
new file mode 100644
index 0000000000..602a7b6446
--- /dev/null
+++ b/plugins/Comet/bayeux.class.inc.php
@@ -0,0 +1,129 @@
+<?php
+/*
+ *
+ * Phomet: a php comet client
+ *
+ * Copyright (C) 2008 Morgan 'ARR!' Allen <morganrallen@gmail.com> http://morglog.alleycatracing.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+class Bayeux
+{
+    private $oCurl = '';
+    private $nNextId = 0;
+
+    public $sUrl = '';
+
+    function __construct($sUrl)
+    {
+        $this->sUrl = $sUrl;
+
+        $this->oCurl = curl_init();
+
+        $aHeaders = array();
+        $aHeaders[] = 'Connection: Keep-Alive';
+
+        curl_setopt($this->oCurl, CURLOPT_URL, $sUrl);
+        curl_setopt($this->oCurl, CURLOPT_HTTPHEADER, $aHeaders);
+        curl_setopt($this->oCurl, CURLOPT_HEADER, 0);
+        curl_setopt($this->oCurl, CURLOPT_POST, 1);
+        curl_setopt($this->oCurl, CURLOPT_RETURNTRANSFER,1);
+
+        $this->handShake();
+    }
+
+    function __destruct()
+    {
+        $this->disconnect();
+    }
+
+    function handShake()
+    {
+        $msgHandshake = array();
+        $msgHandshake['channel'] = '/meta/handshake';
+        $msgHandshake['version'] = "1.0";
+        $msgHandshake['minimumVersion'] = "0.9";
+        $msgHandshake['supportedConnectionTypes'] = array('long-polling');
+        $msgHandshake['id'] = $this->nNextId++;
+
+        curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($msgHandshake)))));
+
+        $data = curl_exec($this->oCurl);
+
+        if(curl_errno($this->oCurl))
+          die("Error: " . curl_error($this->oCurl));
+
+        $oReturn = json_decode($data);
+
+        common_debug(print_r($oReturn, true));
+
+        if (is_array($oReturn)) {
+            $oReturn = $oReturn[0];
+        }
+
+        $bSuccessful = ($oReturn->successful) ? true : false;
+
+        if($bSuccessful)
+        {
+            $this->clientId = $oReturn->clientId;
+
+            $this->connect();
+        }
+    }
+
+    public function connect()
+    {
+        $aMsg['channel'] = '/meta/connect';
+        $aMsg['id'] = $this->nNextId++;
+        $aMsg['clientId'] = $this->clientId;
+        $aMsg['connectionType'] = 'long-polling';
+
+        curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($aMsg)))));
+
+        $data = curl_exec($this->oCurl);
+    }
+
+    function disconnect()
+    {
+        $msgHandshake = array();
+        $msgHandshake['channel'] = '/meta/disconnect';
+        $msgHandshake['id'] = $this->nNextId++;
+        $msgHandshake['clientId'] = $this->clientId;
+
+        curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($msgHandshake)))));
+
+        curl_exec($this->oCurl);
+    }
+
+    public function publish($sChannel, $oData)
+    {
+        if(!$sChannel || !$oData)
+          return;
+
+        $aMsg = array();
+
+        $aMsg['channel'] = $sChannel;
+        $aMsg['id'] = $this->nNextId++;
+        $aMsg['data'] = $oData;
+        $aMsg['clientId'] = $this->clientId;
+
+        curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($aMsg)))));
+
+        $data = curl_exec($this->oCurl);
+//        var_dump($data);
+    }
+}
diff --git a/plugins/Comet/bayeux.class.inc.phps b/plugins/Comet/bayeux.class.inc.phps
new file mode 100644
index 0000000000..ea004a4532
--- /dev/null
+++ b/plugins/Comet/bayeux.class.inc.phps
@@ -0,0 +1,123 @@
+<?php
+/*
+ *
+ * Phomet: a php comet client
+ *
+ * Copyright (C) 2008 Morgan 'ARR!' Allen <morganrallen@gmail.com> http://morglog.alleycatracing.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+class Bayeux
+	{
+		private $oCurl = '';
+		private $nNextId = 0;
+
+		public $sUrl = '';
+
+		function __construct($sUrl)
+		{
+			$this->sUrl = $sUrl;
+
+			$this->oCurl = curl_init();
+
+			$aHeaders = array();
+			$aHeaders[] = 'Connection: Keep-Alive';
+
+			curl_setopt($this->oCurl, CURLOPT_URL, $sUrl);
+			curl_setopt($this->oCurl, CURLOPT_HTTPHEADER, $aHeaders);
+			curl_setopt($this->oCurl, CURLOPT_HEADER, 0);
+			curl_setopt($this->oCurl, CURLOPT_POST, 1);
+			curl_setopt($this->oCurl, CURLOPT_RETURNTRANSFER,1);
+
+			$this->handShake();
+		}
+
+		function __destruct()
+		{
+			$this->disconnect();
+		}
+
+		function handShake()
+		{
+			$msgHandshake = array();
+			$msgHandshake['channel'] = '/meta/handshake';
+			$msgHandshake['version'] = "1.0";
+			$msgHandshake['minimumVersion'] = "0.9";
+			$msgHandshake['id'] = $this->nNextId++;
+
+			curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($msgHandshake)))));
+
+			$data = curl_exec($this->oCurl);
+
+			if(curl_errno($this->oCurl))
+				die("Error: " . curl_error($this->oCurl));
+
+			$oReturn = json_decode($data);
+			$oReturn = $oReturn[0];
+
+			$bSuccessful = ($oReturn->successful) ? true : false;
+
+			if($bSuccessful)
+			{
+				$this->clientId = $oReturn->clientId;
+
+				$this->connect();
+			}
+		}
+
+		public function connect()
+		{
+			$aMsg['channel'] = '/meta/connect';
+			$aMsg['id'] = $this->nNextId++;
+			$aMsg['clientId'] = $this->clientId;
+			$aMsg['connectionType'] = 'long-polling';
+
+			curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($aMsg)))));
+
+			$data = curl_exec($this->oCurl);
+		}
+
+		function disconnect()
+		{
+			$msgHandshake = array();
+			$msgHandshake['channel'] = '/meta/disconnect';
+			$msgHandshake['id'] = $this->nNextId++;
+			$msgHandshake['clientId'] = $this->clientId;
+
+			curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($msgHandshake)))));
+
+			curl_exec($this->oCurl);
+		}
+
+		public function publish($sChannel, $oData)
+		{
+			if(!$sChannel || !$oData)
+				return;
+
+			$aMsg = array();
+
+			$aMsg['channel'] = $sChannel;
+			$aMsg['id'] = $this->nNextId++;
+			$aMsg['data'] = $oData;
+			$aMsg['clientId'] = $this->clientId;
+
+			curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($aMsg)))));
+
+			$data = curl_exec($this->oCurl);
+//			var_dump($data);
+		}
+	}
diff --git a/plugins/Comet/jquery.comet.js b/plugins/Comet/jquery.comet.js
new file mode 100644
index 0000000000..2124e882cb
--- /dev/null
+++ b/plugins/Comet/jquery.comet.js
@@ -0,0 +1,363 @@
+(function($)
+{
+	var msgHandshake =
+	{
+		version: '1.0',
+		minimumVersion: '0.9',
+		channel: '/meta/handshake'
+	};
+
+	var oTransport = function()
+	{
+		this._bXD = 
+			(($.comet._sUrl.substring(0,4) == 'http') && ($.comet._sUrl.substr(7,location.href.length).replace(/\/.*/, '') != location.host))
+			?
+			true
+			:false;
+
+		this.connectionType = (this._bXD) ? 'callback-polling' : 'long-polling';
+
+		this.startup = function(oReturn)
+		{
+			if(this._comet._bConnected) return;
+			this.tunnelInit();
+		};
+
+		this.tunnelInit = function()
+		{
+			var msgConnect = 
+			{
+				channel: '/meta/connect',
+				clientId: $.comet.clientId, 
+				id: String($.comet._nNextId++),
+				connectionType: $.comet._oTransport.connectionType
+			};
+
+			this.openTunnel(msgConnect);
+		};
+
+		this.openTunnel = function(oMsg)
+		{
+			$.comet._bPolling = true;
+
+			this._send($.comet._sUrl, oMsg, function(sReturn)
+			{
+				var oReturn = (typeof sReturn != "object") ? (eval('(' + sReturn + ')')) : sReturn;
+				$.comet._bPolling = false;
+				$.comet.deliver(oReturn);
+				$.comet._oTransport.closeTunnel();
+			});
+		};
+
+		this.closeTunnel = function()
+		{
+			if(!$.comet._bInitialized) return;
+
+			if($.comet._advice)
+			{
+				if($.comet._advice.reconnect == 'none') return;
+
+				if($.comet._advice.interval > 0)
+				{
+					setTimeout($.comet._oTransport._connect, $.comet._advice.interval);
+				}
+				else
+				{
+					$.comet._oTransport._connect();
+				}
+			}
+			else
+			{
+				$.comet._oTransport._connect();
+			}
+		};
+
+		this._connect = function()
+		{
+			if(!$.comet._bInitialized) return;
+
+			if($.comet._bPolling) return;
+
+			if($.comet._advice && $.comet._advice.reconnect == 'handshake')
+			{
+				$.comet._bConnected = false;
+				$.comet.init($.comet._sUrl);
+			}
+			else if($.comet._bConnected)
+			{
+				var msgConnect = 
+				{
+					//jsonp: 'test',
+					clientId: $.comet.clientId,
+					id: String($.comet._nNextId++),
+					channel: '/meta/connect',
+					connectionType: $.comet._oTransport.connectionType
+				};
+				$.comet._oTransport.openTunnel(msgConnect);
+			}
+		};
+
+		this._send = function(sUrl, oMsg, fCallback) {
+			//default callback will check advice, deliver messages, and reconnect
+			var fCallback = (fCallback) ? fCallback : function(sReturn)
+			{
+				var oReturn = (typeof sReturn != "object") ? (eval('(' + sReturn + ')')) : sReturn;
+
+				$.comet.deliver(oReturn);
+
+				if($.comet._advice)
+				{
+					if($.comet._advice.reconnect == 'none')
+						return;
+
+					if($.comet._advice.interval > 0)
+					{
+						setTimeout($.comet._oTransport._connect, $.comet._advice.interval);
+					}
+					else
+					{
+						$.comet._oTransport._connect();
+					}
+				}
+				else
+				{
+					$.comet._oTransport._connect();
+				}
+			};
+
+			//regular AJAX for same domain calls
+			if((!this._bXD) && (this.connectionType == 'long-polling'))
+			{
+				this._pollRequest = $.ajax({
+					url: sUrl,
+					type: 'post',
+					beforeSend: function(oXhr) { oXhr.setRequestHeader('Connection', 'Keep-Alive'); },
+					data: { message: JSON.stringify(oMsg) },
+					success: fCallback
+				});
+			}
+			else // JSONP callback for cross domain
+			{
+				this._pollRequest = $.ajax({
+					url: sUrl,
+					dataType: 'jsonp',
+					jsonp: 'jsonp',
+					beforeSend: function(oXhr) { oXhr.setRequestHeader('Connection', 'Keep-Alive'); },
+					data: 
+					{ 
+						message: JSON.stringify($.extend(oMsg,{connectionType: 'callback-polling' })) 
+					},
+					success: fCallback
+				});
+			}
+		}
+        };
+
+	$.comet = new function()
+	{
+		this.CONNECTED = 'CONNECTED';
+		this.CONNECTING = 'CONNECTING';
+		this.DISCONNECTED = 'DISCONNECTED';
+		this.DISCONNECTING = 'DISCONNECTING';
+
+		this._aMessageQueue = [];
+		this._aSubscriptions = [];
+		this._aSubscriptionCallbacks = [];
+		this._bInitialized = false;
+		this._bConnected = false;
+		this._nBatch = 0;
+		this._nNextId = 0;
+		// just define the transport, do not assign it yet.
+		this._oTransport = ''; //oTransport;
+		this._sUrl = '';
+
+		this.supportedConectionTypes = [ 'long-polling', 'callback-polling' ];
+
+		this.clientId = '';
+
+		this._bTrigger = true; // this sends $.event.trigger(channel, data)
+
+		this.init = function(sUrl)
+		{
+			this._sUrl = (sUrl) ? sUrl : '/cometd';
+
+			this._oTransport = new oTransport();
+
+			this._aMessageQueue = [];
+			this._aSubscriptions = [];
+			this._bInitialized = true;
+			this.startBatch();
+
+			var oMsg = $.extend(msgHandshake, {id: String(this._nNextId++)});
+
+			this._oTransport._send(this._sUrl, oMsg, $.comet._finishInit);
+		};
+
+		this._finishInit = function(sReturn)
+		{
+			var oReturn = (typeof sReturn != "object") ? (eval('(' + sReturn + ')')[0]) : sReturn[0];
+
+			if(oReturn.advice)
+				$.comet._advice = oReturn.advice;
+
+			var bSuccess = (oReturn.successful) ? oReturn.successful : false;
+			// do version check
+
+			if(bSuccess)
+			{
+				// pick transport ?
+				// ......
+
+				$.comet._oTransport._comet = $.comet;
+				$.comet._oTransport.version = $.comet.version;
+
+				$.comet.clientId = oReturn.clientId;
+				$.comet._oTransport.startup(oReturn);
+				$.comet.endBatch();
+			}
+		};
+
+		this._sendMessage = function(oMsg)
+		{
+			if($.comet._nBatch <= 0)
+			{
+				if(oMsg.length > 0)
+					for(var i in oMsg)
+					{
+						oMsg[i].clientId = String($.comet.clientId);
+						oMsg[i].id = String($.comet._nNextId++);
+					}
+				else
+				{
+					oMsg.clientId = String($.comet.clientId);
+					oMsg.id = String($.comet._nNextId++);
+				}
+
+				$.comet._oTransport._send($.comet._sUrl, oMsg);
+			}
+			else
+			{
+				$.comet._aMessageQueue.push(oMsg);
+			}
+		};
+
+
+		this.startBatch = function() { this._nBatch++ };
+		this.endBatch = function() {
+			if(--this._nBatch <= 0)
+			{
+				this._nBatch = 0;
+				if(this._aMessageQueue.length > 0)
+				{
+					this._sendMessage(this._aMessageQueue);
+					this._aMessageQueue = [];
+				}
+			}
+		};
+
+		this.subscribe = function(sSubscription, fCallback)
+		{
+			// if this topic has not been subscribed to yet, send the message now
+			if(!this._aSubscriptions[sSubscription])
+			{
+				this._aSubscriptions.push(sSubscription)
+
+				if (fCallback) {
+					this._aSubscriptionCallbacks[sSubscription] = fCallback;
+				}
+
+				this._sendMessage({ channel: '/meta/subscribe', subscription: sSubscription });
+			}
+
+			//$.event.add(window, sSubscription, fCallback);
+		};
+
+		this.unsubscribe = function(sSubscription) {
+			$.comet._sendMessage({ channel: '/meta/unsubscribe', subscription: sSubscription });
+		};
+
+		this.publish = function(sChannel, oData)
+		{
+			$.comet._sendMessage({channel: sChannel, data: oData});
+		};
+
+		this.deliver = function(sReturn)
+		{
+			var oReturn = sReturn;//eval(sReturn);
+
+			$(oReturn).each(function()
+			{
+					$.comet._deliver(this);
+			});
+		};
+
+		this.disconnect = function()
+		{
+			$($.comet._aSubscriptions).each(function(i)
+			{
+				$.comet.unsubscribe($.comet._aSubscriptions[i]);
+			});
+
+			$.comet._sendMessage({channel:'/meta/disconnect'});
+
+			$.comet._bInitialized = false;
+		}
+
+		this._deliver = function(oMsg,oData)
+		{
+			if(oMsg.advice)
+			{
+				$.comet._advice = oMsg.advice;
+			}
+
+			switch(oMsg.channel)
+			{
+				case '/meta/connect':
+					if(oMsg.successful && !$.comet._bConnected)
+					{
+						$.comet._bConnected = $.comet._bInitialized;
+						$.comet.endBatch();
+					/*
+					   $.comet._sendMessage(msgConnect);
+					*/
+					}
+					else
+					{}
+						//$.comet._bConnected = false;
+				break;
+
+				// add in subscription handling stuff
+				case '/meta/subscribe':
+                                        if(!oMsg.successful)
+                                        {
+                                                $.comet._oTransport._cancelConnect();
+                                                return;
+                                        }
+				break;
+
+				case '/meta/unsubscribe':
+                                        if(!oMsg.successful)
+                                        {
+                                                $.comet._oTransport._cancelConnect();
+                                                return;
+                                        }
+				break;
+
+			}
+
+		if(oMsg.data)
+		{
+			if($.comet._bTrigger)
+			{
+				$.event.trigger(oMsg.channel, [oMsg]);
+			}
+
+			var cb = $.comet._aSubscriptionCallbacks[oMsg.channel];
+			if (cb) {
+				cb(oMsg);
+			}
+		}
+	};
+};
+
+})(jQuery);
diff --git a/plugins/Comet/updatetimeline.js b/plugins/Comet/updatetimeline.js
new file mode 100644
index 0000000000..f4da1f47cd
--- /dev/null
+++ b/plugins/Comet/updatetimeline.js
@@ -0,0 +1,3 @@
+// update the local timeline from a Comet server
+//
+

From 056d0a2555bb6783a2bb4632d2c6ad9f52dde5ec Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sat, 25 Apr 2009 14:20:57 -0400
Subject: [PATCH 29/49] remove unused duplicate file

---
 plugins/Comet/bayeux.class.inc.phps | 123 ----------------------------
 1 file changed, 123 deletions(-)
 delete mode 100644 plugins/Comet/bayeux.class.inc.phps

diff --git a/plugins/Comet/bayeux.class.inc.phps b/plugins/Comet/bayeux.class.inc.phps
deleted file mode 100644
index ea004a4532..0000000000
--- a/plugins/Comet/bayeux.class.inc.phps
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/*
- *
- * Phomet: a php comet client
- *
- * Copyright (C) 2008 Morgan 'ARR!' Allen <morganrallen@gmail.com> http://morglog.alleycatracing.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-class Bayeux
-	{
-		private $oCurl = '';
-		private $nNextId = 0;
-
-		public $sUrl = '';
-
-		function __construct($sUrl)
-		{
-			$this->sUrl = $sUrl;
-
-			$this->oCurl = curl_init();
-
-			$aHeaders = array();
-			$aHeaders[] = 'Connection: Keep-Alive';
-
-			curl_setopt($this->oCurl, CURLOPT_URL, $sUrl);
-			curl_setopt($this->oCurl, CURLOPT_HTTPHEADER, $aHeaders);
-			curl_setopt($this->oCurl, CURLOPT_HEADER, 0);
-			curl_setopt($this->oCurl, CURLOPT_POST, 1);
-			curl_setopt($this->oCurl, CURLOPT_RETURNTRANSFER,1);
-
-			$this->handShake();
-		}
-
-		function __destruct()
-		{
-			$this->disconnect();
-		}
-
-		function handShake()
-		{
-			$msgHandshake = array();
-			$msgHandshake['channel'] = '/meta/handshake';
-			$msgHandshake['version'] = "1.0";
-			$msgHandshake['minimumVersion'] = "0.9";
-			$msgHandshake['id'] = $this->nNextId++;
-
-			curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($msgHandshake)))));
-
-			$data = curl_exec($this->oCurl);
-
-			if(curl_errno($this->oCurl))
-				die("Error: " . curl_error($this->oCurl));
-
-			$oReturn = json_decode($data);
-			$oReturn = $oReturn[0];
-
-			$bSuccessful = ($oReturn->successful) ? true : false;
-
-			if($bSuccessful)
-			{
-				$this->clientId = $oReturn->clientId;
-
-				$this->connect();
-			}
-		}
-
-		public function connect()
-		{
-			$aMsg['channel'] = '/meta/connect';
-			$aMsg['id'] = $this->nNextId++;
-			$aMsg['clientId'] = $this->clientId;
-			$aMsg['connectionType'] = 'long-polling';
-
-			curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($aMsg)))));
-
-			$data = curl_exec($this->oCurl);
-		}
-
-		function disconnect()
-		{
-			$msgHandshake = array();
-			$msgHandshake['channel'] = '/meta/disconnect';
-			$msgHandshake['id'] = $this->nNextId++;
-			$msgHandshake['clientId'] = $this->clientId;
-
-			curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($msgHandshake)))));
-
-			curl_exec($this->oCurl);
-		}
-
-		public function publish($sChannel, $oData)
-		{
-			if(!$sChannel || !$oData)
-				return;
-
-			$aMsg = array();
-
-			$aMsg['channel'] = $sChannel;
-			$aMsg['id'] = $this->nNextId++;
-			$aMsg['data'] = $oData;
-			$aMsg['clientId'] = $this->clientId;
-
-			curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($aMsg)))));
-
-			$data = curl_exec($this->oCurl);
-//			var_dump($data);
-		}
-	}

From 262dbeac787ad3aecb28c470484eb3fc8d036d93 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Apr 2009 12:06:50 -0400
Subject: [PATCH 30/49] Some updates for testing Comet

---
 plugins/Comet/bayeux.class.inc.php |    2 -
 plugins/Comet/jquery.comet.js      | 1814 ++++++++++++++++++++++------
 plugins/Comet/updatetimeline.js    |   27 +
 3 files changed, 1478 insertions(+), 365 deletions(-)

diff --git a/plugins/Comet/bayeux.class.inc.php b/plugins/Comet/bayeux.class.inc.php
index 602a7b6446..785d3e3935 100644
--- a/plugins/Comet/bayeux.class.inc.php
+++ b/plugins/Comet/bayeux.class.inc.php
@@ -69,8 +69,6 @@ class Bayeux
 
         $oReturn = json_decode($data);
 
-        common_debug(print_r($oReturn, true));
-
         if (is_array($oReturn)) {
             $oReturn = $oReturn[0];
         }
diff --git a/plugins/Comet/jquery.comet.js b/plugins/Comet/jquery.comet.js
index 2124e882cb..6de437fa8e 100644
--- a/plugins/Comet/jquery.comet.js
+++ b/plugins/Comet/jquery.comet.js
@@ -1,363 +1,1451 @@
-(function($)
-{
-	var msgHandshake =
-	{
-		version: '1.0',
-		minimumVersion: '0.9',
-		channel: '/meta/handshake'
-	};
-
-	var oTransport = function()
-	{
-		this._bXD = 
-			(($.comet._sUrl.substring(0,4) == 'http') && ($.comet._sUrl.substr(7,location.href.length).replace(/\/.*/, '') != location.host))
-			?
-			true
-			:false;
-
-		this.connectionType = (this._bXD) ? 'callback-polling' : 'long-polling';
-
-		this.startup = function(oReturn)
-		{
-			if(this._comet._bConnected) return;
-			this.tunnelInit();
-		};
-
-		this.tunnelInit = function()
-		{
-			var msgConnect = 
-			{
-				channel: '/meta/connect',
-				clientId: $.comet.clientId, 
-				id: String($.comet._nNextId++),
-				connectionType: $.comet._oTransport.connectionType
-			};
-
-			this.openTunnel(msgConnect);
-		};
-
-		this.openTunnel = function(oMsg)
-		{
-			$.comet._bPolling = true;
-
-			this._send($.comet._sUrl, oMsg, function(sReturn)
-			{
-				var oReturn = (typeof sReturn != "object") ? (eval('(' + sReturn + ')')) : sReturn;
-				$.comet._bPolling = false;
-				$.comet.deliver(oReturn);
-				$.comet._oTransport.closeTunnel();
-			});
-		};
-
-		this.closeTunnel = function()
-		{
-			if(!$.comet._bInitialized) return;
-
-			if($.comet._advice)
-			{
-				if($.comet._advice.reconnect == 'none') return;
-
-				if($.comet._advice.interval > 0)
-				{
-					setTimeout($.comet._oTransport._connect, $.comet._advice.interval);
-				}
-				else
-				{
-					$.comet._oTransport._connect();
-				}
-			}
-			else
-			{
-				$.comet._oTransport._connect();
-			}
-		};
-
-		this._connect = function()
-		{
-			if(!$.comet._bInitialized) return;
-
-			if($.comet._bPolling) return;
-
-			if($.comet._advice && $.comet._advice.reconnect == 'handshake')
-			{
-				$.comet._bConnected = false;
-				$.comet.init($.comet._sUrl);
-			}
-			else if($.comet._bConnected)
-			{
-				var msgConnect = 
-				{
-					//jsonp: 'test',
-					clientId: $.comet.clientId,
-					id: String($.comet._nNextId++),
-					channel: '/meta/connect',
-					connectionType: $.comet._oTransport.connectionType
-				};
-				$.comet._oTransport.openTunnel(msgConnect);
-			}
-		};
-
-		this._send = function(sUrl, oMsg, fCallback) {
-			//default callback will check advice, deliver messages, and reconnect
-			var fCallback = (fCallback) ? fCallback : function(sReturn)
-			{
-				var oReturn = (typeof sReturn != "object") ? (eval('(' + sReturn + ')')) : sReturn;
-
-				$.comet.deliver(oReturn);
-
-				if($.comet._advice)
-				{
-					if($.comet._advice.reconnect == 'none')
-						return;
-
-					if($.comet._advice.interval > 0)
-					{
-						setTimeout($.comet._oTransport._connect, $.comet._advice.interval);
-					}
-					else
-					{
-						$.comet._oTransport._connect();
-					}
-				}
-				else
-				{
-					$.comet._oTransport._connect();
-				}
-			};
-
-			//regular AJAX for same domain calls
-			if((!this._bXD) && (this.connectionType == 'long-polling'))
-			{
-				this._pollRequest = $.ajax({
-					url: sUrl,
-					type: 'post',
-					beforeSend: function(oXhr) { oXhr.setRequestHeader('Connection', 'Keep-Alive'); },
-					data: { message: JSON.stringify(oMsg) },
-					success: fCallback
-				});
-			}
-			else // JSONP callback for cross domain
-			{
-				this._pollRequest = $.ajax({
-					url: sUrl,
-					dataType: 'jsonp',
-					jsonp: 'jsonp',
-					beforeSend: function(oXhr) { oXhr.setRequestHeader('Connection', 'Keep-Alive'); },
-					data: 
-					{ 
-						message: JSON.stringify($.extend(oMsg,{connectionType: 'callback-polling' })) 
-					},
-					success: fCallback
-				});
-			}
-		}
-        };
-
-	$.comet = new function()
-	{
-		this.CONNECTED = 'CONNECTED';
-		this.CONNECTING = 'CONNECTING';
-		this.DISCONNECTED = 'DISCONNECTED';
-		this.DISCONNECTING = 'DISCONNECTING';
-
-		this._aMessageQueue = [];
-		this._aSubscriptions = [];
-		this._aSubscriptionCallbacks = [];
-		this._bInitialized = false;
-		this._bConnected = false;
-		this._nBatch = 0;
-		this._nNextId = 0;
-		// just define the transport, do not assign it yet.
-		this._oTransport = ''; //oTransport;
-		this._sUrl = '';
-
-		this.supportedConectionTypes = [ 'long-polling', 'callback-polling' ];
-
-		this.clientId = '';
-
-		this._bTrigger = true; // this sends $.event.trigger(channel, data)
-
-		this.init = function(sUrl)
-		{
-			this._sUrl = (sUrl) ? sUrl : '/cometd';
-
-			this._oTransport = new oTransport();
-
-			this._aMessageQueue = [];
-			this._aSubscriptions = [];
-			this._bInitialized = true;
-			this.startBatch();
-
-			var oMsg = $.extend(msgHandshake, {id: String(this._nNextId++)});
-
-			this._oTransport._send(this._sUrl, oMsg, $.comet._finishInit);
-		};
-
-		this._finishInit = function(sReturn)
-		{
-			var oReturn = (typeof sReturn != "object") ? (eval('(' + sReturn + ')')[0]) : sReturn[0];
-
-			if(oReturn.advice)
-				$.comet._advice = oReturn.advice;
-
-			var bSuccess = (oReturn.successful) ? oReturn.successful : false;
-			// do version check
-
-			if(bSuccess)
-			{
-				// pick transport ?
-				// ......
-
-				$.comet._oTransport._comet = $.comet;
-				$.comet._oTransport.version = $.comet.version;
-
-				$.comet.clientId = oReturn.clientId;
-				$.comet._oTransport.startup(oReturn);
-				$.comet.endBatch();
-			}
-		};
-
-		this._sendMessage = function(oMsg)
-		{
-			if($.comet._nBatch <= 0)
-			{
-				if(oMsg.length > 0)
-					for(var i in oMsg)
-					{
-						oMsg[i].clientId = String($.comet.clientId);
-						oMsg[i].id = String($.comet._nNextId++);
-					}
-				else
-				{
-					oMsg.clientId = String($.comet.clientId);
-					oMsg.id = String($.comet._nNextId++);
-				}
-
-				$.comet._oTransport._send($.comet._sUrl, oMsg);
-			}
-			else
-			{
-				$.comet._aMessageQueue.push(oMsg);
-			}
-		};
-
-
-		this.startBatch = function() { this._nBatch++ };
-		this.endBatch = function() {
-			if(--this._nBatch <= 0)
-			{
-				this._nBatch = 0;
-				if(this._aMessageQueue.length > 0)
-				{
-					this._sendMessage(this._aMessageQueue);
-					this._aMessageQueue = [];
-				}
-			}
-		};
-
-		this.subscribe = function(sSubscription, fCallback)
-		{
-			// if this topic has not been subscribed to yet, send the message now
-			if(!this._aSubscriptions[sSubscription])
-			{
-				this._aSubscriptions.push(sSubscription)
-
-				if (fCallback) {
-					this._aSubscriptionCallbacks[sSubscription] = fCallback;
-				}
-
-				this._sendMessage({ channel: '/meta/subscribe', subscription: sSubscription });
-			}
-
-			//$.event.add(window, sSubscription, fCallback);
-		};
-
-		this.unsubscribe = function(sSubscription) {
-			$.comet._sendMessage({ channel: '/meta/unsubscribe', subscription: sSubscription });
-		};
-
-		this.publish = function(sChannel, oData)
-		{
-			$.comet._sendMessage({channel: sChannel, data: oData});
-		};
-
-		this.deliver = function(sReturn)
-		{
-			var oReturn = sReturn;//eval(sReturn);
-
-			$(oReturn).each(function()
-			{
-					$.comet._deliver(this);
-			});
-		};
-
-		this.disconnect = function()
-		{
-			$($.comet._aSubscriptions).each(function(i)
-			{
-				$.comet.unsubscribe($.comet._aSubscriptions[i]);
-			});
-
-			$.comet._sendMessage({channel:'/meta/disconnect'});
-
-			$.comet._bInitialized = false;
-		}
-
-		this._deliver = function(oMsg,oData)
-		{
-			if(oMsg.advice)
-			{
-				$.comet._advice = oMsg.advice;
-			}
-
-			switch(oMsg.channel)
-			{
-				case '/meta/connect':
-					if(oMsg.successful && !$.comet._bConnected)
-					{
-						$.comet._bConnected = $.comet._bInitialized;
-						$.comet.endBatch();
-					/*
-					   $.comet._sendMessage(msgConnect);
-					*/
-					}
-					else
-					{}
-						//$.comet._bConnected = false;
-				break;
-
-				// add in subscription handling stuff
-				case '/meta/subscribe':
-                                        if(!oMsg.successful)
-                                        {
-                                                $.comet._oTransport._cancelConnect();
-                                                return;
-                                        }
-				break;
-
-				case '/meta/unsubscribe':
-                                        if(!oMsg.successful)
-                                        {
-                                                $.comet._oTransport._cancelConnect();
-                                                return;
-                                        }
-				break;
-
-			}
-
-		if(oMsg.data)
-		{
-			if($.comet._bTrigger)
-			{
-				$.event.trigger(oMsg.channel, [oMsg]);
-			}
-
-			var cb = $.comet._aSubscriptionCallbacks[oMsg.channel];
-			if (cb) {
-				cb(oMsg);
-			}
-		}
-	};
-};
-
-})(jQuery);
+/**
+ * Copyright 2008 Mort Bay Consulting Pty. Ltd.
+ * Dual licensed under the Apache License 2.0 and the MIT license.
+ * ----------------------------------------------------------------------------
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http: *www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ----------------------------------------------------------------------------
+ * Licensed under the MIT license;
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * ----------------------------------------------------------------------------
+ * $Revision$ $Date$
+ */
+(function($)
+{
+    /**
+     * The constructor for a Comet object.
+     * There is a default Comet instance already created at the variable <code>$.cometd</code>,
+     * and hence that can be used to start a comet conversation with a server.
+     * In the rare case a page needs more than one comet conversation, a new instance can be
+     * created via:
+     * <pre>
+     * var url2 = ...;
+     * var cometd2 = new $.Cometd();
+     * cometd2.init(url2);
+     * </pre>
+     */
+    $.Cometd = function(name)
+    {
+        var _name = name || 'default';
+        var _logPriorities = { debug: 1, info: 2, warn: 3, error: 4 };
+        var _logLevel = 'info';
+        var _url;
+        var _xd = false;
+        var _transport;
+        var _status = 'disconnected';
+        var _messageId = 0;
+        var _clientId = null;
+        var _batch = 0;
+        var _messageQueue = [];
+        var _listeners = {};
+        var _backoff = 0;
+        var _backoffIncrement = 1000;
+        var _maxBackoff = 60000;
+        var _scheduledSend = null;
+        var _extensions = [];
+        var _advice = {};
+        var _handshakeProps;
+
+        /**
+         * Returns the name assigned to this Comet object, or the string 'default'
+         * if no name has been explicitely passed as parameter to the constructor.
+         */
+        this.getName = function()
+        {
+            return _name;
+        };
+
+        /**
+         * Configures the initial comet communication with the comet server.
+         * @param cometURL the URL of the comet server
+         */
+        this.configure = function(cometURL)
+        {
+            _configure(cometURL);
+        };
+
+        function _configure(cometURL)
+        {
+            _url = cometURL;
+            _debug('Initializing comet with url: {}', _url);
+
+            // Check immediately if we're cross domain
+            // If cross domain, the handshake must not send the long polling transport type
+            var urlParts = /(^https?:)?(\/\/(([^:\/\?#]+)(:(\d+))?))?([^\?#]*)/.exec(cometURL);
+            if (urlParts[3]) _xd = urlParts[3] != location.host;
+
+            // Temporary setup a transport to send the initial handshake
+            // The transport may be changed as a result of handshake
+            if (_xd)
+                _transport = newCallbackPollingTransport();
+            else
+                _transport = newLongPollingTransport();
+            _debug('Initial transport is {}', _transport.getType());
+        };
+
+        /**
+         * Configures and establishes the comet communication with the comet server
+         * via a handshake and a subsequent connect.
+         * @param cometURL the URL of the comet server
+         * @param handshakeProps an object to be merged with the handshake message
+         * @see #configure(cometURL)
+         * @see #handshake(handshakeProps)
+         */
+        this.init = function(cometURL, handshakeProps)
+        {
+            _configure(cometURL);
+            _handshake(handshakeProps);
+        };
+
+        /**
+         * Establishes the comet communication with the comet server
+         * via a handshake and a subsequent connect.
+         * @param handshakeProps an object to be merged with the handshake message
+         */
+        this.handshake = function(handshakeProps)
+        {
+            _handshake(handshakeProps);
+        };
+
+        /**
+         * Disconnects from the comet server.
+         * @param disconnectProps an object to be merged with the disconnect message
+         */
+        this.disconnect = function(disconnectProps)
+        {
+            var bayeuxMessage = {
+                channel: '/meta/disconnect'
+            };
+            var message = $.extend({}, disconnectProps, bayeuxMessage);
+            // Deliver immediately
+            // The handshake and connect mechanism make use of startBatch(), and in case
+            // of a failed handshake the disconnect would not be delivered if using _send().
+            _setStatus('disconnecting');
+            _deliver([message], false);
+        };
+
+        /**
+         * Marks the start of a batch of application messages to be sent to the server
+         * in a single request, obtaining a single response containing (possibly) many
+         * application reply messages.
+         * Messages are held in a queue and not sent until {@link #endBatch()} is called.
+         * If startBatch() is called multiple times, then an equal number of endBatch()
+         * calls must be made to close and send the batch of messages.
+         * @see #endBatch()
+         */
+        this.startBatch = function()
+        {
+            _startBatch();
+        };
+
+        /**
+         * Marks the end of a batch of application messages to be sent to the server
+         * in a single request.
+         * @see #startBatch()
+         */
+        this.endBatch = function()
+        {
+            _endBatch(true);
+        };
+
+        /**
+         * Subscribes to the given channel, performing the given callback in the given scope
+         * when a message for the channel arrives.
+         * @param channel the channel to subscribe to
+         * @param scope the scope of the callback
+         * @param callback the callback to call when a message is delivered to the channel
+         * @param subscribeProps an object to be merged with the subscribe message
+         * @return the subscription handle to be passed to {@link #unsubscribe(object)}
+         */
+        this.subscribe = function(channel, scope, callback, subscribeProps)
+        {
+            var subscription = this.addListener(channel, scope, callback);
+
+            // Send the subscription message after the subscription registration to avoid
+            // races where the server would deliver a message to the subscribers, but here
+            // on the client the subscription has not been added yet to the data structures
+            var bayeuxMessage = {
+                channel: '/meta/subscribe',
+                subscription: channel
+            };
+            var message = $.extend({}, subscribeProps, bayeuxMessage);
+            _send(message);
+
+            return subscription;
+        };
+
+        /**
+         * Unsubscribes the subscription obtained with a call to {@link #subscribe(string, object, function)}.
+         * @param subscription the subscription to unsubscribe.
+         */
+        this.unsubscribe = function(subscription, unsubscribeProps)
+        {
+            // Remove the local listener before sending the message
+            // This ensures that if the server fails, this client does not get notifications
+            this.removeListener(subscription);
+            var bayeuxMessage = {
+                channel: '/meta/unsubscribe',
+                subscription: subscription[0]
+            };
+            var message = $.extend({}, unsubscribeProps, bayeuxMessage);
+            _send(message);
+        };
+
+        /**
+         * Publishes a message on the given channel, containing the given content.
+         * @param channel the channel to publish the message to
+         * @param content the content of the message
+         * @param publishProps an object to be merged with the publish message
+         */
+        this.publish = function(channel, content, publishProps)
+        {
+            var bayeuxMessage = {
+                channel: channel,
+                data: content
+            };
+            var message = $.extend({}, publishProps, bayeuxMessage);
+            _send(message);
+        };
+
+        /**
+         * Adds a listener for bayeux messages, performing the given callback in the given scope
+         * when a message for the given channel arrives.
+         * @param channel the channel the listener is interested to
+         * @param scope the scope of the callback
+         * @param callback the callback to call when a message is delivered to the channel
+         * @returns the subscription handle to be passed to {@link #removeListener(object)}
+         * @see #removeListener(object)
+         */
+        this.addListener = function(channel, scope, callback)
+        {
+            // The data structure is a map<channel, subscription[]>, where each subscription
+            // holds the callback to be called and its scope.
+
+            // Normalize arguments
+            if (!callback)
+            {
+                callback = scope;
+                scope = undefined;
+            }
+
+            var subscription = {
+                scope: scope,
+                callback: callback
+            };
+
+            var subscriptions = _listeners[channel];
+            if (!subscriptions)
+            {
+                subscriptions = [];
+                _listeners[channel] = subscriptions;
+            }
+            // Pushing onto an array appends at the end and returns the id associated with the element increased by 1.
+            // Note that if:
+            // a.push('a'); var hb=a.push('b'); delete a[hb-1]; var hc=a.push('c');
+            // then:
+            // hc==3, a.join()=='a',,'c', a.length==3
+            var subscriptionIndex = subscriptions.push(subscription) - 1;
+            _debug('Added listener: channel \'{}\', callback \'{}\', index {}', channel, callback.name, subscriptionIndex);
+
+            // The subscription to allow removal of the listener is made of the channel and the index
+            return [channel, subscriptionIndex];
+        };
+
+        /**
+         * Removes the subscription obtained with a call to {@link #addListener(string, object, function)}.
+         * @param subscription the subscription to unsubscribe.
+         */
+        this.removeListener = function(subscription)
+        {
+            var subscriptions = _listeners[subscription[0]];
+            if (subscriptions)
+            {
+                delete subscriptions[subscription[1]];
+                _debug('Removed listener: channel \'{}\', index {}', subscription[0], subscription[1]);
+            }
+        };
+
+        /**
+         * Removes all listeners registered with {@link #addListener(channel, scope, callback)} or
+         * {@link #subscribe(channel, scope, callback)}.
+         */
+        this.clearListeners = function()
+        {
+            _listeners = {};
+        };
+
+        /**
+         * Returns a string representing the status of the bayeux communication with the comet server.
+         */
+        this.getStatus = function()
+        {
+            return _status;
+        };
+
+        /**
+         * Sets the backoff period used to increase the backoff time when retrying an unsuccessful or failed message.
+         * Default value is 1 second, which means if there is a persistent failure the retries will happen
+         * after 1 second, then after 2 seconds, then after 3 seconds, etc. So for example with 15 seconds of
+         * elapsed time, there will be 5 retries (at 1, 3, 6, 10 and 15 seconds elapsed).
+         * @param period the backoff period to set
+         * @see #getBackoffIncrement()
+         */
+        this.setBackoffIncrement = function(period)
+        {
+            _backoffIncrement = period;
+        };
+
+        /**
+         * Returns the backoff period used to increase the backoff time when retrying an unsuccessful or failed message.
+         * @see #setBackoffIncrement(period)
+         */
+        this.getBackoffIncrement = function()
+        {
+            return _backoffIncrement;
+        };
+
+        /**
+         * Returns the backoff period to wait before retrying an unsuccessful or failed message.
+         */
+        this.getBackoffPeriod = function()
+        {
+            return _backoff;
+        };
+
+        /**
+         * Sets the log level for console logging.
+         * Valid values are the strings 'error', 'warn', 'info' and 'debug', from
+         * less verbose to more verbose.
+         * @param level the log level string
+         */
+        this.setLogLevel = function(level)
+        {
+            _logLevel = level;
+        };
+
+        /**
+         * Registers an extension whose callbacks are called for every incoming message
+         * (that comes from the server to this client implementation) and for every
+         * outgoing message (that originates from this client implementation for the
+         * server).
+         * The format of the extension object is the following:
+         * <pre>
+         * {
+         *     incoming: function(message) { ... },
+         *     outgoing: function(message) { ... }
+         * }
+         * Both properties are optional, but if they are present they will be called
+         * respectively for each incoming message and for each outgoing message.
+         * </pre>
+         * @param name the name of the extension
+         * @param extension the extension to register
+         * @return true if the extension was registered, false otherwise
+         * @see #unregisterExtension(name)
+         */
+        this.registerExtension = function(name, extension)
+        {
+            var existing = false;
+            for (var i = 0; i < _extensions.length; ++i)
+            {
+                var existingExtension = _extensions[i];
+                if (existingExtension.name == name)
+                {
+                    existing = true;
+                    return false;
+                }
+            }
+            if (!existing)
+            {
+                _extensions.push({
+                    name: name,
+                    extension: extension
+                });
+                _debug('Registered extension \'{}\'', name);
+                return true;
+            }
+            else
+            {
+                _info('Could not register extension with name \'{}\': another extension with the same name already exists');
+                return false;
+            }
+        };
+
+        /**
+         * Unregister an extension previously registered with
+         * {@link #registerExtension(name, extension)}.
+         * @param name the name of the extension to unregister.
+         * @return true if the extension was unregistered, false otherwise
+         */
+        this.unregisterExtension = function(name)
+        {
+            var unregistered = false;
+            $.each(_extensions, function(index, extension)
+            {
+                if (extension.name == name)
+                {
+                    _extensions.splice(index, 1);
+                    unregistered = true;
+                    _debug('Unregistered extension \'{}\'', name);
+                    return false;
+                }
+            });
+            return unregistered;
+        };
+
+        /**
+         * Starts a the batch of messages to be sent in a single request.
+         * @see _endBatch(deliverMessages)
+         */
+        function _startBatch()
+        {
+            ++_batch;
+        };
+
+        /**
+         * Ends the batch of messages to be sent in a single request,
+         * optionally delivering messages present in the message queue depending
+         * on the given argument.
+         * @param deliverMessages whether to deliver the messages in the queue or not
+         * @see _startBatch()
+         */
+        function _endBatch(deliverMessages)
+        {
+            --_batch;
+            if (_batch < 0) _batch = 0;
+            if (deliverMessages && _batch == 0 && !_isDisconnected())
+            {
+                var messages = _messageQueue;
+                _messageQueue = [];
+                if (messages.length > 0) _deliver(messages, false);
+            }
+        };
+
+        function _nextMessageId()
+        {
+            return ++_messageId;
+        };
+
+        /**
+         * Converts the given response into an array of bayeux messages
+         * @param response the response to convert
+         * @return an array of bayeux messages obtained by converting the response
+         */
+        function _convertToMessages(response)
+        {
+            if (response === undefined) return [];
+            if (response instanceof Array) return response;
+            if (response instanceof String || typeof response == 'string') return eval('(' + response + ')');
+            if (response instanceof Object) return [response];
+            throw 'Conversion Error ' + response + ', typeof ' + (typeof response);
+        };
+
+        function _setStatus(newStatus)
+        {
+            _debug('{} -> {}', _status, newStatus);
+            _status = newStatus;
+        };
+
+        function _isDisconnected()
+        {
+            return _status == 'disconnecting' || _status == 'disconnected';
+        };
+
+        /**
+         * Sends the initial handshake message
+         */
+        function _handshake(handshakeProps)
+        {
+            _debug('Starting handshake');
+            _clientId = null;
+
+            // Start a batch.
+            // This is needed because handshake and connect are async.
+            // It may happen that the application calls init() then subscribe()
+            // and the subscribe message is sent before the connect message, if
+            // the subscribe message is not held until the connect message is sent.
+            // So here we start a batch to hold temporarly any message until
+            // the connection is fully established.
+            _batch = 0;
+            _startBatch();
+
+            // Save the original properties provided by the user
+            // Deep copy to avoid the user to be able to change them later
+            _handshakeProps = $.extend(true, {}, handshakeProps);
+
+            var bayeuxMessage = {
+                version: '1.0',
+                minimumVersion: '0.9',
+                channel: '/meta/handshake',
+                supportedConnectionTypes: _xd ? ['callback-polling'] : ['long-polling', 'callback-polling']
+            };
+            // Do not allow the user to mess with the required properties,
+            // so merge first the user properties and *then* the bayeux message
+            var message = $.extend({}, handshakeProps, bayeuxMessage);
+
+            // We started a batch to hold the application messages,
+            // so here we must bypass it and deliver immediately.
+            _setStatus('handshaking');
+            _deliver([message], false);
+        };
+
+        function _findTransport(handshakeResponse)
+        {
+            var transportTypes = handshakeResponse.supportedConnectionTypes;
+            if (_xd)
+            {
+                // If we are cross domain, check if the server supports it, that's the only option
+                if ($.inArray('callback-polling', transportTypes) >= 0) return _transport;
+            }
+            else
+            {
+                // Check if we can keep long-polling
+                if ($.inArray('long-polling', transportTypes) >= 0) return _transport;
+
+                // The server does not support long-polling
+                if ($.inArray('callback-polling', transportTypes) >= 0) return newCallbackPollingTransport();
+            }
+            return null;
+        };
+
+        function _delayedHandshake()
+        {
+            _setStatus('handshaking');
+            _delayedSend(function()
+            {
+                _handshake(_handshakeProps);
+            });
+        };
+
+        function _delayedConnect()
+        {
+            _setStatus('connecting');
+            _delayedSend(function()
+            {
+                _connect();
+            });
+        };
+
+        function _delayedSend(operation)
+        {
+            _cancelDelayedSend();
+            var delay = _backoff;
+            _debug("Delayed send: backoff {}, interval {}", _backoff, _advice.interval);
+            if (_advice.interval && _advice.interval > 0)
+                delay += _advice.interval;
+            _scheduledSend = _setTimeout(operation, delay);
+        };
+
+        function _cancelDelayedSend()
+        {
+            if (_scheduledSend !== null) clearTimeout(_scheduledSend);
+            _scheduledSend = null;
+        };
+
+        function _setTimeout(funktion, delay)
+        {
+            return setTimeout(function()
+            {
+                try
+                {
+                    funktion();
+                }
+                catch (x)
+                {
+                    _debug('Exception during scheduled execution of function \'{}\': {}', funktion.name, x);
+                }
+            }, delay);
+        };
+
+        /**
+         * Sends the connect message
+         */
+        function _connect()
+        {
+            _debug('Starting connect');
+            var message = {
+                channel: '/meta/connect',
+                connectionType: _transport.getType()
+            };
+            _setStatus('connecting');
+            _deliver([message], true);
+            _setStatus('connected');
+        };
+
+        function _send(message)
+        {
+            if (_batch > 0)
+                _messageQueue.push(message);
+            else
+                _deliver([message], false);
+        };
+
+        /**
+         * Delivers the messages to the comet server
+         * @param messages the array of messages to send
+         */
+        function _deliver(messages, comet)
+        {
+            // We must be sure that the messages have a clientId.
+            // This is not guaranteed since the handshake may take time to return
+            // (and hence the clientId is not known yet) and the application
+            // may create other messages.
+            $.each(messages, function(index, message)
+            {
+                message['id'] = _nextMessageId();
+                if (_clientId) message['clientId'] = _clientId;
+                messages[index] = _applyOutgoingExtensions(message);
+            });
+
+            var self = this;
+            var envelope = {
+                url: _url,
+                messages: messages,
+                onSuccess: function(request, response)
+                {
+                    try
+                    {
+                        _handleSuccess.call(self, request, response, comet);
+                    }
+                    catch (x)
+                    {
+                        _debug('Exception during execution of success callback: {}', x);
+                    }
+                },
+                onFailure: function(request, reason, exception)
+                {
+                    try
+                    {
+                        _handleFailure.call(self, request, messages, reason, exception, comet);
+                    }
+                    catch (x)
+                    {
+                        _debug('Exception during execution of failure callback: {}', x);
+                    }
+                }
+            };
+            _debug('Sending request to {}, message(s): {}', envelope.url, JSON.stringify(envelope.messages));
+            _transport.send(envelope, comet);
+        };
+
+        function _applyIncomingExtensions(message)
+        {
+            for (var i = 0; i < _extensions.length; ++i)
+            {
+                var extension = _extensions[i];
+                var callback = extension.extension.incoming;
+                if (callback && typeof callback === 'function')
+                {
+                    _debug('Calling incoming extension \'{}\', callback \'{}\'', extension.name, callback.name);
+                    message = _applyExtension(extension.name, callback, message) || message;
+                }
+            }
+            return message;
+        };
+
+        function _applyOutgoingExtensions(message)
+        {
+            for (var i = 0; i < _extensions.length; ++i)
+            {
+                var extension = _extensions[i];
+                var callback = extension.extension.outgoing;
+                if (callback && typeof callback === 'function')
+                {
+                    _debug('Calling outgoing extension \'{}\', callback \'{}\'', extension.name, callback.name);
+                    message = _applyExtension(extension.name, callback, message) || message;
+                }
+            }
+            return message;
+        };
+
+        function _applyExtension(name, callback, message)
+        {
+            try
+            {
+                return callback(message);
+            }
+            catch (x)
+            {
+                _debug('Exception during execution of extension \'{}\': {}', name, x);
+                return message;
+            }
+        };
+
+        function _handleSuccess(request, response, comet)
+        {
+            var messages = _convertToMessages(response);
+            _debug('Received response {}', JSON.stringify(messages));
+
+            // Signal the transport it can deliver other queued requests
+            _transport.complete(request, true, comet);
+
+            for (var i = 0; i < messages.length; ++i)
+            {
+                var message = messages[i];
+                message = _applyIncomingExtensions(message);
+
+                if (message.advice) _advice = message.advice;
+
+                var channel = message.channel;
+                switch (channel)
+                {
+                    case '/meta/handshake':
+                        _handshakeSuccess(message);
+                        break;
+                    case '/meta/connect':
+                        _connectSuccess(message);
+                        break;
+                    case '/meta/disconnect':
+                        _disconnectSuccess(message);
+                        break;
+                    case '/meta/subscribe':
+                        _subscribeSuccess(message);
+                        break;
+                    case '/meta/unsubscribe':
+                        _unsubscribeSuccess(message);
+                        break;
+                    default:
+                        _messageSuccess(message);
+                        break;
+                }
+            }
+        };
+
+        function _handleFailure(request, messages, reason, exception, comet)
+        {
+            var xhr = request.xhr;
+            _debug('Request failed, status: {}, reason: {}, exception: {}', xhr && xhr.status, reason, exception);
+
+            // Signal the transport it can deliver other queued requests
+            _transport.complete(request, false, comet);
+
+            for (var i = 0; i < messages.length; ++i)
+            {
+                var message = messages[i];
+                var channel = message.channel;
+                switch (channel)
+                {
+                    case '/meta/handshake':
+                        _handshakeFailure(xhr, message);
+                        break;
+                    case '/meta/connect':
+                        _connectFailure(xhr, message);
+                        break;
+                    case '/meta/disconnect':
+                        _disconnectFailure(xhr, message);
+                        break;
+                    case '/meta/subscribe':
+                        _subscribeFailure(xhr, message);
+                        break;
+                    case '/meta/unsubscribe':
+                        _unsubscribeFailure(xhr, message);
+                        break;
+                    default:
+                        _messageFailure(xhr, message);
+                        break;
+                }
+            }
+        };
+
+        function _handshakeSuccess(message)
+        {
+            if (message.successful)
+            {
+                _debug('Handshake successful');
+                // Save clientId, figure out transport, then follow the advice to connect
+                _clientId = message.clientId;
+
+                var newTransport = _findTransport(message);
+                if (newTransport === null)
+                {
+                    throw 'Could not agree on transport with server';
+                }
+                else
+                {
+                    if (_transport.getType() != newTransport.getType())
+                    {
+                        _debug('Changing transport from {} to {}', _transport.getType(), newTransport.getType());
+                        _transport = newTransport;
+                    }
+                }
+
+                // Notify the listeners
+                // Here the new transport is in place, as well as the clientId, so
+                // the listener can perform a publish() if it wants, and the listeners
+                // are notified before the connect below.
+                _notifyListeners('/meta/handshake', message);
+
+                var action = _advice.reconnect ? _advice.reconnect : 'retry';
+                switch (action)
+                {
+                    case 'retry':
+                        _delayedConnect();
+                        break;
+                    default:
+                        break;
+                }
+            }
+            else
+            {
+                _debug('Handshake unsuccessful');
+
+                var retry = !_isDisconnected() && _advice.reconnect != 'none';
+                if (!retry) _setStatus('disconnected');
+
+                _notifyListeners('/meta/handshake', message);
+                _notifyListeners('/meta/unsuccessful', message);
+
+                // Only try again if we haven't been disconnected and
+                // the advice permits us to retry the handshake
+                if (retry)
+                {
+                    _increaseBackoff();
+                    _debug('Handshake failure, backing off and retrying in {} ms', _backoff);
+                    _delayedHandshake();
+                }
+            }
+        };
+
+        function _handshakeFailure(xhr, message)
+        {
+            _debug('Handshake failure');
+
+            // Notify listeners
+            var failureMessage = {
+                successful: false,
+                failure: true,
+                channel: '/meta/handshake',
+                request: message,
+                xhr: xhr,
+                advice: {
+                    action: 'retry',
+                    interval: _backoff
+                }
+            };
+
+            var retry = !_isDisconnected() && _advice.reconnect != 'none';
+            if (!retry) _setStatus('disconnected');
+
+            _notifyListeners('/meta/handshake', failureMessage);
+            _notifyListeners('/meta/unsuccessful', failureMessage);
+
+            // Only try again if we haven't been disconnected and the
+            // advice permits us to try again
+            if (retry)
+            {
+                _increaseBackoff();
+                _debug('Handshake failure, backing off and retrying in {} ms', _backoff);
+                _delayedHandshake();
+            }
+        };
+
+        function _connectSuccess(message)
+        {
+            var action = _isDisconnected() ? 'none' : (_advice.reconnect ? _advice.reconnect : 'retry');
+            if (!_isDisconnected()) _setStatus(action == 'retry' ? 'connecting' : 'disconnecting');
+
+            if (message.successful)
+            {
+                _debug('Connect successful');
+
+                // End the batch and allow held messages from the application
+                // to go to the server (see _handshake() where we start the batch).
+                // The batch is ended before notifying the listeners, so that
+                // listeners can batch other cometd operations
+                _endBatch(true);
+
+                // Notify the listeners after the status change but before the next connect
+                _notifyListeners('/meta/connect', message);
+
+                // Connect was successful.
+                // Normally, the advice will say "reconnect: 'retry', interval: 0"
+                // and the server will hold the request, so when a response returns
+                // we immediately call the server again (long polling)
+                switch (action)
+                {
+                    case 'retry':
+                        _resetBackoff();
+                        _delayedConnect();
+                        break;
+                    default:
+                        _resetBackoff();
+                        _setStatus('disconnected');
+                        break;
+                }
+            }
+            else
+            {
+                _debug('Connect unsuccessful');
+
+                // Notify the listeners after the status change but before the next action
+                _notifyListeners('/meta/connect', message);
+                _notifyListeners('/meta/unsuccessful', message);
+
+                // Connect was not successful.
+                // This may happen when the server crashed, the current clientId
+                // will be invalid, and the server will ask to handshake again
+                switch (action)
+                {
+                    case 'retry':
+                        _increaseBackoff();
+                        _delayedConnect();
+                        break;
+                    case 'handshake':
+                        // End the batch but do not deliver the messages until we connect successfully
+                        _endBatch(false);
+                        _resetBackoff();
+                        _delayedHandshake();
+                        break;
+                    case 'none':
+                        _resetBackoff();
+                        _setStatus('disconnected');
+                        break;
+                }
+            }
+        };
+
+        function _connectFailure(xhr, message)
+        {
+            _debug('Connect failure');
+
+            // Notify listeners
+            var failureMessage = {
+                successful: false,
+                failure: true,
+                channel: '/meta/connect',
+                request: message,
+                xhr: xhr,
+                advice: {
+                    action: 'retry',
+                    interval: _backoff
+                }
+            };
+            _notifyListeners('/meta/connect', failureMessage);
+            _notifyListeners('/meta/unsuccessful', failureMessage);
+
+            if (!_isDisconnected())
+            {
+                var action = _advice.reconnect ? _advice.reconnect : 'retry';
+                switch (action)
+                {
+                    case 'retry':
+                        _increaseBackoff();
+                        _debug('Connect failure, backing off and retrying in {} ms', _backoff);
+                        _delayedConnect();
+                        break;
+                    case 'handshake':
+                        _resetBackoff();
+                        _delayedHandshake();
+                        break;
+                    case 'none':
+                        _resetBackoff();
+                        break;
+                    default:
+                        _debug('Unrecognized reconnect value: {}', action);
+                        break;
+                }
+            }
+        };
+
+        function _disconnectSuccess(message)
+        {
+            if (message.successful)
+            {
+                _debug('Disconnect successful');
+                _disconnect(false);
+                _notifyListeners('/meta/disconnect', message);
+            }
+            else
+            {
+                _debug('Disconnect unsuccessful');
+                _disconnect(true);
+                _notifyListeners('/meta/disconnect', message);
+                _notifyListeners('/meta/usuccessful', message);
+            }
+        };
+
+        function _disconnect(abort)
+        {
+            _cancelDelayedSend();
+            if (abort) _transport.abort();
+            _clientId = null;
+            _setStatus('disconnected');
+            _batch = 0;
+            _messageQueue = [];
+            _resetBackoff();
+        };
+
+        function _disconnectFailure(xhr, message)
+        {
+            _debug('Disconnect failure');
+            _disconnect(true);
+
+            var failureMessage = {
+                successful: false,
+                failure: true,
+                channel: '/meta/disconnect',
+                request: message,
+                xhr: xhr,
+                advice: {
+                    action: 'none',
+                    interval: 0
+                }
+            };
+            _notifyListeners('/meta/disconnect', failureMessage);
+            _notifyListeners('/meta/unsuccessful', failureMessage);
+        };
+
+        function _subscribeSuccess(message)
+        {
+            if (message.successful)
+            {
+                _debug('Subscribe successful');
+                _notifyListeners('/meta/subscribe', message);
+            }
+            else
+            {
+                _debug('Subscribe unsuccessful');
+                _notifyListeners('/meta/subscribe', message);
+                _notifyListeners('/meta/unsuccessful', message);
+            }
+        };
+
+        function _subscribeFailure(xhr, message)
+        {
+            _debug('Subscribe failure');
+
+            var failureMessage = {
+                successful: false,
+                failure: true,
+                channel: '/meta/subscribe',
+                request: message,
+                xhr: xhr,
+                advice: {
+                    action: 'none',
+                    interval: 0
+                }
+            };
+            _notifyListeners('/meta/subscribe', failureMessage);
+            _notifyListeners('/meta/unsuccessful', failureMessage);
+        };
+
+        function _unsubscribeSuccess(message)
+        {
+            if (message.successful)
+            {
+                _debug('Unsubscribe successful');
+                _notifyListeners('/meta/unsubscribe', message);
+            }
+            else
+            {
+                _debug('Unsubscribe unsuccessful');
+                _notifyListeners('/meta/unsubscribe', message);
+                _notifyListeners('/meta/unsuccessful', message);
+            }
+        };
+
+        function _unsubscribeFailure(xhr, message)
+        {
+            _debug('Unsubscribe failure');
+
+            var failureMessage = {
+                successful: false,
+                failure: true,
+                channel: '/meta/unsubscribe',
+                request: message,
+                xhr: xhr,
+                advice: {
+                    action: 'none',
+                    interval: 0
+                }
+            };
+            _notifyListeners('/meta/unsubscribe', failureMessage);
+            _notifyListeners('/meta/unsuccessful', failureMessage);
+        };
+
+        function _messageSuccess(message)
+        {
+            if (message.successful === undefined)
+            {
+                if (message.data)
+                {
+                    // It is a plain message, and not a bayeux meta message
+                    _notifyListeners(message.channel, message);
+                }
+                else
+                {
+                    _debug('Unknown message {}', JSON.stringify(message));
+                }
+            }
+            else
+            {
+                if (message.successful)
+                {
+                    _debug('Publish successful');
+                    _notifyListeners('/meta/publish', message);
+                }
+                else
+                {
+                    _debug('Publish unsuccessful');
+                    _notifyListeners('/meta/publish', message);
+                    _notifyListeners('/meta/unsuccessful', message);
+                }
+            }
+        };
+
+        function _messageFailure(xhr, message)
+        {
+            _debug('Publish failure');
+
+            var failureMessage = {
+                successful: false,
+                failure: true,
+                channel: message.channel,
+                request: message,
+                xhr: xhr,
+                advice: {
+                    action: 'none',
+                    interval: 0
+                }
+            };
+            _notifyListeners('/meta/publish', failureMessage);
+            _notifyListeners('/meta/unsuccessful', failureMessage);
+        };
+
+        function _notifyListeners(channel, message)
+        {
+            // Notify direct listeners
+            _notify(channel, message);
+
+            // Notify the globbing listeners
+            var channelParts = channel.split("/");
+            var last = channelParts.length - 1;
+            for (var i = last; i > 0; --i)
+            {
+                var channelPart = channelParts.slice(0, i).join('/') + '/*';
+                // We don't want to notify /foo/* if the channel is /foo/bar/baz,
+                // so we stop at the first non recursive globbing
+                if (i == last) _notify(channelPart, message);
+                // Add the recursive globber and notify
+                channelPart += '*';
+                _notify(channelPart, message);
+            }
+        };
+
+        function _notify(channel, message)
+        {
+            var subscriptions = _listeners[channel];
+            if (subscriptions && subscriptions.length > 0)
+            {
+                for (var i = 0; i < subscriptions.length; ++i)
+                {
+                    var subscription = subscriptions[i];
+                    // Subscriptions may come and go, so the array may have 'holes'
+                    if (subscription)
+                    {
+                        try
+                        {
+                            _debug('Notifying subscription: channel \'{}\', callback \'{}\'', channel, subscription.callback.name);
+                            subscription.callback.call(subscription.scope, message);
+                        }
+                        catch (x)
+                        {
+                            // Ignore exceptions from callbacks
+                            _warn('Exception during execution of callback \'{}\' on channel \'{}\' for message {}, exception: {}', subscription.callback.name, channel, JSON.stringify(message), x);
+                        }
+                    }
+                }
+            }
+        };
+
+        function _resetBackoff()
+        {
+            _backoff = 0;
+        };
+
+        function _increaseBackoff()
+        {
+            if (_backoff < _maxBackoff) _backoff += _backoffIncrement;
+        };
+
+        var _error = this._error = function(text, args)
+        {
+            _log('error', _format.apply(this, arguments));
+        };
+
+        var _warn = this._warn = function(text, args)
+        {
+            _log('warn', _format.apply(this, arguments));
+        };
+
+        var _info = this._info = function(text, args)
+        {
+            _log('info', _format.apply(this, arguments));
+        };
+
+        var _debug = this._debug = function(text, args)
+        {
+            _log('debug', _format.apply(this, arguments));
+        };
+
+        function _log(level, text)
+        {
+            var priority = _logPriorities[level];
+            var configPriority = _logPriorities[_logLevel];
+            if (!configPriority) configPriority = _logPriorities['info'];
+            if (priority >= configPriority)
+            {
+                if (window.console) window.console.log(text);
+            }
+        };
+
+        function _format(text)
+        {
+            var braces = /\{\}/g;
+            var result = '';
+            var start = 0;
+            var count = 0;
+            while (braces.test(text))
+            {
+                result += text.substr(start, braces.lastIndex - start - 2);
+                var arg = arguments[++count];
+                result += arg !== undefined ? arg : '{}';
+                start = braces.lastIndex;
+            }
+            result += text.substr(start, text.length - start);
+            return result;
+        };
+
+        function newLongPollingTransport()
+        {
+            return $.extend({}, new Transport('long-polling'), new LongPollingTransport());
+        };
+
+        function newCallbackPollingTransport()
+        {
+            return $.extend({}, new Transport('callback-polling'), new CallbackPollingTransport());
+        };
+
+        /**
+         * Base object with the common functionality for transports.
+         * The key responsibility is to allow at most 2 outstanding requests to the server,
+         * to avoid that requests are sent behind a long poll.
+         * To achieve this, we have one reserved request for the long poll, and all other
+         * requests are serialized one after the other.
+         */
+        var Transport = function(type)
+        {
+            var _maxRequests = 2;
+            var _requestIds = 0;
+            var _cometRequest = null;
+            var _requests = [];
+            var _packets = [];
+
+            this.getType = function()
+            {
+                return type;
+            };
+
+            this.send = function(packet, comet)
+            {
+                if (comet)
+                    _cometSend(this, packet);
+                else
+                    _send(this, packet);
+            };
+
+            function _cometSend(self, packet)
+            {
+                if (_cometRequest !== null) throw 'Concurrent comet requests not allowed, request ' + _cometRequest.id + ' not yet completed';
+
+                var requestId = ++_requestIds;
+                _debug('Beginning comet request {}', requestId);
+
+                var request = {id: requestId};
+                _debug('Delivering comet request {}', requestId);
+                self.deliver(packet, request);
+                _cometRequest = request;
+            };
+
+            function _send(self, packet)
+            {
+                var requestId = ++_requestIds;
+                _debug('Beginning request {}, {} other requests, {} queued requests', requestId, _requests.length, _packets.length);
+
+                var request = {id: requestId};
+                // Consider the comet request which should always be present
+                if (_requests.length < _maxRequests - 1)
+                {
+                    _debug('Delivering request {}', requestId);
+                    self.deliver(packet, request);
+                    _requests.push(request);
+                }
+                else
+                {
+                    _packets.push([packet, request]);
+                    _debug('Queued request {}, {} queued requests', requestId, _packets.length);
+                }
+            };
+
+            this.complete = function(request, success, comet)
+            {
+                if (comet)
+                    _cometComplete(request);
+                else
+                    _complete(this, request, success);
+            };
+
+            function _cometComplete(request)
+            {
+                var requestId = request.id;
+                if (_cometRequest !== request) throw 'Comet request mismatch, completing request ' + requestId;
+
+                // Reset comet request
+                _cometRequest = null;
+                _debug('Ended comet request {}', requestId);
+            };
+
+            function _complete(self, request, success)
+            {
+                var requestId = request.id;
+                var index = $.inArray(request, _requests);
+                // The index can be negative the request has been aborted
+                if (index >= 0) _requests.splice(index, 1);
+                _debug('Ended request {}, {} other requests, {} queued requests', requestId, _requests.length, _packets.length);
+
+                if (_packets.length > 0)
+                {
+                    var packet = _packets.shift();
+                    if (success)
+                    {
+                        _debug('Dequeueing and sending request {}, {} queued requests', packet[1].id, _packets.length);
+                        _send(self, packet[0]);
+                    }
+                    else
+                    {
+                        _debug('Dequeueing and failing request {}, {} queued requests', packet[1].id, _packets.length);
+                        // Keep the semantic of calling response callbacks asynchronously after the request
+                        setTimeout(function() { packet[0].onFailure(packet[1], 'error'); }, 0);
+                    }
+                }
+            };
+
+            this.abort = function()
+            {
+                for (var i = 0; i < _requests.length; ++i)
+                {
+                    var request = _requests[i];
+                    _debug('Aborting request {}', request.id);
+                    if (request.xhr) request.xhr.abort();
+                }
+                if (_cometRequest)
+                {
+                    _debug('Aborting comet request {}', _cometRequest.id);
+                    if (_cometRequest.xhr) _cometRequest.xhr.abort();
+                }
+                _cometRequest = null;
+                _requests = [];
+                _packets = [];
+            };
+        };
+
+        var LongPollingTransport = function()
+        {
+            this.deliver = function(packet, request)
+            {
+                request.xhr = $.ajax({
+                    url: packet.url,
+                    type: 'POST',
+                    contentType: 'text/json;charset=UTF-8',
+                    beforeSend: function(xhr)
+                    {
+                        xhr.setRequestHeader('Connection', 'Keep-Alive');
+                        return true;
+                    },
+                    data: JSON.stringify(packet.messages),
+                    success: function(response) { packet.onSuccess(request, response); },
+                    error: function(xhr, reason, exception) { packet.onFailure(request, reason, exception); }
+                });
+            };
+        };
+
+        var CallbackPollingTransport = function()
+        {
+            var _maxLength = 2000;
+            this.deliver = function(packet, request)
+            {
+                // Microsoft Internet Explorer has a 2083 URL max length
+                // We must ensure that we stay within that length
+                var messages = JSON.stringify(packet.messages);
+                // Encode the messages because all brackets, quotes, commas, colons, etc
+                // present in the JSON will be URL encoded, taking many more characters
+                var urlLength = packet.url.length + encodeURI(messages).length;
+                _debug('URL length: {}', urlLength);
+                // Let's stay on the safe side and use 2000 instead of 2083
+                // also because we did not count few characters among which
+                // the parameter name 'message' and the parameter 'jsonp',
+                // which sum up to about 50 chars
+                if (urlLength > _maxLength)
+                {
+                    var x = packet.messages.length > 1 ?
+                            'Too many bayeux messages in the same batch resulting in message too big ' +
+                            '(' + urlLength + ' bytes, max is ' + _maxLength + ') for transport ' + this.getType() :
+                            'Bayeux message too big (' + urlLength + ' bytes, max is ' + _maxLength + ') ' +
+                            'for transport ' + this.getType();
+                    // Keep the semantic of calling response callbacks asynchronously after the request
+                    _setTimeout(function() { packet.onFailure(request, 'error', x); }, 0);
+                }
+                else
+                {
+                    $.ajax({
+                        url: packet.url,
+                        type: 'GET',
+                        dataType: 'jsonp',
+                        jsonp: 'jsonp',
+                        beforeSend: function(xhr)
+                        {
+                            xhr.setRequestHeader('Connection', 'Keep-Alive');
+                            return true;
+                        },
+                        data:
+                        {
+                            // In callback-polling, the content must be sent via the 'message' parameter
+                            message: messages
+                        },
+                        success: function(response) { packet.onSuccess(request, response); },
+                        error: function(xhr, reason, exception) { packet.onFailure(request, reason, exception); }
+                    });
+                }
+            };
+        };
+    };
+
+    /**
+     * The JS object that exposes the comet API to applications
+     */
+    $.cometd = new $.Cometd(); // The default instance
+
+})(jQuery);
diff --git a/plugins/Comet/updatetimeline.js b/plugins/Comet/updatetimeline.js
index f4da1f47cd..6612b51168 100644
--- a/plugins/Comet/updatetimeline.js
+++ b/plugins/Comet/updatetimeline.js
@@ -1,3 +1,30 @@
 // update the local timeline from a Comet server
 //
 
+var updater = function()
+{
+    var _handshook = false;
+    var _connected = false;
+    var _cometd;
+
+    return {
+        init: function()
+        {
+            _cometd = $.cometd; // Uses the default Comet object
+            _cometd.init(_timelineServer);
+            _cometd.subscribe(_timeline, this, receive);
+            $(window).unload(leave);
+        }
+    }
+
+    function leave()
+    {
+         _cometd.disconnect();
+    }
+
+    function receive(message)
+    {
+         var noticeItem = makeNoticeItem(message.data);
+         var noticeList = $('ul.notices');
+    }
+}();

From 84072aa5cf6124d59a06a7f0a7945c00ee2836da Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Apr 2009 12:13:49 -0400
Subject: [PATCH 31/49] run 'set names' after each connection to deal with UTF8
 correctly

---
 classes/Memcached_DataObject.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 5f71f716b3..877bbf2e0f 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -227,4 +227,20 @@ class Memcached_DataObject extends DB_DataObject
         $c->set($ckey, $cached, MEMCACHE_COMPRESSED, $expiry);
         return new ArrayWrapper($cached);
     }
+
+    // We overload so that 'SET NAMES "utf8"' is called for
+    // each connection
+
+    function _connect()
+    {
+        global $_DB_DATAOBJECT;
+        $exists = !empty($this->_database_dsn_md5) &&
+          isset($_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]);
+        $result = parent::_connect();
+        if (!$exists) {
+            $DB = &$_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5];
+            $DB->query('SET NAMES "utf8"');
+        }
+        return $result;
+    }
 }

From 068f6801cc59488bfc50ef399a2a4d22b1b7e9c2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Apr 2009 12:27:32 -0400
Subject: [PATCH 32/49] Revert "run 'set names' after each connection to deal
 with UTF8 correctly"

This reverts commit 84072aa5cf6124d59a06a7f0a7945c00ee2836da.

This commit caused grievous harm to old notices on identi.ca.
Reverting until we figure out how to convert the old notices.
---
 classes/Memcached_DataObject.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 877bbf2e0f..5f71f716b3 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -227,20 +227,4 @@ class Memcached_DataObject extends DB_DataObject
         $c->set($ckey, $cached, MEMCACHE_COMPRESSED, $expiry);
         return new ArrayWrapper($cached);
     }
-
-    // We overload so that 'SET NAMES "utf8"' is called for
-    // each connection
-
-    function _connect()
-    {
-        global $_DB_DATAOBJECT;
-        $exists = !empty($this->_database_dsn_md5) &&
-          isset($_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]);
-        $result = parent::_connect();
-        if (!$exists) {
-            $DB = &$_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5];
-            $DB->query('SET NAMES "utf8"');
-        }
-        return $result;
-    }
 }

From ccf45d454c68f7f667d07e0db608569e049ec285 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Apr 2009 15:08:49 -0400
Subject: [PATCH 33/49] Lots of tweaking to make things work

Did some tweaking and maneuvering to make things work. This version
will now show a "notice received" alert box -- lots of progress! Had
to test with Java server, not Python server.
---
 plugins/Comet/CometPlugin.php   |  22 +-
 plugins/Comet/json2.js          | 478 ++++++++++++++++++++++++++++++++
 plugins/Comet/updatetimeline.js |  48 ++--
 3 files changed, 516 insertions(+), 32 deletions(-)
 create mode 100644 plugins/Comet/json2.js

diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index 10f8c198c3..f60d400751 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -56,6 +56,8 @@ class CometPlugin extends Plugin
     {
         $timeline = null;
 
+        $this->log(LOG_DEBUG, 'got action ' . $action->trimmed('action'));
+
         switch ($action->trimmed('action')) {
          case 'public':
             $timeline = '/timelines/public';
@@ -64,16 +66,18 @@ class CometPlugin extends Plugin
             return true;
         }
 
-        $action->element('script', array('type' => 'text/javascript',
-                                         'src' => common_path('plugins/Comet/jquery.comet.js')),
+        $scripts = array('jquery.comet.js', 'json2.js', 'updatetimeline.js');
+
+        foreach ($scripts as $script) {
+            $action->element('script', array('type' => 'text/javascript',
+                                             'src' => common_path('plugins/Comet/'.$script)),
                          ' ');
+        }
+
         $action->elementStart('script', array('type' => 'text/javascript'));
-        $action->raw("var _timelineServer = \"$this->server\"; ".
-                     "var _timeline = \"$timeline\";");
+        $action->raw("$(document).ready(function() { updater.init(\"$this->server\", \"$timeline\");});");
         $action->elementEnd('script');
-        $action->element('script', array('type' => 'text/javascript',
-                                         'src' => common_path('plugins/Comet/updatetimeline.js')),
-                         ' ');
+
         return true;
     }
 
@@ -96,21 +100,17 @@ class CometPlugin extends Plugin
 
             $json = $this->noticeAsJson($notice);
 
-            $this->log(LOG_DEBUG, "JSON = '$json'");
-
             // Bayeux? Comet? Huh? These terms confuse me
             $bay = new Bayeux($this->server);
 
             foreach ($timelines as $timeline) {
                 $this->log(LOG_INFO, "Posting notice $notice->id to '$timeline'.");
                 $bay->publish($timeline, $json);
-                $this->log(LOG_DEBUG, "Done posting notice $notice->id to '$timeline'.");
             }
 
             $bay = NULL;
         }
 
-        $this->log(LOG_DEBUG, "All done.");
         return true;
     }
 
diff --git a/plugins/Comet/json2.js b/plugins/Comet/json2.js
new file mode 100644
index 0000000000..7e27df5181
--- /dev/null
+++ b/plugins/Comet/json2.js
@@ -0,0 +1,478 @@
+/*
+    http://www.JSON.org/json2.js
+    2009-04-16
+
+    Public Domain.
+
+    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+    See http://www.JSON.org/js.html
+
+    This file creates a global JSON object containing two methods: stringify
+    and parse.
+
+        JSON.stringify(value, replacer, space)
+            value       any JavaScript value, usually an object or array.
+
+            replacer    an optional parameter that determines how object
+                        values are stringified for objects. It can be a
+                        function or an array of strings.
+
+            space       an optional parameter that specifies the indentation
+                        of nested structures. If it is omitted, the text will
+                        be packed without extra whitespace. If it is a number,
+                        it will specify the number of spaces to indent at each
+                        level. If it is a string (such as '\t' or '&nbsp;'),
+                        it contains the characters used to indent at each level.
+
+            This method produces a JSON text from a JavaScript value.
+
+            When an object value is found, if the object contains a toJSON
+            method, its toJSON method will be called and the result will be
+            stringified. A toJSON method does not serialize: it returns the
+            value represented by the name/value pair that should be serialized,
+            or undefined if nothing should be serialized. The toJSON method
+            will be passed the key associated with the value, and this will be
+            bound to the object holding the key.
+
+            For example, this would serialize Dates as ISO strings.
+
+                Date.prototype.toJSON = function (key) {
+                    function f(n) {
+                        // Format integers to have at least two digits.
+                        return n < 10 ? '0' + n : n;
+                    }
+
+                    return this.getUTCFullYear()   + '-' +
+                         f(this.getUTCMonth() + 1) + '-' +
+                         f(this.getUTCDate())      + 'T' +
+                         f(this.getUTCHours())     + ':' +
+                         f(this.getUTCMinutes())   + ':' +
+                         f(this.getUTCSeconds())   + 'Z';
+                };
+
+            You can provide an optional replacer method. It will be passed the
+            key and value of each member, with this bound to the containing
+            object. The value that is returned from your method will be
+            serialized. If your method returns undefined, then the member will
+            be excluded from the serialization.
+
+            If the replacer parameter is an array of strings, then it will be
+            used to select the members to be serialized. It filters the results
+            such that only members with keys listed in the replacer array are
+            stringified.
+
+            Values that do not have JSON representations, such as undefined or
+            functions, will not be serialized. Such values in objects will be
+            dropped; in arrays they will be replaced with null. You can use
+            a replacer function to replace those with JSON values.
+            JSON.stringify(undefined) returns undefined.
+
+            The optional space parameter produces a stringification of the
+            value that is filled with line breaks and indentation to make it
+            easier to read.
+
+            If the space parameter is a non-empty string, then that string will
+            be used for indentation. If the space parameter is a number, then
+            the indentation will be that many spaces.
+
+            Example:
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}]);
+            // text is '["e",{"pluribus":"unum"}]'
+
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+            text = JSON.stringify([new Date()], function (key, value) {
+                return this[key] instanceof Date ?
+                    'Date(' + this[key] + ')' : value;
+            });
+            // text is '["Date(---current time---)"]'
+
+
+        JSON.parse(text, reviver)
+            This method parses a JSON text to produce an object or array.
+            It can throw a SyntaxError exception.
+
+            The optional reviver parameter is a function that can filter and
+            transform the results. It receives each of the keys and values,
+            and its return value is used instead of the original value.
+            If it returns what it received, then the structure is not modified.
+            If it returns undefined then the member is deleted.
+
+            Example:
+
+            // Parse the text. Values that look like ISO date strings will
+            // be converted to Date objects.
+
+            myData = JSON.parse(text, function (key, value) {
+                var a;
+                if (typeof value === 'string') {
+                    a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+                    if (a) {
+                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+                            +a[5], +a[6]));
+                    }
+                }
+                return value;
+            });
+
+            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+                var d;
+                if (typeof value === 'string' &&
+                        value.slice(0, 5) === 'Date(' &&
+                        value.slice(-1) === ')') {
+                    d = new Date(value.slice(5, -1));
+                    if (d) {
+                        return d;
+                    }
+                }
+                return value;
+            });
+
+
+    This is a reference implementation. You are free to copy, modify, or
+    redistribute.
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+    NOT CONTROL.
+*/
+
+/*jslint evil: true */
+
+/*global JSON */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
+    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+    lastIndex, length, parse, prototype, push, replace, slice, stringify,
+    test, toJSON, toString, valueOf
+*/
+
+// Create a JSON object only if one does not already exist. We create the
+// methods in a closure to avoid creating global variables.
+
+if (!this.JSON) {
+    JSON = {};
+}
+(function () {
+
+    function f(n) {
+        // Format integers to have at least two digits.
+        return n < 10 ? '0' + n : n;
+    }
+
+    if (typeof Date.prototype.toJSON !== 'function') {
+
+        Date.prototype.toJSON = function (key) {
+
+            return this.getUTCFullYear()   + '-' +
+                 f(this.getUTCMonth() + 1) + '-' +
+                 f(this.getUTCDate())      + 'T' +
+                 f(this.getUTCHours())     + ':' +
+                 f(this.getUTCMinutes())   + ':' +
+                 f(this.getUTCSeconds())   + 'Z';
+        };
+
+        String.prototype.toJSON =
+        Number.prototype.toJSON =
+        Boolean.prototype.toJSON = function (key) {
+            return this.valueOf();
+        };
+    }
+
+    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        gap,
+        indent,
+        meta = {    // table of character substitutions
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
+        },
+        rep;
+
+
+    function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+        escapable.lastIndex = 0;
+        return escapable.test(string) ?
+            '"' + string.replace(escapable, function (a) {
+                var c = meta[a];
+                return typeof c === 'string' ? c :
+                    '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+            }) + '"' :
+            '"' + string + '"';
+    }
+
+
+    function str(key, holder) {
+
+// Produce a string from holder[key].
+
+        var i,          // The loop counter.
+            k,          // The member key.
+            v,          // The member value.
+            length,
+            mind = gap,
+            partial,
+            value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+        if (value && typeof value === 'object' &&
+                typeof value.toJSON === 'function') {
+            value = value.toJSON(key);
+        }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+        if (typeof rep === 'function') {
+            value = rep.call(holder, key, value);
+        }
+
+// What happens next depends on the value's type.
+
+        switch (typeof value) {
+        case 'string':
+            return quote(value);
+
+        case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+            return isFinite(value) ? String(value) : 'null';
+
+        case 'boolean':
+        case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+            return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+        case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+            if (!value) {
+                return 'null';
+            }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+            gap += indent;
+            partial = [];
+
+// Is the value an array?
+
+            if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+                length = value.length;
+                for (i = 0; i < length; i += 1) {
+                    partial[i] = str(i, value) || 'null';
+                }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+                v = partial.length === 0 ? '[]' :
+                    gap ? '[\n' + gap +
+                            partial.join(',\n' + gap) + '\n' +
+                                mind + ']' :
+                          '[' + partial.join(',') + ']';
+                gap = mind;
+                return v;
+            }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+            if (rep && typeof rep === 'object') {
+                length = rep.length;
+                for (i = 0; i < length; i += 1) {
+                    k = rep[i];
+                    if (typeof k === 'string') {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+                for (k in value) {
+                    if (Object.hasOwnProperty.call(value, k)) {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+            v = partial.length === 0 ? '{}' :
+                gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
+                        mind + '}' : '{' + partial.join(',') + '}';
+            gap = mind;
+            return v;
+        }
+    }
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+    if (typeof JSON.stringify !== 'function') {
+        JSON.stringify = function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+            var i;
+            gap = '';
+            indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+            if (typeof space === 'number') {
+                for (i = 0; i < space; i += 1) {
+                    indent += ' ';
+                }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+            } else if (typeof space === 'string') {
+                indent = space;
+            }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+            rep = replacer;
+            if (replacer && typeof replacer !== 'function' &&
+                    (typeof replacer !== 'object' ||
+                     typeof replacer.length !== 'number')) {
+                throw new Error('JSON.stringify');
+            }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+            return str('', {'': value});
+        };
+    }
+
+
+// If the JSON object does not yet have a parse method, give it one.
+
+    if (typeof JSON.parse !== 'function') {
+        JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+            var j;
+
+            function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+                var k, v, value = holder[key];
+                if (value && typeof value === 'object') {
+                    for (k in value) {
+                        if (Object.hasOwnProperty.call(value, k)) {
+                            v = walk(value, k);
+                            if (v !== undefined) {
+                                value[k] = v;
+                            } else {
+                                delete value[k];
+                            }
+                        }
+                    }
+                }
+                return reviver.call(holder, key, value);
+            }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+            cx.lastIndex = 0;
+            if (cx.test(text)) {
+                text = text.replace(cx, function (a) {
+                    return '\\u' +
+                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+                });
+            }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+            if (/^[\],:{}\s]*$/.
+test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+                j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+                return typeof reviver === 'function' ?
+                    walk({'': j}, '') : j;
+            }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+            throw new SyntaxError('JSON.parse');
+        };
+    }
+}());
diff --git a/plugins/Comet/updatetimeline.js b/plugins/Comet/updatetimeline.js
index 6612b51168..7b22445e30 100644
--- a/plugins/Comet/updatetimeline.js
+++ b/plugins/Comet/updatetimeline.js
@@ -3,28 +3,34 @@
 
 var updater = function()
 {
-    var _handshook = false;
-    var _connected = false;
-    var _cometd;
+     var _cometd;
 
-    return {
-        init: function()
-        {
-            _cometd = $.cometd; // Uses the default Comet object
-            _cometd.init(_timelineServer);
-            _cometd.subscribe(_timeline, this, receive);
-            $(window).unload(leave);
-        }
-    }
+     return {
+          init: function(server, timeline)
+          {
+               _cometd = $.cometd; // Uses the default Comet object
+               _cometd.setLogLevel('debug');
+               _cometd.init(server);
+               _cometd.subscribe(timeline, receive);
+               $(window).unload(leave);
+          }
+     }
 
-    function leave()
-    {
-         _cometd.disconnect();
-    }
+     function leave()
+     {
+          _cometd.disconnect();
+     }
 
-    function receive(message)
-    {
-         var noticeItem = makeNoticeItem(message.data);
-         var noticeList = $('ul.notices');
-    }
+     function receive(message)
+     {
+          alert("Received notice.");
+          var noticeItem = makeNoticeItem(message.data);
+          var noticeList = $('ul.notices');
+     }
+
+     function makeNoticeItem(data)
+     {
+          return '';
+     }
 }();
+

From 7dbb5fb8fdf7c4f82c212863a17793a50f887f58 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Apr 2009 15:37:00 -0400
Subject: [PATCH 34/49] Make notice auto-update

Shows notices auto-updating
---
 plugins/Comet/CometPlugin.php   |  5 +++++
 plugins/Comet/updatetimeline.js | 37 ++++++++++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index f60d400751..a7a4f4b237 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -126,6 +126,11 @@ class CometPlugin extends Plugin
         $act = new TwitterApiAction('/dev/null');
 
         $arr = $act->twitter_status_array($notice, true);
+        $arr['url'] = $notice->bestUrl();
+
+        $profile = $notice->getProfile();
+        $arr['user']['profile_url'] = $profile->profileurl;
+
         return $arr;
     }
 
diff --git a/plugins/Comet/updatetimeline.js b/plugins/Comet/updatetimeline.js
index 7b22445e30..c6eefb4475 100644
--- a/plugins/Comet/updatetimeline.js
+++ b/plugins/Comet/updatetimeline.js
@@ -23,14 +23,45 @@ var updater = function()
 
      function receive(message)
      {
-          alert("Received notice.");
           var noticeItem = makeNoticeItem(message.data);
-          var noticeList = $('ul.notices');
+          $("#notices_primary .notices").prepend(noticeItem, true);
+          $("#notices_primary .notice:first").css({display:"none"});
+          $("#notices_primary .notice:first").fadeIn(2500);
+          NoticeHover();
+          NoticeReply();
      }
 
      function makeNoticeItem(data)
      {
-          return '';
+          user = data['user'];
+          ni = "<li class=\"hentry notice\" id=\"notice-"+data['id']+"\">"+
+               "<div class=\"entry-title\">"+
+               "<span class=\"vcard author\">"+
+               "<a href=\""+user['profile_url']+"\" class=\"url\">"+
+               "<img src=\""+user['profile_image_url']+"\" class=\"avatar photo\" width=\"48\" height=\"48\" alt=\""+user['screen_name']+"\"/>"+
+               "<span class=\"nickname fn\">"+user['screen_name']+"</span>"+
+               "</a>"+
+               "</span>"+
+               "<p class=\"entry-content\">"+data['text']+"</p>"+
+               "</div>"+
+               "<div class=\"entry-content\">"+
+               "<dl class=\"timestamp\">"+
+               "<dt>Published</dt>"+
+               "<dd>"+
+               "<a rel=\"bookmark\" href=\""+data['url']+"\" >"+
+               "<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
+               "</a> "+
+               "</dd>"+
+               "</dl>"+
+               "<dl class=\"device\">"+
+               "<dt>From</dt> "+
+               "<dd>"+data['source']+"</dd>"+
+               "</dl>"+
+               "</div>"+
+               "<div class=\"notice-options\">"+
+               "</div>"+
+               "</li>";
+          return ni;
      }
 }();
 

From 781341d91fd4c7406d8687e7828ab86f9696cf66 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Apr 2009 15:41:55 -0400
Subject: [PATCH 35/49] README for the comet plugin

---
 plugins/Comet/README | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 plugins/Comet/README

diff --git a/plugins/Comet/README b/plugins/Comet/README
new file mode 100644
index 0000000000..4abd40af7a
--- /dev/null
+++ b/plugins/Comet/README
@@ -0,0 +1,26 @@
+This is a plugin to automatically load notices in the browser no
+matter who creates them -- the kind of thing we see with
+search.twitter.com, rejaw.com, or FriendFeed's "real time" news.
+
+NOTE: this is an insecure version; don't roll it out on a production
+server.
+
+It requires a cometd server. I've only had the cometd-java server work
+correctly; something's wiggy with the Twisted-based server.
+
+After you have a cometd server installed, just add this code to your
+config.php:
+
+    require_once(INSTALLDIR.'/plugins/Comet/CometPlugin.php');
+    $cp = new CometPlugin('http://example.com:8080/cometd/');
+
+Change 'example.com:8080' to the name and port of the server you
+installed cometd on.
+
+TODO:
+
+* Needs to be tested with Ajax submission. Probably messes everything
+  up.
+* Add more timelines: personal inbox and tags would be great.
+* Add security. In particular, only let the PHP code publish notices
+  to the cometd server. Currently, it doesn't try to authenticate.

From e438334c00ebe29c01bfc5b02aa64cffdb43cb46 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Apr 2009 18:00:06 -0400
Subject: [PATCH 36/49] add live updating for tag pages

---
 plugins/Comet/CometPlugin.php | 36 +++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index a7a4f4b237..cff0d4c9d6 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -62,6 +62,14 @@ class CometPlugin extends Plugin
          case 'public':
             $timeline = '/timelines/public';
             break;
+         case 'tag':
+            $tag = $action->trimmed('tag');
+            if (!empty($tag)) {
+                $timeline = '/timelines/tag/'.$tag;
+            } else {
+                return true;
+            }
+            break;
          default:
             return true;
         }
@@ -94,6 +102,14 @@ class CometPlugin extends Plugin
             $timelines[] = '/timelines/public';
         }
 
+        $tags = $this->getNoticeTags($notice);
+
+        if (!empty($tags)) {
+            foreach ($tags as $tag) {
+                $timelines[] = '/timelines/tag/' . $tag;
+            }
+        }
+
         if (count($timelines) > 0) {
             // Require this, since we need it
             require_once(INSTALLDIR.'/plugins/Comet/bayeux.class.inc.php');
@@ -134,6 +150,26 @@ class CometPlugin extends Plugin
         return $arr;
     }
 
+    function getNoticeTags($notice)
+    {
+        $tags = null;
+
+        $nt = new Notice_tag();
+        $nt->notice_id = $notice->id;
+
+        if ($nt->find()) {
+            $tags = array();
+            while ($nt->fetch()) {
+                $tags[] = $nt->tag;
+            }
+        }
+
+        $nt->free();
+        $nt = null;
+
+        return $tags;
+    }
+
     // Push this up to Plugin
 
     function log($level, $msg)

From db3b56a2fdf51e97e9859aa731674947571667aa Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Apr 2009 20:50:39 -0400
Subject: [PATCH 37/49] Display rendered HTML for a notice

Display the rendered HTML for a notice
---
 plugins/Comet/CometPlugin.php   | 1 +
 plugins/Comet/updatetimeline.js | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index cff0d4c9d6..2e0bb40a46 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -143,6 +143,7 @@ class CometPlugin extends Plugin
 
         $arr = $act->twitter_status_array($notice, true);
         $arr['url'] = $notice->bestUrl();
+        $arr['html'] = htmlspecialchars($notice->rendered);
 
         $profile = $notice->getProfile();
         $arr['user']['profile_url'] = $profile->profileurl;
diff --git a/plugins/Comet/updatetimeline.js b/plugins/Comet/updatetimeline.js
index c6eefb4475..55511d35ff 100644
--- a/plugins/Comet/updatetimeline.js
+++ b/plugins/Comet/updatetimeline.js
@@ -34,6 +34,8 @@ var updater = function()
      function makeNoticeItem(data)
      {
           user = data['user'];
+          html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
+
           ni = "<li class=\"hentry notice\" id=\"notice-"+data['id']+"\">"+
                "<div class=\"entry-title\">"+
                "<span class=\"vcard author\">"+
@@ -42,7 +44,7 @@ var updater = function()
                "<span class=\"nickname fn\">"+user['screen_name']+"</span>"+
                "</a>"+
                "</span>"+
-               "<p class=\"entry-content\">"+data['text']+"</p>"+
+               "<p class=\"entry-content\">"+html+"</p>"+
                "</div>"+
                "<div class=\"entry-content\">"+
                "<dl class=\"timestamp\">"+

From e97223b2ba3f9f1818ba12b707c53c0ebdcab144 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Apr 2009 21:15:11 -0400
Subject: [PATCH 38/49] Don't add a notice if it already exists on the page

Try not to interfere with Ajax posting; don't show something if it's
already on the page.
---
 plugins/Comet/updatetimeline.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/Comet/updatetimeline.js b/plugins/Comet/updatetimeline.js
index 55511d35ff..de750baba3 100644
--- a/plugins/Comet/updatetimeline.js
+++ b/plugins/Comet/updatetimeline.js
@@ -23,6 +23,14 @@ var updater = function()
 
      function receive(message)
      {
+          id = message.data.id;
+
+          // Don't add it if it already exists
+
+          if ($("#notice-"+id).length > 0) {
+               return;
+          }
+
           var noticeItem = makeNoticeItem(message.data);
           $("#notices_primary .notices").prepend(noticeItem, true);
           $("#notices_primary .notice:first").css({display:"none"});

From 7405d9dfa684975309150537069a1268a67ed6be Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Apr 2009 21:16:09 -0400
Subject: [PATCH 39/49] Don't add a node if it's already there

Try not to double-add a node on Ajax submit. Normally not a big deal,
but may happen if the CometPlugin (or in the future Strophe or other
auto-update plugins) is enabled.
---
 js/util.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/js/util.js b/js/util.js
index 15a14625c7..f15c4f2bbf 100644
--- a/js/util.js
+++ b/js/util.js
@@ -188,11 +188,15 @@ $(document).ready(function(){
 													    alert(result);
                                                     }
                                                     else {
-													    $("#notices_primary .notices").prepend(document._importNode($("li", xml).get(0), true));
-													    $("#notices_primary .notice:first").css({display:"none"});
-													    $("#notices_primary .notice:first").fadeIn(2500);
-													    NoticeHover();
-													    NoticeReply();
+                                                         li = $("li", xml).get(0);
+                                                         id = li.id;
+                                                         if ($("#"+li.id).length == 0) {
+                                                              $("#notices_primary .notices").prepend(document._importNode(li, true));
+                                                              $("#notices_primary .notice:first").css({display:"none"});
+                                                              $("#notices_primary .notice:first").fadeIn(2500);
+                                                              NoticeHover();
+                                                              NoticeReply();
+                                                         }
 													}
 													$("#notice_data-text").val("");
                                                     counter();

From efe8c47d7d9e91eb8308845b8b0717e84e36e346 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 27 Apr 2009 20:07:22 +0000
Subject: [PATCH 40/49] Minor CSS order/cleanup.

---
 theme/base/css/display.css | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 0bc2e68b65..dc6b4bc29a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -842,23 +842,6 @@ text-transform:lowercase;
 }
 
 
-
-.notice-data {
-position:absolute;
-top:18px;
-right:0;
-min-height:50px;
-margin-bottom:4px;
-}
-.notice .entry-content .notice-data dt {
-display:none;
-}
-
-.notice-data a {
-display:block;
-outline:none;
-}
-
 .notice-options {
 padding-left:2%;
 float:left;
@@ -1036,6 +1019,8 @@ padding-right:30px;
 .hentry .entry-content p {
 margin-bottom:18px;
 }
+.system_notice ul,
+.instructions ul,
 .hentry entry-content ol,
 .hentry .entry-content ul {
 list-style-position:inside;
@@ -1160,9 +1145,6 @@ clear:both;
 margin-bottom:0;
 }
 
-.instructions ul {
-list-style-position:inside;
-}
 .instructions p,
 .instructions ul {
 margin-bottom:18px;

From 6a20ef71d3b2b325ce24318e2ba4483d6c8732ce Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Tue, 28 Apr 2009 13:05:48 +0100
Subject: [PATCH 41/49] Fixed typo in stopdaemons.sh - was not stopping the new
 memcached queue handler

---
 scripts/stopdaemons.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index 196991de0f..f6d71eddfb 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -25,7 +25,7 @@ DIR=`php $SDIR/getpiddir.php`
 
 for f in jabberhandler ombhandler publichandler smshandler pinghandler \
 	 xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
-         memcachedhandler inboxhandler; do
+         memcachehandler inboxhandler; do
 
 	FILES="$DIR/$f.*.pid"
 	for ff in "$FILES" ; do

From 5b78f95e972f9f19ea46607e8b9544b8f7c4207a Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Tue, 28 Apr 2009 13:30:54 +0100
Subject: [PATCH 42/49] Only start daemons that are required, according to the
 site config. There is the potential to not start some more - see the checks
 in getvaliddaemons.php

---
 scripts/getvaliddaemons.php | 52 +++++++++++++++++++++++++++++++++++++
 scripts/startdaemons.sh     |  6 ++---
 2 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100755 scripts/getvaliddaemons.php

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
new file mode 100755
index 0000000000..482e63af70
--- /dev/null
+++ b/scripts/getvaliddaemons.php
@@ -0,0 +1,52 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Utility script to get a list of daemons that should run, based on the
+ * current configuration. This is used by startdaemons.sh to determine what
+ * it should and shouldn't start up. The output is a list of space-separated
+ * daemon names.
+ */
+
+
+# Abort if called from a web server
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+
+if(common_config('xmpp','enabled')) {
+    echo "xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php ";
+    echo "xmppconfirmhandler.php ";
+}
+if(common_config('memcached','enabled')) {
+    echo "memcachedqueuehandler.php ";
+}
+echo "ombqueuehandler.php ";
+echo "twitterqueuehandler.php ";
+echo "facebookqueuehandler.php ";
+echo "pingqueuehandler.php ";
+echo "inboxqueuehandler.php ";
+echo "smsqueuehandler.php ";
diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 66f9ed4e0c..3869e95c4c 100755
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -21,11 +21,9 @@
 # Note that the 'maildaemon' needs to run as a mail filter.
 
 DIR=`dirname $0`
+DAEMONS=`php $DIR/getvaliddaemons.php`
 
-for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
-         xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
-         twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php \
-	 memcachedqueuehandler.php inboxqueuehandler.php; do
+for f in $DAEMONS; do
 
          echo -n "Starting $f...";
 	 php $DIR/$f

From c7105c2af1ebe3cddd477265c6fea59a61d0c7e5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 28 Apr 2009 13:07:05 -0400
Subject: [PATCH 43/49] Change to avoid a join in notice inbox

The join in notice_inbox is causing temp-table sorting on identi.ca,
so I'm trying a finer-tuned approach.
---
 classes/Notice.php       |  31 ++++++++++--
 classes/Notice_inbox.php | 101 ++++++++++++++++++++++++++++++++++++++-
 classes/User.php         |  29 +----------
 3 files changed, 127 insertions(+), 34 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 27b98de1cc..b087c94bc4 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -215,6 +215,7 @@ class Notice extends Memcached_DataObject
             if (common_config('queue', 'enabled')) {
                 $notice->blowAuthorCaches();
             } else {
+                common_debug("Blowing caches for new notice.");
                 $notice->blowCaches();
             }
         }
@@ -285,7 +286,7 @@ class Notice extends Memcached_DataObject
         // Clear the user's cache
         $cache = common_memcache();
         if (!empty($cache)) {
-            $cache->delete(common_cache_key('user:notices_with_friends:' . $this->profile_id));
+            $cache->delete(common_cache_key('notice_inbox:by_user:'.$this->profile_id));
         }
         $this->blowNoticeCache($blowLast);
         $this->blowPublicCache($blowLast);
@@ -307,9 +308,9 @@ class Notice extends Memcached_DataObject
                     $member->group_id = $group_inbox->group_id;
                     if ($member->find()) {
                         while ($member->fetch()) {
-                            $cache->delete(common_cache_key('user:notices_with_friends:' . $member->profile_id));
+                            $cache->delete(common_cache_key('notice_inbox:by_user:' . $member->profile_id));
                             if ($blowLast) {
-                                $cache->delete(common_cache_key('user:notices_with_friends:' . $member->profile_id . ';last'));
+                                $cache->delete(common_cache_key('notice_inbox:by_user:' . $member->profile_id . ';last'));
                             }
                         }
                     }
@@ -352,9 +353,9 @@ class Notice extends Memcached_DataObject
                          'WHERE subscription.subscribed = ' . $this->profile_id);
 
             while ($user->fetch()) {
-                $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+                $cache->delete(common_cache_key('notice_inbox:by_user:'.$user_id));
                 if ($blowLast) {
-                    $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id . ';last'));
+                    $cache->delete(common_cache_key('notice_inbox:by_user:'.$user_id.';last'));
                 }
             }
             $user->free();
@@ -613,6 +614,26 @@ class Notice extends Memcached_DataObject
         return $wrapper;
     }
 
+    function getStreamByIds($ids)
+    {
+        $cache = common_memcache();
+
+        if (!empty($cache)) {
+            $notices = array();
+            foreach ($ids as $id) {
+                $notices[] = Notice::staticGet('id', $id);
+            }
+            return new ArrayWrapper($notices);
+        } else {
+            $notice = new Notice();
+            $notice->whereAdd('id in (' . implode(', ', $ids) . ')');
+            $notice->orderBy('id DESC');
+
+            $notice->find();
+            return $notice;
+        }
+    }
+
     function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
     {
 
diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index 81ddb45385..162da74fee 100644
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -21,7 +21,11 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Notice_inbox extends Memcached_DataObject 
+// We keep 5 pages of inbox notices in memcache, +1 for pagination check
+
+define('INBOX_CACHE_WINDOW', 101);
+
+class Notice_inbox extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -38,4 +42,97 @@ class Notice_inbox extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    function stream($user_id, $offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
+    {
+        $cache = common_memcache();
+
+        if (empty($cache) ||
+            $since_id != 0 || $before_id != 0 || !is_null($since) ||
+            ($offset + $limit) > INBOX_CACHE_WINDOW) {
+            common_debug('Doing direct DB hit for notice_inbox since the params are screwy.');
+            return Notice_inbox::_streamDirect($user_id, $offset, $limit, $since_id, $before_id, $since);
+        }
+
+        $idkey = common_cache_key('notice_inbox:by_user:'.$user_id);
+
+        $idstr = $cache->get($idkey);
+
+        if (!empty($idstr)) {
+            // Cache hit! Woohoo!
+            common_debug('Cache hit for notice_inbox.');
+            $window = explode(',', $idstr);
+            $ids = array_slice($window, $offset, $limit);
+            return $ids;
+        }
+
+        $laststr = common_cache_key($idkey.';last');
+
+        if (!empty($laststr)) {
+            common_debug('Cache hit for notice_inbox on last item.');
+
+            $window = explode(',', $laststr);
+            $last_id = $window[0];
+            $new_ids = Notice_inbox::_streamDirect($user_id, 0, INBOX_CACHE_WINDOW,
+                                                   $last_id, null, null);
+
+            $new_window = array_merge($new_ids, $window);
+
+            $new_windowstr = implode(',', $new_window);
+
+            $result = $cache->set($idkey, $new_windowstr);
+            $result = $cache->set($idkey . ';last', $new_windowstr);
+
+            $ids = array_slice($new_window, $offset, $limit);
+
+            return $ids;
+        }
+
+        $window = Notice_inbox::_streamDirect($user_id, 0, INBOX_CACHE_WINDOW,
+                                              null, null, null);
+
+        $windowstr = implode(',', $new_window);
+
+        $result = $cache->set($idkey, $windowstr);
+        $result = $cache->set($idkey . ';last', $windowstr);
+
+        $ids = array_slice($window, $offset, $limit);
+
+        return $ids;
+    }
+
+    function _streamDirect($user_id, $offset, $limit, $since_id, $before_id, $since)
+    {
+        $inbox = new Notice_inbox();
+
+        $inbox->user_id = $user_id;
+
+        if ($since_id != 0) {
+            $inbox->whereAdd('notice_id > ' . $since_id);
+        }
+
+        if ($before_id != 0) {
+            $inbox->whereAdd('notice_id < ' . $before_id);
+        }
+
+        if (!is_null($since)) {
+            $inbox->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
+        }
+
+        $inbox->orderBy('notice_id DESC');
+
+        if (!is_null($offset)) {
+            $inbox->limit($offset, $limit);
+        }
+
+        $ids = array();
+
+        if ($inbox->find()) {
+            while ($inbox->fetch()) {
+                $ids[] = $inbox->notice_id;
+            }
+        }
+
+        return $ids;
+    }
 }
diff --git a/classes/User.php b/classes/User.php
index 098381f738..ce7ea1464f 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -451,34 +451,9 @@ class User extends Memcached_DataObject
         } else if ($enabled === true ||
                    ($enabled == 'transitional' && $this->inboxed == 1)) {
 
-            $cache = common_memcache();
+            $ids = Notice_inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since);
 
-            if (!empty($cache)) {
-
-                # Get the notices out of the cache
-
-                $notices = $cache->get(common_cache_key($cachekey));
-
-                # On a cache hit, return a DB-object-like wrapper
-
-                if ($notices !== false) {
-                    $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit));
-                    return $wrapper;
-                }
-            }
-
-            $inbox = Notice_inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since);
-
-            $ids = array();
-
-            while ($inbox->fetch()) {
-                $ids[] = $inbox->notice_id;
-            }
-
-            $inbox->free();
-            unset($inbox);
-
-            return Notice::getStreamByIds($ids, 'user:notices_with_friends:' . $this->id);
+            return Notice::getStreamByIds($ids);
         }
     }
 

From fe53e780be5db4ceb2831a1d69faec6130a10deb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 28 Apr 2009 13:31:56 -0400
Subject: [PATCH 44/49] Remove some debug comments in query-by-id

---
 classes/Notice.php       | 5 ++---
 classes/Notice_inbox.php | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index b087c94bc4..49d0939c1a 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -215,7 +215,6 @@ class Notice extends Memcached_DataObject
             if (common_config('queue', 'enabled')) {
                 $notice->blowAuthorCaches();
             } else {
-                common_debug("Blowing caches for new notice.");
                 $notice->blowCaches();
             }
         }
@@ -353,9 +352,9 @@ class Notice extends Memcached_DataObject
                          'WHERE subscription.subscribed = ' . $this->profile_id);
 
             while ($user->fetch()) {
-                $cache->delete(common_cache_key('notice_inbox:by_user:'.$user_id));
+                $cache->delete(common_cache_key('notice_inbox:by_user:'.$user->id));
                 if ($blowLast) {
-                    $cache->delete(common_cache_key('notice_inbox:by_user:'.$user_id.';last'));
+                    $cache->delete(common_cache_key('notice_inbox:by_user:'.$user->id.';last'));
                 }
             }
             $user->free();
diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index 162da74fee..f321370380 100644
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -50,7 +50,6 @@ class Notice_inbox extends Memcached_DataObject
         if (empty($cache) ||
             $since_id != 0 || $before_id != 0 || !is_null($since) ||
             ($offset + $limit) > INBOX_CACHE_WINDOW) {
-            common_debug('Doing direct DB hit for notice_inbox since the params are screwy.');
             return Notice_inbox::_streamDirect($user_id, $offset, $limit, $since_id, $before_id, $since);
         }
 
@@ -60,7 +59,6 @@ class Notice_inbox extends Memcached_DataObject
 
         if (!empty($idstr)) {
             // Cache hit! Woohoo!
-            common_debug('Cache hit for notice_inbox.');
             $window = explode(',', $idstr);
             $ids = array_slice($window, $offset, $limit);
             return $ids;
@@ -69,8 +67,6 @@ class Notice_inbox extends Memcached_DataObject
         $laststr = common_cache_key($idkey.';last');
 
         if (!empty($laststr)) {
-            common_debug('Cache hit for notice_inbox on last item.');
-
             $window = explode(',', $laststr);
             $last_id = $window[0];
             $new_ids = Notice_inbox::_streamDirect($user_id, 0, INBOX_CACHE_WINDOW,

From e85cddba45c2ce02d135f00acdcfa37cb9168130 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 28 Apr 2009 23:31:00 -0700
Subject: [PATCH 45/49] Ticket #1428 - Changed replies API method to
 "mentions".

---
 actions/twitapistatuses.php | 38 ++++++++++++++++++++-----------------
 lib/router.php              |  4 ++--
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 323c4f1f88..3abeba3672 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -144,10 +144,10 @@ class TwitapistatusesAction extends TwitterapiAction
             break;
          case 'atom':
             if (isset($apidata['api_arg'])) {
-                $selfuri = $selfuri = common_root_url() .
+                $selfuri = common_root_url() .
                     'api/statuses/friends_timeline/' . $apidata['api_arg'] . '.atom';
             } else {
-                $selfuri = $selfuri = common_root_url() .
+                $selfuri = common_root_url() .
                     'api/statuses/friends_timeline.atom';
             }
             $this->show_atom_timeline($notice, $title, $id, $link, $subtitle, null, $selfuri);
@@ -231,10 +231,10 @@ class TwitapistatusesAction extends TwitterapiAction
             break;
          case 'atom':
             if (isset($apidata['api_arg'])) {
-                $selfuri = $selfuri = common_root_url() .
+                $selfuri = common_root_url() .
                     'api/statuses/user_timeline/' . $apidata['api_arg'] . '.atom';
             } else {
-                $selfuri = $selfuri = common_root_url() .
+                $selfuri = common_root_url() .
                  'api/statuses/user_timeline.atom';
             }
             $this->show_atom_timeline($notice, $title, $id, $link, $subtitle, $suplink, $selfuri);
@@ -344,7 +344,7 @@ class TwitapistatusesAction extends TwitterapiAction
         $this->show($args, $apidata);
     }
 
-    function replies($args, $apidata)
+    function mentions($args, $apidata)
     {
 
         parent::handle($args);
@@ -360,11 +360,13 @@ class TwitapistatusesAction extends TwitterapiAction
         $profile = $user->getProfile();
 
         $sitename = common_config('site', 'name');
-        $title = sprintf(_('%1$s / Updates replying to %2$s'), $sitename, $user->nickname);
+        $title = sprintf(_('%1$s / Updates mentioning %2$s'),
+            $sitename, $user->nickname);
         $taguribase = common_config('integration', 'taguri');
-        $id = "tag:$taguribase:Replies:".$user->id;
+        $id = "tag:$taguribase:Mentions:".$user->id;
         $link = common_local_url('replies', array('nickname' => $user->nickname));
-        $subtitle = sprintf(_('%1$s updates that reply to updates from %2$s / %3$s.'), $sitename, $user->nickname, $profile->getBestName());
+        $subtitle = sprintf(_('%1$s updates that reply to updates from %2$s / %3$s.'),
+            $sitename, $user->nickname, $profile->getBestName());
 
         if (!$page) {
             $page = 1;
@@ -385,7 +387,8 @@ class TwitapistatusesAction extends TwitterapiAction
 
         $since = strtotime($this->arg('since'));
 
-        $notice = $user->getReplies((($page-1)*20), $count, $since_id, $before_id, $since);
+        $notice = $user->getReplies((($page-1)*20),
+            $count, $since_id, $before_id, $since);
         $notices = array();
 
         while ($notice->fetch()) {
@@ -400,14 +403,10 @@ class TwitapistatusesAction extends TwitterapiAction
             $this->show_rss_timeline($notices, $title, $link, $subtitle);
             break;
          case 'atom':
-             if (isset($apidata['api_arg'])) {
-                 $selfuri = $selfuri = common_root_url() .
-                     'api/statuses/replies/' . $apidata['api_arg'] . '.atom';
-             } else {
-                 $selfuri = $selfuri = common_root_url() .
-                  'api/statuses/replies.atom';
-             }
-            $this->show_atom_timeline($notices, $title, $id, $link, $subtitle, null, $selfuri);
+            $selfuri = common_root_url() .
+                ltrim($_SERVER['QUERY_STRING'], 'p=');
+            $this->show_atom_timeline($notices, $title, $id, $link, $subtitle,
+                null, $selfuri);
             break;
          case 'json':
             $this->show_json_timeline($notices);
@@ -418,6 +417,11 @@ class TwitapistatusesAction extends TwitterapiAction
 
     }
 
+    function replies($args, $apidata)
+    {
+        call_user_func(array($this, 'mentions'), $args, $apidata);
+    }
+
     function show($args, $apidata)
     {
         parent::handle($args);
diff --git a/lib/router.php b/lib/router.php
index 6fb2f94872..12590b790d 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -231,12 +231,12 @@ class Router
         $m->connect('api/statuses/:method',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+                    array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|mentions|friends|followers|featured)(\.(atom|rss|xml|json))?'));
 
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(user_timeline|friends_timeline|replies|show|destroy|friends|followers)'));
+                    array('method' => '(user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         // users
 

From 10ef8a2f7112a83188e9702d480abd3c6062c26c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 29 Apr 2009 11:27:45 -0400
Subject: [PATCH 46/49] Move algorithm for caching to Notice class

Moved the algorithm for notice stream caching to the Notice class.
---
 classes/Notice.php       | 55 +++++++++++++++++++++++++++++++++++++++
 classes/Notice_inbox.php | 56 ++++------------------------------------
 2 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 49d0939c1a..faabb1e140 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -967,4 +967,59 @@ class Notice extends Memcached_DataObject
                                     array('notice' => $this->id));
         }
     }
+
+    function stream($fn, $args, $cachekey, $offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
+    {
+        $cache = common_memcache();
+
+        if (empty($cache) ||
+            $since_id != 0 || $before_id != 0 || !is_null($since) ||
+            ($offset + $limit) > NOTICE_CACHE_WINDOW) {
+            return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id,
+                                                                      $before_id, $since)));
+        }
+
+        $idkey = common_cache_key($cachekey);
+
+        $idstr = $cache->get($idkey);
+
+        if (!empty($idstr)) {
+            // Cache hit! Woohoo!
+            $window = explode(',', $idstr);
+            $ids = array_slice($window, $offset, $limit);
+            return $ids;
+        }
+
+        $laststr = common_cache_key($idkey.';last');
+
+        if (!empty($laststr)) {
+            $window = explode(',', $laststr);
+            $last_id = $window[0];
+            $new_ids = call_user_func_array($fn, array_merge($args, array(0, NOTICE_CACHE_WINDOW,
+                                                                          $last_id, 0, null)));
+
+            $new_window = array_merge($new_ids, $window);
+
+            $new_windowstr = implode(',', $new_window);
+
+            $result = $cache->set($idkey, $new_windowstr);
+            $result = $cache->set($idkey . ';last', $new_windowstr);
+
+            $ids = array_slice($new_window, $offset, $limit);
+
+            return $ids;
+        }
+
+        $window = call_user_func_array($fn, array_merge($args, array(0, NOTICE_CACHE_WINDOW,
+                                                                     0, 0, null)));
+
+        $windowstr = implode(',', $new_window);
+
+        $result = $cache->set($idkey, $windowstr);
+        $result = $cache->set($idkey . ';last', $windowstr);
+
+        $ids = array_slice($window, $offset, $limit);
+
+        return $ids;
+    }
 }
diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index f321370380..dec14b0d18 100644
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -43,58 +43,12 @@ class Notice_inbox extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function stream($user_id, $offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
+    function stream($user_id, $offset, $limit, $since_id, $before_id, $since)
     {
-        $cache = common_memcache();
-
-        if (empty($cache) ||
-            $since_id != 0 || $before_id != 0 || !is_null($since) ||
-            ($offset + $limit) > INBOX_CACHE_WINDOW) {
-            return Notice_inbox::_streamDirect($user_id, $offset, $limit, $since_id, $before_id, $since);
-        }
-
-        $idkey = common_cache_key('notice_inbox:by_user:'.$user_id);
-
-        $idstr = $cache->get($idkey);
-
-        if (!empty($idstr)) {
-            // Cache hit! Woohoo!
-            $window = explode(',', $idstr);
-            $ids = array_slice($window, $offset, $limit);
-            return $ids;
-        }
-
-        $laststr = common_cache_key($idkey.';last');
-
-        if (!empty($laststr)) {
-            $window = explode(',', $laststr);
-            $last_id = $window[0];
-            $new_ids = Notice_inbox::_streamDirect($user_id, 0, INBOX_CACHE_WINDOW,
-                                                   $last_id, null, null);
-
-            $new_window = array_merge($new_ids, $window);
-
-            $new_windowstr = implode(',', $new_window);
-
-            $result = $cache->set($idkey, $new_windowstr);
-            $result = $cache->set($idkey . ';last', $new_windowstr);
-
-            $ids = array_slice($new_window, $offset, $limit);
-
-            return $ids;
-        }
-
-        $window = Notice_inbox::_streamDirect($user_id, 0, INBOX_CACHE_WINDOW,
-                                              null, null, null);
-
-        $windowstr = implode(',', $new_window);
-
-        $result = $cache->set($idkey, $windowstr);
-        $result = $cache->set($idkey . ';last', $windowstr);
-
-        $ids = array_slice($window, $offset, $limit);
-
-        return $ids;
+        return Notice::stream(array('Notice_inbox', '_streamDirect'),
+                              array($user_id),
+                              'notice_inbox:by_user:'.$user_id,
+                              $offset, $limit, $since_id, $before_id, $since);
     }
 
     function _streamDirect($user_id, $offset, $limit, $since_id, $before_id, $since)

From a4d959b8a2254d173bdf45f418f6add9f6f62cda Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 29 Apr 2009 12:05:31 -0400
Subject: [PATCH 47/49] Public stream uses IDs method

Public stream now uses IDs method
---
 classes/Notice.php | 55 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index faabb1e140..6a7522bd32 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -635,25 +635,58 @@ class Notice extends Memcached_DataObject
 
     function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
     {
+        $ids = Notice::stream(array('Notice', '_publicStreamDirect'),
+                              array(),
+                              'public',
+                              $offset, $limit, $since_id, $before_id, $since);
 
-        $parts = array();
+        return Notice::getStreamByIds($ids);
+    }
 
-        $qry = 'SELECT * FROM notice ';
+    function _publicStreamDirect($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
+    {
+        $notice = new Notice();
+
+        $notice->selectAdd(); // clears it
+        $notice->selectAdd('id');
+
+        $notice->orderBy('id DESC');
+
+        if (!is_null($offset)) {
+            $notice->limit($offset, $limit);
+        }
 
         if (common_config('public', 'localonly')) {
-            $parts[] = 'is_local = 1';
+            $notice->whereAdd('is_local = 1');
         } else {
             # -1 == blacklisted
-            $parts[] = 'is_local != -1';
+            $notice->whereAdd('is_local != -1');
         }
 
-        if ($parts) {
-            $qry .= ' WHERE ' . implode(' AND ', $parts);
+        if ($since_id != 0) {
+            $notice->whereAdd('id > ' . $since_id);
         }
 
-        return Notice::getStream($qry,
-                                 'public',
-                                 $offset, $limit, $since_id, $before_id, null, $since);
+        if ($before_id != 0) {
+            $notice->whereAdd('id < ' . $before_id);
+        }
+
+        if (!is_null($since)) {
+            $notice->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
+        }
+
+        $ids = array();
+
+        if ($notice->find()) {
+            while ($notice->fetch()) {
+                $ids[] = $notice->id;
+            }
+        }
+
+        $notice->free();
+        $notice = NULL;
+
+        return $ids;
     }
 
     function addToInboxes()
@@ -990,7 +1023,7 @@ class Notice extends Memcached_DataObject
             return $ids;
         }
 
-        $laststr = common_cache_key($idkey.';last');
+        $laststr = $cache->get($idkey.';last');
 
         if (!empty($laststr)) {
             $window = explode(',', $laststr);
@@ -1013,7 +1046,7 @@ class Notice extends Memcached_DataObject
         $window = call_user_func_array($fn, array_merge($args, array(0, NOTICE_CACHE_WINDOW,
                                                                      0, 0, null)));
 
-        $windowstr = implode(',', $new_window);
+        $windowstr = implode(',', $window);
 
         $result = $cache->set($idkey, $windowstr);
         $result = $cache->set($idkey . ';last', $windowstr);

From 8295402fb30a3854bae3b9d6c457c7c0e432c51a Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Wed, 29 Apr 2009 13:16:52 -0700
Subject: [PATCH 48/49] Added 'mentions' the the list of API methods requiring
 bare auth

---
 actions/api.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/actions/api.php b/actions/api.php
index d2f0a2eff0..8762b4bcd3 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -130,6 +130,7 @@ class ApiAction extends Action
                                  'statuses/friends_timeline',
                                  'statuses/friends',
                                  'statuses/replies',
+                                 'statuses/mentions',
                                  'statuses/followers',
                                  'favorites/favorites');
 

From b79fef307481b36b4d04dbabb54e3f6d9edf6896 Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Wed, 29 Apr 2009 23:43:42 +0100
Subject: [PATCH 49/49] Fixed remote subscription, broken in
 fc6cedd2227d9d560736e494f431e2b40b26b45c

---
 actions/accesstoken.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index bb68d3314d..46b43c7021 100644
--- a/actions/accesstoken.php
+++ b/actions/accesstoken.php
@@ -59,7 +59,7 @@ class AccesstokenAction extends Action
         try {
             common_debug('getting request from env variables', __FILE__);
             common_remove_magic_from_request();
-            $req = OAuthRequest::from_request('POST', common_locale_url('accesstoken'));
+            $req = OAuthRequest::from_request('POST', common_local_url('accesstoken'));
             common_debug('getting a server', __FILE__);
             $server = omb_oauth_server();
             common_debug('fetching the access token', __FILE__);