From 51ac34e80c5a99008b1a945b2c00b6dbfdde1529 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 26 Jul 2009 13:06:38 -0600
Subject: [PATCH 001/247] first version of deleting users

---
 classes/Profile.php | 75 +++++++++++++++++++++++++++++++++++++++++++++
 classes/User.php    | 43 ++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/classes/Profile.php b/classes/Profile.php
index f926b2cef2..0ee6fa657f 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -461,4 +461,79 @@ class Profile extends Memcached_DataObject
             $c->delete(common_cache_key('profile:notice_count:'.$this->id));
         }
     }
+
+    function delete()
+    {
+        $this->_deleteNotices();
+        $this->_deleteSubscriptions();
+        $this->_deleteMessages();
+        $this->_deleteTags();
+        $this->_deleteBlocks();
+
+        $related = array('Avatar',
+                         'Reply',
+                         'Group_member',
+                         );
+
+        foreach ($related as $cls) {
+            $inst = new $cls();
+            $inst->profile_id = $this->id;
+            $inst->delete();
+        }
+
+        parent::delete();
+    }
+
+    function _deleteNotices()
+    {
+        $notice = new Notice();
+        $notice->profile_id = $this->id;
+
+        if ($notice->find()) {
+            while ($notice->fetch()) {
+                $other = clone($notice);
+                $other->delete();
+            }
+        }
+    }
+
+    function _deleteSubscriptions()
+    {
+        $sub = new Subscription();
+        $sub->subscriber = $this->id;
+        $sub->delete();
+
+        $subd = new Subscription();
+        $subd->subscribed = $this->id;
+        $subd->delete();
+    }
+
+    function _deleteMessages()
+    {
+        $msg = new Message();
+        $msg->from_profile = $this->id;
+        $msg->delete();
+
+        $msg = new Message();
+        $msg->to_profile = $this->id;
+        $msg->delete();
+    }
+
+    function _deleteTags()
+    {
+        $tag = new Profile_tag();
+        $tag->tagged = $this->id;
+        $msg->delete();
+    }
+
+    function _deleteBlocks()
+    {
+        $block = new Profile_block();
+        $block->blocked = $this->id;
+        $block->delete();
+
+        $block = new Group_block();
+        $block->blocked = $this->id;
+        $block->delete();
+    }
 }
diff --git a/classes/User.php b/classes/User.php
index bea47a3b05..991e9c18fb 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -685,4 +685,47 @@ class User extends Memcached_DataObject
     {
         return Design::staticGet('id', $this->design_id);
     }
+
+    function delete()
+    {
+        $profile = $this->getProfile();
+        $profile->delete();
+
+        $related = array('Fave',
+                         'User_openid',
+                         'Confirm_address',
+                         'Remember_me',
+                         'Foreign_link',
+                         'Invitation',
+                         );
+
+        if (common_config('inboxes', 'enabled')) {
+            $related[] = 'Notice_inbox';
+        }
+
+        foreach ($related as $cls) {
+            $inst = new $cls();
+            $inst->user_id = $this->id;
+            $inst->delete();
+        }
+
+        $this->_deleteTags();
+
+        parent::delete();
+    }
+
+    function _deleteTags()
+    {
+        $tag = new Profile_tag();
+        $tag->tagger = $this->id;
+        $tag->delete();
+    }
+
+    function _deleteBlocks()
+    {
+        $block = new Profile_block();
+        $block->blocker = $this->id;
+        $block->delete();
+        // XXX delete group block? Reset blocker?
+    }
 }

From 59f47fab4a00a4fc8f3dfd27367e248e4bcbd957 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 28 Aug 2009 10:42:34 -0700
Subject: [PATCH 002/247] Status_network had wrong ini file

---
 classes/Status_network.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Status_network.php b/classes/Status_network.php
index d526cb4d61..fe4f0b0c58 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -54,7 +54,7 @@ class Status_network extends DB_DataObject
         global $config;
 
         $config['db']['database_'.$dbname] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname";
-        $config['db']['ini_'.$dbname] = INSTALLDIR.'/classes/statusnet.ini';
+        $config['db']['ini_'.$dbname] = INSTALLDIR.'/classes/status_network.ini';
         $config['db']['table_status_network'] = $dbname;
 
         self::$cache = new Memcache();

From 55972f59f6dd3048761f72c16e3fffac3fb29d47 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 29 Aug 2009 11:59:54 -0700
Subject: [PATCH 003/247] remove Notice::gc() for now

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

diff --git a/classes/Notice.php b/classes/Notice.php
index 89afe9d1dc..7d05026267 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -897,7 +897,8 @@ class Notice extends Memcached_DataObject
                 $qry .= '('.$id.', '.$this->id.', '.$source.", '".$this->created. "') ";
                 $cnt++;
                 if (rand() % NOTICE_INBOX_SOFT_LIMIT == 0) {
-                    Notice_inbox::gc($id);
+                    // FIXME: Causes lag in replicated servers
+                    // Notice_inbox::gc($id);
                 }
                 if ($cnt >= MAX_BOXCARS) {
                     $inbox = new Notice_inbox();

From 84e11e8a1727404db558b2e9210f57b6f4f1786d Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 31 Aug 2009 15:33:23 -0400
Subject: [PATCH 004/247] Fix attachment saving

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

diff --git a/lib/util.php b/lib/util.php
index 87d5800f69..0b696662c1 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -495,7 +495,7 @@ function callback_helper($matches, $callback, $notice_id) {
     if(empty($notice_id)){
         $result = call_user_func_array($callback,$url);
     }else{
-        $result = call_user_func_array($callback, array($url,$notice_id) );
+        $result = call_user_func_array($callback, array(array($url,$notice_id)) );
     }
     return substr($matches[0],0,$left) . $result . substr($matches[0],$right);
 }

From cae1072c0d5168c1e01c4ac00a8ee0ad735ff969 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 31 Aug 2009 15:49:11 -0400
Subject: [PATCH 005/247] Fix typo in Stomp

Thanks Marcel|HSD
---
 extlib/Stomp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extlib/Stomp.php b/extlib/Stomp.php
index 9e1c97b3b3..abd9cba62b 100644
--- a/extlib/Stomp.php
+++ b/extlib/Stomp.php
@@ -454,7 +454,7 @@ class Stomp
      */
     public function disconnect ()
     {
-		$header = array();
+		$headers = array();
 
 		if ($this->clientId != null) {
 			$headers["client-id"] = $this->clientId;

From ba199ad4ec47e6b0c067a3b2a15882d3836ea009 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Mon, 31 Aug 2009 17:52:45 +0000
Subject: [PATCH 006/247] Removed <dl> structure from
 MailboxAction::showMessage. Same as committ
 e0b877b26c5e93809b2a53b6c46326d5e31fa0e8.

---
 lib/mailbox.php | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/lib/mailbox.php b/lib/mailbox.php
index a09bf1060a..e1d384a063 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -213,26 +213,20 @@ class MailboxAction extends CurrentUserDesignAction
         }
 
         $this->elementStart('div', 'entry-content');
-        $this->elementStart('dl', 'timestamp');
-        $this->element('dt', null, _('Published'));
-        $this->elementStart('dd', null);
-        $dt = common_date_iso8601($message->created);
         $this->elementStart('a', array('rel' => 'bookmark',
+                                       'class' => 'timestamp',
                                        'href' => $messageurl));
+        $dt = common_date_iso8601($message->created);
         $this->element('abbr', array('class' => 'published',
                                      'title' => $dt),
                                common_date_string($message->created));
         $this->elementEnd('a');
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
         if ($message->source) {
-            $this->elementStart('dl', 'device');
-            $this->elementStart('dt');
-            $this->text(_('From'));
-            $this->elementEnd('dt');
-            $this->showSource($message->source);
-            $this->elementEnd('dl');
+            $this->elementStart('span', 'source');
+            $this->text(_('from'));
+            $this->element('span', 'device', $this->showSource($message->source));
+            $this->elementEnd('span');
         }
         $this->elementEnd('div');
 
@@ -277,18 +271,18 @@ class MailboxAction extends CurrentUserDesignAction
         case 'mail':
         case 'omb':
         case 'api':
-            $this->element('dd', null, $source_name);
+            $this->element('span', 'device', $source_name);
             break;
         default:
             $ns = Notice_source::staticGet($source);
             if ($ns) {
-                $this->elementStart('dd', null);
+                $this->elementStart('span', 'device');
                 $this->element('a', array('href' => $ns->url,
-                                          'rel' => 'external'),
-                               $ns->name);
-                $this->elementEnd('dd');
+                                               'rel' => 'external'),
+                                    $ns->name);
+                $this->elementEnd('span');
             } else {
-                $this->element('dd', null, $source_name);
+                $this->out->element('span', 'device', $source_name);
             }
             break;
         }

From 0a922e0ba464975c2216f3df9163f08e786a5f3d Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 1 Sep 2009 19:00:18 +0000
Subject: [PATCH 007/247] Stop requeuing notices not bound for Twitter.

---
 lib/twitter.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/twitter.php b/lib/twitter.php
index b734d22d8e..e049dc8df0 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -160,6 +160,8 @@ function broadcast_twitter($notice)
             return broadcast_basicauth($notice, $flink);
         }
     }
+
+    return true;
 }
 
 function broadcast_oauth($notice, $flink) {

From 4c4fbd006d986bbc932938a37b7532d89a0e4166 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Sat, 29 Aug 2009 06:20:19 +0000
Subject: [PATCH 008/247] Fix error in log msg format specifier

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

diff --git a/lib/twitter.php b/lib/twitter.php
index e049dc8df0..455f7e7ef0 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -196,7 +196,7 @@ function broadcast_oauth($notice, $flink) {
 
             $errmsg = sprintf('cURL error trying to send notice to Twitter ' .
                               'for user %1$s (user id: %2$s) - ' .
-                              'code: %3$s message: $4$s.',
+                              'code: %3$s message: %4$s.',
                               $user->nickname, $user->id,
                               $e->getCode(), $e->getMessage());
             common_log(LOG_WARNING, $errmsg);
@@ -254,7 +254,7 @@ function broadcast_basicauth($notice, $flink)
 
             $errmsg = sprintf('cURL error trying to send notice to Twitter ' .
                               'for user %1$s (user id: %2$s) - ' .
-                              'code: %3$s message: $4$s.',
+                              'code: %3$s message: %4$s.',
                               $user->nickname, $user->id,
                               $e->getCode(), $e->getMessage());
             common_log(LOG_WARNING, $errmsg);

From e9bd6c8be5ffbc36f441fa9682c1fc608e33d3cf Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Wed, 2 Sep 2009 00:50:41 +0000
Subject: [PATCH 009/247] Better error handling

---
 lib/twitter.php | 100 ++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 58 deletions(-)

diff --git a/lib/twitter.php b/lib/twitter.php
index 455f7e7ef0..676c9b20a2 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -175,34 +175,7 @@ function broadcast_oauth($notice, $flink) {
     try {
         $status = $client->statusesUpdate($statustxt);
     } catch (OAuthClientCurlException $e) {
-
-        if ($e->getMessage() == 'The requested URL returned error: 401') {
-
-            $errmsg = sprintf('User %1$s (user id: %2$s) has an invalid ' .
-                              'Twitter OAuth access token.',
-                              $user->nickname, $user->id);
-            common_log(LOG_WARNING, $errmsg);
-
-            // Bad auth token! We need to delete the foreign_link
-            // to Twitter and inform the user.
-
-            remove_twitter_link($flink);
-            return true;
-
-        } else {
-
-            // Some other error happened, so we should probably
-            // try to send again later.
-
-            $errmsg = sprintf('cURL error trying to send notice to Twitter ' .
-                              'for user %1$s (user id: %2$s) - ' .
-                              'code: %3$s message: %4$s.',
-                              $user->nickname, $user->id,
-                              $e->getCode(), $e->getMessage());
-            common_log(LOG_WARNING, $errmsg);
-
-            return false;
-        }
+        return process_error($e, $flink);
     }
 
     if (empty($status)) {
@@ -210,9 +183,9 @@ function broadcast_oauth($notice, $flink) {
         // This could represent a failure posting,
         // or the Twitter API might just be behaving flakey.
 
-        $errmsg = sprintf('No data returned by Twitter API when ' .
-                         'trying to send update for %1$s (user id %2$s).',
-                         $user->nickname, $user->id);
+        $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' .
+                          'trying to send update for %1$s (user id %2$s).',
+                          $user->nickname, $user->id);
         common_log(LOG_WARNING, $errmsg);
 
         return false;
@@ -220,7 +193,7 @@ function broadcast_oauth($notice, $flink) {
 
     // Notice crossed the great divide
 
-    $msg = sprintf('Twitter bridge posted notice %s to Twitter using OAuth.',
+    $msg = sprintf('Twitter bridge - posted notice %s to Twitter using OAuth.',
                    $notice->id);
     common_log(LOG_INFO, $msg);
 
@@ -239,46 +212,57 @@ function broadcast_basicauth($notice, $flink)
     try {
         $status = $client->statusesUpdate($statustxt);
     } catch (BasicAuthCurlException $e) {
-
-        if ($e->getMessage() == 'The requested URL returned error: 401') {
-
-            $errmsg = sprintf('User %1$s (user id: %2$s) has an invalid ' .
-                              'Twitter screen_name/password combo.',
-                              $user->nickname, $user->id);
-            common_log(LOG_WARNING, $errmsg);
-
-            remove_twitter_link($flink);
-            return true;
-
-        } else {
-
-            $errmsg = sprintf('cURL error trying to send notice to Twitter ' .
-                              'for user %1$s (user id: %2$s) - ' .
-                              'code: %3$s message: %4$s.',
-                              $user->nickname, $user->id,
-                              $e->getCode(), $e->getMessage());
-            common_log(LOG_WARNING, $errmsg);
-
-            return false;
-        }
+        return process_error($e, $flink);
     }
 
     if (empty($status)) {
 
-        $errmsg = sprintf('No data returned by Twitter API when ' .
-                         'trying to send update for %1$s (user id %2$s).',
-                         $user->nickname, $user->id);
+        $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' .
+                          'trying to send update for %1$s (user id %2$s).',
+                          $user->nickname, $user->id);
         common_log(LOG_WARNING, $errmsg);
 
         return false;
     }
 
-    $msg = sprintf('Twitter bridge posted notice %s to Twitter using basic auth.',
+    $msg = sprintf('Twitter bridge - posted notice %s to Twitter using basic auth.',
                    $notice->id);
     common_log(LOG_INFO, $msg);
 
     return true;
+}
 
+function process_error($e, $flink)
+{
+    $user        = $flink->getUser();
+    $errmsg      = $e->getMessage();
+    $delivered   = false;
+
+    switch($errmsg) {
+     case 'The requested URL returned error: 401':
+        $logmsg = sprintf('Twiter bridge - User %1$s (user id: %2$s) has an invalid ' .
+                          'Twitter screen_name/password combo or an invalid acesss token.',
+                          $user->nickname, $user->id);
+        $delivered = true;
+        remove_twitter_link($flink);
+        break;
+     case 'The requested URL returned error: 403':
+        $logmsg = sprintf('Twitter bridge - User %1$s (user id: %2$s) has exceeded ' .
+                          'his/her Twitter request limit.',
+                          $user->nickname, $user->id);
+        break;
+     default:
+        $logmsg = sprintf('Twitter bridge - cURL error trying to send notice to Twitter ' .
+                          'for user %1$s (user id: %2$s) - ' .
+                          'code: %3$s message: %4$s.',
+                          $user->nickname, $user->id,
+                          $e->getCode(), $e->getMessage());
+        break;
+    }
+
+    common_log(LOG_WARNING, $logmsg);
+
+    return $delivered;
 }
 
 function format_status($notice)

From aeef78b6ca9473f464bcd22cb9a56be373bdc845 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Wed, 2 Sep 2009 00:24:30 +0000
Subject: [PATCH 010/247] Fixed bug in which you cannot turn off importing
 friends timelines flag

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

diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 563d867a49..89169941eb 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -165,7 +165,7 @@ class TwittersettingsAction extends ConnectSettingsAction
                                 ($flink->noticesync & FOREIGN_NOTICE_RECV) :
                                 false);
                 $this->elementEnd('li');
-
+            } else {
                 // preserve setting even if bidrection bridge toggled off
 
                 if ($flink && ($flink->noticesync & FOREIGN_NOTICE_RECV)) {

From 3504ef5721da743799776fb8c94c6416c2d1ba06 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 10 Sep 2009 12:11:33 -0400
Subject: [PATCH 011/247] Fix HTML validation

---
 doc-src/bookmarklet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc-src/bookmarklet b/doc-src/bookmarklet
index 6cd2c08f90..7958ea5e99 100644
--- a/doc-src/bookmarklet
+++ b/doc-src/bookmarklet
@@ -3,5 +3,5 @@ A bookmarklet is a small piece of javascript code used as a bookmark. This one w
 Drag-and-drop the following link to your bookmarks bar or right-click it and add it to your browser favorites to keep it handy.
 
 <MTMarkdownOptions output='raw'>
-<a href="javascript:var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=newnotice',l=d.location,e=encodeURIComponent,g=f+'&status_textarea=%22'+((e(s))?e(s):e(document.title))+'%22 from '+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=800,height=570')){l.href=g;}}a();void(0);">Post to %%site.name%%</a>
+<a href="javascript:var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=newnotice',l=d.location,e=encodeURIComponent,g=f+'&amp;status_textarea=%22'+((e(s))?e(s):e(document.title))+'%22 from '+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=800,height=570')){l.href=g;}}a();void(0);">Post to %%site.name%%</a>
 </MTMarkdownOptions>

From 584ea1b23c540cdd781f52eeecd6ad893f63c1a8 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 10 Sep 2009 12:13:43 -0400
Subject: [PATCH 012/247] Revert "If a shortened URL begins with http://, don't
 include it in the shortened url. Saves 7 characters, which is pretty awesome
 for 140 character max length notices."

This reverts commit e2848eb8621dd645fa68cb1641c0af1df5530408.

Downstream consumers of our notices (such as Friendfeed, Facebook, etc) don't have sophisticated URL detection, so a notice that reads: "check out ur1.ca/1" won't be linked. So the http:// prefix is
mandatory.
---
 lib/util.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 3e95d2bea3..256acf1993 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1414,9 +1414,6 @@ function common_shorten_url($long_url)
 
     curl_close($curlh);
 
-    if(substr($short_url,0,7)=='http://'){
-        $short_url = substr($short_url,7);
-    }
     return $short_url;
 }
 

From b46d2e7fe0b4129817d9c23006a5e2b7ffe5974c Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 10 Sep 2009 17:52:51 +0000
Subject: [PATCH 013/247] Markdown is not necessary

---
 doc-src/bookmarklet | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc-src/bookmarklet b/doc-src/bookmarklet
index 7958ea5e99..e5ded77023 100644
--- a/doc-src/bookmarklet
+++ b/doc-src/bookmarklet
@@ -2,6 +2,4 @@ A bookmarklet is a small piece of javascript code used as a bookmark. This one w
 
 Drag-and-drop the following link to your bookmarks bar or right-click it and add it to your browser favorites to keep it handy.
 
-<MTMarkdownOptions output='raw'>
 <a href="javascript:var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=newnotice',l=d.location,e=encodeURIComponent,g=f+'&amp;status_textarea=%22'+((e(s))?e(s):e(document.title))+'%22 from '+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=800,height=570')){l.href=g;}}a();void(0);">Post to %%site.name%%</a>
-</MTMarkdownOptions>

From 2a56245614f90221946ab918e820f6546133a212 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 10 Sep 2009 21:13:30 -0400
Subject: [PATCH 014/247] Re-use enclosure decision logic to decide if a link
 gets a paperclip/lightbox popup.

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

diff --git a/lib/util.php b/lib/util.php
index 256acf1993..292045928d 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -552,12 +552,13 @@ function common_linkify($url) {
     }
 
     if (!empty($f)) {
-        if (isset($f->filename)) {
+        if ($f->isEnclosure()) {
             $is_attachment = true;
             $attachment_id = $f->id;
-        } else { // if it has OEmbed info, it's an attachment, too
+        } else {
             $foe = File_oembed::staticGet('file_id', $f->id);
             if (!empty($foe)) {
+                // if it has OEmbed info, it's an attachment, too
                 $is_attachment = true;
                 $attachment_id = $f->id;
 

From 292bb7c4d8ca469447385e29a80f125e03284d70 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 10 Sep 2009 21:19:38 -0400
Subject: [PATCH 015/247] Allow @ signs in the path, querystring, and fragment
 parts of URLs

---
 lib/util.php               | 6 +++---
 tests/URLDetectionTest.php | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 292045928d..b831859e99 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -442,9 +442,9 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
         ')'.
         '(?:'.
             '(?:\:\d+)?'. //:port
-            '(?:/[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"]*)?'. // /path
-            '(?:\?[\pN\pL\$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"\/]*)?'. // ?query string
-            '(?:\#[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"\/\?\#]*)?'. // #fragment
+            '(?:/[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"@]*)?'. // /path
+            '(?:\?[\pN\pL\$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"@\/]*)?'. // ?query string
+            '(?:\#[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"\@/\?\#]*)?'. // #fragment
         ')(?<![\?\.\,\#\,])'.
     ')'.
     '#ixu';
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index 87b5376467..1c3f7cd96f 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -27,6 +27,8 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
         return array(
                      array('not a link :: no way',
                            'not a link :: no way'),
+                     array('link http://www.somesite.com/xyz/35637563@N00/52803365/ link',
+                           'link <a href="http://www.somesite.com/xyz/35637563@N00/52803365/" rel="external">http://www.somesite.com/xyz/35637563@N00/52803365/</a> link'),
                      array('http://127.0.0.1',
                            '<a href="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
                      array('127.0.0.1',

From 2a06f2ac5bac02dea23b63c8d256a17f316039c1 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 10 Sep 2009 21:21:01 -0400
Subject: [PATCH 016/247] If there is no mimetype set, the file shouldn't be
 considered an enclosure

---
 classes/File.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/File.php b/classes/File.php
index 96a4de6e8e..308d0a7717 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -201,7 +201,7 @@ class File extends Memcached_DataObject
         if(isset($this->filename)){
             return true;
         }
-        $notEnclosureMimeTypes = array('text/html','application/xhtml+xml');
+        $notEnclosureMimeTypes = array('text/html','application/xhtml+xml',null);
         $mimetype = strtolower($this->mimetype);
         $semicolon = strpos($mimetype,';');
         if($semicolon){

From 9e2705d9d3add426fae4ef998075dab72a736b34 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 11 Sep 2009 20:40:51 -0400
Subject: [PATCH 017/247] The site id was hardcoded inside the plugin code.
 Instead the piwikid is used now.

Fixes http://status.net/trac/ticket/1864

Thanks zmf
---
 plugins/PiwikAnalyticsPlugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index 85a24c1320..45a11dfe43 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -96,7 +96,7 @@ document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/ja
 </script>
 <script type="text/javascript">
 try {
-    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4);
+    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", $this->piwikId);
     piwikTracker.trackPageView();
     piwikTracker.enableLinkTracking();
 } catch( err ) {}
@@ -108,4 +108,4 @@ ENDOFPIWIK;
         $action->raw($piwikCode);
         return true;
     }
-}
\ No newline at end of file
+}

From a73162d3eb237046f89ab21e17a9424ac47cd66d Mon Sep 17 00:00:00 2001
From: Marcel van der Boom <marcel@hsdev.com>
Date: Tue, 8 Sep 2009 21:48:51 +0200
Subject: [PATCH 018/247] Silence the NOTICE log messages on port not defined,
 we deal with that properly, and most of the time it is indeed not define

---
 extlib/OAuth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extlib/OAuth.php b/extlib/OAuth.php
index fd48535545..648627b576 100644
--- a/extlib/OAuth.php
+++ b/extlib/OAuth.php
@@ -327,7 +327,7 @@ class OAuthRequest {/*{{{*/
   public function get_normalized_http_url() {/*{{{*/
     $parts = parse_url($this->http_url);
 
-    $port = @$parts['port'];
+    $port = isset($parts['port']) ? $parts['port'] : null;
     $scheme = $parts['scheme'];
     $host = $parts['host'];
     $path = @$parts['path'];

From c04987018cd6c845c6da7a92d9857d8c651f7022 Mon Sep 17 00:00:00 2001
From: Marcel van der Boom <marcel@hsdev.com>
Date: Tue, 8 Sep 2009 22:21:33 +0200
Subject: [PATCH 019/247] Several fixes to make RabbitMQ a player.

  * extlib/Stomp.php
    -spaces for tabs (we're on PEAR, right?)
    - send: initialize the $properties parameter as array() instead of null
      this prevents unsetting $headers if $properties was not set
      (besides that, it's the proper way to initialize an array)
    - subscribe: insert FIXME's on ActiveMQ specifics
    - ack: make sure the content-length header is set *and* is zero.
      I have seen the header set to '3' there but could not find where it
      came from, this is at least safe.
    - disconnect: typo in $headers variable
    - readFrame: use fgets() instead of gets() so that RabbitQ, which is more protocol strict can also play
  * extlib/Stomp/Frame.php
    - spaces for tabs
    - add note on possibly protocol violating linefeed
  * extlib/Stomp/Message.php
    - space for tabs
    - add content-length header for message
  * lib/stompqueuemanager.php
    - use the notice for logging, not the frame
---
 extlib/Stomp.php          | 124 ++++++++++++++++++++++----------------
 extlib/Stomp/Frame.php    |  87 +++++++++++++-------------
 extlib/Stomp/Message.php  |   6 +-
 lib/stompqueuemanager.php |   5 +-
 4 files changed, 123 insertions(+), 99 deletions(-)

diff --git a/extlib/Stomp.php b/extlib/Stomp.php
index abd9cba62b..c9e90629c4 100644
--- a/extlib/Stomp.php
+++ b/extlib/Stomp.php
@@ -26,7 +26,7 @@ require_once 'Stomp/Frame.php';
  *
  * @package Stomp
  * @author Hiram Chirino <hiram@hiramchirino.com>
- * @author Dejan Bosanac <dejan@nighttale.net> 
+ * @author Dejan Bosanac <dejan@nighttale.net>
  * @author Michael Caplan <mcaplan@labnet.net>
  * @version $Revision: 43 $
  */
@@ -44,15 +44,15 @@ class Stomp
      *
      * @var int
      */
-	public $prefetchSize = 1;
-    
-	/**
+    public $prefetchSize = 1;
+
+    /**
      * Client id used for durable subscriptions
      *
      * @var string
      */
-	public $clientId = null;
-    
+    public $clientId = null;
+
     protected $_brokerUri = null;
     protected $_socket = null;
     protected $_hosts = array();
@@ -66,7 +66,7 @@ class Stomp
     protected $_sessionId;
     protected $_read_timeout_seconds = 60;
     protected $_read_timeout_milliseconds = 0;
-    
+
     /**
      * Constructor
      *
@@ -134,10 +134,10 @@ class Stomp
             require_once 'Stomp/Exception.php';
             throw new Stomp_Exception("No broker defined");
         }
-        
+
         // force disconnect, if previous established connection exists
         $this->disconnect();
-        
+
         $i = $this->_currentHost;
         $att = 0;
         $connected = false;
@@ -190,11 +190,11 @@ class Stomp
         if ($password != '') {
             $this->_password = $password;
         }
-		$headers = array('login' => $this->_username , 'passcode' => $this->_password);
-		if ($this->clientId != null) {
-			$headers["client-id"] = $this->clientId;
-		}
-		$frame = new Stomp_Frame("CONNECT", $headers);
+        $headers = array('login' => $this->_username , 'passcode' => $this->_password);
+        if ($this->clientId != null) {
+            $headers["client-id"] = $this->clientId;
+        }
+        $frame = new Stomp_Frame("CONNECT", $headers);
         $this->_writeFrame($frame);
         $frame = $this->readFrame();
         if ($frame instanceof Stomp_Frame && $frame->command == 'CONNECTED') {
@@ -209,7 +209,7 @@ class Stomp
             }
         }
     }
-    
+
     /**
      * Check if client session has ben established
      *
@@ -229,7 +229,7 @@ class Stomp
         return $this->_sessionId;
     }
     /**
-     * Send a message to a destination in the messaging system 
+     * Send a message to a destination in the messaging system
      *
      * @param string $destination Destination queue
      * @param string|Stomp_Frame $msg Message
@@ -237,7 +237,7 @@ class Stomp
      * @param boolean $sync Perform request synchronously
      * @return boolean
      */
-    public function send ($destination, $msg, $properties = null, $sync = null)
+    public function send ($destination, $msg, $properties = array(), $sync = null)
     {
         if ($msg instanceof Stomp_Frame) {
             $msg->headers['destination'] = $destination;
@@ -319,10 +319,12 @@ class Stomp
     public function subscribe ($destination, $properties = null, $sync = null)
     {
         $headers = array('ack' => 'client');
-		$headers['activemq.prefetchSize'] = $this->prefetchSize;
-		if ($this->clientId != null) {
-			$headers["activemq.subcriptionName"] = $this->clientId;
-		}
+        // FIXME: this seems to be activemq specific, but not hurting rabbitmq?
+        $headers['activemq.prefetchSize'] = $this->prefetchSize;
+        if ($this->clientId != null) {
+            // FIXME: this seems to be activemq specific, but not hurting rabbitmq?
+            $headers["activemq.subcriptionName"] = $this->clientId;
+        }
         if (isset($properties)) {
             foreach ($properties as $name => $value) {
                 $headers[$name] = $value;
@@ -424,7 +426,7 @@ class Stomp
     }
     /**
      * Acknowledge consumption of a message from a subscription
-	 * Note: This operation is always asynchronous
+     * Note: This operation is always asynchronous
      *
      * @param string|Stomp_Frame $messageMessage ID
      * @param string $transactionId
@@ -433,20 +435,26 @@ class Stomp
      */
     public function ack ($message, $transactionId = null)
     {
+        // Handle the headers,
+        $headers = array();
+
         if ($message instanceof Stomp_Frame) {
-            $frame = new Stomp_Frame('ACK', $message->headers);
-            $this->_writeFrame($frame);
-            return true;
+            // Copy headers from the object
+            // FIXME: at least content-length can be wrong here (set to 3 sometimes).
+            $headers = $message->headers;
         } else {
-            $headers = array();
             if (isset($transactionId)) {
                 $headers['transaction'] = $transactionId;
             }
             $headers['message-id'] = $message;
-            $frame = new Stomp_Frame('ACK', $headers);
-            $this->_writeFrame($frame);
-            return true;
         }
+        // An ACK has no content
+        $headers['content-length'] = 0;
+
+        // Create it and write it out
+        $frame = new Stomp_Frame('ACK', $headers);
+        $this->_writeFrame($frame);
+        return true;
     }
     /**
      * Graceful disconnect from the server
@@ -454,11 +462,11 @@ class Stomp
      */
     public function disconnect ()
     {
-		$headers = array();
+        $headers = array();
 
-		if ($this->clientId != null) {
-			$headers["client-id"] = $this->clientId;
-		}
+        if ($this->clientId != null) {
+            $headers["client-id"] = $this->clientId;
+        }
 
         if (is_resource($this->_socket)) {
             $this->_writeFrame(new Stomp_Frame('DISCONNECT', $headers));
@@ -490,19 +498,19 @@ class Stomp
             $this->_writeFrame($stompFrame);
         }
     }
-    
+
     /**
      * Set timeout to wait for content to read
      *
      * @param int $seconds_to_wait  Seconds to wait for a frame
      * @param int $milliseconds Milliseconds to wait for a frame
      */
-    public function setReadTimeout($seconds, $milliseconds = 0) 
+    public function setReadTimeout($seconds, $milliseconds = 0)
     {
         $this->_read_timeout_seconds = $seconds;
         $this->_read_timeout_milliseconds = $milliseconds;
     }
-    
+
     /**
      * Read responce frame from server
      *
@@ -513,19 +521,29 @@ class Stomp
         if (!$this->hasFrameToRead()) {
             return false;
         }
-        
+
         $rb = 1024;
         $data = '';
-        do {
-            $read = fgets($this->_socket, $rb);
-            if ($read === false) {
-                $this->_reconnect();
-                return $this->readFrame();
-            }
-            $data .= $read;
-            $len = strlen($data);
-        } while (($len < 2 || ! ($data[$len - 2] == "\x00" && $data[$len - 1] == "\n")));
-        
+         do {
+             $read = fread($this->_socket, $rb);
+             if ($read === false) {
+                 $this->_reconnect();
+                 return $this->readFrame();
+             }
+             $data .= $read;
+             $len = strlen($data);
+
+             $continue = true;
+             // ActiveMq apparently add \n after 0 char
+             if($data[$len - 2] == "\x00" && $data[$len - 1] == "\n")  {
+               $continue = false;
+             }
+
+             // RabbitMq does not
+             if($data[$len - 1] == "\x00") {
+                $continue = false;
+             }
+        } while ( $continue );
         list ($header, $body) = explode("\n\n", $data, 2);
         $header = explode("\n", $header);
         $headers = array();
@@ -546,7 +564,7 @@ class Stomp
             return $frame;
         }
     }
-    
+
     /**
      * Check if there is a frame to read
      *
@@ -557,7 +575,7 @@ class Stomp
         $read = array($this->_socket);
         $write = null;
         $except = null;
-        
+
         $has_frame_to_read = stream_select($read, $write, $except, $this->_read_timeout_seconds, $this->_read_timeout_milliseconds);
 
         if ($has_frame_to_read === false) {
@@ -565,18 +583,18 @@ class Stomp
         } else if ($has_frame_to_read > 0) {
             return true;
         } else {
-            return false; 
+            return false;
         }
     }
-    
+
     /**
      * Reconnects and renews subscriptions (if there were any)
-     * Call this method when you detect connection problems     
+     * Call this method when you detect connection problems
      */
     protected function _reconnect ()
     {
         $subscriptions = $this->_subscriptions;
-        
+
         $this->connect($this->_username, $this->_password);
         foreach ($subscriptions as $dest => $properties) {
             $this->subscribe($dest, $properties);
diff --git a/extlib/Stomp/Frame.php b/extlib/Stomp/Frame.php
index dc59c1cb7f..9fd97b4f5f 100644
--- a/extlib/Stomp/Frame.php
+++ b/extlib/Stomp/Frame.php
@@ -17,46 +17,46 @@
  */
 
 /* vim: set expandtab tabstop=3 shiftwidth=3: */
-
-/**
- * Stomp Frames are messages that are sent and received on a StompConnection.
- *
- * @package Stomp
- * @author Hiram Chirino <hiram@hiramchirino.com>
- * @author Dejan Bosanac <dejan@nighttale.net>
- * @author Michael Caplan <mcaplan@labnet.net>
- * @version $Revision: 36 $
- */
-class Stomp_Frame
-{
-    public $command;
-    public $headers = array();
-    public $body;
-    
-    /**
-     * Constructor
-     *
-     * @param string $command
-     * @param array $headers
-     * @param string $body
-     */
-    public function __construct ($command = null, $headers = null, $body = null)
-    {
-        $this->_init($command, $headers, $body);
-    }
-    
-    protected function _init ($command = null, $headers = null, $body = null)
-    {
-        $this->command = $command;
-        if ($headers != null) {
-            $this->headers = $headers;
-        }
-        $this->body = $body;
-        
-        if ($this->command == 'ERROR') {
-            require_once 'Stomp/Exception.php';
-            throw new Stomp_Exception($this->headers['message'], 0, $this->body);
-        }
+
+/**
+ * Stomp Frames are messages that are sent and received on a StompConnection.
+ *
+ * @package Stomp
+ * @author Hiram Chirino <hiram@hiramchirino.com>
+ * @author Dejan Bosanac <dejan@nighttale.net>
+ * @author Michael Caplan <mcaplan@labnet.net>
+ * @version $Revision: 36 $
+ */
+class Stomp_Frame
+{
+    public $command;
+    public $headers = array();
+    public $body;
+    
+    /**
+     * Constructor
+     *
+     * @param string $command
+     * @param array $headers
+     * @param string $body
+     */
+    public function __construct ($command = null, $headers = null, $body = null)
+    {
+        $this->_init($command, $headers, $body);
+    }
+    
+    protected function _init ($command = null, $headers = null, $body = null)
+    {
+        $this->command = $command;
+        if ($headers != null) {
+            $this->headers = $headers;
+        }
+        $this->body = $body;
+        
+        if ($this->command == 'ERROR') {
+            require_once 'Stomp/Exception.php';
+            throw new Stomp_Exception($this->headers['message'], 0, $this->body);
+        }
     }
     
     /**
@@ -74,7 +74,8 @@ class Stomp_Frame
         
         $data .= "\n";
         $data .= $this->body;
-        return $data .= "\x00\n";
-    }
-}
+        $data .= "\x00\n"; // Should there really be a linefeed here?
+        return $data;
+    }
+}
 ?>
\ No newline at end of file
diff --git a/extlib/Stomp/Message.php b/extlib/Stomp/Message.php
index 6bcad3efd9..0556621338 100644
--- a/extlib/Stomp/Message.php
+++ b/extlib/Stomp/Message.php
@@ -29,8 +29,12 @@ require_once 'Stomp/Frame.php';
  */
 class Stomp_Message extends Stomp_Frame
 {
-    public function __construct ($body, $headers = null)
+    public function __construct ($body, $headers = array())
     {
+        if(!isset($headers['content-length'])) {
+          // TODO: log this, to see if this is correct
+          $headers['content-length'] = strlen($body);
+        }
         $this->_init("SEND", $headers, $body);
     }
 }
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index f059b42f00..5d8b2996b2 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -141,10 +141,11 @@ class StompQueueManager
                 $this->con->ack($frame);
             } else {
                 if ($handler->handle_notice($notice)) {
-                    $this->_log(LOG_INFO, 'Successfully handled notice '. $notice->id .' posted at ' . $frame->headers['created'] . ' in queue '. $queue);
+                    $this->_log(LOG_INFO, 'Successfully handled notice '. $notice->id .' originally posted at ' . $notice->created . ' in queue '. $queue);
+                    
                     $this->con->ack($frame);
                 } else {
-                    $this->_log(LOG_WARNING, 'Failed handling notice '. $notice->id .' posted at ' . $frame->headers['created']  . ' in queue '. $queue);
+                    $this->_log(LOG_WARNING, 'Failed handling notice '. $notice->id .' originally posted at ' . $notice->created   . ' in queue '. $queue);
                     // FIXME we probably shouldn't have to do
                     // this kind of queue management ourselves
                     $this->con->ack($frame);

From 57feeb566a0cb2c544545dbfc616437cae69b923 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 11 Sep 2009 22:37:37 -0400
Subject: [PATCH 020/247] Add a parameter named 'inreplyto' to the 'notice/new'
 page, so urls can inclue 'inreplyto' id's. Also add 'inreplyto' to the urls
 sent in emails.

---
 actions/newnotice.php |  3 ++-
 lib/mail.php          |  2 +-
 lib/noticeform.php    | 11 +++++++++--
 lib/noticelist.php    |  2 +-
 lib/router.php        |  4 ++++
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 00a822860e..6e3720e09e 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -431,13 +431,14 @@ class NewnoticeAction extends Action
         $content = $this->trimmed('status_textarea');
         if (!$content) {
             $replyto = $this->trimmed('replyto');
+            $inreplyto = $this->trimmed('inreplyto');
             $profile = Profile::staticGet('nickname', $replyto);
             if ($profile) {
                 $content = '@' . $profile->nickname . ' ';
             }
         }
 
-        $notice_form = new NoticeForm($this, '', $content);
+        $notice_form = new NoticeForm($this, '', $content, null, $inreplyto);
         $notice_form->show();
     }
 
diff --git a/lib/mail.php b/lib/mail.php
index df585406cc..432b7b3292 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -629,7 +629,7 @@ function mail_notify_attn($user, $notice)
                     $notice->content,//%4
 					$conversationUrl,//%5
                     common_local_url('newnotice',
-                                     array('replyto' => $sender->nickname)),//%6
+                                     array('replyto' => $sender->nickname, 'inreplyto' => $notice->id)),//%6
                     common_local_url('replies',
                                      array('nickname' => $user->nickname)),//%7
                     common_local_url('emailsettings'));//%8
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 1e3a45142c..d1387b1b7c 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -69,6 +69,12 @@ class NoticeForm extends Form
 
     var $user = null;
 
+    /**
+     * The notice being replied to
+     */
+
+    var $inreplyto = null;
+
     /**
      * Constructor
      *
@@ -77,12 +83,13 @@ class NoticeForm extends Form
      * @param string        $content content to pre-fill
      */
 
-    function __construct($out=null, $action=null, $content=null, $user=null)
+    function __construct($out=null, $action=null, $content=null, $user=null, $inreplyto)
     {
         parent::__construct($out);
 
         $this->action  = $action;
         $this->content = $content;
+        $this->inreplyto = $inreplyto;
         
         if ($user) {
             $this->user = $user;
@@ -161,7 +168,7 @@ class NoticeForm extends Form
         if ($this->action) {
             $this->out->hidden('notice_return-to', $this->action, 'returnto');
         }
-        $this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto');
+        $this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
     }
 
     /**
diff --git a/lib/noticelist.php b/lib/noticelist.php
index ec85e4a5c1..6b2bccd976 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -442,7 +442,7 @@ class NoticeListItem extends Widget
     {
         if (common_logged_in()) {
             $reply_url = common_local_url('newnotice',
-                                          array('replyto' => $this->profile->nickname));
+                                          array('replyto' => $this->profile->nickname, 'inreplyto' => $this->notice->id));
             $this->out->elementStart('a', array('href' => $reply_url,
                                                 'class' => 'notice_reply',
                                                 'title' => _('Reply to this notice')));
diff --git a/lib/router.php b/lib/router.php
index 00e728f557..0505c99421 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -175,6 +175,10 @@ class Router
         $m->connect('notice/new?replyto=:replyto',
                     array('action' => 'newnotice'),
                     array('replyto' => '[A-Za-z0-9_-]+'));
+        $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
+                    array('action' => 'newnotice'),
+                    array('replyto' => '[A-Za-z0-9_-]+'),
+                    array('inreplyto' => '[0-9]+'));
 
         $m->connect('notice/:notice/file',
             array('action' => 'file'),

From b75ed37eeb8318a5a5f82f080fb2536af0dbc6be Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sat, 12 Sep 2009 16:58:04 -0400
Subject: [PATCH 021/247] Show username in subject of emails

Fixes http://status.net/trac/ticket/1862
---
 lib/mail.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/mail.php b/lib/mail.php
index 432b7b3292..5bf4d74256 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -551,9 +551,9 @@ function mail_notify_fave($other, $user, $notice)
 
     common_init_locale($other->language);
 
-    $subject = sprintf(_('%s added your notice as a favorite'), $bestname);
+    $subject = sprintf(_('%s (@%s) added your notice as a favorite'), $bestname, $user->nickname);
 
-    $body = sprintf(_("%1\$s just added your notice from %2\$s".
+    $body = sprintf(_("%1\$s (@%7\$s) just added your notice from %2\$s".
                       " as one of their favorites.\n\n" .
                       "The URL of your notice is:\n\n" .
                       "%3\$s\n\n" .
@@ -570,7 +570,8 @@ function mail_notify_fave($other, $user, $notice)
                     $notice->content,
                     common_local_url('showfavorites',
                                      array('nickname' => $user->nickname)),
-                    common_config('site', 'name'));
+                    common_config('site', 'name'),
+                    $user->nickname);
 
     common_init_locale();
     mail_to_user($other, $subject, $body);
@@ -607,9 +608,9 @@ function mail_notify_attn($user, $notice)
 		$conversationUrl = null;
 	}
 	
-    $subject = sprintf(_('%s sent a notice to your attention'), $bestname);
+    $subject = sprintf(_('%s (@%s) sent a notice to your attention'), $bestname, $sender->nickname);
 	
-	$body = sprintf(_("%1\$s just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
+	$body = sprintf(_("%1\$s (@%9\$s) just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
                       "The notice is here:\n\n".
                       "\t%3\$s\n\n" .
                       "It reads:\n\n".
@@ -632,7 +633,8 @@ function mail_notify_attn($user, $notice)
                                      array('replyto' => $sender->nickname, 'inreplyto' => $notice->id)),//%6
                     common_local_url('replies',
                                      array('nickname' => $user->nickname)),//%7
-                    common_local_url('emailsettings'));//%8
+                    common_local_url('emailsettings'), //%8
+                    $sender->nickname); //%9
 	
     common_init_locale();
     mail_to_user($user, $subject, $body);

From 7cd80b29c45c2255e32328dc8b4e8a19933aa645 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sat, 12 Sep 2009 17:06:46 -0400
Subject: [PATCH 022/247] NoticeForm's constructor's inreplyto argument should
 be optional (defaulting to null)

---
 lib/noticeform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/noticeform.php b/lib/noticeform.php
index d1387b1b7c..350e37db8c 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -83,7 +83,7 @@ class NoticeForm extends Form
      * @param string        $content content to pre-fill
      */
 
-    function __construct($out=null, $action=null, $content=null, $user=null, $inreplyto)
+    function __construct($out=null, $action=null, $content=null, $user=null, $inreplyto=null)
     {
         parent::__construct($out);
 

From 29d937d04ef1d5bf83493a16e90dc4b9b7b5a059 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sat, 12 Sep 2009 17:11:55 -0400
Subject: [PATCH 023/247] Check if the avatar exists before trying to delete
 it.

Fixes http://status.net/trac/ticket/1868
---
 actions/avatarsettings.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 02a684b38f..ded419dd79 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -362,13 +362,13 @@ class AvatarsettingsAction extends AccountSettingsAction
         $profile = $user->getProfile();
         
         $avatar = $profile->getOriginalAvatar();
-        $avatar->delete();
+        if($avatar) $avatar->delete();
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-        $avatar->delete();
+        if($avatar) $avatar->delete();
         $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-        $avatar->delete();
+        if($avatar) $avatar->delete();
         $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
-        $avatar->delete();
+        if($avatar) $avatar->delete();
 
         $this->showForm(_('Avatar deleted.'), true);
     }

From 940ea07d4a72becfbdcb434e7043937618c45a61 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 13 Sep 2009 00:01:23 -0400
Subject: [PATCH 024/247] Response for request token doesn't contain
 omb_version

Fixes http://status.net/trac/ticket/681

Sorry it took a year to accept this patch, dho :'-(
---
 actions/requesttoken.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index 48fe1db08f..a17efcdd50 100644
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -72,7 +72,7 @@ class RequesttokenAction extends Action
             $req    = OAuthRequest::from_request('POST', common_local_url('requesttoken'));
             $server = omb_oauth_server();
             $token  = $server->fetch_request_token($req);
-            print $token;
+            print $token.'&omb_version='.OMB_VERSION_01;
         } catch (OAuthException $e) {
             $this->serverError($e->getMessage());
         }

From 53b558353be61ad9c8f6667097a87bbb39acefc0 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 13 Sep 2009 00:16:50 -0400
Subject: [PATCH 025/247] Add ChinaMobile as an email to SMS carrier

---
 db/sms_carrier.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/sms_carrier.sql b/db/sms_carrier.sql
index 055606f582..0e94df296e 100644
--- a/db/sms_carrier.sql
+++ b/db/sms_carrier.sql
@@ -61,4 +61,5 @@ VALUES
     (100113, 'T-Mobile Germany', '%s@t-mobile-sms.de', now()),
     (100114, 'Vodafone Germany', '%s@vodafone-sms.de', now()),
     (100115, 'E-Plus', '%s@smsmail.eplus.de', now()),
-    (100116, 'Cellular South', '%s@csouth1.com', now());
+    (100116, 'Cellular South', '%s@csouth1.com', now()),
+    (100117, 'ChinaMobile (139)', '%s@139.com', now());

From 0a1d2635c1278a12a643c6ee684a9707df6e87dd Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 13 Sep 2009 01:01:31 -0400
Subject: [PATCH 026/247] Set a Vary header with accept-encoding and cookies.

Fixes http://status.net/trac/ticket/17
---
 lib/action.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/action.php b/lib/action.php
index fafb2c6fc4..670eb498c1 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -881,6 +881,7 @@ class Action extends HTMLOutputter // lawsuit
      */
     function handle($argarray=null)
     {
+        header('Vary: Accept-Encoding,Cookie');
         $lm   = $this->lastModified();
         $etag = $this->etag();
         if ($etag) {

From 20997619b353faa94591800fbfc02bc19a4cdce3 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 13 Sep 2009 01:24:57 -0400
Subject: [PATCH 027/247] When viewing a page in https, all links to
 non-actions (links to CSS, JS, etc) should be https. Fixes the mixed content
 warnings that browsers display.

Fixes http://status.net/trac/ticket/1552
---
 lib/util.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/util.php b/lib/util.php
index b831859e99..5b57b79b54 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -750,8 +750,18 @@ function common_local_url($action, $args=null, $params=null, $fragment=null)
     return $url;
 }
 
-function common_path($relative, $ssl=false)
+function common_path($relative, $ssl=null)
 {
+    if($ssl==null) {
+        //ssl was not specifically requested
+        if( $_SERVER['HTTPS'] && $_SERVER['HTTPS']!="off" ) {
+            //currently in https, so stay in https
+            $ssl=true;
+        } else {
+            //not in https, so stay not in https
+            $ssl=false;
+        }
+    }
     $pathpart = (common_config('site', 'path')) ? common_config('site', 'path')."/" : '';
 
     if (($ssl && (common_config('site', 'ssl') === 'sometimes'))

From b9e4b6dd49e8f2c56025df8424137144723d2021 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 13 Sep 2009 17:30:50 -0400
Subject: [PATCH 028/247] Generate ETags for pages which don't specify
 themselves.

---
 index.php      |  2 +-
 lib/action.php | 81 +++++++++++++++++++++++++++++++++++---------------
 2 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/index.php b/index.php
index 7669778f64..72ceb45df2 100644
--- a/index.php
+++ b/index.php
@@ -227,7 +227,7 @@ function main()
 
         try {
             if ($action_obj->prepare($args)) {
-                $action_obj->handle($args);
+                $action_obj->handleWrapper($args);
             }
         } catch (ClientException $cex) {
             $cac = new ClientErrorAction($cex->getMessage(), $cex->getCode());
diff --git a/lib/action.php b/lib/action.php
index 670eb498c1..06cdbdfe0f 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -872,6 +872,63 @@ class Action extends HTMLOutputter // lawsuit
         return is_string($arg) ? trim($arg) : $arg;
     }
 
+    /**
+     * Wrapper for the handle method that handles etags, last-modified, and other conditional headers
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return boolean is read only action?
+     */
+    function handleWrapper($argarray=null)
+    {
+        header('Vary: Accept-Encoding,Cookie,Accept-Language,Authorization');
+        header("Cache-Control: must-revalidate");
+        $lm   = $this->lastModified();
+        $etag = $this->etag();
+        if ($etag) {
+            header('ETag: ' . $etag);
+        }
+        $if_none_match = (array_key_exists('HTTP_IF_NONE_MATCH', $_SERVER)) ?
+          $_SERVER['HTTP_IF_NONE_MATCH'] : null;
+        if ($lm) {
+            header('Last-Modified: ' . date(DATE_RFC1123, $lm));
+            if (array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) {
+                $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
+                $ims = strtotime($if_modified_since);
+                if ($lm <= $ims) {
+                    if (!$if_none_match ||
+                        !$etag ||
+                        $this->_hasEtag($etag, $if_none_match)) {
+                        header('HTTP/1.1 304 Not Modified');
+                        header('Content-Length: 0');
+                        // Better way to do this?
+                        exit(0);
+                    }
+                }
+            }
+        }
+        if($etag) {
+            $ret = $this->handle($argarray);
+        }else{
+            ob_start();
+            $ret = $this->handle($argarray);
+            $output = ob_get_contents();
+            ob_end_clean();
+            //deep etag
+            $etag = md5($output);
+            header('ETag: ' . $etag);
+            if($if_none_match && $this->_hasEtag($etag, $if_none_match)) {
+                header('HTTP/1.1 304 Not Modified');
+                header('Content-Length: 0');
+                // Better way to do this?
+                exit(0);
+            }
+            header('Content-Length: '.strlen($output));
+            print $output;
+        }
+        return $ret;
+    }
+
     /**
      * Handler method
      *
@@ -881,30 +938,6 @@ class Action extends HTMLOutputter // lawsuit
      */
     function handle($argarray=null)
     {
-        header('Vary: Accept-Encoding,Cookie');
-        $lm   = $this->lastModified();
-        $etag = $this->etag();
-        if ($etag) {
-            header('ETag: ' . $etag);
-        }
-        if ($lm) {
-            header('Last-Modified: ' . date(DATE_RFC1123, $lm));
-            if (array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) {
-                $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
-                $ims = strtotime($if_modified_since);
-                if ($lm <= $ims) {
-                    $if_none_match = (array_key_exists('HTTP_IF_NONE_MATCH', $_SERVER)) ?
-                      $_SERVER['HTTP_IF_NONE_MATCH'] : null;
-                    if (!$if_none_match ||
-                        !$etag ||
-                        $this->_hasEtag($etag, $if_none_match)) {
-                        header('HTTP/1.1 304 Not Modified');
-                        // Better way to do this?
-                        exit(0);
-                    }
-                }
-            }
-        }
     }
 
     /**

From bb48698416c1a2ae5a173eb3735c16c587a6e611 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 13 Sep 2009 21:43:29 -0400
Subject: [PATCH 029/247] Add missing pkeyGet override to the Profile class

---
 classes/Profile.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/classes/Profile.php b/classes/Profile.php
index 6ad0e7a3a3..c4fb3a5439 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -47,6 +47,11 @@ class Profile extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    function &pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Profile', $kv);
+    }
+
     function getAvatar($width, $height=null)
     {
         if (is_null($height)) {

From 4a19c292fb444dca840591a5ccec960d63ab57b8 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 13 Sep 2009 21:44:17 -0400
Subject: [PATCH 030/247] Make a new REST service for the autocomplete plugin,
 significantly reducing the size of the responses. Also enables caching in the
 browser.

---
 plugins/Autocomplete/Autocomplete.js        | 51 ++++++------
 plugins/Autocomplete/AutocompletePlugin.php | 16 ++--
 plugins/Autocomplete/autocomplete.php       | 90 +++++++++++++++++++++
 3 files changed, 124 insertions(+), 33 deletions(-)
 create mode 100644 plugins/Autocomplete/autocomplete.php

diff --git a/plugins/Autocomplete/Autocomplete.js b/plugins/Autocomplete/Autocomplete.js
index dfadea0045..3eff685a8d 100644
--- a/plugins/Autocomplete/Autocomplete.js
+++ b/plugins/Autocomplete/Autocomplete.js
@@ -1,38 +1,37 @@
 $(document).ready(function(){
-    $.getJSON($('address .url')[0].href+'/api/statuses/friends.json?user_id=' + current_user['id'] + '&lite=true&callback=?',
-        function(friends){
-            $('#notice_data-text').autocomplete(friends, {
+            $('#notice_data-text').autocomplete($('address .url')[0].href+'/plugins/Autocomplete/autocomplete.json', {
                 multiple: true,
                 multipleSeparator: " ",
                 minChars: 1,
                 formatItem: function(row, i, max){
-                    return '@' + row.screen_name + ' (' + row.name + ')';
+                    row = eval("(" + row + ")");
+                    switch(row.type)
+                    {
+                        case 'user':
+                            return row.nickname + ' (' + row.fullname + ')';
+                        case 'group':
+                            return row.nickname + ' (' + row.fullname + ')';
+                    }
                 },
                 formatMatch: function(row, i, max){
-                    return '@' + row.screen_name;
+                    row = eval("(" + row + ")");
+                    switch(row.type)
+                    {
+                        case 'user':
+                            return row.nickname;
+                        case 'group':
+                            return row.nickname;
+                    }
                 },
                 formatResult: function(row){
-                    return '@' + row.screen_name;
+                    row = eval("(" + row + ")");
+                    switch(row.type)
+                    {
+                        case 'user':
+                            return '@' + row.nickname;
+                        case 'group':
+                            return '!' + row.nickname;
+                    }
                 }
             });
-        }
-    );
-    $.getJSON($('address .url')[0].href+'/api/statusnet/groups/list.json?user_id=' + current_user['id'] + '&callback=?',
-        function(groups){
-            $('#notice_data-text').autocomplete(groups, {
-                multiple: true,
-                multipleSeparator: " ",
-                minChars: 1,
-                formatItem: function(row, i, max){
-                    return '!' + row.nickname + ' (' + row.fullname + ')';
-                },
-                formatMatch: function(row, i, max){
-                    return '!' + row.nickname;
-                },
-                formatResult: function(row){
-                    return '!' + row.nickname;
-                }
-            });
-        }
-    );
 });
diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index b753972703..baaec73c16 100644
--- a/plugins/Autocomplete/AutocompletePlugin.php
+++ b/plugins/Autocomplete/AutocompletePlugin.php
@@ -31,6 +31,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
+require_once(INSTALLDIR.'/plugins/Autocomplete/autocomplete.php');
+
 class AutocompletePlugin extends Plugin
 {
     function __construct()
@@ -40,13 +42,6 @@ class AutocompletePlugin extends Plugin
 
     function onEndShowScripts($action){
         if (common_logged_in()) {
-            $current_user = common_current_user();
-            $js_string = <<<EOT
-<script type="text/javascript">
-var current_user = { id: '$current_user->id' };
-</script>
-EOT;
-            $action->raw($js_string);
             $action->script('plugins/Autocomplete/jquery-autocomplete/jquery.autocomplete.pack.js');
             $action->script('plugins/Autocomplete/Autocomplete.js');
         }
@@ -59,5 +54,12 @@ EOT;
         }
     }
 
+    function onRouterInitialized($m)
+    {
+        if (common_logged_in()) {
+            $m->connect('plugins/Autocomplete/autocomplete.json', array('action'=>'autocomplete'));
+        }
+    }
+
 }
 ?>
diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php
new file mode 100644
index 0000000000..96d54af8d1
--- /dev/null
+++ b/plugins/Autocomplete/autocomplete.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * List users for autocompletion
+ *
+ * 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   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @copyright 2008-2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * List users for autocompletion
+ *
+ * This is the form for adding a new g
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class AutocompleteAction extends Action
+{
+    private $result;
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->results = array();
+        $q = $this->arg('q');
+        $limit = $this->arg('limit');
+        if($limit > 200) $limit=200; //prevent DOS attacks
+        if(substr($q,0,1)=='@'){
+            //user search
+            $q=substr($q,1);
+            $user = new User();
+            $user->limit($limit);
+            $user->whereAdd('nickname like \'' . trim($user->escape($q), '\'') . '%\'');
+            $user->find();
+            while($user->fetch()) {
+                $profile = Profile::pkeyGet(array('id' => $user->id));
+                $this->results[]=array('nickname' => $user->nickname, 'fullname'=> $profile->fullname, 'type'=>'user');
+            }
+        }
+        if(substr($q,0,1)=='!'){
+            //group search
+            $q=substr($q,1);
+            $group = new User_group();
+            $group->limit($limit);
+            $group->whereAdd('nickname like \'' . trim($group->escape($q), '\'') . '%\'');
+            $group->find();
+            while($group->fetch()) {
+                $this->results[]=array('nickname' => $group->nickname, 'fullname'=> $group->fullname, 'type'=>'group');
+            }
+        }
+        return true;
+    }
+
+    function handle($args)
+    {
+        parent::handle($args);
+        foreach($this->results as $result) {
+            print json_encode($result) . "\n";
+        }
+    }
+}

From fe9473ac7810d317e001a0fec19cbacaafc0c909 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Sep 2009 20:04:36 -0300
Subject: [PATCH 031/247] Check that 'dl' function is available and usable
 before trying to call it with error suppression; if it's disabled or
 unavailable we end up with mysterious failures during installation or loading
 of libraries.

Fixed for StatusNet installer as well as some external libraries that should be fixed upstream if they haven't already been:
* PEAR
* Auth/OpenID
* Auth/Yadis
---
 extlib/Auth/OpenID/BigMath.php |  2 +-
 extlib/Auth/Yadis/XML.php      |  2 +-
 extlib/PEAR.php                |  2 +-
 install.php                    | 17 ++++++++++++-----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/extlib/Auth/OpenID/BigMath.php b/extlib/Auth/OpenID/BigMath.php
index 45104947d6..b5fc627a09 100644
--- a/extlib/Auth/OpenID/BigMath.php
+++ b/extlib/Auth/OpenID/BigMath.php
@@ -376,7 +376,7 @@ function Auth_OpenID_detectMathLibrary($exts)
         // Try to load dynamic modules.
         if (!$loaded) {
             foreach ($extension['modules'] as $module) {
-                if (@dl($module . "." . PHP_SHLIB_SUFFIX)) {
+                if (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode') && @dl($module . "." . PHP_SHLIB_SUFFIX)) {
                     $loaded = true;
                     break;
                 }
diff --git a/extlib/Auth/Yadis/XML.php b/extlib/Auth/Yadis/XML.php
index 4854f12bbc..7232d6cbdd 100644
--- a/extlib/Auth/Yadis/XML.php
+++ b/extlib/Auth/Yadis/XML.php
@@ -349,7 +349,7 @@ function &Auth_Yadis_getXMLParser()
     foreach ($extensions as $name => $params) {
         if (!extension_loaded($name)) {
             foreach ($params['libname'] as $libname) {
-                if (@dl($libname)) {
+                if (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode') && @dl($libname)) {
                     $classname = $params['classname'];
                 }
             }
diff --git a/extlib/PEAR.php b/extlib/PEAR.php
index 4c24c6006a..fcefa964a3 100644
--- a/extlib/PEAR.php
+++ b/extlib/PEAR.php
@@ -746,7 +746,7 @@ class PEAR
     {
         if (!extension_loaded($ext)) {
             // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
+            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1) || !function_exists('dl')) {
                 return false;
             }
             if (OS_WINDOWS) {
diff --git a/install.php b/install.php
index c49043e5c6..39984aa086 100644
--- a/install.php
+++ b/install.php
@@ -267,12 +267,19 @@ function checkPrereqs()
 
 function checkExtension($name)
 {
-    if (!extension_loaded($name)) {
-        if (!@dl($name.'.so')) {
-            return false;
-        }
+    if (extension_loaded($name)) {
+        return true;
+    } elseif (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode')) {
+    	// dl will throw a fatal error if it's disabled or we're in safe mode.
+    	// More fun, it may not even exist under some SAPIs in 5.3.0 or later...
+    	$soname = $name . '.' . PHP_SHLIB_SUFFIX;
+    	if (PHP_SHLIB_SUFFIX == 'dll') {
+    		$soname = "php_" . $soname;
+    	}
+    	return @dl($soname);
+    } else {
+        return false;
     }
-    return true;
 }
 
 function showLibs()

From c93072ed8637d3686e071904f3247d2ddfc33ebe Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sun, 13 Sep 2009 18:15:49 -0700
Subject: [PATCH 032/247] Avoid or suppress E_NOTICE and E_WARNING messages
 related to the checklibs checks.

* notice on main installer form checking for $_GET['checklibs']
* notices when seeing which module checks to run
* warnings when attempting to load include files
---
 install.php | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/install.php b/install.php
index 39984aa086..30dd34496b 100644
--- a/install.php
+++ b/install.php
@@ -189,9 +189,9 @@ function main()
         return;
     }
     
-    if( $_GET['checklibs'] ){
+    if (isset($_GET['checklibs'])) {
         showLibs();
-    }else{
+    } else {
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             handlePost();
         } else {
@@ -202,7 +202,7 @@ function main()
 
 function haveExternalLibrary($external_library)
 {
-    if(isset($external_library['include']) && ! include_once($external_library['include'])){
+    if(isset($external_library['include']) && ! haveIncludeFile($external_library['include'])){
         return false;
     }
     if(isset($external_library['check_function']) && ! function_exists($external_library['check_function'])){
@@ -214,6 +214,15 @@ function haveExternalLibrary($external_library)
     return true;
 }
 
+// Attempt to include a PHP file and report if it worked, while
+// suppressing the annoying warning messages on failure.
+function haveIncludeFile($filename) {
+    $old = error_reporting(error_reporting() & ~E_WARNING);
+    $ok = include_once($filename);
+    error_reporting($old);
+    return $ok;
+}
+
 function checkPrereqs()
 {
 	$pass = true;
@@ -308,19 +317,19 @@ E_O_T;
     foreach($absent_libraries as $library)
     {
         echo '<li>';
-        if($library['url']){
+        if(isset($library['url'])){
             echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
         }else{
             echo htmlentities($library['name']);
         }
         echo '<ul>';
-        if($library['deb']){
+        if(isset($library['deb'])){
             echo '<li class="deb package">deb: <a href="apt:' . urlencode($library['deb']) . '">' . htmlentities($library['deb']) . '</a></li>';
         }
-        if($library['rpm']){
+        if(isset($library['rpm'])){
             echo '<li class="rpm package">rpm: ' . htmlentities($library['rpm']) . '</li>';
         }
-        if($library['pear']){
+        if(isset($library['pear'])){
             echo '<li class="pear package">pear: ' . htmlentities($library['pear']) . '</li>';
         }
         echo '</ul>';
@@ -333,7 +342,7 @@ E_O_T;
     foreach($present_libraries as $library)
     {
         echo '<li>';
-        if($library['url']){
+        if(isset($library['url'])){
             echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
         }else{
             echo htmlentities($library['name']);

From bbab0c1fa6f6c14dec987a44700c09c157f1938d Mon Sep 17 00:00:00 2001
From: Christopher Vollick <psycotica0@gmail.com>
Date: Mon, 14 Sep 2009 08:44:58 -0400
Subject: [PATCH 033/247] Fixed Confusing Typo in Documentation.

Subscribe != Unsubscribe.

Also, my editor added a newline at the end because there wasn't one.
---
 doc-src/im | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc-src/im b/doc-src/im
index c722a4e2cb..631f6d9bb7 100644
--- a/doc-src/im
+++ b/doc-src/im
@@ -37,10 +37,10 @@ currently-implemented commands:
 * **help**: Show this help. List available Jabber/XMPP commands
 * **follow &lt;nickname&gt;**: Subscribe to &lt;nickname&gt;
 * **sub &lt;nickname&gt;**: Same as follow
-* **leave &lt;nickname&gt;**: Subscribe to &lt;nickname&gt;
+* **leave &lt;nickname&gt;**: Unsubscribe from &lt;nickname&gt;
 * **unsub &lt;nickname&gt;**: Same as leave
 * **d &lt;nickname&gt; &lt;text&gt;**: Send direct message to &lt;nickname&gt; with message body &lt;text&gt;
 * **get &lt;nickname&gt;**: Get last notice from &lt;nickname&gt;
 * **last &lt;nickname&gt;**: Same as 'get'
 * **whois &lt;nickname&gt;**: Get Profile info on &lt;nickname&gt;
-* **fav &lt;nickname&gt;**: Add user's last notice as a favorite
\ No newline at end of file
+* **fav &lt;nickname&gt;**: Add user's last notice as a favorite

From cf0d449fd8115313885a51ef02226d801cb952df Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Mon, 14 Sep 2009 15:14:48 +0200
Subject: [PATCH 034/247] Updated Cloudy theme

---
 theme/cloudy/css/display.css | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index 3851bc057a..3fe05eb3dd 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -120,6 +120,10 @@ float:left;
 margin-left:11px;
 float:left;
 }
+.form_settings .form_data textarea {
+width:325px;
+}
+
 .form_settings .form_data input.submit {
 margin-left:0;
 }
@@ -968,9 +972,6 @@ right:7px;
 top:47px;
 right:7px;
 }
-.notice-options .notice_reply dt {
-display:none;
-}
 
 .notice-options input,
 .notice-options a {
@@ -978,13 +979,13 @@ text-indent:-9999px;
 outline:none;
 }
 
-.notice-options .notice_reply a,
+.notice-options .notice_reply,
 .notice-options input.submit {
 display:block;
 border:0;
 }
-.notice-options .notice_reply a,
-.notice-options .notice_delete a {
+.notice-options .notice_reply,
+.notice-options .notice_delete {
 text-decoration:none;
 padding-left:16px;
 }
@@ -1375,6 +1376,12 @@ padding-top:160px;
 #smssettings #form_notice,
 #twittersettings #form_notice,
 #imsettings #form_notice,
+#userdesignsettings #form_notice,
+#groupdesignsettings #form_notice,
+#grouplogo #form_notice,
+#editgroup #form_notice,
+#blockedfromgroup #form_notice,
+#groupmembers #form_notice,
 #doc #form_notice,
 #usergroups #form_notice,
 #invite #form_notice,
@@ -1584,11 +1591,11 @@ background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no
 background:none;
 }
 
-.notice-options .notice_reply a,
+.notice-options .notice_reply,
 .notice-options form input.submit {
 background-color:transparent;
 }
-.notice-options .notice_reply a {
+.notice-options .notice_reply {
 background:transparent url(../images/icons/icon_reply.gif) no-repeat 0 45%;
 }
 .notice-options form.form_favor input.submit {
@@ -1597,7 +1604,7 @@ background:transparent url(../images/icons/icon_favourite.gif) no-repeat 0 45%;
 .notice-options form.form_disfavor input.submit {
 background:transparent url(../images/icons/icon_disfavourite.gif) no-repeat 0 45%;
 }
-.notice-options .notice_delete a {
+.notice-options .notice_delete {
 background:transparent url(../images/icons/icon_trash.gif) no-repeat 0 45%;
 }
 

From a9cf185e692fdc9dea2a9b127826ea8e0f9f1021 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Tue, 15 Sep 2009 13:53:16 +0000
Subject: [PATCH 035/247] Updated XHR return markup for Realtime plugin

---
 plugins/Realtime/realtimeupdate.js | 42 +++++++-----------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index d55db58592..eba8ac1d91 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -1,8 +1,8 @@
 // add a notice encoded as JSON into the current timeline
 //
+// TODO: i18n
 
 RealtimeUpdate = {
-
      _userid: 0,
      _replyurl: '',
      _favorurl: '',
@@ -50,26 +50,15 @@ RealtimeUpdate = {
                "<p class=\"entry-content\">"+html+"</p>"+
                "</div>"+
                "<div class=\"entry-content\">"+
-               "<dl class=\"timestamp\">"+
-               "<dt>Published</dt>"+
-               "<dd>"+
-               "<a rel=\"bookmark\" href=\""+data['url']+"\" >"+
+               "<a class=\"timestamp\" 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>"+source+"</dd>"+ // may have a link, I think
-               "</dl>";
-
+               "<span class=\"source\">"+
+               "from "+
+               "<span class=\"device\">+source+</span>"++ // may have a link
+               "</span>";
           if (data['in_reply_to_status_id']) {
-               ni = ni+" <dl class=\"response\">"+
-                    "<dt>To</dt>"+
-                    "<dd>"+
-                    "<a href=\""+data['in_reply_to_status_url']+"\" rel=\"in-reply-to\">in reply to</a>"+
-                    "</dd>"+
-                    "</dl>";
+               ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
           }
 
           ni = ni+"</div>"+
@@ -96,7 +85,7 @@ RealtimeUpdate = {
 
           ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
                "<fieldset>"+
-               "<legend>Favor this notice</legend>"+ // XXX: i18n
+               "<legend>Favor this notice</legend>"+
                "<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
                "<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
                "<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
@@ -108,13 +97,7 @@ RealtimeUpdate = {
      makeReplyLink: function(id, nickname)
      {
           var rl;
-          rl = "<dl class=\"notice_reply\">"+
-               "<dt>Reply to this notice</dt>"+
-               "<dd>"+
-               "<a href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span>"+
-               "</a>"+
-               "</dd>"+
-               "</dl>";
+          rl = "<a class=\"notice_reply\" href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span></a>";
           return rl;
      },
 
@@ -123,12 +106,7 @@ RealtimeUpdate = {
           var dl, delurl;
           delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
 
-          dl = "<dl class=\"notice_delete\">"+
-               "<dt>Delete this notice</dt>"+
-               "<dd>"+
-               "<a href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>"+
-               "</dd>"+
-               "</dl>";
+          dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
 
           return dl;
      },

From 80ba0603c65e1f2365f019128b656a042a2b82d0 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 15 Sep 2009 12:59:32 -0700
Subject: [PATCH 036/247] Make it impossible to delete self-subscriptions via
 the API

---
 actions/twitapifriendships.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index f2ea46910e..eea8945c39 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -99,6 +99,12 @@ class TwitapifriendshipsAction extends TwitterapiAction
         $other = $this->get_profile($id);
         $user = $apidata['user']; // Alwyas the auth user
 
+	if ($user->id == $other->id) {
+	    $this->clientError(_("You cannot unfollow yourself!"),
+			       403, $apidata['content-type']);
+	    return;
+	}
+
         $sub = new Subscription();
         $sub->subscriber = $user->id;
         $sub->subscribed = $other->id;

From 12221f735eaf8a78b8a88841e38d9c7161afeb3c Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 15 Sep 2009 12:59:32 -0700
Subject: [PATCH 037/247] Make it impossible to delete self-subscriptions via
 the API

---
 actions/twitapifriendships.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index f2ea46910e..eea8945c39 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -99,6 +99,12 @@ class TwitapifriendshipsAction extends TwitterapiAction
         $other = $this->get_profile($id);
         $user = $apidata['user']; // Alwyas the auth user
 
+	if ($user->id == $other->id) {
+	    $this->clientError(_("You cannot unfollow yourself!"),
+			       403, $apidata['content-type']);
+	    return;
+	}
+
         $sub = new Subscription();
         $sub->subscriber = $user->id;
         $sub->subscribed = $other->id;

From 4a97ad9efeeb350159e1d0c82686d234ee0cdb12 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 15 Sep 2009 17:08:26 -0400
Subject: [PATCH 038/247] Remove unnecessary Profile::pkeyGet

Thanks for the info, Evan.
---
 classes/Profile.php                   | 5 -----
 plugins/Autocomplete/autocomplete.php | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/classes/Profile.php b/classes/Profile.php
index c4fb3a5439..6ad0e7a3a3 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -47,11 +47,6 @@ class Profile extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function &pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Profile', $kv);
-    }
-
     function getAvatar($width, $height=null)
     {
         if (is_null($height)) {
diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php
index 96d54af8d1..4379a86f28 100644
--- a/plugins/Autocomplete/autocomplete.php
+++ b/plugins/Autocomplete/autocomplete.php
@@ -62,7 +62,7 @@ class AutocompleteAction extends Action
             $user->whereAdd('nickname like \'' . trim($user->escape($q), '\'') . '%\'');
             $user->find();
             while($user->fetch()) {
-                $profile = Profile::pkeyGet(array('id' => $user->id));
+                $profile = Profile::staticGet($user->id);
                 $this->results[]=array('nickname' => $user->nickname, 'fullname'=> $profile->fullname, 'type'=>'user');
             }
         }

From 48565a2cdc9df329dee1ad327a1c632dd8f1d4c3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 17:08:27 -0400
Subject: [PATCH 039/247] Revert "Several fixes to make RabbitMQ a player."

This reverts commit c04987018cd6c845c6da7a92d9857d8c651f7022.
---
 extlib/Stomp.php          | 124 ++++++++++++++++----------------------
 extlib/Stomp/Frame.php    |  87 +++++++++++++-------------
 extlib/Stomp/Message.php  |   6 +-
 lib/stompqueuemanager.php |   5 +-
 4 files changed, 99 insertions(+), 123 deletions(-)

diff --git a/extlib/Stomp.php b/extlib/Stomp.php
index c9e90629c4..abd9cba62b 100644
--- a/extlib/Stomp.php
+++ b/extlib/Stomp.php
@@ -26,7 +26,7 @@ require_once 'Stomp/Frame.php';
  *
  * @package Stomp
  * @author Hiram Chirino <hiram@hiramchirino.com>
- * @author Dejan Bosanac <dejan@nighttale.net>
+ * @author Dejan Bosanac <dejan@nighttale.net> 
  * @author Michael Caplan <mcaplan@labnet.net>
  * @version $Revision: 43 $
  */
@@ -44,15 +44,15 @@ class Stomp
      *
      * @var int
      */
-    public $prefetchSize = 1;
-
-    /**
+	public $prefetchSize = 1;
+    
+	/**
      * Client id used for durable subscriptions
      *
      * @var string
      */
-    public $clientId = null;
-
+	public $clientId = null;
+    
     protected $_brokerUri = null;
     protected $_socket = null;
     protected $_hosts = array();
@@ -66,7 +66,7 @@ class Stomp
     protected $_sessionId;
     protected $_read_timeout_seconds = 60;
     protected $_read_timeout_milliseconds = 0;
-
+    
     /**
      * Constructor
      *
@@ -134,10 +134,10 @@ class Stomp
             require_once 'Stomp/Exception.php';
             throw new Stomp_Exception("No broker defined");
         }
-
+        
         // force disconnect, if previous established connection exists
         $this->disconnect();
-
+        
         $i = $this->_currentHost;
         $att = 0;
         $connected = false;
@@ -190,11 +190,11 @@ class Stomp
         if ($password != '') {
             $this->_password = $password;
         }
-        $headers = array('login' => $this->_username , 'passcode' => $this->_password);
-        if ($this->clientId != null) {
-            $headers["client-id"] = $this->clientId;
-        }
-        $frame = new Stomp_Frame("CONNECT", $headers);
+		$headers = array('login' => $this->_username , 'passcode' => $this->_password);
+		if ($this->clientId != null) {
+			$headers["client-id"] = $this->clientId;
+		}
+		$frame = new Stomp_Frame("CONNECT", $headers);
         $this->_writeFrame($frame);
         $frame = $this->readFrame();
         if ($frame instanceof Stomp_Frame && $frame->command == 'CONNECTED') {
@@ -209,7 +209,7 @@ class Stomp
             }
         }
     }
-
+    
     /**
      * Check if client session has ben established
      *
@@ -229,7 +229,7 @@ class Stomp
         return $this->_sessionId;
     }
     /**
-     * Send a message to a destination in the messaging system
+     * Send a message to a destination in the messaging system 
      *
      * @param string $destination Destination queue
      * @param string|Stomp_Frame $msg Message
@@ -237,7 +237,7 @@ class Stomp
      * @param boolean $sync Perform request synchronously
      * @return boolean
      */
-    public function send ($destination, $msg, $properties = array(), $sync = null)
+    public function send ($destination, $msg, $properties = null, $sync = null)
     {
         if ($msg instanceof Stomp_Frame) {
             $msg->headers['destination'] = $destination;
@@ -319,12 +319,10 @@ class Stomp
     public function subscribe ($destination, $properties = null, $sync = null)
     {
         $headers = array('ack' => 'client');
-        // FIXME: this seems to be activemq specific, but not hurting rabbitmq?
-        $headers['activemq.prefetchSize'] = $this->prefetchSize;
-        if ($this->clientId != null) {
-            // FIXME: this seems to be activemq specific, but not hurting rabbitmq?
-            $headers["activemq.subcriptionName"] = $this->clientId;
-        }
+		$headers['activemq.prefetchSize'] = $this->prefetchSize;
+		if ($this->clientId != null) {
+			$headers["activemq.subcriptionName"] = $this->clientId;
+		}
         if (isset($properties)) {
             foreach ($properties as $name => $value) {
                 $headers[$name] = $value;
@@ -426,7 +424,7 @@ class Stomp
     }
     /**
      * Acknowledge consumption of a message from a subscription
-     * Note: This operation is always asynchronous
+	 * Note: This operation is always asynchronous
      *
      * @param string|Stomp_Frame $messageMessage ID
      * @param string $transactionId
@@ -435,26 +433,20 @@ class Stomp
      */
     public function ack ($message, $transactionId = null)
     {
-        // Handle the headers,
-        $headers = array();
-
         if ($message instanceof Stomp_Frame) {
-            // Copy headers from the object
-            // FIXME: at least content-length can be wrong here (set to 3 sometimes).
-            $headers = $message->headers;
+            $frame = new Stomp_Frame('ACK', $message->headers);
+            $this->_writeFrame($frame);
+            return true;
         } else {
+            $headers = array();
             if (isset($transactionId)) {
                 $headers['transaction'] = $transactionId;
             }
             $headers['message-id'] = $message;
+            $frame = new Stomp_Frame('ACK', $headers);
+            $this->_writeFrame($frame);
+            return true;
         }
-        // An ACK has no content
-        $headers['content-length'] = 0;
-
-        // Create it and write it out
-        $frame = new Stomp_Frame('ACK', $headers);
-        $this->_writeFrame($frame);
-        return true;
     }
     /**
      * Graceful disconnect from the server
@@ -462,11 +454,11 @@ class Stomp
      */
     public function disconnect ()
     {
-        $headers = array();
+		$headers = array();
 
-        if ($this->clientId != null) {
-            $headers["client-id"] = $this->clientId;
-        }
+		if ($this->clientId != null) {
+			$headers["client-id"] = $this->clientId;
+		}
 
         if (is_resource($this->_socket)) {
             $this->_writeFrame(new Stomp_Frame('DISCONNECT', $headers));
@@ -498,19 +490,19 @@ class Stomp
             $this->_writeFrame($stompFrame);
         }
     }
-
+    
     /**
      * Set timeout to wait for content to read
      *
      * @param int $seconds_to_wait  Seconds to wait for a frame
      * @param int $milliseconds Milliseconds to wait for a frame
      */
-    public function setReadTimeout($seconds, $milliseconds = 0)
+    public function setReadTimeout($seconds, $milliseconds = 0) 
     {
         $this->_read_timeout_seconds = $seconds;
         $this->_read_timeout_milliseconds = $milliseconds;
     }
-
+    
     /**
      * Read responce frame from server
      *
@@ -521,29 +513,19 @@ class Stomp
         if (!$this->hasFrameToRead()) {
             return false;
         }
-
+        
         $rb = 1024;
         $data = '';
-         do {
-             $read = fread($this->_socket, $rb);
-             if ($read === false) {
-                 $this->_reconnect();
-                 return $this->readFrame();
-             }
-             $data .= $read;
-             $len = strlen($data);
-
-             $continue = true;
-             // ActiveMq apparently add \n after 0 char
-             if($data[$len - 2] == "\x00" && $data[$len - 1] == "\n")  {
-               $continue = false;
-             }
-
-             // RabbitMq does not
-             if($data[$len - 1] == "\x00") {
-                $continue = false;
-             }
-        } while ( $continue );
+        do {
+            $read = fgets($this->_socket, $rb);
+            if ($read === false) {
+                $this->_reconnect();
+                return $this->readFrame();
+            }
+            $data .= $read;
+            $len = strlen($data);
+        } while (($len < 2 || ! ($data[$len - 2] == "\x00" && $data[$len - 1] == "\n")));
+        
         list ($header, $body) = explode("\n\n", $data, 2);
         $header = explode("\n", $header);
         $headers = array();
@@ -564,7 +546,7 @@ class Stomp
             return $frame;
         }
     }
-
+    
     /**
      * Check if there is a frame to read
      *
@@ -575,7 +557,7 @@ class Stomp
         $read = array($this->_socket);
         $write = null;
         $except = null;
-
+        
         $has_frame_to_read = stream_select($read, $write, $except, $this->_read_timeout_seconds, $this->_read_timeout_milliseconds);
 
         if ($has_frame_to_read === false) {
@@ -583,18 +565,18 @@ class Stomp
         } else if ($has_frame_to_read > 0) {
             return true;
         } else {
-            return false;
+            return false; 
         }
     }
-
+    
     /**
      * Reconnects and renews subscriptions (if there were any)
-     * Call this method when you detect connection problems
+     * Call this method when you detect connection problems     
      */
     protected function _reconnect ()
     {
         $subscriptions = $this->_subscriptions;
-
+        
         $this->connect($this->_username, $this->_password);
         foreach ($subscriptions as $dest => $properties) {
             $this->subscribe($dest, $properties);
diff --git a/extlib/Stomp/Frame.php b/extlib/Stomp/Frame.php
index 9fd97b4f5f..dc59c1cb7f 100644
--- a/extlib/Stomp/Frame.php
+++ b/extlib/Stomp/Frame.php
@@ -17,46 +17,46 @@
  */
 
 /* vim: set expandtab tabstop=3 shiftwidth=3: */
-
-/**
- * Stomp Frames are messages that are sent and received on a StompConnection.
- *
- * @package Stomp
- * @author Hiram Chirino <hiram@hiramchirino.com>
- * @author Dejan Bosanac <dejan@nighttale.net>
- * @author Michael Caplan <mcaplan@labnet.net>
- * @version $Revision: 36 $
- */
-class Stomp_Frame
-{
-    public $command;
-    public $headers = array();
-    public $body;
-    
-    /**
-     * Constructor
-     *
-     * @param string $command
-     * @param array $headers
-     * @param string $body
-     */
-    public function __construct ($command = null, $headers = null, $body = null)
-    {
-        $this->_init($command, $headers, $body);
-    }
-    
-    protected function _init ($command = null, $headers = null, $body = null)
-    {
-        $this->command = $command;
-        if ($headers != null) {
-            $this->headers = $headers;
-        }
-        $this->body = $body;
-        
-        if ($this->command == 'ERROR') {
-            require_once 'Stomp/Exception.php';
-            throw new Stomp_Exception($this->headers['message'], 0, $this->body);
-        }
+
+/**
+ * Stomp Frames are messages that are sent and received on a StompConnection.
+ *
+ * @package Stomp
+ * @author Hiram Chirino <hiram@hiramchirino.com>
+ * @author Dejan Bosanac <dejan@nighttale.net>
+ * @author Michael Caplan <mcaplan@labnet.net>
+ * @version $Revision: 36 $
+ */
+class Stomp_Frame
+{
+    public $command;
+    public $headers = array();
+    public $body;
+    
+    /**
+     * Constructor
+     *
+     * @param string $command
+     * @param array $headers
+     * @param string $body
+     */
+    public function __construct ($command = null, $headers = null, $body = null)
+    {
+        $this->_init($command, $headers, $body);
+    }
+    
+    protected function _init ($command = null, $headers = null, $body = null)
+    {
+        $this->command = $command;
+        if ($headers != null) {
+            $this->headers = $headers;
+        }
+        $this->body = $body;
+        
+        if ($this->command == 'ERROR') {
+            require_once 'Stomp/Exception.php';
+            throw new Stomp_Exception($this->headers['message'], 0, $this->body);
+        }
     }
     
     /**
@@ -74,8 +74,7 @@ class Stomp_Frame
         
         $data .= "\n";
         $data .= $this->body;
-        $data .= "\x00\n"; // Should there really be a linefeed here?
-        return $data;
-    }
-}
+        return $data .= "\x00\n";
+    }
+}
 ?>
\ No newline at end of file
diff --git a/extlib/Stomp/Message.php b/extlib/Stomp/Message.php
index 0556621338..6bcad3efd9 100644
--- a/extlib/Stomp/Message.php
+++ b/extlib/Stomp/Message.php
@@ -29,12 +29,8 @@ require_once 'Stomp/Frame.php';
  */
 class Stomp_Message extends Stomp_Frame
 {
-    public function __construct ($body, $headers = array())
+    public function __construct ($body, $headers = null)
     {
-        if(!isset($headers['content-length'])) {
-          // TODO: log this, to see if this is correct
-          $headers['content-length'] = strlen($body);
-        }
         $this->_init("SEND", $headers, $body);
     }
 }
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 5d8b2996b2..f059b42f00 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -141,11 +141,10 @@ class StompQueueManager
                 $this->con->ack($frame);
             } else {
                 if ($handler->handle_notice($notice)) {
-                    $this->_log(LOG_INFO, 'Successfully handled notice '. $notice->id .' originally posted at ' . $notice->created . ' in queue '. $queue);
-                    
+                    $this->_log(LOG_INFO, 'Successfully handled notice '. $notice->id .' posted at ' . $frame->headers['created'] . ' in queue '. $queue);
                     $this->con->ack($frame);
                 } else {
-                    $this->_log(LOG_WARNING, 'Failed handling notice '. $notice->id .' originally posted at ' . $notice->created   . ' in queue '. $queue);
+                    $this->_log(LOG_WARNING, 'Failed handling notice '. $notice->id .' posted at ' . $frame->headers['created']  . ' in queue '. $queue);
                     // FIXME we probably shouldn't have to do
                     // this kind of queue management ourselves
                     $this->con->ack($frame);

From d7e13e847dbce55ad8ed017f02e1ac8420881e4e Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 15 Sep 2009 17:17:36 -0400
Subject: [PATCH 040/247] 304 responses should not have a Content-Length
 header.

---
 lib/action.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 06cdbdfe0f..ebef4f9e43 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -900,7 +900,6 @@ class Action extends HTMLOutputter // lawsuit
                         !$etag ||
                         $this->_hasEtag($etag, $if_none_match)) {
                         header('HTTP/1.1 304 Not Modified');
-                        header('Content-Length: 0');
                         // Better way to do this?
                         exit(0);
                     }
@@ -919,7 +918,6 @@ class Action extends HTMLOutputter // lawsuit
             header('ETag: ' . $etag);
             if($if_none_match && $this->_hasEtag($etag, $if_none_match)) {
                 header('HTTP/1.1 304 Not Modified');
-                header('Content-Length: 0');
                 // Better way to do this?
                 exit(0);
             }

From d2bf5761225835470d2dcc80fdba2149d1ed51cd Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 15 Sep 2009 14:37:11 -0700
Subject: [PATCH 041/247] Add Jiminy 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 f590d1b97a..2657763f44 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -21,6 +21,7 @@ VALUES
     ('identichat','identichat','http://identichat.prosody.im/', now()),
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
+    ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),
     ('LaTwit','LaTwit','http://latwit.mac65.com/', now()),
     ('LiveTweeter', 'LiveTweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
     ('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()),

From c50ab7730acacd7a461e5509f7bcc259ac482a57 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 15 Sep 2009 14:37:11 -0700
Subject: [PATCH 042/247] Add Jiminy 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 f590d1b97a..2657763f44 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -21,6 +21,7 @@ VALUES
     ('identichat','identichat','http://identichat.prosody.im/', now()),
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
+    ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),
     ('LaTwit','LaTwit','http://latwit.mac65.com/', now()),
     ('LiveTweeter', 'LiveTweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
     ('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()),

From c4ef2346b864b293fc4c4b02c72b07d18718d0cf Mon Sep 17 00:00:00 2001
From: Christopher Vollick <psycotica0@gmail.com>
Date: Wed, 16 Sep 2009 05:07:33 -0400
Subject: [PATCH 043/247] Pagination of user/tag was navigating to wrong page.

Fixes bug #1736.
---
 actions/showstream.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index 4d3067eed3..89285b13c7 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -380,8 +380,13 @@ class ShowstreamAction extends ProfileAction
             $this->showEmptyListMessage();
         }
 
+        $args = array('nickname' => $this->user->nickname);
+        if (!empty($this->tag))
+        {
+            $args['tag'] = $this->tag;
+        }
         $this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,
-                          'showstream', array('nickname' => $this->user->nickname));
+                          'showstream', $args);
     }
 
     function showAnonymousMessage()

From 6568a3202d3acfde694b359e2524d52d93dc83dd Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 16 Sep 2009 13:29:46 +0000
Subject: [PATCH 044/247] Fixed typo

---
 plugins/Realtime/realtimeupdate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index eba8ac1d91..b2c8bb56d6 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -55,7 +55,7 @@ RealtimeUpdate = {
                "</a> "+
                "<span class=\"source\">"+
                "from "+
-               "<span class=\"device\">+source+</span>"++ // may have a link
+               "<span class=\"device\">+source+</span>"+ // may have a link
                "</span>";
           if (data['in_reply_to_status_id']) {
                ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";

From 75085a0df17c717ad7fd08334204885c75480076 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 11 Sep 2009 20:40:51 -0400
Subject: [PATCH 045/247] The site id was hardcoded inside the plugin code.
 Instead the piwikid is used now.

Fixes http://status.net/trac/ticket/1864

Thanks zmf
---
 plugins/PiwikAnalyticsPlugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index 85a24c1320..45a11dfe43 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -96,7 +96,7 @@ document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/ja
 </script>
 <script type="text/javascript">
 try {
-    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4);
+    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", $this->piwikId);
     piwikTracker.trackPageView();
     piwikTracker.enableLinkTracking();
 } catch( err ) {}
@@ -108,4 +108,4 @@ ENDOFPIWIK;
         $action->raw($piwikCode);
         return true;
     }
-}
\ No newline at end of file
+}

From 5ab1ec7ad578e1ac1f2d18ad8e2299cda21f572a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Sep 2009 11:57:07 -0400
Subject: [PATCH 046/247] make PiwikAnalytics work a little nicer

---
 plugins/PiwikAnalyticsPlugin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index 45a11dfe43..e36bd1c5c3 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -59,9 +59,9 @@ if (!defined('STATUSNET')) {
 class PiwikAnalyticsPlugin extends Plugin
 {
     /** the base of your Piwik installation */
-    var $piwikroot = null;
+    public $piwikroot = null;
     /** the Piwik Id of your statusnet installation */
-    var $piwikId   = null;
+    public $piwikId   = null;
 
     /**
      * constructor
@@ -96,7 +96,7 @@ document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/ja
 </script>
 <script type="text/javascript">
 try {
-    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", $this->piwikId);
+    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {$this->piwikId});
     piwikTracker.trackPageView();
     piwikTracker.enableLinkTracking();
 } catch( err ) {}

From f2ecfd237007b8ffafd8c74a290549f5966c107e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Sep 2009 11:57:07 -0400
Subject: [PATCH 047/247] make PiwikAnalytics work a little nicer

---
 plugins/PiwikAnalyticsPlugin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index 45a11dfe43..e36bd1c5c3 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -59,9 +59,9 @@ if (!defined('STATUSNET')) {
 class PiwikAnalyticsPlugin extends Plugin
 {
     /** the base of your Piwik installation */
-    var $piwikroot = null;
+    public $piwikroot = null;
     /** the Piwik Id of your statusnet installation */
-    var $piwikId   = null;
+    public $piwikId   = null;
 
     /**
      * constructor
@@ -96,7 +96,7 @@ document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/ja
 </script>
 <script type="text/javascript">
 try {
-    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", $this->piwikId);
+    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {$this->piwikId});
     piwikTracker.trackPageView();
     piwikTracker.enableLinkTracking();
 } catch( err ) {}

From d9953e015b593965150bb528536f1f90674620ae Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 16 Sep 2009 16:04:19 +0000
Subject: [PATCH 048/247] Fixed missing quotes

---
 plugins/Realtime/realtimeupdate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index b2c8bb56d6..faec8d89c3 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -55,7 +55,7 @@ RealtimeUpdate = {
                "</a> "+
                "<span class=\"source\">"+
                "from "+
-               "<span class=\"device\">+source+</span>"+ // may have a link
+               "<span class=\"device\">"+source+"</span>"+ // may have a link
                "</span>";
           if (data['in_reply_to_status_id']) {
                ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";

From 39aa9b3a9f6a27738ad1cd330c471ae388b11088 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Thu, 17 Sep 2009 20:15:15 +1200
Subject: [PATCH 049/247] fixed up space on @author tags

---
 index.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/index.php b/index.php
index d5174c2b7e..208259eb6a 100644
--- a/index.php
+++ b/index.php
@@ -19,17 +19,20 @@
  * @category StatusNet
  * @package  StatusNet
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
- * @author Brenda Wallace <shiny@cpan.org>
- * @author Christopher Vollick <psycotica0@gmail.com>
- * @author CiaranG <ciaran@ciarang.com>
- * @author Craig Andrews <candrews@integralblue.com>
- * @author Evan Prodromou <evan@status.net>
- * @author Gina Haeussge <osd@foosel.net>
- * @author Jeffery To <jeffery.to@gmail.com>
- * @author Mike Cochrane <mikec@mikenz.geek.nz>
- * @author Robin Millette <millette@controlyourself.ca>
- * @author Sarven Capadisli <csarven@status.net>
- * @author Tom Adams <tom@holizz.com>
+ * @author   Brenda Wallace <shiny@cpan.org> 
+ * @author   Christopher Vollick <psycotica0@gmail.com> 
+ * @author   CiaranG <ciaran@ciarang.com>
+ * @author   Craig Andrews <candrews@integralblue.com> 
+ * @author   Evan Prodromou <evan@controlezvous.ca>
+ * @author   Evan Prodromou <evan@controlyourself.ca> 
+ * @author   Evan Prodromou <evan@prodromou.name>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Gina Haeussge <osd@foosel.net> 
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @author   Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca> 
+ * @author   Tom Adams <tom@holizz.com>
  */
 
 define('INSTALLDIR', dirname(__FILE__));

From fc0f871bfe653a635d5e86986f2c8510434f74c3 Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Fri, 18 Sep 2009 08:27:09 +0100
Subject: [PATCH 050/247] Correction to path in README of recaptcha plugin

---
 plugins/recaptcha/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/recaptcha/README b/plugins/recaptcha/README
index ce23a26953..b996f96cc3 100644
--- a/plugins/recaptcha/README
+++ b/plugins/recaptcha/README
@@ -6,7 +6,7 @@ Use:
 1. Get an API key from http://recaptcha.net
 
 2. In config.php add:
-include_once('plugins/recaptcha.php');
+include_once('plugins/recaptcha/recaptcha.php');
 $captcha = new recaptcha(publickey, privatekey, showErrors);
 
 Changelog

From 4b7881c64e741d7b82f1d65bd9651148692cf1d4 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Fri, 18 Sep 2009 19:32:51 +0200
Subject: [PATCH 051/247] Removed trailing single space in author @title

---
 lib/noticelist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 6b2bccd976..336457b455 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -261,7 +261,7 @@ class NoticeListItem extends Widget
         $attrs = array('href' => $this->profile->profileurl,
                        'class' => 'url');
         if (!empty($this->profile->fullname)) {
-            $attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ') ';
+            $attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ')';
         }
         $this->out->elementStart('a', $attrs);
         $this->showAvatar();

From 6af71f2cd2b2fcacb0f1eb2e0172a300802fe8bc Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 18 Sep 2009 17:37:36 -0400
Subject: [PATCH 052/247] Show context link if this notice starts a
 conversation

---
 lib/noticelist.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 6b2bccd976..507413da76 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -418,9 +418,17 @@ class NoticeListItem extends Widget
 
     function showContext()
     {
-        // XXX: also show context if there are replies to this notice
-        if (!empty($this->notice->conversation)
-            && $this->notice->conversation != $this->notice->id) {
+        $hasConversation = false;
+        if( !empty($this->notice->conversation)
+            && $this->notice->conversation != $this->notice->id){
+            $hasConversation = true;
+        }else{
+            $conversation = Notice::conversationStream($this->notice->id, 1, 1);
+            if($conversation->N > 0){
+                $hasConversation = true;
+            }
+        }
+        if ($hasConversation){
             $convurl = common_local_url('conversation',
                                          array('id' => $this->notice->conversation));
             $this->out->element('a', array('href' => $convurl.'#notice-'.$this->notice->id,

From 15f9c80c28042a5f9d51ec8444e3c9c475360481 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 18 Sep 2009 17:53:06 -0400
Subject: [PATCH 053/247] Blacklist all files and directories in the web root
 (INSTALLDIR). Much more elegant than manually keep tracking of these invalid
 usernames.

---
 classes/User.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/classes/User.php b/classes/User.php
index 14d3cf54fa..8386f1e185 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -120,11 +120,15 @@ class User extends Memcached_DataObject
     function allowed_nickname($nickname)
     {
         // XXX: should already be validated for size, content, etc.
-        static $blacklist = array('rss', 'xrds', 'doc', 'main',
-                                  'settings', 'notice', 'user',
-                                  'search', 'avatar', 'tag', 'tags',
-                                  'api', 'message', 'group', 'groups',
-                                  'local');
+
+        $blacklist = array();
+
+        //all directory and file names should be blacklisted
+        $d = dir(INSTALLDIR);
+        while (false !== ($entry = $d->read())) {
+            $blacklist[]=$entry;
+        }
+        $d->close();
         $merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
         return !in_array($nickname, $merged);
     }

From e9bdc696516b007b94e9557ba98d5e96779fb0e0 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sat, 19 Sep 2009 12:28:08 +1200
Subject: [PATCH 054/247] @author tags updated -- only one entry per name now

---
 index.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/index.php b/index.php
index 208259eb6a..8ff67d19d9 100644
--- a/index.php
+++ b/index.php
@@ -18,21 +18,19 @@
  *
  * @category StatusNet
  * @package  StatusNet
- * @license  GNU Affero General Public License http://www.gnu.org/licenses/
- * @author   Brenda Wallace <shiny@cpan.org> 
- * @author   Christopher Vollick <psycotica0@gmail.com> 
+ * @author   Brenda Wallace <shiny@cpan.org>
+ * @author   Christopher Vollick <psycotica0@gmail.com>
  * @author   CiaranG <ciaran@ciarang.com>
- * @author   Craig Andrews <candrews@integralblue.com> 
+ * @author   Craig Andrews <candrews@integralblue.com>
  * @author   Evan Prodromou <evan@controlezvous.ca>
- * @author   Evan Prodromou <evan@controlyourself.ca> 
- * @author   Evan Prodromou <evan@prodromou.name>
- * @author   Evan Prodromou <evan@status.net>
- * @author   Gina Haeussge <osd@foosel.net> 
+ * @author   Gina Haeussge <osd@foosel.net>
  * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Mike Cochrane <mikec@mikenz.geek.nz>
  * @author   Robin Millette <millette@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca> 
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @author   Tom Adams <tom@holizz.com>
+ * 
+ * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  */
 
 define('INSTALLDIR', dirname(__FILE__));

From 83e232bd3f9f58f4d670bcf1e579fb65293096c6 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sat, 19 Sep 2009 16:01:42 +1200
Subject: [PATCH 055/247] Pear code style

---
 install.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/install.php b/install.php
index 81241315e1..46248c7891 100644
--- a/install.php
+++ b/install.php
@@ -31,6 +31,8 @@
  * @author   Sarven Capadisli <csarven@status.net>
  * @author   Tom Adams <tom@holizz.com>
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
+ * @version  0.9
+ * @link     http://status.net
  */
 
 define('INSTALLDIR', dirname(__FILE__));
@@ -476,12 +478,7 @@ E_O_T;
 
 function updateStatus($status, $error=false)
 {
-    echo '<li';
-
-    if ($error) {
-	echo ' class="error"';
-    }
-    echo ">$status</li>";
+    echo '<li' . ($error ? ' class="error"': '' ) . ">$status</li>";
 }
 
 function handlePost()

From 61121c192a30abdb33ac98cca9962942645df58e Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Sat, 19 Sep 2009 12:09:49 +0100
Subject: [PATCH 056/247] Additional note in Autocomplete plugin readme about
 private mode

---
 plugins/Autocomplete/readme.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/Autocomplete/readme.txt b/plugins/Autocomplete/readme.txt
index 3272aa1eef..1db4c65658 100644
--- a/plugins/Autocomplete/readme.txt
+++ b/plugins/Autocomplete/readme.txt
@@ -1,5 +1,7 @@
 Autocomplete allows users to autocomplete screen names in @ replies. When an "@" is typed into the notice text area, an autocomplete box is displayed populated with the user's friends' screen names.
 
+Note: This plugin doesn't work if the site is in Private mode, i.e. when $config['site']['private'] is set to true.
+
 Installation
 ============
 Add "addPlugin('Autocomplete');" to the bottom of your config.php

From e80fad7ad9bd0bee6a9cf4cfd1615a9b07277364 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 19 Sep 2009 15:06:16 -0400
Subject: [PATCH 057/247] handle Godaddy-style PATH_INFO which includes the
 script

---
 index.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 72ceb45df2..fa94f0c75e 100644
--- a/index.php
+++ b/index.php
@@ -32,7 +32,13 @@ function getPath($req)
         && array_key_exists('p', $req)) {
         return $req['p'];
     } else if (array_key_exists('PATH_INFO', $_SERVER)) {
-        return $_SERVER['PATH_INFO'];
+        $path = $_SERVER['PATH_INFO'];
+        $script = $_SERVER['SCRIPT_NAME'];
+        if (substr($path, 0, mb_strlen($script)) == $script) {
+            return substr($path, mb_strlen($script));
+        } else {
+            return $path;
+        }
     } else {
         return null;
     }

From fd86c6eb1997ae3c9cd4b143ee253784d7603a6b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 19 Sep 2009 15:06:16 -0400
Subject: [PATCH 058/247] handle Godaddy-style PATH_INFO which includes the
 script

---
 index.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 7669778f64..362ab3cd37 100644
--- a/index.php
+++ b/index.php
@@ -32,7 +32,13 @@ function getPath($req)
         && array_key_exists('p', $req)) {
         return $req['p'];
     } else if (array_key_exists('PATH_INFO', $_SERVER)) {
-        return $_SERVER['PATH_INFO'];
+        $path = $_SERVER['PATH_INFO'];
+        $script = $_SERVER['SCRIPT_NAME'];
+        if (substr($path, 0, mb_strlen($script)) == $script) {
+            return substr($path, mb_strlen($script));
+        } else {
+            return $path;
+        }
     } else {
         return null;
     }

From 8548e1185deac0a289e16ea48a64f323c3bec679 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sat, 19 Sep 2009 21:38:52 +0200
Subject: [PATCH 059/247] Fix merges.

---
 actions/finishremotesubscribe.php | 63 -------------------------------
 actions/updateprofile.php         | 49 ++++--------------------
 2 files changed, 8 insertions(+), 104 deletions(-)

diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index 5f6807d10a..b1cec66f48 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -143,67 +143,4 @@ class FinishremotesubscribeAction extends Action
                                                              $user->nickname)),
                         303);
     }
-
-    function add_avatar($profile, $url)
-    {
-        $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
-        copy($url, $temp_filename);
-        $imagefile = new ImageFile($profile->id, $temp_filename);
-        $filename = Avatar::filename($profile->id,
-                                     image_type_to_extension($imagefile->type),
-                                     null,
-                                     common_timestamp());
-        rename($temp_filename, Avatar::path($filename));
-        return $profile->setOriginal($filename);
-    }
-
-    function access_token($omb)
-    {
-
-        common_debug('starting request for access token', __FILE__);
-
-        $con = omb_oauth_consumer();
-        $tok = new OAuthToken($omb['token'], $omb['secret']);
-
-        common_debug('using request token "'.$tok.'"', __FILE__);
-
-        $url = $omb['access_token_url'];
-
-        common_debug('using access token url "'.$url.'"', __FILE__);
-
-        # XXX: Is this the right thing to do? Strip off GET params and make them
-        # POST params? Seems wrong to me.
-
-        $parsed = parse_url($url);
-        $params = array();
-        parse_str($parsed['query'], $params);
-
-        $req = OAuthRequest::from_consumer_and_token($con, $tok, "POST", $url, $params);
-
-        $req->set_parameter('omb_version', OMB_VERSION_01);
-
-        # XXX: test to see if endpoint accepts this signature method
-
-        $req->sign_request(omb_hmac_sha1(), $con, $tok);
-
-        # We re-use this tool's fetcher, since it's pretty good
-
-        common_debug('posting to access token url "'.$req->get_normalized_http_url().'"', __FILE__);
-        common_debug('posting request data "'.$req->to_postdata().'"', __FILE__);
-
-        $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
-        $result = $fetcher->post($req->get_normalized_http_url(),
-                                 $req->to_postdata(),
-                                 array('User-Agent: StatusNet/' . STATUSNET_VERSION));
-
-        common_debug('got result: "'.print_r($result,true).'"', __FILE__);
-
-        if ($result->status != 200) {
-            return null;
-        }
-
-        parse_str($result->body, $return);
-
-        return array($return['oauth_token'], $return['oauth_token_secret']);
-    }
 }
diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index d9cc7f7f3c..4ff4f41c0d 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -55,46 +55,13 @@ class UpdateprofileAction extends Action
      */
     function prepare($argarray)
     {
-        $version = $req->get_parameter('omb_version');
-        if ($version != OMB_VERSION_01) {
-            $this->clientError(_('Unsupported OMB version'), 400);
-            return false;
-        }
-        # First, check to see if listenee exists
-        $listenee =  $req->get_parameter('omb_listenee');
-        $remote = Remote_profile::staticGet('uri', $listenee);
-        if (!$remote) {
-            $this->clientError(_('Profile unknown'), 404);
-            return false;
-        }
-        # Second, check to see if they should be able to post updates!
-        # We see if there are any subscriptions to that remote user with
-        # the given token.
-
-        $sub = new Subscription();
-        $sub->subscribed = $remote->id;
-        $sub->token = $token->key;
-        if (!$sub->find(true)) {
-            $this->clientError(_('You did not send us that profile'), 403);
-            return false;
-        }
-
-        $profile = Profile::staticGet('id', $remote->id);
-        if (!$profile) {
-            # This one is our fault
-            $this->serverError(_('Remote profile with no matching profile'), 500);
-            return false;
-        }
-        $nickname = $req->get_parameter('omb_listenee_nickname');
-        if ($nickname && !Validate::string($nickname, array('min_length' => 1,
-                                                            'max_length' => 64,
-                                                            'format' => NICKNAME_FMT))) {
-            $this->clientError(_('Nickname must have only lowercase letters and numbers and no spaces.'));
-            return false;
-        }
-        $license = $req->get_parameter('omb_listenee_license');
-        if ($license && !common_valid_http_url($license)) {
-            $this->clientError(sprintf(_("Invalid license URL '%s'"), $license));
+        parent::prepare($argarray);
+        $license      = $_POST['omb_listenee_license'];
+        $site_license = common_config('license', 'url');
+        if (!common_compatible_license($license, $site_license)) {
+            $this->clientError(sprintf(_('Listenee stream license ‘%s’ is not '.
+                                         'compatible with site license ‘%s’.'),
+                                       $license, $site_license);
             return false;
         }
         return true;
@@ -113,4 +80,4 @@ class UpdateprofileAction extends Action
             return;
         }
     }
-}
\ No newline at end of file
+}

From e0ff80f1c7c0d7daa9b81652e2d545b17b47fe05 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sat, 19 Sep 2009 21:40:48 +0200
Subject: [PATCH 060/247] Add missing parenthesis.

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

diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index 4ff4f41c0d..3cec9523cd 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -61,7 +61,7 @@ class UpdateprofileAction extends Action
         if (!common_compatible_license($license, $site_license)) {
             $this->clientError(sprintf(_('Listenee stream license ‘%s’ is not '.
                                          'compatible with site license ‘%s’.'),
-                                       $license, $site_license);
+                                       $license, $site_license));
             return false;
         }
         return true;

From 74296fa12c7813ad5cdc80750173c11912b5860f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sat, 19 Sep 2009 18:34:07 -0700
Subject: [PATCH 061/247] Make statuses/home_timeline return the same thing as
 statuses/friends_timeline to support apps trying to use the new retweet API
 method.

---
 actions/twitapistatuses.php | 5 +++++
 lib/router.php              | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index edee239a03..5e2867ea81 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -136,6 +136,11 @@ class TwitapistatusesAction extends TwitterapiAction
 
     }
 
+    function home_timeline($args, $apidata)
+    {
+        call_user_func(array($this, 'friends_timeline'), $args, $apidata);
+    }
+
     function user_timeline($args, $apidata)
     {
         parent::handle($args);
diff --git a/lib/router.php b/lib/router.php
index 0505c99421..5529e60acb 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -272,12 +272,12 @@ class Router
         $m->connect('api/statuses/:method',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+                    array('method' => '(public_timeline|home_timeline|friends_timeline|user_timeline|update|replies|mentions|show|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|mentions|show|destroy|friends|followers)'));
+                    array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         // users
 
@@ -436,7 +436,7 @@ class Router
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(|user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
+                    array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         $m->connect('api/statusnet/groups/:method/:argument',
                     array('action' => 'api',

From 131292472c4bca7e99ee821ae62853f36f4c7bef Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sat, 19 Sep 2009 18:34:07 -0700
Subject: [PATCH 062/247] Make statuses/home_timeline return the same thing as
 statuses/friends_timeline to support apps trying to use the new retweet API
 method.

---
 actions/twitapistatuses.php | 5 +++++
 lib/router.php              | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index edee239a03..5e2867ea81 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -136,6 +136,11 @@ class TwitapistatusesAction extends TwitterapiAction
 
     }
 
+    function home_timeline($args, $apidata)
+    {
+        call_user_func(array($this, 'friends_timeline'), $args, $apidata);
+    }
+
     function user_timeline($args, $apidata)
     {
         parent::handle($args);
diff --git a/lib/router.php b/lib/router.php
index 00e728f557..5309fe7530 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -268,12 +268,12 @@ class Router
         $m->connect('api/statuses/:method',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+                    array('method' => '(public_timeline|home_timeline|friends_timeline|user_timeline|update|replies|mentions|show|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|mentions|show|destroy|friends|followers)'));
+                    array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         // users
 
@@ -432,7 +432,7 @@ class Router
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(|user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
+                    array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         $m->connect('api/statusnet/groups/:method/:argument',
                     array('action' => 'api',

From 8aad3154a7673091291af4b95da2736e98aa75e7 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sat, 19 Sep 2009 18:34:07 -0700
Subject: [PATCH 063/247] Make statuses/home_timeline return the same thing as
 statuses/friends_timeline to support apps trying to use the new retweet API
 method.

---
 actions/twitapistatuses.php | 5 +++++
 lib/router.php              | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index ad6654dff5..2f10ff966c 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -136,6 +136,11 @@ class TwitapistatusesAction extends TwitterapiAction
 
     }
 
+    function home_timeline($args, $apidata)
+    {
+        call_user_func(array($this, 'friends_timeline'), $args, $apidata);
+    }
+
     function user_timeline($args, $apidata)
     {
         parent::handle($args);
diff --git a/lib/router.php b/lib/router.php
index 8f13b88520..2c4d63b0d7 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -265,12 +265,12 @@ class Router
         $m->connect('api/statuses/:method',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+                    array('method' => '(public_timeline|home_timeline|friends_timeline|user_timeline|update|replies|mentions|show|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|mentions|show|destroy|friends|followers)'));
+                    array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         // users
 
@@ -429,7 +429,7 @@ class Router
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(|user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
+                    array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         $m->connect('api/statusnet/groups/:method/:argument',
                     array('action' => 'api',

From cf8944526ec56dd1a3522d6eced65a4d1369c321 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sat, 19 Sep 2009 22:53:39 -0400
Subject: [PATCH 064/247] Make the infinite scroll plugin have a non-infinite
 scroll (button click to scroll) mode

---
 .../InfiniteScroll/InfiniteScrollPlugin.php   |  2 +-
 plugins/InfiniteScroll/infinitescroll.js      |  2 +-
 .../InfiniteScroll/jquery.infinitescroll.js   | 22 ++++++++++++++-----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
index c955298cb9..5928c007fe 100644
--- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php
+++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
@@ -40,7 +40,7 @@ class InfiniteScrollPlugin extends Plugin
 
     function onEndShowScripts($action)
     {
-        $action->script('plugins/InfiniteScroll/jquery.infinitescroll.min.js');
+        $action->script('plugins/InfiniteScroll/jquery.infinitescroll.js');
         $action->script('plugins/InfiniteScroll/infinitescroll.js');
     }
 }
diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index 6513072d06..ae4d53d095 100644
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -1,6 +1,7 @@
 jQuery(document).ready(function($){
   $('notices_primary').infinitescroll({
     debug: true,
+    infiniteScroll  : false,
     nextSelector    : "li.nav_next a",
     loadingImg      : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif',
     text            : "<em>Loading the next set of posts...</em>",
@@ -12,4 +13,3 @@ jQuery(document).ready(function($){
         NoticeAttachments();
     });
 });
-
diff --git a/plugins/InfiniteScroll/jquery.infinitescroll.js b/plugins/InfiniteScroll/jquery.infinitescroll.js
index 670686b0e6..ec31bb0863 100644
--- a/plugins/InfiniteScroll/jquery.infinitescroll.js
+++ b/plugins/InfiniteScroll/jquery.infinitescroll.js
@@ -92,14 +92,14 @@
     
         if (props.isDuringAjax || props.isInvalidPage || props.isDone) return; 
     
-    		if ( !isNearBottom(opts,props) ) return; 
+    		if ( opts.infiniteScroll && !isNearBottom(opts,props) ) return; 
     		  
     		// we dont want to fire the ajax multiple times
     		props.isDuringAjax = true; 
     		
     		// show the loading message and hide the previous/next links
     		props.loadingMsg.appendTo( opts.contentSelector ).show();
-    		$( opts.navSelector ).hide(); 
+    		if(opts.infiniteScroll) $( opts.navSelector ).hide(); 
     		
     		// increment the URL bit. e.g. /page/3/
     		props.currPage++;
@@ -205,10 +205,19 @@
       } 
     });
     
-    // bind scroll handler to element (if its a local scroll) or window  
-    $(opts.localMode ? this : window)
-      .bind('scroll.infscr', function(){ infscrSetup(path,opts,props,callback); } )
-      .trigger('scroll.infscr'); // trigger the event, in case it's a short page
+    if(opts.infiniteScroll){
+      // bind scroll handler to element (if its a local scroll) or window  
+      $(opts.localMode ? this : window)
+        .bind('scroll.infscr', function(){ infscrSetup(path,opts,props,callback); } )
+        .trigger('scroll.infscr'); // trigger the event, in case it's a short page
+    }else{
+      $(opts.nextSelector).click(
+        function(){
+          infscrSetup(path,opts,props,callback);
+          return false;
+        }
+      );
+    }
     
     
     return this;
@@ -222,6 +231,7 @@
   $.infinitescroll = {     
         defaults      : {
                           debug           : false,
+                          infiniteScroll  : true,
                           preload         : false,
                           nextSelector    : "div.navigation a:first",
                           loadingImg      : "http://www.infinite-scroll.com/loading.gif",

From 44820d296dd0c00cef9b48af3a3574f765042715 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 20 Sep 2009 13:44:22 +0200
Subject: [PATCH 065/247] No need to call farbtastic.go.js because it was moved
 to userdesign.go.js

---
 lib/designsettings.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/designsettings.php b/lib/designsettings.php
index fdc05562e0..820d534f23 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -325,7 +325,6 @@ class DesignSettingsAction extends AccountSettingsAction
         parent::showScripts();
 
         $this->script('js/farbtastic/farbtastic.js');
-        $this->script('js/farbtastic/farbtastic.go.js');
         $this->script('js/userdesign.go.js');
 
         $this->autofocus('design_background-image_file');

From 49e91ec7d068fa7b98576207696d2192418baf5b Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 20 Sep 2009 15:14:46 +0000
Subject: [PATCH 066/247] Added realtime streams for all and showstream
 timelines

---
 plugins/Meteor/meteorupdater.js     | 11 +++++++++-
 plugins/Realtime/RealtimePlugin.php | 34 ++++++++++++++++-------------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index 2e688336f1..e8bca3eb49 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -7,8 +7,17 @@ var MeteorUpdater = function()
 
           init: function(server, port, timeline)
           {
+               var screen_name;
+
                Meteor.callbacks["process"] = function(data) {
-                    RealtimeUpdate.receive(JSON.parse(data));
+                    var d = JSON.parse(data);
+                    screen_name = d['user']['screen_name'];
+
+                    if (timeline == 'public' ||
+                        $('address .url')[0].href+screen_name+'/all' == window.location.href ||
+                        $('address .url')[0].href+screen_name == window.location.href) {
+                        RealtimeUpdate.receive(d);
+                    }
                };
 
                Meteor.host = server;
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 82eca3d08c..1703ef0995 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -63,20 +63,22 @@ class RealtimePlugin extends Plugin
     {
         $path = null;
 
-        switch ($action->trimmed('action')) {
-         case 'public':
-            $path = array('public');
-            break;
-         case 'tag':
-            $tag = $action->trimmed('tag');
-            if (!empty($tag)) {
-                $path = array('tag', $tag);
-            } else {
+        $a = $action->trimmed('action');
+
+        switch ($a) {
+            case 'public': case 'all': case 'replies': case 'showstream':
+                $path = array($a);
+                break;
+            case 'tag':
+                $tag = $action->trimmed('tag');
+                if (!empty($tag)) {
+                    $path = array('tag', $tag);
+                } else {
+                    return true;
+                }
+                break;
+             default:
                 return true;
-            }
-            break;
-         default:
-            return true;
         }
 
         $timeline = $this->_pathToChannel($path);
@@ -108,11 +110,13 @@ class RealtimePlugin extends Plugin
     {
         $paths = array();
 
-        // XXX: Add other timelines; this is just for the public one
+        // TODO: Replies timeline
 
         if ($notice->is_local ||
             ($notice->is_local == 0 && !common_config('public', 'localonly'))) {
-            $paths[] = array('public');
+            foreach (array('public', 'all', 'replies', 'showstream') as $a) {
+                $paths[] = array($a);
+            }
         }
 
         $tags = $this->getNoticeTags($notice);

From 182257cbbf1557c2671b1995c9126c45b0bd8e79 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 20 Sep 2009 15:20:10 +0000
Subject: [PATCH 067/247] Fixed indenting

---
 plugins/Meteor/meteorupdater.js | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index e8bca3eb49..939aed00a0 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -3,28 +3,28 @@
 
 var MeteorUpdater = function()
 {
-     return {
+    return {
 
-          init: function(server, port, timeline)
-          {
-               var screen_name;
+        init: function(server, port, timeline)
+        {
+            var screen_name;
 
-               Meteor.callbacks["process"] = function(data) {
-                    var d = JSON.parse(data);
-                    screen_name = d['user']['screen_name'];
+            Meteor.callbacks["process"] = function(data) {
+                var d = JSON.parse(data);
+                screen_name = d['user']['screen_name'];
 
-                    if (timeline == 'public' ||
-                        $('address .url')[0].href+screen_name+'/all' == window.location.href ||
-                        $('address .url')[0].href+screen_name == window.location.href) {
-                        RealtimeUpdate.receive(d);
-                    }
-               };
+                if (timeline == 'public' ||
+                    $('address .url')[0].href+screen_name+'/all' == window.location.href ||
+                    $('address .url')[0].href+screen_name == window.location.href) {
+                    RealtimeUpdate.receive(d);
+                }
+            };
 
-               Meteor.host = server;
-               Meteor.port = port;
-               Meteor.joinChannel(timeline, 0);
-               Meteor.connect();
-          }
-     }
+            Meteor.host = server;
+            Meteor.port = port;
+            Meteor.joinChannel(timeline, 0);
+            Meteor.connect();
+        }
+    }
 }();
 

From 0125f293245a55a46af202e49bfa98bb983d2c57 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sun, 20 Sep 2009 21:39:57 -0700
Subject: [PATCH 068/247] Don't trigger E_NOTICE when looking for commands in
 the notice input explode() only returns one item if there was no space,
 leading to an E_NOTICE about an undefined array index in the list($a,$b)
 pattern.

---
 lib/commandinterpreter.php | 42 ++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index 6e4340e5dc..60fc4c3c44 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -28,7 +28,7 @@ class CommandInterpreter
         # XXX: localise
 
         $text = preg_replace('/\s+/', ' ', trim($text));
-        list($cmd, $arg) = explode(' ', $text, 2);
+        list($cmd, $arg) = $this->split_arg($text);
 
         # We try to support all the same commands as Twitter, see
         # http://getsatisfaction.com/twitter/topics/what_are_the_twitter_commands
@@ -43,7 +43,7 @@ class CommandInterpreter
             return new HelpCommand($user);
          case 'on':
             if ($arg) {
-                list($other, $extra) = explode(' ', $arg, 2);
+                list($other, $extra) = $this->split_arg($arg);
                 if ($extra) {
                     return null;
                 } else {
@@ -54,7 +54,7 @@ class CommandInterpreter
             }
          case 'off':
             if ($arg) {
-                list($other, $extra) = explode(' ', $arg, 2);
+                list($other, $extra) = $this->split_arg($arg);
                 if ($extra) {
                     return null;
                 } else {
@@ -74,7 +74,7 @@ class CommandInterpreter
              if (!$arg) {
                 return null;
             }
-            list($other, $extra) = explode(' ', $arg, 2);
+            list($other, $extra) = $this->split_arg($arg);
             if ($extra) {
                 return null;
             } else {
@@ -84,7 +84,7 @@ class CommandInterpreter
             if (!$arg) {
                 return null;
             }
-            list($other, $extra) = explode(' ', $arg, 2);
+            list($other, $extra) = $this->split_arg($arg);
             if ($extra) {
                 return null;
             } else {
@@ -95,7 +95,7 @@ class CommandInterpreter
             if (!$arg) {
                 return null;
             }
-            list($other, $extra) = explode(' ', $arg, 2);
+            list($other, $extra) = $this->split_arg($arg);
             if ($extra) {
                 return null;
             } else {
@@ -106,7 +106,7 @@ class CommandInterpreter
             if (!$arg) {
                 return null;
             }
-            list($other, $extra) = explode(' ', $arg, 2);
+            list($other, $extra) = $this->split_arg($arg);
             if ($extra) {
                 return null;
             } else {
@@ -117,7 +117,7 @@ class CommandInterpreter
             if (!$arg) {
                 return null;
             }
-            list($other, $extra) = explode(' ', $arg, 2);
+            list($other, $extra) = $this->split_arg($arg);
             if ($extra) {
                 return null;
             } else {
@@ -128,7 +128,7 @@ class CommandInterpreter
             if (!$arg) {
                 return null;
             }
-            list($other, $extra) = explode(' ', $arg, 2);
+            list($other, $extra) = $this->split_arg($arg);
             if (!$extra) {
                 return null;
             } else {
@@ -138,7 +138,7 @@ class CommandInterpreter
             if (!$arg) {
                 return null;
             }
-            list($other, $extra) = explode(' ', $arg, 2);
+            list($other, $extra) = $this->split_arg($arg);
             if ($extra) {
                 return null;
             } else {
@@ -148,7 +148,7 @@ class CommandInterpreter
             if (!$arg) {
                 return null;
             }
-            list($other, $extra) = explode(' ', $arg, 2);
+            list($other, $extra) = $this->split_arg($arg);
             if ($extra) {
                 return null;
             } else {
@@ -158,7 +158,7 @@ class CommandInterpreter
             if (!$arg) {
                 return null;
             }
-            list($other, $extra) = explode(' ', $arg, 2);
+            list($other, $extra) = $this->split_arg($arg);
             if ($extra) {
                 return null;
             } else {
@@ -173,7 +173,7 @@ class CommandInterpreter
             if (!$arg) {
                 return null;
             }
-            list($other, $extra) = explode(' ', $arg, 2);
+            list($other, $extra) = $this->split_arg($arg);
             if ($extra) {
                 return null;
             } else {
@@ -183,7 +183,7 @@ class CommandInterpreter
             if (!$arg) {
                 return null;
             }
-            list($word, $extra) = explode(' ', $arg, 2);
+            list($word, $extra) = $this->split_arg($arg);
             if ($extra) {
                 return null;
             } else if ($word == 'off') {
@@ -195,7 +195,7 @@ class CommandInterpreter
             if (!$arg) {
                 return null;
             }
-            list($word, $extra) = explode(' ', $arg, 2);
+            list($word, $extra) = $this->split_arg($arg);
             if ($extra) {
                 return null;
             } else if ($word == 'all') {
@@ -213,5 +213,17 @@ class CommandInterpreter
             return false;
         }
     }
+    
+    /**
+     * Split arguments without triggering a PHP notice warning
+     */
+    function split_arg($text)
+    {
+        $pieces = explode(' ', $text, 2);
+        if (count($pieces) == 1) {
+            $pieces[] = null;
+        }
+        return $pieces;
+    }
 }
 

From 3c89d31b1883e478d69a121905e5a9a400a17622 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sun, 20 Sep 2009 22:30:10 -0700
Subject: [PATCH 069/247] Fixes for posting shortened URLs or uploads * If no
 shortener plugin is enabled, fall back to using the long URL instead of
 trying to load nonexistent ur1.ca plugin and throwing 'Class  does not exist'
 * Fix bad call to call_user_func_array() in callback_helper() which broke all
 shortening

---
 lib/util.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index b74dc619c1..d9ff8b863b 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -493,7 +493,7 @@ function callback_helper($matches, $callback, $notice_id) {
     }while($original_url!=$url);
 
     if(empty($notice_id)){
-        $result = call_user_func_array($callback,$url);
+        $result = call_user_func_array($callback, array($url));
     }else{
         $result = call_user_func_array($callback, array(array($url,$notice_id)) );
     }
@@ -1374,10 +1374,14 @@ function common_shorten_url($long_url)
         $svc = $user->urlshorteningservice;
     }
     global $_shorteners;
-    if(! $_shorteners[$svc]){
+    if (!isset($_shorteners[$svc])) {
         //the user selected service doesn't exist, so default to ur1.ca
         $svc = 'ur1.ca';
     }
+    if (!isset($_shorteners[$svc])) {
+    	// no shortener plugins installed.
+    	return $long_url;
+    }
 
     $reflectionObj = new ReflectionClass($_shorteners[$svc]['callInfo'][0]);
     $short_url_service = $reflectionObj->newInstanceArgs($_shorteners[$svc]['callInfo'][1]); 

From 8f84bc88d7855ac86b87bf4e8813e18c565d1a52 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Mon, 21 Sep 2009 11:32:36 +0000
Subject: [PATCH 070/247] Updated todo comment for pushing notices to Personal
 and Replies timelines

---
 plugins/Meteor/meteorupdater.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index 939aed00a0..82594d91c7 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -1,5 +1,6 @@
-// update the local timeline from a Meteor server
-//
+// Update the local timeline from a Meteor server
+// XXX: If @a is subscribed to @b, @a should get @b's notices in @a's Personal timeline.
+//      Do Replies timeline.
 
 var MeteorUpdater = function()
 {

From c9bc3900909a85b9b4be31c4dac7f809127a8bf0 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Mon, 21 Sep 2009 11:35:56 +0000
Subject: [PATCH 071/247] Made it slighly more compact with less jQuery
 selection

---
 plugins/Meteor/meteorupdater.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index 82594d91c7..a7c87330c9 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -8,15 +8,15 @@ var MeteorUpdater = function()
 
         init: function(server, port, timeline)
         {
-            var screen_name;
-
             Meteor.callbacks["process"] = function(data) {
                 var d = JSON.parse(data);
-                screen_name = d['user']['screen_name'];
+
+                $user_url = $('address .url')[0].href+d['user']['screen_name'];
 
                 if (timeline == 'public' ||
-                    $('address .url')[0].href+screen_name+'/all' == window.location.href ||
-                    $('address .url')[0].href+screen_name == window.location.href) {
+                    $user_url+'/all' == window.location.href ||
+                    $user_url == window.location.href) {
+
                     RealtimeUpdate.receive(d);
                 }
             };

From 13de845e95da9ea579516c4480789819c9a26edd Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Mon, 21 Sep 2009 14:30:12 +0000
Subject: [PATCH 072/247] Added a check for any URL param. If found, strips
 them out before going ahead with realtime timeline update.

---
 plugins/Meteor/meteorupdater.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index a7c87330c9..91d12cde9c 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -11,11 +11,17 @@ var MeteorUpdater = function()
             Meteor.callbacks["process"] = function(data) {
                 var d = JSON.parse(data);
 
-                $user_url = $('address .url')[0].href+d['user']['screen_name'];
+                var user_url = $('address .url')[0].href+d['user']['screen_name'];
+
+                var wlh = window.location.href;
+
+                if (wlh.indexOf('?') > 0) {
+                   wlh = wlh.slice(0, wlh.indexOf('?'))
+                }
 
                 if (timeline == 'public' ||
-                    $user_url+'/all' == window.location.href ||
-                    $user_url == window.location.href) {
+                    user_url+'/all' == wlh ||
+                    user_url == wlh) {
 
                     RealtimeUpdate.receive(d);
                 }

From 5b91223ce4ece508b25397dc00e1d04ef2e1bc28 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 21 Sep 2009 14:14:55 -0400
Subject: [PATCH 073/247] add a hook at point of enqueuing notices

---
 EVENTS.txt   |  7 +++++++
 lib/util.php | 15 ++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 121ae175d0..64c3c08c7c 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -254,3 +254,10 @@ StartApiRss: after the rss <channel> element is started
 StartApiAtom: after the <feed> element is started
 - $action: action object being shown
 
+StartEnqueueNotice: about to add a notice to the queues (good place to add a new transport)
+- $notice: the notice being added
+- &$transports: modifiable list of transports (as strings) to queue for
+
+EndEnqueueNotice: after adding a notice to the queues
+- $notice: the notice being added
+- $transports: modifiable list of transports to use
diff --git a/lib/util.php b/lib/util.php
index d9ff8b863b..eb247562dc 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -915,11 +915,16 @@ function common_enqueue_notice($notice)
         }
     }
 
-    $qm = QueueManager::get();
+    if (Event::handle('StartEnqueueNotice', array($notice, &$transports))) {
 
-    foreach ($transports as $transport)
-    {
-        $qm->enqueue($notice, $transport);
+        $qm = QueueManager::get();
+
+        foreach ($transports as $transport)
+        {
+            $qm->enqueue($notice, $transport);
+        }
+
+        Event::handle('EndEnqueueNotice', array($notice, $transports));
     }
 
     return true;
@@ -1384,7 +1389,7 @@ function common_shorten_url($long_url)
     }
 
     $reflectionObj = new ReflectionClass($_shorteners[$svc]['callInfo'][0]);
-    $short_url_service = $reflectionObj->newInstanceArgs($_shorteners[$svc]['callInfo'][1]); 
+    $short_url_service = $reflectionObj->newInstanceArgs($_shorteners[$svc]['callInfo'][1]);
     $short_url = $short_url_service->shorten($long_url);
 
     if(substr($short_url,0,7)=='http://'){

From eb41d9e5da6a9d1e9b31ca017b5534eb6bd25b32 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 21 Sep 2009 14:23:35 -0400
Subject: [PATCH 074/247] add a hook for the unqueuemanager

---
 EVENTS.txt             | 4 ++++
 lib/unqueuemanager.php | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 64c3c08c7c..56f91f87a4 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -261,3 +261,7 @@ StartEnqueueNotice: about to add a notice to the queues (good place to add a new
 EndEnqueueNotice: after adding a notice to the queues
 - $notice: the notice being added
 - $transports: modifiable list of transports to use
+
+UnqueueHandleNotice: Handle a notice when no queue manager is available
+- $notice: the notice to handle
+- $queue: the "queue" that is being executed
\ No newline at end of file
diff --git a/lib/unqueuemanager.php b/lib/unqueuemanager.php
index c5dc29d386..269ecdeaa0 100644
--- a/lib/unqueuemanager.php
+++ b/lib/unqueuemanager.php
@@ -73,7 +73,9 @@ class UnQueueManager
             jabber_broadcast_notice($notice);
             break;
          default:
-            throw ServerException("UnQueueManager: Unknown queue: $type");
+            if (Event::handle('UnqueueHandleNotice', array(&$notice, $queue))) {
+                throw ServerException("UnQueueManager: Unknown queue: $queue");
+            }
         }
     }
 

From 6a088afd4be4076a31e8713ed96ac62060bf7278 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 21 Sep 2009 14:29:43 -0400
Subject: [PATCH 075/247] you can add a daemon to getvaliddaemons

---
 EVENTS.txt                  |  5 ++++-
 scripts/getvaliddaemons.php | 29 ++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 56f91f87a4..d3b58ffb01 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -264,4 +264,7 @@ EndEnqueueNotice: after adding a notice to the queues
 
 UnqueueHandleNotice: Handle a notice when no queue manager is available
 - $notice: the notice to handle
-- $queue: the "queue" that is being executed
\ No newline at end of file
+- $queue: the "queue" that is being executed
+
+GetValidDaemons: Just before determining which daemons to run
+- &$daemons: modifiable list of daemon scripts to run, filenames relative to scripts/
diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 8f48e8e6f0..92edacfd3c 100755
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -35,20 +35,31 @@ ENDOFHELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
+$daemons = array();
+
 if(common_config('xmpp','enabled')) {
-    echo "xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php ";
-    echo "xmppconfirmhandler.php ";
+    $daemons[] = 'xmppdaemon.php';
+    $daemons[] = 'jabberqueuehandler.php';
+    $daemons[] = 'publicqueuehandler.php';
+    $daemons[] = 'xmppconfirmhandler.php';
 }
 if(common_config('twitterbridge','enabled')) {
-    echo "twitterstatusfetcher.php ";
+    $daemons[] = 'twitterstatusfetcher.php';
 }
-echo "ombqueuehandler.php ";
+$daemons[] = 'ombqueuehandler.php';
 if (common_config('twitter', 'enabled')) {
-    echo "twitterqueuehandler.php ";
-    echo "synctwitterfriends.php ";
+    $daemons[] = 'twitterqueuehandler.php';
+    $daemons[] = 'synctwitterfriends.php';
 }
-echo "facebookqueuehandler.php ";
-echo "pingqueuehandler.php ";
+$daemons[] = 'facebookqueuehandler.php';
+$daemons[] = 'pingqueuehandler.php';
 if (common_config('sms', 'enabled')) {
-    echo "smsqueuehandler.php ";
+    $daemons[] = 'smsqueuehandler.php';
+}
+
+if (Event::handle('GetValidDaemons', array(&$daemons))) {
+    foreach ($daemons as $daemon) {
+        print $daemon . ' ';
+    }
+    print "\n";
 }

From 470b34ea47ff97bbcbffb49c8a456da358b29578 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Mon, 21 Sep 2009 18:30:22 +0000
Subject: [PATCH 076/247] Escaping internal JavaScript

---
 plugins/Realtime/RealtimePlugin.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 1703ef0995..7a612a4064 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -98,9 +98,13 @@ class RealtimePlugin extends Plugin
         }
 
         $action->elementStart('script', array('type' => 'text/javascript'));
-        $action->raw("$(document).ready(function() { ");
-        $action->raw($this->_updateInitialize($timeline, $user_id));
-        $action->raw(" });");
+        $action->raw('
+        <!--
+        $(document).ready(function() {
+            ' . $this->_updateInitialize($timeline, $user_id) . '
+        });
+        -->
+        ');
         $action->elementEnd('script');
 
         return true;

From 98924a80d776107a734b44027dda18094b1f093f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 21 Sep 2009 14:39:22 -0400
Subject: [PATCH 077/247] 'easy' way to handle notices at queue time

---
 EVENTS.txt                     |  3 ++
 lib/unqueuemanager.php         |  3 ++
 lib/util.php                   |  3 +-
 scripts/pluginqueuehandler.php | 58 ++++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100755 scripts/pluginqueuehandler.php

diff --git a/EVENTS.txt b/EVENTS.txt
index d3b58ffb01..2b16d43c07 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -268,3 +268,6 @@ UnqueueHandleNotice: Handle a notice when no queue manager is available
 
 GetValidDaemons: Just before determining which daemons to run
 - &$daemons: modifiable list of daemon scripts to run, filenames relative to scripts/
+
+HandleQueuedNotice: Handle a queued notice at queue time (or immediately if no queue)
+- &$notice: notice to handle
diff --git a/lib/unqueuemanager.php b/lib/unqueuemanager.php
index 269ecdeaa0..6cfe5bcbd3 100644
--- a/lib/unqueuemanager.php
+++ b/lib/unqueuemanager.php
@@ -72,6 +72,9 @@ class UnQueueManager
             require_once(INSTALLDIR.'/lib/jabber.php');
             jabber_broadcast_notice($notice);
             break;
+         case 'plugin':
+            Event::handle('HandleQueuedNotice', array(&$notice));
+            break;
          default:
             if (Event::handle('UnqueueHandleNotice', array(&$notice, $queue))) {
                 throw ServerException("UnQueueManager: Unknown queue: $queue");
diff --git a/lib/util.php b/lib/util.php
index eb247562dc..37744fc5b7 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -897,7 +897,8 @@ function common_enqueue_notice($notice)
                                     'twitter',
                                     'facebook',
                                     'ping');
-    static $allTransports = array('sms');
+
+    static $allTransports = array('sms', 'plugin');
 
     $transports = $allTransports;
 
diff --git a/scripts/pluginqueuehandler.php b/scripts/pluginqueuehandler.php
new file mode 100755
index 0000000000..ae807db6af
--- /dev/null
+++ b/scripts/pluginqueuehandler.php
@@ -0,0 +1,58 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, 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/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i::';
+$longoptions = array('id::');
+
+$helptext = <<<END_OF_OMB_HELP
+Daemon script for letting plugins handle stuff at queue time
+
+    -i --id           Identity (default none)
+
+END_OF_OMB_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR . '/lib/queuehandler.php';
+
+class PluginQueueHandler extends QueueHandler
+{
+
+    function transport()
+    {
+        return 'plugin';
+    }
+
+    function handle_notice($notice)
+    {
+        Event::handle('HandleQueuedNotice', array(&$notice));
+        return true;
+    }
+}
+
+if (have_option('i', 'id')) {
+    $id = get_option_value('i', 'id');
+} else {
+    $id = null;
+}
+
+$handler = new PluginQueueHandler($id);
+$handler->runOnce();

From f6c70ea327a83f77acbca14bca32f262e6b3a098 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 21 Sep 2009 14:42:20 -0400
Subject: [PATCH 078/247] have to provide full path for daemons

---
 scripts/getvaliddaemons.php | 22 +++++++++++-----------
 scripts/startdaemons.sh     |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 92edacfd3c..684799a0ee 100755
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -38,23 +38,23 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 $daemons = array();
 
 if(common_config('xmpp','enabled')) {
-    $daemons[] = 'xmppdaemon.php';
-    $daemons[] = 'jabberqueuehandler.php';
-    $daemons[] = 'publicqueuehandler.php';
-    $daemons[] = 'xmppconfirmhandler.php';
+    $daemons[] = INSTALLDIR.'/scripts/xmppdaemon.php';
+    $daemons[] = INSTALLDIR.'/scripts/jabberqueuehandler.php';
+    $daemons[] = INSTALLDIR.'/scripts/publicqueuehandler.php';
+    $daemons[] = INSTALLDIR.'/scripts/xmppconfirmhandler.php';
 }
 if(common_config('twitterbridge','enabled')) {
-    $daemons[] = 'twitterstatusfetcher.php';
+    $daemons[] = INSTALLDIR.'/scripts/twitterstatusfetcher.php';
 }
-$daemons[] = 'ombqueuehandler.php';
+$daemons[] = INSTALLDIR.'/scripts/ombqueuehandler.php';
 if (common_config('twitter', 'enabled')) {
-    $daemons[] = 'twitterqueuehandler.php';
-    $daemons[] = 'synctwitterfriends.php';
+    $daemons[] = INSTALLDIR.'/scripts/twitterqueuehandler.php';
+    $daemons[] = INSTALLDIR.'/scripts/synctwitterfriends.php';
 }
-$daemons[] = 'facebookqueuehandler.php';
-$daemons[] = 'pingqueuehandler.php';
+$daemons[] = INSTALLDIR.'/scripts/facebookqueuehandler.php';
+$daemons[] = INSTALLDIR.'/scripts/pingqueuehandler.php';
 if (common_config('sms', 'enabled')) {
-    $daemons[] = 'smsqueuehandler.php';
+    $daemons[] = INSTALLDIR.'/scripts/smsqueuehandler.php';
 }
 
 if (Event::handle('GetValidDaemons', array(&$daemons))) {
diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 298162673c..5fb75414d3 100755
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -40,7 +40,7 @@ DAEMONS=`php $DIR/getvaliddaemons.php $ARGSG`
 for f in $DAEMONS; do
 
          printf "Starting $f...";
-	 php $DIR/$f $ARGSD
+	 php $f $ARGSD
 	 printf "DONE.\n"
 
 done

From fe4751de50f2c26953dca79ab51543f8adb12353 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 21 Sep 2009 14:44:16 -0400
Subject: [PATCH 079/247] add the plugin daemon

---
 scripts/getvaliddaemons.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 684799a0ee..6dd0197129 100755
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -37,22 +37,27 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 
 $daemons = array();
 
+$daemons[] = INSTALLDIR.'/scripts/pluginqueuehandler.php';
+$daemons[] = INSTALLDIR.'/scripts/ombqueuehandler.php';
+$daemons[] = INSTALLDIR.'/scripts/facebookqueuehandler.php';
+$daemons[] = INSTALLDIR.'/scripts/pingqueuehandler.php';
+
 if(common_config('xmpp','enabled')) {
     $daemons[] = INSTALLDIR.'/scripts/xmppdaemon.php';
     $daemons[] = INSTALLDIR.'/scripts/jabberqueuehandler.php';
     $daemons[] = INSTALLDIR.'/scripts/publicqueuehandler.php';
     $daemons[] = INSTALLDIR.'/scripts/xmppconfirmhandler.php';
 }
+
 if(common_config('twitterbridge','enabled')) {
     $daemons[] = INSTALLDIR.'/scripts/twitterstatusfetcher.php';
 }
-$daemons[] = INSTALLDIR.'/scripts/ombqueuehandler.php';
+
 if (common_config('twitter', 'enabled')) {
     $daemons[] = INSTALLDIR.'/scripts/twitterqueuehandler.php';
     $daemons[] = INSTALLDIR.'/scripts/synctwitterfriends.php';
 }
-$daemons[] = INSTALLDIR.'/scripts/facebookqueuehandler.php';
-$daemons[] = INSTALLDIR.'/scripts/pingqueuehandler.php';
+
 if (common_config('sms', 'enabled')) {
     $daemons[] = INSTALLDIR.'/scripts/smsqueuehandler.php';
 }

From acd5a53257f6d0677d1630e4f6cae80706cdbdba Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Mon, 21 Sep 2009 19:17:37 +0000
Subject: [PATCH 080/247] Initial UI to allow certain timelines to be viewed in
 a new window in realtime

---
 plugins/Realtime/RealtimePlugin.php    |   2 +
 plugins/Realtime/icon_external.gif     | Bin 0 -> 90 bytes
 plugins/Realtime/jquery.getUrlParam.js |  72 ++++++++
 plugins/Realtime/realtimeupdate.js     | 229 +++++++++++++++----------
 4 files changed, 208 insertions(+), 95 deletions(-)
 create mode 100644 plugins/Realtime/icon_external.gif
 create mode 100644 plugins/Realtime/jquery.getUrlParam.js

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 7a612a4064..611b1d86c9 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -97,6 +97,8 @@ class RealtimePlugin extends Plugin
             $user_id = 0;
         }
 
+        $action->script('plugins/Realtime/jquery.getUrlParam.js');
+
         $action->elementStart('script', array('type' => 'text/javascript'));
         $action->raw('
         <!--
diff --git a/plugins/Realtime/icon_external.gif b/plugins/Realtime/icon_external.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c4118d53bdc16883409cf7276480cffb5d4b3291
GIT binary patch
literal 90
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J611`erV>%dohG
r(<0@g?ab9LGUKnYF6~@)=SyhLQ!m|bU8{L62k$lYsTUAoV6X-NHqIaP

literal 0
HcmV?d00001

diff --git a/plugins/Realtime/jquery.getUrlParam.js b/plugins/Realtime/jquery.getUrlParam.js
new file mode 100644
index 0000000000..e8f73eb478
--- /dev/null
+++ b/plugins/Realtime/jquery.getUrlParam.js
@@ -0,0 +1,72 @@
+/* Copyright (c) 2006-2007 Mathias Bank (http://www.mathias-bank.de)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) 
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ * 
+ * Version 2.1
+ * 
+ * Thanks to 
+ * Hinnerk Ruemenapf - http://hinnerk.ruemenapf.de/ for bug reporting and fixing.
+ * Tom Leonard for some improvements
+ * 
+ */
+jQuery.fn.extend({
+/**
+* Returns get parameters.
+*
+* If the desired param does not exist, null will be returned
+*
+* To get the document params:
+* @example value = $(document).getUrlParam("paramName");
+* 
+* To get the params of a html-attribut (uses src attribute)
+* @example value = $('#imgLink').getUrlParam("paramName");
+*/ 
+ getUrlParam: function(strParamName){
+	  strParamName = escape(unescape(strParamName));
+	  
+	  var returnVal = new Array();
+	  var qString = null;
+	  
+	  if ($(this).attr("nodeName")=="#document") {
+	  	//document-handler
+		
+		if (window.location.search.search(strParamName) > -1 ){
+			
+			qString = window.location.search.substr(1,window.location.search.length).split("&");
+		}
+			
+	  } else if ($(this).attr("src")!="undefined") {
+	  	
+	  	var strHref = $(this).attr("src")
+	  	if ( strHref.indexOf("?") > -1 ){
+	    	var strQueryString = strHref.substr(strHref.indexOf("?")+1);
+	  		qString = strQueryString.split("&");
+	  	}
+	  } else if ($(this).attr("href")!="undefined") {
+	  	
+	  	var strHref = $(this).attr("href")
+	  	if ( strHref.indexOf("?") > -1 ){
+	    	var strQueryString = strHref.substr(strHref.indexOf("?")+1);
+	  		qString = strQueryString.split("&");
+	  	}
+	  } else {
+	  	return null;
+	  }
+	  	
+	  
+	  if (qString==null) return null;
+	  
+	  
+	  for (var i=0;i<qString.length; i++){
+			if (escape(unescape(qString[i].split("=")[0])) == strParamName){
+				returnVal.push(qString[i].split("=")[1]);
+			}
+			
+	  }
+	  
+	  
+	  if (returnVal.length==0) return null;
+	  else if (returnVal.length==1) return returnVal[0];
+	  else return returnVal;
+	}
+});
\ No newline at end of file
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index faec8d89c3..da2f9ed3aa 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -1,113 +1,152 @@
-// add a notice encoded as JSON into the current timeline
-//
-// TODO: i18n
+$(document).ready(function() {
+    if (!$(document).getUrlParam('realtime')) {
+        $('#site_nav_local_views .current a').append('<button id="realtime_timeline" title="Pop this tab">&#8599;</button>');
 
-RealtimeUpdate = {
-     _userid: 0,
-     _replyurl: '',
-     _favorurl: '',
-     _deleteurl: '',
+        $('#realtime_timeline').css({
+            'margin':'2px 0 0 11px',
+            'background':'transparent url('+$('address .url')[0].href+'/plugins/Realtime/icon_external.gif) no-repeat 45% 45%',
+            'text-indent':'-9999px',
+            'width':'16px',
+            'height':'16px',
+            'padding':'0',
+            'display':'block',
+            'float':'right',
+            'border':'none',
+            'cursor':'pointer'
+        });
 
-     init: function(userid, replyurl, favorurl, deleteurl)
-     {
-          RealtimeUpdate._userid = userid;
-          RealtimeUpdate._replyurl = replyurl;
-          RealtimeUpdate._favorurl = favorurl;
-          RealtimeUpdate._deleteurl = deleteurl;
-     },
+        $('#realtime_timeline').click(function() {
+            window.open($(this).parent('a').attr('href')+'?realtime=1',
+                        $(this).parent('a').attr('title'),
+                        'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
 
-     receive: function(data)
-     {
-          id = data.id;
+            return false;
+        });
+    }
+    else {
+        window.resizeTo(575, 640);
+        address = $('address');
+        content = $('#content');
+        $('body').html(address);
+        $('address').hide();
+        $('body').append(content);
+        $('#content').css({'width':'92%'});
+    }
 
-          // Don't add it if it already exists
 
-          if ($("#notice-"+id).length > 0) {
-               return;
-          }
+    // add a notice encoded as JSON into the current timeline
+    //
+    // TODO: i18n
 
-          var noticeItem = RealtimeUpdate.makeNoticeItem(data);
-          $("#notices_primary .notices").prepend(noticeItem, true);
-          $("#notices_primary .notice:first").css({display:"none"});
-          $("#notices_primary .notice:first").fadeIn(1000);
-          NoticeReply();
-     },
+    RealtimeUpdate = {
+        _userid: 0,
+        _replyurl: '',
+        _favorurl: '',
+        _deleteurl: '',
 
-     makeNoticeItem: function(data)
-     {
-          user = data['user'];
-          html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
-          source = data['source'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
+        init: function(userid, replyurl, favorurl, deleteurl)
+        {
+            RealtimeUpdate._userid = userid;
+            RealtimeUpdate._replyurl = replyurl;
+            RealtimeUpdate._favorurl = favorurl;
+            RealtimeUpdate._deleteurl = deleteurl;
+        },
 
-          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\">"+html+"</p>"+
-               "</div>"+
-               "<div class=\"entry-content\">"+
-               "<a class=\"timestamp\" rel=\"bookmark\" href=\""+data['url']+"\" >"+
-               "<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
-               "</a> "+
-               "<span class=\"source\">"+
-               "from "+
-               "<span class=\"device\">"+source+"</span>"+ // may have a link
-               "</span>";
-          if (data['in_reply_to_status_id']) {
-               ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
-          }
+        receive: function(data)
+        {
+            id = data.id;
 
-          ni = ni+"</div>"+
-               "<div class=\"notice-options\">";
+            // Don't add it if it already exists
 
-          if (RealtimeUpdate._userid != 0) {
-               var input = $("form#form_notice fieldset input#token");
-               var session_key = input.val();
-               ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key);
-               ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']);
-               if (RealtimeUpdate._userid == data['user']['id']) {
+            if ($("#notice-"+id).length > 0) {
+                return;
+            }
+
+            var noticeItem = RealtimeUpdate.makeNoticeItem(data);
+            $("#notices_primary .notices").prepend(noticeItem, true);
+            $("#notices_primary .notice:first").css({display:"none"});
+            $("#notices_primary .notice:first").fadeIn(1000);
+            NoticeReply();
+        },
+
+        makeNoticeItem: function(data)
+        {
+            user = data['user'];
+            html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
+            source = data['source'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
+
+            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\">"+html+"</p>"+
+                "</div>"+
+                "<div class=\"entry-content\">"+
+                "<a class=\"timestamp\" rel=\"bookmark\" href=\""+data['url']+"\" >"+
+                "<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
+                "</a> "+
+                "<span class=\"source\">"+
+                "from "+
+                "<span class=\"device\">"+source+"</span>"+ // may have a link
+                "</span>";
+            if (data['in_reply_to_status_id']) {
+                ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
+            }
+
+            ni = ni+"</div>"+
+            "<div class=\"notice-options\">";
+
+            if (RealtimeUpdate._userid != 0) {
+                var input = $("form#form_notice fieldset input#token");
+                var session_key = input.val();
+                ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key);
+                ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']);
+                if (RealtimeUpdate._userid == data['user']['id']) {
                     ni = ni+RealtimeUpdate.makeDeleteLink(data['id']);
-               }
-          }
+                }
+             }
 
-          ni = ni+"</div>"+
-               "</li>";
-          return ni;
-     },
+            ni = ni+"</div>"+
+            "</li>";
+            return ni;
+        },
 
-     makeFavoriteForm: function(id, session_key)
-     {
-          var ff;
+        makeFavoriteForm: function(id, session_key)
+        {
+            var ff;
 
-          ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
-               "<fieldset>"+
-               "<legend>Favor this notice</legend>"+
-               "<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
-               "<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
-               "<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
-               "</fieldset>"+
-               "</form>";
-          return ff;
-     },
+            ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
+                "<fieldset>"+
+                "<legend>Favor this notice</legend>"+
+                "<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
+                "<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
+                "<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
+                "</fieldset>"+
+                "</form>";
+            return ff;
+        },
 
-     makeReplyLink: function(id, nickname)
-     {
-          var rl;
-          rl = "<a class=\"notice_reply\" href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span></a>";
-          return rl;
-     },
+        makeReplyLink: function(id, nickname)
+        {
+            var rl;
+            rl = "<a class=\"notice_reply\" href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span></a>";
+            return rl;
+        },
 
-     makeDeleteLink: function(id)
-     {
-          var dl, delurl;
-          delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
+        makeDeleteLink: function(id)
+        {
+            var dl, delurl;
+            delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
 
-          dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
+            dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
+
+            return dl;
+        }
+    }
+
+});
 
-          return dl;
-     },
-}

From 3bdf8423c408734ebb5ba614360e8b9048ff0039 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 21 Sep 2009 16:29:22 -0400
Subject: [PATCH 081/247] Fix typo is default hub url

---
 plugins/PubSubHubBub/PubSubHubBubPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/PubSubHubBub/PubSubHubBubPlugin.php b/plugins/PubSubHubBub/PubSubHubBubPlugin.php
index 013a234d73..d7061ac0ed 100644
--- a/plugins/PubSubHubBub/PubSubHubBubPlugin.php
+++ b/plugins/PubSubHubBub/PubSubHubBubPlugin.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-define('DEFAULT_HUB','http://2pubsubhubbub.appspot.com');
+define('DEFAULT_HUB','http://pubsubhubbub.appspot.com');
 
 require_once(INSTALLDIR.'/plugins/PubSubHubBub/publisher.php');
 

From 5cccbe987f9003ec4c40dbdcce254fe04069b107 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 21 Sep 2009 16:33:15 -0400
Subject: [PATCH 082/247] Use new queue handler event

---
 plugins/PubSubHubBub/PubSubHubBubPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/PubSubHubBub/PubSubHubBubPlugin.php b/plugins/PubSubHubBub/PubSubHubBubPlugin.php
index d7061ac0ed..e1e82e352c 100644
--- a/plugins/PubSubHubBub/PubSubHubBubPlugin.php
+++ b/plugins/PubSubHubBub/PubSubHubBubPlugin.php
@@ -59,7 +59,7 @@ class PubSubHubBubPlugin extends Plugin
         $action->element('atom:link',array('rel'=>'hub','href'=>$this->hub),null);
     }
 
-    function onEndNoticeSave($notice){
+    function onHandleQueuedNotice($notice){
         $publisher = new Publisher($this->hub);
 
         $feeds = array();

From ebb52efeb48212626d41a79b9d7e4f505323d074 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 21 Sep 2009 22:48:19 -0400
Subject: [PATCH 083/247] Make link href the long url so users can tell where
 links are going

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

diff --git a/lib/util.php b/lib/util.php
index 37744fc5b7..018b7cad51 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -536,7 +536,7 @@ function common_linkify($url) {
         throw new ServerException("Can't linkify url '$url'");
     }
 
-    $attrs = array('href' => $canon, 'rel' => 'external');
+    $attrs = array('href' => $longurl, 'rel' => 'external');
 
     $is_attachment = false;
     $attachment_id = null;

From f3c8fcccc1c90b6741a15963f3c6429a906bc97c Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 22 Sep 2009 11:12:55 -0400
Subject: [PATCH 084/247] Link hrefs are the short url, and title is the long
 url

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

diff --git a/lib/util.php b/lib/util.php
index 018b7cad51..bd15a56220 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -536,7 +536,7 @@ function common_linkify($url) {
         throw new ServerException("Can't linkify url '$url'");
     }
 
-    $attrs = array('href' => $longurl, 'rel' => 'external');
+    $attrs = array('href' => $canon, 'title' => $longurl, 'rel' => 'external');
 
     $is_attachment = false;
     $attachment_id = null;

From 2cabfba767ba0d92d34a6ea4e4cf91c7325f3e95 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 22 Sep 2009 19:34:10 -0400
Subject: [PATCH 085/247] Allow some punctuation instead of just spaces before
 @user, !group, and #tag

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

diff --git a/lib/util.php b/lib/util.php
index bd15a56220..441dcf68e3 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -391,10 +391,10 @@ function common_render_content($text, $notice)
 {
     $r = common_render_text($text);
     $id = $notice->profile_id;
-    $r = preg_replace('/(^|\s+)@([A-Za-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
+    $r = preg_replace('/(^|[\s\.\,\:\;]+)@([A-Za-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
     $r = preg_replace('/^T ([A-Z0-9]{1,64}) /e', "'T '.common_at_link($id, '\\1').' '", $r);
-    $r = preg_replace('/(^|\s+)@#([A-Za-z0-9]{1,64})/e', "'\\1@#'.common_at_hash_link($id, '\\2')", $r);
-    $r = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/e', "'\\1!'.common_group_link($id, '\\2')", $r);
+    $r = preg_replace('/(^|[\s\.\,\:\;]+)@#([A-Za-z0-9]{1,64})/e', "'\\1@#'.common_at_hash_link($id, '\\2')", $r);
+    $r = preg_replace('/(^|[\s\.\,\:\;]+)!([A-Za-z0-9]{1,64})/e', "'\\1!'.common_group_link($id, '\\2')", $r);
     return $r;
 }
 

From 4f833531dd5aa05e56ab00dd95eda4ce8419564d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 20 Jul 2009 19:04:48 -0400
Subject: [PATCH 086/247] start a module for schema management

---
 lib/schema.php | 124 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 lib/schema.php

diff --git a/lib/schema.php b/lib/schema.php
new file mode 100644
index 0000000000..db2f49a789
--- /dev/null
+++ b/lib/schema.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Database schema utilities
+ *
+ * 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  Database
+ * @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);
+}
+
+/**
+ * Class representing the database schema
+ *
+ * A class representing the database schema. Can be used to
+ * manipulate the schema -- especially for plugins and upgrade
+ * utilities.
+ *
+ * @category Database
+ * @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 Schema
+{
+    protected $db = null;
+
+    static function get()
+    {
+
+    }
+
+    public function getTableDef($name)
+    {
+    }
+
+    public function getColumnDef($table, $column)
+    {
+    }
+
+    public function getIndexDef($table, $index)
+    {
+    }
+
+    public function createTable($name, $columns, $indices=null)
+    {
+    }
+
+    public function dropTable($name)
+    {
+    }
+
+    public function createIndex($name, $table, $columns)
+    {
+    }
+
+    public function dropIndex($name, $table)
+    {
+    }
+
+    public function addColumn($table, $columndef)
+    {
+    }
+
+    public function modifyColumn($table, $column, $columndef)
+    {
+    }
+
+    public function dropColumn($table, $column)
+    {
+    }
+
+    public function ensureTable($name, $columns, $indices)
+    {
+        $def = $this->tableDef($name);
+        if (empty($def)) {
+            return $this->createTable($name, $columns, $indices);
+        }
+    }
+}
+
+class TableDef
+{
+    public $name;
+    public $columns;
+}
+
+class ColumnDef
+{
+    public $name;
+    public $type;
+    public $size;
+}
+
+class IndexDef
+{
+    public $name;
+    public $table;
+    public $columns;
+}

From f31653ca5bc06db4d1a2a2dc8a1943f2d99f735a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 24 Aug 2009 11:22:40 -0400
Subject: [PATCH 087/247] make table def method of schema code work

---
 lib/schema.php | 58 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/lib/schema.php b/lib/schema.php
index db2f49a789..624765eb2e 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -47,15 +47,65 @@ if (!defined('LACONICA')) {
 
 class Schema
 {
-    protected $db = null;
+    static $_single = null;
+    protected $conn = null;
+
+    protected function __construct()
+    {
+        // XXX: there should be an easier way to do this.
+        $user = new User();
+        $this->conn = $user->getDatabaseConnection();
+        $user->free();
+        unset($user);
+    }
 
     static function get()
     {
-
+        if (empty(self::$_single)) {
+            self::$_single = new Schema();
+        }
+        return self::$_single;
     }
 
     public function getTableDef($name)
     {
+        $res =& $this->conn->query('DESCRIBE ' . $name);
+
+        if (PEAR::isError($res)) {
+            throw new Exception($res->getMessage());
+        }
+
+        $td = new TableDef();
+
+        $td->name    = $name;
+        $td->columns = array();
+
+        $row = array();
+
+        while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
+
+            $cd = new ColumnDef();
+
+            $cd->name = $row['Field'];
+
+            $packed = $row['Type'];
+
+            if (preg_match('/^(\w+)\((\d+)\)$/', $packed, $match)) {
+                $cd->type = $match[1];
+                $cd->size = $match[2];
+            } else {
+                $cd->type = $packed;
+            }
+
+            $cd->nullable = ($row['Null'] == 'YES') ? true : false;
+            $cd->key      = $row['Key'];
+            $cd->default  = $row['Default'];
+            $cd->extra    = $row['Extra'];
+
+            $td->columns[] = $cd;
+        }
+
+        return $td;
     }
 
     public function getColumnDef($table, $column)
@@ -114,6 +164,10 @@ class ColumnDef
     public $name;
     public $type;
     public $size;
+    public $nullable;
+    public $key;
+    public $default;
+    public $extra;
 }
 
 class IndexDef

From bd8a2dbfd68289a4f025964647320f8ef5e857aa Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 24 Aug 2009 11:23:02 -0400
Subject: [PATCH 088/247] test script for schema code

---
 scripts/showtable.php | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 scripts/showtable.php

diff --git a/scripts/showtable.php b/scripts/showtable.php
new file mode 100644
index 0000000000..30f0bb5a90
--- /dev/null
+++ b/scripts/showtable.php
@@ -0,0 +1,41 @@
+#!/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/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$helptext = <<<END_OF_SHOWTABLE_HELP
+showtable.php <tablename>
+Shows the structure of a table
+
+END_OF_SHOWTABLE_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (count($args) != 1) {
+    show_help();
+}
+
+$name = $args[0];
+
+$schema = Schema::get();
+
+$td = $schema->getTableDef($name);
+
+print_r($td);

From e206324f245145a0e8c9ec0535cba1d62344ebf7 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 09:20:04 -0400
Subject: [PATCH 089/247] statusize schema-related modules

---
 lib/schema.php        | 18 +++++++++---------
 scripts/showtable.php |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/schema.php b/lib/schema.php
index 624765eb2e..d3b30aeeb5 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Database schema utilities
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Database
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -39,10 +39,10 @@ if (!defined('LACONICA')) {
  * utilities.
  *
  * @category Database
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class Schema
diff --git a/scripts/showtable.php b/scripts/showtable.php
index 30f0bb5a90..eb18a98e20 100644
--- a/scripts/showtable.php
+++ b/scripts/showtable.php
@@ -1,8 +1,8 @@
 #!/usr/bin/env php
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, 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

From 42ba05de5fa9413ce0f383cfdafa7288e291ab17 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 09:33:40 -0400
Subject: [PATCH 090/247] revert output buffering (costly) for ETags (low
 priority)

---
 index.php      |  2 +-
 lib/action.php | 41 +++++------------------------------------
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/index.php b/index.php
index fa94f0c75e..362ab3cd37 100644
--- a/index.php
+++ b/index.php
@@ -233,7 +233,7 @@ function main()
 
         try {
             if ($action_obj->prepare($args)) {
-                $action_obj->handleWrapper($args);
+                $action_obj->handle($args);
             }
         } catch (ClientException $cex) {
             $cac = new ClientErrorAction($cex->getMessage(), $cex->getCode());
diff --git a/lib/action.php b/lib/action.php
index ebef4f9e43..670eb498c1 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -873,29 +873,28 @@ class Action extends HTMLOutputter // lawsuit
     }
 
     /**
-     * Wrapper for the handle method that handles etags, last-modified, and other conditional headers
+     * Handler method
      *
      * @param array $argarray is ignored since it's now passed in in prepare()
      *
      * @return boolean is read only action?
      */
-    function handleWrapper($argarray=null)
+    function handle($argarray=null)
     {
-        header('Vary: Accept-Encoding,Cookie,Accept-Language,Authorization');
-        header("Cache-Control: must-revalidate");
+        header('Vary: Accept-Encoding,Cookie');
         $lm   = $this->lastModified();
         $etag = $this->etag();
         if ($etag) {
             header('ETag: ' . $etag);
         }
-        $if_none_match = (array_key_exists('HTTP_IF_NONE_MATCH', $_SERVER)) ?
-          $_SERVER['HTTP_IF_NONE_MATCH'] : null;
         if ($lm) {
             header('Last-Modified: ' . date(DATE_RFC1123, $lm));
             if (array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) {
                 $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
                 $ims = strtotime($if_modified_since);
                 if ($lm <= $ims) {
+                    $if_none_match = (array_key_exists('HTTP_IF_NONE_MATCH', $_SERVER)) ?
+                      $_SERVER['HTTP_IF_NONE_MATCH'] : null;
                     if (!$if_none_match ||
                         !$etag ||
                         $this->_hasEtag($etag, $if_none_match)) {
@@ -906,36 +905,6 @@ class Action extends HTMLOutputter // lawsuit
                 }
             }
         }
-        if($etag) {
-            $ret = $this->handle($argarray);
-        }else{
-            ob_start();
-            $ret = $this->handle($argarray);
-            $output = ob_get_contents();
-            ob_end_clean();
-            //deep etag
-            $etag = md5($output);
-            header('ETag: ' . $etag);
-            if($if_none_match && $this->_hasEtag($etag, $if_none_match)) {
-                header('HTTP/1.1 304 Not Modified');
-                // Better way to do this?
-                exit(0);
-            }
-            header('Content-Length: '.strlen($output));
-            print $output;
-        }
-        return $ret;
-    }
-
-    /**
-     * Handler method
-     *
-     * @param array $argarray is ignored since it's now passed in in prepare()
-     *
-     * @return boolean is read only action?
-     */
-    function handle($argarray=null)
-    {
     }
 
     /**

From bef4a8b6ba9e19f2ec629031444279ca76f17bcf Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 09:34:55 -0400
Subject: [PATCH 091/247] Revert "When viewing a page in https, all links to
 non-actions (links to CSS, JS, etc) should be https. Fixes the mixed content
 warnings that browsers display."

This reverts commit 20997619b353faa94591800fbfc02bc19a4cdce3.

The commit doesn't take into account having different servers (theme
server, avatar server) and being able to set HTTPS for some but not all.
---
 lib/util.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 5b57b79b54..b831859e99 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -750,18 +750,8 @@ function common_local_url($action, $args=null, $params=null, $fragment=null)
     return $url;
 }
 
-function common_path($relative, $ssl=null)
+function common_path($relative, $ssl=false)
 {
-    if($ssl==null) {
-        //ssl was not specifically requested
-        if( $_SERVER['HTTPS'] && $_SERVER['HTTPS']!="off" ) {
-            //currently in https, so stay in https
-            $ssl=true;
-        } else {
-            //not in https, so stay not in https
-            $ssl=false;
-        }
-    }
     $pathpart = (common_config('site', 'path')) ? common_config('site', 'path')."/" : '';
 
     if (($ssl && (common_config('site', 'ssl') === 'sometimes'))

From e6cbe3a26938ca8d88d44bacc6c40ba09f5f1fd1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 11:07:22 -0400
Subject: [PATCH 092/247] Revert "Added a check for any URL param. If found,
 strips them out before"

This reverts commit 13de845e95da9ea579516c4480789819c9a26edd.
---
 plugins/Meteor/meteorupdater.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index 91d12cde9c..a7c87330c9 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -11,17 +11,11 @@ var MeteorUpdater = function()
             Meteor.callbacks["process"] = function(data) {
                 var d = JSON.parse(data);
 
-                var user_url = $('address .url')[0].href+d['user']['screen_name'];
-
-                var wlh = window.location.href;
-
-                if (wlh.indexOf('?') > 0) {
-                   wlh = wlh.slice(0, wlh.indexOf('?'))
-                }
+                $user_url = $('address .url')[0].href+d['user']['screen_name'];
 
                 if (timeline == 'public' ||
-                    user_url+'/all' == wlh ||
-                    user_url == wlh) {
+                    $user_url+'/all' == window.location.href ||
+                    $user_url == window.location.href) {
 
                     RealtimeUpdate.receive(d);
                 }

From 87ff03890e6512bf4cf336c5583382e22bb75414 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 11:07:56 -0400
Subject: [PATCH 093/247] Revert "Made it slighly more compact with less jQuery
 selection"

This reverts commit c9bc3900909a85b9b4be31c4dac7f809127a8bf0.
---
 plugins/Meteor/meteorupdater.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index a7c87330c9..82594d91c7 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -8,15 +8,15 @@ var MeteorUpdater = function()
 
         init: function(server, port, timeline)
         {
+            var screen_name;
+
             Meteor.callbacks["process"] = function(data) {
                 var d = JSON.parse(data);
-
-                $user_url = $('address .url')[0].href+d['user']['screen_name'];
+                screen_name = d['user']['screen_name'];
 
                 if (timeline == 'public' ||
-                    $user_url+'/all' == window.location.href ||
-                    $user_url == window.location.href) {
-
+                    $('address .url')[0].href+screen_name+'/all' == window.location.href ||
+                    $('address .url')[0].href+screen_name == window.location.href) {
                     RealtimeUpdate.receive(d);
                 }
             };

From 35eb33fe2bd0d41fb4c03000c557c36125b2c809 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 11:08:12 -0400
Subject: [PATCH 094/247] Revert "Fixed indenting"

This reverts commit 182257cbbf1557c2671b1995c9126c45b0bd8e79.
---
 plugins/Meteor/meteorupdater.js | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index 82594d91c7..de01d430a1 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -4,28 +4,28 @@
 
 var MeteorUpdater = function()
 {
-    return {
+     return {
 
-        init: function(server, port, timeline)
-        {
-            var screen_name;
+          init: function(server, port, timeline)
+          {
+               var screen_name;
 
-            Meteor.callbacks["process"] = function(data) {
-                var d = JSON.parse(data);
-                screen_name = d['user']['screen_name'];
+               Meteor.callbacks["process"] = function(data) {
+                    var d = JSON.parse(data);
+                    screen_name = d['user']['screen_name'];
 
-                if (timeline == 'public' ||
-                    $('address .url')[0].href+screen_name+'/all' == window.location.href ||
-                    $('address .url')[0].href+screen_name == window.location.href) {
-                    RealtimeUpdate.receive(d);
-                }
-            };
+                    if (timeline == 'public' ||
+                        $('address .url')[0].href+screen_name+'/all' == window.location.href ||
+                        $('address .url')[0].href+screen_name == window.location.href) {
+                        RealtimeUpdate.receive(d);
+                    }
+               };
 
-            Meteor.host = server;
-            Meteor.port = port;
-            Meteor.joinChannel(timeline, 0);
-            Meteor.connect();
-        }
-    }
+               Meteor.host = server;
+               Meteor.port = port;
+               Meteor.joinChannel(timeline, 0);
+               Meteor.connect();
+          }
+     }
 }();
 

From 6cb2f89983f89fb7f4559fe607ca2af2c6729d27 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 11:08:35 -0400
Subject: [PATCH 095/247] Revert "Added realtime streams for all and showstream
 timelines"

This reverts commit 49e91ec7d068fa7b98576207696d2192418baf5b.
---
 plugins/Meteor/meteorupdater.js     | 11 +---------
 plugins/Realtime/RealtimePlugin.php | 34 +++++++++++++----------------
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index de01d430a1..9ce68775bf 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -8,17 +8,8 @@ var MeteorUpdater = function()
 
           init: function(server, port, timeline)
           {
-               var screen_name;
-
                Meteor.callbacks["process"] = function(data) {
-                    var d = JSON.parse(data);
-                    screen_name = d['user']['screen_name'];
-
-                    if (timeline == 'public' ||
-                        $('address .url')[0].href+screen_name+'/all' == window.location.href ||
-                        $('address .url')[0].href+screen_name == window.location.href) {
-                        RealtimeUpdate.receive(d);
-                    }
+                    RealtimeUpdate.receive(JSON.parse(data));
                };
 
                Meteor.host = server;
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 611b1d86c9..4548822610 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -63,22 +63,20 @@ class RealtimePlugin extends Plugin
     {
         $path = null;
 
-        $a = $action->trimmed('action');
-
-        switch ($a) {
-            case 'public': case 'all': case 'replies': case 'showstream':
-                $path = array($a);
-                break;
-            case 'tag':
-                $tag = $action->trimmed('tag');
-                if (!empty($tag)) {
-                    $path = array('tag', $tag);
-                } else {
-                    return true;
-                }
-                break;
-             default:
+        switch ($action->trimmed('action')) {
+         case 'public':
+            $path = array('public');
+            break;
+         case 'tag':
+            $tag = $action->trimmed('tag');
+            if (!empty($tag)) {
+                $path = array('tag', $tag);
+            } else {
                 return true;
+            }
+            break;
+         default:
+            return true;
         }
 
         $timeline = $this->_pathToChannel($path);
@@ -116,13 +114,11 @@ class RealtimePlugin extends Plugin
     {
         $paths = array();
 
-        // TODO: Replies timeline
+        // XXX: Add other timelines; this is just for the public one
 
         if ($notice->is_local ||
             ($notice->is_local == 0 && !common_config('public', 'localonly'))) {
-            foreach (array('public', 'all', 'replies', 'showstream') as $a) {
-                $paths[] = array($a);
-            }
+            $paths[] = array('public');
         }
 
         $tags = $this->getNoticeTags($notice);

From 13976f5796f24725280f4ff33901349df4668f50 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 23 Sep 2009 17:22:51 +0000
Subject: [PATCH 096/247] JavaScript fixes for IE

---
 plugins/Realtime/realtimeupdate.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index da2f9ed3aa..d034deef16 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -17,7 +17,7 @@ $(document).ready(function() {
 
         $('#realtime_timeline').click(function() {
             window.open($(this).parent('a').attr('href')+'?realtime=1',
-                        $(this).parent('a').attr('title'),
+                        $('body').attr('id'),
                         'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
 
             return false;
@@ -25,8 +25,8 @@ $(document).ready(function() {
     }
     else {
         window.resizeTo(575, 640);
-        address = $('address');
-        content = $('#content');
+        var address = $('address');
+        var content = $('#content');
         $('body').html(address);
         $('address').hide();
         $('body').append(content);

From 1fe11eabb675fa876bdbcd5884231ffd6fa278ff Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 17:07:20 -0400
Subject: [PATCH 097/247] Do realtime popup with PHP instead of Javascript

Move the realtime detection code to PHP extension rather than
JavaScript.
---
 plugins/Realtime/RealtimePlugin.php | 110 ++++++++++----
 plugins/Realtime/realtimeupdate.js  | 222 ++++++++++++----------------
 2 files changed, 177 insertions(+), 155 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 4548822610..22851a6c14 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -50,6 +50,11 @@ class RealtimePlugin extends Plugin
     protected $favorurl = null;
     protected $deleteurl = null;
 
+    /**
+     * When it's time to initialize the plugin, calculate and
+     * pass the URLs we need.
+     */
+
     function onInitializePlugin()
     {
         $this->replyurl = common_local_url('newnotice');
@@ -57,30 +62,20 @@ class RealtimePlugin extends Plugin
         // FIXME: need to find a better way to pass this pattern in
         $this->deleteurl = common_local_url('deletenotice',
                                             array('notice' => '0000000000'));
+        return true;
     }
 
     function onEndShowScripts($action)
     {
-        $path = null;
+        $timeline = $this->_getTimeline($action);
 
-        switch ($action->trimmed('action')) {
-         case 'public':
-            $path = array('public');
-            break;
-         case 'tag':
-            $tag = $action->trimmed('tag');
-            if (!empty($tag)) {
-                $path = array('tag', $tag);
-            } else {
-                return true;
-            }
-            break;
-         default:
+        // If there's not a timeline on this page,
+        // just return true
+
+        if (empty($timeline)) {
             return true;
         }
 
-        $timeline = $this->_pathToChannel($path);
-
         $scripts = $this->_getScripts();
 
         foreach ($scripts as $script) {
@@ -95,16 +90,14 @@ class RealtimePlugin extends Plugin
             $user_id = 0;
         }
 
-        $action->script('plugins/Realtime/jquery.getUrlParam.js');
-
         $action->elementStart('script', array('type' => 'text/javascript'));
-        $action->raw('
-        <!--
-        $(document).ready(function() {
-            ' . $this->_updateInitialize($timeline, $user_id) . '
-        });
-        -->
-        ');
+
+        $script = ' $(document).ready(function() { '.
+          $this->_updateInitialize($timeline, $user_id).
+          '}); ';
+
+        $action->raw($script);
+
         $action->elementEnd('script');
 
         return true;
@@ -146,6 +139,47 @@ class RealtimePlugin extends Plugin
         return true;
     }
 
+    function onStartShowPageNotice($action)
+    {
+        $timeline = $this->_getTimeline($action);
+        if (!empty($timeline)) {
+            $base = $action->selfUrl();
+            if (mb_strstr($url, '?')) {
+                $url = $base . '&realtime=1';
+            } else {
+                $url = $base . '?realtime=1';
+            }
+            $title = $action->title();
+            $code = "window.open('$url', '$title', 'toolbar=no,resizable=yes,scrollbars=yes,status=yes,height=640,width=575');";
+            $action->element('a', array('href' => $base,
+                                        'onclick' => $code,
+                                        'id' => 'realtime_timeline',
+                                        'title' => _('Pop up')),
+                             'Pop up');
+
+        }
+        return true;
+    }
+
+    function onStartShowBody($action)
+    {
+        $realtime = $action->boolean('realtime');
+        if (!$realtime) {
+            return true;
+        }
+
+        $action->elementStart('body',
+                              (common_current_user()) ? array('id' => $action->trimmed('action'),
+                                                              'class' => 'user_in')
+                              : array('id' => $action->trimmed('action')));
+        if (common_logged_in()) {
+            $action->showNoticeForm();
+        }
+        $action->showContent();
+        $action->elementEnd('body');
+        return false; // No default processing
+    }
+
     function noticeAsJson($notice)
     {
         // FIXME: this code should be abstracted to a neutral third
@@ -230,4 +264,30 @@ class RealtimePlugin extends Plugin
     {
         return '';
     }
+
+    function _getTimeline($action)
+    {
+        $path = null;
+        $timeline = null;
+
+        switch ($action->trimmed('action')) {
+         case 'public':
+            $path = array('public');
+            break;
+         case 'tag':
+            $tag = $action->trimmed('tag');
+            if (!empty($tag)) {
+                $path = array('tag', $tag);
+            }
+            break;
+         default:
+            break;
+        }
+
+        if (!is_null($path)) {
+            $timeline = $this->_pathToChannel($path);
+        }
+
+        return $timeline;
+    }
 }
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index da2f9ed3aa..3293ef6e9f 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -1,152 +1,114 @@
-$(document).ready(function() {
-    if (!$(document).getUrlParam('realtime')) {
-        $('#site_nav_local_views .current a').append('<button id="realtime_timeline" title="Pop this tab">&#8599;</button>');
+// add a notice encoded as JSON into the current timeline
+//
+// TODO: i18n
 
-        $('#realtime_timeline').css({
-            'margin':'2px 0 0 11px',
-            'background':'transparent url('+$('address .url')[0].href+'/plugins/Realtime/icon_external.gif) no-repeat 45% 45%',
-            'text-indent':'-9999px',
-            'width':'16px',
-            'height':'16px',
-            'padding':'0',
-            'display':'block',
-            'float':'right',
-            'border':'none',
-            'cursor':'pointer'
-        });
+RealtimeUpdate = {
+     _userid: 0,
+     _replyurl: '',
+     _favorurl: '',
+     _deleteurl: '',
 
-        $('#realtime_timeline').click(function() {
-            window.open($(this).parent('a').attr('href')+'?realtime=1',
-                        $(this).parent('a').attr('title'),
-                        'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
+     init: function(userid, replyurl, favorurl, deleteurl)
+     {
+        RealtimeUpdate._userid = userid;
+        RealtimeUpdate._replyurl = replyurl;
+        RealtimeUpdate._favorurl = favorurl;
+        RealtimeUpdate._deleteurl = deleteurl;
+     },
 
-            return false;
-        });
-    }
-    else {
-        window.resizeTo(575, 640);
-        address = $('address');
-        content = $('#content');
-        $('body').html(address);
-        $('address').hide();
-        $('body').append(content);
-        $('#content').css({'width':'92%'});
-    }
+     receive: function(data)
+     {
+          id = data.id;
 
+          // Don't add it if it already exists
+          //
+          if ($("#notice-"+id).length > 0) {
+               return;
+          }
 
-    // add a notice encoded as JSON into the current timeline
-    //
-    // TODO: i18n
+          var noticeItem = RealtimeUpdate.makeNoticeItem(data);
+          $("#notices_primary .notices").prepend(noticeItem, true);
+          $("#notices_primary .notice:first").css({display:"none"});
+          $("#notices_primary .notice:first").fadeIn(1000);
+          NoticeReply();
+     },
 
-    RealtimeUpdate = {
-        _userid: 0,
-        _replyurl: '',
-        _favorurl: '',
-        _deleteurl: '',
+     makeNoticeItem: function(data)
+     {
+          user = data['user'];
+          html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
+          source = data['source'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
 
-        init: function(userid, replyurl, favorurl, deleteurl)
-        {
-            RealtimeUpdate._userid = userid;
-            RealtimeUpdate._replyurl = replyurl;
-            RealtimeUpdate._favorurl = favorurl;
-            RealtimeUpdate._deleteurl = deleteurl;
-        },
-
-        receive: function(data)
-        {
-            id = data.id;
-
-            // Don't add it if it already exists
-
-            if ($("#notice-"+id).length > 0) {
-                return;
-            }
-
-            var noticeItem = RealtimeUpdate.makeNoticeItem(data);
-            $("#notices_primary .notices").prepend(noticeItem, true);
-            $("#notices_primary .notice:first").css({display:"none"});
-            $("#notices_primary .notice:first").fadeIn(1000);
-            NoticeReply();
-        },
-
-        makeNoticeItem: function(data)
-        {
-            user = data['user'];
-            html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
-            source = data['source'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
-
-            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\">"+html+"</p>"+
-                "</div>"+
-                "<div class=\"entry-content\">"+
-                "<a class=\"timestamp\" rel=\"bookmark\" href=\""+data['url']+"\" >"+
-                "<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
-                "</a> "+
-                "<span class=\"source\">"+
-                "from "+
+          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\">"+html+"</p>"+
+               "</div>"+
+               "<div class=\"entry-content\">"+
+               "<a class=\"timestamp\" rel=\"bookmark\" href=\""+data['url']+"\" >"+
+               "<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
+               "</a> "+
+               "<span class=\"source\">"+
+               "from "+
                 "<span class=\"device\">"+source+"</span>"+ // may have a link
-                "</span>";
-            if (data['in_reply_to_status_id']) {
-                ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
-            }
+               "</span>";
+          if (data['in_reply_to_status_id']) {
+               ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
+          }
 
-            ni = ni+"</div>"+
+          ni = ni+"</div>"+
             "<div class=\"notice-options\">";
 
-            if (RealtimeUpdate._userid != 0) {
-                var input = $("form#form_notice fieldset input#token");
-                var session_key = input.val();
-                ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key);
-                ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']);
-                if (RealtimeUpdate._userid == data['user']['id']) {
+          if (RealtimeUpdate._userid != 0) {
+               var input = $("form#form_notice fieldset input#token");
+               var session_key = input.val();
+               ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key);
+               ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']);
+               if (RealtimeUpdate._userid == data['user']['id']) {
                     ni = ni+RealtimeUpdate.makeDeleteLink(data['id']);
-                }
-             }
+               }
+          }
 
-            ni = ni+"</div>"+
-            "</li>";
-            return ni;
-        },
+          ni = ni+"</div>"+
+               "</li>";
+          return ni;
+     },
 
-        makeFavoriteForm: function(id, session_key)
-        {
-            var ff;
+     makeFavoriteForm: function(id, session_key)
+     {
+          var ff;
 
-            ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
+          ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
                 "<fieldset>"+
-                "<legend>Favor this notice</legend>"+
-                "<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
-                "<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
-                "<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
+               "<legend>Favor this notice</legend>"+
+               "<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
+               "<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
+               "<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
                 "</fieldset>"+
-                "</form>";
-            return ff;
+               "</form>";
+          return ff;
+     },
+
+     makeReplyLink: function(id, nickname)
+     {
+          var rl;
+          rl = "<a class=\"notice_reply\" href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span></a>";
+          return rl;
         },
 
-        makeReplyLink: function(id, nickname)
-        {
-            var rl;
-            rl = "<a class=\"notice_reply\" href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span></a>";
-            return rl;
-        },
+     makeDeleteLink: function(id)
+     {
+          var dl, delurl;
+          delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
 
-        makeDeleteLink: function(id)
-        {
-            var dl, delurl;
-            delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
+          dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
 
-            dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
-
-            return dl;
-        }
-    }
-
-});
+          return dl;
+     }
+}
 

From 5152d31d2a4199306d656480ca5ff8d0978d8984 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 17:28:14 -0400
Subject: [PATCH 098/247] Add some more realtime feeds

---
 plugins/Realtime/RealtimePlugin.php | 67 +++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 22851a6c14..0f3e310714 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -107,13 +107,23 @@ class RealtimePlugin extends Plugin
     {
         $paths = array();
 
-        // XXX: Add other timelines; this is just for the public one
+        // Add to the author's timeline
+
+        $user = User::staticGet('id', $notice->profile_id);
+
+        if (!empty($user)) {
+            $paths[] = array('showstream', $user->nickname);
+        }
+
+        // Add to the public timeline
 
         if ($notice->is_local ||
             ($notice->is_local == 0 && !common_config('public', 'localonly'))) {
             $paths[] = array('public');
         }
 
+        // Add to the tags timeline
+
         $tags = $this->getNoticeTags($notice);
 
         if (!empty($tags)) {
@@ -122,6 +132,46 @@ class RealtimePlugin extends Plugin
             }
         }
 
+        // Add to inbox timelines
+        // XXX: do a join
+
+        $inbox = new Notice_inbox();
+        $inbox->notice_id = $notice->id;
+
+        if ($inbox->find()) {
+            while ($inbox->fetch()) {
+                $user = User::staticGet('id', $inbox->user_id);
+                $paths[] = array('all', $user->nickname);
+            }
+        }
+
+        // Add to the replies timeline
+
+        $reply = new Reply();
+        $reply->notice_id = $notice->id;
+
+        if ($reply->find()) {
+            while ($reply->fetch()) {
+                $user = User::staticGet('id', $reply->profile_id);
+                if (!empty($user)) {
+                    $paths[] = array('replies', $user->nickname);
+                }
+            }
+        }
+
+        // Add to the group timeline
+        // XXX: join
+
+        $gi = new Group_inbox();
+        $gi->notice_id = $notice->id;
+
+        if ($gi->find()) {
+            while ($gi->fetch()) {
+                $ug = User_group::staticGet('id', $gi->group_id);
+                $paths[] = array('showgroup', $ug->nickname);
+            }
+        }
+
         if (count($paths) > 0) {
 
             $json = $this->noticeAsJson($notice);
@@ -270,7 +320,9 @@ class RealtimePlugin extends Plugin
         $path = null;
         $timeline = null;
 
-        switch ($action->trimmed('action')) {
+        $action_name = $action->trimmed('action');
+
+        switch ($action_name) {
          case 'public':
             $path = array('public');
             break;
@@ -280,11 +332,20 @@ class RealtimePlugin extends Plugin
                 $path = array('tag', $tag);
             }
             break;
+         case 'showstream':
+         case 'all':
+         case 'replies':
+         case 'showgroup':
+            $nickname = common_canonical_nickname($action->trimmed('nickname'));
+            if (!empty($nickname)) {
+                $path = array($action_name, $nickname);
+            }
+            break;
          default:
             break;
         }
 
-        if (!is_null($path)) {
+        if (!empty($path)) {
             $timeline = $this->_pathToChannel($path);
         }
 

From 36e009349d68d8f34fc50d77c26e6e3307116b2c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 14:58:42 -0400
Subject: [PATCH 099/247] hack around address hack in util.js

---
 plugins/Realtime/RealtimePlugin.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 0f3e310714..c41c9ce4ac 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -222,6 +222,16 @@ class RealtimePlugin extends Plugin
                               (common_current_user()) ? array('id' => $action->trimmed('action'),
                                                               'class' => 'user_in')
                               : array('id' => $action->trimmed('action')));
+
+        // XXX hack to deal with JS that tries to get the
+        // root url from page output
+
+        $action->elementStart('address');
+        $action->element('a', array('class' => 'url',
+                                  'href' => common_local_url('public')),
+                         '');
+        $action->elementEnd('address');
+
         if (common_logged_in()) {
             $action->showNoticeForm();
         }

From bdbc2cb8de370eef6d5d06412746f52797ea0458 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 15:24:12 -0400
Subject: [PATCH 100/247] move some stuff around for realtime

---
 plugins/Realtime/RealtimePlugin.php | 32 +++++++++--------------------
 plugins/Realtime/realtimeupdate.js  |  5 +++++
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index c41c9ce4ac..fde3060216 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -76,6 +76,15 @@ class RealtimePlugin extends Plugin
             return true;
         }
 
+        $base = $action->selfUrl();
+        if (mb_strstr($url, '?')) {
+            $url = $base . '&realtime=1';
+        } else {
+            $url = $base . '?realtime=1';
+        }
+
+        $title = $action->title();
+
         $scripts = $this->_getScripts();
 
         foreach ($scripts as $script) {
@@ -94,6 +103,7 @@ class RealtimePlugin extends Plugin
 
         $script = ' $(document).ready(function() { '.
           $this->_updateInitialize($timeline, $user_id).
+          ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'"); '.
           '}); ';
 
         $action->raw($script);
@@ -189,28 +199,6 @@ class RealtimePlugin extends Plugin
         return true;
     }
 
-    function onStartShowPageNotice($action)
-    {
-        $timeline = $this->_getTimeline($action);
-        if (!empty($timeline)) {
-            $base = $action->selfUrl();
-            if (mb_strstr($url, '?')) {
-                $url = $base . '&realtime=1';
-            } else {
-                $url = $base . '?realtime=1';
-            }
-            $title = $action->title();
-            $code = "window.open('$url', '$title', 'toolbar=no,resizable=yes,scrollbars=yes,status=yes,height=640,width=575');";
-            $action->element('a', array('href' => $base,
-                                        'onclick' => $code,
-                                        'id' => 'realtime_timeline',
-                                        'title' => _('Pop up')),
-                             'Pop up');
-
-        }
-        return true;
-    }
-
     function onStartShowBody($action)
     {
         $realtime = $action->boolean('realtime');
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 3293ef6e9f..04e07956d5 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -109,6 +109,11 @@ RealtimeUpdate = {
           dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
 
           return dl;
+     },
+
+     addPopup: function(url, title)
+     {
+          // FIXME: need to add the realtime popup button here
      }
 }
 

From 49b701f9ec6d7795147f94c43eaf744a96efb199 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 23 Sep 2009 13:45:51 -0700
Subject: [PATCH 101/247] Started refactoring API into individual actions

---
 actions/apifriendstimeline.php | 161 +++++++++++++++++++++++++++++++++
 lib/router.php                 |  16 +++-
 lib/twitterapi.php             | 127 +++++++++++++++++++++++++-
 3 files changed, 297 insertions(+), 7 deletions(-)
 create mode 100644 actions/apifriendstimeline.php

diff --git a/actions/apifriendstimeline.php b/actions/apifriendstimeline.php
new file mode 100644
index 0000000000..ea38ec022e
--- /dev/null
+++ b/actions/apifriendstimeline.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show the friends timeline
+ *
+ * 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  Personal
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/twitterapi.php';
+
+class ApifriendstimelineAction extends TwitterapiAction
+{
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        return true;
+
+    }
+
+    function handle($args) {
+
+        parent::handle($args);
+        common_debug(var_export($args, true));
+
+        if ($this->requiresAuth()) {
+            if ($this->showBasicAuthHeader()) {
+                $this->showTimeline();
+            }
+        } else {
+            $this->showTimeline();
+        }
+    }
+
+    function showTimeline()
+    {
+        common_debug('Auth user = ' . var_export($this->auth_user, true));
+
+        $user = $this->getTargetUser($this->arg('id'));
+
+        if (empty($user)) {
+            $this->clientError(_('No such user!'), 404, $this->arg('format'));
+            return;
+        }
+
+        $profile    = $user->getProfile();
+        $sitename   = common_config('site', 'name');
+        $title      = sprintf(_("%s and friends"), $user->nickname);
+        $taguribase = common_config('integration', 'taguri');
+        $id         = "tag:$taguribase:FriendsTimeline:" . $user->id;
+        $link       = common_local_url('all',
+            array('nickname' => $user->nickname));
+        $subtitle   = sprintf(_('Updates from %1$s and friends on %2$s!'),
+            $user->nickname, $sitename);
+
+        $page     = (int)$this->arg('page', 1);
+        $count    = (int)$this->arg('count', 20);
+        $max_id   = (int)$this->arg('max_id', 0);
+        $since_id = (int)$this->arg('since_id', 0);
+        $since    = $this->arg('since');
+
+        if (!empty($this->auth_user) && $this->auth_user->id == $user->id) {
+            $notice = $user->noticeInbox(($page-1)*$count,
+                $count, $since_id, $max_id, $since);
+        } else {
+            $notice = $user->noticesWithFriends(($page-1)*$count,
+                $count, $since_id, $max_id, $since);
+        }
+
+        switch($this->arg('format')) {
+        case 'xml':
+            $this->show_xml_timeline($notice);
+            break;
+        case 'rss':
+            $this->show_rss_timeline($notice, $title, $link, $subtitle);
+            break;
+        case 'atom':
+
+            $target_id = $this->arg('id');
+
+            if (isset($target_id)) {
+                $selfuri = common_root_url() .
+                    'api/statuses/friends_timeline/' .
+                        $target_id . '.atom';
+            } else {
+                $selfuri = common_root_url() .
+                    'api/statuses/friends_timeline.atom';
+            }
+            $this->show_atom_timeline($notice, $title, $id, $link,
+                $subtitle, null, $selfuri);
+            break;
+        case 'json':
+            $this->show_json_timeline($notice);
+            break;
+        default:
+            $this->clientError(_('API method not found!'), $code = 404);
+        }
+
+    }
+
+    function requiresAuth()
+    {
+        return true;
+    }
+
+    /**
+     * Is this page read-only?
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this page last modified?
+     *
+     */
+
+    function lastModified()
+    {
+
+    }
+
+}
\ No newline at end of file
diff --git a/lib/router.php b/lib/router.php
index 2c4d63b0d7..0e5fe3a54f 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -262,15 +262,27 @@ class Router
 
         // statuses API
 
+        $m->connect('api/statuses/friends_timeline.:format',
+                    array('action' => 'apifriendstimeline',
+                          'format' => '(xml|json|rss|atom)'));
+
+        $m->connect('api/statuses/friends_timeline/:id.:format',
+                    array('action' => 'apifriendstimeline',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json|rss|atom)'));
+
+        $m->connect('api/statuses/home_timeline',
+                    array('action' => 'apifriendstimeline'));
+
         $m->connect('api/statuses/:method',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(public_timeline|home_timeline|friends_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+                    array('method' => '(public_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
 
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
+                    array('method' => '(user_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         // users
 
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index d199e4dee2..ac5c5b4239 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -502,7 +502,7 @@ class TwitterapiAction extends Action
             $enclosure = $entry['enclosures'][0];
             $this->element('enclosure', array('url'=>$enclosure['url'],'type'=>$enclosure['mimetype'],'length'=>$enclosure['size']), null);
         }
-        
+
         if(array_key_exists('tags', $entry)){
             foreach($entry['tags'] as $tag){
                 $this->element('category', null,$tag);
@@ -934,7 +934,7 @@ class TwitterapiAction extends Action
         return;
     }
 
-    function clientError($msg, $code = 400, $content_type = 'json')
+    function clientError($msg, $code = 400, $format = 'xml')
     {
 
         static $status = array(400 => 'Bad Request',
@@ -967,20 +967,23 @@ class TwitterapiAction extends Action
         $status_string = $status[$code];
         header('HTTP/1.1 '.$code.' '.$status_string);
 
-        if ($content_type == 'xml') {
+        if ($format == 'xml') {
             $this->init_document('xml');
             $this->elementStart('hash');
             $this->element('error', null, $msg);
             $this->element('request', null, $_SERVER['REQUEST_URI']);
             $this->elementEnd('hash');
             $this->end_document('xml');
-        } else {
+        } elseif ($format == 'json'){
             $this->init_document('json');
             $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
             print(json_encode($error_array));
             $this->end_document('json');
-        }
+        } else {
 
+            // If user didn't request a useful format, throw a regular client error
+            throw new ClientException($msg, $code);
+        }
     }
 
     function init_twitter_rss()
@@ -1063,6 +1066,39 @@ class TwitterapiAction extends Action
         }
     }
 
+    function getTargetUser($id)
+    {
+        if (empty($id)) {
+
+            // Twitter supports these other ways of passing the user ID
+            if (is_numeric($this->arg('id'))) {
+                return User::staticGet($this->arg('id'));
+            } else if ($this->arg('id')) {
+                $nickname = common_canonical_nickname($this->arg('id'));
+                return User::staticGet('nickname', $nickname);
+            } else if ($this->arg('user_id')) {
+                // This is to ensure that a non-numeric user_id still
+                // overrides screen_name even if it doesn't get used
+                if (is_numeric($this->arg('user_id'))) {
+                    return User::staticGet('id', $this->arg('user_id'));
+                }
+            } else if ($this->arg('screen_name')) {
+                $nickname = common_canonical_nickname($this->arg('screen_name'));
+                return User::staticGet('nickname', $nickname);
+            } else {
+                // Fall back to trying the currently authenticated user
+                return $this->auth_user;
+            }
+
+        } else if (is_numeric($id)) {
+            return User::staticGet($id);
+        } else {
+            $nickname = common_canonical_nickname($id);
+            return User::staticGet('nickname', $nickname);
+        }
+    }
+
+
     function get_group($id, $apidata=null)
     {
         if (empty($id)) {
@@ -1170,4 +1206,85 @@ class TwitterapiAction extends Action
         }
     }
 
+    function showBasicAuthHeader()
+    {
+        $this->basicAuthProcessHeader();
+
+        if (!isset($this->auth_user)) {
+            header('WWW-Authenticate: Basic realm="StatusNet API"');
+
+            // show error if the user clicks 'cancel'
+
+            $this->showBasicAuthError();
+            return false;
+
+        } else {
+            $nickname = $this->auth_user;
+            $password = $this->auth_pw;
+            $this->auth_user = common_check_user($nickname, $password);
+
+            if (empty($this->auth_user)) {
+
+                // basic authentication failed
+
+                list($proxy, $ip) = common_client_ip();
+                common_log(LOG_WARNING,
+                    "Failed API auth attempt, nickname = $nickname, proxy = $proxy, ip = $ip.");
+                $this->showBasicAuthError();
+                return false;
+            }
+        }
+        return true;
+    }
+
+    function basicAuthProcessHeader()
+    {
+        if (isset($_SERVER['AUTHORIZATION']) || isset($_SERVER['HTTP_AUTHORIZATION'])) {
+            $authorization_header = isset($_SERVER['HTTP_AUTHORIZATION'])? $_SERVER['HTTP_AUTHORIZATION'] : $_SERVER['AUTHORIZATION'];
+        }
+
+        if (isset($_SERVER['PHP_AUTH_USER'])) {
+            $this->auth_user = $_SERVER['PHP_AUTH_USER'];
+            $this->auth_pw = $_SERVER['PHP_AUTH_PW'];
+        } elseif (isset($authorization_header) && strstr(substr($authorization_header, 0, 5), 'Basic')) {
+            // decode the HTTP_AUTHORIZATION header on php-cgi server self
+            // on fcgid server the header name is AUTHORIZATION
+
+            $auth_hash = base64_decode(substr($authorization_header, 6));
+            list($this->auth_user, $this->auth_pw) = explode(':', $auth_hash);
+
+            // set all to null on a empty basic auth request
+            if ($this->auth_user == "") {
+                $this->auth_user = null;
+                $this->auth_pw = null;
+            }
+        } else {
+            $this->auth_user = null;
+            $this->auth_pw = null;
+        }
+    }
+
+    function showBasicAuthError()
+    {
+        header('HTTP/1.1 401 Unauthorized');
+        $msg = 'Could not authenticate you.';
+
+        if ($this->arg('format') == 'xml') {
+            header('Content-Type: application/xml; charset=utf-8');
+            $this->startXML();
+            $this->elementStart('hash');
+            $this->element('error', null, $msg);
+            $this->element('request', null, $_SERVER['REQUEST_URI']);
+            $this->elementEnd('hash');
+            $this->endXML();
+        } elseif ($this->arg('format') == 'json') {
+            header('Content-Type: application/json; charset=utf-8');
+            $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
+            print(json_encode($error_array));
+        } else {
+            header('Content-type: text/plain');
+            print "$msg\n";
+        }
+    }
+
 }

From 4d4bb089a5e3addfd4be2f82e5e4e257070f4058 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 23 Sep 2009 21:58:35 +0000
Subject: [PATCH 102/247] Created addPop() for Realtime plugin and added param
 to include iconurl

---
 plugins/Realtime/RealtimePlugin.php |  4 +++-
 plugins/Realtime/realtimeupdate.js  | 25 +++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index fde3060216..157c800d95 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -99,11 +99,13 @@ class RealtimePlugin extends Plugin
             $user_id = 0;
         }
 
+        $iconurl = $base.'plugins/Realtime/icon_external.gif';
+
         $action->elementStart('script', array('type' => 'text/javascript'));
 
         $script = ' $(document).ready(function() { '.
           $this->_updateInitialize($timeline, $user_id).
-          ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'"); '.
+          ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'", "'. $iconurl .'");'
           '}); ';
 
         $action->raw($script);
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 04e07956d5..2910e4a802 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -111,9 +111,30 @@ RealtimeUpdate = {
           return dl;
      },
 
-     addPopup: function(url, title)
+     addPopup: function(url, title, iconurl)
      {
-          // FIXME: need to add the realtime popup button here
+         $('#site_nav_local_views .current a').append('<button id="realtime_timeline" title="Real-time pop window">&#8599;</button>');
+ 
+         $('#realtime_timeline').css({
+             'margin':'2px 0 0 11px',
+             'background':'transparent url('+ iconurl + ') no-repeat 45% 45%',
+             'text-indent':'-9999px',
+             'width':'16px',
+             'height':'16px',
+             'padding':'0',
+             'display':'block',
+             'float':'right',
+             'border':'none',
+             'cursor':'pointer'
+         });
+ 
+         $('#realtime_timeline').click(function() {
+             window.open(url,
+                         title,
+                         'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
+ 
+             return false;
+         });
      }
 }
 

From ddb9518c9949989f99c3e7b0323c9bbd01c1d5ee Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 23 Sep 2009 22:00:22 +0000
Subject: [PATCH 103/247] Some layout and rendering adjustment for Realtime
 plugin

---
 plugins/Realtime/RealtimePlugin.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 157c800d95..f211c01f94 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -213,9 +213,9 @@ class RealtimePlugin extends Plugin
                                                               'class' => 'user_in')
                               : array('id' => $action->trimmed('action')));
 
+        $action->elementStart('div', array('id' => 'header'));
         // XXX hack to deal with JS that tries to get the
         // root url from page output
-
         $action->elementStart('address');
         $action->element('a', array('class' => 'url',
                                   'href' => common_local_url('public')),
@@ -225,7 +225,9 @@ class RealtimePlugin extends Plugin
         if (common_logged_in()) {
             $action->showNoticeForm();
         }
-        $action->showContent();
+        $action->elementEnd('div');
+
+        $action->showContentBlock();
         $action->elementEnd('body');
         return false; // No default processing
     }

From 1f12993a4ddad8eba29c604c55f6b82d08dc0127 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 23 Sep 2009 22:02:42 +0000
Subject: [PATCH 104/247] Added JavaScript to initialize the poped Window

---
 plugins/Realtime/RealtimePlugin.php | 13 ++++++++++---
 plugins/Realtime/realtimeupdate.js  |  7 +++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index f211c01f94..4fb8bf84e5 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -99,15 +99,22 @@ class RealtimePlugin extends Plugin
             $user_id = 0;
         }
 
-        $iconurl = $base.'plugins/Realtime/icon_external.gif';
+        // FIXME: Need to check if the current URL is a poped realtime window
+        if (1==2) {
+            $realtimeUI = ' RealtimeUpdate.initPopupWindow();';
+        }
+        else {
+            // FIXME: This icon URL is no good if fancy URLs are off.
+            $iconurl = $base.'plugins/Realtime/icon_external.gif';
+            $realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'", "'. $iconurl .'");';
+        }
 
         $action->elementStart('script', array('type' => 'text/javascript'));
 
         $script = ' $(document).ready(function() { '.
           $this->_updateInitialize($timeline, $user_id).
-          ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'", "'. $iconurl .'");'
+          $realtimeUI.
           '}); ';
-
         $action->raw($script);
 
         $action->elementEnd('script');
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 2910e4a802..4fda5079d4 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -135,6 +135,13 @@ RealtimeUpdate = {
  
              return false;
          });
+     },
+
+     initPopupWindow: function()
+     {
+         window.resizeTo(575, 640);
+         $('address').hide();
+         $('#content').css({'width':'92%'});
      }
 }
 

From d86155ad943032918c2fab070ca49f0a3586f25d Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 23 Sep 2009 22:04:39 +0000
Subject: [PATCH 105/247] Using timeline string instead of title for WindowName
 because IE doesn't like names with whitespace.

---
 plugins/Realtime/RealtimePlugin.php | 4 +---
 plugins/Realtime/realtimeupdate.js  | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 4fb8bf84e5..7334f56572 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -83,8 +83,6 @@ class RealtimePlugin extends Plugin
             $url = $base . '?realtime=1';
         }
 
-        $title = $action->title();
-
         $scripts = $this->_getScripts();
 
         foreach ($scripts as $script) {
@@ -106,7 +104,7 @@ class RealtimePlugin extends Plugin
         else {
             // FIXME: This icon URL is no good if fancy URLs are off.
             $iconurl = $base.'plugins/Realtime/icon_external.gif';
-            $realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'", "'. $iconurl .'");';
+            $realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$timeline.'", "'. $iconurl .'");';
         }
 
         $action->elementStart('script', array('type' => 'text/javascript'));
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 4fda5079d4..57fe0a8436 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -111,7 +111,7 @@ RealtimeUpdate = {
           return dl;
      },
 
-     addPopup: function(url, title, iconurl)
+     addPopup: function(url, timeline, iconurl)
      {
          $('#site_nav_local_views .current a').append('<button id="realtime_timeline" title="Real-time pop window">&#8599;</button>');
  
@@ -130,7 +130,7 @@ RealtimeUpdate = {
  
          $('#realtime_timeline').click(function() {
              window.open(url,
-                         title,
+                         timeline,
                          'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
  
              return false;

From 3449843f839b6c17618b27b031c608860761cd32 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 22:24:35 -0400
Subject: [PATCH 106/247] use schema tool to create a table

---
 lib/schema.php | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/lib/schema.php b/lib/schema.php
index d3b30aeeb5..f490756905 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -110,18 +110,87 @@ class Schema
 
     public function getColumnDef($table, $column)
     {
+        $td = $this->getTableDef($table);
+
+        foreach ($td->columns as $cd) {
+            if ($cd->name == $column) {
+                return $cd;
+            }
+        }
+
+        return null;
     }
 
     public function getIndexDef($table, $index)
     {
+        return null;
     }
 
     public function createTable($name, $columns, $indices=null)
     {
+        $uniques = array();
+        $primary = array();
+        $indices = array();
+
+        $sql = "CREATE TABLE $name (\n";
+
+        for ($i = 0; $i < count($columns); $i++) {
+
+            $cd =& $columns[$i];
+
+            if ($i > 0) {
+                $sql .= ",\n";
+            }
+
+            $sql .= $this->_columnSql($cd);
+
+            switch ($cd->key) {
+             case 'UNI':
+                $uniques[] = $cd->name;
+                break;
+             case 'PRI':
+                $primary[] = $cd->name;
+                break;
+             case 'MUL':
+                $indices[] = $cd->name;
+                break;
+            }
+        }
+
+        if (count($primary) > 0) { // it really should be...
+            $sql .= ",\nconstraint primary key (" . implode(',', $primary) . ")";
+        }
+
+        foreach ($uniques as $u) {
+            $sql .= ",\nunique index {$name}_{$u}_idx ($u)";
+        }
+
+        foreach ($indices as $i) {
+            $sql .= ",\nindex {$name}_{$i}_idx ($i)";
+        }
+
+        $sql .= "); ";
+
+        common_debug($sql);
+
+        $res =& $this->conn->query($sql);
+
+        if (PEAR::isError($res)) {
+            throw new Exception($res->getMessage());
+        }
+
+        return true;
     }
 
     public function dropTable($name)
     {
+        $res =& $this->conn->query("DROP TABLE $name");
+
+        if (PEAR::isError($res)) {
+            throw new Exception($res->getMessage());
+        }
+
+        return true;
     }
 
     public function createIndex($name, $table, $columns)
@@ -151,6 +220,25 @@ class Schema
             return $this->createTable($name, $columns, $indices);
         }
     }
+
+    function _columnSql($cd)
+    {
+        $sql = "{$cd->name} ";
+
+        if (!empty($cd->size)) {
+            $sql .= "{$cd->type}({$cd->size}) ";
+        } else {
+            $sql .= "{$cd->type} ";
+        }
+
+        if (!empty($cd->default)) {
+            $sql .= "default {$cd->default} ";
+        } else {
+            $sql .= ($cd->nullable) ? "null " : "not null ";
+        }
+
+        return $sql;
+    }
 }
 
 class TableDef
@@ -168,6 +256,17 @@ class ColumnDef
     public $key;
     public $default;
     public $extra;
+
+    function __construct($name, $type, $size=null, $nullable=null,
+                         $key=null, $default=null, $extra=null) {
+        $this->name     = $name;
+        $this->type     = $type;
+        $this->size     = $size;
+        $this->nullable = $nullable;
+        $this->key      = $key;
+        $this->default  = $default;
+        $this->extra    = $extra;
+    }
 }
 
 class IndexDef

From 543e3e797277526ac0f0c6ac99be64897955258a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 23:04:25 -0400
Subject: [PATCH 107/247] some UI fixes

---
 plugins/Realtime/RealtimePlugin.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 7334f56572..e30c411567 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -77,7 +77,7 @@ class RealtimePlugin extends Plugin
         }
 
         $base = $action->selfUrl();
-        if (mb_strstr($url, '?')) {
+        if (mb_strstr($base, '?')) {
             $url = $base . '&realtime=1';
         } else {
             $url = $base . '?realtime=1';
@@ -97,21 +97,19 @@ class RealtimePlugin extends Plugin
             $user_id = 0;
         }
 
-        // FIXME: Need to check if the current URL is a poped realtime window
-        if (1==2) {
+        if ($action->boolean('realtime')) {
             $realtimeUI = ' RealtimeUpdate.initPopupWindow();';
         }
         else {
-            // FIXME: This icon URL is no good if fancy URLs are off.
-            $iconurl = $base.'plugins/Realtime/icon_external.gif';
+            $iconurl = common_path('plugins/Realtime/icon_external.gif');
             $realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$timeline.'", "'. $iconurl .'");';
         }
 
         $action->elementStart('script', array('type' => 'text/javascript'));
 
         $script = ' $(document).ready(function() { '.
-          $this->_updateInitialize($timeline, $user_id).
           $realtimeUI.
+          $this->_updateInitialize($timeline, $user_id).
           '}); ';
         $action->raw($script);
 
@@ -219,8 +217,10 @@ class RealtimePlugin extends Plugin
                               : array('id' => $action->trimmed('action')));
 
         $action->elementStart('div', array('id' => 'header'));
+
         // XXX hack to deal with JS that tries to get the
         // root url from page output
+
         $action->elementStart('address');
         $action->element('a', array('class' => 'url',
                                   'href' => common_local_url('public')),

From a5ed805aeabab3930d066b2777dbab9663bc487f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 23:23:13 -0400
Subject: [PATCH 108/247] move scripts to just before </body>, add event for
 scripts that need to be in <head>

---
 EVENTS.txt     |  6 ++++++
 lib/action.php | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 68cb28603b..dfaf34a66e 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -134,3 +134,9 @@ StartAddressData: Allows the site owner to provide additional information about
 
 EndAddressData: At the end of <address>
 - $action: the current action
+
+StartShowHeadElements: Right after the <head> tag
+- $action: the current action
+
+EndShowHeadElements: Right before the </head> tag; put <script>s here if you need them in <head>
+- $action: the current action
diff --git a/lib/action.php b/lib/action.php
index 670eb498c1..ebc812acaa 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -120,14 +120,16 @@ class Action extends HTMLOutputter // lawsuit
     {
         // XXX: attributes (profile?)
         $this->elementStart('head');
-        $this->showTitle();
-        $this->showShortcutIcon();
-        $this->showStylesheets();
-        $this->showScripts();
-        $this->showOpenSearch();
-        $this->showFeeds();
-        $this->showDescription();
-        $this->extraHead();
+        if (Event::handle('StartShowHeadElements', array($this))) {
+            $this->showTitle();
+            $this->showShortcutIcon();
+            $this->showStylesheets();
+            $this->showOpenSearch();
+            $this->showFeeds();
+            $this->showDescription();
+            $this->extraHead();
+            Event::handle('EndShowHeadElements', array($this));
+        }
         $this->elementEnd('head');
     }
 
@@ -352,6 +354,7 @@ class Action extends HTMLOutputter // lawsuit
             Event::handle('EndShowFooter', array($this));
         }
         $this->elementEnd('div');
+        $this->showScripts();
         $this->elementEnd('body');
     }
 

From 55fb3222881b6a4a6613283a49d20d5d45cd4856 Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Thu, 24 Sep 2009 11:01:18 +0100
Subject: [PATCH 109/247] Fixed broken Piwik plugin - was not using the
 supplied site code

---
 plugins/PiwikAnalyticsPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index e36bd1c5c3..8191f51811 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -73,7 +73,7 @@ class PiwikAnalyticsPlugin extends Plugin
     function __construct($root=null, $id=null)
     {
         $this->piwikroot = $root;
-        $this->piwikid   = $id;
+        $this->piwikId   = $id;
         parent::__construct();
     }
 

From 5323956e388ebc2e4dfa1a5193aa670c96fff027 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 24 Sep 2009 13:48:38 -0400
Subject: [PATCH 110/247] implemented etag and last modified

---
 plugins/Autocomplete/autocomplete.php | 54 +++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php
index 4379a86f28..aa57b3915f 100644
--- a/plugins/Autocomplete/autocomplete.php
+++ b/plugins/Autocomplete/autocomplete.php
@@ -47,10 +47,48 @@ class AutocompleteAction extends Action
 {
     private $result;
 
+    /**
+     * Last-modified date for page
+     *
+     * When was the content of this page last modified? Based on notice,
+     * profile, avatar.
+     *
+     * @return int last-modified date as unix timestamp
+     */
+    function lastModified()
+    {
+        $max=0;
+        foreach($this->users as $user){
+            $max = max($max,strtotime($user->modified),strtotime($user->profile->modified));
+        }
+        foreach($this->groups as $group){
+            $max = max($max,strtotime($group->modified));
+        }
+        return $max;
+    }
+
+    /**
+     * An entity tag for this page
+     *
+     * Shows the ETag for the page, based on the notice ID and timestamps
+     * for the notice, profile, and avatar. It's weak, since we change
+     * the date text "one hour ago", etc.
+     *
+     * @return string etag
+     */
+    function etag()
+    {
+        return '"' . implode(':', array($this->arg('action'),
+            crc32($this->arg('q')), //the actual string can have funny characters in we don't want showing up in the etag
+            $this->arg('limit'),
+            $this->lastModified())) . '"';
+    }
+
     function prepare($args)
     {
         parent::prepare($args);
-        $this->results = array();
+        $this->groups=array();
+        $this->users=array();
         $q = $this->arg('q');
         $limit = $this->arg('limit');
         if($limit > 200) $limit=200; //prevent DOS attacks
@@ -63,7 +101,8 @@ class AutocompleteAction extends Action
             $user->find();
             while($user->fetch()) {
                 $profile = Profile::staticGet($user->id);
-                $this->results[]=array('nickname' => $user->nickname, 'fullname'=> $profile->fullname, 'type'=>'user');
+                $user->profile=$profile;
+                $this->users[]=$user;
             }
         }
         if(substr($q,0,1)=='!'){
@@ -74,7 +113,7 @@ class AutocompleteAction extends Action
             $group->whereAdd('nickname like \'' . trim($group->escape($q), '\'') . '%\'');
             $group->find();
             while($group->fetch()) {
-                $this->results[]=array('nickname' => $group->nickname, 'fullname'=> $group->fullname, 'type'=>'group');
+                $this->groups[]=$group;
             }
         }
         return true;
@@ -83,7 +122,14 @@ class AutocompleteAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        foreach($this->results as $result) {
+        $results = array();
+        foreach($this->users as $user){
+            $results[]=array('nickname' => $user->nickname, 'fullname'=> $user->profile->fullname, 'type'=>'user');
+        }
+        foreach($this->groups as $group){
+            $results[]=array('nickname' => $group->nickname, 'fullname'=> $group->fullname, 'type'=>'group');
+        }
+        foreach($results as $result) {
             print json_encode($result) . "\n";
         }
     }

From 3d30ad83f881a69d76b57a9af051fef308644987 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 24 Sep 2009 16:52:32 -0400
Subject: [PATCH 111/247] Implemented join and leave groups api methods

---
 actions/twitapigroups.php | 124 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index 4deb1b764a..493144e77e 100644
--- a/actions/twitapigroups.php
+++ b/actions/twitapigroups.php
@@ -293,6 +293,105 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
          }
      }
 
+     function join($args, $apidata)
+     {
+         parent::handle($args);
+
+         common_debug("in groups api action");
+
+         $this->auth_user = $apidata['user'];
+         $group = $this->get_group($apidata['api_arg'], $apidata);
+
+         if (empty($group)) {
+             $this->clientError('Not Found', 404, $apidata['content-type']);
+             return false;
+         }
+
+         if($this->auth_user->isMember($group)){
+            $this->clientError(_('You are already a member of that group'), $code = 403);
+            return false;
+         }
+
+         if (Group_block::isBlocked($group, $this->auth_user->getProfile())) {
+            $this->clientError(_('You have been blocked from that group by the admin.'), 403);
+            return false;
+         }
+
+         $member = new Group_member();
+
+         $member->group_id   = $group->id;
+         $member->profile_id = $this->auth_user->id;
+         $member->created    = common_sql_now();
+
+         $result = $member->insert();
+
+         if (!$result) {
+            common_log_db_error($member, 'INSERT', __FILE__);
+            $this->serverError(sprintf(_('Could not join user %s to group %s'),
+                                       $this->auth_user->nickname, $group->nickname));
+         }
+
+         switch($apidata['content-type']) {
+          case 'xml':
+             $this->show_single_xml_group($group);
+             break;
+          case 'json':
+             $this->show_single_json_group($group);
+             break;
+          default:
+             $this->clientError(_('API method not found!'), $code = 404);
+         }
+     }
+
+     function leave($args, $apidata)
+     {
+         parent::handle($args);
+
+         common_debug("in groups api action");
+
+         $this->auth_user = $apidata['user'];
+         $group = $this->get_group($apidata['api_arg'], $apidata);
+
+         if (empty($group)) {
+             $this->clientError('Not Found', 404, $apidata['content-type']);
+             return false;
+         }
+
+         if(! $this->auth_user->isMember($group)){
+            $this->clientError(_('You are not a member of that group'), $code = 403);
+            return false;
+         }
+
+         $member = new Group_member();
+
+         $member->group_id   = $group->id;
+         $member->profile_id = $this->auth_user->id;
+
+         if (!$member->find(true)) {
+            $this->serverError(_('Could not find membership record.'));
+            return;
+         }
+
+         $result = $member->delete();
+
+         if (!$result) {
+            common_log_db_error($member, 'INSERT', __FILE__);
+            $this->serverError(sprintf(_('Could not remove user %s to group %s'),
+                                       $this->auth_user->nickname, $group->nickname));
+         }
+
+         switch($apidata['content-type']) {
+          case 'xml':
+             $this->show_single_xml_group($group);
+             break;
+          case 'json':
+             $this->show_single_json_group($group);
+             break;
+          default:
+             $this->clientError(_('API method not found!'), $code = 404);
+         }
+     }
+
      function is_member($args, $apidata)
      {
          parent::handle($args);
@@ -326,4 +425,29 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
              $this->clientError(_('API method not found!'), $code = 404);
          }
      }
+
+     function create($args, $apidata)
+     {
+        die("todo");
+     }
+
+     function update($args, $apidata)
+     {
+        die("todo");
+     }
+
+     function update_group_logo($args, $apidata)
+     {
+        die("todo");
+     }
+
+     function destroy($args, $apidata)
+     {
+        die("todo");
+     }
+
+     function tag($args, $apidata)
+     {
+        die("todo");
+     }
 }

From d7e43c732efe2e3b6b4827c4d2286bc03507a31c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 24 Sep 2009 17:14:04 -0400
Subject: [PATCH 112/247] Revert "move scripts to just before </body>, add
 event for scripts that need to be in <head>"

This reverts commit a5ed805aeabab3930d066b2777dbab9663bc487f.

It shouldn't have gone on the stable branch.
---
 EVENTS.txt     |  6 ------
 lib/action.php | 19 ++++++++-----------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index dfaf34a66e..68cb28603b 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -134,9 +134,3 @@ StartAddressData: Allows the site owner to provide additional information about
 
 EndAddressData: At the end of <address>
 - $action: the current action
-
-StartShowHeadElements: Right after the <head> tag
-- $action: the current action
-
-EndShowHeadElements: Right before the </head> tag; put <script>s here if you need them in <head>
-- $action: the current action
diff --git a/lib/action.php b/lib/action.php
index ebc812acaa..670eb498c1 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -120,16 +120,14 @@ class Action extends HTMLOutputter // lawsuit
     {
         // XXX: attributes (profile?)
         $this->elementStart('head');
-        if (Event::handle('StartShowHeadElements', array($this))) {
-            $this->showTitle();
-            $this->showShortcutIcon();
-            $this->showStylesheets();
-            $this->showOpenSearch();
-            $this->showFeeds();
-            $this->showDescription();
-            $this->extraHead();
-            Event::handle('EndShowHeadElements', array($this));
-        }
+        $this->showTitle();
+        $this->showShortcutIcon();
+        $this->showStylesheets();
+        $this->showScripts();
+        $this->showOpenSearch();
+        $this->showFeeds();
+        $this->showDescription();
+        $this->extraHead();
         $this->elementEnd('head');
     }
 
@@ -354,7 +352,6 @@ class Action extends HTMLOutputter // lawsuit
             Event::handle('EndShowFooter', array($this));
         }
         $this->elementEnd('div');
-        $this->showScripts();
         $this->elementEnd('body');
     }
 

From e566219299b339fb649eb8a21bd37e8c93844375 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 24 Sep 2009 15:10:55 -0700
Subject: [PATCH 113/247] Output If-Modified-Since header for all RSS 1.0 feeds
 (again)

---
 actions/allrss.php       |  1 +
 actions/favoritesrss.php | 11 ++++++-----
 actions/grouprss.php     |  1 +
 actions/publicrss.php    | 18 ++++++++++++++++--
 actions/repliesrss.php   |  1 +
 actions/userrss.php      |  7 ++++---
 lib/rssaction.php        | 36 ++++++++++++++++++------------------
 7 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/actions/allrss.php b/actions/allrss.php
index 57efb73f0e..28b1be27d8 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -68,6 +68,7 @@ class AllrssAction extends Rss10Action
             $this->clientError(_('No such user.'));
             return false;
         } else {
+            $this->notices = $this->getNotices($this->limit);
             return true;
         }
     }
diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index 2d5ce98541..62f06e841b 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -50,11 +50,11 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  */
 class FavoritesrssAction extends Rss10Action
 {
-    
+
     /** The user whose favorites to display */
-    
+
     var $user = null;
-        
+
     /**
      * Find the user to display by supplied nickname
      *
@@ -66,7 +66,7 @@ class FavoritesrssAction extends Rss10Action
     function prepare($args)
     {
         parent::prepare($args);
-        
+
         $nickname   = $this->trimmed('nickname');
         $this->user = User::staticGet('nickname', $nickname);
 
@@ -74,10 +74,11 @@ class FavoritesrssAction extends Rss10Action
             $this->clientError(_('No such user.'));
             return false;
         } else {
+            $this->notices = $this->getNotices($this->limit);
             return true;
         }
     }
-    
+
     /**
      * Get notices
      *
diff --git a/actions/grouprss.php b/actions/grouprss.php
index 70c1ded488..6a6b55e78f 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -104,6 +104,7 @@ class groupRssAction extends Rss10Action
             return false;
         }
 
+        $this->notices = $this->getNotices($this->limit);
         return true;
     }
 
diff --git a/actions/publicrss.php b/actions/publicrss.php
index 593888b9f6..0c5d061cb6 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -49,9 +49,23 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  */
 class PublicrssAction extends Rss10Action
 {
+    /**
+     * Read arguments and initialize members
+     *
+     * @param array $args Arguments from $_REQUEST
+     * @return boolean success
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->notices = $this->getNotices($this->limit);
+        return true;
+    }
+
     /**
      * Initialization.
-     * 
+     *
      * @return boolean true
      */
     function init()
@@ -73,7 +87,7 @@ class PublicrssAction extends Rss10Action
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
-        
+
         return $notices;
     }
 
diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index c71c9226fb..76aae21adb 100644
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -38,6 +38,7 @@ class RepliesrssAction extends Rss10Action
             $this->clientError(_('No such user.'));
             return false;
         } else {
+            $this->notices = $this->getNotices($this->limit);
             return true;
         }
     }
diff --git a/actions/userrss.php b/actions/userrss.php
index fa6d588cdf..e6f6970924 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -25,7 +25,6 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 class UserrssAction extends Rss10Action
 {
-    var $user = null;
     var $tag  = null;
 
     function prepare($args)
@@ -39,6 +38,7 @@ class UserrssAction extends Rss10Action
             $this->clientError(_('No such user.'));
             return false;
         } else {
+            $this->notices = $this->getNotices($this->limit);
             return true;
         }
     }
@@ -64,10 +64,10 @@ class UserrssAction extends Rss10Action
 
     function getNotices($limit=0)
     {
-
         $user = $this->user;
-
+        
         if (is_null($user)) {
+            common_debug('null user');
             return null;
         }
 
@@ -75,6 +75,7 @@ class UserrssAction extends Rss10Action
 
         $notices = array();
         while ($notice->fetch()) {
+            common_debug("notice");
             $notices[] = clone($notice);
         }
 
diff --git a/lib/rssaction.php b/lib/rssaction.php
index dd0f1005af..faf6bec7de 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -78,25 +78,12 @@ class Rss10Action extends Action
     function prepare($args)
     {
         parent::prepare($args);
+
         $this->limit = (int) $this->trimmed('limit');
+
         if ($this->limit == 0) {
             $this->limit = DEFAULT_RSS_LIMIT;
         }
-        return true;
-    }
-
-    /**
-     * Handle a request
-     *
-     * @param array $args Arguments from $_REQUEST
-     *
-     * @return void
-     */
-
-    function handle($args)
-    {
-        // Parent handling, including cache check
-        parent::handle($args);
 
         if (common_config('site', 'private')) {
             if (!isset($_SERVER['PHP_AUTH_USER'])) {
@@ -122,8 +109,21 @@ class Rss10Action extends Action
             }
         }
 
-        // Get the list of notices
-        $this->notices = $this->getNotices($this->limit);
+        return true;
+    }
+
+    /**
+     * Handle a request
+     *
+     * @param array $args Arguments from $_REQUEST
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        // Parent handling, including cache check
+        parent::handle($args);
         $this->showRss();
     }
 
@@ -140,7 +140,7 @@ class Rss10Action extends Action
     }
 
     /**
-     * Get the notices to output in this stream
+     * Get the notices to output in this stream.
      *
      * @return array an array of Notice objects sorted in reverse chron
      */

From b617c608ea0d66451eb2dcd75e1e1c58c179d8e6 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 24 Sep 2009 15:28:25 -0700
Subject: [PATCH 114/247] Left a couple debugging statements in (removed)

---
 actions/userrss.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/actions/userrss.php b/actions/userrss.php
index e6f6970924..19e610551d 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -67,7 +67,6 @@ class UserrssAction extends Rss10Action
         $user = $this->user;
         
         if (is_null($user)) {
-            common_debug('null user');
             return null;
         }
 
@@ -75,7 +74,6 @@ class UserrssAction extends Rss10Action
 
         $notices = array();
         while ($notice->fetch()) {
-            common_debug("notice");
             $notices[] = clone($notice);
         }
 

From ed9ba9d945e4f50812022a7489fc8135f4e49846 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Thu, 24 Sep 2009 18:13:46 -0700
Subject: [PATCH 115/247] Reorganize, make bare auth work, output
 If-Modified-Since header

---
 actions/apifriendstimeline.php | 144 +++++++++++++++++++++------------
 lib/twitterapi.php             |   3 +-
 2 files changed, 92 insertions(+), 55 deletions(-)

diff --git a/actions/apifriendstimeline.php b/actions/apifriendstimeline.php
index ea38ec022e..8c8d934164 100644
--- a/actions/apifriendstimeline.php
+++ b/actions/apifriendstimeline.php
@@ -36,6 +36,9 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
 class ApifriendstimelineAction extends TwitterapiAction
 {
 
+    var $user    = null;
+    var $notices = null;
+
     /**
      * Take arguments for running
      *
@@ -48,93 +51,120 @@ class ApifriendstimelineAction extends TwitterapiAction
     function prepare($args)
     {
         parent::prepare($args);
-        return true;
 
-    }
+	$this->page     = (int)$this->arg('page', 1);
+        $this->count    = (int)$this->arg('count', 20);
+        $this->max_id   = (int)$this->arg('max_id', 0);
+        $this->since_id = (int)$this->arg('since_id', 0);
+        $this->since    = $this->arg('since');
 
-    function handle($args) {
+	if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+		return;
+	    }
+	}
 
-        parent::handle($args);
-        common_debug(var_export($args, true));
+	$this->user = $this->getTargetUser($this->arg('id'));
 
-        if ($this->requiresAuth()) {
-            if ($this->showBasicAuthHeader()) {
-                $this->showTimeline();
-            }
-        } else {
-            $this->showTimeline();
-        }
-    }
-
-    function showTimeline()
-    {
-        common_debug('Auth user = ' . var_export($this->auth_user, true));
-
-        $user = $this->getTargetUser($this->arg('id'));
-
-        if (empty($user)) {
+	if (empty($this->user)) {
             $this->clientError(_('No such user!'), 404, $this->arg('format'));
             return;
         }
 
-        $profile    = $user->getProfile();
+	$this->notices = $this->getNotices();
+
+        return true;
+    }
+
+    function handle($args) {
+	parent::handle($args);
+	$this->showTimeline();
+    }
+
+    function showTimeline()
+    {
+        $profile    = $this->user->getProfile();
         $sitename   = common_config('site', 'name');
         $title      = sprintf(_("%s and friends"), $user->nickname);
         $taguribase = common_config('integration', 'taguri');
         $id         = "tag:$taguribase:FriendsTimeline:" . $user->id;
         $link       = common_local_url('all',
-            array('nickname' => $user->nickname));
+				       array('nickname' => $user->nickname));
         $subtitle   = sprintf(_('Updates from %1$s and friends on %2$s!'),
-            $user->nickname, $sitename);
-
-        $page     = (int)$this->arg('page', 1);
-        $count    = (int)$this->arg('count', 20);
-        $max_id   = (int)$this->arg('max_id', 0);
-        $since_id = (int)$this->arg('since_id', 0);
-        $since    = $this->arg('since');
-
-        if (!empty($this->auth_user) && $this->auth_user->id == $user->id) {
-            $notice = $user->noticeInbox(($page-1)*$count,
-                $count, $since_id, $max_id, $since);
-        } else {
-            $notice = $user->noticesWithFriends(($page-1)*$count,
-                $count, $since_id, $max_id, $since);
-        }
+			      $user->nickname, $sitename);
 
         switch($this->arg('format')) {
-        case 'xml':
-            $this->show_xml_timeline($notice);
+	 case 'xml':
+            $this->show_xml_timeline($this->notices);
             break;
-        case 'rss':
-            $this->show_rss_timeline($notice, $title, $link, $subtitle);
+	 case 'rss':
+            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
             break;
-        case 'atom':
+	 case 'atom':
 
             $target_id = $this->arg('id');
 
             if (isset($target_id)) {
                 $selfuri = common_root_url() .
-                    'api/statuses/friends_timeline/' .
-                        $target_id . '.atom';
+		  'api/statuses/friends_timeline/' .
+		  $target_id . '.atom';
             } else {
                 $selfuri = common_root_url() .
-                    'api/statuses/friends_timeline.atom';
+		  'api/statuses/friends_timeline.atom';
             }
-            $this->show_atom_timeline($notice, $title, $id, $link,
-                $subtitle, null, $selfuri);
+            $this->show_atom_timeline($this->notices, $title, $id, $link,
+				      $subtitle, null, $selfuri);
             break;
-        case 'json':
-            $this->show_json_timeline($notice);
+	 case 'json':
+            $this->show_json_timeline($this->notices);
             break;
-        default:
+	 default:
             $this->clientError(_('API method not found!'), $code = 404);
+	    break;
+        }
+    }
+
+    function getNotices()
+    {
+	$notices = array();
+
+        if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) {
+            $notice = $this->user->noticeInbox(($this->page-1) * $this->count,
+					       $this->count, $this->since_id,
+					       $this->max_id, $this->since);
+        } else {
+            $notice = $this->user->noticesWithFriends(($this->page-1) * $this->count,
+						      $this->count, $this->since_id,
+						      $this->max_id, $this->since);
         }
 
+	while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+	return $notices;
     }
 
     function requiresAuth()
     {
-        return true;
+	// If the site is "private", all API methods except statusnet/config
+        // need authentication
+
+        if (common_config('site', 'private')) {
+	    return true;
+        }
+
+	// bare auth: only needs auth if without an argument or query param specifying user id
+
+	$id           = $this->arg('id');
+	$user_id      = $this->arg('user_id');
+	$screen_name  = $this->arg('screen_name');
+
+	if (empty($id) && empty($user_id) && empty($screen_name)) {
+	    return true;
+	}
+
+	return false;
     }
 
     /**
@@ -149,13 +179,21 @@ class ApifriendstimelineAction extends TwitterapiAction
     }
 
     /**
-     * When was this page last modified?
+     * When was this feed last modified?
      *
      */
 
     function lastModified()
     {
+        if (empty($this->notices)) {
+            return null;
+        }
 
+        if (count($this->notices) == 0) {
+            return null;
+        }
+
+        return strtotime($this->notices[0]->created);
     }
 
 }
\ No newline at end of file
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index ac5c5b4239..959b0981a5 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -1098,7 +1098,6 @@ class TwitterapiAction extends Action
         }
     }
 
-
     function get_group($id, $apidata=null)
     {
         if (empty($id)) {
@@ -1206,7 +1205,7 @@ class TwitterapiAction extends Action
         }
     }
 
-    function showBasicAuthHeader()
+    function checkBasicAuthUser()
     {
         $this->basicAuthProcessHeader();
 

From ecb75561af074160650ccf2a5fd79241701c347e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 24 Sep 2009 22:25:30 -0400
Subject: [PATCH 116/247] Move configuration defaults to new module and
 variable

Moved the default values of $config to $default. The code for
setting up $default is moved to lib/default.php.
---
 lib/common.php  | 212 ++-----------------------------------------
 lib/default.php | 232 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 240 insertions(+), 204 deletions(-)
 create mode 100644 lib/default.php

diff --git a/lib/common.php b/lib/common.php
index 194eb568f7..58e208a4e9 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -53,6 +53,7 @@ require_once('DB/DataObject/Cast.php'); # for dates
 if (!function_exists('gettext')) {
     require_once("php-gettext/gettext.inc");
 }
+
 require_once(INSTALLDIR.'/lib/language.php');
 
 // This gets included before the config file, so that admin code and plugins
@@ -93,214 +94,17 @@ if (isset($path)) {
     null;
 }
 
-// default configuration, overwritten in config.php
+require_once(INSTALLDIR.'/lib/default.php');
 
-$config =
-  array('site' =>
-        array('name' => 'Just another StatusNet microblog',
-              'server' => $_server,
-              'theme' => 'default',
-              'path' => $_path,
-              'logfile' => null,
-              'logo' => null,
-              'logdebug' => false,
-              'fancy' => false,
-              'locale_path' => INSTALLDIR.'/locale',
-              'language' => 'en_US',
-              'languages' => get_all_languages(),
-              'email' =>
-              array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : null,
-              'broughtby' => null,
-              'timezone' => 'UTC',
-              'broughtbyurl' => null,
-              'closed' => false,
-              'inviteonly' => false,
-              'private' => false,
-              'ssl' => 'never',
-              'sslserver' => null,
-              'shorturllength' => 30,
-              'dupelimit' => 60, # default for same person saying the same thing
-              'textlimit' => 140,
-              ),
-        'syslog' =>
-        array('appname' => 'statusnet', # for syslog
-              'priority' => 'debug', # XXX: currently ignored
-              'facility' => LOG_USER),
-        'queue' =>
-        array('enabled' => false,
-              'subsystem' => 'db', # default to database, or 'stomp'
-              'stomp_server' => null,
-              'queue_basename' => 'statusnet',
-              'stomp_username' => null,
-              'stomp_password' => null,
-              ),
-        'license' =>
-        array('url' => 'http://creativecommons.org/licenses/by/3.0/',
-              'title' => 'Creative Commons Attribution 3.0',
-              'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'),
-        'mail' =>
-        array('backend' => 'mail',
-              'params' => null),
-        'nickname' =>
-        array('blacklist' => array(),
-              'featured' => array()),
-        'profile' =>
-        array('banned' => array(),
-              'biolimit' => null),
-        'avatar' =>
-        array('server' => null,
-              'dir' => INSTALLDIR . '/avatar/',
-              'path' => $_path . '/avatar/'),
-        'background' =>
-        array('server' => null,
-              'dir' => INSTALLDIR . '/background/',
-              'path' => $_path . '/background/'),
-        'public' =>
-        array('localonly' => true,
-              'blacklist' => array(),
-              'autosource' => array()),
-        'theme' =>
-        array('server' => null,
-              'dir' => null,
-              'path'=> null),
-        'throttle' =>
-        array('enabled' => false, // whether to throttle edits; false by default
-              'count' => 20, // number of allowed messages in timespan
-              'timespan' => 600), // timespan for throttling
-        'xmpp' =>
-        array('enabled' => false,
-              'server' => 'INVALID SERVER',
-              'port' => 5222,
-              'user' => 'update',
-              'encryption' => true,
-              'resource' => 'uniquename',
-              'password' => 'blahblahblah',
-              'host' => null, # only set if != server
-              'debug' => false, # print extra debug info
-              'public' => array()), # JIDs of users who want to receive the public stream
-        'invite' =>
-        array('enabled' => true),
-        'sphinx' =>
-        array('enabled' => false,
-              'server' => 'localhost',
-              'port' => 3312),
-        'tag' =>
-        array('dropoff' => 864000.0),
-        'popular' =>
-        array('dropoff' => 864000.0),
-        'daemon' =>
-        array('piddir' => '/var/run',
-              'user' => false,
-              'group' => false),
-        'emailpost' =>
-        array('enabled' => true),
-        'sms' =>
-        array('enabled' => true),
-        'twitter' =>
-        array('enabled' => true),
-        'twitterbridge' =>
-        array('enabled' => false),
-        'integration' =>
-        array('source' => 'StatusNet', # source attribute for Twitter
-              'taguri' => $_server.',2009'), # base for tag URIs
-	'twitter' =>
-	array('consumer_key'    => null,
-	      'consumer_secret' => null),
-        'memcached' =>
-        array('enabled' => false,
-              'server' => 'localhost',
-              'base' => null,
-              'port' => 11211),
- 		'ping' =>
-        array('notify' => array()),
-        'inboxes' =>
-        array('enabled' => true), # on by default for new sites
-        'newuser' =>
-        array('default' => null,
-              'welcome' => null),
-        'snapshot' =>
-        array('run' => 'web',
-              'frequency' => 10000,
-              'reporturl' => 'http://status.net/stats/report'),
-        'attachments' =>
-        array('server' => null,
-              'dir' => INSTALLDIR . '/file/',
-              'path' => $_path . '/file/',
-              'supported' => array('image/png',
-                                   'image/jpeg',
-                                   'image/gif',
-                                   'image/svg+xml',
-                                   'audio/mpeg',
-                                   'audio/x-speex',
-                                   'application/ogg',
-                                   'application/pdf',
-                                   'application/vnd.oasis.opendocument.text',
-                                   'application/vnd.oasis.opendocument.text-template',
-                                   'application/vnd.oasis.opendocument.graphics',
-                                   'application/vnd.oasis.opendocument.graphics-template',
-                                   'application/vnd.oasis.opendocument.presentation',
-                                   'application/vnd.oasis.opendocument.presentation-template',
-                                   'application/vnd.oasis.opendocument.spreadsheet',
-                                   'application/vnd.oasis.opendocument.spreadsheet-template',
-                                   'application/vnd.oasis.opendocument.chart',
-                                   'application/vnd.oasis.opendocument.chart-template',
-                                   'application/vnd.oasis.opendocument.image',
-                                   'application/vnd.oasis.opendocument.image-template',
-                                   'application/vnd.oasis.opendocument.formula',
-                                   'application/vnd.oasis.opendocument.formula-template',
-                                   'application/vnd.oasis.opendocument.text-master',
-                                   'application/vnd.oasis.opendocument.text-web',
-                                   'application/x-zip',
-                                   'application/zip',
-                                   'text/plain',
-                                   'video/mpeg',
-                                   'video/mp4',
-                                   'video/quicktime',
-                                   'video/mpeg'),
-        'file_quota' => 5000000,
-        'user_quota' => 50000000,
-        'monthly_quota' => 15000000,
-        'uploads' => true,
-        'filecommand' => '/usr/bin/file',
-        ),
-        'group' =>
-        array('maxaliases' => 3,
-              'desclimit' => null),
-        'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/'),
-        'search' =>
-        array('type' => 'fulltext'),
-        'sessions' =>
-        array('handle' => false, // whether to handle sessions ourselves
-              'debug' => false), // debugging output for sessions
-        'design' =>
-        array('backgroundcolor' => null, // null -> 'use theme default'
-              'contentcolor' => null,
-              'sidebarcolor' => null,
-              'textcolor' => null,
-              'linkcolor' => null,
-              'backgroundimage' => null,
-              'disposition' => null),
-        'notice' =>
-        array('contentlimit' => null),
-        'message' =>
-        array('contentlimit' => null),
-        'http' =>
-        array('client' => 'curl'), // XXX: should this be the default?
-        );
+// Set config values initially to default values
+
+$config = $default;
+
+// default configuration, overwritten in config.php
 
 $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
 
-$config['db'] =
-  array('database' => 'YOU HAVE TO SET THIS IN config.php',
-        'schema_location' => INSTALLDIR . '/classes',
-        'class_location' => INSTALLDIR . '/classes',
-        'require_prefix' => 'classes/',
-        'class_prefix' => '',
-        'mirror' => null,
-        'utf8' => true,
-        'db_driver' => 'DB', # XXX: JanRain libs only work with DB
-        'quote_identifiers' => false,
-        'type' => 'mysql' );
+$config['db'] = $default['db'];
 
 // Backward compatibility
 
diff --git a/lib/default.php b/lib/default.php
new file mode 100644
index 0000000000..7af94d2ad6
--- /dev/null
+++ b/lib/default.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Default settings for core configuration
+ *
+ * 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  Config
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-9 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+$default =
+  array('site' =>
+        array('name' => 'Just another StatusNet microblog',
+              'server' => $_server,
+              'theme' => 'default',
+              'path' => $_path,
+              'logfile' => null,
+              'logo' => null,
+              'logdebug' => false,
+              'fancy' => false,
+              'locale_path' => INSTALLDIR.'/locale',
+              'language' => 'en_US',
+              'languages' => get_all_languages(),
+              'email' =>
+              array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : null,
+              'broughtby' => null,
+              'timezone' => 'UTC',
+              'broughtbyurl' => null,
+              'closed' => false,
+              'inviteonly' => false,
+              'private' => false,
+              'ssl' => 'never',
+              'sslserver' => null,
+              'shorturllength' => 30,
+              'dupelimit' => 60, # default for same person saying the same thing
+              'textlimit' => 140,
+              ),
+        'db' =>
+        array('database' => 'YOU HAVE TO SET THIS IN config.php',
+              'schema_location' => INSTALLDIR . '/classes',
+              'class_location' => INSTALLDIR . '/classes',
+              'require_prefix' => 'classes/',
+              'class_prefix' => '',
+              'mirror' => null,
+              'utf8' => true,
+              'db_driver' => 'DB', # XXX: JanRain libs only work with DB
+              'quote_identifiers' => false,
+              'type' => 'mysql' ),
+        'syslog' =>
+        array('appname' => 'statusnet', # for syslog
+              'priority' => 'debug', # XXX: currently ignored
+              'facility' => LOG_USER),
+        'queue' =>
+        array('enabled' => false,
+              'subsystem' => 'db', # default to database, or 'stomp'
+              'stomp_server' => null,
+              'queue_basename' => 'statusnet',
+              'stomp_username' => null,
+              'stomp_password' => null,
+              ),
+        'license' =>
+        array('url' => 'http://creativecommons.org/licenses/by/3.0/',
+              'title' => 'Creative Commons Attribution 3.0',
+              'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'),
+        'mail' =>
+        array('backend' => 'mail',
+              'params' => null),
+        'nickname' =>
+        array('blacklist' => array(),
+              'featured' => array()),
+        'profile' =>
+        array('banned' => array(),
+              'biolimit' => null),
+        'avatar' =>
+        array('server' => null,
+              'dir' => INSTALLDIR . '/avatar/',
+              'path' => $_path . '/avatar/'),
+        'background' =>
+        array('server' => null,
+              'dir' => INSTALLDIR . '/background/',
+              'path' => $_path . '/background/'),
+        'public' =>
+        array('localonly' => true,
+              'blacklist' => array(),
+              'autosource' => array()),
+        'theme' =>
+        array('server' => null,
+              'dir' => null,
+              'path'=> null),
+        'throttle' =>
+        array('enabled' => false, // whether to throttle edits; false by default
+              'count' => 20, // number of allowed messages in timespan
+              'timespan' => 600), // timespan for throttling
+        'xmpp' =>
+        array('enabled' => false,
+              'server' => 'INVALID SERVER',
+              'port' => 5222,
+              'user' => 'update',
+              'encryption' => true,
+              'resource' => 'uniquename',
+              'password' => 'blahblahblah',
+              'host' => null, # only set if != server
+              'debug' => false, # print extra debug info
+              'public' => array()), # JIDs of users who want to receive the public stream
+        'invite' =>
+        array('enabled' => true),
+        'sphinx' =>
+        array('enabled' => false,
+              'server' => 'localhost',
+              'port' => 3312),
+        'tag' =>
+        array('dropoff' => 864000.0),
+        'popular' =>
+        array('dropoff' => 864000.0),
+        'daemon' =>
+        array('piddir' => '/var/run',
+              'user' => false,
+              'group' => false),
+        'emailpost' =>
+        array('enabled' => true),
+        'sms' =>
+        array('enabled' => true),
+        'twitter' =>
+        array('enabled' => true),
+        'twitterbridge' =>
+        array('enabled' => false),
+        'integration' =>
+        array('source' => 'StatusNet', # source attribute for Twitter
+              'taguri' => $_server.',2009'), # base for tag URIs
+	'twitter' =>
+	array('consumer_key'    => null,
+	      'consumer_secret' => null),
+        'memcached' =>
+        array('enabled' => false,
+              'server' => 'localhost',
+              'base' => null,
+              'port' => 11211),
+ 		'ping' =>
+        array('notify' => array()),
+        'inboxes' =>
+        array('enabled' => true), # on by default for new sites
+        'newuser' =>
+        array('default' => null,
+              'welcome' => null),
+        'snapshot' =>
+        array('run' => 'web',
+              'frequency' => 10000,
+              'reporturl' => 'http://status.net/stats/report'),
+        'attachments' =>
+        array('server' => null,
+              'dir' => INSTALLDIR . '/file/',
+              'path' => $_path . '/file/',
+              'supported' => array('image/png',
+                                   'image/jpeg',
+                                   'image/gif',
+                                   'image/svg+xml',
+                                   'audio/mpeg',
+                                   'audio/x-speex',
+                                   'application/ogg',
+                                   'application/pdf',
+                                   'application/vnd.oasis.opendocument.text',
+                                   'application/vnd.oasis.opendocument.text-template',
+                                   'application/vnd.oasis.opendocument.graphics',
+                                   'application/vnd.oasis.opendocument.graphics-template',
+                                   'application/vnd.oasis.opendocument.presentation',
+                                   'application/vnd.oasis.opendocument.presentation-template',
+                                   'application/vnd.oasis.opendocument.spreadsheet',
+                                   'application/vnd.oasis.opendocument.spreadsheet-template',
+                                   'application/vnd.oasis.opendocument.chart',
+                                   'application/vnd.oasis.opendocument.chart-template',
+                                   'application/vnd.oasis.opendocument.image',
+                                   'application/vnd.oasis.opendocument.image-template',
+                                   'application/vnd.oasis.opendocument.formula',
+                                   'application/vnd.oasis.opendocument.formula-template',
+                                   'application/vnd.oasis.opendocument.text-master',
+                                   'application/vnd.oasis.opendocument.text-web',
+                                   'application/x-zip',
+                                   'application/zip',
+                                   'text/plain',
+                                   'video/mpeg',
+                                   'video/mp4',
+                                   'video/quicktime',
+                                   'video/mpeg'),
+        'file_quota' => 5000000,
+        'user_quota' => 50000000,
+        'monthly_quota' => 15000000,
+        'uploads' => true,
+        'filecommand' => '/usr/bin/file',
+        ),
+        'group' =>
+        array('maxaliases' => 3,
+              'desclimit' => null),
+        'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/'),
+        'search' =>
+        array('type' => 'fulltext'),
+        'sessions' =>
+        array('handle' => false, // whether to handle sessions ourselves
+              'debug' => false), // debugging output for sessions
+        'design' =>
+        array('backgroundcolor' => null, // null -> 'use theme default'
+              'contentcolor' => null,
+              'sidebarcolor' => null,
+              'textcolor' => null,
+              'linkcolor' => null,
+              'backgroundimage' => null,
+              'disposition' => null),
+        'notice' =>
+        array('contentlimit' => null),
+        'message' =>
+        array('contentlimit' => null),
+        'http' =>
+        array('client' => 'curl'), // XXX: should this be the default?
+        );

From d3d9913be062c974e3ae721c0cbf5c5ad2cbfce8 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Fri, 25 Sep 2009 12:47:14 +0000
Subject: [PATCH 117/247] Added hook for notice item. After <li> and Before
 </li>. Allows authors to include aside data to their notice items

---
 EVENTS.txt         | 6 ++++++
 lib/noticelist.php | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index fa25aabcd6..74923dcc0a 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -194,6 +194,12 @@ StartShowExportData: just before showing the <div> with export data (feeds)
 EndShowExportData: just after showing the <div> with export data (feeds)
 - $action: action object being shown
 
+StartShowNoticeItem: just before showing the notice item
+- $action: action object being shown
+
+EndShowNoticeItem: just after showing the notice item
+- $action: action object being shown
+
 StartShowPageNotice: just before showing the page notice (instructions or error)
 - $action: action object being shown
 
diff --git a/lib/noticelist.php b/lib/noticelist.php
index d4cd3ff6e5..c2ff7c26b3 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -178,9 +178,12 @@ class NoticeListItem extends Widget
     function show()
     {
         $this->showStart();
-        $this->showNotice();
-        $this->showNoticeInfo();
-        $this->showNoticeOptions();
+        if (Event::handle('StartShowNoticeItem', array($this))) {
+            $this->showNotice();
+            $this->showNoticeInfo();
+            $this->showNoticeOptions();
+            Event::handle('EndShowNoticeItem', array($this));
+        }
         $this->showEnd();
     }
 

From bc2a0f550be71aea89b2c4f548aa187627bbbf38 Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Fri, 25 Sep 2009 21:25:20 +0100
Subject: [PATCH 118/247] Updated Piwik plugin documentation to new addPlugin()
 installaation method

---
 plugins/PiwikAnalyticsPlugin.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index 8191f51811..54faa0bdbe 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -38,22 +38,16 @@ if (!defined('STATUSNET')) {
  * 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
+ * To use this plugin add the following to your config.php
  *
- *     require_once('plugins/PiwikAnalyticsPlugin.php');
- *     $pa = new PiwikAnalyticsPlugin("example.com/piwik/","id");
+ *  addPlugin('PiwikAnalytics', array('piwikroot' => 'example.com/piwik/',
+ *                                    'piwikId' => 'id'));
  *
- * exchange example.com/piwik/ with the url to your piwik installation and
- * make sure you don't forget the final /
- * exchange id with the ID your statusnet installation has in your Piwik analytics
+ * Replace 'example.com/piwik/' with the URL to your Piwik installation and
+ * make sure you don't forget the final /.
+ * Replace 'id' with the ID your statusnet installation has in your Piwik
+ * analytics setup - for example '8'.
  *
- * @category Plugin
- * @package  StatusNet
- * @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://status.net/
- *
- * @see      Event
  */
 
 class PiwikAnalyticsPlugin extends Plugin

From de5ff19713a990af197330dd8e4314de465ffe76 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 25 Sep 2009 16:58:35 -0700
Subject: [PATCH 119/247] Moved basic auth stuff into its own classes

---
 actions/apifriendstimeline.php | 114 ++++++++++++----------------
 lib/apiauth.php                | 131 +++++++++++++++++++++++++++++++++
 lib/apibareauth.php            |  68 +++++++++++++++++
 lib/router.php                 |   4 +-
 lib/twitterapi.php             |  81 --------------------
 5 files changed, 247 insertions(+), 151 deletions(-)
 create mode 100644 lib/apiauth.php
 create mode 100644 lib/apibareauth.php

diff --git a/actions/apifriendstimeline.php b/actions/apifriendstimeline.php
index 8c8d934164..2eb00e23a6 100644
--- a/actions/apifriendstimeline.php
+++ b/actions/apifriendstimeline.php
@@ -31,9 +31,9 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR.'/lib/apibareauth.php';
 
-class ApifriendstimelineAction extends TwitterapiAction
+class ApiFriendsTimelineAction extends ApiBareAuthAction
 {
 
     var $user    = null;
@@ -52,33 +52,33 @@ class ApifriendstimelineAction extends TwitterapiAction
     {
         parent::prepare($args);
 
-	$this->page     = (int)$this->arg('page', 1);
+        $this->page     = (int)$this->arg('page', 1);
         $this->count    = (int)$this->arg('count', 20);
         $this->max_id   = (int)$this->arg('max_id', 0);
         $this->since_id = (int)$this->arg('since_id', 0);
         $this->since    = $this->arg('since');
 
-	if ($this->requiresAuth()) {
+        if ($this->requiresAuth()) {
             if ($this->checkBasicAuthUser() == false) {
-		return;
-	    }
-	}
+                return;
+            }
+        }
 
-	$this->user = $this->getTargetUser($this->arg('id'));
+        $this->user = $this->getTargetUser($this->arg('id'));
 
-	if (empty($this->user)) {
+        if (empty($this->user)) {
             $this->clientError(_('No such user!'), 404, $this->arg('format'));
             return;
         }
 
-	$this->notices = $this->getNotices();
+        $this->notices = $this->getNotices();
 
         return true;
     }
 
     function handle($args) {
-	parent::handle($args);
-	$this->showTimeline();
+        parent::handle($args);
+        $this->showTimeline();
     }
 
     function showTimeline()
@@ -89,82 +89,60 @@ class ApifriendstimelineAction extends TwitterapiAction
         $taguribase = common_config('integration', 'taguri');
         $id         = "tag:$taguribase:FriendsTimeline:" . $user->id;
         $link       = common_local_url('all',
-				       array('nickname' => $user->nickname));
+                                       array('nickname' => $user->nickname));
         $subtitle   = sprintf(_('Updates from %1$s and friends on %2$s!'),
-			      $user->nickname, $sitename);
+                              $user->nickname, $sitename);
 
         switch($this->arg('format')) {
-	 case 'xml':
-            $this->show_xml_timeline($this->notices);
-            break;
-	 case 'rss':
-            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
-            break;
-	 case 'atom':
+            case 'xml':
+                $this->show_xml_timeline($this->notices);
+                break;
+            case 'rss':
+                $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+                break;
+            case 'atom':
 
-            $target_id = $this->arg('id');
+                $target_id = $this->arg('id');
 
-            if (isset($target_id)) {
-                $selfuri = common_root_url() .
-		  'api/statuses/friends_timeline/' .
-		  $target_id . '.atom';
-            } else {
-                $selfuri = common_root_url() .
-		  'api/statuses/friends_timeline.atom';
-            }
-            $this->show_atom_timeline($this->notices, $title, $id, $link,
-				      $subtitle, null, $selfuri);
-            break;
-	 case 'json':
-            $this->show_json_timeline($this->notices);
-            break;
-	 default:
-            $this->clientError(_('API method not found!'), $code = 404);
-	    break;
+                if (isset($target_id)) {
+                    $selfuri = common_root_url() .
+                        'api/statuses/friends_timeline/' .
+                        $target_id . '.atom';
+                } else {
+                    $selfuri = common_root_url() .
+                        'api/statuses/friends_timeline.atom';
+                }
+                $this->show_atom_timeline($this->notices, $title, $id, $link,
+                                          $subtitle, null, $selfuri);
+                break;
+            case 'json':
+                $this->show_json_timeline($this->notices);
+                break;
+            default:
+                $this->clientError(_('API method not found!'), $code = 404);
+                break;
         }
     }
 
     function getNotices()
     {
-	$notices = array();
+        $notices = array();
 
         if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) {
             $notice = $this->user->noticeInbox(($this->page-1) * $this->count,
-					       $this->count, $this->since_id,
-					       $this->max_id, $this->since);
+                                               $this->count, $this->since_id,
+                                               $this->max_id, $this->since);
         } else {
             $notice = $this->user->noticesWithFriends(($this->page-1) * $this->count,
-						      $this->count, $this->since_id,
-						      $this->max_id, $this->since);
+                                                      $this->count, $this->since_id,
+                                                      $this->max_id, $this->since);
         }
 
-	while ($notice->fetch()) {
+        while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
 
-	return $notices;
-    }
-
-    function requiresAuth()
-    {
-	// If the site is "private", all API methods except statusnet/config
-        // need authentication
-
-        if (common_config('site', 'private')) {
-	    return true;
-        }
-
-	// bare auth: only needs auth if without an argument or query param specifying user id
-
-	$id           = $this->arg('id');
-	$user_id      = $this->arg('user_id');
-	$screen_name  = $this->arg('screen_name');
-
-	if (empty($id) && empty($user_id) && empty($screen_name)) {
-	    return true;
-	}
-
-	return false;
+        return $notices;
     }
 
     /**
diff --git a/lib/apiauth.php b/lib/apiauth.php
new file mode 100644
index 0000000000..501d3de10e
--- /dev/null
+++ b/lib/apiauth.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Base class for API actions that require authentication
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/twitterapi.php';
+
+class ApiAuthAction extends TwitterapiAction
+{
+    /**
+     * Does this API resource require authentication?
+     *
+     * @return boolean true
+     */
+
+    function requiresAuth()
+    {
+        return true;
+    }
+
+    function checkBasicAuthUser()
+    {
+        $this->basicAuthProcessHeader();
+
+        if (!isset($this->auth_user)) {
+            header('WWW-Authenticate: Basic realm="StatusNet API"');
+
+            // show error if the user clicks 'cancel'
+
+            $this->showBasicAuthError();
+            return false;
+
+        } else {
+            $nickname = $this->auth_user;
+            $password = $this->auth_pw;
+            $this->auth_user = common_check_user($nickname, $password);
+
+            if (empty($this->auth_user)) {
+
+                // basic authentication failed
+
+                list($proxy, $ip) = common_client_ip();
+                common_log(LOG_WARNING,
+                    "Failed API auth attempt, nickname = $nickname, proxy = $proxy, ip = $ip.");
+                $this->showBasicAuthError();
+                return false;
+            }
+        }
+        return true;
+    }
+
+    function basicAuthProcessHeader()
+    {
+        if (isset($_SERVER['AUTHORIZATION']) || isset($_SERVER['HTTP_AUTHORIZATION'])) {
+            $authorization_header = isset($_SERVER['HTTP_AUTHORIZATION'])? $_SERVER['HTTP_AUTHORIZATION'] : $_SERVER['AUTHORIZATION'];
+        }
+
+        if (isset($_SERVER['PHP_AUTH_USER'])) {
+            $this->auth_user = $_SERVER['PHP_AUTH_USER'];
+            $this->auth_pw = $_SERVER['PHP_AUTH_PW'];
+        } elseif (isset($authorization_header) && strstr(substr($authorization_header, 0, 5), 'Basic')) {
+            // decode the HTTP_AUTHORIZATION header on php-cgi server self
+            // on fcgid server the header name is AUTHORIZATION
+
+            $auth_hash = base64_decode(substr($authorization_header, 6));
+            list($this->auth_user, $this->auth_pw) = explode(':', $auth_hash);
+
+            // set all to null on a empty basic auth request
+            if ($this->auth_user == "") {
+                $this->auth_user = null;
+                $this->auth_pw = null;
+            }
+        } else {
+            $this->auth_user = null;
+            $this->auth_pw = null;
+        }
+    }
+
+    function showBasicAuthError()
+    {
+        header('HTTP/1.1 401 Unauthorized');
+        $msg = 'Could not authenticate you.';
+
+        if ($this->arg('format') == 'xml') {
+            header('Content-Type: application/xml; charset=utf-8');
+            $this->startXML();
+            $this->elementStart('hash');
+            $this->element('error', null, $msg);
+            $this->element('request', null, $_SERVER['REQUEST_URI']);
+            $this->elementEnd('hash');
+            $this->endXML();
+        } elseif ($this->arg('format') == 'json') {
+            header('Content-Type: application/json; charset=utf-8');
+            $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
+            print(json_encode($error_array));
+        } else {
+            header('Content-type: text/plain');
+            print "$msg\n";
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/lib/apibareauth.php b/lib/apibareauth.php
new file mode 100644
index 0000000000..8921cddca0
--- /dev/null
+++ b/lib/apibareauth.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Base class for API actions that require "bare auth". Bare auth means
+ * authentication is required only if the action is called without an argument
+ * or query param specifying user id.
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apiauth.php';
+
+class ApiBareAuthAction extends ApiAuthAction
+{
+    /**
+     * Does this API resource require authentication?
+     *
+     * @return boolean true or false
+     */
+
+    function requiresAuth()
+    {
+        // If the site is "private", all API methods except statusnet/config
+        // need authentication
+
+        if (common_config('site', 'private')) {
+            return true;
+        }
+
+        // check whether a user has been specified somehow
+
+        $id           = $this->arg('id');
+        $user_id      = $this->arg('user_id');
+        $screen_name  = $this->arg('screen_name');
+
+        if (empty($id) && empty($user_id) && empty($screen_name)) {
+            return true;
+        }
+
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/lib/router.php b/lib/router.php
index 0e5fe3a54f..370fbe62b5 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -263,11 +263,11 @@ class Router
         // statuses API
 
         $m->connect('api/statuses/friends_timeline.:format',
-                    array('action' => 'apifriendstimeline',
+                    array('action' => 'ApiFriendsTimeline',
                           'format' => '(xml|json|rss|atom)'));
 
         $m->connect('api/statuses/friends_timeline/:id.:format',
-                    array('action' => 'apifriendstimeline',
+                    array('action' => 'ApiFriendsTimeline',
                           'id' => '[a-zA-Z0-9]+',
                           'format' => '(xml|json|rss|atom)'));
 
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 959b0981a5..5cf6666688 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -1205,85 +1205,4 @@ class TwitterapiAction extends Action
         }
     }
 
-    function checkBasicAuthUser()
-    {
-        $this->basicAuthProcessHeader();
-
-        if (!isset($this->auth_user)) {
-            header('WWW-Authenticate: Basic realm="StatusNet API"');
-
-            // show error if the user clicks 'cancel'
-
-            $this->showBasicAuthError();
-            return false;
-
-        } else {
-            $nickname = $this->auth_user;
-            $password = $this->auth_pw;
-            $this->auth_user = common_check_user($nickname, $password);
-
-            if (empty($this->auth_user)) {
-
-                // basic authentication failed
-
-                list($proxy, $ip) = common_client_ip();
-                common_log(LOG_WARNING,
-                    "Failed API auth attempt, nickname = $nickname, proxy = $proxy, ip = $ip.");
-                $this->showBasicAuthError();
-                return false;
-            }
-        }
-        return true;
-    }
-
-    function basicAuthProcessHeader()
-    {
-        if (isset($_SERVER['AUTHORIZATION']) || isset($_SERVER['HTTP_AUTHORIZATION'])) {
-            $authorization_header = isset($_SERVER['HTTP_AUTHORIZATION'])? $_SERVER['HTTP_AUTHORIZATION'] : $_SERVER['AUTHORIZATION'];
-        }
-
-        if (isset($_SERVER['PHP_AUTH_USER'])) {
-            $this->auth_user = $_SERVER['PHP_AUTH_USER'];
-            $this->auth_pw = $_SERVER['PHP_AUTH_PW'];
-        } elseif (isset($authorization_header) && strstr(substr($authorization_header, 0, 5), 'Basic')) {
-            // decode the HTTP_AUTHORIZATION header on php-cgi server self
-            // on fcgid server the header name is AUTHORIZATION
-
-            $auth_hash = base64_decode(substr($authorization_header, 6));
-            list($this->auth_user, $this->auth_pw) = explode(':', $auth_hash);
-
-            // set all to null on a empty basic auth request
-            if ($this->auth_user == "") {
-                $this->auth_user = null;
-                $this->auth_pw = null;
-            }
-        } else {
-            $this->auth_user = null;
-            $this->auth_pw = null;
-        }
-    }
-
-    function showBasicAuthError()
-    {
-        header('HTTP/1.1 401 Unauthorized');
-        $msg = 'Could not authenticate you.';
-
-        if ($this->arg('format') == 'xml') {
-            header('Content-Type: application/xml; charset=utf-8');
-            $this->startXML();
-            $this->elementStart('hash');
-            $this->element('error', null, $msg);
-            $this->element('request', null, $_SERVER['REQUEST_URI']);
-            $this->elementEnd('hash');
-            $this->endXML();
-        } elseif ($this->arg('format') == 'json') {
-            header('Content-Type: application/json; charset=utf-8');
-            $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
-            print(json_encode($error_array));
-        } else {
-            header('Content-type: text/plain');
-            print "$msg\n";
-        }
-    }
-
 }

From 2b6dfbdf2b9df0992018f8df1f54b4cf16185599 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sat, 26 Sep 2009 20:25:47 +0000
Subject: [PATCH 120/247] A different go at the realtime button location.
 Button is in a prominent location.

---
 plugins/Realtime/realtimeupdate.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 57fe0a8436..a31565177f 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -113,19 +113,19 @@ RealtimeUpdate = {
 
      addPopup: function(url, timeline, iconurl)
      {
-         $('#site_nav_local_views .current a').append('<button id="realtime_timeline" title="Real-time pop window">&#8599;</button>');
+         $('#content').prepend('<button id="realtime_timeline" title="Realtime window">Realtime</button>');
  
          $('#realtime_timeline').css({
-             'margin':'2px 0 0 11px',
-             'background':'transparent url('+ iconurl + ') no-repeat 45% 45%',
-             'text-indent':'-9999px',
-             'width':'16px',
-             'height':'16px',
-             'padding':'0',
+             'margin':'0 0 18px 0',
+             'background':'transparent url('+ iconurl + ') no-repeat 0% 30%',
+             'padding':'0 0 0 20px',
              'display':'block',
              'float':'right',
              'border':'none',
-             'cursor':'pointer'
+             'cursor':'pointer',
+             'color':$("a").css("color"),
+             'font-weight':'bold',
+             'font-size':'1em'
          });
  
          $('#realtime_timeline').click(function() {

From 7d843b11228bb55750177ca7809d5f067d52dc20 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 11:31:34 +0000
Subject: [PATCH 121/247] jQuery.prepend takes a single param

---
 plugins/Realtime/realtimeupdate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index a31565177f..765710bfe2 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -27,7 +27,7 @@ RealtimeUpdate = {
           }
 
           var noticeItem = RealtimeUpdate.makeNoticeItem(data);
-          $("#notices_primary .notices").prepend(noticeItem, true);
+          $("#notices_primary .notices").prepend(noticeItem);
           $("#notices_primary .notice:first").css({display:"none"});
           $("#notices_primary .notice:first").fadeIn(1000);
           NoticeReply();

From a51339a2195caed5a3833346f508b38953e4618b Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 11:49:18 +0000
Subject: [PATCH 122/247] Don't really need the header container. Adjusted some
 CSS instead

---
 plugins/Realtime/RealtimePlugin.php |  3 ---
 plugins/Realtime/realtimeupdate.js  | 10 +++++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index e30c411567..0f0d0f9f42 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -216,8 +216,6 @@ class RealtimePlugin extends Plugin
                                                               'class' => 'user_in')
                               : array('id' => $action->trimmed('action')));
 
-        $action->elementStart('div', array('id' => 'header'));
-
         // XXX hack to deal with JS that tries to get the
         // root url from page output
 
@@ -230,7 +228,6 @@ class RealtimePlugin extends Plugin
         if (common_logged_in()) {
             $action->showNoticeForm();
         }
-        $action->elementEnd('div');
 
         $action->showContentBlock();
         $action->elementEnd('body');
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 765710bfe2..a5f6052eab 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -114,7 +114,7 @@ RealtimeUpdate = {
      addPopup: function(url, timeline, iconurl)
      {
          $('#content').prepend('<button id="realtime_timeline" title="Realtime window">Realtime</button>');
- 
+
          $('#realtime_timeline').css({
              'margin':'0 0 18px 0',
              'background':'transparent url('+ iconurl + ') no-repeat 0% 30%',
@@ -127,12 +127,12 @@ RealtimeUpdate = {
              'font-weight':'bold',
              'font-size':'1em'
          });
- 
+
          $('#realtime_timeline').click(function() {
              window.open(url,
                          timeline,
                          'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
- 
+
              return false;
          });
      },
@@ -142,6 +142,10 @@ RealtimeUpdate = {
          window.resizeTo(575, 640);
          $('address').hide();
          $('#content').css({'width':'92%'});
+
+         $('#form_notice').css({
+             'margin':'18px 0 29px 1.795%'
+         });
      }
 }
 

From 74d537c834cf897e989d9909393c879129d99ae7 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 11:54:45 +0000
Subject: [PATCH 123/247] Using a relative value for the form_notice note
 location instead

---
 theme/base/css/display.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 1f37a7637b..7706fba484 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -484,7 +484,7 @@ height:16px;
 #form_notice .form_note {
 position:absolute;
 bottom:2px;
-right:98px;
+right:21.715%;
 z-index:9;
 }
 #form_notice .form_note dt {

From 73c92045373d097d115d4016da092a6e0711ab04 Mon Sep 17 00:00:00 2001
From: unknown <jul@.stanford.edu>
Date: Sun, 27 Sep 2009 13:58:48 +0200
Subject: [PATCH 124/247] fix for a misnamed variable in subscription function
 in the "create simulation data" script

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

diff --git a/scripts/createsim.php b/scripts/createsim.php
index 71ed3bf722..1266a9700b 100644
--- a/scripts/createsim.php
+++ b/scripts/createsim.php
@@ -101,7 +101,7 @@ function newSub($i)
 
     $to = User::staticGet('nickname', $tunic);
 
-    if (empty($from)) {
+    if (empty($to)) {
         throw new Exception("Can't find user '$tunic'.");
     }
 

From 4d92d7d52ff20b22232c32c40fc88a8d03085ec9 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 12:15:37 +0000
Subject: [PATCH 125/247] Removed form_notice label and h1 from view

---
 plugins/Realtime/realtimeupdate.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index a5f6052eab..bcbf1ba287 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -144,8 +144,12 @@ RealtimeUpdate = {
          $('#content').css({'width':'92%'});
 
          $('#form_notice').css({
-             'margin':'18px 0 29px 1.795%'
+            'margin':'18px 0 29px 1.795%'
          });
+
+         $('#form_notice label, h1').css({'display': 'none'});
+
+         $('.notices li:first-child').css({'border-top':'none'});
      }
 }
 

From 7c335c28da886f48439ad648bd5ab4957152f140 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 12:21:49 +0000
Subject: [PATCH 126/247] Updated window resize

---
 plugins/Realtime/realtimeupdate.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index bcbf1ba287..984c1bf55e 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -139,12 +139,12 @@ RealtimeUpdate = {
 
      initPopupWindow: function()
      {
-         window.resizeTo(575, 640);
+         window.resizeTo(500, 550);
          $('address').hide();
          $('#content').css({'width':'92%'});
 
          $('#form_notice').css({
-            'margin':'18px 0 29px 1.795%'
+            'margin':'18px 0 29px 1.795%',
          });
 
          $('#form_notice label, h1').css({'display': 'none'});

From 3bc55e7b8bff2fe331371333de9ff4f96c8584d2 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 12:22:56 +0000
Subject: [PATCH 127/247] Reduced form_notice margin bottom

---
 plugins/Realtime/realtimeupdate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 984c1bf55e..ad519158b0 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -144,7 +144,7 @@ RealtimeUpdate = {
          $('#content').css({'width':'92%'});
 
          $('#form_notice').css({
-            'margin':'18px 0 29px 1.795%',
+            'margin':'18px 0 18px 1.795%',
          });
 
          $('#form_notice label, h1').css({'display': 'none'});

From c66a884ff5cec1e58a7ba40f310badd3f108d9a5 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 12:26:01 +0000
Subject: [PATCH 128/247] Increated content width

---
 plugins/Realtime/realtimeupdate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index ad519158b0..965fea9926 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -141,7 +141,7 @@ RealtimeUpdate = {
      {
          window.resizeTo(500, 550);
          $('address').hide();
-         $('#content').css({'width':'92%'});
+         $('#content').css({'width':'93.5%'});
 
          $('#form_notice').css({
             'margin':'18px 0 18px 1.795%',

From 8904f0f67dc8ab79b07d95452171a1d2b0af5efc Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 12:38:40 +0000
Subject: [PATCH 129/247] Removing only notie_data-text label from view

---
 plugins/Realtime/realtimeupdate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 965fea9926..fa0334881b 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -147,7 +147,7 @@ RealtimeUpdate = {
             'margin':'18px 0 18px 1.795%',
          });
 
-         $('#form_notice label, h1').css({'display': 'none'});
+         $('#form_notice label[for=notice_data-text], h1').css({'display': 'none'});
 
          $('.notices li:first-child').css({'border-top':'none'});
      }

From 3bba45102130e01032163f40e52005744623c686 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 12:40:35 +0000
Subject: [PATCH 130/247] Aligning notice_data-attach from top

---
 plugins/Realtime/realtimeupdate.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index fa0334881b..86fb01a5d9 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -150,6 +150,8 @@ RealtimeUpdate = {
          $('#form_notice label[for=notice_data-text], h1').css({'display': 'none'});
 
          $('.notices li:first-child').css({'border-top':'none'});
+
+         $('#form_notice label[for="notice_data-attach"], #form_notice #notice_data-attach').css({'top':'0'});
      }
 }
 

From 7466887a2f6e9d8f5f45a8b2e92e2147c572864c Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 12:43:40 +0000
Subject: [PATCH 131/247] Adjusted form_notice width

---
 plugins/Realtime/realtimeupdate.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 86fb01a5d9..b791f4a2ab 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -145,6 +145,8 @@ RealtimeUpdate = {
 
          $('#form_notice').css({
             'margin':'18px 0 18px 1.795%',
+            'width':'93%',
+            'max-width':'451px'
          });
 
          $('#form_notice label[for=notice_data-text], h1').css({'display': 'none'});

From 22332555cf5eb920d6f95eced76446cf189d6f54 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 12:59:01 +0000
Subject: [PATCH 132/247] Aligned notice_data-attach input

---
 plugins/Realtime/realtimeupdate.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index b791f4a2ab..015c004397 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -154,6 +154,11 @@ RealtimeUpdate = {
          $('.notices li:first-child').css({'border-top':'none'});
 
          $('#form_notice label[for="notice_data-attach"], #form_notice #notice_data-attach').css({'top':'0'});
+
+         $('#form_notice #notice_data-attach').css({
+            'left':'auto',
+            'right':'0'
+         });
      }
 }
 

From 60335fcbdf7b2ae4d27e7d413e7f5f46f61feda5 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 14:06:39 +0000
Subject: [PATCH 133/247] Draw a line to indicate new (unread) notice in a
 timeline since window blur. Inspired by Pidgin's Markerline plugin.

---
 plugins/Realtime/realtimeupdate.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 015c004397..b5f78e4163 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -14,6 +14,18 @@ RealtimeUpdate = {
         RealtimeUpdate._replyurl = replyurl;
         RealtimeUpdate._favorurl = favorurl;
         RealtimeUpdate._deleteurl = deleteurl;
+
+        $(window).blur(function() {
+          $('#notices_primary .notice').css({
+            'border-top-color':$('#notices_primary .notice:last').css('border-top-color'),
+            'border-top-style':'dotted'
+          });
+
+          $('#notices_primary .notice:first').css({
+            'border-top-color':'#AAAAAA',
+            'border-top-style':'solid'
+          });
+        });
      },
 
      receive: function(data)
@@ -151,7 +163,7 @@ RealtimeUpdate = {
 
          $('#form_notice label[for=notice_data-text], h1').css({'display': 'none'});
 
-         $('.notices li:first-child').css({'border-top':'none'});
+         $('.notices li:first-child').css({'border-top-color':'transparent'});
 
          $('#form_notice label[for="notice_data-attach"], #form_notice #notice_data-attach').css({'top':'0'});
 

From 3694058976fca36edf2d7f43a75ffc74f0a7c672 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 27 Sep 2009 14:24:31 +0000
Subject: [PATCH 134/247] Changed terminology for poping a window

---
 plugins/Realtime/realtimeupdate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index b5f78e4163..4cd68a816b 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -125,7 +125,7 @@ RealtimeUpdate = {
 
      addPopup: function(url, timeline, iconurl)
      {
-         $('#content').prepend('<button id="realtime_timeline" title="Realtime window">Realtime</button>');
+         $('#content').prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>');
 
          $('#realtime_timeline').css({
              'margin':'0 0 18px 0',

From 3ff8514f5ed8dac381cf24d9de9a25dcfa20af77 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sat, 26 Sep 2009 17:14:10 -0700
Subject: [PATCH 135/247] Fix URL linkification test cases for addition of
 'title' attribution with long URL in f3c8fccc

After removing 103 false positives, this leaves 4 actually broken tests, showing two failure modes for mail links:
* 'mail without mailto' formatting shortcut in common_linkify didn't get the 'title' attribute added with the other URLs
* links including mailto: protocol are being incorrectly expanded to http: protocol in the long URL
---
 tests/URLDetectionTest.php | 218 ++++++++++++++++++-------------------
 1 file changed, 109 insertions(+), 109 deletions(-)

diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index 1c3f7cd96f..a7cdcaa242 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -28,69 +28,69 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('not a link :: no way',
                            'not a link :: no way'),
                      array('link http://www.somesite.com/xyz/35637563@N00/52803365/ link',
-                           'link <a href="http://www.somesite.com/xyz/35637563@N00/52803365/" rel="external">http://www.somesite.com/xyz/35637563@N00/52803365/</a> link'),
+                           'link <a href="http://www.somesite.com/xyz/35637563@N00/52803365/" title="http://www.somesite.com/xyz/35637563@N00/52803365/" rel="external">http://www.somesite.com/xyz/35637563@N00/52803365/</a> link'),
                      array('http://127.0.0.1',
-                           '<a href="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
+                           '<a href="http://127.0.0.1/" title="http://127.0.0.1" rel="external">http://127.0.0.1</a>'),
                      array('127.0.0.1',
-                           '<a href="http://127.0.0.1/" rel="external">127.0.0.1</a>'),
+                           '<a href="http://127.0.0.1/" title="http://127.0.0.1" rel="external">127.0.0.1</a>'),
                      array('127.0.0.1:99',
-                           '<a href="http://127.0.0.1:99/" rel="external">127.0.0.1:99</a>'),
+                           '<a href="http://127.0.0.1:99/" title="http://127.0.0.1:99" rel="external">127.0.0.1:99</a>'),
                      array('127.0.0.1/Name:test.php',
-                           '<a href="http://127.0.0.1/Name:test.php" rel="external">127.0.0.1/Name:test.php</a>'),
+                           '<a href="http://127.0.0.1/Name:test.php" title="http://127.0.0.1/Name:test.php" rel="external">127.0.0.1/Name:test.php</a>'),
                      array('127.0.0.1/~test',
-                           '<a href="http://127.0.0.1/~test" rel="external">127.0.0.1/~test</a>'),
+                           '<a href="http://127.0.0.1/~test" title="http://127.0.0.1/~test" rel="external">127.0.0.1/~test</a>'),
                      array('127.0.0.1/+test',
-                           '<a href="http://127.0.0.1/+test" rel="external">127.0.0.1/+test</a>'),
+                           '<a href="http://127.0.0.1/+test" title="http://127.0.0.1/+test" rel="external">127.0.0.1/+test</a>'),
                      array('127.0.0.1/$test',
-                           '<a href="http://127.0.0.1/$test" rel="external">127.0.0.1/$test</a>'),
+                           '<a href="http://127.0.0.1/$test" title="http://127.0.0.1/$test" rel="external">127.0.0.1/$test</a>'),
                      array('127.0.0.1/\'test',
-                           '<a href="http://127.0.0.1/\'test" rel="external">127.0.0.1/\'test</a>'),
+                           '<a href="http://127.0.0.1/\'test" title="http://127.0.0.1/\'test" rel="external">127.0.0.1/\'test</a>'),
                      array('127.0.0.1/"test',
-                           '<a href="http://127.0.0.1/&quot;test" rel="external">127.0.0.1/&quot;test</a>'),
+                           '<a href="http://127.0.0.1/&quot;test" title="http://127.0.0.1/&quot;test" rel="external">127.0.0.1/&quot;test</a>'),
                      array('127.0.0.1/-test',
-                           '<a href="http://127.0.0.1/-test" rel="external">127.0.0.1/-test</a>'),
+                           '<a href="http://127.0.0.1/-test" title="http://127.0.0.1/-test" rel="external">127.0.0.1/-test</a>'),
                      array('127.0.0.1/_test',
-                           '<a href="http://127.0.0.1/_test" rel="external">127.0.0.1/_test</a>'),
+                           '<a href="http://127.0.0.1/_test" title="http://127.0.0.1/_test" rel="external">127.0.0.1/_test</a>'),
                      array('127.0.0.1/!test',
-                           '<a href="http://127.0.0.1/!test" rel="external">127.0.0.1/!test</a>'),
+                           '<a href="http://127.0.0.1/!test" title="http://127.0.0.1/!test" rel="external">127.0.0.1/!test</a>'),
                      array('127.0.0.1/*test',
-                           '<a href="http://127.0.0.1/*test" rel="external">127.0.0.1/*test</a>'),
+                           '<a href="http://127.0.0.1/*test" title="http://127.0.0.1/*test" rel="external">127.0.0.1/*test</a>'),
                      array('127.0.0.1/test%20stuff',
-                           '<a href="http://127.0.0.1/test%20stuff" rel="external">127.0.0.1/test%20stuff</a>'),
+                           '<a href="http://127.0.0.1/test%20stuff" title="http://127.0.0.1/test%20stuff" rel="external">127.0.0.1/test%20stuff</a>'),
                      array('http://[::1]:99/test.php',
-                           '<a href="http://[::1]:99/test.php" rel="external">http://[::1]:99/test.php</a>'),
+                           '<a href="http://[::1]:99/test.php" title="http://[::1]:99/test.php" rel="external">http://[::1]:99/test.php</a>'),
                      array('http://::1/test.php',
-                           '<a href="http://::1/test.php" rel="external">http://::1/test.php</a>'),
+                           '<a href="http://::1/test.php" title="http://::1/test.php" rel="external">http://::1/test.php</a>'),
                      array('http://::1',
-                           '<a href="http://::1/" rel="external">http://::1</a>'),
+                           '<a href="http://::1/" title="http://::1" rel="external">http://::1</a>'),
                      array('2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php',
-                           '<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php</a>'),
+                           '<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php" title="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php</a>'),
                      array('[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php',
-                           '<a href="http://[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php" rel="external">[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php</a>'),
+                           '<a href="http://[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php" title="http://[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php" rel="external">[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php</a>'),
                      array('2001:4978:1b5:0:21d:e0ff:fe66:59ab',
-                           '<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab</a>'),
+                           '<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/" title="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab</a>'),
                      array('http://127.0.0.1',
-                           '<a href="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
+                           '<a href="http://127.0.0.1/" title="http://127.0.0.1" rel="external">http://127.0.0.1</a>'),
                      array('example.com',
-                           '<a href="http://example.com/" rel="external">example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>'),
                      array('example.com',
-                           '<a href="http://example.com/" rel="external">example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>'),
                      array('http://example.com',
-                           '<a href="http://example.com/" rel="external">http://example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>'),
                      array('http://example.com.',
-                           '<a href="http://example.com/" rel="external">http://example.com</a>.'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>.'),
                      array('/var/lib/example.so',
                            '/var/lib/example.so'),
                      array('example',
                            'example'),
                      array('user@example.com',
-                           '<a href="mailto:user@example.com" rel="external">user@example.com</a>'),
+                           '<a href="mailto:user@example.com" title="mailto:user@example.com" rel="external">user@example.com</a>'),
                      array('user_name+other@example.com',
-                           '<a href="mailto:user_name+other@example.com" rel="external">user_name+other@example.com</a>'),
+                           '<a href="mailto:user_name+other@example.com" title="mailto:user_name+other@example.com" rel="external">user_name+other@example.com</a>'),
                      array('mailto:user@example.com',
-                           '<a href="mailto:user@example.com" rel="external">mailto:user@example.com</a>'),
+                           '<a href="mailto:user@example.com" title="mailto:user@example.com" rel="external">mailto:user@example.com</a>'),
                      array('mailto:user@example.com?subject=test',
-                           '<a href="mailto:user@example.com?subject=test" rel="external">mailto:user@example.com?subject=test</a>'),
+                           '<a href="mailto:user@example.com?subject=test" title="mailto:user@example.com?subject=test" rel="external">mailto:user@example.com?subject=test</a>'),
                      array('#example',
                            '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('example'))) . '" rel="tag">example</a></span>'),
                      array('#example.com',
@@ -98,165 +98,165 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('#.net',
                            '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('.net'))) . '" rel="tag">.net</a></span>'),
                      array('http://example',
-                           '<a href="http://example/" rel="external">http://example</a>'),
+                           '<a href="http://example/" title="http://example" rel="external">http://example</a>'),
                      array('http://3xampl3',
-                           '<a href="http://3xampl3/" rel="external">http://3xampl3</a>'),
+                           '<a href="http://3xampl3/" title="http://3xampl3" rel="external">http://3xampl3</a>'),
                      array('http://example/',
-                           '<a href="http://example/" rel="external">http://example/</a>'),
+                           '<a href="http://example/" title="http://example/" rel="external">http://example/</a>'),
                      array('http://example/path',
-                           '<a href="http://example/path" rel="external">http://example/path</a>'),
+                           '<a href="http://example/path" title="http://example/path" rel="external">http://example/path</a>'),
                      array('http://example.com',
-                           '<a href="http://example.com/" rel="external">http://example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>'),
                      array('https://example.com',
-                           '<a href="https://example.com/" rel="external">https://example.com</a>'),
+                           '<a href="https://example.com/" title="https://example.com" rel="external">https://example.com</a>'),
                      array('ftp://example.com',
-                           '<a href="ftp://example.com/" rel="external">ftp://example.com</a>'),
+                           '<a href="ftp://example.com/" title="ftp://example.com" rel="external">ftp://example.com</a>'),
                      array('ftps://example.com',
-                           '<a href="ftps://example.com/" rel="external">ftps://example.com</a>'),
+                           '<a href="ftps://example.com/" title="ftps://example.com" rel="external">ftps://example.com</a>'),
                      array('http://user@example.com',
-                           '<a href="http://user@example.com/" rel="external">http://user@example.com</a>'),
+                           '<a href="http://user@example.com/" title="http://user@example.com" rel="external">http://user@example.com</a>'),
                      array('http://user:pass@example.com',
-                           '<a href="http://user:pass@example.com/" rel="external">http://user:pass@example.com</a>'),
+                           '<a href="http://user:pass@example.com/" title="http://user:pass@example.com" rel="external">http://user:pass@example.com</a>'),
                      array('http://example.com:8080',
-                           '<a href="http://example.com:8080/" rel="external">http://example.com:8080</a>'),
+                           '<a href="http://example.com:8080/" title="http://example.com:8080" rel="external">http://example.com:8080</a>'),
                      array('http://example.com:8080/test.php',
-                           '<a href="http://example.com:8080/test.php" rel="external">http://example.com:8080/test.php</a>'),
+                           '<a href="http://example.com:8080/test.php" title="http://example.com:8080/test.php" rel="external">http://example.com:8080/test.php</a>'),
                      array('example.com:8080/test.php',
-                           '<a href="http://example.com:8080/test.php" rel="external">example.com:8080/test.php</a>'),
+                           '<a href="http://example.com:8080/test.php" title="http://example.com:8080/test.php" rel="external">example.com:8080/test.php</a>'),
                      array('http://www.example.com',
-                           '<a href="http://www.example.com/" rel="external">http://www.example.com</a>'),
+                           '<a href="http://www.example.com/" title="http://www.example.com" rel="external">http://www.example.com</a>'),
                      array('http://example.com/',
-                           '<a href="http://example.com/" rel="external">http://example.com/</a>'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com/</a>'),
                      array('http://example.com/path',
-                           '<a href="http://example.com/path" rel="external">http://example.com/path</a>'),
+                           '<a href="http://example.com/path" title="http://example.com/path" rel="external">http://example.com/path</a>'),
                      array('http://example.com/path.html',
-                           '<a href="http://example.com/path.html" rel="external">http://example.com/path.html</a>'),
+                           '<a href="http://example.com/path.html" title="http://example.com/path.html" rel="external">http://example.com/path.html</a>'),
                      array('http://example.com/path.html#fragment',
-                           '<a href="http://example.com/path.html#fragment" rel="external">http://example.com/path.html#fragment</a>'),
+                           '<a href="http://example.com/path.html#fragment" title="http://example.com/path.html#fragment" rel="external">http://example.com/path.html#fragment</a>'),
                      array('http://example.com/path.php?foo=bar&bar=foo',
-                           '<a href="http://example.com/path.php?foo=bar&amp;bar=foo" rel="external">http://example.com/path.php?foo=bar&amp;bar=foo</a>'),
+                           '<a href="http://example.com/path.php?foo=bar&amp;bar=foo" title="http://example.com/path.php?foo=bar&amp;bar=foo" rel="external">http://example.com/path.php?foo=bar&amp;bar=foo</a>'),
                      array('http://example.com.',
-                           '<a href="http://example.com/" rel="external">http://example.com</a>.'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>.'),
                      array('http://müllärör.de',
-                           '<a href="http://m&#xFC;ll&#xE4;r&#xF6;r.de/" rel="external">http://müllärör.de</a>'),
+                           '<a href="http://m&#xFC;ll&#xE4;r&#xF6;r.de/" title="http://m&#xFC;ll&#xE4;r&#xF6;r.de" rel="external">http://müllärör.de</a>'),
                      array('http://ﺱﺲﺷ.com',
-                           '<a href="http://&#xFEB1;&#xFEB2;&#xFEB7;.com/" rel="external">http://ﺱﺲﺷ.com</a>'),
+                           '<a href="http://&#xFEB1;&#xFEB2;&#xFEB7;.com/" title="http://&#xFEB1;&#xFEB2;&#xFEB7;.com" rel="external">http://ﺱﺲﺷ.com</a>'),
                      array('http://сделаткартинки.com',
-                           '<a href="http://&#x441;&#x434;&#x435;&#x43B;&#x430;&#x442;&#x43A;&#x430;&#x440;&#x442;&#x438;&#x43D;&#x43A;&#x438;.com/" rel="external">http://сделаткартинки.com</a>'),
+                           '<a href="http://&#x441;&#x434;&#x435;&#x43B;&#x430;&#x442;&#x43A;&#x430;&#x440;&#x442;&#x438;&#x43D;&#x43A;&#x438;.com/" title="http://&#x441;&#x434;&#x435;&#x43B;&#x430;&#x442;&#x43A;&#x430;&#x440;&#x442;&#x438;&#x43D;&#x43A;&#x438;.com" rel="external">http://сделаткартинки.com</a>'),
                      array('http://tūdaliņ.lv',
-                           '<a href="http://t&#x16B;dali&#x146;.lv/" rel="external">http://tūdaliņ.lv</a>'),
+                           '<a href="http://t&#x16B;dali&#x146;.lv/" title="http://t&#x16B;dali&#x146;.lv" rel="external">http://tūdaliņ.lv</a>'),
                      array('http://brændendekærlighed.com',
-                           '<a href="http://br&#xE6;ndendek&#xE6;rlighed.com/" rel="external">http://brændendekærlighed.com</a>'),
+                           '<a href="http://br&#xE6;ndendek&#xE6;rlighed.com/" title="http://br&#xE6;ndendek&#xE6;rlighed.com" rel="external">http://brændendekærlighed.com</a>'),
                      array('http://あーるいん.com',
-                           '<a href="http://&#x3042;&#x30FC;&#x308B;&#x3044;&#x3093;.com/" rel="external">http://あーるいん.com</a>'),
+                           '<a href="http://&#x3042;&#x30FC;&#x308B;&#x3044;&#x3093;.com/" title="http://&#x3042;&#x30FC;&#x308B;&#x3044;&#x3093;.com" rel="external">http://あーるいん.com</a>'),
                      array('http://예비교사.com',
-                           '<a href="http://&#xC608;&#xBE44;&#xAD50;&#xC0AC;.com/" rel="external">http://예비교사.com</a>'),
+                           '<a href="http://&#xC608;&#xBE44;&#xAD50;&#xC0AC;.com/" title="http://&#xC608;&#xBE44;&#xAD50;&#xC0AC;.com" rel="external">http://예비교사.com</a>'),
                      array('http://example.com.',
-                           '<a href="http://example.com/" rel="external">http://example.com</a>.'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>.'),
                      array('http://example.com?',
-                           '<a href="http://example.com/" rel="external">http://example.com</a>?'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>?'),
                      array('http://example.com!',
-                           '<a href="http://example.com/" rel="external">http://example.com</a>!'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>!'),
                      array('http://example.com,',
-                           '<a href="http://example.com/" rel="external">http://example.com</a>,'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>,'),
                      array('http://example.com;',
-                           '<a href="http://example.com/" rel="external">http://example.com</a>;'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>;'),
                      array('http://example.com:',
-                           '<a href="http://example.com/" rel="external">http://example.com</a>:'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>:'),
                      array('\'http://example.com\'',
-                           '\'<a href="http://example.com/" rel="external">http://example.com</a>\''),
+                           '\'<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>\''),
                      array('"http://example.com"',
-                           '&quot;<a href="http://example.com/" rel="external">http://example.com</a>&quot;'),
+                           '&quot;<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>&quot;'),
                      array('http://example.com',
-                           '<a href="http://example.com/" rel="external">http://example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>'),
                      array('(http://example.com)',
-                           '(<a href="http://example.com/" rel="external">http://example.com</a>)'),
+                           '(<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>)'),
                      array('[http://example.com]',
-                           '[<a href="http://example.com/" rel="external">http://example.com</a>]'),
+                           '[<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>]'),
                      array('<http://example.com>',
-                           '&lt;<a href="http://example.com/" rel="external">http://example.com</a>&gt;'),
+                           '&lt;<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>&gt;'),
                      array('http://example.com/path/(foo)/bar',
-                           '<a href="http://example.com/path/(foo)/bar" rel="external">http://example.com/path/(foo)/bar</a>'),
+                           '<a href="http://example.com/path/(foo)/bar" title="http://example.com/path/(foo)/bar" rel="external">http://example.com/path/(foo)/bar</a>'),
                      array('http://example.com/path/[foo]/bar',
-                           '<a href="http://example.com/path/[foo]/bar" rel="external">http://example.com/path/[foo]/bar</a>'),
+                           '<a href="http://example.com/path/[foo]/bar" title="http://example.com/path/[foo]/bar" rel="external">http://example.com/path/[foo]/bar</a>'),
                      array('http://example.com/path/foo/(bar)',
-                           '<a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>'),
+                           '<a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>'),
                      //Not a valid url - urls cannot contain unencoded square brackets
                      array('http://example.com/path/foo/[bar]',
-                           '<a href="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
+                           '<a href="http://example.com/path/foo/[bar]" title="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
                      array('Hey, check out my cool site http://example.com okay?',
-                           'Hey, check out my cool site <a href="http://example.com/" rel="external">http://example.com</a> okay?'),
+                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a> okay?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar))?',
-                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)?'),
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar)?',
-                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>?'),
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar).)?',
-                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>.)?'),
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>.)?'),
                      //Not a valid url - urls cannot contain unencoded commas
                      array('What about parens (e.g. http://example.com/path/(foo,bar)?',
-                           'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" rel="external">http://example.com/path/(foo,bar)</a>?'),
+                           'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" title="http://example.com/path/(foo,bar)" rel="external">http://example.com/path/(foo,bar)</a>?'),
                      array('Unbalanced too (e.g. http://example.com/path/((((foo)/bar)?',
-                           'Unbalanced too (e.g. <a href="http://example.com/path/((((foo)/bar)" rel="external">http://example.com/path/((((foo)/bar)</a>?'),
+                           'Unbalanced too (e.g. <a href="http://example.com/path/((((foo)/bar)" title="http://example.com/path/((((foo)/bar)" rel="external">http://example.com/path/((((foo)/bar)</a>?'),
                      array('Unbalanced too (e.g. http://example.com/path/(foo))))/bar)?',
-                           'Unbalanced too (e.g. <a href="http://example.com/path/(foo))))/bar" rel="external">http://example.com/path/(foo))))/bar</a>)?'),
+                           'Unbalanced too (e.g. <a href="http://example.com/path/(foo))))/bar" title="http://example.com/path/(foo))))/bar" rel="external">http://example.com/path/(foo))))/bar</a>)?'),
                      array('Unbalanced too (e.g. http://example.com/path/foo/((((bar)?',
-                           'Unbalanced too (e.g. <a href="http://example.com/path/foo/((((bar)" rel="external">http://example.com/path/foo/((((bar)</a>?'),
+                           'Unbalanced too (e.g. <a href="http://example.com/path/foo/((((bar)" title="http://example.com/path/foo/((((bar)" rel="external">http://example.com/path/foo/((((bar)</a>?'),
                      array('Unbalanced too (e.g. http://example.com/path/foo/(bar))))?',
-                           'Unbalanced too (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)))?'),
+                           'Unbalanced too (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)))?'),
                      array('example.com',
-                           '<a href="http://example.com/" rel="external">example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>'),
                      array('example.org',
-                           '<a href="http://example.org/" rel="external">example.org</a>'),
+                           '<a href="http://example.org/" title="http://example.org" rel="external">example.org</a>'),
                      array('example.co.uk',
-                           '<a href="http://example.co.uk/" rel="external">example.co.uk</a>'),
+                           '<a href="http://example.co.uk/" title="http://example.co.uk" rel="external">example.co.uk</a>'),
                      array('www.example.co.uk',
-                           '<a href="http://www.example.co.uk/" rel="external">www.example.co.uk</a>'),
+                           '<a href="http://www.example.co.uk/" title="http://www.example.co.uk" rel="external">www.example.co.uk</a>'),
                      array('farm1.images.example.co.uk',
-                           '<a href="http://farm1.images.example.co.uk/" rel="external">farm1.images.example.co.uk</a>'),
+                           '<a href="http://farm1.images.example.co.uk/" title="http://farm1.images.example.co.uk" rel="external">farm1.images.example.co.uk</a>'),
                      array('example.museum',
-                           '<a href="http://example.museum/" rel="external">example.museum</a>'),
+                           '<a href="http://example.museum/" title="http://example.museum" rel="external">example.museum</a>'),
                      array('example.travel',
-                           '<a href="http://example.travel/" rel="external">example.travel</a>'),
+                           '<a href="http://example.travel/" title="http://example.travel" rel="external">example.travel</a>'),
                      array('example.com.',
-                           '<a href="http://example.com/" rel="external">example.com</a>.'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>.'),
                      array('example.com?',
-                           '<a href="http://example.com/" rel="external">example.com</a>?'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>?'),
                      array('example.com!',
-                           '<a href="http://example.com/" rel="external">example.com</a>!'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>!'),
                      array('example.com,',
-                           '<a href="http://example.com/" rel="external">example.com</a>,'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>,'),
                      array('example.com;',
-                           '<a href="http://example.com/" rel="external">example.com</a>;'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>;'),
                      array('example.com:',
-                           '<a href="http://example.com/" rel="external">example.com</a>:'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>:'),
                      array('\'example.com\'',
-                           '\'<a href="http://example.com/" rel="external">example.com</a>\''),
+                           '\'<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>\''),
                      array('"example.com"',
-                           '&quot;<a href="http://example.com/" rel="external">example.com</a>&quot;'),
+                           '&quot;<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>&quot;'),
                      array('example.com',
-                           '<a href="http://example.com/" rel="external">example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>'),
                      array('(example.com)',
-                           '(<a href="http://example.com/" rel="external">example.com</a>)'),
+                           '(<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>)'),
                      array('[example.com]',
-                           '[<a href="http://example.com/" rel="external">example.com</a>]'),
+                           '[<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>]'),
                      array('<example.com>',
-                           '&lt;<a href="http://example.com/" rel="external">example.com</a>&gt;'),
+                           '&lt;<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>&gt;'),
                      array('Hey, check out my cool site example.com okay?',
-                           'Hey, check out my cool site <a href="http://example.com/" rel="external">example.com</a> okay?'),
+                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com" rel="external">example.com</a> okay?'),
                      array('Hey, check out my cool site example.com.I made it.',
-                           'Hey, check out my cool site <a href="http://example.com/" rel="external">example.com</a>.I made it.'),
+                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com" rel="external">example.com</a>.I made it.'),
                      array('Hey, check out my cool site example.com.Funny thing...',
-                           'Hey, check out my cool site <a href="http://example.com/" rel="external">example.com</a>.Funny thing...'),
+                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com" rel="external">example.com</a>.Funny thing...'),
                      array('Hey, check out my cool site example.com.You will love it.',
-                           'Hey, check out my cool site <a href="http://example.com/" rel="external">example.com</a>.You will love it.'),
+                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com" rel="external">example.com</a>.You will love it.'),
                      array('What about parens (e.g. example.com/path/foo/(bar))?',
-                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>)?'),
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>)?'),
                      array('What about parens (e.g. example.com/path/foo/(bar)?',
-                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>?'),
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>?'),
                      array('What about parens (e.g. example.com/path/foo/(bar).)?',
-                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>.)?'),
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>.)?'),
                      array('What about parens (e.g. example.com/path/(foo,bar)?',
-                           'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" rel="external">example.com/path/(foo,bar)</a>?'),
+                           'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" title="http://example.com/path/(foo,bar)" rel="external">example.com/path/(foo,bar)</a>?'),
                      array('file.ext',
                            'file.ext'),
                      array('file.html',

From fc2426d7ce33bba0e1ad4dfc1ed9af7749695b20 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Sun, 27 Sep 2009 16:52:15 -0400
Subject: [PATCH 136/247] Fix some bugs in the URL linkification, and fixed the
 unit test.

---
 classes/File.php                |   8 +-
 classes/File_redirection.php    |   3 +
 lib/util.php                    |  23 +++---
 tests/HashTagDetectionTests.php |   1 +
 tests/URLDetectionTest.php      | 131 ++++++++++++++++----------------
 5 files changed, 90 insertions(+), 76 deletions(-)

diff --git a/classes/File.php b/classes/File.php
index 9758cf7f55..e04a9d5255 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -94,7 +94,13 @@ class File extends Memcached_DataObject
             $file_redir = File_redirection::staticGet('url', $given_url);
             if (empty($file_redir)) {
                 $redir_data = File_redirection::where($given_url);
-                $redir_url = $redir_data['url'];
+                if (is_array($redir_data)) {
+                    $redir_url = $redir_data['url'];
+                } elseif (is_string($redir_data)) {
+                    $redir_url = $redir_data;
+                } else {
+                    throw new ServerException("Can't process url '$given_url'");
+                }
                 // TODO: max field length
                 if ($redir_url === $given_url || strlen($redir_url) > 255) {
                     $x = File::saveNew($redir_data, $given_url);
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index 76b18f672d..79052bf7d3 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -79,6 +79,9 @@ class File_redirection extends Memcached_DataObject
             }
         }
 
+        if(strpos($short_url,'://') === false){
+            return $short_url;
+        }
         $curlh = File_redirection::_commonCurl($short_url, $redirs);
         // Don't include body in output
         curl_setopt($curlh, CURLOPT_NOBODY, true);
diff --git a/lib/util.php b/lib/util.php
index 56753debe0..d249b154fc 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -522,20 +522,21 @@ function common_linkify($url) {
 
    if(strpos($url, '@') !== false && strpos($url, ':') === false) {
        //url is an email address without the mailto: protocol
-       return XMLStringer::estring('a', array('href' => "mailto:$url", 'rel' => 'external'), $url);
-   }
+       $canon = "mailto:$url";
+       $longurl = "mailto:$url";
+   }else{
 
-    $canon = File_redirection::_canonUrl($url);
+        $canon = File_redirection::_canonUrl($url);
 
-    $longurl_data = File_redirection::where($url);
-    if (is_array($longurl_data)) {
-        $longurl = $longurl_data['url'];
-    } elseif (is_string($longurl_data)) {
-        $longurl = $longurl_data;
-    } else {
-        throw new ServerException("Can't linkify url '$url'");
+        $longurl_data = File_redirection::where($canon);
+        if (is_array($longurl_data)) {
+            $longurl = $longurl_data['url'];
+        } elseif (is_string($longurl_data)) {
+            $longurl = $longurl_data;
+        } else {
+            throw new ServerException("Can't linkify url '$url'");
+        }
     }
-
     $attrs = array('href' => $canon, 'title' => $longurl, 'rel' => 'external');
 
     $is_attachment = false;
diff --git a/tests/HashTagDetectionTests.php b/tests/HashTagDetectionTests.php
index aeac4a5e3f..483d7135e1 100644
--- a/tests/HashTagDetectionTests.php
+++ b/tests/HashTagDetectionTests.php
@@ -7,6 +7,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('STATUSNET', true);
+define('LACONICA', true);
 
 require_once INSTALLDIR . '/lib/common.php';
 
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index a7cdcaa242..45203bf6e3 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -7,6 +7,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('STATUSNET', true);
+define('LACONICA', true);
 
 require_once INSTALLDIR . '/lib/common.php';
 
@@ -30,11 +31,11 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('link http://www.somesite.com/xyz/35637563@N00/52803365/ link',
                            'link <a href="http://www.somesite.com/xyz/35637563@N00/52803365/" title="http://www.somesite.com/xyz/35637563@N00/52803365/" rel="external">http://www.somesite.com/xyz/35637563@N00/52803365/</a> link'),
                      array('http://127.0.0.1',
-                           '<a href="http://127.0.0.1/" title="http://127.0.0.1" rel="external">http://127.0.0.1</a>'),
+                           '<a href="http://127.0.0.1/" title="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
                      array('127.0.0.1',
-                           '<a href="http://127.0.0.1/" title="http://127.0.0.1" rel="external">127.0.0.1</a>'),
+                           '<a href="http://127.0.0.1/" title="http://127.0.0.1/" rel="external">127.0.0.1</a>'),
                      array('127.0.0.1:99',
-                           '<a href="http://127.0.0.1:99/" title="http://127.0.0.1:99" rel="external">127.0.0.1:99</a>'),
+                           '<a href="http://127.0.0.1:99/" title="http://127.0.0.1:99/" rel="external">127.0.0.1:99</a>'),
                      array('127.0.0.1/Name:test.php',
                            '<a href="http://127.0.0.1/Name:test.php" title="http://127.0.0.1/Name:test.php" rel="external">127.0.0.1/Name:test.php</a>'),
                      array('127.0.0.1/~test',
@@ -62,23 +63,23 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('http://::1/test.php',
                            '<a href="http://::1/test.php" title="http://::1/test.php" rel="external">http://::1/test.php</a>'),
                      array('http://::1',
-                           '<a href="http://::1/" title="http://::1" rel="external">http://::1</a>'),
+                           '<a href="http://::1/" title="http://::1/" rel="external">http://::1</a>'),
                      array('2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php',
                            '<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php" title="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php</a>'),
                      array('[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php',
                            '<a href="http://[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php" title="http://[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php" rel="external">[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php</a>'),
                      array('2001:4978:1b5:0:21d:e0ff:fe66:59ab',
-                           '<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/" title="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab</a>'),
+                           '<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/" title="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab</a>'),
                      array('http://127.0.0.1',
-                           '<a href="http://127.0.0.1/" title="http://127.0.0.1" rel="external">http://127.0.0.1</a>'),
+                           '<a href="http://127.0.0.1/" title="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
                      array('example.com',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>'),
                      array('example.com',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>'),
                      array('http://example.com',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>'),
                      array('http://example.com.',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>.'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>.'),
                      array('/var/lib/example.so',
                            '/var/lib/example.so'),
                      array('example',
@@ -91,6 +92,8 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                            '<a href="mailto:user@example.com" title="mailto:user@example.com" rel="external">mailto:user@example.com</a>'),
                      array('mailto:user@example.com?subject=test',
                            '<a href="mailto:user@example.com?subject=test" title="mailto:user@example.com?subject=test" rel="external">mailto:user@example.com?subject=test</a>'),
+                     array('xmpp:user@example.com',
+                           '<a href="xmpp:user@example.com" title="xmpp:user@example.com" rel="external">xmpp:user@example.com</a>'),
                      array('#example',
                            '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('example'))) . '" rel="tag">example</a></span>'),
                      array('#example.com',
@@ -98,33 +101,33 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('#.net',
                            '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('.net'))) . '" rel="tag">.net</a></span>'),
                      array('http://example',
-                           '<a href="http://example/" title="http://example" rel="external">http://example</a>'),
+                           '<a href="http://example/" title="http://example/" rel="external">http://example</a>'),
                      array('http://3xampl3',
-                           '<a href="http://3xampl3/" title="http://3xampl3" rel="external">http://3xampl3</a>'),
+                           '<a href="http://3xampl3/" title="http://3xampl3/" rel="external">http://3xampl3</a>'),
                      array('http://example/',
                            '<a href="http://example/" title="http://example/" rel="external">http://example/</a>'),
                      array('http://example/path',
                            '<a href="http://example/path" title="http://example/path" rel="external">http://example/path</a>'),
                      array('http://example.com',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>'),
                      array('https://example.com',
-                           '<a href="https://example.com/" title="https://example.com" rel="external">https://example.com</a>'),
+                           '<a href="https://example.com/" title="https://example.com/" rel="external">https://example.com</a>'),
                      array('ftp://example.com',
-                           '<a href="ftp://example.com/" title="ftp://example.com" rel="external">ftp://example.com</a>'),
+                           '<a href="ftp://example.com/" title="ftp://example.com/" rel="external">ftp://example.com</a>'),
                      array('ftps://example.com',
-                           '<a href="ftps://example.com/" title="ftps://example.com" rel="external">ftps://example.com</a>'),
+                           '<a href="ftps://example.com/" title="ftps://example.com/" rel="external">ftps://example.com</a>'),
                      array('http://user@example.com',
-                           '<a href="http://user@example.com/" title="http://user@example.com" rel="external">http://user@example.com</a>'),
+                           '<a href="http://user@example.com/" title="http://user@example.com/" rel="external">http://user@example.com</a>'),
                      array('http://user:pass@example.com',
-                           '<a href="http://user:pass@example.com/" title="http://user:pass@example.com" rel="external">http://user:pass@example.com</a>'),
+                           '<a href="http://user:pass@example.com/" title="http://user:pass@example.com/" rel="external">http://user:pass@example.com</a>'),
                      array('http://example.com:8080',
-                           '<a href="http://example.com:8080/" title="http://example.com:8080" rel="external">http://example.com:8080</a>'),
+                           '<a href="http://example.com:8080/" title="http://example.com:8080/" rel="external">http://example.com:8080</a>'),
                      array('http://example.com:8080/test.php',
                            '<a href="http://example.com:8080/test.php" title="http://example.com:8080/test.php" rel="external">http://example.com:8080/test.php</a>'),
                      array('example.com:8080/test.php',
                            '<a href="http://example.com:8080/test.php" title="http://example.com:8080/test.php" rel="external">example.com:8080/test.php</a>'),
                      array('http://www.example.com',
-                           '<a href="http://www.example.com/" title="http://www.example.com" rel="external">http://www.example.com</a>'),
+                           '<a href="http://www.example.com/" title="http://www.example.com/" rel="external">http://www.example.com</a>'),
                      array('http://example.com/',
                            '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com/</a>'),
                      array('http://example.com/path',
@@ -136,45 +139,45 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('http://example.com/path.php?foo=bar&bar=foo',
                            '<a href="http://example.com/path.php?foo=bar&amp;bar=foo" title="http://example.com/path.php?foo=bar&amp;bar=foo" rel="external">http://example.com/path.php?foo=bar&amp;bar=foo</a>'),
                      array('http://example.com.',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>.'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>.'),
                      array('http://müllärör.de',
-                           '<a href="http://m&#xFC;ll&#xE4;r&#xF6;r.de/" title="http://m&#xFC;ll&#xE4;r&#xF6;r.de" rel="external">http://müllärör.de</a>'),
+                           '<a href="http://m&#xFC;ll&#xE4;r&#xF6;r.de/" title="http://m&#xFC;ll&#xE4;r&#xF6;r.de/" rel="external">http://müllärör.de</a>'),
                      array('http://ﺱﺲﺷ.com',
-                           '<a href="http://&#xFEB1;&#xFEB2;&#xFEB7;.com/" title="http://&#xFEB1;&#xFEB2;&#xFEB7;.com" rel="external">http://ﺱﺲﺷ.com</a>'),
+                           '<a href="http://&#xFEB1;&#xFEB2;&#xFEB7;.com/" title="http://&#xFEB1;&#xFEB2;&#xFEB7;.com/" rel="external">http://ﺱﺲﺷ.com</a>'),
                      array('http://сделаткартинки.com',
-                           '<a href="http://&#x441;&#x434;&#x435;&#x43B;&#x430;&#x442;&#x43A;&#x430;&#x440;&#x442;&#x438;&#x43D;&#x43A;&#x438;.com/" title="http://&#x441;&#x434;&#x435;&#x43B;&#x430;&#x442;&#x43A;&#x430;&#x440;&#x442;&#x438;&#x43D;&#x43A;&#x438;.com" rel="external">http://сделаткартинки.com</a>'),
+                           '<a href="http://&#x441;&#x434;&#x435;&#x43B;&#x430;&#x442;&#x43A;&#x430;&#x440;&#x442;&#x438;&#x43D;&#x43A;&#x438;.com/" title="http://&#x441;&#x434;&#x435;&#x43B;&#x430;&#x442;&#x43A;&#x430;&#x440;&#x442;&#x438;&#x43D;&#x43A;&#x438;.com/" rel="external">http://сделаткартинки.com</a>'),
                      array('http://tūdaliņ.lv',
-                           '<a href="http://t&#x16B;dali&#x146;.lv/" title="http://t&#x16B;dali&#x146;.lv" rel="external">http://tūdaliņ.lv</a>'),
+                           '<a href="http://t&#x16B;dali&#x146;.lv/" title="http://t&#x16B;dali&#x146;.lv/" rel="external">http://tūdaliņ.lv</a>'),
                      array('http://brændendekærlighed.com',
-                           '<a href="http://br&#xE6;ndendek&#xE6;rlighed.com/" title="http://br&#xE6;ndendek&#xE6;rlighed.com" rel="external">http://brændendekærlighed.com</a>'),
+                           '<a href="http://br&#xE6;ndendek&#xE6;rlighed.com/" title="http://br&#xE6;ndendek&#xE6;rlighed.com/" rel="external">http://brændendekærlighed.com</a>'),
                      array('http://あーるいん.com',
-                           '<a href="http://&#x3042;&#x30FC;&#x308B;&#x3044;&#x3093;.com/" title="http://&#x3042;&#x30FC;&#x308B;&#x3044;&#x3093;.com" rel="external">http://あーるいん.com</a>'),
+                           '<a href="http://&#x3042;&#x30FC;&#x308B;&#x3044;&#x3093;.com/" title="http://&#x3042;&#x30FC;&#x308B;&#x3044;&#x3093;.com/" rel="external">http://あーるいん.com</a>'),
                      array('http://예비교사.com',
-                           '<a href="http://&#xC608;&#xBE44;&#xAD50;&#xC0AC;.com/" title="http://&#xC608;&#xBE44;&#xAD50;&#xC0AC;.com" rel="external">http://예비교사.com</a>'),
+                           '<a href="http://&#xC608;&#xBE44;&#xAD50;&#xC0AC;.com/" title="http://&#xC608;&#xBE44;&#xAD50;&#xC0AC;.com/" rel="external">http://예비교사.com</a>'),
                      array('http://example.com.',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>.'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>.'),
                      array('http://example.com?',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>?'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>?'),
                      array('http://example.com!',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>!'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>!'),
                      array('http://example.com,',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>,'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>,'),
                      array('http://example.com;',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>;'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>;'),
                      array('http://example.com:',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>:'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>:'),
                      array('\'http://example.com\'',
-                           '\'<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>\''),
+                           '\'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>\''),
                      array('"http://example.com"',
-                           '&quot;<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>&quot;'),
+                           '&quot;<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>&quot;'),
                      array('http://example.com',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>'),
                      array('(http://example.com)',
-                           '(<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>)'),
+                           '(<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>)'),
                      array('[http://example.com]',
-                           '[<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>]'),
+                           '[<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>]'),
                      array('<http://example.com>',
-                           '&lt;<a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a>&gt;'),
+                           '&lt;<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>&gt;'),
                      array('http://example.com/path/(foo)/bar',
                            '<a href="http://example.com/path/(foo)/bar" title="http://example.com/path/(foo)/bar" rel="external">http://example.com/path/(foo)/bar</a>'),
                      array('http://example.com/path/[foo]/bar',
@@ -185,7 +188,7 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('http://example.com/path/foo/[bar]',
                            '<a href="http://example.com/path/foo/[bar]" title="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
                      array('Hey, check out my cool site http://example.com okay?',
-                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com" rel="external">http://example.com</a> okay?'),
+                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a> okay?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar))?',
                            'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar)?',
@@ -204,51 +207,51 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('Unbalanced too (e.g. http://example.com/path/foo/(bar))))?',
                            'Unbalanced too (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)))?'),
                      array('example.com',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>'),
                      array('example.org',
-                           '<a href="http://example.org/" title="http://example.org" rel="external">example.org</a>'),
+                           '<a href="http://example.org/" title="http://example.org/" rel="external">example.org</a>'),
                      array('example.co.uk',
-                           '<a href="http://example.co.uk/" title="http://example.co.uk" rel="external">example.co.uk</a>'),
+                           '<a href="http://example.co.uk/" title="http://example.co.uk/" rel="external">example.co.uk</a>'),
                      array('www.example.co.uk',
-                           '<a href="http://www.example.co.uk/" title="http://www.example.co.uk" rel="external">www.example.co.uk</a>'),
+                           '<a href="http://www.example.co.uk/" title="http://www.example.co.uk/" rel="external">www.example.co.uk</a>'),
                      array('farm1.images.example.co.uk',
-                           '<a href="http://farm1.images.example.co.uk/" title="http://farm1.images.example.co.uk" rel="external">farm1.images.example.co.uk</a>'),
+                           '<a href="http://farm1.images.example.co.uk/" title="http://farm1.images.example.co.uk/" rel="external">farm1.images.example.co.uk</a>'),
                      array('example.museum',
-                           '<a href="http://example.museum/" title="http://example.museum" rel="external">example.museum</a>'),
+                           '<a href="http://example.museum/" title="http://example.museum/" rel="external">example.museum</a>'),
                      array('example.travel',
-                           '<a href="http://example.travel/" title="http://example.travel" rel="external">example.travel</a>'),
+                           '<a href="http://example.travel/" title="http://example.travel/" rel="external">example.travel</a>'),
                      array('example.com.',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>.'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>.'),
                      array('example.com?',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>?'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>?'),
                      array('example.com!',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>!'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>!'),
                      array('example.com,',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>,'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>,'),
                      array('example.com;',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>;'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>;'),
                      array('example.com:',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>:'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>:'),
                      array('\'example.com\'',
-                           '\'<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>\''),
+                           '\'<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>\''),
                      array('"example.com"',
-                           '&quot;<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>&quot;'),
+                           '&quot;<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>&quot;'),
                      array('example.com',
-                           '<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>'),
+                           '<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>'),
                      array('(example.com)',
-                           '(<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>)'),
+                           '(<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>)'),
                      array('[example.com]',
-                           '[<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>]'),
+                           '[<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>]'),
                      array('<example.com>',
-                           '&lt;<a href="http://example.com/" title="http://example.com" rel="external">example.com</a>&gt;'),
+                           '&lt;<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>&gt;'),
                      array('Hey, check out my cool site example.com okay?',
-                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com" rel="external">example.com</a> okay?'),
+                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">example.com</a> okay?'),
                      array('Hey, check out my cool site example.com.I made it.',
-                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com" rel="external">example.com</a>.I made it.'),
+                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>.I made it.'),
                      array('Hey, check out my cool site example.com.Funny thing...',
-                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com" rel="external">example.com</a>.Funny thing...'),
+                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>.Funny thing...'),
                      array('Hey, check out my cool site example.com.You will love it.',
-                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com" rel="external">example.com</a>.You will love it.'),
+                           'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>.You will love it.'),
                      array('What about parens (e.g. example.com/path/foo/(bar))?',
                            'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>)?'),
                      array('What about parens (e.g. example.com/path/foo/(bar)?',

From dfa955bfda67ee9fd254e97abf9dc29f2b51a857 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 27 Sep 2009 14:11:12 -0700
Subject: [PATCH 137/247] - Output entity tag - More comments for function
 blocks

---
 actions/apifriendstimeline.php | 60 +++++++++++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/actions/apifriendstimeline.php b/actions/apifriendstimeline.php
index 2eb00e23a6..dd89f44fe5 100644
--- a/actions/apifriendstimeline.php
+++ b/actions/apifriendstimeline.php
@@ -76,11 +76,27 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
         return true;
     }
 
+    /**
+     * Handle the request
+     *
+     * Just show the notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
     function handle($args) {
         parent::handle($args);
         $this->showTimeline();
     }
 
+    /**
+     * Show the timeline of notices
+     *
+     * @return void
+     */
+
     function showTimeline()
     {
         $profile    = $this->user->getProfile();
@@ -124,6 +140,12 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
         }
     }
 
+    /**
+     * Get notices
+     *
+     * @return array notices
+     */
+
     function getNotices()
     {
         $notices = array();
@@ -163,15 +185,37 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
 
     function lastModified()
     {
-        if (empty($this->notices)) {
-            return null;
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+            return strtotime($this->notices[0]->created);
         }
 
-        if (count($this->notices) == 0) {
-            return null;
-        }
-
-        return strtotime($this->notices[0]->created);
+        return null;
     }
 
-}
\ No newline at end of file
+    /**
+     * An entity tag for this page
+     *
+     * Returns an Etag based on the action name, language, user ID, and
+     * timestamps of the first and last notice in the timeline
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+
+            $last = count($this->notices) - 1;
+
+            return implode(':',
+                array($this->arg('action'),
+                      common_language(),
+                      $this->user->id,
+                      strtotime($this->notices[0]->created),
+                      strtotime($this->notices[$last]->created))) . '"';
+        }
+
+        return null;
+    }
+
+}

From 37bdc060c521203ff4e14a1a2b1d7fc59d1c2d4d Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 27 Sep 2009 15:33:46 -0700
Subject: [PATCH 138/247] phpcs on apifriendstimeline.php, apiauth.php and
 apibareauth.php

---
 actions/apifriendstimeline.php | 110 +++++++++++++++++++++------------
 lib/apiauth.php                |  56 ++++++++++++++---
 lib/apibareauth.php            |  11 ++++
 3 files changed, 128 insertions(+), 49 deletions(-)

diff --git a/actions/apifriendstimeline.php b/actions/apifriendstimeline.php
index dd89f44fe5..dc280b3f3f 100644
--- a/actions/apifriendstimeline.php
+++ b/actions/apifriendstimeline.php
@@ -19,7 +19,7 @@
  * 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  Personal
+ * @category  API
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
@@ -33,6 +33,17 @@ if (!defined('STATUSNET')) {
 
 require_once INSTALLDIR.'/lib/apibareauth.php';
 
+/**
+ * Returns the most recent notices (default 20) posted by the target user.
+ * This is the equivalent of 'You and friends' page accessed via Web.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
 class ApiFriendsTimelineAction extends ApiBareAuthAction
 {
 
@@ -86,7 +97,8 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
      * @return void
      */
 
-    function handle($args) {
+    function handle($args)
+    {
         parent::handle($args);
         $this->showTimeline();
     }
@@ -104,39 +116,45 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
         $title      = sprintf(_("%s and friends"), $user->nickname);
         $taguribase = common_config('integration', 'taguri');
         $id         = "tag:$taguribase:FriendsTimeline:" . $user->id;
-        $link       = common_local_url('all',
-                                       array('nickname' => $user->nickname));
-        $subtitle   = sprintf(_('Updates from %1$s and friends on %2$s!'),
-                              $user->nickname, $sitename);
+        $link       = common_local_url(
+            'all', array('nickname' => $user->nickname)
+        );
+        $subtitle   = sprintf(
+            _('Updates from %1$s and friends on %2$s!'),
+            $user->nickname, $sitename
+        );
 
         switch($this->arg('format')) {
-            case 'xml':
-                $this->show_xml_timeline($this->notices);
-                break;
-            case 'rss':
-                $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
-                break;
-            case 'atom':
+        case 'xml':
+            $this->show_xml_timeline($this->notices);
+            break;
+        case 'rss':
+            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            break;
+        case 'atom':
 
-                $target_id = $this->arg('id');
+            $target_id = $this->arg('id');
 
-                if (isset($target_id)) {
-                    $selfuri = common_root_url() .
-                        'api/statuses/friends_timeline/' .
-                        $target_id . '.atom';
-                } else {
-                    $selfuri = common_root_url() .
-                        'api/statuses/friends_timeline.atom';
-                }
-                $this->show_atom_timeline($this->notices, $title, $id, $link,
-                                          $subtitle, null, $selfuri);
-                break;
-            case 'json':
-                $this->show_json_timeline($this->notices);
-                break;
-            default:
-                $this->clientError(_('API method not found!'), $code = 404);
-                break;
+            if (isset($target_id)) {
+                $selfuri = common_root_url() .
+                    'api/statuses/friends_timeline/' .
+                    $target_id . '.atom';
+            } else {
+                $selfuri = common_root_url() .
+                    'api/statuses/friends_timeline.atom';
+            }
+
+            $this->show_atom_timeline(
+                $this->notices, $title, $id, $link,
+                $subtitle, null, $selfuri
+            );
+            break;
+        case 'json':
+            $this->show_json_timeline($this->notices);
+            break;
+        default:
+            $this->clientError(_('API method not found!'), $code = 404);
+            break;
         }
     }
 
@@ -151,13 +169,17 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
         $notices = array();
 
         if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) {
-            $notice = $this->user->noticeInbox(($this->page-1) * $this->count,
-                                               $this->count, $this->since_id,
-                                               $this->max_id, $this->since);
+            $notice = $this->user->noticeInbox(
+                ($this->page-1) * $this->count,
+                $this->count, $this->since_id,
+                $this->max_id, $this->since
+            );
         } else {
-            $notice = $this->user->noticesWithFriends(($this->page-1) * $this->count,
-                                                      $this->count, $this->since_id,
-                                                      $this->max_id, $this->since);
+            $notice = $this->user->noticesWithFriends(
+                ($this->page-1) * $this->count,
+                $this->count, $this->since_id,
+                $this->max_id, $this->since
+            );
         }
 
         while ($notice->fetch()) {
@@ -168,7 +190,9 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
     }
 
     /**
-     * Is this page read-only?
+     * Is this action read only?
+     *
+     * @param array $args other arguments
      *
      * @return boolean true
      */
@@ -181,6 +205,7 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
     /**
      * When was this feed last modified?
      *
+     * @return string datestamp of the latest notice in the stream
      */
 
     function lastModified()
@@ -193,7 +218,7 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
     }
 
     /**
-     * An entity tag for this page
+     * An entity tag for this stream
      *
      * Returns an Etag based on the action name, language, user ID, and
      * timestamps of the first and last notice in the timeline
@@ -207,12 +232,15 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
 
             $last = count($this->notices) - 1;
 
-            return implode(':',
+            return implode(
+                ':',
                 array($this->arg('action'),
                       common_language(),
                       $this->user->id,
                       strtotime($this->notices[0]->created),
-                      strtotime($this->notices[$last]->created))) . '"';
+                      strtotime($this->notices[$last]->created))
+            )
+            . '"';
         }
 
         return null;
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 501d3de10e..c1976f964e 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -33,6 +33,16 @@ if (!defined('STATUSNET')) {
 
 require_once INSTALLDIR.'/lib/twitterapi.php';
 
+/**
+ * Actions extending this class will require auth
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
 class ApiAuthAction extends TwitterapiAction
 {
     /**
@@ -46,6 +56,13 @@ class ApiAuthAction extends TwitterapiAction
         return true;
     }
 
+    /**
+     * Check for a user specified via HTTP basic auth. If there isn't
+     * one, try to get one by outputting the basic auth header.
+     *
+     * @return boolean true or false
+     */
+
     function checkBasicAuthUser()
     {
         $this->basicAuthProcessHeader();
@@ -68,8 +85,11 @@ class ApiAuthAction extends TwitterapiAction
                 // basic authentication failed
 
                 list($proxy, $ip) = common_client_ip();
-                common_log(LOG_WARNING,
-                    "Failed API auth attempt, nickname = $nickname, proxy = $proxy, ip = $ip.");
+                common_log(
+                    LOG_WARNING,
+                    'Failed API auth attempt, nickname = ' .
+                    "$nickname, proxy = $proxy, ip = $ip."
+                );
                 $this->showBasicAuthError();
                 return false;
             }
@@ -77,16 +97,28 @@ class ApiAuthAction extends TwitterapiAction
         return true;
     }
 
+    /**
+     * Read the HTTP headers and set the auth user.  Decodes HTTP_AUTHORIZATION
+     * param to support basic auth when PHP is running in CGI mode.
+     *
+     * @return void
+     */
+
     function basicAuthProcessHeader()
     {
-        if (isset($_SERVER['AUTHORIZATION']) || isset($_SERVER['HTTP_AUTHORIZATION'])) {
-            $authorization_header = isset($_SERVER['HTTP_AUTHORIZATION'])? $_SERVER['HTTP_AUTHORIZATION'] : $_SERVER['AUTHORIZATION'];
+        if (isset($_SERVER['AUTHORIZATION'])
+            || isset($_SERVER['HTTP_AUTHORIZATION'])
+        ) {
+                $authorization_header = isset($_SERVER['HTTP_AUTHORIZATION'])
+                ? $_SERVER['HTTP_AUTHORIZATION'] : $_SERVER['AUTHORIZATION'];
         }
 
         if (isset($_SERVER['PHP_AUTH_USER'])) {
             $this->auth_user = $_SERVER['PHP_AUTH_USER'];
             $this->auth_pw = $_SERVER['PHP_AUTH_PW'];
-        } elseif (isset($authorization_header) && strstr(substr($authorization_header, 0, 5), 'Basic')) {
+        } elseif (isset($authorization_header)
+            && strstr(substr($authorization_header, 0, 5), 'Basic')) {
+
             // decode the HTTP_AUTHORIZATION header on php-cgi server self
             // on fcgid server the header name is AUTHORIZATION
 
@@ -94,6 +126,7 @@ class ApiAuthAction extends TwitterapiAction
             list($this->auth_user, $this->auth_pw) = explode(':', $auth_hash);
 
             // set all to null on a empty basic auth request
+
             if ($this->auth_user == "") {
                 $this->auth_user = null;
                 $this->auth_pw = null;
@@ -104,6 +137,13 @@ class ApiAuthAction extends TwitterapiAction
         }
     }
 
+    /**
+     * Output an authentication error message.  Use XML or JSON if one
+     * of those formats is specified, otherwise output plain text
+     *
+     * @return void
+     */
+
     function showBasicAuthError()
     {
         header('HTTP/1.1 401 Unauthorized');
@@ -119,7 +159,8 @@ class ApiAuthAction extends TwitterapiAction
             $this->endXML();
         } elseif ($this->arg('format') == 'json') {
             header('Content-Type: application/json; charset=utf-8');
-            $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
+            $error_array = array('error' => $msg,
+                                 'request' => $_SERVER['REQUEST_URI']);
             print(json_encode($error_array));
         } else {
             header('Content-type: text/plain');
@@ -127,5 +168,4 @@ class ApiAuthAction extends TwitterapiAction
         }
     }
 
-
-}
\ No newline at end of file
+}
diff --git a/lib/apibareauth.php b/lib/apibareauth.php
index 8921cddca0..a99d450ecc 100644
--- a/lib/apibareauth.php
+++ b/lib/apibareauth.php
@@ -35,6 +35,17 @@ if (!defined('STATUSNET')) {
 
 require_once INSTALLDIR.'/lib/apiauth.php';
 
+/**
+ * Actions extending this class will require auth unless a target
+ * user ID has been specified
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
 class ApiBareAuthAction extends ApiAuthAction
 {
     /**

From 99d2999b5cddb364177ab52bce01df71ffc656b3 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 27 Sep 2009 16:57:06 -0700
Subject: [PATCH 139/247] Broke out public_timeline and user_timeline into
 their own actions

---
 actions/apipublictimeline.php | 207 ++++++++++++++++++++++++++++
 actions/apiusertimeline.php   | 249 ++++++++++++++++++++++++++++++++++
 2 files changed, 456 insertions(+)
 create mode 100644 actions/apipublictimeline.php
 create mode 100644 actions/apiusertimeline.php

diff --git a/actions/apipublictimeline.php b/actions/apipublictimeline.php
new file mode 100644
index 0000000000..63cb0cbafb
--- /dev/null
+++ b/actions/apipublictimeline.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show the public timeline
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/twitterapi.php';
+
+/**
+ * Returns the most recent notices (default 20) posted by everybody
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiPublicTimelineAction extends TwitterapiAction
+{
+
+    var $notices = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->page     = (int)$this->arg('page', 1);
+        $this->count    = (int)$this->arg('count', 20);
+        $this->max_id   = (int)$this->arg('max_id', 0);
+        $this->since_id = (int)$this->arg('since_id', 0);
+        $this->since    = $this->arg('since');
+
+        $this->notices = $this->getNotices();
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Just show the notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showTimeline();
+    }
+
+    /**
+     * Show the timeline of notices
+     *
+     * @return void
+     */
+
+    function showTimeline()
+    {
+        $sitename   = common_config('site', 'name');
+        $title      = sprintf(_("%s public timeline"), $sitename);
+        $taguribase = common_config('integration', 'taguri');
+        $id         = "tag:$taguribase:PublicTimeline";
+        $link       = common_root_url();
+        $subtitle   = sprintf(_("%s updates from everyone!"), $sitename);
+
+        switch($this->arg('format')) {
+        case 'xml':
+            $this->show_xml_timeline($this->notices);
+            break;
+        case 'rss':
+            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            break;
+        case 'atom':
+            $selfuri = common_root_url() . 'api/statuses/public_timeline.atom';
+            $this->show_atom_timeline(
+                $this->notices, $title, $id, $link,
+                $subtitle, null, $selfuri
+            );
+            break;
+        case 'json':
+            $this->show_json_timeline($this->notices);
+            break;
+        default:
+            $this->clientError(_('API method not found!'), $code = 404);
+            break;
+        }
+    }
+
+    /**
+     * Get notices
+     *
+     * @return array notices
+     */
+
+    function getNotices()
+    {
+        $notices = array();
+
+        $notice = Notice::publicStream(
+            ($this->page - 1) * $this->count, $this->count, $this->since_id,
+            $this->max_id, $this->since
+        );
+
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+        return $notices;
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this feed last modified?
+     *
+     * @return string datestamp of the latest notice in the stream
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+            return strtotime($this->notices[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this stream
+     *
+     * Returns an Etag based on the action name, language, and
+     * timestamps of the first and last notice in the timeline
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+
+            $last = count($this->notices) - 1;
+
+            return implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      strtotime($this->notices[0]->created),
+                      strtotime($this->notices[$last]->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+}
diff --git a/actions/apiusertimeline.php b/actions/apiusertimeline.php
new file mode 100644
index 0000000000..1c69613136
--- /dev/null
+++ b/actions/apiusertimeline.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show a user's timeline
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apibareauth.php';
+
+/**
+ * Returns the most recent notices (default 20) posted by the authenticating
+ * user. Another user's timeline can be requested via the id parameter. This
+ * is the API equivalent of the user profile web page.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiUserTimelineAction extends ApiBareAuthAction
+{
+
+    var $user    = null;
+    var $notices = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->page     = (int)$this->arg('page', 1);
+        $this->count    = (int)$this->arg('count', 20);
+        $this->max_id   = (int)$this->arg('max_id', 0);
+        $this->since_id = (int)$this->arg('since_id', 0);
+        $this->since    = $this->arg('since');
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->user = $this->getTargetUser($this->arg('id'));
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user!'), 404, $this->arg('format'));
+            return;
+        }
+
+        $this->notices = $this->getNotices();
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Just show the notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showTimeline();
+    }
+
+    /**
+     * Show the timeline of notices
+     *
+     * @return void
+     */
+
+    function showTimeline()
+    {
+        $profile = $this->user->getProfile();
+
+        $sitename   = common_config('site', 'name');
+        $title      = sprintf(_("%s timeline"), $this->user->nickname);
+        $taguribase = common_config('integration', 'taguri');
+        $id         = "tag:$taguribase:UserTimeline:" . $this->user->id;
+        $link       = common_local_url(
+            'showstream',
+            array('nickname' => $this->user->nickname)
+        );
+        $subtitle   = sprintf(
+            _('Updates from %1$s on %2$s!'),
+            $this->user->nickname, $sitename
+        );
+
+        // FriendFeed's SUP protocol
+        // Also added RSS and Atom feeds
+
+        $suplink = common_local_url('sup', null, null, $this->user->id);
+        header('X-SUP-ID: ' . $suplink);
+
+        switch($this->arg('format')) {
+        case 'xml':
+            $this->show_xml_timeline($this->notices);
+            break;
+        case 'rss':
+            $this->show_rss_timeline(
+                $this->notices, $title, $link,
+                $subtitle, $suplink
+            );
+            break;
+        case 'atom':
+            if (isset($apidata['api_arg'])) {
+                $selfuri = common_root_url() .
+                    'api/statuses/user_timeline/' .
+                    $apidata['api_arg'] . '.atom';
+            } else {
+                $selfuri = common_root_url() .
+                    'api/statuses/user_timeline.atom';
+            }
+            $this->show_atom_timeline(
+                $this->notices, $title, $id, $link,
+                $subtitle, $suplink, $selfuri
+            );
+            break;
+        case 'json':
+            $this->show_json_timeline($this->notices);
+            break;
+        default:
+            $this->clientError(_('API method not found!'), $code = 404);
+            break;
+        }
+
+    }
+
+    /**
+     * Get notices
+     *
+     * @return array notices
+     */
+
+    function getNotices()
+    {
+        $notices = array();
+
+        $notice = $this->user->getNotices(
+            ($this->page-1) * $this->count, $this->count,
+            $this->since_id, $this->max_id, $this->since
+        );
+
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+        return $notices;
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this feed last modified?
+     *
+     * @return string datestamp of the latest notice in the stream
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+            return strtotime($this->notices[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this stream
+     *
+     * Returns an Etag based on the action name, language, user ID, and
+     * timestamps of the first and last notice in the timeline
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+
+            $last = count($this->notices) - 1;
+
+            return implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      $this->user->id,
+                      strtotime($this->notices[0]->created),
+                      strtotime($this->notices[$last]->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+}

From eac388a3cb23ac35a2e9e5506938d34b408bae1d Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 27 Sep 2009 17:17:03 -0700
Subject: [PATCH 140/247] Forgot to commit the routes for the new actions

---
 lib/router.php | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/lib/router.php b/lib/router.php
index d4d5b659cd..b9c6162226 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -266,6 +266,10 @@ class Router
 
         // statuses API
 
+        $m->connect('api/statuses/public_timeline.:format',
+                    array('action' => 'ApiPublicTimeline',
+                    'format' => '(xml|json|rss|atom)'));
+
         $m->connect('api/statuses/friends_timeline.:format',
                     array('action' => 'ApiFriendsTimeline',
                           'format' => '(xml|json|rss|atom)'));
@@ -275,18 +279,36 @@ class Router
                           'id' => '[a-zA-Z0-9]+',
                           'format' => '(xml|json|rss|atom)'));
 
+        $m->connect('api/statuses/user_timeline.:format',
+                    array('action' => 'ApiUserTimeline',
+                    'format' => '(xml|json|rss|atom)'));
+
+        $m->connect('api/statuses/user_timeline/:id.:format',
+                    array('action' => 'ApiUserTimeline',
+                    'id' => '[a-zA-Z0-9]+',
+                    'format' => '(xml|json|rss|atom)'));
+
+        $m->connect('api/statuses/mentions.:format',
+                    array('action' => 'ApiMentions',
+                    'format' => '(xml|json|rss|atom)'));
+
+        $m->connect('api/statuses/mentions/:id.:format',
+                    array('action' => 'ApiMentions',
+                    'id' => '[a-zA-Z0-9]+',
+                    'format' => '(xml|json|rss|atom)'));
+
         $m->connect('api/statuses/home_timeline',
                     array('action' => 'apifriendstimeline'));
 
         $m->connect('api/statuses/:method',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(public_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+                    array('method' => '(update|replies|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
 
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(user_timeline|replies|mentions|show|destroy|friends|followers)'));
+                    array('method' => '(replies|show|destroy|friends|followers)'));
 
         // users
 

From 44dd8f833dca4ab0b076a7fc7d16fdfed317b41f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 27 Sep 2009 17:17:57 -0700
Subject: [PATCH 141/247] Broke mentions API method out into its own action

---
 actions/apimentions.php | 234 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 234 insertions(+)
 create mode 100644 actions/apimentions.php

diff --git a/actions/apimentions.php b/actions/apimentions.php
new file mode 100644
index 0000000000..2b2e27f20d
--- /dev/null
+++ b/actions/apimentions.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show notices mentioning a user (@nickname)
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apibareauth.php';
+
+/**
+ * Returns the most recent (default 20) mentions (status containing @nickname)
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiMentionsAction extends ApiBareAuthAction
+{
+
+    var $user    = null;
+    var $notices = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->page     = (int)$this->arg('page', 1);
+        $this->count    = (int)$this->arg('count', 20);
+        $this->max_id   = (int)$this->arg('max_id', 0);
+        $this->since_id = (int)$this->arg('since_id', 0);
+        $this->since    = $this->arg('since');
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->user = $this->getTargetUser($this->arg('id'));
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user!'), 404, $this->arg('format'));
+            return;
+        }
+
+        $this->notices = $this->getNotices();
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Just show the notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showTimeline();
+    }
+
+    /**
+     * Show the timeline of notices
+     *
+     * @return void
+     */
+
+    function showTimeline()
+    {
+        $profile = $this->user->getProfile();
+
+        $sitename   = common_config('site', 'name');
+        $title      = sprintf(
+            _('%1$s / Updates mentioning %2$s'),
+            $sitename, $this->user->nickname
+        );
+        $taguribase = common_config('integration', 'taguri');
+        $id         = "tag:$taguribase:Mentions:" . $this->user->id;
+        $link       = common_local_url(
+            'replies',
+            array('nickname' => $this->user->nickname)
+        );
+        $subtitle   = sprintf(
+            _('%1$s updates that reply to updates from %2$s / %3$s.'),
+            $sitename, $this->user->nickname, $profile->getBestName()
+        );
+
+        switch($this->arg('format')) {
+        case 'xml':
+            $this->show_xml_timeline($this->notices);
+            break;
+        case 'rss':
+            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            break;
+        case 'atom':
+            $selfuri = common_root_url() .
+                ltrim($_SERVER['QUERY_STRING'], 'p=');
+            $this->show_atom_timeline(
+                $this->notices, $title, $id, $link, $subtitle,
+                null, $selfuri
+            );
+            break;
+        case 'json':
+            $this->show_json_timeline($this->notices);
+            break;
+        default:
+            $this->clientError(_('API method not found!'), $code = 404);
+            break;
+        }
+    }
+
+    /**
+     * Get notices
+     *
+     * @return array notices
+     */
+
+    function getNotices()
+    {
+        $notices = array();
+
+        $notice = $this->user->getReplies(
+            ($this->page - 1) * $this->count, $this->count,
+            $this->since_id, $this->max_id, $this->since
+        );
+
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+        return $notices;
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this feed last modified?
+     *
+     * @return string datestamp of the latest notice in the stream
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+            return strtotime($this->notices[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this stream
+     *
+     * Returns an Etag based on the action name, language, user ID, and
+     * timestamps of the first and last notice in the timeline
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+
+            $last = count($this->notices) - 1;
+
+            return implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      $this->user->id,
+                      strtotime($this->notices[0]->created),
+                      strtotime($this->notices[$last]->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+}

From d392cbed7d4ba2f280211177eb99830bd3b61b04 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 27 Sep 2009 17:23:11 -0700
Subject: [PATCH 142/247] Route aliases: replies -> mentions and home_timeline
 -> friends_timeline

---
 lib/router.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/lib/router.php b/lib/router.php
index b9c6162226..91cdd2cf80 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -278,6 +278,14 @@ class Router
                     array('action' => 'ApiFriendsTimeline',
                           'id' => '[a-zA-Z0-9]+',
                           'format' => '(xml|json|rss|atom)'));
+        $m->connect('api/statuses/home_timeline.:format',
+                    array('action' => 'ApiFriendsTimeline',
+                          'format' => '(xml|json|rss|atom)'));
+
+        $m->connect('api/statuses/home_timeline/:id.:format',
+                    array('action' => 'ApiFriendsTimeline',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json|rss|atom)'));
 
         $m->connect('api/statuses/user_timeline.:format',
                     array('action' => 'ApiUserTimeline',
@@ -297,18 +305,27 @@ class Router
                     'id' => '[a-zA-Z0-9]+',
                     'format' => '(xml|json|rss|atom)'));
 
+        $m->connect('api/statuses/replies.:format',
+                    array('action' => 'ApiMentions',
+                    'format' => '(xml|json|rss|atom)'));
+
+        $m->connect('api/statuses/replies/:id.:format',
+                    array('action' => 'ApiMentions',
+                    'id' => '[a-zA-Z0-9]+',
+                    'format' => '(xml|json|rss|atom)'));
+
         $m->connect('api/statuses/home_timeline',
                     array('action' => 'apifriendstimeline'));
 
         $m->connect('api/statuses/:method',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(update|replies|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+                    array('method' => '(update|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
 
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(replies|show|destroy|friends|followers)'));
+                    array('method' => '(show|destroy|friends|followers)'));
 
         // users
 

From f3820cc85d53c9885744deb76d4b48cd1ec8f7e9 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 27 Sep 2009 17:27:42 -0700
Subject: [PATCH 143/247] Fix nickname in feed title

---
 actions/apifriendstimeline.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/actions/apifriendstimeline.php b/actions/apifriendstimeline.php
index dc280b3f3f..5205160163 100644
--- a/actions/apifriendstimeline.php
+++ b/actions/apifriendstimeline.php
@@ -113,15 +113,15 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
     {
         $profile    = $this->user->getProfile();
         $sitename   = common_config('site', 'name');
-        $title      = sprintf(_("%s and friends"), $user->nickname);
+        $title      = sprintf(_("%s and friends"), $this->user->nickname);
         $taguribase = common_config('integration', 'taguri');
-        $id         = "tag:$taguribase:FriendsTimeline:" . $user->id;
+        $id         = "tag:$taguribase:FriendsTimeline:" . $this->user->id;
         $link       = common_local_url(
-            'all', array('nickname' => $user->nickname)
+            'all', array('nickname' => $this->user->nickname)
         );
         $subtitle   = sprintf(
             _('Updates from %1$s and friends on %2$s!'),
-            $user->nickname, $sitename
+            $this->user->nickname, $sitename
         );
 
         switch($this->arg('format')) {

From a8d1b7e9c26b4449a4a1e0e250f9b6766b2d8e62 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 27 Sep 2009 21:10:17 -0400
Subject: [PATCH 144/247] Merge DeleteAction class into DeletenoticeAction

The DeleteAction class checked for notice information, and only had
one subclass: DeletenoticeAction. I couldn't figure out any other
class that would subclass it, so I combined the two into a single class.
---
 actions/deletenotice.php | 37 +++++++++++++++++---
 lib/deleteaction.php     | 74 ----------------------------------------
 2 files changed, 33 insertions(+), 78 deletions(-)
 delete mode 100644 lib/deleteaction.php

diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 3d040f2fa9..617fa9c17a 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -32,15 +32,44 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/deleteaction.php';
-
-class DeletenoticeAction extends DeleteAction
+class DeletenoticeAction extends Action
 {
-    var $error = null;
+    var $error        = null;
+    var $user         = null;
+    var $notice       = null;
+    var $profile      = null;
+    var $user_profile = null;
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user   = common_current_user();
+        $notice_id    = $this->trimmed('notice');
+        $this->notice = Notice::staticGet($notice_id);
+
+        if (!$this->notice) {
+            common_user_error(_('No such notice.'));
+            exit;
+        }
+
+        $this->profile      = $this->notice->getProfile();
+        $this->user_profile = $this->user->getProfile();
+
+        return true;
+    }
 
     function handle($args)
     {
         parent::handle($args);
+
+        if (!common_logged_in()) {
+            common_user_error(_('Not logged in.'));
+            exit;
+        } else if ($this->notice->profile_id != $this->user_profile->id) {
+            common_user_error(_('Can\'t delete this notice.'));
+            exit;
+        }
         // XXX: Ajax!
 
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
diff --git a/lib/deleteaction.php b/lib/deleteaction.php
deleted file mode 100644
index f702820c61..0000000000
--- a/lib/deleteaction.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Base class for deleting things
- *
- * 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  Personal
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-     exit(1);
-}
-
-class DeleteAction extends Action
-{
-    var $user         = null;
-    var $notice       = null;
-    var $profile      = null;
-    var $user_profile = null;
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        $this->user   = common_current_user();
-        $notice_id    = $this->trimmed('notice');
-        $this->notice = Notice::staticGet($notice_id);
-
-        if (!$this->notice) {
-            common_user_error(_('No such notice.'));
-            exit;
-        }
-
-        $this->profile      = $this->notice->getProfile();
-        $this->user_profile = $this->user->getProfile();
-
-        return true;
-    }
-
-    function handle($args)
-    {
-        parent::handle($args);
-
-        if (!common_logged_in()) {
-            common_user_error(_('Not logged in.'));
-            exit;
-        } else if ($this->notice->profile_id != $this->user_profile->id) {
-            common_user_error(_('Can\'t delete this notice.'));
-            exit;
-        }
-    }
-
-}

From 6c069312e2911d3b2fe54d051354f579fde7bb63 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 15:28:11 -0400
Subject: [PATCH 145/247] user rights

---
 classes/User.php         | 26 ++++++++++++++++++
 lib/right.php            | 50 ++++++++++++++++++++++++++++++++++
 tests/UserRightsTest.php | 59 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 135 insertions(+)
 create mode 100644 lib/right.php
 create mode 100644 tests/UserRightsTest.php

diff --git a/classes/User.php b/classes/User.php
index 5e74c7fde4..bea81af4d2 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -711,4 +711,30 @@ class User extends Memcached_DataObject
 
         return true;
     }
+
+    /**
+     * Does this user have the right to do X?
+     *
+     * With our role-based authorization, this is merely a lookup for whether the user
+     * has a particular role. The implementation currently uses a switch statement
+     * to determine if the user has the pre-defined role to exercise the right. Future
+     * implementations may allow per-site roles, and different mappings of roles to rights.
+     *
+     * @param $right string Name of the right, usually a constant in class Right
+     * @return boolean whether the user has the right in question
+     */
+
+    function hasRight($right)
+    {
+        switch ($right)
+        {
+         case Right::deleteOthersNotice:
+            return $this->hasRole('moderator');
+            break;
+         default:
+            $result = false;
+            Event::handle('UserRightsCheck', array($this, &$result));
+            return $result;
+        }
+    }
 }
diff --git a/lib/right.php b/lib/right.php
new file mode 100644
index 0000000000..4e0096d46a
--- /dev/null
+++ b/lib/right.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Class for user rights
+ *
+ * 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  Authorization
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * class for rights
+ *
+ * Mostly for holding the rights constants
+ *
+ * @category Authorization
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class Right
+{
+    const deleteOthersNotice = 'deleteothersnotice';
+}
+
diff --git a/tests/UserRightsTest.php b/tests/UserRightsTest.php
new file mode 100644
index 0000000000..6544ee53d7
--- /dev/null
+++ b/tests/UserRightsTest.php
@@ -0,0 +1,59 @@
+<?php
+
+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('STATUSNET', true);
+
+require_once INSTALLDIR . '/lib/common.php';
+
+class UserRightsTest extends PHPUnit_Framework_TestCase
+{
+    protected $user = null;
+
+    function setUp()
+    {
+        $this->user = User::register(array('nickname' => 'userrightstestuser'));
+    }
+
+    function tearDown()
+    {
+        $profile = $this->user->getProfile();
+        $this->user->delete();
+        $profile->delete();
+    }
+
+    function testInvalidRole()
+    {
+        $this->assertFalse($this->user->hasRole('invalidrole'));
+    }
+
+    function standardRoles()
+    {
+        return array('admin', 'moderator');
+    }
+
+    /**
+     * @dataProvider standardRoles
+     *
+     */
+
+    function testUngrantedRole($role)
+    {
+        $this->assertFalse($this->user->hasRole($role));
+    }
+
+    /**
+     * @dataProvider standardRoles
+     *
+     */
+
+    function testGrantedRole($role)
+    {
+        $this->user->grantRole($role);
+        $this->assertFalse($this->user->hasRole($role));
+    }
+}
\ No newline at end of file

From 38345d078343d4631eab2c883a39d87380f7b1af Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Sep 2009 21:08:44 -0400
Subject: [PATCH 146/247] let hooks override standard user rights

---
 classes/User.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/classes/User.php b/classes/User.php
index bea81af4d2..3f7ed09bb7 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -726,15 +726,18 @@ class User extends Memcached_DataObject
 
     function hasRight($right)
     {
-        switch ($right)
-        {
-         case Right::deleteOthersNotice:
-            return $this->hasRole('moderator');
-            break;
-         default:
-            $result = false;
-            Event::handle('UserRightsCheck', array($this, &$result));
-            return $result;
+        $result = false;
+        if (Event::handle('UserRightsCheck', array($this, $right, &$result))) {
+            switch ($right)
+            {
+             case Right::deleteOthersNotice:
+                $result = $this->hasRole('moderator');
+                break;
+             default:
+                $result = false;
+                break;
+            }
         }
+        return $result;
     }
 }

From ee236e68df8a8b7ee7917fd60ef36b57c0bd64db Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 27 Sep 2009 21:05:29 -0400
Subject: [PATCH 147/247] show delete button when user has deleteOthersNotice
 right

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

diff --git a/lib/noticelist.php b/lib/noticelist.php
index c2ff7c26b3..6c296f82a7 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -472,7 +472,10 @@ class NoticeListItem extends Widget
     function showDeleteLink()
     {
         $user = common_current_user();
-        if ($user && $this->notice->profile_id == $user->id) {
+
+        if (!empty($user) &&
+            ($this->notice->profile_id == $user->id || $user->hasRight(Right::deleteOthersNotice))) {
+
             $deleteurl = common_local_url('deletenotice',
                                           array('notice' => $this->notice->id));
             $this->out->element('a', array('href' => $deleteurl,

From ee9856c452a7e54994c30cd9138dd6faa2107001 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 27 Sep 2009 21:14:49 -0400
Subject: [PATCH 148/247] moderator can delete another user's notice

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

diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 617fa9c17a..4a48a9c346 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -66,7 +66,8 @@ class DeletenoticeAction extends Action
         if (!common_logged_in()) {
             common_user_error(_('Not logged in.'));
             exit;
-        } else if ($this->notice->profile_id != $this->user_profile->id) {
+        } else if ($this->notice->profile_id != $this->user_profile->id &&
+                   !$this->user->hasRight(Right::deleteOthersNotice)) {
             common_user_error(_('Can\'t delete this notice.'));
             exit;
         }

From 6b7a007ef2e3ea64be547923b97f08670dc13d14 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 27 Sep 2009 20:21:16 -0700
Subject: [PATCH 149/247] Forgot to add home_timeline to the list of methods
 that only require bareauth.

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

diff --git a/actions/api.php b/actions/api.php
index c236378bcb..3705d035c4 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -142,6 +142,7 @@ class ApiAction extends Action
 
         static $bareauth = array('statuses/user_timeline',
                                  'statuses/friends_timeline',
+				 'statuses/home_timeline',
                                  'statuses/friends',
                                  'statuses/replies',
                                  'statuses/mentions',

From 4e6c7302072eb6e11ae0025795a7a96fb28f2f29 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 27 Sep 2009 20:21:16 -0700
Subject: [PATCH 150/247] Forgot to add home_timeline to the list of methods
 that only require bareauth.

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

diff --git a/actions/api.php b/actions/api.php
index d570bb0174..1bc90de110 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -160,6 +160,7 @@ class ApiAction extends Action
 
         static $bareauth = array('statuses/user_timeline',
                                  'statuses/friends_timeline',
+				 'statuses/home_timeline',
                                  'statuses/friends',
                                  'statuses/replies',
                                  'statuses/mentions',

From 155ba6c103b3672656937ad36bec02cb9c7834e5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 29 Sep 2009 09:12:44 -0400
Subject: [PATCH 151/247] stop overwriting created timestamp on group edit

---
 actions/editgroup.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/actions/editgroup.php b/actions/editgroup.php
index e7ba836a01..b8dac31cb1 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -250,7 +250,6 @@ class EditgroupAction extends GroupDesignAction
         $this->group->homepage    = $homepage;
         $this->group->description = $description;
         $this->group->location    = $location;
-        $this->group->created     = common_sql_now();
 
         $result = $this->group->update($orig);
 

From 0a57d1ccee1af8570d4c83934d9ab99fa1a1dc37 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 29 Sep 2009 17:16:07 -0400
Subject: [PATCH 152/247] change string return from Notice::saveNew to
 exceptions

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

diff --git a/classes/Notice.php b/classes/Notice.php
index f3fa9af781..93d5de7908 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -153,30 +153,30 @@ class Notice extends Memcached_DataObject
         $final = common_shorten_links($content);
 
         if (Notice::contentTooLong($final)) {
-            common_log(LOG_INFO, 'Rejecting notice that is too long.');
-            return _('Problem saving notice. Too long.');
+            throw new ClientException(_('Problem saving notice. Too long.'));
         }
 
         if (!$profile) {
-            common_log(LOG_ERR, 'Problem saving notice. Unknown user.');
-            return _('Problem saving notice. Unknown user.');
+            throw new ClientException(_('Problem saving notice. Unknown user.'));
         }
 
         if (common_config('throttle', 'enabled') && !Notice::checkEditThrottle($profile_id)) {
             common_log(LOG_WARNING, 'Excessive posting by profile #' . $profile_id . '; throttled.');
-            return _('Too many notices too fast; take a breather and post again in a few minutes.');
+            throw new ClientException(_('Too many notices too fast; take a breather '.
+                                        'and post again in a few minutes.'));
         }
 
         if (common_config('site', 'dupelimit') > 0 && !Notice::checkDupes($profile_id, $final)) {
             common_log(LOG_WARNING, 'Dupe posting by profile #' . $profile_id . '; throttled.');
-			return _('Too many duplicate messages too quickly; take a breather and post again in a few minutes.');
+			throw new ClientException(_('Too many duplicate messages too quickly;'.
+                                        ' take a breather and post again in a few minutes.'));
         }
 
 		$banned = common_config('profile', 'banned');
 
         if ( in_array($profile_id, $banned) || in_array($profile->nickname, $banned)) {
             common_log(LOG_WARNING, "Attempted post from banned user: $profile->nickname (user id = $profile_id).");
-            return _('You are banned from posting notices on this site.');
+            throw new ClientException(_('You are banned from posting notices on this site.'));
         }
 
         $notice = new Notice();
@@ -222,7 +222,7 @@ class Notice extends Memcached_DataObject
 
             if (!$id) {
                 common_log_db_error($notice, 'INSERT', __FILE__);
-                return _('Problem saving notice.');
+                throw new ServerException(_('Problem saving notice.'));
             }
 
             // Update ID-dependent columns: URI, conversation
@@ -247,7 +247,7 @@ class Notice extends Memcached_DataObject
             if ($changed) {
                 if (!$notice->update($orig)) {
                     common_log_db_error($notice, 'UPDATE', __FILE__);
-                    return _('Problem saving notice.');
+                    throw new ServerException(_('Problem saving notice.'));
                 }
             }
 

From 89ac81c34464b2fc4f54b643d0d95d12bac765ab Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 29 Sep 2009 17:25:52 -0400
Subject: [PATCH 153/247] remove string-checks from code using
 Notice::saveNew()

---
 actions/newnotice.php       |  7 -------
 actions/twitapistatuses.php |  5 -----
 lib/facebookaction.php      | 10 +++++-----
 lib/oauthstore.php          |  5 +----
 scripts/maildaemon.php      |  9 +++++----
 scripts/xmppdaemon.php      | 11 +++++++----
 6 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 23ec2a1b58..d5b0332f48 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -255,13 +255,6 @@ class NewnoticeAction extends Action
         $notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
                                   ($replyto == 'false') ? null : $replyto);
 
-        if (is_string($notice)) {
-            if (isset($filename)) {
-                $this->deleteFile($filename);
-            }
-            $this->clientError($notice);
-        }
-
         if (isset($mimetype)) {
             $this->attachFile($notice, $fileRecord);
         }
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 2f10ff966c..87043b1821 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -297,11 +297,6 @@ class TwitapistatusesAction extends TwitterapiAction
                 html_entity_decode($status, ENT_NOQUOTES, 'UTF-8'),
                     $source, 1, $reply_to);
 
-            if (is_string($notice)) {
-                $this->serverError($notice);
-                return;
-            }
-
             common_broadcast_notice($notice);
             $apidata['api_arg'] = $notice->id;
         }
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 411f795945..3f3a8d3b09 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -468,11 +468,11 @@ class FacebookAction extends Action
 
         $replyto = $this->trimmed('inreplyto');
 
-        $notice = Notice::saveNew($user->id, $content,
-            'web', 1, ($replyto == 'false') ? null : $replyto);
-
-        if (is_string($notice)) {
-            $this->showPage($notice);
+        try {
+            $notice = Notice::saveNew($user->id, $content,
+                                      'web', 1, ($replyto == 'false') ? null : $replyto);
+        } catch (Exception $e) {
+            $this->showPage($e->getMessage());
             return;
         }
 
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index e69a00f55f..d617a7df7e 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -156,7 +156,6 @@ class StatusNetOAuthDataStore extends OAuthDataStore
         return $this->new_access_token($consumer);
     }
 
-
     /**
      * Revoke specified OAuth token
      *
@@ -363,9 +362,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
                                   false,
                                   null,
                                   $omb_notice->getIdentifierURI());
-        if (is_string($notice)) {
-            throw new Exception($notice);
-        }
+
         common_broadcast_notice($notice, true);
     }
 
diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index 5705cfd50e..586bef624e 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -260,10 +260,11 @@ class MailerDaemon
 
     function add_notice($user, $msg, $fileRecords)
     {
-        $notice = Notice::saveNew($user->id, $msg, 'mail');
-        if (is_string($notice)) {
-            $this->log(LOG_ERR, $notice);
-            return $notice;
+        try {
+            $notice = Notice::saveNew($user->id, $msg, 'mail');
+        } catch (Exception $e) {
+            $this->log(LOG_ERR, $e->getMessage());
+            return $e->getMessage();
         }
         foreach($fileRecords as $fileRecord){
             $this->attachFile($notice, $fileRecord);
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 1b1aec3e6e..b2efc07c38 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -323,12 +323,15 @@ class XMPPDaemon extends Daemon
                                           mb_strlen($content_shortened)));
           return;
         }
-        $notice = Notice::saveNew($user->id, $content_shortened, 'xmpp');
-        if (is_string($notice)) {
-            $this->log(LOG_ERR, $notice);
-            $this->from_site($user->jabber, $notice);
+
+        try {
+            $notice = Notice::saveNew($user->id, $content_shortened, 'xmpp');
+        } catch (Exception $e) {
+            $this->log(LOG_ERR, $e->getMessage());
+            $this->from_site($user->jabber, $e->getMessage());
             return;
         }
+
         common_broadcast_notice($notice);
         $this->log(LOG_INFO,
                    'Added notice ' . $notice->id . ' from user ' . $user->nickname);

From 5252c438040f071e0c61a9c93152dcf1aa382504 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 29 Sep 2009 17:43:45 -0400
Subject: [PATCH 154/247] move HTTP error code strings to class variables

---
 lib/clienterroraction.php | 43 +++++++++++++++++----------------------
 lib/error.php             |  6 ++++--
 lib/servererroraction.php | 19 +++++++----------
 3 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php
index 7d007a7567..1b98a10645 100644
--- a/lib/clienterroraction.php
+++ b/lib/clienterroraction.php
@@ -46,28 +46,28 @@ require_once INSTALLDIR.'/lib/error.php';
  */
 class ClientErrorAction extends ErrorAction
 {
+    static $status = array(400 => 'Bad Request',
+                           401 => 'Unauthorized',
+                           402 => 'Payment Required',
+                           403 => 'Forbidden',
+                           404 => 'Not Found',
+                           405 => 'Method Not Allowed',
+                           406 => 'Not Acceptable',
+                           407 => 'Proxy Authentication Required',
+                           408 => 'Request Timeout',
+                           409 => 'Conflict',
+                           410 => 'Gone',
+                           411 => 'Length Required',
+                           412 => 'Precondition Failed',
+                           413 => 'Request Entity Too Large',
+                           414 => 'Request-URI Too Long',
+                           415 => 'Unsupported Media Type',
+                           416 => 'Requested Range Not Satisfiable',
+                           417 => 'Expectation Failed');
+
     function __construct($message='Error', $code=400)
     {
         parent::__construct($message, $code);
-
-        $this->status  = array(400 => 'Bad Request',
-                               401 => 'Unauthorized',
-                               402 => 'Payment Required',
-                               403 => 'Forbidden',
-                               404 => 'Not Found',
-                               405 => 'Method Not Allowed',
-                               406 => 'Not Acceptable',
-                               407 => 'Proxy Authentication Required',
-                               408 => 'Request Timeout',
-                               409 => 'Conflict',
-                               410 => 'Gone',
-                               411 => 'Length Required',
-                               412 => 'Precondition Failed',
-                               413 => 'Request Entity Too Large',
-                               414 => 'Request-URI Too Long',
-                               415 => 'Unsupported Media Type',
-                               416 => 'Requested Range Not Satisfiable',
-                               417 => 'Expectation Failed');
         $this->default = 400;
     }
 
@@ -91,9 +91,4 @@ class ClientErrorAction extends ErrorAction
 
         $this->showPage();
     }
-
-    function title()
-    {
-        return $this->status[$this->code];
-    }
 }
diff --git a/lib/error.php b/lib/error.php
index 0c521db081..6a9b76be11 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -44,9 +44,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class ErrorAction extends Action
 {
+    static $status = array();
+
     var $code    = null;
     var $message = null;
-    var $status  = null;
     var $default = null;
 
     function __construct($message, $code, $output='php://output', $indent=true)
@@ -88,9 +89,10 @@ class ErrorAction extends Action
      *
      * @return page title
      */
+
     function title()
     {
-        return $this->message;
+        return self::$status[$this->code];
     }
 
     function isReadOnly($args)
diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index c6400605ea..0993a63bca 100644
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -55,17 +55,17 @@ require_once INSTALLDIR.'/lib/error.php';
 
 class ServerErrorAction extends ErrorAction
 {
+    static $status = array(500 => 'Internal Server Error',
+                           501 => 'Not Implemented',
+                           502 => 'Bad Gateway',
+                           503 => 'Service Unavailable',
+                           504 => 'Gateway Timeout',
+                           505 => 'HTTP Version Not Supported');
+
     function __construct($message='Error', $code=500)
     {
         parent::__construct($message, $code);
 
-        $this->status  = array(500 => 'Internal Server Error',
-                               501 => 'Not Implemented',
-                               502 => 'Bad Gateway',
-                               503 => 'Service Unavailable',
-                               504 => 'Gateway Timeout',
-                               505 => 'HTTP Version Not Supported');
-
         $this->default = 500;
 
         // Server errors must be logged.
@@ -93,9 +93,4 @@ class ServerErrorAction extends ErrorAction
 
         $this->showPage();
     }
-
-    function title()
-    {
-        return $this->status[$this->code];
-    }
 }

From 5309910b9b4dd2533ff5b2190f90bf415fd20113 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 29 Sep 2009 17:57:31 -0400
Subject: [PATCH 155/247] Twitter API returns server errors in preferred format

---
 actions/twitapistatuses.php |  2 +-
 lib/twitterapi.php          | 56 ++++++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 5e2867ea81..41887a68f4 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -297,7 +297,7 @@ class TwitapistatusesAction extends TwitterapiAction
                     $source, 1, $reply_to);
 
             if (is_string($notice)) {
-                $this->serverError($notice);
+                $this->serverError($notice, 500, $apidata['content-type']);
                 return;
             }
 
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 638efba241..3bac400e2f 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -501,7 +501,7 @@ class TwitterapiAction extends Action
             $enclosure = $entry['enclosures'][0];
             $this->element('enclosure', array('url'=>$enclosure['url'],'type'=>$enclosure['mimetype'],'length'=>$enclosure['size']), null);
         }
-        
+
         if(array_key_exists('tags', $entry)){
             foreach($entry['tags'] as $tag){
                 $this->element('category', null,$tag);
@@ -939,35 +939,16 @@ class TwitterapiAction extends Action
 
     function clientError($msg, $code = 400, $content_type = 'json')
     {
-
-        static $status = array(400 => 'Bad Request',
-                               401 => 'Unauthorized',
-                               402 => 'Payment Required',
-                               403 => 'Forbidden',
-                               404 => 'Not Found',
-                               405 => 'Method Not Allowed',
-                               406 => 'Not Acceptable',
-                               407 => 'Proxy Authentication Required',
-                               408 => 'Request Timeout',
-                               409 => 'Conflict',
-                               410 => 'Gone',
-                               411 => 'Length Required',
-                               412 => 'Precondition Failed',
-                               413 => 'Request Entity Too Large',
-                               414 => 'Request-URI Too Long',
-                               415 => 'Unsupported Media Type',
-                               416 => 'Requested Range Not Satisfiable',
-                               417 => 'Expectation Failed');
-
         $action = $this->trimmed('action');
 
         common_debug("User error '$code' on '$action': $msg", __FILE__);
 
-        if (!array_key_exists($code, $status)) {
+        if (!array_key_exists($code, ClientErrorAction::$status)) {
             $code = 400;
         }
 
-        $status_string = $status[$code];
+        $status_string = ClientErrorAction::$status[$code];
+
         header('HTTP/1.1 '.$code.' '.$status_string);
 
         if ($content_type == 'xml') {
@@ -986,6 +967,35 @@ class TwitterapiAction extends Action
 
     }
 
+    function serverError($msg, $code = 500, $content_type = 'json')
+    {
+        $action = $this->trimmed('action');
+
+        common_debug("Server error '$code' on '$action': $msg", __FILE__);
+
+        if (!array_key_exists($code, ServerErrorAction::$status)) {
+            $code = 400;
+        }
+
+        $status_string = ServerErrorAction::$status[$code];
+
+        header('HTTP/1.1 '.$code.' '.$status_string);
+
+        if ($content_type == 'xml') {
+            $this->init_document('xml');
+            $this->elementStart('hash');
+            $this->element('error', null, $msg);
+            $this->element('request', null, $_SERVER['REQUEST_URI']);
+            $this->elementEnd('hash');
+            $this->end_document('xml');
+        } else {
+            $this->init_document('json');
+            $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
+            print(json_encode($error_array));
+            $this->end_document('json');
+        }
+    }
+
     function init_twitter_rss()
     {
         $this->startXML();

From eb85f16f773ff1df71d1af4fad85d40286d5f3a6 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 30 Sep 2009 10:37:46 +0000
Subject: [PATCH 156/247] Switched Doctype to XHTML 1.0 Strict (which best
 reflects the current grammar in use)

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

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index aa01f6b1d9..9e3a5b305e 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -113,7 +113,9 @@ class HTMLOutputter extends XMLOutputter
             // Browsers don't like it when <?xml it output for non-xhtml documents
             $this->xw->startDocument('1.0', 'UTF-8');
         }
-        $this->xw->writeDTD('html');
+        $this->xw->writeDTD('html',
+                            '-//W3C//DTD XHTML 1.0 Strict//EN',
+                            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
 
         $language = $this->getLanguage();
 

From 353f58c23149159306131b0819de713da6b69464 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 30 Sep 2009 10:51:59 +0000
Subject: [PATCH 157/247] Outputting UTF-8 charset in document header
 irrespective of mimetype.

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

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 9e3a5b305e..99f956545b 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -106,7 +106,7 @@ class HTMLOutputter extends XMLOutputter
             }
         }
 
-        header('Content-Type: '.$type);
+        header('Content-Type: '.$type.'; charset=UTF-8');
 
         $this->extraHeaders();
         if( ! substr($type,0,strlen('text/html'))=='text/html' ){
diff --git a/lib/util.php b/lib/util.php
index b831859e99..a069ccf7b3 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1148,7 +1148,7 @@ function common_negotiate_type($cprefs, $sprefs)
     }
 
     if ('text/html' === $besttype) {
-        return "text/html; charset=utf-8";
+        return "text/html";
     }
     return $besttype;
 }

From 1e7df7fbab8a03468a1697240e92f67c82dadced Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 30 Sep 2009 10:53:04 +0000
Subject: [PATCH 158/247] Better check to see if the XML prolog should be
 outputted for XML documents i.e., if best mimetype is */*xml, then use the
 XML prolog.

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

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 99f956545b..64be745beb 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -109,8 +109,8 @@ class HTMLOutputter extends XMLOutputter
         header('Content-Type: '.$type.'; charset=UTF-8');
 
         $this->extraHeaders();
-        if( ! substr($type,0,strlen('text/html'))=='text/html' ){
-            // Browsers don't like it when <?xml it output for non-xhtml documents
+        if (preg_match("/.*\/.*xml/", $type)) {
+            // Required for XML documents
             $this->xw->startDocument('1.0', 'UTF-8');
         }
         $this->xw->writeDTD('html',

From 267ab67c8325243d176e1124f2024c7b08417f37 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 30 Sep 2009 12:22:55 +0000
Subject: [PATCH 159/247] Script no longer needed for Realtime plugin

---
 plugins/Realtime/jquery.getUrlParam.js | 72 --------------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 plugins/Realtime/jquery.getUrlParam.js

diff --git a/plugins/Realtime/jquery.getUrlParam.js b/plugins/Realtime/jquery.getUrlParam.js
deleted file mode 100644
index e8f73eb478..0000000000
--- a/plugins/Realtime/jquery.getUrlParam.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright (c) 2006-2007 Mathias Bank (http://www.mathias-bank.de)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) 
- * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
- * 
- * Version 2.1
- * 
- * Thanks to 
- * Hinnerk Ruemenapf - http://hinnerk.ruemenapf.de/ for bug reporting and fixing.
- * Tom Leonard for some improvements
- * 
- */
-jQuery.fn.extend({
-/**
-* Returns get parameters.
-*
-* If the desired param does not exist, null will be returned
-*
-* To get the document params:
-* @example value = $(document).getUrlParam("paramName");
-* 
-* To get the params of a html-attribut (uses src attribute)
-* @example value = $('#imgLink').getUrlParam("paramName");
-*/ 
- getUrlParam: function(strParamName){
-	  strParamName = escape(unescape(strParamName));
-	  
-	  var returnVal = new Array();
-	  var qString = null;
-	  
-	  if ($(this).attr("nodeName")=="#document") {
-	  	//document-handler
-		
-		if (window.location.search.search(strParamName) > -1 ){
-			
-			qString = window.location.search.substr(1,window.location.search.length).split("&");
-		}
-			
-	  } else if ($(this).attr("src")!="undefined") {
-	  	
-	  	var strHref = $(this).attr("src")
-	  	if ( strHref.indexOf("?") > -1 ){
-	    	var strQueryString = strHref.substr(strHref.indexOf("?")+1);
-	  		qString = strQueryString.split("&");
-	  	}
-	  } else if ($(this).attr("href")!="undefined") {
-	  	
-	  	var strHref = $(this).attr("href")
-	  	if ( strHref.indexOf("?") > -1 ){
-	    	var strQueryString = strHref.substr(strHref.indexOf("?")+1);
-	  		qString = strQueryString.split("&");
-	  	}
-	  } else {
-	  	return null;
-	  }
-	  	
-	  
-	  if (qString==null) return null;
-	  
-	  
-	  for (var i=0;i<qString.length; i++){
-			if (escape(unescape(qString[i].split("=")[0])) == strParamName){
-				returnVal.push(qString[i].split("=")[1]);
-			}
-			
-	  }
-	  
-	  
-	  if (returnVal.length==0) return null;
-	  else if (returnVal.length==1) return returnVal[0];
-	  else return returnVal;
-	}
-});
\ No newline at end of file

From d9e7118a33181407f0ee1a61c435ef001a736754 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 30 Sep 2009 12:48:15 +0000
Subject: [PATCH 160/247] Relocated the button for pop up window for notice
 stream

---
 plugins/Realtime/realtimeupdate.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 4cd68a816b..3303d3a44f 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -125,14 +125,17 @@ RealtimeUpdate = {
 
      addPopup: function(url, timeline, iconurl)
      {
-         $('#content').prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>');
+         $('#notices_primary').css({'position':'relative'});
+         $('#notices_primary').prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>');
 
          $('#realtime_timeline').css({
-             'margin':'0 0 18px 0',
+             'margin':'0 0 11px 0',
              'background':'transparent url('+ iconurl + ') no-repeat 0% 30%',
              'padding':'0 0 0 20px',
              'display':'block',
-             'float':'right',
+             'position':'absolute',
+             'top':'-20px',
+             'right':'0',
              'border':'none',
              'cursor':'pointer',
              'color':$("a").css("color"),

From a57783de0214f061eca3ab65880f573e8668de03 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 30 Sep 2009 13:29:37 +0000
Subject: [PATCH 161/247] Timeout a little incase the notice item from XHR
 response is not appended to the page.

---
 plugins/Realtime/realtimeupdate.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 3303d3a44f..11e466325e 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -30,19 +30,20 @@ RealtimeUpdate = {
 
      receive: function(data)
      {
-          id = data.id;
+          setTimeout(function() {
+              id = data.id;
 
-          // Don't add it if it already exists
-          //
-          if ($("#notice-"+id).length > 0) {
-               return;
-          }
-
-          var noticeItem = RealtimeUpdate.makeNoticeItem(data);
-          $("#notices_primary .notices").prepend(noticeItem);
-          $("#notices_primary .notice:first").css({display:"none"});
-          $("#notices_primary .notice:first").fadeIn(1000);
-          NoticeReply();
+              // Don't add it if it already exists
+              if ($("#notice-"+id).length > 0) {
+                   return;
+              }
+    
+              var noticeItem = RealtimeUpdate.makeNoticeItem(data);
+              $("#notices_primary .notices").prepend(noticeItem);
+              $("#notices_primary .notice:first").css({display:"none"});
+              $("#notices_primary .notice:first").fadeIn(1000);
+              NoticeReply();
+          }, 500);
      },
 
      makeNoticeItem: function(data)

From e307adfbfc44e653ee2b5b94dcf7eabdc8ffe0df Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 30 Sep 2009 10:22:26 -0700
Subject: [PATCH 162/247] New actions for /statuses/friends and
 /statuses/followers + social graph methods

---
 actions/apifollowers.php     |  85 +++++++++++
 actions/apifriends.php       |  85 +++++++++++
 actions/apisubscriptions.php | 275 +++++++++++++++++++++++++++++++++++
 lib/apiauth.php              |   3 +
 lib/router.php               |  55 ++++---
 lib/twitterapi.php           |   2 -
 6 files changed, 479 insertions(+), 26 deletions(-)
 create mode 100644 actions/apifollowers.php
 create mode 100644 actions/apifriends.php
 create mode 100644 actions/apisubscriptions.php

diff --git a/actions/apifollowers.php b/actions/apifollowers.php
new file mode 100644
index 0000000000..30e3b2d1bf
--- /dev/null
+++ b/actions/apifollowers.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show a user's followers (subscriptions)
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apibareauth.php';
+
+/**
+ * Ouputs the authenticating user's followers (subscribers), each with
+ * current Twitter-style status inline.  They are ordered by the order
+ * in which they subscribed to the user, 100 at a time.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiFollowersAction extends ApiSubscriptionsAction
+{
+    /**
+     * Get the user's subscribers (followers) as an array of profiles
+     *
+     * @return array Profiles
+     */
+
+    function getProfiles()
+    {
+        $offset = ($this->page - 1) * $this->count;
+        $limit =  $this->count + 1;
+
+        $subs = null;
+
+        if (isset($this->tag)) {
+            $subs = $this->user->getTaggedSubscribers(
+                $this->tag, $offset, $limit
+            );
+        } else {
+            $subs = $this->user->getSubscribers(
+                $offset,
+                $limit
+            );
+        }
+
+        $profiles = array();
+
+        if (!empty($subs)) {
+            while ($subs->fetch()) {
+                $profiles[] = clone($subs);
+            }
+        }
+
+        return $profiles;
+    }
+
+}
diff --git a/actions/apifriends.php b/actions/apifriends.php
new file mode 100644
index 0000000000..12751a6419
--- /dev/null
+++ b/actions/apifriends.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show a user's friends (subscriptions)
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apibareauth.php';
+
+/**
+ * Ouputs the authenticating user's friends (subscriptions), each with
+ * current Twitter-style status inline.  They are ordered by the date
+ * in which the user subscribed to them, 100 at a time.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiFriendsAction extends ApiSubscriptionsAction
+{
+    /**
+     * Get the user's subscriptions (friends) as an array of profiles
+     *
+     * @return array Profiles
+     */
+
+    function getProfiles()
+    {
+        $offset = ($this->page - 1) * $this->count;
+        $limit =  $this->count + 1;
+
+        $subs = null;
+
+        if (isset($this->tag)) {
+            $subs = $this->user->getTaggedSubscriptions(
+                $this->tag, $offset, $limit
+            );
+        } else {
+            $subs = $this->user->getSubscriptions(
+                $offset,
+                $limit
+            );
+        }
+
+        $profiles = array();
+
+        if (!empty($subs)) {
+            while ($subs->fetch()) {
+                $profiles[] = clone($subs);
+            }
+        }
+
+        return $profiles;
+    }
+
+}
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
new file mode 100644
index 0000000000..78dcd722dd
--- /dev/null
+++ b/actions/apisubscriptions.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Base class for showing subscription information in the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apibareauth.php';
+
+/**
+ * This class outputs a list of profiles as Twitter-style user and status objects.
+ * It is used by the API methods /api/statuses/(friends|followers). To support the
+ * social graph methods it also can output a simple list of IDs.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiSubscriptionsAction extends ApiBareAuthAction
+{
+
+    var $page     = null;
+    var $count    = null;
+    var $user     = null;
+    var $profiles = null;
+    var $format   = null;
+    var $tag      = null;
+    var $lite     = null;
+    var $ids_only = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->page     = (int)$this->arg('page', 1);
+        $this->tag      = $this->arg('tag');
+        $this->format   = $this->arg('format');
+
+        // Note: Twitter no longer supports 'lite'
+        $this->lite     = $this->arg('lite');
+
+        $this->ids_only = $this->arg('ids_only');
+
+        // If called as a social graph method, show 5000 per page, otherwise 100
+
+        $this->count    = isset($this->ids_only) ?
+            5000 : (int)$this->arg('count', 100);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return false;
+            }
+        }
+
+        $this->user = $this->getTargetUser($this->arg('id'));
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user!'), 404, $this->format);
+            return false;
+        }
+
+        $this->profiles = $this->getProfiles();
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Show the profiles
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(_('API method not found!'), $code = 404);
+            return;
+        }
+
+        $this->init_document($this->format);
+
+        if (isset($this->ids_only)) {
+            $this->showIds();
+        } else {
+            $this->showProfiles(isset($this->lite) ? false : true);
+        }
+
+        $this->end_document($this->format);
+    }
+
+    /**
+     * Get profiles - should get overrrided
+     *
+     * @return array Profiles
+     */
+
+    function getProfiles()
+    {
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this feed last modified?
+     *
+     * @return string datestamp of the latest profile in the stream
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->profiles) && (count($this->profiles) > 0)) {
+            return strtotime($this->profiles[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this action
+     *
+     * Returns an Etag based on the action name, language, user ID, and
+     * timestamps of the first and last profiles in the subscriptions list
+     * There's also an indicator to show whether this action is being called
+     * as /api/statuses/(friends|followers) or /api/(friends|followers)/ids
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->profiles) && (count($this->profiles) > 0)) {
+
+            $last = count($this->profiles) - 1;
+
+            return '"' . implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      $this->user->id,
+                      isset($this->ids_only) ? 'IDs' : 'Profiles',
+                      strtotime($this->profiles[0]->created),
+                      strtotime($this->profiles[$last]->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+    /**
+     * Show the profiles as Twitter-style useres and statuses
+     *
+     * @param boolean $include_statuses Whether to include the latest status
+     *                                  with each user. Default true.
+     *
+     * @return void
+     */
+
+    function showProfiles($include_statuses = true)
+    {
+        switch ($this->format) {
+        case 'xml':
+            $this->elementStart('users', array('type' => 'array'));
+            foreach ($this->profiles as $profile) {
+                $this->show_profile(
+                    $profile,
+                    $this->format,
+                    null,
+                    $include_statuses
+                );
+            }
+            $this->elementEnd('users');
+            break;
+        case 'json':
+            $arrays = array();
+            foreach ($this->profiles as $profile) {
+                $arrays[] = $this->twitter_user_array(
+                    $profile,
+                    $include_statuses
+                );
+            }
+            print json_encode($arrays);
+            break;
+        default:
+            $this->clientError(_('Unsupported format.'));
+            break;
+        }
+    }
+
+    /**
+     * Show the IDs of the profiles only. 5000 per page. To support
+     * the 'social graph' methods: /api/(friends|followers)/ids
+     *
+     * @return void
+     */
+
+    function showIds()
+    {
+        switch ($this->format) {
+        case 'xml':
+            $this->elementStart('ids');
+            foreach ($this->profiles as $profile) {
+                $this->element('id', null, $profile->id);
+            }
+            $this->elementEnd('ids');
+            break;
+        case 'json':
+            $ids = array();
+            foreach ($this->profiles as $profile) {
+                $ids[] = (int)$profile->id;
+            }
+            print json_encode($ids);
+            break;
+        default:
+            $this->clientError(_('Unsupported format.'));
+            break;
+        }
+    }
+
+}
diff --git a/lib/apiauth.php b/lib/apiauth.php
index c1976f964e..f0b4b6bf7f 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -45,6 +45,9 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
 
 class ApiAuthAction extends TwitterapiAction
 {
+
+    var $auth_user = null;
+
     /**
      * Does this API resource require authentication?
      *
diff --git a/lib/router.php b/lib/router.php
index 91cdd2cf80..b3bb240d9a 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -314,18 +314,33 @@ class Router
                     'id' => '[a-zA-Z0-9]+',
                     'format' => '(xml|json|rss|atom)'));
 
-        $m->connect('api/statuses/home_timeline',
-                    array('action' => 'apifriendstimeline'));
+        $m->connect('api/statuses/friends.:format',
+                     array('action' => 'ApiFriends',
+                           'format' => '(xml|json)'));
+
+        $m->connect('api/statuses/friends/:id.:format',
+                    array('action' => 'ApiFriends',
+                    'id' => '[a-zA-Z0-9]+',
+                    'format' => '(xml|json)'));
+
+        $m->connect('api/statuses/followers.:format',
+                     array('action' => 'ApiFollowers',
+                           'format' => '(xml|json)'));
+
+        $m->connect('api/statuses/followers/:id.:format',
+                    array('action' => 'ApiFollowers',
+                    'id' => '[a-zA-Z0-9]+',
+                    'format' => '(xml|json)'));
 
         $m->connect('api/statuses/:method',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(update|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+                    array('method' => '(update|show|featured)(\.(atom|rss|xml|json))?'));
 
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(show|destroy|friends|followers)'));
+                    array('method' => '(show|destroy)'));
 
         // users
 
@@ -380,29 +395,21 @@ class Router
 
         // Social graph
 
-        $m->connect('api/friends/ids/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'statuses',
-                          'method' => 'friendsIDs'));
+        $m->connect('api/friends/ids/:id.:format',
+                    array('action' => 'apiFriends',
+                          'ids_only' => true));
 
-        foreach (array('xml', 'json') as $e) {
-            $m->connect('api/friends/ids.'.$e,
-                        array('action' => 'api',
-                              'apiaction' => 'statuses',
-                              'method' => 'friendsIDs.'.$e));
-        }
+        $m->connect('api/followers/ids/:id.:format',
+                    array('action' => 'apiFollowers',
+                          'ids_only' => true));
 
-        $m->connect('api/followers/ids/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'statuses',
-                          'method' => 'followersIDs'));
+        $m->connect('api/friends/ids.:format',
+                    array('action' => 'apiFriends',
+                          'ids_only' => true));
 
-        foreach (array('xml', 'json') as $e) {
-            $m->connect('api/followers/ids.'.$e,
-                        array('action' => 'api',
-                              'apiaction' => 'statuses',
-                              'method' => 'followersIDs.'.$e));
-        }
+        $m->connect('api/followers/ids.:format',
+                     array('action' => 'apiFollowers',
+                          'ids_only' => true));
 
         // account
 
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 5cf6666688..6014a340eb 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -24,8 +24,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 class TwitterapiAction extends Action
 {
 
-    var $auth_user;
-
     /**
      * Initialization.
      *

From 1e7939cc4857db1109df40979bd475d4c0da48e9 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 30 Sep 2009 10:27:54 -0700
Subject: [PATCH 163/247] Left opening double quotes off Etag

---
 actions/apifriendstimeline.php | 2 +-
 actions/apimentions.php        | 2 +-
 actions/apipublictimeline.php  | 2 +-
 actions/apiusertimeline.php    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/actions/apifriendstimeline.php b/actions/apifriendstimeline.php
index 5205160163..1e88d1c2b4 100644
--- a/actions/apifriendstimeline.php
+++ b/actions/apifriendstimeline.php
@@ -232,7 +232,7 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
 
             $last = count($this->notices) - 1;
 
-            return implode(
+            return '"' . implode(
                 ':',
                 array($this->arg('action'),
                       common_language(),
diff --git a/actions/apimentions.php b/actions/apimentions.php
index 2b2e27f20d..43e93a9c63 100644
--- a/actions/apimentions.php
+++ b/actions/apimentions.php
@@ -217,7 +217,7 @@ class ApiMentionsAction extends ApiBareAuthAction
 
             $last = count($this->notices) - 1;
 
-            return implode(
+            return '"' . implode(
                 ':',
                 array($this->arg('action'),
                       common_language(),
diff --git a/actions/apipublictimeline.php b/actions/apipublictimeline.php
index 63cb0cbafb..2be979e6dc 100644
--- a/actions/apipublictimeline.php
+++ b/actions/apipublictimeline.php
@@ -191,7 +191,7 @@ class ApiPublicTimelineAction extends TwitterapiAction
 
             $last = count($this->notices) - 1;
 
-            return implode(
+            return '"' . implode(
                 ':',
                 array($this->arg('action'),
                       common_language(),
diff --git a/actions/apiusertimeline.php b/actions/apiusertimeline.php
index 1c69613136..44d69415bd 100644
--- a/actions/apiusertimeline.php
+++ b/actions/apiusertimeline.php
@@ -232,7 +232,7 @@ class ApiUserTimelineAction extends ApiBareAuthAction
 
             $last = count($this->notices) - 1;
 
-            return implode(
+            return '"' . implode(
                 ':',
                 array($this->arg('action'),
                       common_language(),

From 34ba2d03e94d3708a68166a8eae248152691f628 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 30 Sep 2009 10:30:06 -0700
Subject: [PATCH 164/247] Fix header comment

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

diff --git a/actions/apifollowers.php b/actions/apifollowers.php
index 30e3b2d1bf..b216cced7e 100644
--- a/actions/apifollowers.php
+++ b/actions/apifollowers.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Show a user's followers (subscriptions)
+ * Show a user's followers (subscribers)
  *
  * PHP version 5
  *

From c5be2962ad6fa4f78a4892005bc6a342de89c5d0 Mon Sep 17 00:00:00 2001
From: Toby Inkster <mail@tobyinkster.co.uk>
Date: Wed, 30 Sep 2009 13:12:17 +0100
Subject: [PATCH 165/247] FOAF for Groups.

---
 actions/foafgroup.php | 173 ++++++++++++++++++++++++++++++++++++++++++
 actions/showgroup.php |   7 +-
 lib/router.php        |   4 +
 3 files changed, 183 insertions(+), 1 deletion(-)
 create mode 100644 actions/foafgroup.php

diff --git a/actions/foafgroup.php b/actions/foafgroup.php
new file mode 100644
index 0000000000..f5fd7fe885
--- /dev/null
+++ b/actions/foafgroup.php
@@ -0,0 +1,173 @@
+<?php
+/*
+ * StatusNet the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, 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/>.
+ *
+ * @category  Mail
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Toby Inkster <mail@tobyinkster.co.uk>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+class FoafGroupAction extends Action
+{
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $nickname_arg = $this->arg('nickname');
+
+        if (empty($nickname_arg)) {
+            $this->clientError(_('No such group.'), 404);
+            return false;
+        }
+
+        $this->nickname = common_canonical_nickname($nickname_arg);
+
+        // Permanent redirect on non-canonical nickname
+
+        if ($nickname_arg != $this->nickname) {
+            common_redirect(common_local_url('foafgroup',
+                                             array('nickname' => $this->nickname)),
+                            301);
+            return false;
+        }
+
+        $this->group = User_group::staticGet('nickname', $this->nickname);
+
+        if (!$this->group) {
+            $this->clientError(_('No such group.'), 404);
+            return false;
+        }
+
+        common_set_returnto($this->selfUrl());
+
+        return true;
+    }
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        header('Content-Type: application/rdf+xml');
+
+        $this->startXML();
+        $this->elementStart('rdf:RDF', array('xmlns:rdf' =>
+                                              'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+                                              'xmlns:dcterms' =>
+                                              'http://purl.org/dc/terms/',
+                                              'xmlns:sioc' =>
+                                              'http://rdfs.org/sioc/ns#',
+                                              'xmlns:foaf' =>
+                                              'http://xmlns.com/foaf/0.1/',
+                                              'xmlns:statusnet' =>
+                                              'http://status.net/ont/',
+                                              'xmlns' => 'http://xmlns.com/foaf/0.1/'));
+
+        $this->showPpd(common_local_url('foafgroup', array('nickname' => $this->nickname)), $this->group->permalink());
+
+        $this->elementStart('Group', array('rdf:about' =>
+                                             $this->group->permalink()));
+        if ($this->group->fullname) {
+            $this->element('name', null, $this->group->fullname);
+        }
+        if ($this->group->description) {
+            $this->element('dcterms:description', null, $this->group->description);
+        }
+        if ($this->group->nickname) {
+            $this->element('dcterms:identifier', null, $this->group->nickname);
+            $this->element('nick', null, $this->group->nickname);
+        }
+        foreach ($this->group->getAliases() as $alias) {
+            $this->element('nick', null, $alias);
+        }
+        if ($this->group->homeUrl()) {
+            $this->element('weblog', array('rdf:resource' => $this->group->homeUrl()));
+        }
+        if ($this->group->homepage) {
+            $this->element('page', array('rdf:resource' => $this->group->homepage));
+        }
+        if ($this->group->homepage_logo) {
+            $this->element('depiction', array('rdf:resource' => $this->group->homepage_logo));
+        }
+        
+        $members = $this->group->getMembers();
+        $member_details = array();
+        while ($members->fetch()) {
+            $member_uri = common_local_url('userbyid', array('id'=>$members->id));
+            $member_details[$member_uri] = array(
+                                        'nickname' => $members->nickname
+                                        );
+            $this->element('member', array('rdf:resource' => $member_uri));
+        }
+        
+        $admins = $this->group->getAdmins();
+        while ($admins->fetch()) {
+            $admin_uri = common_local_url('userbyid', array('id'=>$admins->id));
+            $member_details[$admin_uri]['is_admin'] = true;
+            $this->element('statusnet:groupAdmin', array('rdf:resource' => $admin_uri));
+        }
+
+        $this->elementEnd('Group');
+        
+        ksort($member_details);
+        foreach ($member_details as $uri => $details) {
+            if ($details['is_admin'])
+            {
+                $this->elementStart('Agent', array('rdf:about' => $uri));
+                $this->element('nick', null, $details['nickname']);
+                $this->elementStart('holdsAccount');
+                $this->elementStart('sioc:User', array('rdf:about'=>$uri.'#acct'));
+                $this->elementStart('sioc:has_function');
+                $this->elementStart('statusnet:GroupAdminRole');
+                $this->element('sioc:scope', array('rdf:resource' => $this->group->permalink()));
+                $this->elementEnd('statusnet:GroupAdminRole');
+                $this->elementEnd('sioc:has_function');
+                $this->elementEnd('sioc:User');
+                $this->elementEnd('holdsAccount');
+                $this->elementEnd('Agent');
+            }
+            else
+            {
+                $this->element('Agent', array(
+                                        'foaf:nick' => $details['nickname'],
+                                        'rdf:about' => $uri,
+                                        ));
+            }
+        }
+        
+        $this->elementEnd('rdf:RDF');
+        $this->endXML();
+    }
+
+    function showPpd($foaf_url, $person_uri)
+    {
+        $this->elementStart('Document', array('rdf:about' => $foaf_url));
+        $this->element('primaryTopic', array('rdf:resource' => $person_uri));
+        $this->elementEnd('Document');
+    }
+
+}
\ No newline at end of file
diff --git a/actions/showgroup.php b/actions/showgroup.php
index ff99497621..a67765ce58 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -345,7 +345,12 @@ class ShowgroupAction extends GroupDesignAction
                                                      'method' => 'timeline',
                                                      'argument' => $this->group->nickname.'.atom')),
                               sprintf(_('Notice feed for %s group (Atom)'),
-                                      $this->group->nickname)));
+                                      $this->group->nickname)),
+                     new Feed(Feed::FOAF,
+                              common_local_url('foafgroup',
+                                               array('nickname' => $this->group->nickname)),
+                              sprintf(_('FOAF for %s group'),
+                                       $this->group->nickname)));
     }
 
     /**
diff --git a/lib/router.php b/lib/router.php
index c18f273ed0..91f886bce1 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -241,6 +241,10 @@ class Router
                         array('nickname' => '[a-zA-Z0-9]+'));
         }
 
+        $m->connect('group/:nickname/foaf',
+                    array('action' => 'foafgroup'),
+                    array('nickname' => '[a-zA-Z0-9]+'));
+
         $m->connect('group/:nickname/blocked',
                     array('action' => 'blockedfromgroup'),
                     array('nickname' => '[a-zA-Z0-9]+'));

From 524c2794c954346a00d7bf4cd58a6742bc005707 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 30 Sep 2009 17:02:04 -0700
Subject: [PATCH 166/247] Declare some more variables; instance variable for
 format

---
 actions/apifriendstimeline.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/actions/apifriendstimeline.php b/actions/apifriendstimeline.php
index 1e88d1c2b4..be0cf758c2 100644
--- a/actions/apifriendstimeline.php
+++ b/actions/apifriendstimeline.php
@@ -47,8 +47,13 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
 class ApiFriendsTimelineAction extends ApiBareAuthAction
 {
 
-    var $user    = null;
-    var $notices = null;
+    var $user     = null;
+    var $notices  = null;
+    var $count    = null;
+    var $max_id   = null;
+    var $since_id = null;
+    var $since    = null;
+    var $format   = null;
 
     /**
      * Take arguments for running
@@ -68,6 +73,7 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
         $this->max_id   = (int)$this->arg('max_id', 0);
         $this->since_id = (int)$this->arg('since_id', 0);
         $this->since    = $this->arg('since');
+        $this->format   = $this->arg('format');
 
         if ($this->requiresAuth()) {
             if ($this->checkBasicAuthUser() == false) {
@@ -78,7 +84,7 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->arg('format'));
+            $this->clientError(_('No such user!'), 404, $this->format);
             return;
         }
 
@@ -124,7 +130,7 @@ class ApiFriendsTimelineAction extends ApiBareAuthAction
             $this->user->nickname, $sitename
         );
 
-        switch($this->arg('format')) {
+        switch($this->format) {
         case 'xml':
             $this->show_xml_timeline($this->notices);
             break;

From a3901e0e243d42fb75162a063c10b77fddd7dfe5 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 30 Sep 2009 17:06:46 -0700
Subject: [PATCH 167/247] New action for /statuses/show

---
 actions/apishow.php | 196 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 196 insertions(+)
 create mode 100644 actions/apishow.php

diff --git a/actions/apishow.php b/actions/apishow.php
new file mode 100644
index 0000000000..3d0b7b6e3a
--- /dev/null
+++ b/actions/apishow.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show a notice (as a Twitter-style status)
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/twitterapi.php';
+
+/**
+ * Returns the notice specified by id as a Twitter-style status and inline user
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiShowAction extends TwitterapiAction
+{
+
+    var $notice_id = null;
+    var $notice    = null;
+    var $format    = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        // 'id' is an undocumented parameter in Twitter's API. Several
+        // clients make use of it, so we support it too.
+
+        // show.json?id=12345 takes precedence over /show/12345.json
+
+        $this->notice_id = (int)$this->trimmed('id');
+
+        if (empty($notice_id)) {
+            $this->notice_id = (int)$this->arg('id');
+        }
+
+        $this->format = $this->arg('format');
+        $this->notice = Notice::staticGet((int)$this->notice_id);
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Just show the notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(_('API method not found!'), $code = 404);
+            return;
+        }
+
+        $this->showNotice();
+    }
+
+    /**
+     * Show the timeline of notices
+     *
+     * @return void
+     */
+
+    function showNotice()
+    {
+        if (!empty($this->notice)) {
+            if ($this->format == 'xml') {
+                $this->show_single_xml_status($this->notice);
+            } elseif ($this->format == 'json') {
+                $this->show_single_json_status($this->notice);
+            }
+        } else {
+
+            // XXX: Twitter just sets a 404 header and doens't bother
+            // to return an err msg
+
+            $deleted = Deleted_notice::staticGet($this->notice_id);
+
+            if (!empty($deleted)) {
+                $this->clientError(
+                    _('Status deleted.'), 
+                    410, 
+                    $this->format
+                );
+            } else {
+                $this->clientError(
+                    _('No status with that ID found.'),
+                    404, 
+                    $this->format
+                );
+            }
+        }
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this notice last modified?
+     *
+     * @return string datestamp of the latest notice in the stream
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->notice)) {
+            return strtotime($this->notices->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this notice
+     *
+     * Returns an Etag based on the action name, language, and
+     * timestamps of the notice
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->notice)) {
+
+            return '"' . implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      $this->notice->id,
+                      strtotime($this->notice->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+}

From 8b8e0c95af8efe656c3c7a67153117ba8128456e Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 30 Sep 2009 17:08:52 -0700
Subject: [PATCH 168/247] Add route for /statuses/show

---
 actions/apishow.php | 10 +++++-----
 lib/router.php      | 11 ++++++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/actions/apishow.php b/actions/apishow.php
index 3d0b7b6e3a..d17cc8c95d 100644
--- a/actions/apishow.php
+++ b/actions/apishow.php
@@ -83,7 +83,7 @@ class ApiShowAction extends TwitterapiAction
     /**
      * Handle the request
      *
-     * Just show the notices
+     * Check the format and show the notice
      *
      * @param array $args $_REQUEST data (unused)
      *
@@ -103,7 +103,7 @@ class ApiShowAction extends TwitterapiAction
     }
 
     /**
-     * Show the timeline of notices
+     * Show the notice
      *
      * @return void
      */
@@ -125,14 +125,14 @@ class ApiShowAction extends TwitterapiAction
 
             if (!empty($deleted)) {
                 $this->clientError(
-                    _('Status deleted.'), 
-                    410, 
+                    _('Status deleted.'),
+                    410,
                     $this->format
                 );
             } else {
                 $this->clientError(
                     _('No status with that ID found.'),
-                    404, 
+                    404,
                     $this->format
                 );
             }
diff --git a/lib/router.php b/lib/router.php
index b3bb240d9a..972db4c9df 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -332,10 +332,19 @@ class Router
                     'id' => '[a-zA-Z0-9]+',
                     'format' => '(xml|json)'));
 
+        $m->connect('api/statuses/show.:format',
+                    array('action' => 'ApiShow',
+                          'format' => '(xml|json)'));
+
+        $m->connect('api/statuses/show/:id.:format',
+                    array('action' => 'ApiShow',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json)'));
+
         $m->connect('api/statuses/:method',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(update|show|featured)(\.(atom|rss|xml|json))?'));
+                    array('method' => '(update|featured)(\.(atom|rss|xml|json))?'));
 
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',

From c5f33cc6c26cc10dbcf2f1d3104875ad694f2256 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 30 Sep 2009 17:11:22 -0700
Subject: [PATCH 169/247] Fix: last modified header wasn't showing

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

diff --git a/actions/apishow.php b/actions/apishow.php
index d17cc8c95d..952c7f593b 100644
--- a/actions/apishow.php
+++ b/actions/apishow.php
@@ -161,7 +161,7 @@ class ApiShowAction extends TwitterapiAction
     function lastModified()
     {
         if (!empty($this->notice)) {
-            return strtotime($this->notices->created);
+            return strtotime($this->notice->created);
         }
 
         return null;

From cc776478e2ea8fc861fd3b4e8e878f7d6020c34e Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 1 Oct 2009 10:07:09 +0000
Subject: [PATCH 170/247] Revert "Outputting UTF-8 charset in document header
 irrespective of mimetype."

This reverts commit 353f58c23149159306131b0819de713da6b69464.

Even though outputting UTF-8 by default at all times is a good thing,
it shouldn't be forced in startHTML().
---
 lib/htmloutputter.php | 2 +-
 lib/util.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 64be745beb..c70f965376 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -106,7 +106,7 @@ class HTMLOutputter extends XMLOutputter
             }
         }
 
-        header('Content-Type: '.$type.'; charset=UTF-8');
+        header('Content-Type: '.$type);
 
         $this->extraHeaders();
         if (preg_match("/.*\/.*xml/", $type)) {
diff --git a/lib/util.php b/lib/util.php
index 44a3772200..d249b154fc 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1165,7 +1165,7 @@ function common_negotiate_type($cprefs, $sprefs)
     }
 
     if ('text/html' === $besttype) {
-        return "text/html";
+        return "text/html; charset=utf-8";
     }
     return $besttype;
 }

From acc78972383c2346b5729192ab00c90c48c5b2a6 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 1 Oct 2009 12:27:02 +0000
Subject: [PATCH 171/247] Added hook for Aside container

---
 EVENTS.txt     | 6 ++++++
 lib/action.php | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 74923dcc0a..e0d4bbd061 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -87,6 +87,12 @@ StartShowContentBlock: Showing before the content container
 EndShowContentBlock: Showing after the content container
 - $action: the current action
 
+StartShowAside: Showing before the Aside container
+- $action: the current action
+
+EndShowAside: Showing after the Aside container
+- $action: the current action
+
 StartNoticeSave: before inserting a notice (good place for content filters)
 - $notice: notice being saved (no ID or URI)
 
diff --git a/lib/action.php b/lib/action.php
index 02793f0694..71ceffe20d 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -525,7 +525,10 @@ class Action extends HTMLOutputter // lawsuit
             $this->showContentBlock();
             Event::handle('EndShowContentBlock', array($this));
         }
-        $this->showAside();
+        if (Event::handle('StartShowAside', array($this))) {
+            $this->showAside();
+            Event::handle('EndShowAside', array($this));
+        }
         $this->elementEnd('div');
     }
 

From b980f5e45b613d60e968e84b304ef9db260f24c2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 1 Oct 2009 15:00:54 -0400
Subject: [PATCH 172/247] add some more methods to Schema

---
 lib/schema.php | 203 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 184 insertions(+), 19 deletions(-)

diff --git a/lib/schema.php b/lib/schema.php
index f490756905..056c2093d6 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -193,32 +193,161 @@ class Schema
         return true;
     }
 
-    public function createIndex($name, $table, $columns)
+    public function createIndex($table, $columnNames, $name = null)
     {
+        if (!is_array($columnNames)) {
+            $columnNames = array($columnNames);
+        }
+
+        if (empty($name)) {
+            $name = "$table_".implode("_", $columnNames)."_idx";
+        }
+
+        $res =& $this->conn->query("ALTER TABLE $table ADD INDEX $name (".implode(",", $columnNames).")");
+
+        if (PEAR::isError($res)) {
+            throw new Exception($res->getMessage());
+        }
+
+        return true;
     }
 
-    public function dropIndex($name, $table)
+    public function dropIndex($table, $name)
     {
+        $res =& $this->conn->query("ALTER TABLE $table DROP INDEX $name");
+
+        if (PEAR::isError($res)) {
+            throw new Exception($res->getMessage());
+        }
+
+        return true;
     }
 
     public function addColumn($table, $columndef)
     {
-    }
+        $sql = "ALTER TABLE $table ADD COLUMN " . $this->_columnSql($columndef);
 
-    public function modifyColumn($table, $column, $columndef)
-    {
-    }
+        $res =& $this->conn->query($sql);
 
-    public function dropColumn($table, $column)
-    {
-    }
-
-    public function ensureTable($name, $columns, $indices)
-    {
-        $def = $this->tableDef($name);
-        if (empty($def)) {
-            return $this->createTable($name, $columns, $indices);
+        if (PEAR::isError($res)) {
+            throw new Exception($res->getMessage());
         }
+
+        return true;
+    }
+
+    public function modifyColumn($table, $columndef)
+    {
+        $sql = "ALTER TABLE $table MODIFY COLUMN " . $this->_columnSql($columndef);
+
+        $res =& $this->conn->query($sql);
+
+        if (PEAR::isError($res)) {
+            throw new Exception($res->getMessage());
+        }
+
+        return true;
+    }
+
+    public function dropColumn($table, $columnName)
+    {
+        $sql = "ALTER TABLE $table DROP COLUMN $columnName";
+
+        $res =& $this->conn->query($sql);
+
+        if (PEAR::isError($res)) {
+            throw new Exception($res->getMessage());
+        }
+
+        return true;
+    }
+
+    public function ensureTable($tableName, $columns, $indices=null)
+    {
+        // XXX: DB engine portability -> toilet
+
+        try {
+            $td = $this->getTableDef($tableName);
+        } catch (Exception $e) {
+            if (preg_match('/no such table/', $e->getMessage())) {
+                return $this->createTable($tableName, $columns, $indices);
+            } else {
+                throw $e;
+            }
+        }
+
+        $cur = $this->_names($td->columns);
+        $new = $this->_names($columns);
+
+        $toadd  = array_diff($new, $cur);
+        $todrop = array_diff($cur, $new);
+
+        $same  = array_intersect($new, $cur);
+
+        foreach ($same as $m) {
+            $curCol = $this->_byName($td->columns, $m);
+            $newCol = $this->_byName($columns, $m);
+
+            if (!$newCol->equals($curCol)) {
+                $tomod[] = $newCol->name;
+            }
+        }
+
+        if (count($toadd) + count($todrop) + count($tomod) == 0) {
+            // nothing to do
+            return true;
+        }
+
+        // For efficiency, we want this all in one
+        // query, instead of using our methods.
+
+        $phrase = array();
+
+        foreach ($toadd as $columnName) {
+            $cd = $this->_byName($columns, $columnName);
+            $phrase[] = 'ADD COLUMN ' . $this->_columnSql($cd);
+        }
+
+        foreach ($todrop as $columnName) {
+            $phrase[] = 'DROP COLUMN ' . $columnName;
+        }
+
+        foreach ($tomod as $columnName) {
+            $cd = $this->_byName($columns, $columnName);
+            $phrase[] = 'MODIFY COLUMN ' . $this->_columnSql($cd);
+        }
+
+        $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase);
+
+        $res =& $this->conn->query($sql);
+
+        if (PEAR::isError($res)) {
+            throw new Exception($res->getMessage());
+        }
+
+        return true;
+    }
+
+    function _names($cds)
+    {
+        $names = array();
+
+        foreach ($cds as $cd) {
+            $names[] = $cd->name;
+        }
+
+        return $names;
+    }
+
+    function _byName($cds, $name)
+    {
+        foreach ($cds as $cd) {
+            if ($cd->name == $name) {
+                return $cd;
+            }
+        }
+
+        return null;
     }
 
     function _columnSql($cd)
@@ -257,16 +386,52 @@ class ColumnDef
     public $default;
     public $extra;
 
-    function __construct($name, $type, $size=null, $nullable=null,
+    function __construct($name, $type, $size=null, $nullable=true,
                          $key=null, $default=null, $extra=null) {
-        $this->name     = $name;
-        $this->type     = $type;
-        $this->size     = $size;
+        $this->name     = strtolower($name);
+        $this->type     = strtolower($type);
+        $this->size     = $size+0;
         $this->nullable = $nullable;
         $this->key      = $key;
         $this->default  = $default;
         $this->extra    = $extra;
     }
+
+    function equals($other)
+    {
+        return ($this->name == $other->name &&
+                $this->_typeMatch($other) &&
+                $this->_defaultMatch($other) &&
+                $this->_nullMatch($other) &&
+                $this->key == $other->key);
+    }
+
+    function _typeMatch($other)
+    {
+        switch ($this->type) {
+         case 'integer':
+         case 'int':
+            return ($other->type == 'integer' ||
+                    $other->type == 'int');
+            break;
+         default:
+            return ($this->type == $other->type &&
+                    $this->size == $other->size);
+        }
+    }
+
+    function _defaultMatch($other)
+    {
+        return ((is_null($this->default) && is_null($other->default)) ||
+                ($this->default == $other->default));
+    }
+
+    function _nullMatch($other)
+    {
+        return ((!is_null($this->default) && !is_null($other->default) &&
+                 $this->default == $other->default) ||
+                ($this->nullable == $other->nullable));
+    }
 }
 
 class IndexDef

From d103522ff364098ed26305b31d1cb62f87de1318 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 1 Oct 2009 15:11:12 -0400
Subject: [PATCH 173/247] check the schema

---
 EVENTS.txt              |  2 ++
 README                  |  8 ++++++++
 lib/common.php          |  6 ++++++
 lib/default.php         |  3 ++-
 scripts/checkschema.php | 30 ++++++++++++++++++++++++++++++
 5 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 scripts/checkschema.php

diff --git a/EVENTS.txt b/EVENTS.txt
index e0d4bbd061..fbb2f36a7b 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -283,3 +283,5 @@ StartShowHeadElements: Right after the <head> tag
 
 EndShowHeadElements: Right before the </head> tag; put <script>s here if you need them in <head>
 - $action: the current action
+
+CheckSchema: chance to check the schema
diff --git a/README b/README
index f3b2528b85..486656a3bc 100644
--- a/README
+++ b/README
@@ -1037,6 +1037,14 @@ utf8: whether to talk to the database in UTF-8 mode. This is the default
       with new installations, but older sites may want to turn it off
       until they get their databases fixed up. See "UTF-8 database"
       above for details.
+schemacheck: when to let plugins check the database schema to add
+             tables or update them. Values can be 'runtime' (default)
+             or 'script'. 'runtime' can be costly (plugins check the
+             schema on every hit, adding potentially several db
+             queries, some quite long), but not everyone knows how to
+             run a script. If you can, set this to 'script' and run
+             scripts/checkschema.php whenever you install or upgrade a
+             plugin.
 
 syslog
 ------
diff --git a/lib/common.php b/lib/common.php
index 58e208a4e9..ce33c871bf 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -232,6 +232,12 @@ require_once INSTALLDIR.'/lib/serverexception.php';
 
 Config::loadSettings();
 
+// XXX: if plugins should check the schema at runtime, do that here.
+
+if ($config['db']['schemacheck'] == 'runtime') {
+    Event::handle('CheckSchema');
+}
+
 // XXX: other formats here
 
 define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
diff --git a/lib/default.php b/lib/default.php
index 7af94d2ad6..f9670cb7f9 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -64,7 +64,8 @@ $default =
               'utf8' => true,
               'db_driver' => 'DB', # XXX: JanRain libs only work with DB
               'quote_identifiers' => false,
-              'type' => 'mysql' ),
+              'type' => 'mysql',
+              'schemacheck' => 'runtime'), // 'runtime' or 'script'
         'syslog' =>
         array('appname' => 'statusnet', # for syslog
               'priority' => 'debug', # XXX: currently ignored
diff --git a/scripts/checkschema.php b/scripts/checkschema.php
new file mode 100644
index 0000000000..bf52abe154
--- /dev/null
+++ b/scripts/checkschema.php
@@ -0,0 +1,30 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, 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/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$helptext = <<<END_OF_CHECKSCHEMA_HELP
+Gives plugins a chance to update the database schema.
+
+END_OF_CHECKSCHEMA_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+Event::handle('CheckSchema');

From 544c58d263e61e2eda3b2c54a4f0a1a6bbfa4910 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 1 Oct 2009 15:43:08 -0400
Subject: [PATCH 174/247] Some bug fixes

The $tomod variable wasn't set, and the ColumnDef constructor
didn't work without any args. These are fixed.
---
 lib/schema.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/schema.php b/lib/schema.php
index 056c2093d6..8c8f5e9ff5 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -284,6 +284,8 @@ class Schema
 
         $same  = array_intersect($new, $cur);
 
+        $tomod = array();
+
         foreach ($same as $m) {
             $curCol = $this->_byName($td->columns, $m);
             $newCol = $this->_byName($columns, $m);
@@ -386,8 +388,9 @@ class ColumnDef
     public $default;
     public $extra;
 
-    function __construct($name, $type, $size=null, $nullable=true,
-                         $key=null, $default=null, $extra=null) {
+    function __construct($name=null, $type=null, $size=null,
+                         $nullable=true, $key=null, $default=null,
+                         $extra=null) {
         $this->name     = strtolower($name);
         $this->type     = strtolower($type);
         $this->size     = $size+0;

From f65baaaa4f48b84392200bb54161887669440cab Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 1 Oct 2009 15:43:57 -0400
Subject: [PATCH 175/247] change DB so OpenIDPlugin manages OpenID tables

---
 db/statusnet.sql                | 12 ------------
 plugins/OpenID/OpenIDPlugin.php | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/db/statusnet.sql b/db/statusnet.sql
index 221d60ce37..dfcddb643c 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -195,18 +195,6 @@ create table nonce (
     constraint primary key (consumer_key, ts, nonce)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
-/* One-to-many relationship of user to openid_url */
-
-create table user_openid (
-    canonical varchar(255) primary key comment 'Canonical true URL',
-    display varchar(255) not null unique key comment 'URL for viewing, may be different from canonical',
-    user_id integer not null comment 'user owning this URL' references user (id),
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    index user_openid_user_id_idx (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
 /* These are used by JanRain OpenID library */
 
 create table oid_associations (
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 91bddf381f..a933a11555 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -222,4 +222,19 @@ class OpenIDPlugin extends Plugin
 
         return true;
     }
+
+    function onCheckSchema() {
+        $schema = Schema::get();
+        $schema->ensureTable('user_openid',
+                             array(new ColumnDef('canonical', 'varchar',
+                                                 '255', false, 'PRI'),
+                                   new ColumnDef('display', 'varchar',
+                                                 '255', false),
+                                   new ColumnDef('user_id', 'integer',
+                                                 null, false, 'MUL'),
+                                   new ColumnDef('created', 'datetime',
+                                                 null, false),
+                                   new ColumnDef('modified', 'timestamp')));
+        return true;
+    }
 }

From b0ddb971e61bd98250c41e653ab2e649a9b08926 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 1 Oct 2009 16:15:52 -0700
Subject: [PATCH 176/247] New action for /statuses/update

---
 actions/apiupdate.php | 240 ++++++++++++++++++++++++++++++++++++++++++
 lib/router.php        |   9 +-
 2 files changed, 244 insertions(+), 5 deletions(-)
 create mode 100644 actions/apiupdate.php

diff --git a/actions/apiupdate.php b/actions/apiupdate.php
new file mode 100644
index 0000000000..9ce208f656
--- /dev/null
+++ b/actions/apiupdate.php
@@ -0,0 +1,240 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Post a notice (update your status) through the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apibareauth.php';
+
+/**
+ * Updates the authenticating user's status (posts a notice).
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiUpdateAction extends ApiAuthAction
+{
+
+    var $user                  = null;
+    var $source                = null;
+    var $status                = null;
+    var $in_reply_to_status_id = null;
+    var $format                = null;
+
+    static $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return false;
+            }
+        }
+
+        $this->user = $this->auth_user;
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user!'), 404, $this->format);
+            return false;
+        }
+
+        $this->status = $this->trimmed('status');
+
+        if (empty($this->status)) {
+            $this->clientError(
+                'Client must provide a \'status\' parameter with a value.',
+                400,
+                $this->format
+            );
+
+            return false;
+        }
+
+        $this->source = $this->trimmed('source');
+
+        if (empty($this->source) || in_array($source, $this->reserved_sources)) {
+            $this->source = 'api';
+        }
+
+        $this->format = $this->arg('format');
+
+        $this->in_reply_to_status_id
+            = intval($this->trimmed('in_reply_to_status_id'));
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Just show the notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400, $this->format
+            );
+            return;
+        }
+
+        $status_shortened = common_shorten_links($this->status);
+
+        if (Notice::contentTooLong($status_shortened)) {
+
+            // Note: Twitter truncates anything over 140, flags the status
+            // as "truncated."
+
+            $this->clientError(
+                sprintf(
+                    _('That\'s too long. Max notice size is %d chars.'),
+                    Notice::maxContent()
+                ),
+                406,
+                $this->format
+            );
+
+            return;
+        }
+
+        // Check for commands
+
+        $inter = new CommandInterpreter();
+        $cmd = $inter->handle_command($this->user, $status_shortened);
+
+        if ($cmd) {
+
+            if ($this->supported($cmd)) {
+                $cmd->execute(new Channel());
+            }
+
+            // Cmd not supported?  Twitter just returns your latest status.
+            // And, it returns your last status whether the cmd was successful
+            // or not!
+
+            $this->notice = $this->user->getCurrentNotice();
+
+        } else {
+
+            $reply_to = null;
+
+            if (!empty($this->in_reply_to_status_id)) {
+
+                // Check whether notice actually exists
+
+                $reply = Notice::staticGet($this->in_reply_to_status_id);
+
+                if ($reply) {
+                    $reply_to = $this->in_reply_to_status_id;
+                } else {
+                    $this->clientError(
+                        _('Not found'),
+                        $code = 404,
+                        $this->format
+                    );
+                    return;
+                }
+            }
+
+            $this->notice = Notice::saveNew(
+                $this->user->id,
+                html_entity_decode($this->status, ENT_NOQUOTES, 'UTF-8'),
+                $this->source,
+                1,
+                $reply_to
+            );
+
+            common_broadcast_notice($this->notice);
+        }
+
+        $this->showNotice();
+    }
+
+    /**
+     * Show the resulting notice
+     *
+     * @return void
+     */
+
+    function showNotice()
+    {
+        if (!empty($this->notice)) {
+            if ($this->format == 'xml') {
+                $this->show_single_xml_status($this->notice);
+            } elseif ($this->format == 'json') {
+                $this->show_single_json_status($this->notice);
+            }
+        }
+    }
+
+    /**
+     * Is this command supported when doing an update from the API?
+     *
+     * @param string $cmd the command to check for
+     *
+     * @return boolean true or false
+     */
+
+    function supported($cmd)
+    {
+        static $cmdlist = array('MessageCommand', 'SubCommand', 'UnsubCommand',
+            'FavCommand', 'OnCommand', 'OffCommand');
+
+        if (in_array(get_class($cmd), $cmdlist)) {
+            return true;
+        }
+
+        return false;
+    }
+
+}
diff --git a/lib/router.php b/lib/router.php
index 972db4c9df..1ea06afe08 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -341,15 +341,14 @@ class Router
                           'id' => '[a-zA-Z0-9]+',
                           'format' => '(xml|json)'));
 
-        $m->connect('api/statuses/:method',
-                    array('action' => 'api',
-                          'apiaction' => 'statuses'),
-                    array('method' => '(update|featured)(\.(atom|rss|xml|json))?'));
+        $m->connect('api/statuses/update.:format',
+                    array('action' => 'ApiUpdate',
+                          'format' => '(xml|json)'));
 
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(show|destroy)'));
+                    array('method' => 'destroy'));
 
         // users
 

From 9a1dbee0fdd1f586512e4517a5abb7898501bc11 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 1 Oct 2009 17:35:28 -0700
Subject: [PATCH 177/247] A new action for /statuses/destroy

---
 actions/apidestroy.php | 152 +++++++++++++++++++++++++++++++++++++++++
 actions/apiupdate.php  |   4 +-
 lib/router.php         |  15 ++--
 3 files changed, 164 insertions(+), 7 deletions(-)
 create mode 100644 actions/apidestroy.php

diff --git a/actions/apidestroy.php b/actions/apidestroy.php
new file mode 100644
index 0000000000..a3b6bf65e8
--- /dev/null
+++ b/actions/apidestroy.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Destroy a notice through the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apiauth.php';
+
+/**
+ * Deletes one of the authenticating user's statuses (notices).
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiDestroyAction extends ApiAuthAction
+{
+
+    var $user                  = null;
+    var $status                = null;
+    var $format                = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return false;
+            }
+        }
+
+        $this->user = $this->auth_user;
+        $this->notice_id = (int)$this->trimmed('id');
+
+        if (empty($notice_id)) {
+            $this->notice_id = (int)$this->arg('id');
+        }
+
+        $this->format = $this->arg('format');
+        $this->notice = Notice::staticGet((int)$this->notice_id);
+
+        return true;
+     }
+
+    /**
+     * Handle the request
+     *
+     * Delete the notice and all related replies
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+             $this->clientError(_('API method not found!'), $code = 404);
+             return;
+        }
+
+         if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
+             $this->clientError(_('This method requires a POST or DELETE.'),
+                 400, $this->format);
+             return;
+         }
+
+         if (empty($this->notice)) {
+             $this->clientError(_('No status found with that ID.'),
+                 404, $this->format);
+             return;
+         }
+
+         if ($this->user->id == $this->notice->profile_id) {
+             $replies = new Reply;
+             $replies->get('notice_id', $this->notice_id);
+             $replies->delete();
+             $this->notice->delete();
+
+             if ($this->format == 'xml') {
+                 $this->show_single_xml_status($this->notice);
+             } elseif ($this->format == 'json') {
+                 $this->show_single_json_status($this->notice);
+             }
+         } else {
+             $this->clientError(_('You may not delete another user\'s status.'),
+                 403, $this->format);
+         }
+
+        $this->showNotice();
+    }
+
+    /**
+     * Show the deleted notice
+     *
+     * @return void
+     */
+
+    function showNotice()
+    {
+        if (!empty($this->notice)) {
+            if ($this->format == 'xml') {
+                $this->show_single_xml_status($this->notice);
+            } elseif ($this->format == 'json') {
+                $this->show_single_json_status($this->notice);
+            }
+        }
+    }
+
+}
diff --git a/actions/apiupdate.php b/actions/apiupdate.php
index 9ce208f656..04a38f3f87 100644
--- a/actions/apiupdate.php
+++ b/actions/apiupdate.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
+require_once INSTALLDIR.'/lib/apiauth.php';
 
 /**
  * Updates the authenticating user's status (posts a notice).
@@ -109,7 +109,7 @@ class ApiUpdateAction extends ApiAuthAction
     /**
      * Handle the request
      *
-     * Just show the notices
+     * Make a new notice for the update, save it, and show it
      *
      * @param array $args $_REQUEST data (unused)
      *
diff --git a/lib/router.php b/lib/router.php
index 3de4e322f9..5c9513f570 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -342,17 +342,22 @@ class Router
 
         $m->connect('api/statuses/show/:id.:format',
                     array('action' => 'ApiShow',
-                          'id' => '[a-zA-Z0-9]+',
+                          'id' => '[0-9]+',
                           'format' => '(xml|json)'));
 
         $m->connect('api/statuses/update.:format',
                     array('action' => 'ApiUpdate',
                           'format' => '(xml|json)'));
 
-        $m->connect('api/statuses/:method/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'statuses'),
-                    array('method' => 'destroy'));
+        $m->connect('api/statuses/destroy.:format',
+                  array('action' => 'ApiDestroy',
+                        'format' => '(xml|json)'));
+
+        $m->connect('api/statuses/destroy/:id.:format',
+                  array('action' => 'ApiDestroy',
+                        'id' => '[0-9]+',
+                        'format' => '(xml|json)'));
+
 
         // users
 

From 1e0c36afb5c265eff1d72331b44239e35f5226ed Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 1 Oct 2009 18:19:59 -0700
Subject: [PATCH 178/247] Renamed and moved stuff around to better match
 Twitter's API organization

---
 ...{apidestroy.php => apistatusesdestroy.php} |   2 +-
 actions/{apishow.php => apistatusesshow.php}  |   2 +-
 .../{apiupdate.php => apistatusesupdate.php}  |   2 +-
 ...ndstimeline.php => apitimelinefriends.php} |   2 +-
 ...pimentions.php => apitimelinementions.php} |   2 +-
 ...blictimeline.php => apitimelinepublic.php} |   2 +-
 ...piusertimeline.php => apitimelineuser.php} |   2 +-
 ...{apifollowers.php => apiuserfollowers.php} |   2 +-
 .../{apifriends.php => apiuserfriends.php}    |   2 +-
 actions/twitapistatuses.php                   | 606 ------------------
 lib/router.php                                |  40 +-
 11 files changed, 29 insertions(+), 635 deletions(-)
 rename actions/{apidestroy.php => apistatusesdestroy.php} (98%)
 rename actions/{apishow.php => apistatusesshow.php} (98%)
 rename actions/{apiupdate.php => apistatusesupdate.php} (99%)
 rename actions/{apifriendstimeline.php => apitimelinefriends.php} (99%)
 rename actions/{apimentions.php => apitimelinementions.php} (99%)
 rename actions/{apipublictimeline.php => apitimelinepublic.php} (98%)
 rename actions/{apiusertimeline.php => apitimelineuser.php} (99%)
 rename actions/{apifollowers.php => apiuserfollowers.php} (97%)
 rename actions/{apifriends.php => apiuserfriends.php} (97%)
 delete mode 100644 actions/twitapistatuses.php

diff --git a/actions/apidestroy.php b/actions/apistatusesdestroy.php
similarity index 98%
rename from actions/apidestroy.php
rename to actions/apistatusesdestroy.php
index a3b6bf65e8..ae0f4c4532 100644
--- a/actions/apidestroy.php
+++ b/actions/apistatusesdestroy.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/apiauth.php';
  * @link     http://status.net/
  */
 
-class ApiDestroyAction extends ApiAuthAction
+class ApiStatusesDestroyAction extends ApiAuthAction
 {
 
     var $user                  = null;
diff --git a/actions/apishow.php b/actions/apistatusesshow.php
similarity index 98%
rename from actions/apishow.php
rename to actions/apistatusesshow.php
index 952c7f593b..55eea2356d 100644
--- a/actions/apishow.php
+++ b/actions/apistatusesshow.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @link     http://status.net/
  */
 
-class ApiShowAction extends TwitterapiAction
+class ApiStatusesShowAction extends TwitterapiAction
 {
 
     var $notice_id = null;
diff --git a/actions/apiupdate.php b/actions/apistatusesupdate.php
similarity index 99%
rename from actions/apiupdate.php
rename to actions/apistatusesupdate.php
index 04a38f3f87..fb12785593 100644
--- a/actions/apiupdate.php
+++ b/actions/apistatusesupdate.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/apiauth.php';
  * @link     http://status.net/
  */
 
-class ApiUpdateAction extends ApiAuthAction
+class ApiStatusesUpdateAction extends ApiAuthAction
 {
 
     var $user                  = null;
diff --git a/actions/apifriendstimeline.php b/actions/apitimelinefriends.php
similarity index 99%
rename from actions/apifriendstimeline.php
rename to actions/apitimelinefriends.php
index be0cf758c2..65bbb5a74a 100644
--- a/actions/apifriendstimeline.php
+++ b/actions/apitimelinefriends.php
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
  * @link     http://status.net/
  */
 
-class ApiFriendsTimelineAction extends ApiBareAuthAction
+class ApiTimelineFriendsAction extends ApiBareAuthAction
 {
 
     var $user     = null;
diff --git a/actions/apimentions.php b/actions/apitimelinementions.php
similarity index 99%
rename from actions/apimentions.php
rename to actions/apitimelinementions.php
index 43e93a9c63..93c6da3073 100644
--- a/actions/apimentions.php
+++ b/actions/apitimelinementions.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
  * @link     http://status.net/
  */
 
-class ApiMentionsAction extends ApiBareAuthAction
+class ApiTimelineMentionsAction extends ApiBareAuthAction
 {
 
     var $user    = null;
diff --git a/actions/apipublictimeline.php b/actions/apitimelinepublic.php
similarity index 98%
rename from actions/apipublictimeline.php
rename to actions/apitimelinepublic.php
index 2be979e6dc..10bde6f37d 100644
--- a/actions/apipublictimeline.php
+++ b/actions/apitimelinepublic.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @link     http://status.net/
  */
 
-class ApiPublicTimelineAction extends TwitterapiAction
+class ApiTimelinePublicAction extends TwitterapiAction
 {
 
     var $notices = null;
diff --git a/actions/apiusertimeline.php b/actions/apitimelineuser.php
similarity index 99%
rename from actions/apiusertimeline.php
rename to actions/apitimelineuser.php
index 44d69415bd..c4d02bc622 100644
--- a/actions/apiusertimeline.php
+++ b/actions/apitimelineuser.php
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
  * @link     http://status.net/
  */
 
-class ApiUserTimelineAction extends ApiBareAuthAction
+class ApiTimelineUserAction extends ApiBareAuthAction
 {
 
     var $user    = null;
diff --git a/actions/apifollowers.php b/actions/apiuserfollowers.php
similarity index 97%
rename from actions/apifollowers.php
rename to actions/apiuserfollowers.php
index b216cced7e..5c0243449b 100644
--- a/actions/apifollowers.php
+++ b/actions/apiuserfollowers.php
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
  * @link     http://status.net/
  */
 
-class ApiFollowersAction extends ApiSubscriptionsAction
+class ApiUserFollowersAction extends ApiSubscriptionsAction
 {
     /**
      * Get the user's subscribers (followers) as an array of profiles
diff --git a/actions/apifriends.php b/actions/apiuserfriends.php
similarity index 97%
rename from actions/apifriends.php
rename to actions/apiuserfriends.php
index 12751a6419..8a42e36b98 100644
--- a/actions/apifriends.php
+++ b/actions/apiuserfriends.php
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
  * @link     http://status.net/
  */
 
-class ApiFriendsAction extends ApiSubscriptionsAction
+class ApiUserFriendsAction extends ApiSubscriptionsAction
 {
     /**
      * Get the user's subscriptions (friends) as an array of profiles
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
deleted file mode 100644
index 87043b1821..0000000000
--- a/actions/twitapistatuses.php
+++ /dev/null
@@ -1,606 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, 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/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once(INSTALLDIR.'/lib/twitterapi.php');
-
-class TwitapistatusesAction extends TwitterapiAction
-{
-
-    function public_timeline($args, $apidata)
-    {
-        // XXX: To really live up to the spec we need to build a list
-        // of notices by users who have custom avatars, so fix this SQL -- Zach
-
-        parent::handle($args);
-
-        $sitename   = common_config('site', 'name');
-        $title      = sprintf(_("%s public timeline"), $sitename);
-        $taguribase = common_config('integration', 'taguri');
-        $id         = "tag:$taguribase:PublicTimeline";
-        $link       = common_root_url();
-        $subtitle   = sprintf(_("%s updates from everyone!"), $sitename);
-
-        $page     = (int)$this->arg('page', 1);
-        $count    = (int)$this->arg('count', 20);
-        $max_id   = (int)$this->arg('max_id', 0);
-        $since_id = (int)$this->arg('since_id', 0);
-        $since    = $this->arg('since');
-
-        $notice = Notice::publicStream(($page-1)*$count, $count, $since_id,
-            $max_id, $since);
-
-        switch($apidata['content-type']) {
-        case 'xml':
-            $this->show_xml_timeline($notice);
-            break;
-        case 'rss':
-            $this->show_rss_timeline($notice, $title, $link, $subtitle);
-            break;
-        case 'atom':
-            $selfuri = common_root_url() . 'api/statuses/public_timeline.atom';
-            $this->show_atom_timeline($notice, $title, $id, $link,
-                $subtitle, null, $selfuri);
-            break;
-        case 'json':
-            $this->show_json_timeline($notice);
-            break;
-        default:
-            $this->clientError(_('API method not found!'), $code = 404);
-            break;
-        }
-
-    }
-
-    function friends_timeline($args, $apidata)
-    {
-        parent::handle($args);
-
-        $this->auth_user = $apidata['user'];
-        $user = $this->get_user($apidata['api_arg'], $apidata);
-
-        if (empty($user)) {
-             $this->clientError(_('No such user!'), 404,
-             $apidata['content-type']);
-            return;
-        }
-
-        $profile    = $user->getProfile();
-        $sitename   = common_config('site', 'name');
-        $title      = sprintf(_("%s and friends"), $user->nickname);
-        $taguribase = common_config('integration', 'taguri');
-        $id         = "tag:$taguribase:FriendsTimeline:" . $user->id;
-        $link       = common_local_url('all',
-            array('nickname' => $user->nickname));
-        $subtitle   = sprintf(_('Updates from %1$s and friends on %2$s!'),
-            $user->nickname, $sitename);
-
-        $page     = (int)$this->arg('page', 1);
-        $count    = (int)$this->arg('count', 20);
-        $max_id   = (int)$this->arg('max_id', 0);
-        $since_id = (int)$this->arg('since_id', 0);
-        $since    = $this->arg('since');
-
-        if (!empty($this->auth_user) && $this->auth_user->id == $user->id) {
-            $notice = $user->noticeInbox(($page-1)*$count,
-                $count, $since_id, $max_id, $since);
-        } else {
-            $notice = $user->noticesWithFriends(($page-1)*$count,
-                $count, $since_id, $max_id, $since);
-        }
-
-        switch($apidata['content-type']) {
-        case 'xml':
-            $this->show_xml_timeline($notice);
-            break;
-        case 'rss':
-            $this->show_rss_timeline($notice, $title, $link, $subtitle);
-            break;
-        case 'atom':
-            if (isset($apidata['api_arg'])) {
-                $selfuri = common_root_url() .
-                    'api/statuses/friends_timeline/' .
-                        $apidata['api_arg'] . '.atom';
-            } else {
-                $selfuri = common_root_url() .
-                    'api/statuses/friends_timeline.atom';
-            }
-            $this->show_atom_timeline($notice, $title, $id, $link,
-                $subtitle, null, $selfuri);
-            break;
-        case 'json':
-            $this->show_json_timeline($notice);
-            break;
-        default:
-            $this->clientError(_('API method not found!'), $code = 404);
-        }
-
-    }
-
-    function home_timeline($args, $apidata)
-    {
-        call_user_func(array($this, 'friends_timeline'), $args, $apidata);
-    }
-
-    function user_timeline($args, $apidata)
-    {
-        parent::handle($args);
-
-        $this->auth_user = $apidata['user'];
-        $user = $this->get_user($apidata['api_arg'], $apidata);
-
-        if (empty($user)) {
-            $this->clientError('Not Found', 404, $apidata['content-type']);
-            return;
-        }
-
-        $profile = $user->getProfile();
-
-        $sitename   = common_config('site', 'name');
-        $title      = sprintf(_("%s timeline"), $user->nickname);
-        $taguribase = common_config('integration', 'taguri');
-        $id         = "tag:$taguribase:UserTimeline:".$user->id;
-        $link       = common_local_url('showstream',
-            array('nickname' => $user->nickname));
-        $subtitle   = sprintf(_('Updates from %1$s on %2$s!'),
-            $user->nickname, $sitename);
-
-        # FriendFeed's SUP protocol
-        # Also added RSS and Atom feeds
-
-        $suplink = common_local_url('sup', null, null, $user->id);
-        header('X-SUP-ID: '.$suplink);
-
-        $page     = (int)$this->arg('page', 1);
-        $count    = (int)$this->arg('count', 20);
-        $max_id   = (int)$this->arg('max_id', 0);
-        $since_id = (int)$this->arg('since_id', 0);
-        $since    = $this->arg('since');
-
-        $notice = $user->getNotices(($page-1)*$count,
-            $count, $since_id, $max_id, $since);
-
-        switch($apidata['content-type']) {
-         case 'xml':
-            $this->show_xml_timeline($notice);
-            break;
-         case 'rss':
-            $this->show_rss_timeline($notice, $title, $link,
-                $subtitle, $suplink);
-            break;
-         case 'atom':
-            if (isset($apidata['api_arg'])) {
-                $selfuri = common_root_url() .
-                    'api/statuses/user_timeline/' .
-                        $apidata['api_arg'] . '.atom';
-            } else {
-                $selfuri = common_root_url() .
-                 'api/statuses/user_timeline.atom';
-            }
-            $this->show_atom_timeline($notice, $title, $id, $link,
-                $subtitle, $suplink, $selfuri);
-            break;
-         case 'json':
-            $this->show_json_timeline($notice);
-            break;
-         default:
-            $this->clientError(_('API method not found!'), $code = 404);
-        }
-
-    }
-
-    function update($args, $apidata)
-    {
-        parent::handle($args);
-
-        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
-            return;
-        }
-
-        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(_('This method requires a POST.'),
-                400, $apidata['content-type']);
-            return;
-        }
-
-        $user = $apidata['user'];  // Always the auth user
-
-        $status = $this->trimmed('status');
-        $source = $this->trimmed('source');
-        $in_reply_to_status_id =
-            intval($this->trimmed('in_reply_to_status_id'));
-        $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
-
-        if (empty($source) || in_array($source, $reserved_sources)) {
-            $source = 'api';
-        }
-
-        if (empty($status)) {
-
-            // XXX: Note: In this case, Twitter simply returns '200 OK'
-            // No error is given, but the status is not posted to the
-            // user's timeline.     Seems bad.     Shouldn't we throw an
-            // errror? -- Zach
-            return;
-
-        } else {
-
-            $status_shortened = common_shorten_links($status);
-
-            if (Notice::contentTooLong($status_shortened)) {
-
-                // XXX: Twitter truncates anything over 140, flags the status
-                // as "truncated." Sending this error may screw up some clients
-                // that assume Twitter will truncate for them.    Should we just
-                // truncate too? -- Zach
-                $this->clientError(sprintf(_('That\'s too long. Max notice size is %d chars.'),
-                                           Notice::maxContent()),
-                                   $code = 406, $apidata['content-type']);
-                return;
-            }
-        }
-
-        // Check for commands
-        $inter = new CommandInterpreter();
-        $cmd = $inter->handle_command($user, $status_shortened);
-
-        if ($cmd) {
-
-            if ($this->supported($cmd)) {
-                $cmd->execute(new Channel());
-            }
-
-            // cmd not supported?  Twitter just returns your latest status.
-            // And, it returns your last status whether the cmd was successful
-            // or not!
-            $n = $user->getCurrentNotice();
-            $apidata['api_arg'] = $n->id;
-        } else {
-
-            $reply_to = null;
-
-            if ($in_reply_to_status_id) {
-
-                // check whether notice actually exists
-                $reply = Notice::staticGet($in_reply_to_status_id);
-
-                if ($reply) {
-                    $reply_to = $in_reply_to_status_id;
-                } else {
-                    $this->clientError(_('Not found'), $code = 404,
-                        $apidata['content-type']);
-                    return;
-                }
-            }
-
-            $notice = Notice::saveNew($user->id,
-                html_entity_decode($status, ENT_NOQUOTES, 'UTF-8'),
-                    $source, 1, $reply_to);
-
-            common_broadcast_notice($notice);
-            $apidata['api_arg'] = $notice->id;
-        }
-
-        $this->show($args, $apidata);
-    }
-
-    function mentions($args, $apidata)
-    {
-        parent::handle($args);
-
-        $user = $this->get_user($apidata['api_arg'], $apidata);
-        $this->auth_user = $apidata['user'];
-
-        if (empty($user)) {
-             $this->clientError(_('No such user!'), 404,
-                 $apidata['content-type']);
-            return;
-        }
-
-        $profile = $user->getProfile();
-
-        $sitename   = common_config('site', 'name');
-        $title      = sprintf(_('%1$s / Updates mentioning %2$s'),
-            $sitename, $user->nickname);
-        $taguribase = common_config('integration', 'taguri');
-        $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());
-
-        $page     = (int)$this->arg('page', 1);
-        $count    = (int)$this->arg('count', 20);
-        $max_id   = (int)$this->arg('max_id', 0);
-        $since_id = (int)$this->arg('since_id', 0);
-        $since    = $this->arg('since');
-
-        $notice = $user->getReplies(($page-1)*$count,
-            $count, $since_id, $max_id, $since);
-
-        switch($apidata['content-type']) {
-        case 'xml':
-            $this->show_xml_timeline($notice);
-            break;
-        case 'rss':
-            $this->show_rss_timeline($notice, $title, $link, $subtitle);
-            break;
-        case 'atom':
-            $selfuri = common_root_url() .
-                ltrim($_SERVER['QUERY_STRING'], 'p=');
-            $this->show_atom_timeline($notice, $title, $id, $link, $subtitle,
-                null, $selfuri);
-            break;
-        case 'json':
-            $this->show_json_timeline($notice);
-            break;
-        default:
-            $this->clientError(_('API method not found!'), $code = 404);
-        }
-
-    }
-
-    function replies($args, $apidata)
-    {
-        call_user_func(array($this, 'mentions'), $args, $apidata);
-    }
-
-    function show($args, $apidata)
-    {
-        parent::handle($args);
-
-        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
-            return;
-        }
-
-        // 'id' is an undocumented parameter in Twitter's API. Several
-        // clients make use of it, so we support it too.
-
-        // show.json?id=12345 takes precedence over /show/12345.json
-
-        $this->auth_user = $apidata['user'];
-        $notice_id       = $this->trimmed('id');
-
-        if (empty($notice_id)) {
-            $notice_id   = $apidata['api_arg'];
-        }
-
-        $notice          = Notice::staticGet((int)$notice_id);
-
-        if ($notice) {
-            if ($apidata['content-type'] == 'xml') {
-                $this->show_single_xml_status($notice);
-            } elseif ($apidata['content-type'] == 'json') {
-                $this->show_single_json_status($notice);
-            }
-        } else {
-            // XXX: Twitter just sets a 404 header and doens't bother
-            // to return an err msg
-            $deleted = Deleted_notice::staticGet($notice_id);
-            if (!empty($deleted)) {
-                $this->clientError(_('Status deleted.'),
-                                   410, $apidata['content-type']);
-            } else {
-                $this->clientError(_('No status with that ID found.'),
-                                   404, $apidata['content-type']);
-            }
-        }
-    }
-
-    function destroy($args, $apidata)
-    {
-        parent::handle($args);
-
-        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
-            return;
-        }
-
-        // Check for RESTfulness
-        if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
-            // XXX: Twitter just prints the err msg, no XML / JSON.
-            $this->clientError(_('This method requires a POST or DELETE.'),
-                400, $apidata['content-type']);
-            return;
-        }
-
-        $user      = $apidata['user']; // Always the auth user
-        $notice_id = $apidata['api_arg'];
-        $notice    = Notice::staticGet($notice_id);
-
-        if (empty($notice)) {
-            $this->clientError(_('No status found with that ID.'),
-                404, $apidata['content-type']);
-            return;
-        }
-
-        if ($user->id == $notice->profile_id) {
-            $replies = new Reply;
-            $replies->get('notice_id', $notice_id);
-            $replies->delete();
-            $notice->delete();
-
-            if ($apidata['content-type'] == 'xml') {
-                $this->show_single_xml_status($notice);
-            } elseif ($apidata['content-type'] == 'json') {
-                $this->show_single_json_status($notice);
-            }
-        } else {
-            $this->clientError(_('You may not delete another user\'s status.'),
-                403, $apidata['content-type']);
-        }
-
-    }
-
-    function friends($args, $apidata)
-    {
-        parent::handle($args);
-        $includeStatuses=! (boolean) $args['lite'];
-        return $this->subscriptions($apidata, 'subscribed', 'subscriber', false, $includeStatuses);
-    }
-
-    function friendsIDs($args, $apidata)
-    {
-        parent::handle($args);
-        return $this->subscriptions($apidata, 'subscribed', 'subscriber', true);
-    }
-
-    function followers($args, $apidata)
-    {
-        parent::handle($args);
-        $includeStatuses=! (boolean) $args['lite'];
-        return $this->subscriptions($apidata, 'subscriber', 'subscribed', false, $includeStatuses);
-    }
-
-    function followersIDs($args, $apidata)
-    {
-        parent::handle($args);
-        return $this->subscriptions($apidata, 'subscriber', 'subscribed', true);
-    }
-
-    function subscriptions($apidata, $other_attr, $user_attr, $onlyIDs=false, $includeStatuses=true)
-    {
-        $this->auth_user = $apidata['user'];
-        $user = $this->get_user($apidata['api_arg'], $apidata);
-
-        if (empty($user)) {
-            $this->clientError('Not Found', 404, $apidata['content-type']);
-            return;
-        }
-
-        $profile = $user->getProfile();
-
-        $sub = new Subscription();
-        $sub->$user_attr = $profile->id;
-
-        $sub->orderBy('created DESC');
-
-        // Normally, page 100 friends at a time
-
-        if (!$onlyIDs) {
-            $page  = $this->arg('page', 1);
-            $count = $this->arg('count', 100);
-            $sub->limit(($page-1)*$count, $count);
-        } else {
-
-            // If we're just looking at IDs, return
-            // ALL of them, unless the user specifies a page,
-            // in which case, return 500 per page.
-
-            $page = $this->arg('page');
-            if (!empty($page)) {
-                if ($page < 1) {
-                    $page = 1;
-                }
-                $count = 500;
-                $sub->limit(($page-1)*$count, $count);
-            }
-        }
-
-        $others = array();
-
-        if ($sub->find()) {
-            while ($sub->fetch()) {
-                $others[] = Profile::staticGet($sub->$other_attr);
-            }
-        } else {
-            // user has no followers
-        }
-
-        $type = $apidata['content-type'];
-
-        $this->init_document($type);
-
-        if ($onlyIDs) {
-            $this->showIDs($others, $type);
-        } else {
-            $this->show_profiles($others, $type, $includeStatuses);
-        }
-
-        $this->end_document($type);
-    }
-
-    function show_profiles($profiles, $type, $includeStatuses)
-    {
-        switch ($type) {
-        case 'xml':
-            $this->elementStart('users', array('type' => 'array'));
-            foreach ($profiles as $profile) {
-                $this->show_profile($profile,$type,null,$includeStatuses);
-            }
-            $this->elementEnd('users');
-            break;
-        case 'json':
-            $arrays = array();
-            foreach ($profiles as $profile) {
-                $arrays[] = $this->twitter_user_array($profile, $includeStatuses);
-            }
-            print json_encode($arrays);
-            break;
-        default:
-            $this->clientError(_('unsupported file type'));
-        }
-    }
-
-    function showIDs($profiles, $type)
-    {
-        switch ($type) {
-        case 'xml':
-            $this->elementStart('ids');
-            foreach ($profiles as $profile) {
-                $this->element('id', null, $profile->id);
-            }
-            $this->elementEnd('ids');
-            break;
-        case 'json':
-            $ids = array();
-            foreach ($profiles as $profile) {
-                $ids[] = (int)$profile->id;
-            }
-            print json_encode($ids);
-            break;
-        default:
-            $this->clientError(_('unsupported file type'));
-        }
-    }
-
-    function featured($args, $apidata)
-    {
-        parent::handle($args);
-        $this->serverError(_('API method under construction.'), $code=501);
-    }
-
-    function supported($cmd)
-    {
-        $cmdlist = array('MessageCommand', 'SubCommand', 'UnsubCommand',
-            'FavCommand', 'OnCommand', 'OffCommand');
-
-        if (in_array(get_class($cmd), $cmdlist)) {
-            return true;
-        }
-
-        return false;
-    }
-
-}
diff --git a/lib/router.php b/lib/router.php
index 5c9513f570..357c702247 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -271,90 +271,90 @@ class Router
         // statuses API
 
         $m->connect('api/statuses/public_timeline.:format',
-                    array('action' => 'ApiPublicTimeline',
+                    array('action' => 'ApiTimelinePublic',
                     'format' => '(xml|json|rss|atom)'));
 
         $m->connect('api/statuses/friends_timeline.:format',
-                    array('action' => 'ApiFriendsTimeline',
+                    array('action' => 'ApiTimelineFriends',
                           'format' => '(xml|json|rss|atom)'));
 
         $m->connect('api/statuses/friends_timeline/:id.:format',
-                    array('action' => 'ApiFriendsTimeline',
+                    array('action' => 'ApiTimelineFriends',
                           'id' => '[a-zA-Z0-9]+',
                           'format' => '(xml|json|rss|atom)'));
         $m->connect('api/statuses/home_timeline.:format',
-                    array('action' => 'ApiFriendsTimeline',
+                    array('action' => 'ApiTimelineFriends',
                           'format' => '(xml|json|rss|atom)'));
 
         $m->connect('api/statuses/home_timeline/:id.:format',
-                    array('action' => 'ApiFriendsTimeline',
+                    array('action' => 'ApiTimelineFriends',
                           'id' => '[a-zA-Z0-9]+',
                           'format' => '(xml|json|rss|atom)'));
 
         $m->connect('api/statuses/user_timeline.:format',
-                    array('action' => 'ApiUserTimeline',
+                    array('action' => 'ApiTimelineUser',
                     'format' => '(xml|json|rss|atom)'));
 
         $m->connect('api/statuses/user_timeline/:id.:format',
-                    array('action' => 'ApiUserTimeline',
+                    array('action' => 'ApiTimelineUser',
                     'id' => '[a-zA-Z0-9]+',
                     'format' => '(xml|json|rss|atom)'));
 
         $m->connect('api/statuses/mentions.:format',
-                    array('action' => 'ApiMentions',
+                    array('action' => 'ApiTimelineMentions',
                     'format' => '(xml|json|rss|atom)'));
 
         $m->connect('api/statuses/mentions/:id.:format',
-                    array('action' => 'ApiMentions',
+                    array('action' => 'ApiTimelineMentions',
                     'id' => '[a-zA-Z0-9]+',
                     'format' => '(xml|json|rss|atom)'));
 
         $m->connect('api/statuses/replies.:format',
-                    array('action' => 'ApiMentions',
+                    array('action' => 'ApiTimelineMentions',
                     'format' => '(xml|json|rss|atom)'));
 
         $m->connect('api/statuses/replies/:id.:format',
-                    array('action' => 'ApiMentions',
+                    array('action' => 'ApiTimelineMentions',
                     'id' => '[a-zA-Z0-9]+',
                     'format' => '(xml|json|rss|atom)'));
 
         $m->connect('api/statuses/friends.:format',
-                     array('action' => 'ApiFriends',
+                     array('action' => 'ApiUserFriends',
                            'format' => '(xml|json)'));
 
         $m->connect('api/statuses/friends/:id.:format',
-                    array('action' => 'ApiFriends',
+                    array('action' => 'ApiUserFriends',
                     'id' => '[a-zA-Z0-9]+',
                     'format' => '(xml|json)'));
 
         $m->connect('api/statuses/followers.:format',
-                     array('action' => 'ApiFollowers',
+                     array('action' => 'ApiUserFollowers',
                            'format' => '(xml|json)'));
 
         $m->connect('api/statuses/followers/:id.:format',
-                    array('action' => 'ApiFollowers',
+                    array('action' => 'ApiUserFollowers',
                     'id' => '[a-zA-Z0-9]+',
                     'format' => '(xml|json)'));
 
         $m->connect('api/statuses/show.:format',
-                    array('action' => 'ApiShow',
+                    array('action' => 'ApiStatusesShow',
                           'format' => '(xml|json)'));
 
         $m->connect('api/statuses/show/:id.:format',
-                    array('action' => 'ApiShow',
+                    array('action' => 'ApiStatusesShow',
                           'id' => '[0-9]+',
                           'format' => '(xml|json)'));
 
         $m->connect('api/statuses/update.:format',
-                    array('action' => 'ApiUpdate',
+                    array('action' => 'ApiStatusesUpdate',
                           'format' => '(xml|json)'));
 
         $m->connect('api/statuses/destroy.:format',
-                  array('action' => 'ApiDestroy',
+                  array('action' => 'ApiStatusesDestroy',
                         'format' => '(xml|json)'));
 
         $m->connect('api/statuses/destroy/:id.:format',
-                  array('action' => 'ApiDestroy',
+                  array('action' => 'ApiStatusesDestroy',
                         'id' => '[0-9]+',
                         'format' => '(xml|json)'));
 

From eaef9b689ab41eed23eb74841ed5038066c485a3 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 2 Oct 2009 10:31:13 -0700
Subject: [PATCH 179/247] New action for /users/show

---
 actions/apiusershow.php  | 126 +++++++++++++++++++++++++++++++++++++++
 actions/twitapiusers.php |  80 -------------------------
 lib/router.php           |   8 +--
 3 files changed, 130 insertions(+), 84 deletions(-)
 create mode 100644 actions/apiusershow.php
 delete mode 100644 actions/twitapiusers.php

diff --git a/actions/apiusershow.php b/actions/apiusershow.php
new file mode 100644
index 0000000000..2e2ceab41b
--- /dev/null
+++ b/actions/apiusershow.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show a user's profile information
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/twitterapi.php';
+
+/**
+ * Ouputs information for a user, specified by ID or screen name.
+ * The user's most recent status will be returned inline.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiUserShowAction extends TwitterApiAction
+{
+
+    var $format = null;
+    var $user   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->format = $this->arg('format');
+
+        $email = $this->arg('email');
+
+        // XXX: email field deprecated in Twitter's API
+
+        if (!empty($email)) {
+            $this->user = User::staticGet('email', $email);
+        } else {
+            $this->user = $this->getTargetUser($this->arg('id'));
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Check the format and show the user info
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (empty($this->user)) {
+            $this->clientError(_('Not found.'), 404, $this->format);
+            return;
+        }
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(_('API method not found!'), $code = 404);
+            return;
+        }
+
+        $profile = $this->user->getProfile();
+
+        if (empty($profile)) {
+            $this->clientError(_('User has no profile.'));
+            return;
+        }
+
+        $twitter_user = $this->twitter_user_array($this->user->getProfile(), true);
+
+        if ($this->format == 'xml') {
+            $this->init_document('xml');
+            $this->show_twitter_xml_user($twitter_user);
+            $this->end_document('xml');
+        } elseif ($this->format == 'json') {
+            $this->init_document('json');
+            $this->show_json_objects($twitter_user);
+            $this->end_document('json');
+        }
+
+    }
+
+}
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
deleted file mode 100644
index 703fa6754f..0000000000
--- a/actions/twitapiusers.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, 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/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once(INSTALLDIR.'/lib/twitterapi.php');
-
-class TwitapiusersAction extends TwitterapiAction
-{
-
-    function show($args, $apidata)
-    {
-        parent::handle($args);
-
-        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
-            return;
-        }
-
-        $user = null;
-        $email = $this->arg('email');
-
-        // XXX: email field deprecated in Twitter's API
-
-        if ($email) {
-            $user = User::staticGet('email', $email);
-        } else {
-            $user = $this->get_user($apidata['api_arg'], $apidata);
-        }
-
-        if (empty($user)) {
-            $this->clientError(_('Not found.'), 404, $apidata['content-type']);
-            return;
-        }
-
-        $profile = $user->getProfile();
-
-        if (!$profile) {
-            common_server_error(_('User has no profile.'));
-            return;
-        }
-
-        $twitter_user = $this->twitter_user_array($user->getProfile(), true);
-
-        if ($apidata['content-type'] == 'xml') {
-            $this->init_document('xml');
-            $this->show_twitter_xml_user($twitter_user);
-            $this->end_document('xml');
-        } elseif ($apidata['content-type'] == 'json') {
-            $this->init_document('json');
-            $this->show_json_objects($twitter_user);
-            $this->end_document('json');
-        } else {
-
-            // This is in case 'show' was called via /account/verify_credentials
-            // without a format (xml or json).
-            header('Content-Type: text/html; charset=utf-8');
-            print 'Authorized';
-        }
-
-    }
-}
diff --git a/lib/router.php b/lib/router.php
index 357c702247..57f9864bc5 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -361,10 +361,10 @@ class Router
 
         // users
 
-        $m->connect('api/users/:method/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'users'),
-                    array('method' => 'show(\.(xml|json))?'));
+        $m->connect('api/users/show/:id.:format',
+                    array('action' => 'ApiUserShow',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json)'));
 
         $m->connect('api/users/:method',
                     array('action' => 'api',

From 87858a11f4435e20b0bd2f43da2961976a9c9a2d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 2 Oct 2009 15:02:33 -0400
Subject: [PATCH 180/247] make lib/schema.php phpcs-clean

---
 lib/schema.php | 307 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 271 insertions(+), 36 deletions(-)

diff --git a/lib/schema.php b/lib/schema.php
index 8c8f5e9ff5..1e0c1f3e98 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -50,15 +50,29 @@ class Schema
     static $_single = null;
     protected $conn = null;
 
+    /**
+     * Constructor. Only run once for singleton object.
+     */
+
     protected function __construct()
     {
         // XXX: there should be an easier way to do this.
         $user = new User();
+
         $this->conn = $user->getDatabaseConnection();
+
         $user->free();
+
         unset($user);
     }
 
+    /**
+     * Main public entry point. Use this to get
+     * the singleton object.
+     *
+     * @return Schema the (single) Schema object
+     */
+
     static function get()
     {
         if (empty(self::$_single)) {
@@ -67,6 +81,17 @@ class Schema
         return self::$_single;
     }
 
+    /**
+     * Returns a TableDef object for the table
+     * in the schema with the given name.
+     *
+     * Throws an exception if the table is not found.
+     *
+     * @param string $name Name of the table to get
+     *
+     * @return TableDef tabledef for that table.
+     */
+
     public function getTableDef($name)
     {
         $res =& $this->conn->query('DESCRIBE ' . $name);
@@ -108,6 +133,18 @@ class Schema
         return $td;
     }
 
+    /**
+     * Gets a ColumnDef object for a single column.
+     *
+     * Throws an exception if the table is not found.
+     *
+     * @param string $table  name of the table
+     * @param string $column name of the column
+     *
+     * @return ColumnDef definition of the column or null
+     *                   if not found.
+     */
+
     public function getColumnDef($table, $column)
     {
         $td = $this->getTableDef($table);
@@ -121,12 +158,17 @@ class Schema
         return null;
     }
 
-    public function getIndexDef($table, $index)
-    {
-        return null;
-    }
+    /**
+     * Creates a table with the given names and columns.
+     *
+     * @param string $name    Name of the table
+     * @param array  $columns Array of ColumnDef objects
+     *                        for new table.
+     *
+     * @return boolean success flag
+     */
 
-    public function createTable($name, $columns, $indices=null)
+    public function createTable($name, $columns)
     {
         $uniques = array();
         $primary = array();
@@ -145,13 +187,13 @@ class Schema
             $sql .= $this->_columnSql($cd);
 
             switch ($cd->key) {
-             case 'UNI':
+            case 'UNI':
                 $uniques[] = $cd->name;
                 break;
-             case 'PRI':
+            case 'PRI':
                 $primary[] = $cd->name;
                 break;
-             case 'MUL':
+            case 'MUL':
                 $indices[] = $cd->name;
                 break;
             }
@@ -171,8 +213,6 @@ class Schema
 
         $sql .= "); ";
 
-        common_debug($sql);
-
         $res =& $this->conn->query($sql);
 
         if (PEAR::isError($res)) {
@@ -182,6 +222,16 @@ class Schema
         return true;
     }
 
+    /**
+     * Drops a table from the schema
+     *
+     * Throws an exception if the table is not found.
+     *
+     * @param string $name Name of the table to drop
+     *
+     * @return boolean success flag
+     */
+
     public function dropTable($name)
     {
         $res =& $this->conn->query("DROP TABLE $name");
@@ -193,7 +243,23 @@ class Schema
         return true;
     }
 
-    public function createIndex($table, $columnNames, $name = null)
+    /**
+     * Adds an index to a table.
+     *
+     * If no name is provided, a name will be made up based
+     * on the table name and column names.
+     *
+     * Throws an exception on database error, esp. if the table
+     * does not exist.
+     *
+     * @param string $table       Name of the table
+     * @param array  $columnNames Name of columns to index
+     * @param string $name        (Optional) name of the index
+     *
+     * @return boolean success flag
+     */
+
+    public function createIndex($table, $columnNames, $name=null)
     {
         if (!is_array($columnNames)) {
             $columnNames = array($columnNames);
@@ -203,7 +269,9 @@ class Schema
             $name = "$table_".implode("_", $columnNames)."_idx";
         }
 
-        $res =& $this->conn->query("ALTER TABLE $table ADD INDEX $name (".implode(",", $columnNames).")");
+        $res =& $this->conn->query("ALTER TABLE $table ".
+                                   "ADD INDEX $name (".
+                                   implode(",", $columnNames).")");
 
         if (PEAR::isError($res)) {
             throw new Exception($res->getMessage());
@@ -212,6 +280,15 @@ class Schema
         return true;
     }
 
+    /**
+     * Drops a named index from a table.
+     *
+     * @param string $table name of the table the index is on.
+     * @param string $name  name of the index
+     *
+     * @return boolean success flag
+     */
+
     public function dropIndex($table, $name)
     {
         $res =& $this->conn->query("ALTER TABLE $table DROP INDEX $name");
@@ -223,6 +300,16 @@ class Schema
         return true;
     }
 
+    /**
+     * Adds a column to a table
+     *
+     * @param string    $table     name of the table
+     * @param ColumnDef $columndef Definition of the new
+     *                             column.
+     *
+     * @return boolean success flag
+     */
+
     public function addColumn($table, $columndef)
     {
         $sql = "ALTER TABLE $table ADD COLUMN " . $this->_columnSql($columndef);
@@ -236,9 +323,21 @@ class Schema
         return true;
     }
 
+    /**
+     * Modifies a column in the schema.
+     *
+     * The name must match an existing column and table.
+     *
+     * @param string    $table     name of the table
+     * @param ColumnDef $columndef new definition of the column.
+     *
+     * @return boolean success flag
+     */
+
     public function modifyColumn($table, $columndef)
     {
-        $sql = "ALTER TABLE $table MODIFY COLUMN " . $this->_columnSql($columndef);
+        $sql = "ALTER TABLE $table MODIFY COLUMN " .
+          $this->_columnSql($columndef);
 
         $res =& $this->conn->query($sql);
 
@@ -249,6 +348,17 @@ class Schema
         return true;
     }
 
+    /**
+     * Drops a column from a table
+     *
+     * The name must match an existing column.
+     *
+     * @param string $table      name of the table
+     * @param string $columnName name of the column to drop
+     *
+     * @return boolean success flag
+     */
+
     public function dropColumn($table, $columnName)
     {
         $sql = "ALTER TABLE $table DROP COLUMN $columnName";
@@ -262,7 +372,22 @@ class Schema
         return true;
     }
 
-    public function ensureTable($tableName, $columns, $indices=null)
+    /**
+     * Ensures that a table exists with the given
+     * name and the given column definitions.
+     *
+     * If the table does not yet exist, it will
+     * create the table. If it does exist, it will
+     * alter the table to match the column definitions.
+     *
+     * @param string $tableName name of the table
+     * @param array  $columns   array of ColumnDef
+     *                          objects for the table
+     *
+     * @return boolean success flag
+     */
+
+    public function ensureTable($tableName, $columns)
     {
         // XXX: DB engine portability -> toilet
 
@@ -270,7 +395,7 @@ class Schema
             $td = $this->getTableDef($tableName);
         } catch (Exception $e) {
             if (preg_match('/no such table/', $e->getMessage())) {
-                return $this->createTable($tableName, $columns, $indices);
+                return $this->createTable($tableName, $columns);
             } else {
                 throw $e;
             }
@@ -281,10 +406,8 @@ class Schema
 
         $toadd  = array_diff($new, $cur);
         $todrop = array_diff($cur, $new);
-
-        $same  = array_intersect($new, $cur);
-
-        $tomod = array();
+        $same   = array_intersect($new, $cur);
+        $tomod  = array();
 
         foreach ($same as $m) {
             $curCol = $this->_byName($td->columns, $m);
@@ -307,6 +430,7 @@ class Schema
 
         foreach ($toadd as $columnName) {
             $cd = $this->_byName($columns, $columnName);
+
             $phrase[] = 'ADD COLUMN ' . $this->_columnSql($cd);
         }
 
@@ -316,6 +440,7 @@ class Schema
 
         foreach ($tomod as $columnName) {
             $cd = $this->_byName($columns, $columnName);
+
             $phrase[] = 'MODIFY COLUMN ' . $this->_columnSql($cd);
         }
 
@@ -330,7 +455,16 @@ class Schema
         return true;
     }
 
-    function _names($cds)
+    /**
+     * Returns the array of names from an array of
+     * ColumnDef objects.
+     *
+     * @param array $cds array of ColumnDef objects
+     *
+     * @return array strings for name values
+     */
+
+    private function _names($cds)
     {
         $names = array();
 
@@ -341,7 +475,17 @@ class Schema
         return $names;
     }
 
-    function _byName($cds, $name)
+    /**
+     * Get a ColumnDef from an array matching
+     * name.
+     *
+     * @param array  $cds  Array of ColumnDef objects
+     * @param string $name Name of the column
+     *
+     * @return ColumnDef matching item or null if no match.
+     */
+
+    private function _byName($cds, $name)
     {
         foreach ($cds as $cd) {
             if ($cd->name == $name) {
@@ -352,7 +496,19 @@ class Schema
         return null;
     }
 
-    function _columnSql($cd)
+    /**
+     * Return the proper SQL for creating or
+     * altering a column.
+     *
+     * Appropriate for use in CREATE TABLE or
+     * ALTER TABLE statements.
+     *
+     * @param ColumnDef $cd column to create
+     *
+     * @return string correct SQL for that column
+     */
+
+    private function _columnSql($cd)
     {
         $sql = "{$cd->name} ";
 
@@ -372,25 +528,71 @@ class Schema
     }
 }
 
+/**
+ * A class encapsulating the structure of a table.
+ *
+ * @category Database
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
 class TableDef
 {
+    /** name of the table */
     public $name;
+    /** array of ColumnDef objects for the columns. */
     public $columns;
 }
 
+/**
+ * A class encapsulating the structure of a column in a table.
+ *
+ * @category Database
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
 class ColumnDef
 {
+    /** name of the column. */
     public $name;
+    /** type of column, e.g. 'int', 'varchar' */
     public $type;
+    /** size of the column. */
     public $size;
+    /** boolean flag; can it be null? */
     public $nullable;
+    /**
+     * type of key: null = no key; 'PRI' => primary;
+     * 'UNI' => unique key; 'MUL' => multiple values.
+     */
     public $key;
+    /** default value if any. */
     public $default;
+    /** 'extra' stuff. Returned by MySQL, largely
+     * unused. */
     public $extra;
 
+    /**
+     * Constructor.
+     *
+     * @param string  $name     name of the column
+     * @param string  $type     type of the column
+     * @param int     $size     size of the column
+     * @param boolean $nullable can this be null?
+     * @param string  $key      type of key
+     * @param value   $default  default value
+     * @param value   $extra    unused
+     */
+
     function __construct($name=null, $type=null, $size=null,
                          $nullable=true, $key=null, $default=null,
-                         $extra=null) {
+                         $extra=null)
+    {
         $this->name     = strtolower($name);
         $this->type     = strtolower($type);
         $this->size     = $size+0;
@@ -400,6 +602,15 @@ class ColumnDef
         $this->extra    = $extra;
     }
 
+    /**
+     * Compares this columndef with another to see
+     * if they're functionally equivalent.
+     *
+     * @param ColumnDef $other column to compare
+     *
+     * @return boolean true if equivalent, otherwise false.
+     */
+
     function equals($other)
     {
         return ($this->name == $other->name &&
@@ -409,37 +620,61 @@ class ColumnDef
                 $this->key == $other->key);
     }
 
-    function _typeMatch($other)
+    /**
+     * Does the type of this column match the
+     * type of the other column?
+     *
+     * Checks the type and size of a column. Tries
+     * to ignore differences between synonymous
+     * data types, like 'integer' and 'int'.
+     *
+     * @param ColumnDef $other other column to check
+     *
+     * @return boolean true if they're about equivalent
+     */
+
+    private function _typeMatch($other)
     {
         switch ($this->type) {
-         case 'integer':
-         case 'int':
+        case 'integer':
+        case 'int':
             return ($other->type == 'integer' ||
                     $other->type == 'int');
             break;
-         default:
+        default:
             return ($this->type == $other->type &&
                     $this->size == $other->size);
         }
     }
 
-    function _defaultMatch($other)
+    /**
+     * Does the default behaviour of this column match
+     * the other?
+     *
+     * @param ColumnDef $other other column to check
+     *
+     * @return boolean true if defaults are effectively the same.
+     */
+
+    private function _defaultMatch($other)
     {
         return ((is_null($this->default) && is_null($other->default)) ||
                 ($this->default == $other->default));
     }
 
-    function _nullMatch($other)
+    /**
+     * Does the null behaviour of this column match
+     * the other?
+     *
+     * @param ColumnDef $other other column to check
+     *
+     * @return boolean true if these columns 'null' the same.
+     */
+
+    private function _nullMatch($other)
     {
         return ((!is_null($this->default) && !is_null($other->default) &&
                  $this->default == $other->default) ||
                 ($this->nullable == $other->nullable));
     }
 }
-
-class IndexDef
-{
-    public $name;
-    public $table;
-    public $columns;
-}

From 94e3f6bb092486df99034064c0e7d553bcf7d180 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 2 Oct 2009 15:29:57 -0400
Subject: [PATCH 181/247] also delete blocks

---
 classes/User.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/User.php b/classes/User.php
index ef84342922..007662131c 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -714,6 +714,7 @@ class User extends Memcached_DataObject
         }
 
         $this->_deleteTags();
+        $this->_deleteBlocks();
 
         parent::delete();
     }

From be513db013b6079d3ff32fdb0bb332cdbace1798 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 2 Oct 2009 15:42:34 -0400
Subject: [PATCH 182/247] copy-and-paste typo in profile deletion

---
 classes/Profile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Profile.php b/classes/Profile.php
index 463802b4ee..8385ebf889 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -523,7 +523,7 @@ class Profile extends Memcached_DataObject
     {
         $tag = new Profile_tag();
         $tag->tagged = $this->id;
-        $msg->delete();
+        $tag->delete();
     }
 
     function _deleteBlocks()

From 54b22c0c0bb1e7f5fbbcf9035219b5ed07e1b80c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 2 Oct 2009 15:42:58 -0400
Subject: [PATCH 183/247] script to permanently delete a user

---
 scripts/deleteuser.php | 68 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 scripts/deleteuser.php

diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php
new file mode 100644
index 0000000000..67aea7921c
--- /dev/null
+++ b/scripts/deleteuser.php
@@ -0,0 +1,68 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, 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/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i::n::y';
+$longoptions = array('id::nickname::yes');
+
+$helptext = <<<END_OF_DELETEUSER_HELP
+deleteuser.php [options]
+deletes a user from the database
+
+  -i --id       ID of the user
+  -n --nickname nickname of the user
+  -y --yes      do not wait for confirmation
+
+END_OF_DELETEUSER_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (have_option('i', 'id')) {
+    $id = get_option_value('i', 'id');
+    $user = User::staticGet('id', $id);
+    if (empty($user)) {
+        print "Can't find user with ID $id\n";
+        exit(1);
+    }
+} else if (have_option('n', 'nickname')) {
+    $nickname = get_option_value('n', 'nickname');
+    $user = User::staticGet('nickname', $nickname);
+    if (empty($user)) {
+        print "Can't find user with nickname '$nickname'\n";
+        exit(1);
+    }
+} else {
+    print "You must provide either an ID or a nickname.\n";
+    exit(1);
+}
+
+if (!have_option('y', 'yes')) {
+    print "About to PERMANENTLY delete user '{$user->nickname}' ({$user->id}). Are you sure? [y/N] ";
+    $response = fgets(STDIN);
+    if (strtolower($response) != 'y') {
+        print "Aborting.\n";
+        exit(0);
+    }
+}
+
+print "Deleting...";
+$user->delete();
+print "DONE.\n";

From 2d85d619074b69ff0d31249c45715af686b13986 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 2 Oct 2009 15:46:00 -0400
Subject: [PATCH 184/247] better handling of y response in deleteuser.php

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

diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php
index 67aea7921c..52389123c5 100644
--- a/scripts/deleteuser.php
+++ b/scripts/deleteuser.php
@@ -57,7 +57,7 @@ if (have_option('i', 'id')) {
 if (!have_option('y', 'yes')) {
     print "About to PERMANENTLY delete user '{$user->nickname}' ({$user->id}). Are you sure? [y/N] ";
     $response = fgets(STDIN);
-    if (strtolower($response) != 'y') {
+    if (strtolower(trim($response)) != 'y') {
         print "Aborting.\n";
         exit(0);
     }

From daa8b47306626b2b26b2d48a54449cd7394fc22e Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 2 Oct 2009 17:23:48 -0700
Subject: [PATCH 185/247] New actions for direct messaging through the API

---
 actions/apidirectmessage.php       | 389 +++++++++++++++++++++++++++++
 actions/apidirectmessagenew.php    | 192 ++++++++++++++
 actions/twitapidirect_messages.php | 305 ----------------------
 lib/router.php                     |  34 +--
 lib/twitterapi.php                 | 194 ++++++++------
 5 files changed, 707 insertions(+), 407 deletions(-)
 create mode 100644 actions/apidirectmessage.php
 create mode 100644 actions/apidirectmessagenew.php
 delete mode 100644 actions/twitapidirect_messages.php

diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
new file mode 100644
index 0000000000..87ae44d7a5
--- /dev/null
+++ b/actions/apidirectmessage.php
@@ -0,0 +1,389 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show a the direct messages from or to a user
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apiauth.php';
+
+/**
+ * Show a list of direct messages from or to the authenticating user
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiDirectMessageAction extends ApiAuthAction
+{
+    var $format       = null;
+    var $messages     = null;
+    var $page         = null;
+    var $count        = null;
+    var $max_id       = null;
+    var $since_id     = null;
+    var $since        = null;
+    var $title        = null;
+    var $subtitle     = null;
+    var $link         = null;
+    var $selfuri_base = null;
+    var $id           = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->user = $this->auth_user;
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user!'), 404, $this->format);
+            return;
+        }
+
+        $this->page     = (int)$this->arg('page', 1);
+        $this->count    = (int)$this->arg('count', 20);
+        $this->max_id   = (int)$this->arg('max_id', 0);
+        $this->since_id = (int)$this->arg('since_id', 0);
+        $this->since    = $this->arg('since');
+
+        $server   = common_root_url();
+        $taguribase = common_config('integration', 'taguri');
+
+        if ($this->arg('sent')) {
+
+            // Action was called by /api/direct_messages/sent.format
+
+            $this->title = sprintf(
+                _("Direct messages from %s"),
+                $this->user->nickname
+            );
+            $this->subtitle = sprintf(
+                _("All the direct messages sent from %s"),
+                $this->user->nickname
+            );
+            $this->link = $server . $this->user->nickname . '/outbox';
+            $this->selfuri_base = common_root_url() . 'api/direct_messages/sent';
+            $this->id = "tag:$taguribase:SentDirectMessages:" . $this->user->id;
+        } else {
+            $this->title = sprintf(
+                _("Direct messages to %s"),
+                $this->user->nickname
+            );
+            $this->subtitle = sprintf(
+                _("All the direct messages sent to %s"),
+                $this->user->nickname
+            );
+            $this->link = $server . $this->user->nickname . '/inbox';
+            $this->selfuri_base = common_root_url() . 'api/direct_messages';
+            $this->id = "tag:$taguribase:DirectMessages:" . $this->user->id;
+        }
+
+        $this->format = $this->arg('format');
+
+        $this->messages = $this->getMessages();
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Show the messages
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showMessages();
+    }
+
+    /**
+     * Show the messages
+     *
+     * @return void
+     */
+
+    function showMessages()
+    {
+        switch($this->format) {
+        case 'xml':
+            $this->showXmlDirectMessages();
+            break;
+        case 'rss':
+            $this->showRssDirectMessages();
+            break;
+        case 'atom':
+            $this->showAtomDirectMessages();
+            break;
+        case 'json':
+            $this->showJsonDirectMessages();
+            break;
+        default:
+            $this->clientError(_('API method not found!'), $code = 404);
+            break;
+        }
+    }
+
+    /**
+     * Get notices
+     *
+     * @return array notices
+     */
+
+    function getMessages()
+    {
+        $message  = new Message();
+
+        if ($this->arg('sent')) {
+            $message->from_profile = $this->user->id;
+        } else {
+            $message->to_profile = $this->user->id;
+        }
+
+        if (!empty($this->max_id)) {
+            $message->whereAdd('id <= ' . $this->max_id);
+        }
+
+        if (!empty($this->since_id)) {
+            $message->whereAdd('id > ' . $this->since_id);
+        }
+
+        if (!empty($since)) {
+            $d = date('Y-m-d H:i:s', $this->since);
+            $message->whereAdd("created > '$d'");
+        }
+
+        $message->orderBy('created DESC, id DESC');
+        $message->limit((($this->page - 1) * $this->count), $this->count);
+        $message->find();
+
+        $messages = array();
+
+        while ($message->fetch()) {
+            $messages[] = clone($message);
+        }
+
+        return $messages;
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this notice last modified?
+     *
+     * @return string datestamp of the latest notice in the stream
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->messages)) {
+            return strtotime($this->messages[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * Shows a list of direct messages as Twitter-style XML array
+     *
+     * @return void
+     */
+
+    function showXmlDirectMessages()
+    {
+        $this->init_document('xml');
+        $this->elementStart('direct-messages', array('type' => 'array'));
+
+        foreach ($this->messages as $m) {
+            $dm_array = $this->directMessageArray($m);
+            $this->showXmlDirectMessage($dm_array);
+        }
+
+        $this->elementEnd('direct-messages');
+        $this->end_document('xml');
+    }
+
+    /**
+     * Shows a list of direct messages as a JSON encoded array
+     *
+     * @return void
+     */
+
+    function showJsonDirectMessages()
+    {
+        $this->init_document('json');
+
+        $dmsgs = array();
+
+        foreach ($this->messages as $m) {
+            $dm_array = $this->directMessageArray($m);
+            array_push($dmsgs, $dm_array);
+        }
+
+        $this->show_json_objects($dmsgs);
+        $this->end_document('json');
+    }
+
+    /**
+     * Shows a list of direct messages as RSS items
+     *
+     * @return void
+     */
+
+    function showRssDirectMessages()
+    {
+        $this->init_document('rss');
+
+        $this->element('title', null, $this->title);
+
+        $this->element('link', null, $this->link);
+        $this->element('description', null, $this->subtitle);
+        $this->element('language', null, 'en-us');
+
+        $this->element(
+            'atom:link',
+            array(
+                'type' => 'application/rss+xml',
+                'href' => $this->selfuri_base . '.rss',
+                'rel' => self
+                ),
+            null
+        );
+        $this->element('ttl', null, '40');
+
+        foreach ($this->messages as $m) {
+            $entry = $this->rssDirectMessageArray($m);
+            $this->show_twitter_rss_item($entry);
+        }
+
+        $this->end_twitter_rss();
+    }
+
+    /**
+     * Shows a list of direct messages as Atom entries
+     *
+     * @return void
+     */
+
+    function showAtomDirectMessages()
+    {
+        $this->init_document('atom');
+
+        $this->element('title', null, $this->title);
+        $this->element('id', null, $this->id);
+
+        $selfuri = common_root_url() . 'api/direct_messages.atom';
+
+        $this->element(
+            'link', array(
+            'href' => $this->link,
+            'rel' => 'alternate',
+            'type' => 'text/html'),
+            null
+        );
+        $this->element(
+            'link', array(
+            'href' => $this->selfuri_base . '.atom', 'rel' => 'self',
+            'type' => 'application/atom+xml'),
+            null
+        );
+        $this->element('updated', null, common_date_iso8601('now'));
+        $this->element('subtitle', null, $this->subtitle);
+
+        foreach ($this->messages as $m) {
+            $entry = $this->rssDirectMessageArray($m);
+            $this->showTwitterAtomEntry($entry);
+        }
+
+        $this->end_document('atom');
+    }
+
+    /**
+     * An entity tag for this notice
+     *
+     * Returns an Etag based on the action name, language, and
+     * timestamps of the notice
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->messages)) {
+
+            $last = count($this->messages) - 1;
+
+            return '"' . implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      strtotime($this->messages[0]->created),
+                      strtotime($this->messages[$last]->created)
+                )
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+}
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
new file mode 100644
index 0000000000..d836409ae0
--- /dev/null
+++ b/actions/apidirectmessagenew.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Send a direct message via the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apiauth.php';
+
+/**
+ * Creates a new direct message from the authenticating user to
+ * the user specified by id.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiDirectMessageNewAction extends ApiAuthAction
+{
+    var $format  = null;
+    var $source  = null;
+    var $user    = null;
+    var $other   = null;
+    var $content = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->user = $this->auth_user;
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user!'), 404, $this->format);
+            return;
+        }
+
+        $this->source = $this->trimmed('source'); // Not supported by Twitter.
+
+        $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
+        if (empty($thtis->source) || in_array($this->source, $reserved_sources)) {
+            $source = 'api';
+        }
+
+        $this->content = $this->trimmed('text');
+
+        $this->user  = $this->auth_user;
+
+        $user_param  = $this->trimmed('user');
+        $user_id     = $this->arg('user_id');
+        $screen_name = $this->trimmed('screen_name');
+
+        if (isset($user_param) || isset($user_id) || isset($screen_name)) {
+            $this->other = $this->getTargetUser($user_param);
+        }
+
+        $this->format = $this->arg('format');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Save the new message
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400,
+                $this->format
+            );
+            return;
+        }
+
+        if (empty($this->content)) {
+            $this->clientError(
+                _('No message text!'),
+                406,
+                $this->format
+            );
+        } else {
+            $content_shortened = common_shorten_links($this->content);
+            if (Message::contentTooLong($content_shortened)) {
+                $this->clientError(
+                    sprintf(
+                        _('That\'s too long. Max message size is %d chars.'),
+                        Message::maxContent()
+                    ),
+                    406,
+                    $this->format
+                );
+                return;
+            }
+        }
+
+        if (empty($this->other)) {
+            $this->clientError(_('Recipient user not found.'), 403, $this->format);
+            return;
+        } else if (!$this->user->mutuallySubscribed($this->other)) {
+            $this->clientError(
+                _('Can\'t send direct messages to users who aren\'t your friend.'),
+                403,
+                $this->format
+            );
+            return;
+        } else if ($this->user->id == $this->other->id) {
+
+            // Note: sending msgs to yourself is allowed by Twitter
+
+            $errmsg = 'Don\'t send a message to yourself; ' . 
+                   'just say it to yourself quietly instead.'
+
+            $this->clientError(_($errmsg), 403, $this->format);
+            return;
+        }
+
+        $message = Message::saveNew(
+            $this->user->id,
+            $this->other->id,
+            html_entity_decode($this->content, ENT_NOQUOTES, 'UTF-8'),
+            $this->source
+        );
+
+        if (is_string($message)) {
+            $this->serverError($message);
+            return;
+        }
+
+        mail_notify_message($message, $this->user, $this->other);
+
+        if ($this->format == 'xml') {
+            $this->showSingleXmlDirectMessage($message);
+        } elseif ($this->format == 'json') {
+            $this->showSingleJsondirectMessage($message);
+        }
+    }
+
+}
+
diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php
deleted file mode 100644
index 08b8f4e9c1..0000000000
--- a/actions/twitapidirect_messages.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, 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/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once(INSTALLDIR.'/lib/twitterapi.php');
-
-class Twitapidirect_messagesAction extends TwitterapiAction
-{
-
-    function direct_messages($args, $apidata)
-    {
-        parent::handle($args);
-        return $this->show_messages($args, $apidata, 'received');
-    }
-
-    function sent($args, $apidata)
-    {
-        parent::handle($args);
-        return $this->show_messages($args, $apidata, 'sent');
-    }
-
-    function show_messages($args, $apidata, $type)
-    {
-        $user = $apidata['user']; // Always the auth user
-
-        $message  = new Message();
-        $title    = null;
-        $subtitle = null;
-        $link     = null;
-        $server   = common_root_url();
-
-        if ($type == 'received') {
-            $message->to_profile = $user->id;
-            $title = sprintf(_("Direct messages to %s"), $user->nickname);
-            $subtitle = sprintf(_("All the direct messages sent to %s"),
-                $user->nickname);
-            $link = $server . $user->nickname . '/inbox';
-        } else {
-            $message->from_profile = $user->id;
-            $title = _('Direct Messages You\'ve Sent');
-            $subtitle = sprintf(_("All the direct messages sent from %s"),
-                $user->nickname);
-            $link = $server . $user->nickname . '/outbox';
-        }
-
-        $page     = (int)$this->arg('page', 1);
-        $count    = (int)$this->arg('count', 20);
-        $max_id   = (int)$this->arg('max_id', 0);
-        $since_id = (int)$this->arg('since_id', 0);
-        $since    = $this->arg('since');
-
-        if ($max_id) {
-            $message->whereAdd("id <= $max_id");
-        }
-
-        if ($since_id) {
-            $message->whereAdd("id > $since_id");
-        }
-
-        if ($since) {
-            $d = date('Y-m-d H:i:s', $since);
-            $message->whereAdd("created > '$d'");
-        }
-
-        $message->orderBy('created DESC, id DESC');
-        $message->limit((($page-1)*$count), $count);
-        $message->find();
-
-        switch($apidata['content-type']) {
-        case 'xml':
-            $this->show_xml_dmsgs($message);
-            break;
-        case 'rss':
-            $this->show_rss_dmsgs($message, $title, $link, $subtitle);
-            break;
-        case 'atom':
-            $selfuri = common_root_url() . 'api/direct_messages';
-            $selfuri .= ($type == 'received') ? '.atom' : '/sent.atom';
-            $taguribase = common_config('integration', 'taguri');
-
-            if ($type == 'sent') {
-                $id = "tag:$taguribase:SentDirectMessages:" . $user->id;
-            } else {
-                $id = "tag:$taguribase:DirectMessages:" . $user->id;
-            }
-
-            $this->show_atom_dmsgs($message, $title, $link, $subtitle,
-                $selfuri, $id);
-            break;
-        case 'json':
-            $this->show_json_dmsgs($message);
-            break;
-        default:
-            $this->clientError(_('API method not found!'), $code = 404);
-        }
-
-    }
-
-    // had to change this from "new" to "create" to avoid PHP reserved word
-    function create($args, $apidata)
-    {
-        parent::handle($args);
-
-        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(_('This method requires a POST.'),
-                400, $apidata['content-type']);
-            return;
-        }
-
-        $user = $apidata['user'];
-        $source = $this->trimmed('source'); // Not supported by Twitter.
-
-        $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
-        if (empty($source) || in_array($source, $reserved_sources)) {
-            $source = 'api';
-        }
-
-        $content = $this->trimmed('text');
-
-        if (empty($content)) {
-            $this->clientError(_('No message text!'),
-                $code = 406, $apidata['content-type']);
-        } else {
-            $content_shortened = common_shorten_links($content);
-            if (Message::contentTooLong($content_shortened)) {
-                $this->clientError(sprintf(_('That\'s too long. Max message size is %d chars.'),
-                                           Message::maxContent()),
-                                   $code = 406, $apidata['content-type']);
-                return;
-            }
-        }
-
-        $other = $this->get_user($this->trimmed('user'));
-
-        if (empty($other)) {
-            $this->clientError(_('Recipient user not found.'),
-                $code = 403, $apidata['content-type']);
-            return;
-        } else if (!$user->mutuallySubscribed($other)) {
-            $this->clientError(_('Can\'t send direct messages to users who aren\'t your friend.'),
-                $code = 403, $apidata['content-type']);
-            return;
-        } else if ($user->id == $other->id) {
-            // Sending msgs to yourself is allowed by Twitter
-            $this->clientError(_('Don\'t send a message to yourself; just say it to yourself quietly instead.'),
-                $code = 403, $apidata['content-type']);
-            return;
-        }
-
-        $message = Message::saveNew($user->id, $other->id,
-            html_entity_decode($content, ENT_NOQUOTES, 'UTF-8'), $source);
-
-        if (is_string($message)) {
-            $this->serverError($message);
-            return;
-        }
-
-        $this->notify($user, $other, $message);
-
-        if ($apidata['content-type'] == 'xml') {
-            $this->show_single_xml_dmsg($message);
-        } elseif ($apidata['content-type'] == 'json') {
-            $this->show_single_json_dmsg($message);
-        }
-
-    }
-
-    function destroy($args, $apidata)
-    {
-        parent::handle($args);
-        $this->serverError(_('API method under construction.'), $code=501);
-    }
-
-    function show_xml_dmsgs($message)
-    {
-
-        $this->init_document('xml');
-        $this->elementStart('direct-messages', array('type' => 'array'));
-
-        if (is_array($message)) {
-            foreach ($message as $m) {
-                $twitter_dm = $this->twitter_dmsg_array($m);
-                $this->show_twitter_xml_dmsg($twitter_dm);
-            }
-        } else {
-            while ($message->fetch()) {
-                $twitter_dm = $this->twitter_dmsg_array($message);
-                $this->show_twitter_xml_dmsg($twitter_dm);
-            }
-        }
-
-        $this->elementEnd('direct-messages');
-        $this->end_document('xml');
-
-    }
-
-    function show_json_dmsgs($message)
-    {
-
-        $this->init_document('json');
-
-        $dmsgs = array();
-
-        if (is_array($message)) {
-            foreach ($message as $m) {
-                $twitter_dm = $this->twitter_dmsg_array($m);
-                array_push($dmsgs, $twitter_dm);
-            }
-        } else {
-            while ($message->fetch()) {
-                $twitter_dm = $this->twitter_dmsg_array($message);
-                array_push($dmsgs, $twitter_dm);
-            }
-        }
-
-        $this->show_json_objects($dmsgs);
-        $this->end_document('json');
-
-    }
-
-    function show_rss_dmsgs($message, $title, $link, $subtitle)
-    {
-
-        $this->init_document('rss');
-
-        $this->elementStart('channel');
-        $this->element('title', null, $title);
-
-        $this->element('link', null, $link);
-        $this->element('description', null, $subtitle);
-        $this->element('language', null, 'en-us');
-        $this->element('ttl', null, '40');
-
-        if (is_array($message)) {
-            foreach ($message as $m) {
-                $entry = $this->twitter_rss_dmsg_array($m);
-                $this->show_twitter_rss_item($entry);
-            }
-        } else {
-            while ($message->fetch()) {
-                $entry = $this->twitter_rss_dmsg_array($message);
-                $this->show_twitter_rss_item($entry);
-            }
-        }
-
-        $this->elementEnd('channel');
-        $this->end_twitter_rss();
-
-    }
-
-    function show_atom_dmsgs($message, $title, $link, $subtitle, $selfuri, $id)
-    {
-
-        $this->init_document('atom');
-
-        $this->element('title', null, $title);
-        $this->element('id', null, $id);
-        $this->element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), null);
-        $this->element('link', array('href' => $selfuri, 'rel' => 'self',
-            'type' => 'application/atom+xml'), null);
-        $this->element('updated', null, common_date_iso8601('now'));
-        $this->element('subtitle', null, $subtitle);
-
-        if (is_array($message)) {
-            foreach ($message as $m) {
-                $entry = $this->twitter_rss_dmsg_array($m);
-                $this->show_twitter_atom_entry($entry);
-            }
-        } else {
-            while ($message->fetch()) {
-                $entry = $this->twitter_rss_dmsg_array($message);
-                $this->show_twitter_atom_entry($entry);
-            }
-        }
-
-        $this->end_document('atom');
-    }
-
-    // swiped from MessageAction. Should it be place in util.php?
-    function notify($from, $to, $message)
-    {
-        mail_notify_message($message, $from, $to);
-        # XXX: Jabber, SMS notifications... probably queued
-    }
-
-}
diff --git a/lib/router.php b/lib/router.php
index 57f9864bc5..75abf58ab8 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -358,7 +358,6 @@ class Router
                         'id' => '[0-9]+',
                         'format' => '(xml|json)'));
 
-
         // users
 
         $m->connect('api/users/show/:id.:format',
@@ -373,30 +372,19 @@ class Router
 
         // direct messages
 
-        foreach (array('xml', 'json') as $e) {
-            $m->connect('api/direct_messages/new.'.$e,
-                        array('action' => 'api',
-                              'apiaction' => 'direct_messages',
-                              'method' => 'create.'.$e));
-        }
 
-        foreach (array('xml', 'json', 'rss', 'atom') as $e) {
-            $m->connect('api/direct_messages.'.$e,
-                        array('action' => 'api',
-                              'apiaction' => 'direct_messages',
-                              'method' => 'direct_messages.'.$e));
-        }
+        $m->connect('api/direct_messages.:format',
+                    array('action' => 'ApiDirectMessage',
+                          'format' => '(xml|json|rss|atom)'));
 
-        foreach (array('xml', 'json', 'rss', 'atom') as $e) {
-            $m->connect('api/direct_messages/sent.'.$e,
-                        array('action' => 'api',
-                              'apiaction' => 'direct_messages',
-                              'method' => 'sent.'.$e));
-        }
+        $m->connect('api/direct_messages/sent.:format',
+                    array('action' => 'ApiDirectMessage',
+                          'format' => '(xml|json|rss|atom)',
+                          'sent' => true));
 
-        $m->connect('api/direct_messages/destroy/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'direct_messages'));
+        $m->connect('api/direct_messages/new.:format',
+                     array('action' => 'ApiDirectMessageNew',
+                           'format' => '(xml|json)'));
 
         // friendships
 
@@ -410,7 +398,7 @@ class Router
                           'apiaction' => 'friendships'),
                     array('method' => '(show|exists)(\.(xml|json))'));
 
-        // Social graph
+       // Social graph
 
         $m->connect('api/friends/ids/:id.:format',
                     array('action' => 'apiFriends',
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 708738832b..b2104fddd6 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -322,51 +322,6 @@ class TwitterapiAction extends Action
         return $entry;
     }
 
-    function twitter_rss_dmsg_array($message)
-    {
-
-        $entry = array();
-
-        $entry['title'] = sprintf('Message from %s to %s',
-            $message->getFrom()->nickname, $message->getTo()->nickname);
-
-        $entry['content'] = common_xml_safe_str(trim($message->content));
-        $entry['link'] = common_local_url('showmessage', array('message' => $message->id));
-        $entry['published'] = common_date_iso8601($message->created);
-
-        $taguribase = common_config('integration', 'taguri');
-
-        $entry['id'] = "tag:$taguribase,:$entry[link]";
-        $entry['updated'] = $entry['published'];
-        $entry['author'] = $message->getFrom()->getBestName();
-
-        # RSS Item specific
-        $entry['description'] = $entry['content'];
-        $entry['pubDate'] = common_date_rfc2822($message->created);
-        $entry['guid'] = $entry['link'];
-
-        return $entry;
-    }
-
-    function twitter_dmsg_array($message)
-    {
-        $twitter_dm = array();
-
-        $from_profile = $message->getFrom();
-        $to_profile = $message->getTo();
-
-        $twitter_dm['id'] = $message->id;
-        $twitter_dm['sender_id'] = $message->from_profile;
-        $twitter_dm['text'] = trim($message->content);
-        $twitter_dm['recipient_id'] = $message->to_profile;
-        $twitter_dm['created_at'] = $this->date_twitter($message->created);
-        $twitter_dm['sender_screen_name'] = $from_profile->nickname;
-        $twitter_dm['recipient_screen_name'] = $to_profile->nickname;
-        $twitter_dm['sender'] = $this->twitter_user_array($from_profile, false);
-        $twitter_dm['recipient'] = $this->twitter_user_array($to_profile, false);
-
-        return $twitter_dm;
-    }
 
     function twitter_relationship_array($source, $target)
     {
@@ -531,40 +486,6 @@ class TwitterapiAction extends Action
         $this->end_document('json');
     }
 
-    function show_single_xml_dmsg($message)
-    {
-        $this->init_document('xml');
-        $dmsg = $this->twitter_dmsg_array($message);
-        $this->show_twitter_xml_dmsg($dmsg);
-        $this->end_document('xml');
-    }
-
-    function show_single_json_dmsg($message)
-    {
-        $this->init_document('json');
-        $dmsg = $this->twitter_dmsg_array($message);
-        $this->show_json_objects($dmsg);
-        $this->end_document('json');
-    }
-
-    function show_twitter_xml_dmsg($twitter_dm)
-    {
-        $this->elementStart('direct_message');
-        foreach($twitter_dm as $element => $value) {
-            switch ($element) {
-            case 'sender':
-            case 'recipient':
-                $this->show_twitter_xml_user($value, $element);
-                break;
-            case 'text':
-                $this->element($element, null, common_xml_safe_str($value));
-                break;
-            default:
-                $this->element($element, null, $value);
-            }
-        }
-        $this->elementEnd('direct_message');
-    }
 
     function show_xml_timeline($notice)
     {
@@ -685,6 +606,121 @@ class TwitterapiAction extends Action
         $this->end_twitter_rss();
     }
 
+
+    function showTwitterAtomEntry($entry)
+    {
+        $this->elementStart('entry');
+        $this->element('title', null, $entry['title']);
+        $this->element('content', array('type' => 'html'), $entry['content']);
+        $this->element('id', null, $entry['id']);
+        $this->element('published', null, $entry['published']);
+        $this->element('updated', null, $entry['updated']);
+        $this->element('link', array('type' => 'text/html',
+                                     'href' => $entry['link'],
+                                     'rel' => 'alternate'));
+        $this->element('link', array('type' => $entry['avatar-type'],
+                                     'href' => $entry['avatar'],
+                                     'rel' => 'image'));
+        $this->elementStart('author');
+
+        $this->element('name', null, $entry['author-name']);
+        $this->element('uri', null, $entry['author-uri']);
+
+        $this->elementEnd('author');
+        $this->elementEnd('entry');
+    }
+
+    function showXmlDirectMessage($dm)
+    {
+        $this->elementStart('direct_message');
+        foreach($dm as $element => $value) {
+            switch ($element) {
+            case 'sender':
+            case 'recipient':
+                $this->show_twitter_xml_user($value, $element);
+                break;
+            case 'text':
+                $this->element($element, null, common_xml_safe_str($value));
+                break;
+            default:
+                $this->element($element, null, $value);
+                break;
+            }
+        }
+        $this->elementEnd('direct_message');
+    }
+
+    function directMessageArray($message)
+    {
+        $dmsg = array();
+
+        $from_profile = $message->getFrom();
+        $to_profile = $message->getTo();
+
+        $dmsg['id'] = $message->id;
+        $dmsg['sender_id'] = $message->from_profile;
+        $dmsg['text'] = trim($message->content);
+        $dmsg['recipient_id'] = $message->to_profile;
+        $dmsg['created_at'] = $this->date_twitter($message->created);
+        $dmsg['sender_screen_name'] = $from_profile->nickname;
+        $dmsg['recipient_screen_name'] = $to_profile->nickname;
+        $dmsg['sender'] = $this->twitter_user_array($from_profile, false);
+        $dmsg['recipient'] = $this->twitter_user_array($to_profile, false);
+
+        return $dmsg;
+    }
+
+    function rssDirectMessageArray($message)
+    {
+        $entry = array();
+
+        $from = $message->getFrom();
+
+        $entry['title'] = sprintf('Message from %s to %s',
+            $from->nickname, $message->getTo()->nickname);
+
+        $entry['content'] = common_xml_safe_str($message->rendered);
+        $entry['link'] = common_local_url('showmessage', array('message' => $message->id));
+        $entry['published'] = common_date_iso8601($message->created);
+
+        $taguribase = common_config('integration', 'taguri');
+
+        $entry['id'] = "tag:$taguribase:$entry[link]";
+        $entry['updated'] = $entry['published'];
+
+        $entry['author-name'] = $from->getBestName();
+        $entry['author-uri'] = $from->homepage;
+
+        $avatar = $from->getAvatar(AVATAR_STREAM_SIZE);
+
+        $entry['avatar']      = (!empty($avatar)) ? $avatar->url : Avatar::defaultImage(AVATAR_STREAM_SIZE);
+        $entry['avatar-type'] = (!empty($avatar)) ? $avatar->mediatype : 'image/png';
+
+        // RSS item specific
+
+        $entry['description'] = $entry['content'];
+        $entry['pubDate'] = common_date_rfc2822($message->created);
+        $entry['guid'] = $entry['link'];
+
+        return $entry;
+    }
+
+    function showSingleXmlDirectMessage($message)
+    {
+        $this->init_document('xml');
+        $dmsg = $this->directMessageArray($message);
+        $this->showXmlDirectMessage($dmsg);
+        $this->end_document('xml');
+    }
+
+    function showSingleJsonDirectMessage($message)
+    {
+        $this->init_document('json');
+        $dmsg = $this->directMessageArray($message);
+        $this->show_json_objects($dmsg);
+        $this->end_document('json');
+    }
+
     function show_atom_groups($group, $title, $id, $link, $subtitle=null, $selfuri=null)
     {
 

From 0743ca125902ab2d40f324063b5a0552b1e28f72 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sat, 3 Oct 2009 17:36:53 +1300
Subject: [PATCH 186/247] indent fix

---
 install.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/install.php b/install.php
index c2a5bb29ee..69f025a6a6 100644
--- a/install.php
+++ b/install.php
@@ -1,3 +1,4 @@
+
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
@@ -31,7 +32,7 @@
  * @author   Sarven Capadisli <csarven@status.net>
  * @author   Tom Adams <tom@holizz.com>
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
- * @version  0.9
+ * @version  0.9.x
  * @link     http://status.net
  */
 
@@ -340,13 +341,13 @@ function checkExtension($name)
     if (extension_loaded($name)) {
         return true;
     } elseif (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode')) {
-    	// dl will throw a fatal error if it's disabled or we're in safe mode.
-    	// More fun, it may not even exist under some SAPIs in 5.3.0 or later...
-    	$soname = $name . '.' . PHP_SHLIB_SUFFIX;
-    	if (PHP_SHLIB_SUFFIX == 'dll') {
-    		$soname = "php_" . $soname;
-    	}
-    	return @dl($soname);
+        // dl will throw a fatal error if it's disabled or we're in safe mode.
+        // More fun, it may not even exist under some SAPIs in 5.3.0 or later...
+        $soname = $name . '.' . PHP_SHLIB_SUFFIX;
+        if (PHP_SHLIB_SUFFIX == 'dll') {
+            $soname = "php_" . $soname;
+        }
+        return @dl($soname);
     } else {
         return false;
     }

From 852f0c59a448b3c0dc07a928924cce6ce3399e70 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sat, 3 Oct 2009 17:40:53 +1300
Subject: [PATCH 187/247] added doxygen

---
 index.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/index.php b/index.php
index 51e30f5782..a4d1fcf4d0 100644
--- a/index.php
+++ b/index.php
@@ -61,6 +61,9 @@ function getPath($req)
     }
 }
 
+/**
+ * logs and then displays error messages
+ */
 function handleError($error)
 {
     if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {

From 00c0becd56c1185f26524828be4722ffd8f05712 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sat, 3 Oct 2009 17:48:38 +1300
Subject: [PATCH 188/247] more doxygen

---
 index.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/index.php b/index.php
index a4d1fcf4d0..644812bd55 100644
--- a/index.php
+++ b/index.php
@@ -63,6 +63,8 @@ function getPath($req)
 
 /**
  * logs and then displays error messages
+ *
+ * @return void
  */
 function handleError($error)
 {

From 5528c0cd3d66c1acd7bf25b26833e8a107641f35 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sat, 3 Oct 2009 22:06:51 +0000
Subject: [PATCH 189/247] Using CDATA for autofocus script

---
 lib/htmloutputter.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 64be745beb..2ff9380cc1 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -427,16 +427,12 @@ class HTMLOutputter extends XMLOutputter
     function autofocus($id)
     {
         $this->elementStart('script', array('type' => 'text/javascript'));
-        $this->raw('
-        <!--
-        $(document).ready(function() {
-            var el = $("#' . $id . '");
-            if (el.length) {
-                el.focus();
-            }
-        });
-        -->
-        ');
+        $this->raw('/*<![CDATA[*/'.
+                   ' $(document).ready(function() {'.
+                   ' var el = $("#' . $id . '");'.
+                   ' if (el.length) { el.focus(); }'.
+                   ' });'.
+                   ' /*]]>*/');
         $this->elementEnd('script');
     }
 }

From bcdf31c639d7a50a7eefd16706fa0d9d6f33601f Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 4 Oct 2009 11:14:26 +1300
Subject: [PATCH 190/247] added all them doxygens

---
 classes/Notice.php | 825 +++++++++++++++++++++++----------------------
 1 file changed, 421 insertions(+), 404 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 93d5de7908..c68098c654 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
@@ -15,13 +15,30 @@
  *
  * 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 Notices
+ * @package  StatusNet
+ * @author   Brenda Wallace <shiny@cpan.org>
+ * @author   Christopher Vollick <psycotica0@gmail.com>
+ * @author   CiaranG <ciaran@ciarang.com>
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@controlezvous.ca>
+ * @author   Gina Haeussge <osd@foosel.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @author   Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Tom Adams <tom@holizz.com>
+ * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { 
+    exit(1); 
+}
 
 /**
- * Table Definition for notice
- */
+* Table Definition for notice
+*/
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
 /* We keep the first three 20-notice pages, plus one for pagination check,
@@ -35,7 +52,7 @@ class Notice extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
-
+    
     public $__table = 'notice';                          // table name
     public $id;                              // int(4)  primary_key not_null
     public $profile_id;                      // int(4)   not_null
@@ -49,45 +66,45 @@ class Notice extends Memcached_DataObject
     public $is_local;                        // tinyint(1)
     public $source;                          // varchar(32)
     public $conversation;                    // int(4)
-
+    
     /* Static get */
     function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Notice',$k,$v); }
-
+    
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
-
+    
     /* Notice types */
     const LOCAL_PUBLIC    =  1;
     const REMOTE_OMB      =  0;
     const LOCAL_NONPUBLIC = -1;
     const GATEWAY         = -2;
-
+    
     function getProfile()
     {
         return Profile::staticGet('id', $this->profile_id);
     }
-
+    
     function delete()
     {
         $this->blowCaches(true);
         $this->blowFavesCache(true);
         $this->blowSubsCache(true);
-
+        
         // For auditing purposes, save a record that the notice
         // was deleted.
-
+        
         $deleted = new Deleted_notice();
-
+        
         $deleted->id         = $this->id;
         $deleted->profile_id = $this->profile_id;
         $deleted->uri        = $this->uri;
         $deleted->created    = $this->created;
         $deleted->deleted    = common_sql_now();
-
+        
         $this->query('BEGIN');
-
+        
         $deleted->insert();
-
+        
         //Null any notices that are replies to this notice
         $this->query(sprintf("UPDATE notice set reply_to = null WHERE reply_to = %d", $this->id));
         $related = array('Reply',
@@ -106,7 +123,7 @@ class Notice extends Memcached_DataObject
         $result = parent::delete();
         $this->query('COMMIT');
     }
-
+    
     function saveTags()
     {
         /* extract all #hastags */
@@ -114,14 +131,14 @@ class Notice extends Memcached_DataObject
         if (!$count) {
             return true;
         }
-
+        
         //turn each into their canonical tag
         //this is needed to remove dupes before saving e.g. #hash.tag = #hashtag
         $hashtags = array();
         for($i=0; $i<count($match[1]); $i++) {
             $hashtags[] = common_canonical_tag($match[1][$i]);
         }
-
+        
         /* Add them to the database */
         foreach(array_unique($hashtags) as $hashtag) {
             /* elide characters we don't want in the tag */
@@ -129,7 +146,7 @@ class Notice extends Memcached_DataObject
         }
         return true;
     }
-
+    
     function saveTag($hashtag)
     {
         $tag = new Notice_tag();
@@ -137,158 +154,158 @@ class Notice extends Memcached_DataObject
         $tag->tag = $hashtag;
         $tag->created = $this->created;
         $id = $tag->insert();
-
+        
         if (!$id) {
             throw new ServerException(sprintf(_('DB error inserting hashtag: %s'),
                                               $last_error->message));
             return;
         }
     }
-
+    
     static function saveNew($profile_id, $content, $source=null,
                             $is_local=Notice::LOCAL_PUBLIC, $reply_to=null, $uri=null, $created=null) {
-
-        $profile = Profile::staticGet($profile_id);
-
-        $final = common_shorten_links($content);
-
-        if (Notice::contentTooLong($final)) {
-            throw new ClientException(_('Problem saving notice. Too long.'));
-        }
-
-        if (!$profile) {
-            throw new ClientException(_('Problem saving notice. Unknown user.'));
-        }
-
-        if (common_config('throttle', 'enabled') && !Notice::checkEditThrottle($profile_id)) {
-            common_log(LOG_WARNING, 'Excessive posting by profile #' . $profile_id . '; throttled.');
-            throw new ClientException(_('Too many notices too fast; take a breather '.
+                                
+                                $profile = Profile::staticGet($profile_id);
+                                
+                                $final = common_shorten_links($content);
+                                
+                                if (Notice::contentTooLong($final)) {
+                                    throw new ClientException(_('Problem saving notice. Too long.'));
+                                }
+                                
+                                if (!$profile) {
+                                    throw new ClientException(_('Problem saving notice. Unknown user.'));
+                                }
+                                
+                                if (common_config('throttle', 'enabled') && !Notice::checkEditThrottle($profile_id)) {
+                                    common_log(LOG_WARNING, 'Excessive posting by profile #' . $profile_id . '; throttled.');
+                                    throw new ClientException(_('Too many notices too fast; take a breather '.
                                         'and post again in a few minutes.'));
-        }
-
-        if (common_config('site', 'dupelimit') > 0 && !Notice::checkDupes($profile_id, $final)) {
-            common_log(LOG_WARNING, 'Dupe posting by profile #' . $profile_id . '; throttled.');
-			throw new ClientException(_('Too many duplicate messages too quickly;'.
+                                }
+                                
+                                if (common_config('site', 'dupelimit') > 0 && !Notice::checkDupes($profile_id, $final)) {
+                                    common_log(LOG_WARNING, 'Dupe posting by profile #' . $profile_id . '; throttled.');
+                                    throw new ClientException(_('Too many duplicate messages too quickly;'.
                                         ' take a breather and post again in a few minutes.'));
-        }
-
-		$banned = common_config('profile', 'banned');
-
-        if ( in_array($profile_id, $banned) || in_array($profile->nickname, $banned)) {
-            common_log(LOG_WARNING, "Attempted post from banned user: $profile->nickname (user id = $profile_id).");
-            throw new ClientException(_('You are banned from posting notices on this site.'));
-        }
-
-        $notice = new Notice();
-        $notice->profile_id = $profile_id;
-
-        $blacklist = common_config('public', 'blacklist');
-        $autosource = common_config('public', 'autosource');
-
+                                }
+                                
+                                $banned = common_config('profile', 'banned');
+                                
+                                if ( in_array($profile_id, $banned) || in_array($profile->nickname, $banned)) {
+                                    common_log(LOG_WARNING, "Attempted post from banned user: $profile->nickname (user id = $profile_id).");
+                                    throw new ClientException(_('You are banned from posting notices on this site.'));
+                                }
+                                
+                                $notice = new Notice();
+                                $notice->profile_id = $profile_id;
+                                
+                                $blacklist = common_config('public', 'blacklist');
+                                $autosource = common_config('public', 'autosource');
+                                
         # Blacklisted are non-false, but not 1, either
-
-        if (($blacklist && in_array($profile_id, $blacklist)) ||
-            ($source && $autosource && in_array($source, $autosource))) {
-            $notice->is_local = Notice::LOCAL_NONPUBLIC;
-        } else {
-            $notice->is_local = $is_local;
-        }
-
-        if (!empty($created)) {
-            $notice->created = $created;
-        } else {
-            $notice->created = common_sql_now();
-        }
-
-		$notice->content = $final;
-		$notice->rendered = common_render_content($final, $notice);
-		$notice->source = $source;
-		$notice->uri = $uri;
-
-		$notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final);
-
-        if (!empty($notice->reply_to)) {
-            $reply = Notice::staticGet('id', $notice->reply_to);
-            $notice->conversation = $reply->conversation;
-        }
-
-        if (Event::handle('StartNoticeSave', array(&$notice))) {
-
+                                
+                                if (($blacklist && in_array($profile_id, $blacklist)) ||
+                                    ($source && $autosource && in_array($source, $autosource))) {
+                                        $notice->is_local = Notice::LOCAL_NONPUBLIC;
+                                    } else {
+                                        $notice->is_local = $is_local;
+                                    }
+                                
+                                if (!empty($created)) {
+                                    $notice->created = $created;
+                                } else {
+                                    $notice->created = common_sql_now();
+                                }
+                                
+                                $notice->content = $final;
+                                $notice->rendered = common_render_content($final, $notice);
+                                $notice->source = $source;
+                                $notice->uri = $uri;
+                                
+                                $notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final);
+                                
+                                if (!empty($notice->reply_to)) {
+                                    $reply = Notice::staticGet('id', $notice->reply_to);
+                                    $notice->conversation = $reply->conversation;
+                                }
+                                
+                                if (Event::handle('StartNoticeSave', array(&$notice))) {
+                                    
             // XXX: some of these functions write to the DB
-
-            $notice->query('BEGIN');
-
-            $id = $notice->insert();
-
-            if (!$id) {
-                common_log_db_error($notice, 'INSERT', __FILE__);
-                throw new ServerException(_('Problem saving notice.'));
-            }
-
+                                    
+                                    $notice->query('BEGIN');
+                                    
+                                    $id = $notice->insert();
+                                    
+                                    if (!$id) {
+                                        common_log_db_error($notice, 'INSERT', __FILE__);
+                                        throw new ServerException(_('Problem saving notice.'));
+                                    }
+                                    
             // Update ID-dependent columns: URI, conversation
-
-            $orig = clone($notice);
-
-            $changed = false;
-
-            if (empty($uri)) {
-                $notice->uri = common_notice_uri($notice);
-                $changed = true;
-            }
-
+                                    
+                                    $orig = clone($notice);
+                                    
+                                    $changed = false;
+                                    
+                                    if (empty($uri)) {
+                                        $notice->uri = common_notice_uri($notice);
+                                        $changed = true;
+                                    }
+                                    
             // If it's not part of a conversation, it's
             // the beginning of a new conversation.
-
-            if (empty($notice->conversation)) {
-                $notice->conversation = $notice->id;
-                $changed = true;
-            }
-
-            if ($changed) {
-                if (!$notice->update($orig)) {
-                    common_log_db_error($notice, 'UPDATE', __FILE__);
-                    throw new ServerException(_('Problem saving notice.'));
-                }
-            }
-
+                                    
+                                    if (empty($notice->conversation)) {
+                                        $notice->conversation = $notice->id;
+                                        $changed = true;
+                                    }
+                                    
+                                    if ($changed) {
+                                        if (!$notice->update($orig)) {
+                                            common_log_db_error($notice, 'UPDATE', __FILE__);
+                                            throw new ServerException(_('Problem saving notice.'));
+                                        }
+                                    }
+                                    
             // XXX: do we need to change this for remote users?
-
-            $notice->saveReplies();
-            $notice->saveTags();
-
-            $notice->addToInboxes();
-
-            $notice->saveUrls();
-
-            $notice->query('COMMIT');
-
-            Event::handle('EndNoticeSave', array($notice));
-        }
-
+                                    
+                                    $notice->saveReplies();
+                                    $notice->saveTags();
+                                    
+                                    $notice->addToInboxes();
+                                    
+                                    $notice->saveUrls();
+                                    
+                                    $notice->query('COMMIT');
+                                    
+                                    Event::handle('EndNoticeSave', array($notice));
+                                }
+                                
         # Clear the cache for subscribed users, so they'll update at next request
         # XXX: someone clever could prepend instead of clearing the cache
-
-        $notice->blowCaches();
-
-        return $notice;
-    }
-
+                                
+                                $notice->blowCaches();
+                                
+                                return $notice;
+                            }
+    
     /** save all urls in the notice to the db
-     *
-     * follow redirects and save all available file information
-     * (mimetype, date, size, oembed, etc.)
-     *
-     * @return void
-     */
-    function saveUrls() {
-        common_replace_urls_callback($this->content, array($this, 'saveUrl'), $this->id);
-    }
-
+        *
+        * follow redirects and save all available file information
+        * (mimetype, date, size, oembed, etc.)
+        *
+        * @return void
+        */
+        function saveUrls() {
+            common_replace_urls_callback($this->content, array($this, 'saveUrl'), $this->id);
+        }
+    
     function saveUrl($data) {
         list($url, $notice_id) = $data;
         File::processNew($url, $notice_id);
     }
-
+    
     static function checkDupes($profile_id, $content) {
         $profile = Profile::staticGet($profile_id);
         if (!$profile) {
@@ -311,14 +328,14 @@ class Notice extends Memcached_DataObject
         $notice->profile_id = $profile_id;
         $notice->content = $content;
         if (common_config('db','type') == 'pgsql')
-          $notice->whereAdd('extract(epoch from now() - created) < ' . common_config('site', 'dupelimit'));
+            $notice->whereAdd('extract(epoch from now() - created) < ' . common_config('site', 'dupelimit'));
         else
-          $notice->whereAdd('now() - created < ' . common_config('site', 'dupelimit'));
-
+            $notice->whereAdd('now() - created < ' . common_config('site', 'dupelimit'));
+        
         $cnt = $notice->count();
         return ($cnt == 0);
     }
-
+    
     static function checkEditThrottle($profile_id) {
         $profile = Profile::staticGet($profile_id);
         if (!$profile) {
@@ -336,7 +353,7 @@ class Notice extends Memcached_DataObject
         # Either not N notices in the stream, OR the Nth was not posted within timespan seconds
         return true;
     }
-
+    
     function getUploadedAttachment() {
         $post = clone $this;
         $query = 'select file.url as up, file.id as i from file join file_to_post on file.id = file_id where post_id=' . $post->escape($post->id) . ' and url like "%/notice/%/file"';
@@ -350,7 +367,7 @@ class Notice extends Memcached_DataObject
         $post->free();
         return $ret;
     }
-
+    
     function hasAttachments() {
         $post = clone $this;
         $query = "select count(file_id) as n_attachments from file join file_to_post on (file_id = file.id) join notice on (post_id = notice.id) where post_id = " . $post->escape($post->id);
@@ -360,7 +377,7 @@ class Notice extends Memcached_DataObject
         $post->free();
         return $n_attachments;
     }
-
+    
     function attachments() {
         // XXX: cache this
         $att = array();
@@ -374,7 +391,7 @@ class Notice extends Memcached_DataObject
         }
         return $att;
     }
-
+    
     function blowCaches($blowLast=false)
     {
         $this->blowSubsCache($blowLast);
@@ -387,7 +404,7 @@ class Notice extends Memcached_DataObject
         $profile = Profile::staticGet($this->profile_id);
         $profile->blowNoticeCount();
     }
-
+    
     function blowConversationCache($blowLast=false)
     {
         $cache = common_memcache();
@@ -399,7 +416,7 @@ class Notice extends Memcached_DataObject
             }
         }
     }
-
+    
     function blowGroupCache($blowLast=false)
     {
         $cache = common_memcache();
@@ -428,7 +445,7 @@ class Notice extends Memcached_DataObject
             unset($group_inbox);
         }
     }
-
+    
     function blowTagCache($blowLast=false)
     {
         $cache = common_memcache();
@@ -439,7 +456,7 @@ class Notice extends Memcached_DataObject
                 while ($tag->fetch()) {
                     $tag->blowCache($blowLast);
                     $ck = 'profile:notice_ids_tagged:' . $this->profile_id . ':' . $tag->tag;
-
+                    
                     $cache->delete($ck);
                     if ($blowLast) {
                         $cache->delete($ck . ';last');
@@ -450,19 +467,19 @@ class Notice extends Memcached_DataObject
             unset($tag);
         }
     }
-
+    
     function blowSubsCache($blowLast=false)
     {
         $cache = common_memcache();
         if ($cache) {
             $user = new User();
-
+            
             $UT = common_config('db','type')=='pgsql'?'"user"':'user';
             $user->query('SELECT id ' .
-
+                         
                          "FROM $UT JOIN subscription ON $UT.id = subscription.subscriber " .
                          '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_own:'.$user->id));
@@ -475,7 +492,7 @@ class Notice extends Memcached_DataObject
             unset($user);
         }
     }
-
+    
     function blowNoticeCache($blowLast=false)
     {
         if ($this->is_local) {
@@ -488,7 +505,7 @@ class Notice extends Memcached_DataObject
             }
         }
     }
-
+    
     function blowRepliesCache($blowLast=false)
     {
         $cache = common_memcache();
@@ -507,7 +524,7 @@ class Notice extends Memcached_DataObject
             unset($reply);
         }
     }
-
+    
     function blowPublicCache($blowLast=false)
     {
         if ($this->is_local == Notice::LOCAL_PUBLIC) {
@@ -520,7 +537,7 @@ class Notice extends Memcached_DataObject
             }
         }
     }
-
+    
     function blowFavesCache($blowLast=false)
     {
         $cache = common_memcache();
@@ -541,14 +558,14 @@ class Notice extends Memcached_DataObject
             unset($fave);
         }
     }
-
+    
     # XXX: too many args; we need to move to named params or even a separate
     # class for notice streams
-
+    
     static function getStream($qry, $cachekey, $offset=0, $limit=20, $since_id=0, $max_id=0, $order=null, $since=null) {
-
+        
         if (common_config('memcached', 'enabled')) {
-
+            
             # Skip the cache if this is a since, since_id or max_id qry
             if ($since_id > 0 || $max_id > 0 || $since) {
                 return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since);
@@ -556,127 +573,127 @@ class Notice extends Memcached_DataObject
                 return Notice::getCachedStream($qry, $cachekey, $offset, $limit, $order);
             }
         }
-
+        
         return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since);
     }
-
+    
     static function getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since) {
-
+        
         $needAnd = false;
         $needWhere = true;
-
+        
         if (preg_match('/\bWHERE\b/i', $qry)) {
             $needWhere = false;
             $needAnd = true;
         }
-
+        
         if ($since_id > 0) {
-
+            
             if ($needWhere) {
                 $qry .= ' WHERE ';
                 $needWhere = false;
             } else {
                 $qry .= ' AND ';
             }
-
+            
             $qry .= ' notice.id > ' . $since_id;
         }
-
+        
         if ($max_id > 0) {
-
+            
             if ($needWhere) {
                 $qry .= ' WHERE ';
                 $needWhere = false;
             } else {
                 $qry .= ' AND ';
             }
-
+            
             $qry .= ' notice.id <= ' . $max_id;
         }
-
+        
         if ($since) {
-
+            
             if ($needWhere) {
                 $qry .= ' WHERE ';
                 $needWhere = false;
             } else {
                 $qry .= ' AND ';
             }
-
+            
             $qry .= ' notice.created > \'' . date('Y-m-d H:i:s', $since) . '\'';
         }
-
+        
         # Allow ORDER override
-
+        
         if ($order) {
             $qry .= $order;
         } else {
             $qry .= ' ORDER BY notice.created DESC, notice.id DESC ';
         }
-
+        
         if (common_config('db','type') == 'pgsql') {
             $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
         } else {
             $qry .= ' LIMIT ' . $offset . ', ' . $limit;
         }
-
+        
         $notice = new Notice();
-
+        
         $notice->query($qry);
-
+        
         return $notice;
     }
-
+    
     # XXX: this is pretty long and should probably be broken up into
     # some helper functions
-
+    
     static function getCachedStream($qry, $cachekey, $offset, $limit, $order) {
-
+        
         # If outside our cache window, just go to the DB
-
+        
         if ($offset + $limit > NOTICE_CACHE_WINDOW) {
             return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
         }
-
+        
         # Get the cache; if we can't, just go to the DB
-
+        
         $cache = common_memcache();
-
+        
         if (!$cache) {
             return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
         }
-
+        
         # 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;
         }
-
+        
         # If the cache was invalidated because of new data being
         # added, we can try and just get the new stuff. We keep an additional
         # copy of the data at the key + ';last'
-
+        
         # No cache hit. Try to get the *last* cached version
-
+        
         $last_notices = $cache->get(common_cache_key($cachekey) . ';last');
-
+        
         if ($last_notices) {
-
+            
             # Reverse-chron order, so last ID is last.
-
+            
             $last_id = $last_notices[0]->id;
-
+            
             # XXX: this assumes monotonically increasing IDs; a fair
             # bet with our DB.
-
+            
             $new_notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW,
-                                                  $last_id, null, $order, null);
-
+                $last_id, null, $order, null);
+            
             if ($new_notice) {
                 $new_notices = array();
                 while ($new_notice->fetch()) {
@@ -685,54 +702,54 @@ class Notice extends Memcached_DataObject
                 $new_notice->free();
                 $notices = array_slice(array_merge($new_notices, $last_notices),
                                        0, NOTICE_CACHE_WINDOW);
-
+                
                 # Store the array in the cache for next time
-
+                
                 $result = $cache->set(common_cache_key($cachekey), $notices);
                 $result = $cache->set(common_cache_key($cachekey) . ';last', $notices);
-
+                
                 # return a wrapper of the array for use now
-
+                
                 return new ArrayWrapper(array_slice($notices, $offset, $limit));
             }
         }
-
+        
         # Otherwise, get the full cache window out of the DB
-
+        
         $notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW, null, null, $order, null);
-
+        
         # If there are no hits, just return the value
-
+        
         if (!$notice) {
             return $notice;
         }
-
+        
         # Pack results into an array
-
+        
         $notices = array();
-
+        
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
-
+        
         $notice->free();
-
+        
         # Store the array in the cache for next time
-
+        
         $result = $cache->set(common_cache_key($cachekey), $notices);
         $result = $cache->set(common_cache_key($cachekey) . ';last', $notices);
-
+        
         # return a wrapper of the array for use now
-
+        
         $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit));
-
+        
         return $wrapper;
     }
-
+    
     function getStreamByIds($ids)
     {
         $cache = common_memcache();
-
+        
         if (!empty($cache)) {
             $notices = array();
             foreach ($ids as $id) {
@@ -750,35 +767,35 @@ class Notice extends Memcached_DataObject
             }
             $notice->whereAdd('id in (' . implode(', ', $ids) . ')');
             $notice->orderBy('id DESC');
-
+            
             $notice->find();
             return $notice;
         }
     }
-
+    
     function publicStream($offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
     {
         $ids = Notice::stream(array('Notice', '_publicStreamDirect'),
                               array(),
                               'public',
                               $offset, $limit, $since_id, $max_id, $since);
-
+        
         return Notice::getStreamByIds($ids);
     }
-
+    
     function _publicStreamDirect($offset=0, $limit=20, $since_id=0, $max_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')) {
             $notice->whereAdd('is_local = ' . Notice::LOCAL_PUBLIC);
         } else {
@@ -786,108 +803,108 @@ class Notice extends Memcached_DataObject
             $notice->whereAdd('is_local !='. Notice::LOCAL_NONPUBLIC);
             $notice->whereAdd('is_local !='. Notice::GATEWAY);
         }
-
+        
         if ($since_id != 0) {
             $notice->whereAdd('id > ' . $since_id);
         }
-
+        
         if ($max_id != 0) {
             $notice->whereAdd('id <= ' . $max_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 conversationStream($id, $offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
     {
         $ids = Notice::stream(array('Notice', '_conversationStreamDirect'),
                               array($id),
                               'notice:conversation_ids:'.$id,
                               $offset, $limit, $since_id, $max_id, $since);
-
+        
         return Notice::getStreamByIds($ids);
     }
-
+    
     function _conversationStreamDirect($id, $offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
     {
         $notice = new Notice();
-
+        
         $notice->selectAdd(); // clears it
         $notice->selectAdd('id');
-
+        
         $notice->conversation = $id;
-
+        
         $notice->orderBy('id DESC');
-
+        
         if (!is_null($offset)) {
             $notice->limit($offset, $limit);
         }
-
+        
         if ($since_id != 0) {
             $notice->whereAdd('id > ' . $since_id);
         }
-
+        
         if ($max_id != 0) {
             $notice->whereAdd('id <= ' . $max_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()
     {
         $enabled = common_config('inboxes', 'enabled');
-
+        
         if ($enabled === true || $enabled === 'transitional') {
-
+            
             // XXX: loads constants
-
+            
             $inbox = new Notice_inbox();
-
+            
             $users = $this->getSubscribedUsers();
-
+            
             // FIXME: kind of ignoring 'transitional'...
             // we'll probably stop supporting inboxless mode
             // in 0.9.x
-
+            
             $ni = array();
-
+            
             foreach ($users as $id) {
                 $ni[$id] = NOTICE_INBOX_SOURCE_SUB;
             }
-
+            
             $groups = $this->saveGroups();
-
+            
             foreach ($groups as $group) {
                 $users = $group->getUserMembers();
                 foreach ($users as $id) {
@@ -896,12 +913,12 @@ class Notice extends Memcached_DataObject
                     }
                 }
             }
-
+            
             $cnt = 0;
-
+            
             $qryhdr = 'INSERT INTO notice_inbox (user_id, notice_id, source, created) VALUES ';
             $qry = $qryhdr;
-
+            
             foreach ($ni as $id => $source) {
                 if ($cnt > 0) {
                     $qry .= ', ';
@@ -919,52 +936,52 @@ class Notice extends Memcached_DataObject
                     $cnt = 0;
                 }
             }
-
+            
             if ($cnt > 0) {
                 $inbox = new Notice_inbox();
                 $inbox->query($qry);
             }
         }
-
+        
         return;
     }
-
+    
     function getSubscribedUsers()
     {
         $user = new User();
-
+        
         if(common_config('db','quote_identifiers'))
-          $user_table = '"user"';
+            $user_table = '"user"';
         else $user_table = 'user';
-
+        
         $qry =
-          'SELECT id ' .
-          'FROM '. $user_table .' JOIN subscription '.
-          'ON '. $user_table .'.id = subscription.subscriber ' .
-          'WHERE subscription.subscribed = %d ';
-
+            'SELECT id ' .
+            'FROM '. $user_table .' JOIN subscription '.
+            'ON '. $user_table .'.id = subscription.subscriber ' .
+            'WHERE subscription.subscribed = %d ';
+        
         $user->query(sprintf($qry, $this->profile_id));
-
+        
         $ids = array();
-
+        
         while ($user->fetch()) {
             $ids[] = $user->id;
         }
-
+        
         $user->free();
-
+        
         return $ids;
     }
-
+    
     function saveGroups()
     {
         $groups = array();
-
+        
         $enabled = common_config('inboxes', 'enabled');
         if ($enabled !== true && $enabled !== 'transitional') {
             return $groups;
         }
-
+        
         /* extract all !group */
         $count = preg_match_all('/(?:^|\s)!([A-Za-z0-9]{1,64})/',
                                 strtolower($this->content),
@@ -972,62 +989,62 @@ class Notice extends Memcached_DataObject
         if (!$count) {
             return $groups;
         }
-
+        
         $profile = $this->getProfile();
-
+        
         /* Add them to the database */
-
+        
         foreach (array_unique($match[1]) as $nickname) {
             /* XXX: remote groups. */
             $group = User_group::getForNickname($nickname);
-
+            
             if (empty($group)) {
                 continue;
             }
-
+            
             // we automatically add a tag for every group name, too
-
+            
             $tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($nickname),
                                              'notice_id' => $this->id));
-
+            
             if (is_null($tag)) {
                 $this->saveTag($nickname);
             }
-
+            
             if ($profile->isMember($group)) {
-
+                
                 $result = $this->addToGroupInbox($group);
-
+                
                 if (!$result) {
                     common_log_db_error($gi, 'INSERT', __FILE__);
                 }
-
+                
                 $groups[] = clone($group);
             }
         }
-
+        
         return $groups;
     }
-
+    
     function addToGroupInbox($group)
     {
         $gi = Group_inbox::pkeyGet(array('group_id' => $group->id,
                                          'notice_id' => $this->id));
-
+        
         if (empty($gi)) {
-
+            
             $gi = new Group_inbox();
-
+            
             $gi->group_id  = $group->id;
             $gi->notice_id = $this->id;
             $gi->created   = $this->created;
-
+            
             return $gi->insert();
         }
-
+        
         return true;
     }
-
+    
     function saveReplies()
     {
         // Alternative reply format
@@ -1037,21 +1054,21 @@ class Notice extends Memcached_DataObject
         }
         // extract all @messages
         $cnt = preg_match_all('/(?:^|\s)@([a-z0-9]{1,64})/', $this->content, $match);
-
+        
         $names = array();
-
+        
         if ($cnt || $tname) {
             // XXX: is there another way to make an array copy?
             $names = ($tname) ? array_unique(array_merge(array(strtolower($tname)), $match[1])) : array_unique($match[1]);
         }
-
+        
         $sender = Profile::staticGet($this->profile_id);
-
+        
         $replied = array();
-
+        
         // store replied only for first @ (what user/notice what the reply directed,
         // we assume first @ is it)
-
+        
         for ($i=0; $i<count($names); $i++) {
             $nickname = $names[$i];
             $recipient = common_relative_profile($sender, $nickname, $this->created);
@@ -1076,7 +1093,7 @@ class Notice extends Memcached_DataObject
                 $replied[$recipient->id] = 1;
             }
         }
-
+        
         // Hash format replies, too
         $cnt = preg_match_all('/(?:^|\s)@#([a-z0-9]{1,64})/', $this->content, $match);
         if ($cnt) {
@@ -1103,7 +1120,7 @@ class Notice extends Memcached_DataObject
                 }
             }
         }
-
+        
         foreach (array_keys($replied) as $recipient) {
             $user = User::staticGet('id', $recipient);
             if ($user) {
@@ -1111,22 +1128,22 @@ class Notice extends Memcached_DataObject
             }
         }
     }
-
+    
     function asAtomEntry($namespace=false, $source=false)
     {
         $profile = $this->getProfile();
-
+        
         $xs = new XMLStringer(true);
-
+        
         if ($namespace) {
             $attrs = array('xmlns' => 'http://www.w3.org/2005/Atom',
                            'xmlns:thr' => 'http://purl.org/syndication/thread/1.0');
         } else {
             $attrs = array();
         }
-
+        
         $xs->elementStart('entry', $attrs);
-
+        
         if ($source) {
             $xs->elementStart('source');
             $xs->element('title', null, $profile->nickname . " - " . common_config('site', 'name'));
@@ -1135,38 +1152,38 @@ class Notice extends Memcached_DataObject
             if (!empty($user)) {
                 $atom_feed = common_local_url('api',
                                               array('apiaction' => 'statuses',
-                                                    'method' => 'user_timeline',
-                                                    'argument' => $profile->nickname.'.atom'));
+                                                  'method' => 'user_timeline',
+                                                  'argument' => $profile->nickname.'.atom'));
                 $xs->element('link', array('rel' => 'self',
                                            'type' => 'application/atom+xml',
                                            'href' => $profile->profileurl));
                 $xs->element('link', array('rel' => 'license',
                                            'href' => common_config('license', 'url')));
             }
-
+            
             $xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE));
         }
-
+        
         $xs->elementStart('author');
         $xs->element('name', null, $profile->nickname);
         $xs->element('uri', null, $profile->profileurl);
         $xs->elementEnd('author');
-
+        
         if ($source) {
             $xs->elementEnd('source');
         }
-
+        
         $xs->element('title', null, $this->content);
         $xs->element('summary', null, $this->content);
-
+        
         $xs->element('link', array('rel' => 'alternate',
                                    'href' => $this->bestUrl()));
-
+        
         $xs->element('id', null, $this->uri);
-
+        
         $xs->element('published', null, common_date_w3dtf($this->created));
         $xs->element('updated', null, common_date_w3dtf($this->modified));
-
+        
         if ($this->reply_to) {
             $reply_notice = Notice::staticGet('id', $this->reply_to);
             if (!empty($reply_notice)) {
@@ -1177,9 +1194,9 @@ class Notice extends Memcached_DataObject
                                    'href' => $reply_notice->bestUrl()));
             }
         }
-
+        
         $xs->element('content', array('type' => 'html'), $this->rendered);
-
+        
         $tag = new Notice_tag();
         $tag->notice_id = $this->id;
         if ($tag->find()) {
@@ -1188,7 +1205,7 @@ class Notice extends Memcached_DataObject
             }
         }
         $tag->free();
-
+        
         # Enclosures
         $attachments = $this->attachments();
         if($attachments){
@@ -1203,12 +1220,12 @@ class Notice extends Memcached_DataObject
                 }
             }
         }
-
+        
         $xs->elementEnd('entry');
-
+        
         return $xs->getString();
     }
-
+    
     function bestUrl()
     {
         if (!empty($this->url)) {
@@ -1220,135 +1237,135 @@ class Notice extends Memcached_DataObject
                                     array('notice' => $this->id));
         }
     }
-
+    
     function stream($fn, $args, $cachekey, $offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
     {
         $cache = common_memcache();
-
+        
         if (empty($cache) ||
             $since_id != 0 || $max_id != 0 || (!is_null($since) && $since > 0) ||
             is_null($limit) ||
             ($offset + $limit) > NOTICE_CACHE_WINDOW) {
-            return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id,
-                                                                      $max_id, $since)));
-        }
-
+                return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id,
+                    $max_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 = $cache->get($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)));
-
+                $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)));
-
+            0, 0, null)));
+        
         $windowstr = implode(',', $window);
-
+        
         $result = $cache->set($idkey, $windowstr);
         $result = $cache->set($idkey . ';last', $windowstr);
-
+        
         $ids = array_slice($window, $offset, $limit);
-
+        
         return $ids;
     }
-
+    
     /**
-     * Determine which notice, if any, a new notice is in reply to.
-     *
-     * For conversation tracking, we try to see where this notice fits
-     * in the tree. Rough algorithm is:
-     *
-     * if (reply_to is set and valid) {
-     *     return reply_to;
-     * } else if ((source not API or Web) and (content starts with "T NAME" or "@name ")) {
-     *     return ID of last notice by initial @name in content;
-     * }
-     *
-     * Note that all @nickname instances will still be used to save "reply" records,
-     * so the notice shows up in the mentioned users' "replies" tab.
-     *
-     * @param integer $reply_to   ID passed in by Web or API
-     * @param integer $profile_id ID of author
-     * @param string  $source     Source tag, like 'web' or 'gwibber'
-     * @param string  $content    Final notice content
-     *
-     * @return integer ID of replied-to notice, or null for not a reply.
-     */
-
-    static function getReplyTo($reply_to, $profile_id, $source, $content)
+        * Determine which notice, if any, a new notice is in reply to.
+        *
+        * For conversation tracking, we try to see where this notice fits
+        * in the tree. Rough algorithm is:
+        *
+        * if (reply_to is set and valid) {
+        *     return reply_to;
+        * } else if ((source not API or Web) and (content starts with "T NAME" or "@name ")) {
+        *     return ID of last notice by initial @name in content;
+        * }
+    *
+        * Note that all @nickname instances will still be used to save "reply" records,
+        * so the notice shows up in the mentioned users' "replies" tab.
+        *
+        * @param integer $reply_to   ID passed in by Web or API
+        * @param integer $profile_id ID of author
+        * @param string  $source     Source tag, like 'web' or 'gwibber'
+        * @param string  $content    Final notice content
+        *
+        * @return integer ID of replied-to notice, or null for not a reply.
+        */
+        
+        static function getReplyTo($reply_to, $profile_id, $source, $content)
     {
         static $lb = array('xmpp', 'mail', 'sms', 'omb');
-
+        
         // If $reply_to is specified, we check that it exists, and then
         // return it if it does
-
+        
         if (!empty($reply_to)) {
             $reply_notice = Notice::staticGet('id', $reply_to);
             if (!empty($reply_notice)) {
                 return $reply_to;
             }
         }
-
+        
         // If it's not a "low bandwidth" source (one where you can't set
         // a reply_to argument), we return. This is mostly web and API
         // clients.
-
+        
         if (!in_array($source, $lb)) {
             return null;
         }
-
+        
         // Is there an initial @ or T?
-
+        
         if (preg_match('/^T ([A-Z0-9]{1,64}) /', $content, $match) ||
             preg_match('/^@([a-z0-9]{1,64})\s+/', $content, $match)) {
-            $nickname = common_canonical_nickname($match[1]);
-        } else {
-            return null;
-        }
-
+                $nickname = common_canonical_nickname($match[1]);
+            } else {
+                return null;
+            }
+        
         // Figure out who that is.
-
+        
         $sender = Profile::staticGet('id', $profile_id);
         $recipient = common_relative_profile($sender, $nickname, common_sql_now());
-
+        
         if (empty($recipient)) {
             return null;
         }
-
+        
         // Get their last notice
-
+        
         $last = $recipient->getCurrentNotice();
-
+        
         if (!empty($last)) {
             return $last->id;
         }
     }
-
+    
     static function maxContent()
     {
         $contentlimit = common_config('notice', 'contentlimit');
@@ -1358,7 +1375,7 @@ class Notice extends Memcached_DataObject
         }
         return $contentlimit;
     }
-
+    
     static function contentTooLong($content)
     {
         $contentlimit = self::maxContent();

From 18f4a7eaea3c78cb55db843d77b43db86ac70308 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 3 Oct 2009 20:34:40 -0400
Subject: [PATCH 191/247] reformat Notice.php

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

diff --git a/classes/Notice.php b/classes/Notice.php
index c68098c654..ba2227c0a3 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -15,7 +15,7 @@
  *
  * 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 Notices
  * @package  StatusNet
  * @author   Brenda Wallace <shiny@cpan.org>
@@ -32,13 +32,13 @@
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { 
-    exit(1); 
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
 }
 
 /**
-* Table Definition for notice
-*/
+ * Table Definition for notice
+ */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
 /* We keep the first three 20-notice pages, plus one for pagination check,
@@ -52,7 +52,7 @@ class Notice extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
-    
+
     public $__table = 'notice';                          // table name
     public $id;                              // int(4)  primary_key not_null
     public $profile_id;                      // int(4)   not_null
@@ -66,45 +66,45 @@ class Notice extends Memcached_DataObject
     public $is_local;                        // tinyint(1)
     public $source;                          // varchar(32)
     public $conversation;                    // int(4)
-    
+
     /* Static get */
     function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Notice',$k,$v); }
-    
+
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
-    
+
     /* Notice types */
     const LOCAL_PUBLIC    =  1;
     const REMOTE_OMB      =  0;
     const LOCAL_NONPUBLIC = -1;
     const GATEWAY         = -2;
-    
+
     function getProfile()
     {
         return Profile::staticGet('id', $this->profile_id);
     }
-    
+
     function delete()
     {
         $this->blowCaches(true);
         $this->blowFavesCache(true);
         $this->blowSubsCache(true);
-        
+
         // For auditing purposes, save a record that the notice
         // was deleted.
-        
+
         $deleted = new Deleted_notice();
-        
+
         $deleted->id         = $this->id;
         $deleted->profile_id = $this->profile_id;
         $deleted->uri        = $this->uri;
         $deleted->created    = $this->created;
         $deleted->deleted    = common_sql_now();
-        
+
         $this->query('BEGIN');
-        
+
         $deleted->insert();
-        
+
         //Null any notices that are replies to this notice
         $this->query(sprintf("UPDATE notice set reply_to = null WHERE reply_to = %d", $this->id));
         $related = array('Reply',
@@ -123,7 +123,7 @@ class Notice extends Memcached_DataObject
         $result = parent::delete();
         $this->query('COMMIT');
     }
-    
+
     function saveTags()
     {
         /* extract all #hastags */
@@ -131,14 +131,14 @@ class Notice extends Memcached_DataObject
         if (!$count) {
             return true;
         }
-        
+
         //turn each into their canonical tag
         //this is needed to remove dupes before saving e.g. #hash.tag = #hashtag
         $hashtags = array();
         for($i=0; $i<count($match[1]); $i++) {
             $hashtags[] = common_canonical_tag($match[1][$i]);
         }
-        
+
         /* Add them to the database */
         foreach(array_unique($hashtags) as $hashtag) {
             /* elide characters we don't want in the tag */
@@ -146,7 +146,7 @@ class Notice extends Memcached_DataObject
         }
         return true;
     }
-    
+
     function saveTag($hashtag)
     {
         $tag = new Notice_tag();
@@ -154,158 +154,158 @@ class Notice extends Memcached_DataObject
         $tag->tag = $hashtag;
         $tag->created = $this->created;
         $id = $tag->insert();
-        
+
         if (!$id) {
             throw new ServerException(sprintf(_('DB error inserting hashtag: %s'),
                                               $last_error->message));
             return;
         }
     }
-    
+
     static function saveNew($profile_id, $content, $source=null,
                             $is_local=Notice::LOCAL_PUBLIC, $reply_to=null, $uri=null, $created=null) {
-                                
-                                $profile = Profile::staticGet($profile_id);
-                                
-                                $final = common_shorten_links($content);
-                                
-                                if (Notice::contentTooLong($final)) {
-                                    throw new ClientException(_('Problem saving notice. Too long.'));
-                                }
-                                
-                                if (!$profile) {
-                                    throw new ClientException(_('Problem saving notice. Unknown user.'));
-                                }
-                                
-                                if (common_config('throttle', 'enabled') && !Notice::checkEditThrottle($profile_id)) {
-                                    common_log(LOG_WARNING, 'Excessive posting by profile #' . $profile_id . '; throttled.');
-                                    throw new ClientException(_('Too many notices too fast; take a breather '.
+
+        $profile = Profile::staticGet($profile_id);
+
+        $final = common_shorten_links($content);
+
+        if (Notice::contentTooLong($final)) {
+            throw new ClientException(_('Problem saving notice. Too long.'));
+        }
+
+        if (!$profile) {
+            throw new ClientException(_('Problem saving notice. Unknown user.'));
+        }
+
+        if (common_config('throttle', 'enabled') && !Notice::checkEditThrottle($profile_id)) {
+            common_log(LOG_WARNING, 'Excessive posting by profile #' . $profile_id . '; throttled.');
+            throw new ClientException(_('Too many notices too fast; take a breather '.
                                         'and post again in a few minutes.'));
-                                }
-                                
-                                if (common_config('site', 'dupelimit') > 0 && !Notice::checkDupes($profile_id, $final)) {
-                                    common_log(LOG_WARNING, 'Dupe posting by profile #' . $profile_id . '; throttled.');
-                                    throw new ClientException(_('Too many duplicate messages too quickly;'.
+        }
+
+        if (common_config('site', 'dupelimit') > 0 && !Notice::checkDupes($profile_id, $final)) {
+            common_log(LOG_WARNING, 'Dupe posting by profile #' . $profile_id . '; throttled.');
+            throw new ClientException(_('Too many duplicate messages too quickly;'.
                                         ' take a breather and post again in a few minutes.'));
-                                }
-                                
-                                $banned = common_config('profile', 'banned');
-                                
-                                if ( in_array($profile_id, $banned) || in_array($profile->nickname, $banned)) {
-                                    common_log(LOG_WARNING, "Attempted post from banned user: $profile->nickname (user id = $profile_id).");
-                                    throw new ClientException(_('You are banned from posting notices on this site.'));
-                                }
-                                
-                                $notice = new Notice();
-                                $notice->profile_id = $profile_id;
-                                
-                                $blacklist = common_config('public', 'blacklist');
-                                $autosource = common_config('public', 'autosource');
-                                
+        }
+
+        $banned = common_config('profile', 'banned');
+
+        if ( in_array($profile_id, $banned) || in_array($profile->nickname, $banned)) {
+            common_log(LOG_WARNING, "Attempted post from banned user: $profile->nickname (user id = $profile_id).");
+            throw new ClientException(_('You are banned from posting notices on this site.'));
+        }
+
+        $notice = new Notice();
+        $notice->profile_id = $profile_id;
+
+        $blacklist = common_config('public', 'blacklist');
+        $autosource = common_config('public', 'autosource');
+
         # Blacklisted are non-false, but not 1, either
-                                
-                                if (($blacklist && in_array($profile_id, $blacklist)) ||
-                                    ($source && $autosource && in_array($source, $autosource))) {
-                                        $notice->is_local = Notice::LOCAL_NONPUBLIC;
-                                    } else {
-                                        $notice->is_local = $is_local;
-                                    }
-                                
-                                if (!empty($created)) {
-                                    $notice->created = $created;
-                                } else {
-                                    $notice->created = common_sql_now();
-                                }
-                                
-                                $notice->content = $final;
-                                $notice->rendered = common_render_content($final, $notice);
-                                $notice->source = $source;
-                                $notice->uri = $uri;
-                                
-                                $notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final);
-                                
-                                if (!empty($notice->reply_to)) {
-                                    $reply = Notice::staticGet('id', $notice->reply_to);
-                                    $notice->conversation = $reply->conversation;
-                                }
-                                
-                                if (Event::handle('StartNoticeSave', array(&$notice))) {
-                                    
+
+        if (($blacklist && in_array($profile_id, $blacklist)) ||
+            ($source && $autosource && in_array($source, $autosource))) {
+            $notice->is_local = Notice::LOCAL_NONPUBLIC;
+        } else {
+            $notice->is_local = $is_local;
+        }
+
+        if (!empty($created)) {
+            $notice->created = $created;
+        } else {
+            $notice->created = common_sql_now();
+        }
+
+        $notice->content = $final;
+        $notice->rendered = common_render_content($final, $notice);
+        $notice->source = $source;
+        $notice->uri = $uri;
+
+        $notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final);
+
+        if (!empty($notice->reply_to)) {
+            $reply = Notice::staticGet('id', $notice->reply_to);
+            $notice->conversation = $reply->conversation;
+        }
+
+        if (Event::handle('StartNoticeSave', array(&$notice))) {
+
             // XXX: some of these functions write to the DB
-                                    
-                                    $notice->query('BEGIN');
-                                    
-                                    $id = $notice->insert();
-                                    
-                                    if (!$id) {
-                                        common_log_db_error($notice, 'INSERT', __FILE__);
-                                        throw new ServerException(_('Problem saving notice.'));
-                                    }
-                                    
+
+            $notice->query('BEGIN');
+
+            $id = $notice->insert();
+
+            if (!$id) {
+                common_log_db_error($notice, 'INSERT', __FILE__);
+                throw new ServerException(_('Problem saving notice.'));
+            }
+
             // Update ID-dependent columns: URI, conversation
-                                    
-                                    $orig = clone($notice);
-                                    
-                                    $changed = false;
-                                    
-                                    if (empty($uri)) {
-                                        $notice->uri = common_notice_uri($notice);
-                                        $changed = true;
-                                    }
-                                    
+
+            $orig = clone($notice);
+
+            $changed = false;
+
+            if (empty($uri)) {
+                $notice->uri = common_notice_uri($notice);
+                $changed = true;
+            }
+
             // If it's not part of a conversation, it's
             // the beginning of a new conversation.
-                                    
-                                    if (empty($notice->conversation)) {
-                                        $notice->conversation = $notice->id;
-                                        $changed = true;
-                                    }
-                                    
-                                    if ($changed) {
-                                        if (!$notice->update($orig)) {
-                                            common_log_db_error($notice, 'UPDATE', __FILE__);
-                                            throw new ServerException(_('Problem saving notice.'));
-                                        }
-                                    }
-                                    
+
+            if (empty($notice->conversation)) {
+                $notice->conversation = $notice->id;
+                $changed = true;
+            }
+
+            if ($changed) {
+                if (!$notice->update($orig)) {
+                    common_log_db_error($notice, 'UPDATE', __FILE__);
+                    throw new ServerException(_('Problem saving notice.'));
+                }
+            }
+
             // XXX: do we need to change this for remote users?
-                                    
-                                    $notice->saveReplies();
-                                    $notice->saveTags();
-                                    
-                                    $notice->addToInboxes();
-                                    
-                                    $notice->saveUrls();
-                                    
-                                    $notice->query('COMMIT');
-                                    
-                                    Event::handle('EndNoticeSave', array($notice));
-                                }
-                                
+
+            $notice->saveReplies();
+            $notice->saveTags();
+
+            $notice->addToInboxes();
+
+            $notice->saveUrls();
+
+            $notice->query('COMMIT');
+
+            Event::handle('EndNoticeSave', array($notice));
+        }
+
         # Clear the cache for subscribed users, so they'll update at next request
         # XXX: someone clever could prepend instead of clearing the cache
-                                
-                                $notice->blowCaches();
-                                
-                                return $notice;
-                            }
-    
+
+        $notice->blowCaches();
+
+        return $notice;
+    }
+
     /** save all urls in the notice to the db
-        *
-        * follow redirects and save all available file information
-        * (mimetype, date, size, oembed, etc.)
-        *
-        * @return void
-        */
-        function saveUrls() {
-            common_replace_urls_callback($this->content, array($this, 'saveUrl'), $this->id);
-        }
-    
+     *
+     * follow redirects and save all available file information
+     * (mimetype, date, size, oembed, etc.)
+     *
+     * @return void
+     */
+    function saveUrls() {
+        common_replace_urls_callback($this->content, array($this, 'saveUrl'), $this->id);
+    }
+
     function saveUrl($data) {
         list($url, $notice_id) = $data;
         File::processNew($url, $notice_id);
     }
-    
+
     static function checkDupes($profile_id, $content) {
         $profile = Profile::staticGet($profile_id);
         if (!$profile) {
@@ -328,14 +328,14 @@ class Notice extends Memcached_DataObject
         $notice->profile_id = $profile_id;
         $notice->content = $content;
         if (common_config('db','type') == 'pgsql')
-            $notice->whereAdd('extract(epoch from now() - created) < ' . common_config('site', 'dupelimit'));
+          $notice->whereAdd('extract(epoch from now() - created) < ' . common_config('site', 'dupelimit'));
         else
-            $notice->whereAdd('now() - created < ' . common_config('site', 'dupelimit'));
-        
+          $notice->whereAdd('now() - created < ' . common_config('site', 'dupelimit'));
+
         $cnt = $notice->count();
         return ($cnt == 0);
     }
-    
+
     static function checkEditThrottle($profile_id) {
         $profile = Profile::staticGet($profile_id);
         if (!$profile) {
@@ -353,7 +353,7 @@ class Notice extends Memcached_DataObject
         # Either not N notices in the stream, OR the Nth was not posted within timespan seconds
         return true;
     }
-    
+
     function getUploadedAttachment() {
         $post = clone $this;
         $query = 'select file.url as up, file.id as i from file join file_to_post on file.id = file_id where post_id=' . $post->escape($post->id) . ' and url like "%/notice/%/file"';
@@ -367,7 +367,7 @@ class Notice extends Memcached_DataObject
         $post->free();
         return $ret;
     }
-    
+
     function hasAttachments() {
         $post = clone $this;
         $query = "select count(file_id) as n_attachments from file join file_to_post on (file_id = file.id) join notice on (post_id = notice.id) where post_id = " . $post->escape($post->id);
@@ -377,7 +377,7 @@ class Notice extends Memcached_DataObject
         $post->free();
         return $n_attachments;
     }
-    
+
     function attachments() {
         // XXX: cache this
         $att = array();
@@ -391,7 +391,7 @@ class Notice extends Memcached_DataObject
         }
         return $att;
     }
-    
+
     function blowCaches($blowLast=false)
     {
         $this->blowSubsCache($blowLast);
@@ -404,7 +404,7 @@ class Notice extends Memcached_DataObject
         $profile = Profile::staticGet($this->profile_id);
         $profile->blowNoticeCount();
     }
-    
+
     function blowConversationCache($blowLast=false)
     {
         $cache = common_memcache();
@@ -416,7 +416,7 @@ class Notice extends Memcached_DataObject
             }
         }
     }
-    
+
     function blowGroupCache($blowLast=false)
     {
         $cache = common_memcache();
@@ -445,7 +445,7 @@ class Notice extends Memcached_DataObject
             unset($group_inbox);
         }
     }
-    
+
     function blowTagCache($blowLast=false)
     {
         $cache = common_memcache();
@@ -456,7 +456,7 @@ class Notice extends Memcached_DataObject
                 while ($tag->fetch()) {
                     $tag->blowCache($blowLast);
                     $ck = 'profile:notice_ids_tagged:' . $this->profile_id . ':' . $tag->tag;
-                    
+
                     $cache->delete($ck);
                     if ($blowLast) {
                         $cache->delete($ck . ';last');
@@ -467,19 +467,19 @@ class Notice extends Memcached_DataObject
             unset($tag);
         }
     }
-    
+
     function blowSubsCache($blowLast=false)
     {
         $cache = common_memcache();
         if ($cache) {
             $user = new User();
-            
+
             $UT = common_config('db','type')=='pgsql'?'"user"':'user';
             $user->query('SELECT id ' .
-                         
+
                          "FROM $UT JOIN subscription ON $UT.id = subscription.subscriber " .
                          '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_own:'.$user->id));
@@ -492,7 +492,7 @@ class Notice extends Memcached_DataObject
             unset($user);
         }
     }
-    
+
     function blowNoticeCache($blowLast=false)
     {
         if ($this->is_local) {
@@ -505,7 +505,7 @@ class Notice extends Memcached_DataObject
             }
         }
     }
-    
+
     function blowRepliesCache($blowLast=false)
     {
         $cache = common_memcache();
@@ -524,7 +524,7 @@ class Notice extends Memcached_DataObject
             unset($reply);
         }
     }
-    
+
     function blowPublicCache($blowLast=false)
     {
         if ($this->is_local == Notice::LOCAL_PUBLIC) {
@@ -537,7 +537,7 @@ class Notice extends Memcached_DataObject
             }
         }
     }
-    
+
     function blowFavesCache($blowLast=false)
     {
         $cache = common_memcache();
@@ -558,14 +558,14 @@ class Notice extends Memcached_DataObject
             unset($fave);
         }
     }
-    
+
     # XXX: too many args; we need to move to named params or even a separate
     # class for notice streams
-    
+
     static function getStream($qry, $cachekey, $offset=0, $limit=20, $since_id=0, $max_id=0, $order=null, $since=null) {
-        
+
         if (common_config('memcached', 'enabled')) {
-            
+
             # Skip the cache if this is a since, since_id or max_id qry
             if ($since_id > 0 || $max_id > 0 || $since) {
                 return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since);
@@ -573,127 +573,127 @@ class Notice extends Memcached_DataObject
                 return Notice::getCachedStream($qry, $cachekey, $offset, $limit, $order);
             }
         }
-        
+
         return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since);
     }
-    
+
     static function getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since) {
-        
+
         $needAnd = false;
         $needWhere = true;
-        
+
         if (preg_match('/\bWHERE\b/i', $qry)) {
             $needWhere = false;
             $needAnd = true;
         }
-        
+
         if ($since_id > 0) {
-            
+
             if ($needWhere) {
                 $qry .= ' WHERE ';
                 $needWhere = false;
             } else {
                 $qry .= ' AND ';
             }
-            
+
             $qry .= ' notice.id > ' . $since_id;
         }
-        
+
         if ($max_id > 0) {
-            
+
             if ($needWhere) {
                 $qry .= ' WHERE ';
                 $needWhere = false;
             } else {
                 $qry .= ' AND ';
             }
-            
+
             $qry .= ' notice.id <= ' . $max_id;
         }
-        
+
         if ($since) {
-            
+
             if ($needWhere) {
                 $qry .= ' WHERE ';
                 $needWhere = false;
             } else {
                 $qry .= ' AND ';
             }
-            
+
             $qry .= ' notice.created > \'' . date('Y-m-d H:i:s', $since) . '\'';
         }
-        
+
         # Allow ORDER override
-        
+
         if ($order) {
             $qry .= $order;
         } else {
             $qry .= ' ORDER BY notice.created DESC, notice.id DESC ';
         }
-        
+
         if (common_config('db','type') == 'pgsql') {
             $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
         } else {
             $qry .= ' LIMIT ' . $offset . ', ' . $limit;
         }
-        
+
         $notice = new Notice();
-        
+
         $notice->query($qry);
-        
+
         return $notice;
     }
-    
+
     # XXX: this is pretty long and should probably be broken up into
     # some helper functions
-    
+
     static function getCachedStream($qry, $cachekey, $offset, $limit, $order) {
-        
+
         # If outside our cache window, just go to the DB
-        
+
         if ($offset + $limit > NOTICE_CACHE_WINDOW) {
             return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
         }
-        
+
         # Get the cache; if we can't, just go to the DB
-        
+
         $cache = common_memcache();
-        
+
         if (!$cache) {
             return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
         }
-        
+
         # 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;
         }
-        
+
         # If the cache was invalidated because of new data being
         # added, we can try and just get the new stuff. We keep an additional
         # copy of the data at the key + ';last'
-        
+
         # No cache hit. Try to get the *last* cached version
-        
+
         $last_notices = $cache->get(common_cache_key($cachekey) . ';last');
-        
+
         if ($last_notices) {
-            
+
             # Reverse-chron order, so last ID is last.
-            
+
             $last_id = $last_notices[0]->id;
-            
+
             # XXX: this assumes monotonically increasing IDs; a fair
             # bet with our DB.
-            
+
             $new_notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW,
-                $last_id, null, $order, null);
-            
+                                                  $last_id, null, $order, null);
+
             if ($new_notice) {
                 $new_notices = array();
                 while ($new_notice->fetch()) {
@@ -702,54 +702,54 @@ class Notice extends Memcached_DataObject
                 $new_notice->free();
                 $notices = array_slice(array_merge($new_notices, $last_notices),
                                        0, NOTICE_CACHE_WINDOW);
-                
+
                 # Store the array in the cache for next time
-                
+
                 $result = $cache->set(common_cache_key($cachekey), $notices);
                 $result = $cache->set(common_cache_key($cachekey) . ';last', $notices);
-                
+
                 # return a wrapper of the array for use now
-                
+
                 return new ArrayWrapper(array_slice($notices, $offset, $limit));
             }
         }
-        
+
         # Otherwise, get the full cache window out of the DB
-        
+
         $notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW, null, null, $order, null);
-        
+
         # If there are no hits, just return the value
-        
+
         if (!$notice) {
             return $notice;
         }
-        
+
         # Pack results into an array
-        
+
         $notices = array();
-        
+
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
-        
+
         $notice->free();
-        
+
         # Store the array in the cache for next time
-        
+
         $result = $cache->set(common_cache_key($cachekey), $notices);
         $result = $cache->set(common_cache_key($cachekey) . ';last', $notices);
-        
+
         # return a wrapper of the array for use now
-        
+
         $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit));
-        
+
         return $wrapper;
     }
-    
+
     function getStreamByIds($ids)
     {
         $cache = common_memcache();
-        
+
         if (!empty($cache)) {
             $notices = array();
             foreach ($ids as $id) {
@@ -767,35 +767,35 @@ class Notice extends Memcached_DataObject
             }
             $notice->whereAdd('id in (' . implode(', ', $ids) . ')');
             $notice->orderBy('id DESC');
-            
+
             $notice->find();
             return $notice;
         }
     }
-    
+
     function publicStream($offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
     {
         $ids = Notice::stream(array('Notice', '_publicStreamDirect'),
                               array(),
                               'public',
                               $offset, $limit, $since_id, $max_id, $since);
-        
+
         return Notice::getStreamByIds($ids);
     }
-    
+
     function _publicStreamDirect($offset=0, $limit=20, $since_id=0, $max_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')) {
             $notice->whereAdd('is_local = ' . Notice::LOCAL_PUBLIC);
         } else {
@@ -803,108 +803,108 @@ class Notice extends Memcached_DataObject
             $notice->whereAdd('is_local !='. Notice::LOCAL_NONPUBLIC);
             $notice->whereAdd('is_local !='. Notice::GATEWAY);
         }
-        
+
         if ($since_id != 0) {
             $notice->whereAdd('id > ' . $since_id);
         }
-        
+
         if ($max_id != 0) {
             $notice->whereAdd('id <= ' . $max_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 conversationStream($id, $offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
     {
         $ids = Notice::stream(array('Notice', '_conversationStreamDirect'),
                               array($id),
                               'notice:conversation_ids:'.$id,
                               $offset, $limit, $since_id, $max_id, $since);
-        
+
         return Notice::getStreamByIds($ids);
     }
-    
+
     function _conversationStreamDirect($id, $offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
     {
         $notice = new Notice();
-        
+
         $notice->selectAdd(); // clears it
         $notice->selectAdd('id');
-        
+
         $notice->conversation = $id;
-        
+
         $notice->orderBy('id DESC');
-        
+
         if (!is_null($offset)) {
             $notice->limit($offset, $limit);
         }
-        
+
         if ($since_id != 0) {
             $notice->whereAdd('id > ' . $since_id);
         }
-        
+
         if ($max_id != 0) {
             $notice->whereAdd('id <= ' . $max_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()
     {
         $enabled = common_config('inboxes', 'enabled');
-        
+
         if ($enabled === true || $enabled === 'transitional') {
-            
+
             // XXX: loads constants
-            
+
             $inbox = new Notice_inbox();
-            
+
             $users = $this->getSubscribedUsers();
-            
+
             // FIXME: kind of ignoring 'transitional'...
             // we'll probably stop supporting inboxless mode
             // in 0.9.x
-            
+
             $ni = array();
-            
+
             foreach ($users as $id) {
                 $ni[$id] = NOTICE_INBOX_SOURCE_SUB;
             }
-            
+
             $groups = $this->saveGroups();
-            
+
             foreach ($groups as $group) {
                 $users = $group->getUserMembers();
                 foreach ($users as $id) {
@@ -913,12 +913,12 @@ class Notice extends Memcached_DataObject
                     }
                 }
             }
-            
+
             $cnt = 0;
-            
+
             $qryhdr = 'INSERT INTO notice_inbox (user_id, notice_id, source, created) VALUES ';
             $qry = $qryhdr;
-            
+
             foreach ($ni as $id => $source) {
                 if ($cnt > 0) {
                     $qry .= ', ';
@@ -936,52 +936,52 @@ class Notice extends Memcached_DataObject
                     $cnt = 0;
                 }
             }
-            
+
             if ($cnt > 0) {
                 $inbox = new Notice_inbox();
                 $inbox->query($qry);
             }
         }
-        
+
         return;
     }
-    
+
     function getSubscribedUsers()
     {
         $user = new User();
-        
+
         if(common_config('db','quote_identifiers'))
-            $user_table = '"user"';
+          $user_table = '"user"';
         else $user_table = 'user';
-        
+
         $qry =
-            'SELECT id ' .
-            'FROM '. $user_table .' JOIN subscription '.
-            'ON '. $user_table .'.id = subscription.subscriber ' .
-            'WHERE subscription.subscribed = %d ';
-        
+          'SELECT id ' .
+          'FROM '. $user_table .' JOIN subscription '.
+          'ON '. $user_table .'.id = subscription.subscriber ' .
+          'WHERE subscription.subscribed = %d ';
+
         $user->query(sprintf($qry, $this->profile_id));
-        
+
         $ids = array();
-        
+
         while ($user->fetch()) {
             $ids[] = $user->id;
         }
-        
+
         $user->free();
-        
+
         return $ids;
     }
-    
+
     function saveGroups()
     {
         $groups = array();
-        
+
         $enabled = common_config('inboxes', 'enabled');
         if ($enabled !== true && $enabled !== 'transitional') {
             return $groups;
         }
-        
+
         /* extract all !group */
         $count = preg_match_all('/(?:^|\s)!([A-Za-z0-9]{1,64})/',
                                 strtolower($this->content),
@@ -989,62 +989,62 @@ class Notice extends Memcached_DataObject
         if (!$count) {
             return $groups;
         }
-        
+
         $profile = $this->getProfile();
-        
+
         /* Add them to the database */
-        
+
         foreach (array_unique($match[1]) as $nickname) {
             /* XXX: remote groups. */
             $group = User_group::getForNickname($nickname);
-            
+
             if (empty($group)) {
                 continue;
             }
-            
+
             // we automatically add a tag for every group name, too
-            
+
             $tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($nickname),
                                              'notice_id' => $this->id));
-            
+
             if (is_null($tag)) {
                 $this->saveTag($nickname);
             }
-            
+
             if ($profile->isMember($group)) {
-                
+
                 $result = $this->addToGroupInbox($group);
-                
+
                 if (!$result) {
                     common_log_db_error($gi, 'INSERT', __FILE__);
                 }
-                
+
                 $groups[] = clone($group);
             }
         }
-        
+
         return $groups;
     }
-    
+
     function addToGroupInbox($group)
     {
         $gi = Group_inbox::pkeyGet(array('group_id' => $group->id,
                                          'notice_id' => $this->id));
-        
+
         if (empty($gi)) {
-            
+
             $gi = new Group_inbox();
-            
+
             $gi->group_id  = $group->id;
             $gi->notice_id = $this->id;
             $gi->created   = $this->created;
-            
+
             return $gi->insert();
         }
-        
+
         return true;
     }
-    
+
     function saveReplies()
     {
         // Alternative reply format
@@ -1054,21 +1054,21 @@ class Notice extends Memcached_DataObject
         }
         // extract all @messages
         $cnt = preg_match_all('/(?:^|\s)@([a-z0-9]{1,64})/', $this->content, $match);
-        
+
         $names = array();
-        
+
         if ($cnt || $tname) {
             // XXX: is there another way to make an array copy?
             $names = ($tname) ? array_unique(array_merge(array(strtolower($tname)), $match[1])) : array_unique($match[1]);
         }
-        
+
         $sender = Profile::staticGet($this->profile_id);
-        
+
         $replied = array();
-        
+
         // store replied only for first @ (what user/notice what the reply directed,
         // we assume first @ is it)
-        
+
         for ($i=0; $i<count($names); $i++) {
             $nickname = $names[$i];
             $recipient = common_relative_profile($sender, $nickname, $this->created);
@@ -1093,7 +1093,7 @@ class Notice extends Memcached_DataObject
                 $replied[$recipient->id] = 1;
             }
         }
-        
+
         // Hash format replies, too
         $cnt = preg_match_all('/(?:^|\s)@#([a-z0-9]{1,64})/', $this->content, $match);
         if ($cnt) {
@@ -1120,7 +1120,7 @@ class Notice extends Memcached_DataObject
                 }
             }
         }
-        
+
         foreach (array_keys($replied) as $recipient) {
             $user = User::staticGet('id', $recipient);
             if ($user) {
@@ -1128,22 +1128,22 @@ class Notice extends Memcached_DataObject
             }
         }
     }
-    
+
     function asAtomEntry($namespace=false, $source=false)
     {
         $profile = $this->getProfile();
-        
+
         $xs = new XMLStringer(true);
-        
+
         if ($namespace) {
             $attrs = array('xmlns' => 'http://www.w3.org/2005/Atom',
                            'xmlns:thr' => 'http://purl.org/syndication/thread/1.0');
         } else {
             $attrs = array();
         }
-        
+
         $xs->elementStart('entry', $attrs);
-        
+
         if ($source) {
             $xs->elementStart('source');
             $xs->element('title', null, $profile->nickname . " - " . common_config('site', 'name'));
@@ -1152,38 +1152,38 @@ class Notice extends Memcached_DataObject
             if (!empty($user)) {
                 $atom_feed = common_local_url('api',
                                               array('apiaction' => 'statuses',
-                                                  'method' => 'user_timeline',
-                                                  'argument' => $profile->nickname.'.atom'));
+                                                    'method' => 'user_timeline',
+                                                    'argument' => $profile->nickname.'.atom'));
                 $xs->element('link', array('rel' => 'self',
                                            'type' => 'application/atom+xml',
                                            'href' => $profile->profileurl));
                 $xs->element('link', array('rel' => 'license',
                                            'href' => common_config('license', 'url')));
             }
-            
+
             $xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE));
         }
-        
+
         $xs->elementStart('author');
         $xs->element('name', null, $profile->nickname);
         $xs->element('uri', null, $profile->profileurl);
         $xs->elementEnd('author');
-        
+
         if ($source) {
             $xs->elementEnd('source');
         }
-        
+
         $xs->element('title', null, $this->content);
         $xs->element('summary', null, $this->content);
-        
+
         $xs->element('link', array('rel' => 'alternate',
                                    'href' => $this->bestUrl()));
-        
+
         $xs->element('id', null, $this->uri);
-        
+
         $xs->element('published', null, common_date_w3dtf($this->created));
         $xs->element('updated', null, common_date_w3dtf($this->modified));
-        
+
         if ($this->reply_to) {
             $reply_notice = Notice::staticGet('id', $this->reply_to);
             if (!empty($reply_notice)) {
@@ -1194,9 +1194,9 @@ class Notice extends Memcached_DataObject
                                    'href' => $reply_notice->bestUrl()));
             }
         }
-        
+
         $xs->element('content', array('type' => 'html'), $this->rendered);
-        
+
         $tag = new Notice_tag();
         $tag->notice_id = $this->id;
         if ($tag->find()) {
@@ -1205,7 +1205,7 @@ class Notice extends Memcached_DataObject
             }
         }
         $tag->free();
-        
+
         # Enclosures
         $attachments = $this->attachments();
         if($attachments){
@@ -1220,12 +1220,12 @@ class Notice extends Memcached_DataObject
                 }
             }
         }
-        
+
         $xs->elementEnd('entry');
-        
+
         return $xs->getString();
     }
-    
+
     function bestUrl()
     {
         if (!empty($this->url)) {
@@ -1237,135 +1237,135 @@ class Notice extends Memcached_DataObject
                                     array('notice' => $this->id));
         }
     }
-    
+
     function stream($fn, $args, $cachekey, $offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
     {
         $cache = common_memcache();
-        
+
         if (empty($cache) ||
             $since_id != 0 || $max_id != 0 || (!is_null($since) && $since > 0) ||
             is_null($limit) ||
             ($offset + $limit) > NOTICE_CACHE_WINDOW) {
-                return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id,
-                    $max_id, $since)));
-            }
-        
+            return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id,
+                                                                      $max_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 = $cache->get($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)));
-            
+                                                                          $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)));
-        
+                                                                     0, 0, null)));
+
         $windowstr = implode(',', $window);
-        
+
         $result = $cache->set($idkey, $windowstr);
         $result = $cache->set($idkey . ';last', $windowstr);
-        
+
         $ids = array_slice($window, $offset, $limit);
-        
+
         return $ids;
     }
-    
+
     /**
-        * Determine which notice, if any, a new notice is in reply to.
-        *
-        * For conversation tracking, we try to see where this notice fits
-        * in the tree. Rough algorithm is:
-        *
-        * if (reply_to is set and valid) {
-        *     return reply_to;
-        * } else if ((source not API or Web) and (content starts with "T NAME" or "@name ")) {
-        *     return ID of last notice by initial @name in content;
-        * }
-    *
-        * Note that all @nickname instances will still be used to save "reply" records,
-        * so the notice shows up in the mentioned users' "replies" tab.
-        *
-        * @param integer $reply_to   ID passed in by Web or API
-        * @param integer $profile_id ID of author
-        * @param string  $source     Source tag, like 'web' or 'gwibber'
-        * @param string  $content    Final notice content
-        *
-        * @return integer ID of replied-to notice, or null for not a reply.
-        */
-        
-        static function getReplyTo($reply_to, $profile_id, $source, $content)
+     * Determine which notice, if any, a new notice is in reply to.
+     *
+     * For conversation tracking, we try to see where this notice fits
+     * in the tree. Rough algorithm is:
+     *
+     * if (reply_to is set and valid) {
+     *     return reply_to;
+     * } else if ((source not API or Web) and (content starts with "T NAME" or "@name ")) {
+     *     return ID of last notice by initial @name in content;
+     * }
+     *
+     * Note that all @nickname instances will still be used to save "reply" records,
+     * so the notice shows up in the mentioned users' "replies" tab.
+     *
+     * @param integer $reply_to   ID passed in by Web or API
+     * @param integer $profile_id ID of author
+     * @param string  $source     Source tag, like 'web' or 'gwibber'
+     * @param string  $content    Final notice content
+     *
+     * @return integer ID of replied-to notice, or null for not a reply.
+     */
+
+    static function getReplyTo($reply_to, $profile_id, $source, $content)
     {
         static $lb = array('xmpp', 'mail', 'sms', 'omb');
-        
+
         // If $reply_to is specified, we check that it exists, and then
         // return it if it does
-        
+
         if (!empty($reply_to)) {
             $reply_notice = Notice::staticGet('id', $reply_to);
             if (!empty($reply_notice)) {
                 return $reply_to;
             }
         }
-        
+
         // If it's not a "low bandwidth" source (one where you can't set
         // a reply_to argument), we return. This is mostly web and API
         // clients.
-        
+
         if (!in_array($source, $lb)) {
             return null;
         }
-        
+
         // Is there an initial @ or T?
-        
+
         if (preg_match('/^T ([A-Z0-9]{1,64}) /', $content, $match) ||
             preg_match('/^@([a-z0-9]{1,64})\s+/', $content, $match)) {
-                $nickname = common_canonical_nickname($match[1]);
-            } else {
-                return null;
-            }
-        
+            $nickname = common_canonical_nickname($match[1]);
+        } else {
+            return null;
+        }
+
         // Figure out who that is.
-        
+
         $sender = Profile::staticGet('id', $profile_id);
         $recipient = common_relative_profile($sender, $nickname, common_sql_now());
-        
+
         if (empty($recipient)) {
             return null;
         }
-        
+
         // Get their last notice
-        
+
         $last = $recipient->getCurrentNotice();
-        
+
         if (!empty($last)) {
             return $last->id;
         }
     }
-    
+
     static function maxContent()
     {
         $contentlimit = common_config('notice', 'contentlimit');
@@ -1375,7 +1375,7 @@ class Notice extends Memcached_DataObject
         }
         return $contentlimit;
     }
-    
+
     static function contentTooLong($content)
     {
         $contentlimit = self::maxContent();

From 9c460d591e1e11f7aa3970ffd0b3e320dd11d33e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 23:23:13 -0400
Subject: [PATCH 192/247] move scripts to just before </body>, add event for
 scripts that need to be in <head>

---
 lib/action.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 71ceffe20d..1b2f737521 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -120,14 +120,16 @@ class Action extends HTMLOutputter // lawsuit
     {
         // XXX: attributes (profile?)
         $this->elementStart('head');
-        $this->showTitle();
-        $this->showShortcutIcon();
-        $this->showStylesheets();
-        $this->showScripts();
-        $this->showOpenSearch();
-        $this->showFeeds();
-        $this->showDescription();
-        $this->extraHead();
+        if (Event::handle('StartShowHeadElements', array($this))) {
+            $this->showTitle();
+            $this->showShortcutIcon();
+            $this->showStylesheets();
+            $this->showOpenSearch();
+            $this->showFeeds();
+            $this->showDescription();
+            $this->extraHead();
+            Event::handle('EndShowHeadElements', array($this));
+        }
         $this->elementEnd('head');
     }
 
@@ -352,6 +354,7 @@ class Action extends HTMLOutputter // lawsuit
             Event::handle('EndShowFooter', array($this));
         }
         $this->elementEnd('div');
+        $this->showScripts();
         $this->elementEnd('body');
     }
 

From 22b4a66de3441bcb54b748f98be5b53e3be4bece Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 30 Jun 2009 23:33:47 -0400
Subject: [PATCH 193/247] copy Comet plugin to Orbited

---
 plugins/Orbited/CometPlugin.php      |  205 ++++
 plugins/Orbited/README               |   26 +
 plugins/Orbited/bayeux.class.inc.php |  134 +++
 plugins/Orbited/jquery.comet.js      | 1451 ++++++++++++++++++++++++++
 plugins/Orbited/json2.js             |  478 +++++++++
 plugins/Orbited/updatetimeline.js    |  154 +++
 6 files changed, 2448 insertions(+)
 create mode 100644 plugins/Orbited/CometPlugin.php
 create mode 100644 plugins/Orbited/README
 create mode 100644 plugins/Orbited/bayeux.class.inc.php
 create mode 100644 plugins/Orbited/jquery.comet.js
 create mode 100644 plugins/Orbited/json2.js
 create mode 100644 plugins/Orbited/updatetimeline.js

diff --git a/plugins/Orbited/CometPlugin.php b/plugins/Orbited/CometPlugin.php
new file mode 100644
index 0000000000..45251c66f0
--- /dev/null
+++ b/plugins/Orbited/CometPlugin.php
@@ -0,0 +1,205 @@
+<?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, $username=null, $password=null)
+    {
+        $this->server   = $server;
+        $this->username = $username;
+        $this->password = $password;
+
+        parent::__construct();
+    }
+
+    function onEndShowScripts($action)
+    {
+        $timeline = null;
+
+        $this->log(LOG_DEBUG, 'got action ' . $action->trimmed('action'));
+
+        switch ($action->trimmed('action')) {
+         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;
+        }
+
+        $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)),
+                         ' ');
+        }
+
+        $user = common_current_user();
+
+        if (!empty($user->id)) {
+            $user_id = $user->id;
+        } else {
+            $user_id = 0;
+        }
+
+        $replyurl = common_local_url('newnotice');
+        $favorurl = common_local_url('favor');
+        // FIXME: need to find a better way to pass this pattern in
+        $deleteurl = common_local_url('deletenotice',
+                                      array('notice' => '0000000000'));
+
+        $action->elementStart('script', array('type' => 'text/javascript'));
+        $action->raw("$(document).ready(function() { updater.init(\"$this->server\", \"$timeline\", $user_id, \"$replyurl\", \"$favorurl\", \"$deleteurl\"); });");
+        $action->elementEnd('script');
+
+        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';
+        }
+
+        $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');
+
+            $json = $this->noticeAsJson($notice);
+
+            // Bayeux? Comet? Huh? These terms confuse me
+            $bay = new Bayeux($this->server, $this->user, $this->password);
+
+            foreach ($timelines as $timeline) {
+                $this->log(LOG_INFO, "Posting notice $notice->id to '$timeline'.");
+                $bay->publish($timeline, $json);
+            }
+
+            $bay = NULL;
+        }
+
+        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);
+        $arr['url'] = $notice->bestUrl();
+        $arr['html'] = htmlspecialchars($notice->rendered);
+        $arr['source'] = htmlspecialchars($arr['source']);
+
+        if (!empty($notice->reply_to)) {
+            $reply_to = Notice::staticGet('id', $notice->reply_to);
+            if (!empty($reply_to)) {
+                $arr['in_reply_to_status_url'] = $reply_to->bestUrl();
+            }
+            $reply_to = null;
+        }
+
+        $profile = $notice->getProfile();
+        $arr['user']['profile_url'] = $profile->profileurl;
+
+        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)
+    {
+        common_log($level, get_class($this) . ': '.$msg);
+    }
+}
diff --git a/plugins/Orbited/README b/plugins/Orbited/README
new file mode 100644
index 0000000000..4abd40af7a
--- /dev/null
+++ b/plugins/Orbited/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.
diff --git a/plugins/Orbited/bayeux.class.inc.php b/plugins/Orbited/bayeux.class.inc.php
new file mode 100644
index 0000000000..39ad8a8fc6
--- /dev/null
+++ b/plugins/Orbited/bayeux.class.inc.php
@@ -0,0 +1,134 @@
+<?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;
+
+    private $sUser = '';
+    private $sPassword = '';
+
+    public $sUrl = '';
+
+    function __construct($sUrl, $sUser='', $sPassword='')
+    {
+        $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);
+
+        if (!is_null($sUser) && mb_strlen($sUser) > 0) {
+            curl_setopt($this->oCurl, CURLOPT_USERPWD,"$sUser:$sPassword");
+        }
+
+        $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);
+
+        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/Orbited/jquery.comet.js b/plugins/Orbited/jquery.comet.js
new file mode 100644
index 0000000000..6de437fa8e
--- /dev/null
+++ b/plugins/Orbited/jquery.comet.js
@@ -0,0 +1,1451 @@
+/**
+ * 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/Orbited/json2.js b/plugins/Orbited/json2.js
new file mode 100644
index 0000000000..7e27df5181
--- /dev/null
+++ b/plugins/Orbited/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/Orbited/updatetimeline.js b/plugins/Orbited/updatetimeline.js
new file mode 100644
index 0000000000..170949e9ba
--- /dev/null
+++ b/plugins/Orbited/updatetimeline.js
@@ -0,0 +1,154 @@
+// update the local timeline from a Comet server
+//
+
+var updater = function()
+{
+     var _server;
+     var _timeline;
+     var _userid;
+     var _replyurl;
+     var _favorurl;
+     var _deleteurl;
+     var _cometd;
+
+     return {
+          init: function(server, timeline, userid, replyurl, favorurl, deleteurl)
+          {
+               _cometd = $.cometd; // Uses the default Comet object
+               _cometd.setLogLevel('debug');
+               _cometd.init(server);
+               _server = server;
+               _timeline = timeline;
+               _userid = userid;
+               _favorurl = favorurl;
+               _replyurl = replyurl;
+               _deleteurl = deleteurl;
+               _cometd.subscribe(timeline, receive);
+               $(window).unload(leave);
+          }
+     }
+
+     function leave()
+     {
+          _cometd.disconnect();
+     }
+
+     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"});
+          $("#notices_primary .notice:first").fadeIn(1000);
+          NoticeHover();
+          NoticeReply();
+     }
+
+     function makeNoticeItem(data)
+     {
+          user = data['user'];
+          html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
+          source = data['source'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
+
+          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\">"+html+"</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>"+source+"</dd>"+ // may have a link, I think
+               "</dl>";
+
+          if (data['in_reply_to_status_id']) {
+               ni = ni+" <dl class=\"response\">"+
+                    "<dt>To</dt>"+
+                    "<dd>"+
+                    "<a href=\""+data['in_reply_to_status_url']+"\" rel=\"in-reply-to\">in reply to</a>"+
+                    "</dd>"+
+                    "</dl>";
+          }
+
+          ni = ni+"</div>"+
+               "<div class=\"notice-options\">";
+
+          if (_userid != 0) {
+               var input = $("form#form_notice fieldset input#token");
+               var session_key = input.val();
+               ni = ni+makeFavoriteForm(data['id'], session_key);
+               ni = ni+makeReplyLink(data['id'], data['user']['screen_name']);
+               if (_userid == data['user']['id']) {
+                    ni = ni+makeDeleteLink(data['id']);
+               }
+          }
+
+          ni = ni+"</div>"+
+               "</li>";
+          return ni;
+     }
+
+     function makeFavoriteForm(id, session_key)
+     {
+          var ff;
+
+          ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+_favorurl+"\">"+
+               "<fieldset>"+
+               "<legend>Favor this notice</legend>"+ // XXX: i18n
+               "<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
+               "<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
+               "<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
+               "</fieldset>"+
+               "</form>";
+          return ff;
+     }
+
+     function makeReplyLink(id, nickname)
+     {
+          var rl;
+          rl = "<dl class=\"notice_reply\">"+
+               "<dt>Reply to this notice</dt>"+
+               "<dd>"+
+               "<a href=\""+_replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span>"+
+               "</a>"+
+               "</dd>"+
+               "</dl>";
+          return rl;
+     }
+
+     function makeDeleteLink(id)
+     {
+          var dl, delurl;
+          delurl = _deleteurl.replace("0000000000", id);
+
+          dl = "<dl class=\"notice_delete\">"+
+               "<dt>Delete this notice</dt>"+
+               "<dd>"+
+               "<a href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>"+
+               "</dd>"+
+               "</dl>";
+
+          return dl;
+     }
+}();
+

From 0d6314052fed12fd626bfa5519853f1d6ecb6814 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 1 Jul 2009 00:58:44 -0400
Subject: [PATCH 194/247] rename plugin

---
 plugins/Orbited/{CometPlugin.php => OrbitedPlugin.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/Orbited/{CometPlugin.php => OrbitedPlugin.php} (100%)

diff --git a/plugins/Orbited/CometPlugin.php b/plugins/Orbited/OrbitedPlugin.php
similarity index 100%
rename from plugins/Orbited/CometPlugin.php
rename to plugins/Orbited/OrbitedPlugin.php

From 630dcda56fa056389bd715e3d1df704addf2a8ca Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 20 Jul 2009 19:17:39 -0400
Subject: [PATCH 195/247] remove unused files for OrbitedPlugin

---
 plugins/Orbited/bayeux.class.inc.php |  134 ---
 plugins/Orbited/jquery.comet.js      | 1451 --------------------------
 plugins/Orbited/json2.js             |  478 ---------
 3 files changed, 2063 deletions(-)
 delete mode 100644 plugins/Orbited/bayeux.class.inc.php
 delete mode 100644 plugins/Orbited/jquery.comet.js
 delete mode 100644 plugins/Orbited/json2.js

diff --git a/plugins/Orbited/bayeux.class.inc.php b/plugins/Orbited/bayeux.class.inc.php
deleted file mode 100644
index 39ad8a8fc6..0000000000
--- a/plugins/Orbited/bayeux.class.inc.php
+++ /dev/null
@@ -1,134 +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;
-
-    private $sUser = '';
-    private $sPassword = '';
-
-    public $sUrl = '';
-
-    function __construct($sUrl, $sUser='', $sPassword='')
-    {
-        $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);
-
-        if (!is_null($sUser) && mb_strlen($sUser) > 0) {
-            curl_setopt($this->oCurl, CURLOPT_USERPWD,"$sUser:$sPassword");
-        }
-
-        $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);
-
-        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/Orbited/jquery.comet.js b/plugins/Orbited/jquery.comet.js
deleted file mode 100644
index 6de437fa8e..0000000000
--- a/plugins/Orbited/jquery.comet.js
+++ /dev/null
@@ -1,1451 +0,0 @@
-/**
- * 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/Orbited/json2.js b/plugins/Orbited/json2.js
deleted file mode 100644
index 7e27df5181..0000000000
--- a/plugins/Orbited/json2.js
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
-    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');
-        };
-    }
-}());

From 9c2d0879e9064fe3b9cf9af2c7eabe869966bd92 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 21 Jul 2009 11:00:03 -0700
Subject: [PATCH 196/247] updated OrbitedPlugin to use RealtimePlugin

---
 plugins/Orbited/OrbitedPlugin.php | 186 ++++++++----------------------
 1 file changed, 47 insertions(+), 139 deletions(-)

diff --git a/plugins/Orbited/OrbitedPlugin.php b/plugins/Orbited/OrbitedPlugin.php
index 45251c66f0..cf6e5de139 100644
--- a/plugins/Orbited/OrbitedPlugin.php
+++ b/plugins/Orbited/OrbitedPlugin.php
@@ -2,7 +2,7 @@
 /**
  * Laconica, the distributed open-source microblogging tool
  *
- * Plugin to do "real time" updates using Comet/Bayeux
+ * Plugin to do "real time" updates using Orbited + STOMP
  *
  * PHP version 5
  *
@@ -31,8 +31,13 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
+require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
+
 /**
- * Plugin to do realtime updates using Comet
+ * Plugin to do realtime updates using Orbited + STOMP
+ *
+ * This plugin pushes data to a STOMP server which is then served to the
+ * browser by the Orbited server.
  *
  * @category Plugin
  * @package  Laconica
@@ -41,165 +46,68 @@ if (!defined('LACONICA')) {
  * @link     http://laconi.ca/
  */
 
-class CometPlugin extends Plugin
+class OrbitedPlugin extends RealtimePlugin
 {
-    var $server = null;
+    public $webserver   = null;
+    public $webport     = null;
+    public $channelbase = null;
+    public $stompserver = null;
+    public $username    = null;
+    public $password    = null;
 
-    function __construct($server=null, $username=null, $password=null)
+    protected $con      = null;
+
+    function _getScripts()
     {
-        $this->server   = $server;
-        $this->username = $username;
-        $this->password = $password;
-
-        parent::__construct();
+        $scripts = parent::_getScripts();
+        $root = 'http://'.$this->webserver.(($this->webport == 80) ? '':':'.$this->webport);
+        $scripts[] = $root.'/static/Orbited.js';
+        $scripts[] = $root.'/static/protocols/stomp/stomp.js';
+        $scripts[] = common_path('plugins/Orbited/orbitedupdater.js');
+        return $scripts;
     }
 
-    function onEndShowScripts($action)
+    function _updateInitialize($timeline, $user_id)
     {
-        $timeline = null;
+        $script = parent::_updateInitialize($timeline, $user_id);
+        return $script." OrbitedUpdater.init(\"$this->stompserver\", $this->stompport, \"{$timeline}\");";
+    }
 
-        $this->log(LOG_DEBUG, 'got action ' . $action->trimmed('action'));
+    function _connect()
+    {
+        require_once(INSTALLDIR.'/extlibs/Stomp.php');
 
-        switch ($action->trimmed('action')) {
-         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;
-        }
+        $stompserver = (empty($this->stompserver)) ? "tcp://{$this->webserver}:61613/" : $this->stompserver;
 
-        $scripts = array('jquery.comet.js', 'json2.js', 'updatetimeline.js');
+        $this->con = new Stomp($stompserver);
 
-        foreach ($scripts as $script) {
-            $action->element('script', array('type' => 'text/javascript',
-                                             'src' => common_path('plugins/Comet/'.$script)),
-                         ' ');
-        }
-
-        $user = common_current_user();
-
-        if (!empty($user->id)) {
-            $user_id = $user->id;
+        if ($this->con->connect($this->username, $this->password)) {
+            $this->_log(LOG_INFO, "Connected.");
         } else {
-            $user_id = 0;
+            $this->_log(LOG_ERR, 'Failed to connect to queue server');
+            throw new ServerException('Failed to connect to queue server');
         }
-
-        $replyurl = common_local_url('newnotice');
-        $favorurl = common_local_url('favor');
-        // FIXME: need to find a better way to pass this pattern in
-        $deleteurl = common_local_url('deletenotice',
-                                      array('notice' => '0000000000'));
-
-        $action->elementStart('script', array('type' => 'text/javascript'));
-        $action->raw("$(document).ready(function() { updater.init(\"$this->server\", \"$timeline\", $user_id, \"$replyurl\", \"$favorurl\", \"$deleteurl\"); });");
-        $action->elementEnd('script');
-
-        return true;
     }
 
-    function onEndNoticeSave($notice)
+    function _publish($channel, $message)
     {
-        $this->log(LOG_INFO, "Called for save notice.");
+        $result = $this->con->send($channel,
+                                   json_encode($message));
 
-        $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';
-        }
-
-        $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');
-
-            $json = $this->noticeAsJson($notice);
-
-            // Bayeux? Comet? Huh? These terms confuse me
-            $bay = new Bayeux($this->server, $this->user, $this->password);
-
-            foreach ($timelines as $timeline) {
-                $this->log(LOG_INFO, "Posting notice $notice->id to '$timeline'.");
-                $bay->publish($timeline, $json);
-            }
-
-            $bay = NULL;
-        }
-
-        return true;
+        return $result;
+        // TODO: parse and deal with result
     }
 
-    function noticeAsJson($notice)
+    function _disconnect()
     {
-        // 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);
-        $arr['url'] = $notice->bestUrl();
-        $arr['html'] = htmlspecialchars($notice->rendered);
-        $arr['source'] = htmlspecialchars($arr['source']);
-
-        if (!empty($notice->reply_to)) {
-            $reply_to = Notice::staticGet('id', $notice->reply_to);
-            if (!empty($reply_to)) {
-                $arr['in_reply_to_status_url'] = $reply_to->bestUrl();
-            }
-            $reply_to = null;
-        }
-
-        $profile = $notice->getProfile();
-        $arr['user']['profile_url'] = $profile->profileurl;
-
-        return $arr;
+        $this->con->disconnect();
     }
 
-    function getNoticeTags($notice)
+    function _pathToChannel($path)
     {
-        $tags = null;
-
-        $nt = new Notice_tag();
-        $nt->notice_id = $notice->id;
-
-        if ($nt->find()) {
-            $tags = array();
-            while ($nt->fetch()) {
-                $tags[] = $nt->tag;
-            }
+        if (!empty($this->channelbase)) {
+            array_unshift($path, $this->channelbase);
         }
-
-        $nt->free();
-        $nt = null;
-
-        return $tags;
-    }
-
-    // Push this up to Plugin
-
-    function log($level, $msg)
-    {
-        common_log($level, get_class($this) . ': '.$msg);
+        return '/' . implode('/', $path);
     }
 }

From 035978270d609b650b8e32f252366e0e75b12507 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 4 Oct 2009 03:02:04 -0400
Subject: [PATCH 197/247] Update OrbitedPlugin to work with RealtimePlugin
 framework

---
 plugins/Orbited/OrbitedPlugin.php |  43 ++++++++-
 plugins/Orbited/orbitedupdater.js |  21 ++++
 plugins/Orbited/updatetimeline.js | 154 ------------------------------
 3 files changed, 60 insertions(+), 158 deletions(-)
 create mode 100644 plugins/Orbited/orbitedupdater.js
 delete mode 100644 plugins/Orbited/updatetimeline.js

diff --git a/plugins/Orbited/OrbitedPlugin.php b/plugins/Orbited/OrbitedPlugin.php
index cf6e5de139..ad7d1d2764 100644
--- a/plugins/Orbited/OrbitedPlugin.php
+++ b/plugins/Orbited/OrbitedPlugin.php
@@ -52,34 +52,49 @@ class OrbitedPlugin extends RealtimePlugin
     public $webport     = null;
     public $channelbase = null;
     public $stompserver = null;
+    public $stompport   = null;
     public $username    = null;
     public $password    = null;
+    public $webuser     = null;
+    public $webpass     = null;
 
     protected $con      = null;
 
     function _getScripts()
     {
         $scripts = parent::_getScripts();
-        $root = 'http://'.$this->webserver.(($this->webport == 80) ? '':':'.$this->webport);
+
+        $port = (is_null($this->webport)) ? 8000 : $this->webport;
+
+        $server = (is_null($this->webserver)) ? common_config('site', 'server') : $this->webserver;
+
+        $root = 'http://'.$server.(($port == 80) ? '':':'.$port);
+
         $scripts[] = $root.'/static/Orbited.js';
         $scripts[] = $root.'/static/protocols/stomp/stomp.js';
         $scripts[] = common_path('plugins/Orbited/orbitedupdater.js');
+
         return $scripts;
     }
 
     function _updateInitialize($timeline, $user_id)
     {
         $script = parent::_updateInitialize($timeline, $user_id);
-        return $script." OrbitedUpdater.init(\"$this->stompserver\", $this->stompport, \"{$timeline}\");";
+
+        $server = $this->_getStompServer();
+        $port   = $this->_getStompPort();
+
+        return $script." OrbitedUpdater.init(\"$server\", $port, ".
+          "\"{$timeline}\", \"{$this->webuser}\", \"{$this->webpass}\");";
     }
 
     function _connect()
     {
         require_once(INSTALLDIR.'/extlibs/Stomp.php');
 
-        $stompserver = (empty($this->stompserver)) ? "tcp://{$this->webserver}:61613/" : $this->stompserver;
+        $url = $this->_getStompUrl();
 
-        $this->con = new Stomp($stompserver);
+        $this->con = new Stomp($url);
 
         if ($this->con->connect($this->username, $this->password)) {
             $this->_log(LOG_INFO, "Connected.");
@@ -110,4 +125,24 @@ class OrbitedPlugin extends RealtimePlugin
         }
         return '/' . implode('/', $path);
     }
+
+    function _getStompServer()
+    {
+        $server = (!is_null($this->stompserver)) ? $this->stompserver :
+        (!is_null($this->webserver)) ? $this->webserver :
+        common_config('site', 'server');
+        return $server;
+    }
+
+    function _getStompPort()
+    {
+        $port = (!is_null($this->stompport)) ? $this->stompport : 61613;
+    }
+
+    function _getStompUrl()
+    {
+        $server = $this->_getStompServer();
+        $port   = $this->_getStompPort();
+        return "tcp://$server:$port/";
+    }
 }
diff --git a/plugins/Orbited/orbitedupdater.js b/plugins/Orbited/orbitedupdater.js
new file mode 100644
index 0000000000..d70f4a4fda
--- /dev/null
+++ b/plugins/Orbited/orbitedupdater.js
@@ -0,0 +1,21 @@
+// Update the local timeline from a Orbited server
+
+var OrbitedUpdater = function()
+{
+     return {
+
+          init: function(server, port, timeline, username, password)
+          {
+               // set up stomp client.
+               stomp = new STOMPClient();
+
+               stomp.connect(server, port, username, password);
+               stomp.subscribe(timeline);
+
+               stomp.onmessageframe = function(frame) {
+                    RealtimeUpdate.receive(JSON.parse(frame.body));
+               };
+          };
+     }
+}();
+
diff --git a/plugins/Orbited/updatetimeline.js b/plugins/Orbited/updatetimeline.js
deleted file mode 100644
index 170949e9ba..0000000000
--- a/plugins/Orbited/updatetimeline.js
+++ /dev/null
@@ -1,154 +0,0 @@
-// update the local timeline from a Comet server
-//
-
-var updater = function()
-{
-     var _server;
-     var _timeline;
-     var _userid;
-     var _replyurl;
-     var _favorurl;
-     var _deleteurl;
-     var _cometd;
-
-     return {
-          init: function(server, timeline, userid, replyurl, favorurl, deleteurl)
-          {
-               _cometd = $.cometd; // Uses the default Comet object
-               _cometd.setLogLevel('debug');
-               _cometd.init(server);
-               _server = server;
-               _timeline = timeline;
-               _userid = userid;
-               _favorurl = favorurl;
-               _replyurl = replyurl;
-               _deleteurl = deleteurl;
-               _cometd.subscribe(timeline, receive);
-               $(window).unload(leave);
-          }
-     }
-
-     function leave()
-     {
-          _cometd.disconnect();
-     }
-
-     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"});
-          $("#notices_primary .notice:first").fadeIn(1000);
-          NoticeHover();
-          NoticeReply();
-     }
-
-     function makeNoticeItem(data)
-     {
-          user = data['user'];
-          html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
-          source = data['source'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
-
-          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\">"+html+"</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>"+source+"</dd>"+ // may have a link, I think
-               "</dl>";
-
-          if (data['in_reply_to_status_id']) {
-               ni = ni+" <dl class=\"response\">"+
-                    "<dt>To</dt>"+
-                    "<dd>"+
-                    "<a href=\""+data['in_reply_to_status_url']+"\" rel=\"in-reply-to\">in reply to</a>"+
-                    "</dd>"+
-                    "</dl>";
-          }
-
-          ni = ni+"</div>"+
-               "<div class=\"notice-options\">";
-
-          if (_userid != 0) {
-               var input = $("form#form_notice fieldset input#token");
-               var session_key = input.val();
-               ni = ni+makeFavoriteForm(data['id'], session_key);
-               ni = ni+makeReplyLink(data['id'], data['user']['screen_name']);
-               if (_userid == data['user']['id']) {
-                    ni = ni+makeDeleteLink(data['id']);
-               }
-          }
-
-          ni = ni+"</div>"+
-               "</li>";
-          return ni;
-     }
-
-     function makeFavoriteForm(id, session_key)
-     {
-          var ff;
-
-          ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+_favorurl+"\">"+
-               "<fieldset>"+
-               "<legend>Favor this notice</legend>"+ // XXX: i18n
-               "<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
-               "<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
-               "<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
-               "</fieldset>"+
-               "</form>";
-          return ff;
-     }
-
-     function makeReplyLink(id, nickname)
-     {
-          var rl;
-          rl = "<dl class=\"notice_reply\">"+
-               "<dt>Reply to this notice</dt>"+
-               "<dd>"+
-               "<a href=\""+_replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span>"+
-               "</a>"+
-               "</dd>"+
-               "</dl>";
-          return rl;
-     }
-
-     function makeDeleteLink(id)
-     {
-          var dl, delurl;
-          delurl = _deleteurl.replace("0000000000", id);
-
-          dl = "<dl class=\"notice_delete\">"+
-               "<dt>Delete this notice</dt>"+
-               "<dd>"+
-               "<a href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>"+
-               "</dd>"+
-               "</dl>";
-
-          return dl;
-     }
-}();
-

From 27ff66c9de64a60cb3219f6d823cb290d4f18c01 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 4 Oct 2009 04:05:40 -0400
Subject: [PATCH 198/247] Some changes required from Orbited debugging

---
 plugins/Orbited/OrbitedPlugin.php | 18 ++++++++++++------
 plugins/Orbited/orbitedextra.js   |  2 ++
 plugins/Orbited/orbitedupdater.js | 11 +++++++----
 3 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 plugins/Orbited/orbitedextra.js

diff --git a/plugins/Orbited/OrbitedPlugin.php b/plugins/Orbited/OrbitedPlugin.php
index ad7d1d2764..ba87b266a0 100644
--- a/plugins/Orbited/OrbitedPlugin.php
+++ b/plugins/Orbited/OrbitedPlugin.php
@@ -60,6 +60,12 @@ class OrbitedPlugin extends RealtimePlugin
 
     protected $con      = null;
 
+    function onStartShowHeadElements($action)
+    {
+        // See http://orbited.org/wiki/Deployment#Cross-SubdomainDeployment
+        $action->element('script', null, ' document.domain = document.domain; ');
+    }
+
     function _getScripts()
     {
         $scripts = parent::_getScripts();
@@ -71,6 +77,7 @@ class OrbitedPlugin extends RealtimePlugin
         $root = 'http://'.$server.(($port == 80) ? '':':'.$port);
 
         $scripts[] = $root.'/static/Orbited.js';
+        $scripts[] = common_path('plugins/Orbited/orbitedextra.js');
         $scripts[] = $root.'/static/protocols/stomp/stomp.js';
         $scripts[] = common_path('plugins/Orbited/orbitedupdater.js');
 
@@ -90,16 +97,16 @@ class OrbitedPlugin extends RealtimePlugin
 
     function _connect()
     {
-        require_once(INSTALLDIR.'/extlibs/Stomp.php');
+        require_once(INSTALLDIR.'/extlib/Stomp.php');
 
         $url = $this->_getStompUrl();
 
         $this->con = new Stomp($url);
 
         if ($this->con->connect($this->username, $this->password)) {
-            $this->_log(LOG_INFO, "Connected.");
+            $this->log(LOG_INFO, "Connected.");
         } else {
-            $this->_log(LOG_ERR, 'Failed to connect to queue server');
+            $this->log(LOG_ERR, 'Failed to connect to queue server');
             throw new ServerException('Failed to connect to queue server');
         }
     }
@@ -128,15 +135,14 @@ class OrbitedPlugin extends RealtimePlugin
 
     function _getStompServer()
     {
-        $server = (!is_null($this->stompserver)) ? $this->stompserver :
+        return (!is_null($this->stompserver)) ? $this->stompserver :
         (!is_null($this->webserver)) ? $this->webserver :
         common_config('site', 'server');
-        return $server;
     }
 
     function _getStompPort()
     {
-        $port = (!is_null($this->stompport)) ? $this->stompport : 61613;
+        return (!is_null($this->stompport)) ? $this->stompport : 61613;
     }
 
     function _getStompUrl()
diff --git a/plugins/Orbited/orbitedextra.js b/plugins/Orbited/orbitedextra.js
new file mode 100644
index 0000000000..47e5c0c80e
--- /dev/null
+++ b/plugins/Orbited/orbitedextra.js
@@ -0,0 +1,2 @@
+TCPSocket = Orbited.TCPSocket;
+
diff --git a/plugins/Orbited/orbitedupdater.js b/plugins/Orbited/orbitedupdater.js
index d70f4a4fda..8c5ab3b732 100644
--- a/plugins/Orbited/orbitedupdater.js
+++ b/plugins/Orbited/orbitedupdater.js
@@ -9,13 +9,16 @@ var OrbitedUpdater = function()
                // set up stomp client.
                stomp = new STOMPClient();
 
-               stomp.connect(server, port, username, password);
-               stomp.subscribe(timeline);
-
                stomp.onmessageframe = function(frame) {
                     RealtimeUpdate.receive(JSON.parse(frame.body));
                };
-          };
+
+               stomp.onconnectedframe = function() {
+                    stomp.subscribe(timeline);
+               }
+
+               stomp.connect(server, port, username, password);
+          }
      }
 }();
 

From 091e7b908befb7d24404ea653f59b38063e04f69 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 4 Oct 2009 04:10:15 -0400
Subject: [PATCH 199/247] need to show scripts at end of body in RealtimePlugin

---
 plugins/Realtime/RealtimePlugin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 0f0d0f9f42..1819279686 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -230,6 +230,7 @@ class RealtimePlugin extends Plugin
         }
 
         $action->showContentBlock();
+        $action->showScripts();
         $action->elementEnd('body');
         return false; // No default processing
     }

From affe00276a008038e8a8b37b3812215e382fe98e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 4 Oct 2009 04:11:10 -0400
Subject: [PATCH 200/247] remove spurious readme from Orbited

---
 plugins/Orbited/README | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 plugins/Orbited/README

diff --git a/plugins/Orbited/README b/plugins/Orbited/README
deleted file mode 100644
index 4abd40af7a..0000000000
--- a/plugins/Orbited/README
+++ /dev/null
@@ -1,26 +0,0 @@
-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 df8cce27887a3a7cd813ade61b9bd47e945d9ddc Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 4 Oct 2009 16:51:43 +0000
Subject: [PATCH 201/247] Removed obsolete iphone theme (pre v0.7)

---
 theme/iphone/bg-body.gif                | Bin 136 -> 0 bytes
 theme/iphone/bg-header.gif              | Bin 2469 -> 0 bytes
 theme/iphone/default-avatar-mini.png    | Bin 646 -> 0 bytes
 theme/iphone/default-avatar-profile.png | Bin 2853 -> 0 bytes
 theme/iphone/default-avatar-stream.png  | Bin 1487 -> 0 bytes
 theme/iphone/display.css                | 698 ------------------------
 theme/iphone/display.css.dist           | 686 -----------------------
 theme/iphone/ie6.css.dist               |  63 ---
 theme/iphone/ie7.css.dist               |  20 -
 theme/iphone/login-bg.gif               | Bin 328 -> 0 bytes
 theme/iphone/logo.png                   | Bin 818 -> 0 bytes
 11 files changed, 1467 deletions(-)
 delete mode 100644 theme/iphone/bg-body.gif
 delete mode 100644 theme/iphone/bg-header.gif
 delete mode 100644 theme/iphone/default-avatar-mini.png
 delete mode 100644 theme/iphone/default-avatar-profile.png
 delete mode 100644 theme/iphone/default-avatar-stream.png
 delete mode 100644 theme/iphone/display.css
 delete mode 100644 theme/iphone/display.css.dist
 delete mode 100644 theme/iphone/ie6.css.dist
 delete mode 100644 theme/iphone/ie7.css.dist
 delete mode 100644 theme/iphone/login-bg.gif
 delete mode 100644 theme/iphone/logo.png

diff --git a/theme/iphone/bg-body.gif b/theme/iphone/bg-body.gif
deleted file mode 100644
index d87e2e8d76f7ff81d3ab327b7e3a06c8a8d6bb1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 136
zcmZ?wbhEHbJiyGzu$h73&;PGC9$o+c|Nr%e*Dl??eDw0ktM{*7e{_A{*&_$eA3cBT
z!l`R#7?6Mthz-)qz+!7~!gKXri`Tx#CD|70xHd6ltXh}zdS8Lg`I6lG73<#Dy#Ie-
hL4k*kRR4)3MJID!33MKEax|!5o3p0ubT0#gH2{s0LAn3{

diff --git a/theme/iphone/bg-header.gif b/theme/iphone/bg-header.gif
deleted file mode 100644
index 5154b2e5e9fec15cf8b1e8592670d4a9fd9d4bb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2469
zcmV;W30n3?Nk%w1VGID+0QUd@Pi}Z@iHK=}eqe5GVt|7fGCp8_f;UW9RC0SzZ+TpL
zfL&~BOI~6~T46zAaB+);N?c-AW@uz`Z#+<1c9M=(b$nQMeOhX2U~Ot<b8u2}dTxt~
zZHkF$hK4|4Z%S%)7cf0aYII(0Y!)s$M_FKFaBpdbhd*F%88bjqVrF%ai)C_fLRMa8
zgoQw0a7I{PHcVGTWN{QLHgAZ8RApx<L{L0jYiNXqSZHcic6~rqU08R1I#60wbbDQC
zXE;q*P+?_UYin$UfnsoMbBu>jZg_N$ifoFAL|0!wR9qD-I8R_?a*m5!dVg+)f<<O?
zTWDo;j)_}(e`kb+K2lpcPFW&5MrLzwK2uydPFP`of?jH9WN~g_et}YPdQNV4S7&HZ
zaCvl(j6hXhPG4h3Xmn(8ZDfIiQDS9pi;8cGg>8m{L}YPQbbMH7X?T&2R%T~ZW@mMf
zj&qQWMrCtzkBMe<aZ_@68812+G(j0OKzEXjNN98yFFZzOa~3T*6)ZPHV{t@fa(0o7
zLSu1BX>~_ub9Rx9bdZfrZFg~vi*t{RWrBoul8tMKh&oSNLSk@cgN1dGjZAEIOl)^w
zeSuDGcS~z_cae@-cz#)Ues__LM`v^sDKv79jAVj@L}YSFX>@OlifV_4c94vAkd1SV
zh;@*SO>B2_j*LcUb7g~tMP+hZd4F_`h)8L4UVMOBd46Ppgi~W@U3`E>W^!<ii))C7
zQetIMae6^jU14u-JyKgqYIRC!bwy=!UVMRHe1Jh>abtmlaEyy~l8i-Ua$0$RTX}wW
zk&I=7gjsieOKf&ya%^3DfM9)ragB^gXmoUujdhTWbB~Q)eSu$mfnR-qa*vF0j*D=N
zigApKc8`l?f`w#qY+`R~O>THvczr@uUSo1^YK4YVWM+4ej6YOcUwwjKet}<pf;~}M
zXoZGDV{&qhj7Vp5NNII+kc>=icTH?|O>K5;h=(*%U|xNIL1S=bgoJR7igApJFiKW3
zPhD$+e|M6MA^8LV00000EC2ui01N=w000R80P_eONU)&6g9sBUT*$DY!-o(fN}Ncs
zqQ#3CGiuz(v7^V2AVWUXL$ajFlPF7~Sjn=b%a<@?%4Aufrp=o;bL!m5vnNgvK!XY$
zO0=laK1h=)UCK1+h^J7aN}USzkJYPKvueGnq^sAjT>*(5OIECmvuM+*UCR~^zkYbq
zcIqU<ij5O6Y}Al3x04lqC-4T&Yo${^7=urEfZ+kJJ;p8$C`NojvSJr7TzL4=II|1R
zoHu)jJQ}nE(Wpb8{^7s@XV)G?zn<ONv}o70TRVWnT3GKN!d&}?gzpC--olCt%YqM5
z7D&#aKPN;zOLanlrdzLqJxd@$)&o`l5g#Maqd?@v2a3V|5&QA&+_P~n-+c`G?s*6j
z^a#{_L7?#99~*)QSRg0|@+Zgy#uR9bF%#?;VT4aizzQoCV))B1Pxvvx6B<@nONABE
zAtD_U_<>?AAF7gKg?@<W$BgT!;>S8P`k~4?hOEO$kA?ub<Bf)t;bV`g^!Q^LMwX!@
zC%iD}BQJdLK_wql@bONTSz=iw6|aQS<ttdeQV16Ci1|u1Se#i%AygE?W+<Vw*=8?o
z7IID@Az%^82floO#RnfG(Tguh_|i)fg%ZkWqm3qU$t8?lqJyJ^Uh;tslX7Zlr<dq*
z2{WFG%8aNwOk(LIlZ<f*C1a@nIu9kfP(mvzsOZ9~E~tnzNw1X9Q>#4UP{KkYy(W^#
zvCAs^1vo5N0uB<EENh7+(X#M`B}jbnMYrE_3jhE}0PwB3<pPjE0_h@=0J-YAi$oFZ
z#=EY(354OUzF{QrLcjUGu<pNM5d5#fVHBM3za)g=MZ>v}kW0Z6dl9i059gBc!x}W;
zMaLhLfN=wNkc<Gy9p7>C9V(xUfXgnIymHJ9yj*hwJ;01J%supgv(G*6jB^7Ow1IOQ
z5cFVl4-m9bLDElGz;p#vM;$fNR6}3^1X<_swAWlSV1Wf<Z#{O|XP>>p4q~%Swgt;D
zutVHyGZ6POcWWYd-kRwDy^P+Pgu_7J48%f4ESZpzN#ctuPR22YBV+h6$dG}|F|D*h
zMk`V*A%zs1gWkjvtu#T#=SwuvdFKj@u7CndIMW0WufI;aGe9_lyY09;Lrd<s)6zQ-
z!UK;6FwUR>3oWp~f=e~kpb?BU$_InSHMjs{O$xzOlEOW};Brk0m7qg@C9_oGy*iZ`
z@XRb-7?8p<U8K-OI`G49fd1teu>byAFhKtRsD)V=Knn!WLOHacKn5;Qfdp6}0cb#g
z2{ModTA<(r2`~%|#-W14m|zIuz(F_+ql3eUz!}b<LRrA!6T>iJ1U?}PFnr<@V2}k4
zb;t-t*wBYP1Va%2eW;98fMFFz?1nPH&<!v|A`(Z0;uDXUk4Q`b2Q6rU6SbH{FkEp8
zQ*Z+q#rQ=Wu;T_7m;yV*$POH+ksa)~0378Q$2rEa1LUCN1v+rYJ$B#%CNRMT$RWr;
zjzW;57zH2|dB_Ve@{x{YWDssKiXe>Q7L#;@B}d_idIZ4{ngr!1F&Tg$)T5LED5WC;
zuz-3jAeFCVB`i}J01k+tmLlK)2VQxET;|f2y8NXtH^6}b1e2J#+<-C%kcKoca{~j|
zfHOtG%rxwxnFA1oGp$JsVq8-cyU^x0wXu&~Y{M42AO<?Mp^sfC!kzC_#5Q(ei+7?k
z8%%)bE|~EDPIo}V6P_pmKuZ9Pd@>;$0xdx*u)&2?q(Y$&^#m8Nu?Q|KqM{eI=pv{g
zhH=b63|tTcH6*ZzIdCB!5<mnZQo2%=N<a)LmBb39af+FqLIS5igd}9T(-oXT4lC&C
zDKc;fQe;39rMN;VNU?%LG_@2NC`Bn&u!&?4br6R*1W_?z2TW`t1AEv+S68qH3ao$v
zT5ZH3uCRv;P=EqprN9*^(AGwTwXJ)=>sK*>*A>|Hta~7<S@9a!H|&9}n^*xRFwuxc
zWT3H+C2R(Yv4TNRb`XQO!as^}g+Wx-vzYztXU#zhE|6jn5=e$QxG;#)a>KN*oknR@
zFb&g!Hp2)}FhdlK;0@e1BMQ5%!w{lS2Q%Q-xJEF8DTd&R<u;eOt{8$TzF~^#nt}+@
z#V!$u@PG$=qq`UYZ+E|;1`Md7yyrD<d1ruu8L-#A?S1bI*06>xticIeZ~}hyy9FWm
jKnOzUZ-4>ZUnuy)9|lJ7ffFnM0YIU_4|Xtw0|Ed${i-RK

diff --git a/theme/iphone/default-avatar-mini.png b/theme/iphone/default-avatar-mini.png
deleted file mode 100644
index 38b8692b4a2f71c8de3d6a12b715df33aada5f7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 646
zcmV;10(t$3P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000Aa000Aa0e#hi%m4rY8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10s~1zK~zYI?Uuc(8bK7r&&<w#kV1>t7_1ao1dG5H5=fedf?I_U
zERrsb<oy9wVrM6*B~2ieok?McAcDmUsS+&2MXjQ!V4+P2iSF!8k*xUg>GN6ogMr}`
z=geF#+zTQC5di=LaBdjJM@3P-0idfKA;f20*DnA(@I8qLjEKM(3u~J8S_pAFm&<9f
zSPbEC7@TwLgOn1}=@gFRpkA-LjIlSH&E_!?ePIBYs;Zr6G<v60DyhL>a4*xpF`v&-
zEEd<x<?@B=y5|hQ6T>i`SF2Su6bfC-+-EQtpin4yM0Ag<s(L?@$sElb08G<FGMU@}
zusLHa6_3Y{X6}<nBy?TZ?{d%c0)ar_=m9?~a%;afxdx|zQ@|+z5WfnYP6y3q6H-br
z#(unl^X;86c1ia&&N*z`Mk<y1cR;OH!)!J?=(Ur{<o5tYQC6$f>V_}m^LaEH4M-{d
zNe9pK002AF4@7iH=bR&(&2Ehsiv@`2laNxrAB{#2)9Ew=0L!vqS=K>6*rng^e_gNF
z@3`x_^;WAT4=u}|=ytns97hAt;6zjd&?=Y9n`49wheK2<l{I7R84-Q(hyG1fRcl0a
zX4|%6nkFKV$hKSlhm;cI@ff{c&uh2aP!#2*>$*>gXpP+!1HdC8#9K|%7P#8l;_13R
g5kkBIaJK9D9f4f}@hqK`?*IS*07*qoM6N<$f=KKaB>(^b

diff --git a/theme/iphone/default-avatar-profile.png b/theme/iphone/default-avatar-profile.png
deleted file mode 100644
index f8357d4fc296271b837b3d9911cfbc133918ef2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2853
zcmb_ei8mD78y=G~k);$_B4nAeWf!uJb!=mwFxIgpYYNHGgi?(!!!%2>gg$GQDZ3$C
zn6Z3Be3pqYcBbs~o9}=4-E-dioO|zk&w1~C&-1+RGdmkIZcbrN006*kVQvCrq1S%~
zI>VZOym_F-0`@2)3r7%ZJOcTpvDRn9&E29{{$u|cn~@yxA!}188sZx55QdC?;2r4?
zc<|tXV$i*iC|~bzf5ouK0OGo?FaW@rZ((BS_>i>rHW4c7FWjxaVWi+;PI(&gUGbv)
zCr`avoO2*wy=Ua~C1uC-v5*p<e9sp$q15vh&jV^h3Fg{FcWTg@_~<W;#!ETT@_Kjf
z>$Q2JAp6N$SP)UT0fjP1Qa2BpIrR1SKnCEBZ}tIn-pzCOAL^<yR}bHcZ!|G!hn!&P
zJW2GPx*fYN@JJwyH@2V#L!_wZ@@SoXBvW_<o-elqKe42!c<F}=Wt@Lwnj}11<<)0r
zDO3lbRH71rzBRdgNULBrF`iO@!MTrIm+`0dAATyj<#qom5R|yiW|ZbgDxRERJQ7rN
zPa6&XNz>VgF4S4C^PNcO*LaWpw=UvIUY^7m4i3h~MsaKF%sZz<peGjAvVmdN0zner
zPC02Q>6N(33sl$Ce5KKlzn4d&swu~LH8q(F3rIK|9vBuDK&Xxv*&|}Ni<D&Fu`Zo(
zin8aAu73Uc6^q4Y;BcvYJ_iV8%o2k^Um7Y<Q&Zc!@I%e+TA}F9!mJZOqQjSBhO!8<
zGB@|?%T}0QT;#t}USi!5zBZx$N>tk@B&1Xm=RlEy_1+0Kbz(#Fg+!DDI8Ugks(!DJ
zlHJ;3R+WhBlF8(z-Rby$TN3V2k3L}|iG(&|fP@JrEjY`G;cjO~VGihvZ<#e~wwxS<
z?5s_8_w=L@VjHpBh+e2V+cHXD?uusEbpJoL`sGe#%<Pr1N(X1>uBD|9!)k10S+Ja_
z0a9dwpwY!V*j{~oJ?mM4S5}&?NlQQ7-i{=fnyAsTpMdMw`HbWN(~h^wT&t3YhlkTj
zf1=xucV`B;l$vspajqcy*&O=gGfkkfXiZZH#2ya66}Ix5?)N2y+t1(sZ~Tb_I*s72
z%yvZDdOl$agTdMb<{vHM19Bv;U$?{`i+J_Tx6cb@aL7mOst~EVTOIt~+~F;m1VV2L
zx5x-I5q}f_Ls?s5+S`o^Dk|BCnqkh3i6<5y?-T_4Lnvcw_6cu_c5Tm9F!)*44VUXR
zf^7Q$8HtWyl9EeNS*=g!bNn-9;AW(<U=s6Ok0U%XGO}G1=0}I1py8ae_Efh|ck!v8
z4L7gJ%9c9)bfD}<BOT!K0_h8e(b3U%4i3h5?uf8bK7Lo@u7*fZP|*Cs0&VHZG=&0?
zwauB&w7o5%s7Sk%PDM(|%F4=T@uqhg+1g^_zxhaXBnLXu01BrALqiK28VJnAfyV6$
z&*t9IQWuXtZEfwQqwPNL#MzbA)%UF9gM&C385zK3F|nf3(sZSkJs_&2<a*571SB}P
zr0CH3JcZrWT5kDICJjC~KHjrF)mVJ7McCTf8jHh4&2@2G@0512g7WwG9~m93=R~}m
zp7!kR?bUj)PI7tYwFxV-f}*+$Cfc8J8Bf!DdO#e!V!tN;Oop`<*4AQMT3Rx8%e!<o
znx1^2Z}yGR!#59BDx-E*-KaYoh0p@s>6oC-JmXa0?fm%o`2Ao1*s5cG_TyF6G&MPD
zX&oKxPEJmQ?)+==z*;hSXmF5kq#<+6r#xIsRP<J~+=u&>?)B}1gBe9za%a;4x2G{S
zR%T|YMZ3v;I3<o|J+O3WXegmG-_(_TX?dA5&I9ak4h$CJLdPiY8@sZDe!s2CZxFbU
z*EKvjS!#c684Up_DM=n78N-Fb5Maod%_M$67T%TLRmM;8Q~8@LcIIWLkN5uePs7T@
z0lnQofplT-^H*=)ytyQPyi|bksfn$9h3+`TtIIbM$BLjhH`gn!n-4S@g~DkX-mZd|
z>;4{bAauXR;mn{=sKJT}1XAVO%|mv1PPm}K#>vI?{ZlA$M&AI`#-iMpVKHn@jtv9?
zF|d{=YJ^HkNf|R;v1n^Rc+Tm{<{ja50flYG=V%7ZGmas>-nh~7vGes`f3=+)A6i&h
zF&Tm)B32O*H}8DD$9+eB9o>wf6VyXKl$FhQJmVi<i&>3nTxkm&EpfUiC|GlEszE5|
zm5rrkes%Thxo!+|>cNcn=Sjxe8pP592D>1ldGDIOe&WO_Q!C{A%z(JKTRJhT;R={n
zuT)f2l1G<^j@4G*P?0$aJ8om!RH7z>!DtI6FApy|;XFS@L_~CSb~36$cm?ELb7LnH
zucCj8c`56q0B-q$a#jDYK-hiJcz;DePfrgdVPqqd$=tI$)M2QO4M9;>I7NE|VgRoi
z(0<U_D15@X(6?Y)?JDo*=eM~xhsn&y$hBA{fCdK#Da5e2b9Gw2P@dBp{v&Ye$H_I4
zeqs(wzjxNB`hIk#8&4y9b^)nh+UQ?Wjd}bOho+{i-Q0v?8ujKwpUP8MIlU|@dQLl|
zo<$sk!2-5A{%XKX;-7>b!+xiR#zy05(;guDP-o(Me;J<vrqUhB1)oB9WAUCT2p4G`
z9UaMm<Tr0F=ftmTw;nfR8E?*RUZzTB5QBYuB(t)zBobcU7L48gDr*6S{+gVz!pA^P
zjb+vAA8i^Nv~_fMGrL5>HtDJ2!$U)c2n1q~pIBe~HLiIA@tHwJzNo9yij0bKYkjPT
z$BPvt9GDbByOUZ1DFrGbQ1b9yjTMbH<EzO}UuVm^T^PY(VV2~icMb2cD#A;Sa7E81
zb9;Mxiq0^XzeC5}g63wAHE=UONt6DEPC8A4goNCfo10VR_h4r!$%pJIcCXj47&@u8
zyK{W}GUD<6&vR%2p@%{VRc9W@^6Y&ch9eN-EoqWzVJ-Wnp>ni)xk8W6=bAEx#>dUg
z%*-AZqytz5EkE1iMq))f9`GKELxJZYmSCxhEQb&RflwDtPbPd-A1aO~dlwI{uoQ^!
zN=(G!1qQ=BIV|BXd3>!fdMe5TXb#ptb=x_v_4l_s?yc)vWysl6U}+8>QM-_`#%Dha
zT%1XL;k3Plc6#{7fB~_T)Mgt{aPI7Ql`rXb0-XA*0=r!u-*u7gJ$8-4_7greHMKg`
zIJVJNDTQ|^wuv~}i%`$JGG5;ANVHNB-s9agE3Ba+=SE!+>I(u6-abCbUs8FQTis$V
z5h(Gb84Ivpm*I}a+fdzbfjXBURU#Feon6f$;9x<H>^UADn7w^lXS(2M|AoC8Y&D#^
z6k@a(P2%M$3A<8VT`dO&(<>U+Ib{}N+gN|fD&r#~BYO?HI4kgtCZS^D@S{t1Tpwsb
z(&*W|RI&WJx;HFc&_N9@YDh^*Jv!N6e6-od(Q;rgb;k2A*gBJ}@D2z7NnAh`800Cn
zc66Bh*R}NaN-8M4M5EEMH_v{+zNXW?4-OCamrE-HgMzlcH85ybKRQ{)1~;tP-T<KZ
z+Symxde6@4Mc%!;O1k7zJ)4@60$kg?&m)%&^W2IzJCX6?-b9cz1*EL4^(Y!%h6et^
z{X~h`U9HKQ-zP&g65MQw96nFLR;`ML(|ktrbkei?QhX;#*#W%zz+x1?!Aq>l(sYl+
zS!I7?qkq$*l6##{qYBc%D6;rIMoURyO261<RyEhgk}>pF_VNj@`K5~N77M-xR!a-8
MfY_K+7<ncC52qD%GXMYp

diff --git a/theme/iphone/default-avatar-stream.png b/theme/iphone/default-avatar-stream.png
deleted file mode 100644
index 6b63baa70ffede89af964363c384971346d9a7a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1487
zcmV;=1u*)FP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000K;000K;0UmWYH2?qr8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11x!gqK~!jg?V4X`Q&$|vKj$`0YwiC^En<o^okeR%t=b}UG6Ifv
z2tMpd2r6?v$gEFe8$%h4_QAnKDZ;jgVbnf2nC?NQ!TQwdB!#Y<j>Z|aDy3W6;R?})
zJJa7D+8b}%q`4{D>!4paaL(^{&bi<3xi|OxZhl9J2<f1ddINYD*a$QN>i|dE0WSwJ
z;8&o3y8I|2|D^3LB6AAh1ik=tKx{650`H~bDI%!ZcR(rC1bhe718ACt%jLrDcH?%t
zsjjXjCnqQSb+v$ri3#rCzt6pU_lQIyjE#+%-9G>yipXCx_?iVMr9J?@266xz8X9P8
zYooHV@|6(Ign@wpIy*awMx%!5Z{TeaxosGd0+dqgn0n^&moHz={{8#ev17+#bDo2E
zJkFUjXSj6flJR)|25b=#9i{~+rE-CvflW@QlM^RS;BvWaq&*i`u3X{NsZ&PtOA+}5
zK$|uk1vUZf+qdtvBM;Eh(!%D=n~mm2N~yO1G^JDl@G*eb>t*N8oi<U-jJCEmii(P0
zYT=I>m5o3i!0z3<QA*iHFcZql%V}+GHJZ&zDWw5hVCr@0cDrpOXBBJLt~IK~KwVOR
z%jF_JKi|?M<KyG>_V#k~=FJ5Y5fL6fe8}a?ml+uuu{^G}w$|L-;$Zs6JIj$0x~_BN
z$PvQfu<=TxwzihNd-u}N&|sOw;NTz~9UY91j{}gClY`Ia!|(S~US2-$*ouk@%F4=k
z^5hA?CJiVBC@U+=c;T+DE(Qk&F>ij6NQ91#4&w2+CGxtibMoZLBzb^DBEi+GR|y0H
zmgXoeElpOn`8t~M;K2hfUc8vn7mvree*L<odCs3d&+zbYN?&hpFHfI7wMq$iu@7X#
zqeqXJFLLea>9I7=(9lp?pRVhKLLsY^fGh+wHa6mLq>rRmtXN@bp62G}dHpL_uCz)C
z$U;C-QBm59mz0#SXU`r>^K9F;jl8_Pls=!&$NKf_tx^KA5CGu!`|*0cGi(lrgF}Z7
zQCwVXX^w(|0uCQOJm-#8R#tN0z=3S&OkF>l&Z}3iroFwLTeoh}-`~%M4I8MhueZE^
z7}&mjJ6pGIB^V5%>pEVqmztWI1w{c1`aJY_Ja{~wg$zw1H#hgC#9diELa!s11lWxw
z0d`|afZbRUU^kWo*p2_a087E#=;$cdu3aM*i=mWCMvY1-G)+s^&Gy*^NZD7@v^nFJ
zEn7xYQ<M4Ici{qV+_=H9W5<}BoV23#r9sm)+S}VRM!gvyp<pn$=;Q$=CnxFZ>dM$J
zqX0X|X9Eq00_G&b4EX*2SC)~P4@#-D`H9idQKK4l0DXYx?%lg7JJ;3K5eNhbg+e@g
z_RO3|Lqw8y$ZVf&OJ_H1=J`Z~f`S5kJ|9(8Rde`^jEoSA#f)a3A>e((QCL_wXHZE=
z$!n3V0hqPWeHv2&0JwAK&Y}~_7U6K%sE&!qkj7NbX&m76>C-%a{@gBZ8S(h>V}ik;
z(d+@xMC4zlGc-d(L!3Kz&L(>EBaujO{P=NnT?d!|K7;AksEB+E`~+~}!UYBf2JGUQ
z7H7|%B@&4k%}+%n3^UWLRlseaLen&M?b?Ok@5kwM+CtbsG#aI|v(vn&-M~9CO?-Bu
zyA}8zC<IuwY83|$9>nAEEc#v$kH_im?j{fjm~#(*06q~({y(4Us6jRG4bWoPoK7ce
z)~s37qXxsn!{)#96Tnx%=OQvQlalTb1>gt9u>Y{fFF>Q^!yaZRr3!&Jd2!sP5vT!P
pRW4Qse&@wen|>f9B54D%{{RsfdHbSpK`#IR002ovPDHLkV1m@7$GHFi

diff --git a/theme/iphone/display.css b/theme/iphone/display.css
deleted file mode 100644
index 1838a8e86e..0000000000
--- a/theme/iphone/display.css
+++ /dev/null
@@ -1,698 +0,0 @@
-/* CSS Document */
-/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */
-/* Simplified for mobile by Ken Sheppardson http://identi.ca/kshep    */
-
-@import url(../../base/css/display.css);
-
-html {}
-body {
-  width: 100%;
-  padding: 0;
-  margin: 0;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 24px;
-  min-height: 100%;
-  height: 100%;
-  color: #193441;
-}
-
-a {
-  color: #C15D42;
-  text-decoration: none;
-}
-a:hover {
-  text-decoration: underline;
-}
-img, img a {
-  border: 0;
-}
-h1 {
-  font-size: 1.2em;
-}
-
-#wrap {
-  margin: 0;
-}
-
-#header {
-  width: 100%;
-  float: left;
-  background-color: #193441;
-  margin: 0 0 20px 0;
-  padding: 0;
-}
-#logo {
-  float: left;
-  margin: 10px 0px 0px 10px;
-}
-p#branding {
-  margin: 0;
-  padding: 6px 0 3px 0;
-  color: #fbf2d7;
-  font-size: 2em;
-  font-weight: bold;
-  line-height: 2.5em;
-}
-p#branding a {
-  color: #dab134;
-}
-
-#header h1.pagetitle {
-  display: none;
-  margin: 0;
-  padding: 0;
-  font-size: 1.2em;
-  line-height: 2em;
-  color: #d8e2d7;
-}
-
-#header h2.sitename {
-  display: none;
-  margin: 0;
-  padding: 0;
-  color: #FCFFF5;
-}
-
-/* ===== Begin Navigation Styling ===== */
-
-/* ----- Navigation ------ */
-#nav {
-  float: right;
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-  font-size: 1.2em;
-}
-#nav li {
-  display: block;
-  float: left;
-}
-#nav li a {
-  display: block;
-  padding: 9px 15px 12px 0px;
-  color: #91AA9D;
-}
-#nav li a:hover {
-  text-decoration: underline;
-}
-
-/* ----- Tabs ----- */
-#nav_views {
-  clear: both;
-  float: left;
-  margin: 10px 0px 0px 5px;
-  padding: 0;
-  bottom: 0;
-  list-style-type: none;
-  font-size: 1.1em;
-  font-weight: bold;
-}
-#nav_views li {
-  display: block;
-  float: left;
-  line-height: 1.3em;
-}
-#nav_views li a {
-  display: block;
-  margin: 0;
-  padding: 4px 12px 3px 12px;
-  color: #FCFFF5;
-  background-color: #91AA9D;
-  border-right: 1px solid #6A8787;
-}
-#nav_views li a:hover {
-  text-decoration: none;
-}
-#nav_views li.current a, #nav_views li.current a:hover {
-  color: #3F606F;
-  background-color: #FCFFF5;
-  border-right: 1px solid #6A8787;
-}
-#nav_views li.current a:hover {
-  color: #193441;
-}
-#nav_views li a:hover {
-  color: #FCFFF5;
-  background-color: #3F606F;
-  border-right: 1px solid #6A8787;
-}
-
-/* ----- Nav Footer ----- */
-#nav_sub {
-  clear: both;
-  margin: 18px 10px 0 10px;
-  padding: 0;
-  list-style-type: none;
-  font-size: 1.1em;
-  font-weight: bold;
-  line-height: 2em;
-  border-top: 1px solid #D8E2D7;
-}
-#nav_sub li {
-  display: block;
-  float: left;
-}
-#nav_sub li a {
-  padding: 6px 24px 6px 0;
-}
-#nav_sub li a:hover {
-  text-decoration: underline;
-}
-/* ===== End Navigation Styling ===== */
-
-#content {
-  clear: left;
-  margin: 10px;
-  font-family: Georgia, "Times New Roman", Times, serif;
-  font-size: 1em;
-  line-height: 1.1em;
-}
-#content h2 {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1.1em;
-}
-#content label {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1.1em;
-}
-
-.instructions {
-  clear: both;
-  float: left;
-  margin: 5px 5px 10px 5px;
-}
-.instructions p, .success, .error {
-  font-weight: normal;
-  margin: 0;
-  padding: 10px;
-  font-family: Georgia, "Times New Roman", Times, serif;
-  font-size: 1.1em;
-  line-height: 1.2em;
-  border: 1px solid #91AA9D;
-  color: #FCFFF5;
-}
-.instructions a, .success a, .error a {
-  color: #d8e2d7;
-  text-decoration: underline;
-}
-.instructions a:hover, .success a:hover, .error a:hover {
-  color: #FCFFF5;
-}
-.success {
-  clear: both;
-  float: left;
-  margin: 5px 5px 10px 5px;
-  background-color: #48705b;
-}
-.error {
-  clear: both;
-  float: left;
-  margin: 5px 5px 10px 5px;
-  background-color: #ce3728;
-}
-
-/* ----- Stream -----*/
-
-#notices {
-  clear: both;
-  margin: 0 auto;
-  padding: 0;
-  list-style-type: none;
-  border-top: 1px solid #D8E2D7;
-}
-#notices a:hover {
-  text-decoration: underline;
-}
-.notice_single {
-  clear: both;
-  display: block;
-  margin: 0;
-  padding: 5px 5px 5px 0;
-  min-height: 48px;
-  font-family: Georgia, "Times New Roman", Times, serif;
-  font-size: 1em;
-  line-height: 1.4em;
-  border-bottom: 1px solid #D8E2D7;
-}
-.notice_single:hover {
-  background-color: #F3F8EA;
-}
-.notice_single p {
-  display: inline;
-  margin: 0;
-  padding: 0;
-}
-#notice_delete_form #confirmation_text {
-  display: block;
-  font-size: 1.1em;
-  font-weight: bold;
-}
-input#submit_yes, input#submit_no {
-  margin: 18px 10px 0px 0px;
-  padding: 4px;
-  font-weight: bold;
-  color: #FCFFF5;
-  background-color: #C15D42;
-  cursor: pointer;
-  border: 0;
-  width: 40px;
-}
-input#submit_yes:hover, input#submit_no:hover {
-  background-color: #904632;
-}
-.avatar.stream {
-  float: left;
-  margin: 0 10px 0 0;
-}
-p.time {
-  display: block;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 0.9em;
-  line-height: 2em;
-}
-p.time a {
-  color: #91AA9D;
-}
-
-/* ----- Profile -----*/
-#profile {
-  clear: both;
-  float: left;
-  padding: 10px 0 0 0;
-  border-top: 1px solid #D8E2D7;
-  font-family: Georgia, "Times New Roman", Times, serif;
-}
-#profile h1 {
-  clear: both;
-  float: left;
-  margin: 0;
-  padding: 0;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1.2em;
-}
-#profile h2 {
-  clear: both;
-  float: left;
-  margin: 0;
-  padding: 1em 0 0.2em 0;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1.1em;
-  text-transform: uppercase;
-  color: #91AA9D;
-}
-#profile p {
-  clear: both;
-  float: left;
-  margin: 0 10px 0 0;
-  font-size: 1em;
-  line-height: 1.4em;
-}
-#profile p.location {
-  margin: 0 10px 12px 0;
-  font-style: italic;
-}
-#profile p.notice_current {
-  font-size: 1.2em;
-  line-height: 1.3em;
-}
-#profile_avatar {
-  float: left;
-  margin-right: 4px;
-}
-#profile_avatar img {
-  margin-bottom: 5px;
-}
-.avatar.profile {
-  clear: left;
-  margin: 0 10px 5px 0;
-}
-.avatar.original {
-  float: left;
-  margin: 0 10px 18px 0;
-}
-a.nickname {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-weight: bold;
-  font-size: 1.1em;
-  padding-right: 3px;
-}
-#profile_information {
-  float: left;
-}
-
-.statistics {
-  clear: both;
-  float: left;
-}
-.statistics h2 {
-  clear: both;
-  float: left;
-  margin: 12px 0 3px 0;
-}
-dl.statistics {
-  margin: 0;
-}
-.statistics dt {
-  clear: left;
-  float: left;
-  width: 200px;
-}
-.statistics dd {
-  float: left;
-}
-.statistics dt:after {
-  content: ":";
-}
-#subscriptions {
-  clear: both;
-  float: left;
-  margin: 18px 0 30px 0;
-}
-#subscriptions_avatars {
-  clear: both;
-  float: left;
-  margin: 6px 0 0 0;
-  padding: 0;
-  list-style-type: none;
-}
-#subscriptions_avatars li .avatar.mini {
-  float: left;
-  margin: 0 3px 3px 0;
-  padding: 0;
-  line-height: 0;
-}
-#subscriptions_viewall {
-  clear: left;
-}
-/* ----- End Profile -----*/
-
-/* ----- Begin Subscriptions & Subscribers -----*/
-
-ul.subscriptions, ul.subscribers {
-  float: none;
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-  overflow: auto;
-}
-ul.subscriptions li, ul.subscribers li {
-  display: block;
-  float: left;
-  padding: 0;
-}
-/* ----- End Subscriptions & Subscribers -----*/
-
-#pagination {
-  margin: 18px auto;
-}
-#nav_pagination {
-  margin: 0 0 36px 0;
-  padding: 0;
-  float: right;
-  list-style-type: none;
-  font-size: 12px;
-  font-weight: bold;
-}
-#nav_pagination li {
-  display: block;
-  float: left;
-  background-color: #91AA9D;
-}
-#nav_pagination li.before {
-  margin-right: 1px;
-}
-#nav_pagination li a {
-  padding: 6px 15px;
-  line-height: 2em;
-  background-color: #91AA9D;
-  color: #FCFFF5;
-}
-#nav_pagination li a:hover {
-  background-color: #3F606F;
-  color: #FCFFF5;
-  text-decoration: none;
-}
-
-#footer {
-  clear: both;
-  margin: 10px;
-  border-top: 1px solid #D8E2D7;
-}
-#footer p {
-  font-size: 0.8em;
-  margin-top: 1em;
-  line-height: 1.2em;
-}
-#cc {
-  float: left;
-  margin: 3px 10px 0 0;
-}
-
-/* ===== Begin Forms Styling ===== */
-
-/* ----- Forms General Style ----- */
-form {
-  margin: 0 auto;
-  padding: 0;
-}
-form {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1em;
-}
-form label {
-  display: block;
-  font-size: 1em;
-  font-weight: bold;
-  line-height: 1.5em;
-}
-form input {
-  border: 1px solid #D8E2D7;
-  width: 264px;
-}
-input#submit, input.submit  {
-  display: block;
-  margin: 18px 0;
-  padding: 4px;
-  font-weight: bold;
-  color: #FCFFF5;
-  background-color: #C15D42;
-  cursor: pointer;
-  border: 0;
-  width: auto;
-}
-input#submit:hover, input.submit:hover {
-  background-color: #904632;
-}
-input.checkbox {
-  width: auto;
-  border: 0;
-}
-textarea, input {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1em;
-  color: #193441;
-  padding: 3px;
-}
-textarea:focus, input:focus {
-  background-color: #f0f6eb;
-}
-textarea {
-  width: 270px;
-  border: 1px solid #D8E2D7;
-}
-.input_instructions {
-  margin-top: 3px;
-  display: block;
-  font-size: 1em;
-  line-height: 1.2em;
-  color: #91aa9d;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-/* ----- Status Form ----- */
-#status_form {
-  width: 100%;
-  margin: 0px 0px 10px 5px;
-}
-#status_form p {
-  margin: 0;
-  padding: 0;
-}
-#status_label {
-  display: none;
-  clear: both;
-  margin: 0;
-  padding: 0 0 3px 0;
-  font-size: 1.5em;
-  font-weight: bold;
-  line-height: 2em;
-  color: #91AA9D;
-}
-#status_textarea {
-  display: block;
-  float: left;
-  width: 70%;
-  height: 3em;
-  margin: 0 0 10px 0;
-  padding: 0;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 1.1em;
-  color: #193441;
-  border: 0;
-}
-#status_submit {
-  display: block;
-  float: left;
-  margin: 0 0 0 4px;
-  padding: 1em 10px 1em 10px;
-  line-height: 1em;
-  width: 10%;
-  background-color: #C15D42;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-weight: bold;
-  font-size: 1em;
-  color: #FCFFF5;
-  cursor: pointer;
-  border: 0;
-}
-#status_submit:hover {
-  background-color: #904632;
-}
-#counter {
-  padding: 1em .5em 1em 5px;
-  color: #fff;
-  clear: both;
-  float: left;
-  font-weight: bold;
-  text-align: right;
-}
-/* ----- Subscribe Form ----- */
-#subscribe .submit, #unsubscribe .submit, #remotesubscribe .button, #remotesubscribe {
-  clear: left;
-  margin: 0;
-  width: 96px;
-  height: 27px;
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-weight: bold;
-  font-size: 12px;
-  text-transform: uppercase;
-  background-color: #c15d42;
-  color: #fcfff5;
-  border: 0;
-}
-#remotesubscribe {
-  width: 96px;
-  height: 22px;
-  padding: 5px 0 0 0;
-  text-align: center;
-}
-#subscribe .button:hover, #unsubscribe .button:hover {
-  background-color: #904632;
-  cursor: pointer;
-}
-
-a#remotesubscribe {
-  display: block;
-}
-
-/* ----- Login Form -----*/
-input#license {
-  width: auto;
-  border: 0;
-}
-/* ----- Avatar Form -----*/
-form {
-  clear: left;
-}
-
-/* ----- OpenID Form -----*/
-
-input#openid_url {
-  background: url(login-bg.gif) no-repeat;
-  background-color: #fff;
-  background-position: 4px 50%;
-  color: #000;
-  padding-left: 24px;
-}
-
-/* People lists (search results, maybe subscribers) */
-
-#profiles {
-  clear: both;
-  margin: 0 auto;
-  padding: 0;
-  list-style-type: none;
-  border-top: 1px solid #D8E2D7;
-}
-#profiles a:hover {
-  text-decoration: underline;
-}
-
-.profile_single {
-  clear: both;
-  display: block;
-  margin: 0;
-  padding: 5px 5px 5px 0;
-  min-height: 48px;
-  font-family: Georgia, "Times New Roman", Times, serif;
-  font-size: 1.2em;
-  line-height: 1.4em;
-  border-bottom: 1px solid #D8E2D7;
-}
-.profile_single:hover {
-  background-color: #F3F8EA;
-}
-
-/* ----- IM Settings Form -----*/
-
-#imsettings p {
-  margin: 0;
-  padding: 0;
-  line-height: 1.3em;
-}
-
-/* ===== End Forms Styling ===== */
-
-/* ===== Tag Cloud Styling ===== */
-
-p.tagcloud {
-text-align: center;
-}
-
-p.tagcloud a {
-line-height:1em;
-vertical-align:middle;
-}
-
-p.tagcloud a.largest {
-font-size: 4em;
-}
-p.tagcloud a.verylarge {
-font-size: 3em;
-}
-
-p.tagcloud a.large {
-font-size: 2em;
-}
-
-p.tagcloud a.medium {
-font-size: 1.5em;
-}
-
-p.tagcloud a.small {
-font-size: 1em;
-}
-
-p.tagcloud a.verysmall {
-font-size: 80%;
-}
-
-p.tagcloud a.smallest {
-font-size: 60%;
-}
-
-a.replybutton {
-  border: 1px solid #D8E2D7;
-  padding: 0px 10px 0px 10px;
-  line-height: 0.8em;
-}
diff --git a/theme/iphone/display.css.dist b/theme/iphone/display.css.dist
deleted file mode 100644
index 395da2e2fe..0000000000
--- a/theme/iphone/display.css.dist
+++ /dev/null
@@ -1,686 +0,0 @@
-/* CSS Document */
-/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */
-
-html {
-	background: url(bg-body.gif) repeat-y top center #d8e2d7;
-	}
-body {
-	position: absolute;
-	width: 100%;
-	margin: 0;
-	padding: 0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	line-height: 12px;
-	min-height: 100%;
-	height: 100%;
-	color: #193441;
-	}
-a {
-	color: #C15D42;
-	text-decoration: none;
-	}
-a:hover {
-	text-decoration: underline;
-	}
-img, img a {
-	border: 0;
-	}
-h1 {
-	font-size: 14px;
-	}
-
-
-#wrap {
-	margin: 0 auto;
-	padding: 0 20px;
-	width: 760px;
-	background: url(bg-header.gif) repeat-x #FCFFF5;
-	}
-#header {
-	position: relative;
-	margin: 0 auto;
-	width: 540px;
-	height: 216px;
-	}
-#logo {
-	margin-top: 9px;
-	}
-p#branding {
-	margin: 0;
-	padding: 6px 0 3px 0;
-	color: #fbf2d7;
-	font-size: 21px;
-	font-weight: bold;
-	line-height: 27px;
-	}
-p#branding a {
-	color: #dab134;
-	}
-
-#header h1.pagetitle {
-	margin: 0;
-	padding: 0;
-	font-size: 15px;
-	line-height: 24px;
-	color: #d8e2d7;
-}
-
-#header h2.sitename {
-	display: none;
-	margin: 0;
-	padding: 0;
-	color: #FCFFF5;
-}
-
-/* ===== Begin Navigation Styling ===== */
-
-/* ----- Navigation ------ */
-#nav {
-	float: right;
-	margin: 0;
-	padding: 0;
-	list-style-type: none;
-	font-size: 12px;
-	}
-#nav li {
-	display: block;
-	float: left;
-	}
-#nav li a {
-	display: block;
-	padding: 9px 9px 12px 9px;
-	color: #91AA9D;
-	}
-#nav li a:hover {
-	text-decoration: underline;
-	}
-
-/* ----- Tabs ----- */
-#nav_views {
-	margin: 0 auto;
-	padding: 0;
-	position: absolute;
-	bottom: 0;
-	list-style-type: none;
-	font-size: 14px;
-	font-weight: bold;
-	width: 540px;
-	/*height: 30px;*/
-	}
-#nav_views li {
-	display: block;
-	float: left;
-	line-height: 21px;
-	}
-#nav_views li a {
-	display: block;
-	margin: 0;
-	padding: 4px 12px 3px 12px;
-	color: #FCFFF5;
-	background-color: #91AA9D;
-	border-right: 1px solid #6A8787;
-	}
-#nav_views li a:hover {
-	text-decoration: none;
-	}
-#nav_views li.current a, #nav_views li.current a:hover {
-	color: #3F606F;
-	background-color: #FCFFF5;
-	border-right: 1px solid #6A8787;
-	}
-#nav_views li.current a:hover {
-	color: #193441;
-	}
-#nav_views li a:hover {
-	color: #FCFFF5;
-	background-color: #3F606F;
-	border-right: 1px solid #6A8787;
-	}
-
-/* ----- Nav Footer ----- */
-#nav_sub {
-	clear: both;
-	margin: 18px auto 0 auto;
-	padding: 0;
-	list-style-type: none;
-	font-size: 11px;
-	font-weight: bold;
-	line-height: 21px;
-	border-top: 1px solid #D8E2D7;
-	width: 540px;
-	}
-#nav_sub li {
-	display: block;
-	float: left;
-	}
-#nav_sub li a {
-	padding: 6px 24px 6px 0;
-	}
-#nav_sub li a:hover {
-	text-decoration: underline;
-	}
-/* ===== End Navigation Styling ===== */
-
-#content {
-	clear: left;
-	margin: 40px 0 45px 0;
-	padding: 0 110px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 14px;
-	line-height: 18px;
-	}
-#content h2 {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 15px;
-	}
-#content label {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	}
-.instructions p, .success, .error {
-	font-weight: normal;
-	margin: 36px 0 0 0;
-	padding: 10px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 13px;
-	line-height: 15px;
-	border: 1px solid #91AA9D;
-	color: #FCFFF5;
-	}
-.instructions a, .success a, .error a {
-	color: #d8e2d7;
-	text-decoration: underline;
-	}
-.instructions a:hover, .success a:hover, .error a:hover {
-	color: #FCFFF5;
-	}		
-.success {
-	background-color: #48705b;
-	}
-.error {
-	background-color: #ce3728;
-	}
-
-
-/* ----- Stream -----*/
-
-#notices {
-	clear: both;
-	margin: 0 auto;
-	padding: 0;
-	list-style-type: none;
-	width: 540px;
-	border-top: 1px solid #D8E2D7;
-	}
-#notices a:hover {
-	text-decoration: underline;
-	}
-.notice_single {
-	clear: both;
-	display: block;
-	margin: 0;
-	padding: 5px 5px 5px 0;
-	min-height: 48px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 13px;
-	line-height: 16px;
-	border-bottom: 1px solid #D8E2D7;
-	}
-.notice_single:hover {
-	background-color: #F3F8EA;
-	}
-.notice_single p {
-	display: inline;
-	margin: 0;
-	padding: 0;
-	}
-#notice_delete_form #confirmation_text {
-        display: block;
-	font-size: 14px;
-	font-weight: bold;
-	}
-input#submit_yes, input#submit_no {
-	margin: 18px 10px 0px 0px;
-	padding: 4px;
-	font-weight: bold;
-	color: #FCFFF5;
-	background-color: #C15D42;
-	cursor: pointer;
-	border: 0;
-	width: 40px;
-	}
-input#submit_yes:hover, input#submit_no:hover {
-	background-color: #904632;
-	}
-.avatar.stream {
-	float: left;
-	margin: 0 10px 0 0;
-	}
-p.time {
-	display: block;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	line-height: 15px;
-	}
-p.time a {
-	color: #91AA9D;
-	}
-	
-/* ----- Profile -----*/
-#profile {
-	clear: left;
-	margin: 0 -110px;
-	padding: 10px 0 0 0;
-	min-height: 170px;
-	border-top: 1px solid #D8E2D7;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	}
-#profile h1 {
-	margin: 0;
-	padding: 0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	}
-#profile h2 {
-	margin: 0;
-	padding: 0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	text-transform: uppercase;
-	color: #91AA9D;
-	}
-#profile p {
-	margin: 0 10px 0 0;
-	font-size: 12px;
-	line-height: 14px;
-	}
-#profile p.location {
-	margin: 0 10px 12px 0;
-	font-style: italic;
-	}
-#profile p.notice_current {
-	font-size: 18px;
-	line-height: 21px;
-	}
-#profile_avatar {
-	float: left;
-	margin-right: 4px;
-	}
-#profile_avatar img {
-	margin-bottom: 5px;
-	}
-.avatar.profile {
-	clear: left;
-	margin: 0 10px 5px 0;
-	}
-.avatar.original {
-	float: left;
-	margin: 0 10px 18px 0;
-	}
-a.nickname {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 12px;
-	padding-right: 3px;
-	}
-#profile_information {
-	float: left;
-	position: relative;
-	width: 270px;
-	height: 200px;
-	}
-.statistics {
-	margin-top: 18px;
-	}
-.statistics h2 {
-	margin: 12px 0 3px 0;
-	}
-dl.statistics {
-	margin: 0;
-	font-size: 12px;
-	line-height: 14px;
-	}
-.statistics dt {
-	float: left;
-	width: 96px;
-}	
-.statistics dd {
-	margin-left: 100px;
-}
-.statistics dt:after {
-	content: ":";
-	}
-#subscriptions {
-	float: left;
-	margin: 18px 0 30px 0;
-	}
-#subscriptions_avatars {
-	float: left;
-	margin: 6px 0 0 0;
-	padding: 0;
-	list-style-type: none;
-	width: 270px;
-	}
-#subscriptions_avatars li .avatar.mini {
-	float: left;
-	margin: 0 3px 3px 0;
-	padding: 0;
-	line-height: 0;
-	/* border: 1px solid #f00; */
-	}
-#subscriptions_viewall {
-	clear: left;
-	}
-/* ----- End Profile -----*/
-
-/* ----- Begin Subscriptions & Subscribers -----*/
-
-ul.subscriptions, ul.subscribers {
-	float: none;
-	margin: 0;
-	padding: 0;
-	list-style-type: none;
-	overflow: auto;
-	}
-ul.subscriptions li, ul.subscribers li {
-	display: block;
-	float: left;
-	padding: 0;
-	}
-/* ----- End Subscriptions & Subscribers -----*/
-
-
-
-#pagination {
-	margin: 18px auto;
-	width: 540px;
-	}
-#nav_pagination {
-	margin: 0 0 36px 0;
-	padding: 0;
-	float: right;
-	list-style-type: none;
-	font-size: 12px;
-	font-weight: bold;
-	}
-#nav_pagination li {
-	display: block;
-	float: left;
-	background-color: #91AA9D;
-	}
-#nav_pagination li.before {
-	margin-right: 1px;
-	}
-#nav_pagination li a {
-	padding: 6px 15px;
-	line-height: 21px;
-	background-color: #91AA9D;
-	color: #FCFFF5;
-	}
-#nav_pagination li a:hover {
-	background-color: #3F606F;
-	color: #FCFFF5;
-	text-decoration: none;
-	}
-
-#footer {
-	clear: both;
-	margin: 0 auto;
-	padding: 0 0 36px 0;
-	width: 540px;
-	border-top: 1px solid #D8E2D7;
-	}
-#footer p {
-	margin-top: 9px;
-	line-height: 12px;
-	}
-#cc {
-	float: left;
-	margin: 3px 10px 0 0;
-	}
-
-/* ===== Begin Forms Styling ===== */
-
-/* ----- Forms General Style ----- */
-form {
-	margin: 0 auto;
-	padding: 0;
-	}
-form {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	}
-form label {
-	display: block;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 18px;
-	}
-form input {
-	border: 1px solid #D8E2D7;
-	width: 264px;
-	}
-input#submit, input.submit  {
-	display: block;
-	margin: 18px 0;
-	padding: 4px;
-	font-weight: bold;
-	color: #FCFFF5;
-	background-color: #C15D42;
-	cursor: pointer;
-	border: 0;
-	width: auto;
-	}
-input#submit:hover, input.submit:hover {
-	background-color: #904632;
-	}
-input.checkbox {
-	/*width: 14px;
-	height: 14px;*/
-	width: auto;
-	border: 0;
-	}	
-textarea, input {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #193441;
-	padding: 3px;
-	}
-textarea:focus, input:focus {
-	background-color: #f0f6eb;
-	}
-textarea {
-	width: 270px;
-	border: 1px solid #D8E2D7;
-	}
-.input_instructions {
-	margin-top: 3px;
-	display: block;
-	font-size: 11px;
-	line-height: 15px;
-	color: #91aa9d;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	}
-
-/* ----- Status Form ----- */
-#status_form {
-	height: 96px;
-	/*background-color: #F00;*/
-	}
-#status_form p {
-	margin: 36px 0 0 0;
-	padding: 0;
-	}
-#status_label {
-	display: block;
-	clear: both;
-	margin: 0;
-	padding: 0 0 3px 0;
-	font-size: 18px;
-	font-weight: bold;
-	line-height: 24px;
-	color: #91AA9D;
-	}
-#status_textarea {
-	display: block;
-	float: left;
-	width: 463px;
-	height: 35px;
-	padding: 5px;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #193441;
-	border: 0;
-	}
-#status_submit {
-	display: block;
-	float: left;
-	margin: 1px 0 0 4px;
-	width: 63px;
-	height: 45px;
-	background-color: #C15D42;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 14px;
-	color: #FCFFF5;
-	cursor: pointer;
-	border: 0;
-	}
-#status_submit:hover {
-	background-color: #904632;
-	}
-#counter {
-	position: absolute;
-	top: 140px;
-	left: -64px;
-	width: 50px;
-	font-weight: bold;
-	text-align: right;
-}
-/* ----- Subscribe Form ----- */
-#subscribe .submit, #unsubscribe .submit, #remotesubscribe .button, #remotesubscribe {
-	clear: left;
-	margin: 0;
-	width: 96px;
-	height: 27px;
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-weight: bold;
-	font-size: 10px;
-	text-transform: uppercase;
-	background-color: #c15d42;
-	color: #fcfff5;
-	border: 0;
-	}
-#remotesubscribe {
-	width: 96px;
-	height: 22px;
-	padding: 5px 0 0 0;
-	text-align: center;
-	}
-#subscribe .button:hover, #unsubscribe .button:hover {
-	background-color: #904632;
-	cursor: pointer;
-	}
-
-a#remotesubscribe {
-	display: block;
-}
-
-/* ----- Login Form -----*/
-input#license {
-	width: auto;
-	border: 0;
-	}
-/* ----- Avatar Form -----*/
-form {
-	clear: left;
-}
-
-/* ----- OpenID Form -----*/
-
-input#openid_url {
-   background: url(login-bg.gif) no-repeat;
-   background-color: #fff;
-   background-position: 4px 50%;
-   color: #000;
-   padding-left: 24px;
-}
-
-/* People lists (search results, maybe subscribers) */
-
-#profiles {
-	clear: both;
-	margin: 0 auto;
-	padding: 0;
-	list-style-type: none;
-	width: 540px;
-	border-top: 1px solid #D8E2D7;
-	/*border: 1px solid #F00;*/
-	}
-#profiles a:hover {
-	text-decoration: underline;
-	}
-	
-.profile_single {
-	clear: both;
-	display: block;
-	margin: 0;
-	padding: 5px 5px 5px 0;
-	min-height: 48px;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size: 13px;
-	line-height: 16px;
-	border-bottom: 1px solid #D8E2D7;
-	}
-.profile_single:hover {
-	background-color: #F3F8EA;
-	}
-
-/* ----- IM Settings Form -----*/
-
-#imsettings p {
-	margin: 0;
-	padding: 0;
-	line-height: 15px;
-}
-
-/* ===== End Forms Styling ===== */
-
-/* ===== Tag Cloud Styling ===== */
-
-p.tagcloud {
-text-align: center;
-}
-
-p.tagcloud a {
-line-height:100%;
-vertical-align:middle;
-}
-
-p.tagcloud a.largest {
-font-size: 400%;
-}
-p.tagcloud a.verylarge {
-font-size: 300%;
-}
-
-p.tagcloud a.large {
-font-size: 200%;
-}
-
-p.tagcloud a.medium {
-font-size: 150%;
-}
-
-p.tagcloud a.small {
-font-size: 100%;
-}
-
-p.tagcloud a.verysmall {
-font-size: 80%;
-}
-
-p.tagcloud a.smallest {
-font-size: 60%;
-}
diff --git a/theme/iphone/ie6.css.dist b/theme/iphone/ie6.css.dist
deleted file mode 100644
index 97d9fee3fe..0000000000
--- a/theme/iphone/ie6.css.dist
+++ /dev/null
@@ -1,63 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-body {
-	text-align: center;
-}
-input {
-	height: 24px;
-}
-#wrap {
-	margin: 0 auto;
-	padding: 0 20px;
-	width: 800px;
-	text-align: left;
-	background: url(bg-header.gif) repeat-x #FCFFF5;
-	}
-#header {
-	position: relative;
-	margin-left: 108px;
-	}	
-#nav_views {
-	margin: 0;
-	}
-#nav_views li {
-	line-height: 19px;
-	}
-.statistics dd {
-	margin-top: -15px;
-	clear: both;
-	}	
-#notices {
-	margin: 0;
-	}			
-.notice_single {
-	height: 48px;
-	}
-#profile p.notice_current {
-	height: 96px;
-	}	
-	
-#subscriptions_avatars li {
-	float: left;
-	margin: 0;
-	padding: 0;
-	}
-img.avatar.original, img.avatar.profile {
-	clear: none;
-	float: left;
-}		
-#status_textarea {
-	height: 46px;
-	}
-			
-#nav_pagination li a {
-	padding: 6px 15px;
-	line-height: 27px;
-	}
-#nav_sub {
-	position: relative;
-	margin-left: 108px;
-	}	
-#footer {
-	margin-left: 108px;
-}
diff --git a/theme/iphone/ie7.css.dist b/theme/iphone/ie7.css.dist
deleted file mode 100644
index bbf52d5cfd..0000000000
--- a/theme/iphone/ie7.css.dist
+++ /dev/null
@@ -1,20 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-
-#statistics dd {
-	clear: both;
-	}		
-	
-	
-#subscriptions_avatars li {
-	float: left;
-	}
-img.avatar.original, img.avatar.profile {
-	clear: none;
-	float: left;
-}
-			
-#nav_pagination li a {
-	padding: 6px 15px;
-	line-height: 27px;
-	}
\ No newline at end of file
diff --git a/theme/iphone/login-bg.gif b/theme/iphone/login-bg.gif
deleted file mode 100644
index e2d8377db023a3915cc9e8c2f1f5c7462622f0a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 328
zcmZ?wbhEHb6krfwxXQrr>({UQ_wR4qxN*;(J#*&FS-N!TvSrKGuV4S?%F;i7{_Nbj
z^V6qK`}XadJ9qBs)2Dx~3p;V*#MZ4_j~qF&aN)v#|Nb2~aNyv<gIl(2xq0*Et5>g9
ztXT2$=g%EGcI@80`{m1*Z{NOs{rdIFl`Ee<eY$t=-c_qsUB7<)%$YOq-o1PO{{6gp
z^S)1(`~Uwx0|h|wCkt4&4u}N#iGeNkz|;Z_7lD5F7Os;qE2o`(Y^>F4W-ruOthu2f
ztl_Mdp@*QzZPDcui{^-N`o3xq@(UMrZh5FF-w`Y#$*8QNq^Zf+5a!Y$(d{Fk$;RMZ
d?jf!z+?DC8mZr!$-G@O{mX$wbm9ry*H2@d`j5z=R

diff --git a/theme/iphone/logo.png b/theme/iphone/logo.png
deleted file mode 100644
index 3b271814d6efb8359231648b514ca87799fff178..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 818
zcmV-21I_%2P)<h;3K|Lk000e1NJLTq004df000^Y0{{R3Mwl4(0001BP)t-s88kus
z|MgO5Zo|yTi<+A!K}_!Q>TZCAL|S7tO<2*{)3v|7;O5?us-35^v3-q@V03wyrlwVI
zZ*z=>YlVOzJ4cD5mp@rvH&R$+etIxUQYb@BdX$U+0000000000xJ&Bz0007wNkl<Z
zNQteM>w>Hx2!KsdGuy1$%elV)a~?%htafLbJ^Y!`fKL%bA%xHYtmwt6DB>xxVD%+~
zX&8nb3*yx96kSEb>573&sKNao{D{uR%lO{nBHq@c%Fg5kyf)Eb?&mJzm!>_(zvcox
z2F$CakNs8r)U=~Be<k*(auNS@q8>#{DP4!xGQc|SwF1aeVDc_LIhE}{z$%$(Ej$hL
zP=yqH9vQ%4TG*(!Jh!9;sA`~kXI1Q!=e-kps{l0aELJlx$);`W3%;#!()aPYDQMxC
zf8%=mI&{+LCi8&sOyE9#s^8Of#5WlA9N=D(1y<lNgM`HpJ{M&?CzqTUUGa-u5j&?_
zcEN=J*yv2{@j&_#rVxkThv-gQBw)Q23shX1P5ce%7qbqdX6cKu#ST62)Pp_VR2Q9K
zq$S7Cv_XbXd-g4cKwq-AP&|BvN6dDh3%$pWOtIiG9ukEb6Dvvi2%assN%FVHOA0T;
z^E@4%!+Z7(#rl?g91nG(Lge@Hs>kbz`+EdGt18>K@tK}n?(yLme9RB%j_s-7*M^3P
z=y7;@_POrFMh;Q?F}yy<1KSjhvgRI-Tg`=+@46DYE^j}@vtvv6_qUgq*LT|QtPj?Q
z!pp452}cd3tRr7C!maizyw@H6_7dfnplfHgF80W+#RBWN$M5qzt&y6`q{@@%3_p^A
zV))mD{}7Z?Sqvf6M)}|2@y$ev<^3}5d*B&f%t!oN!vF2P#$#06-3~9dvJDLdGBShI
zAy4tNNRI#g5%E7zFO)5qv31{Nt;X>Rr1WyZD+O`j+UsNtODt0lHn*PkZowx^K5=bh
w!vjg*QSs01_LDs56};LYn@LE{9NxV89}6`S_nFs3yZ`_I07*qoM6N<$f`d_*H~;_u


From 2f065d687dc76bfbac3e1b7b3dcccf544f4b4987 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 4 Oct 2009 23:53:02 +0200
Subject: [PATCH 202/247] Unnecessary selector bit

---
 theme/base/css/display.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 7706fba484..76709113fc 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -251,7 +251,7 @@ margin-right:18px;
 margin-bottom:11px;
 margin-left:18px;
 }
-#site_nav_global_primary ul li {
+#site_nav_global_primary li {
 display:inline;
 margin-left:11px;
 }

From 7a33125a6c05a885a7e4c6d80be4e0fe26499565 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Mon, 5 Oct 2009 14:17:55 +0000
Subject: [PATCH 203/247] Added hook to wrap the notice form data block

---
 EVENTS.txt         |  6 +++++
 lib/noticeform.php | 64 ++++++++++++++++++++++++----------------------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index fbb2f36a7b..02b11a8a67 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -93,6 +93,12 @@ StartShowAside: Showing before the Aside container
 EndShowAside: Showing after the Aside container
 - $action: the current action
 
+StartShowNoticeFormData: Showing before the notice form data
+- $action: the current action
+
+EndShowNoticeFormData: Showing after the notice form data
+- $action: the current action
+
 StartNoticeSave: before inserting a notice (good place for content filters)
 - $notice: notice being saved (no ID or URI)
 
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 186330bf1c..9864d15eb0 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -142,40 +142,44 @@ class NoticeForm extends Form
 
     function formData()
     {
-        $this->out->element('label', array('for' => 'notice_data-text'),
-                            sprintf(_('What\'s up, %s?'), $this->user->nickname));
-        // XXX: vary by defined max size
-        $this->out->element('textarea', array('id' => 'notice_data-text',
-                                              'cols' => 35,
-                                              'rows' => 4,
-                                              'name' => 'status_textarea'),
-                            ($this->content) ? $this->content : '');
+        if (Event::handle('StartShowNoticeFormData', array($this))) {
+            $this->out->element('label', array('for' => 'notice_data-text'),
+                                sprintf(_('What\'s up, %s?'), $this->user->nickname));
+            // XXX: vary by defined max size
+            $this->out->element('textarea', array('id' => 'notice_data-text',
+                                                  'cols' => 35,
+                                                  'rows' => 4,
+                                                  'name' => 'status_textarea'),
+                                ($this->content) ? $this->content : '');
 
-        $contentLimit = Notice::maxContent();
+            $contentLimit = Notice::maxContent();
 
-        $this->out->element('script', array('type' => 'text/javascript'),
-                            'maxLength = ' . $contentLimit . ';');
+            $this->out->element('script', array('type' => 'text/javascript'),
+                                'maxLength = ' . $contentLimit . ';');
 
-        if ($contentLimit > 0) {
-            $this->out->elementStart('dl', 'form_note');
-            $this->out->element('dt', null, _('Available characters'));
-            $this->out->element('dd', array('id' => 'notice_text-count'),
-                                $contentLimit);
-            $this->out->elementEnd('dl');
+            if ($contentLimit > 0) {
+                $this->out->elementStart('dl', 'form_note');
+                $this->out->element('dt', null, _('Available characters'));
+                $this->out->element('dd', array('id' => 'notice_text-count'),
+                                    $contentLimit);
+                $this->out->elementEnd('dl');
+            }
+
+            if (common_config('attachments', 'uploads')) {
+                $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
+                $this->out->element('input', array('id' => 'notice_data-attach',
+                                                   'type' => 'file',
+                                                   'name' => 'attach',
+                                                   'title' => _('Attach a file')));
+                $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
+            }
+            if ($this->action) {
+                $this->out->hidden('notice_return-to', $this->action, 'returnto');
+            }
+            $this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
+
+            Event::handle('StartShowNoticeFormData', array($this));
         }
-
-        if (common_config('attachments', 'uploads')) {
-            $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
-            $this->out->element('input', array('id' => 'notice_data-attach',
-                                               'type' => 'file',
-                                               'name' => 'attach',
-                                               'title' => _('Attach a file')));
-            $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
-        }
-        if ($this->action) {
-            $this->out->hidden('notice_return-to', $this->action, 'returnto');
-        }
-        $this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
     }
 
     /**

From aeca8807dbce951beccbc3fb0e5a4ae5600e5e5f Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Mon, 5 Oct 2009 12:55:55 -0400
Subject: [PATCH 204/247] Open tags should have closing tags

---
 scripts/allsites.php               | 3 ++-
 scripts/createsim.php              | 1 +
 scripts/decache.php                | 1 +
 scripts/deleteuser.php             | 1 +
 scripts/enjitqueuehandler.php      | 1 +
 scripts/facebookqueuehandler.php   | 1 +
 scripts/fixup_conversations.php    | 1 +
 scripts/fixup_hashtags.php         | 1 +
 scripts/fixup_inboxes.php          | 1 +
 scripts/fixup_notices_rendered.php | 1 +
 scripts/fixup_replies.php          | 1 +
 scripts/fixup_utf8.php             | 1 +
 scripts/getpiddir.php              | 1 +
 scripts/getvaliddaemons.php        | 1 +
 scripts/inbox_users.php            | 1 +
 scripts/jabberqueuehandler.php     | 1 +
 scripts/maildaemon.php             | 1 +
 scripts/ombqueuehandler.php        | 1 +
 scripts/pingqueuehandler.php       | 1 +
 scripts/publicqueuehandler.php     | 1 +
 scripts/reportsnapshot.php         | 1 +
 scripts/sessiongc.php              | 1 +
 scripts/setpassword.php            | 1 +
 scripts/showcache.php              | 1 +
 scripts/smsqueuehandler.php        | 1 +
 scripts/synctwitterfriends.php     | 2 +-
 scripts/triminboxes.php            | 1 +
 scripts/twitterqueuehandler.php    | 1 +
 scripts/twitterstatusfetcher.php   | 2 +-
 scripts/uncache_users.php          | 1 +
 scripts/update_translations.php    | 1 +
 scripts/xmppconfirmhandler.php     | 2 +-
 scripts/xmppdaemon.php             | 1 +
 33 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/scripts/allsites.php b/scripts/allsites.php
index cf1419e550..ff9d8bc804 100755
--- a/scripts/allsites.php
+++ b/scripts/allsites.php
@@ -37,4 +37,5 @@ if ($sn->find()) {
     while ($sn->fetch()) {
         print "$sn->nickname\n";
     }
-}
\ No newline at end of file
+}
+?>
diff --git a/scripts/createsim.php b/scripts/createsim.php
index 71ed3bf722..93f904506a 100644
--- a/scripts/createsim.php
+++ b/scripts/createsim.php
@@ -140,3 +140,4 @@ $tagmax     = (have_option('t', 'tags')) ? get_option_value('t', 'tags') : 10000
 $userprefix = (have_option('x', 'prefix')) ? get_option_value('x', 'prefix') : 'testuser';
 
 main($usercount, $noticeavg, $subsavg, $tagmax);
+?>
diff --git a/scripts/decache.php b/scripts/decache.php
index 7cabd78ada..9b820bd832 100644
--- a/scripts/decache.php
+++ b/scripts/decache.php
@@ -48,3 +48,4 @@ if (!$object) {
 }
 
 $result = $object->decache();
+?>
diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php
index 52389123c5..446f76878b 100644
--- a/scripts/deleteuser.php
+++ b/scripts/deleteuser.php
@@ -66,3 +66,4 @@ if (!have_option('y', 'yes')) {
 print "Deleting...";
 $user->delete();
 print "DONE.\n";
+?>
diff --git a/scripts/enjitqueuehandler.php b/scripts/enjitqueuehandler.php
index 08f733b07c..5eda062f5a 100755
--- a/scripts/enjitqueuehandler.php
+++ b/scripts/enjitqueuehandler.php
@@ -137,3 +137,4 @@ if ($handler->start()) {
 }
 
 $handler->finish();
+?>
diff --git a/scripts/facebookqueuehandler.php b/scripts/facebookqueuehandler.php
index e13ac4e850..dc17cb15a0 100755
--- a/scripts/facebookqueuehandler.php
+++ b/scripts/facebookqueuehandler.php
@@ -72,3 +72,4 @@ if (have_option('i')) {
 $handler = new FacebookQueueHandler($id);
 
 $handler->runOnce();
+?>
diff --git a/scripts/fixup_conversations.php b/scripts/fixup_conversations.php
index 8a9f7bb577..f79288f7b3 100755
--- a/scripts/fixup_conversations.php
+++ b/scripts/fixup_conversations.php
@@ -68,3 +68,4 @@ while ($nid->fetch()) {
     
     print ".\n";
 }
+?>
diff --git a/scripts/fixup_hashtags.php b/scripts/fixup_hashtags.php
index 5cfebd8ee8..bae0947b2d 100755
--- a/scripts/fixup_hashtags.php
+++ b/scripts/fixup_hashtags.php
@@ -45,3 +45,4 @@ while ($notice->fetch()) {
         common_log_db_error($notice, 'UPDATE', __FILE__);
     }
 }
+?>
diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php
index d55a538853..9619f3226b 100755
--- a/scripts/fixup_inboxes.php
+++ b/scripts/fixup_inboxes.php
@@ -79,3 +79,4 @@ while ($user->fetch()) {
         $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
     }
 }
+?>
diff --git a/scripts/fixup_notices_rendered.php b/scripts/fixup_notices_rendered.php
index 359cd6cce4..4b928ecd22 100755
--- a/scripts/fixup_notices_rendered.php
+++ b/scripts/fixup_notices_rendered.php
@@ -49,3 +49,4 @@ while ($notice->fetch()) {
         common_log_db_error($notice, 'UPDATE', __FILE__);
     }
 }
+?>
diff --git a/scripts/fixup_replies.php b/scripts/fixup_replies.php
index 7328635d3c..302c239151 100755
--- a/scripts/fixup_replies.php
+++ b/scripts/fixup_replies.php
@@ -39,3 +39,4 @@ while ($notice->fetch()) {
     common_log(LOG_INFO, 'Getting replies for notice #' . $notice->id);
     common_save_replies($notice);
 }
+?>
diff --git a/scripts/fixup_utf8.php b/scripts/fixup_utf8.php
index 5a9fba7c3f..24d301dab8 100755
--- a/scripts/fixup_utf8.php
+++ b/scripts/fixup_utf8.php
@@ -363,3 +363,4 @@ $fixer = new UTF8FixerUpper(array('max_date' => $max_date,
 
 $fixer->fixup();
 
+?>
diff --git a/scripts/getpiddir.php b/scripts/getpiddir.php
index 8274c37c0f..5860655fd3 100755
--- a/scripts/getpiddir.php
+++ b/scripts/getpiddir.php
@@ -28,3 +28,4 @@ ENDOFHELP;
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 echo common_config('daemon', 'piddir');
+?>
diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 8f48e8e6f0..7fffac783b 100755
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -52,3 +52,4 @@ echo "pingqueuehandler.php ";
 if (common_config('sms', 'enabled')) {
     echo "smsqueuehandler.php ";
 }
+?>
diff --git a/scripts/inbox_users.php b/scripts/inbox_users.php
index 32adcea213..718dd856be 100755
--- a/scripts/inbox_users.php
+++ b/scripts/inbox_users.php
@@ -105,3 +105,4 @@ foreach ($ids as $id) {
 		$cache->delete(common_cache_key('user:notices_with_friends:' . $user->id . ';last'));
 	}
 }
+?>
diff --git a/scripts/jabberqueuehandler.php b/scripts/jabberqueuehandler.php
index 8f3a56944d..b029ea1f1e 100755
--- a/scripts/jabberqueuehandler.php
+++ b/scripts/jabberqueuehandler.php
@@ -76,3 +76,4 @@ if (have_option('i')) {
 $handler = new JabberQueueHandler($id);
 
 $handler->runOnce();
+?>
diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index 11911dcbdc..19c77e077a 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -389,3 +389,4 @@ if (common_config('emailpost', 'enabled')) {
     $md = new MailerDaemon();
     $md->handle_message('php://stdin');
 }
+?>
diff --git a/scripts/ombqueuehandler.php b/scripts/ombqueuehandler.php
index 8e685f1c8e..a24185da35 100755
--- a/scripts/ombqueuehandler.php
+++ b/scripts/ombqueuehandler.php
@@ -85,3 +85,4 @@ if (have_option('i')) {
 $handler = new OmbQueueHandler($id);
 
 $handler->runOnce();
+?>
diff --git a/scripts/pingqueuehandler.php b/scripts/pingqueuehandler.php
index c92337e36c..768c06c776 100644
--- a/scripts/pingqueuehandler.php
+++ b/scripts/pingqueuehandler.php
@@ -67,3 +67,4 @@ if (have_option('i')) {
 $handler = new PingQueueHandler($id);
 
 $handler->runOnce();
+?>
diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index 50a11bcba0..ffb5acdb64 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -74,3 +74,4 @@ if (have_option('i')) {
 $handler = new PublicQueueHandler($id);
 
 $handler->runOnce();
+?>
diff --git a/scripts/reportsnapshot.php b/scripts/reportsnapshot.php
index 71f1019ee6..b8f8d2a7cf 100644
--- a/scripts/reportsnapshot.php
+++ b/scripts/reportsnapshot.php
@@ -28,3 +28,4 @@ END_OF_SNAPSHOT_HELP;
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 Snapshot::check();
+?>
diff --git a/scripts/sessiongc.php b/scripts/sessiongc.php
index af55ddf3f0..b5fdcbf341 100644
--- a/scripts/sessiongc.php
+++ b/scripts/sessiongc.php
@@ -34,3 +34,4 @@ $maxlifetime = ini_get('session.gc_maxlifetime');
 print "Deleting sessions older than $maxlifetime seconds.\n";
 
 Session::gc($maxlifetime);
+?>
diff --git a/scripts/setpassword.php b/scripts/setpassword.php
index 50d49d7dbf..f951dccf78 100755
--- a/scripts/setpassword.php
+++ b/scripts/setpassword.php
@@ -59,3 +59,4 @@ if (!$user->update($original)) {
     print "Password for user '$nickname' updated.\n";
     exit(0);
 }
+?>
diff --git a/scripts/showcache.php b/scripts/showcache.php
index f179795728..fb0ccb5e03 100644
--- a/scripts/showcache.php
+++ b/scripts/showcache.php
@@ -69,3 +69,4 @@ if (empty($obj)) {
     var_dump($obj);
     print "\n";
 }
+?>
diff --git a/scripts/smsqueuehandler.php b/scripts/smsqueuehandler.php
index 6583a77da8..9e8de7a117 100755
--- a/scripts/smsqueuehandler.php
+++ b/scripts/smsqueuehandler.php
@@ -71,3 +71,4 @@ if (have_option('i')) {
 $handler = new SmsQueueHandler($id);
 
 $handler->runOnce();
+?>
diff --git a/scripts/synctwitterfriends.php b/scripts/synctwitterfriends.php
index b30e700a1c..f582231e39 100755
--- a/scripts/synctwitterfriends.php
+++ b/scripts/synctwitterfriends.php
@@ -283,4 +283,4 @@ if (have_option('d') || have_option('debug')) {
 
 $syncer = new SyncTwitterFriendsDaemon($id, 60, 2, $debug);
 $syncer->runOnce();
-
+?>
diff --git a/scripts/triminboxes.php b/scripts/triminboxes.php
index da09817e5b..5153d17065 100644
--- a/scripts/triminboxes.php
+++ b/scripts/triminboxes.php
@@ -54,3 +54,4 @@ $cnt = $user->find();
 while ($user->fetch()) {
     Notice_inbox::gc($user->id);
 }
+?>
diff --git a/scripts/twitterqueuehandler.php b/scripts/twitterqueuehandler.php
index ce4d824d0d..820baeb0a1 100755
--- a/scripts/twitterqueuehandler.php
+++ b/scripts/twitterqueuehandler.php
@@ -72,3 +72,4 @@ if (have_option('i')) {
 $handler = new TwitterQueueHandler($id);
 
 $handler->runOnce();
+?>
diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php
index 3cdf1867a1..726d2e2375 100755
--- a/scripts/twitterstatusfetcher.php
+++ b/scripts/twitterstatusfetcher.php
@@ -562,4 +562,4 @@ if (have_option('d') || have_option('debug')) {
 
 $fetcher = new TwitterStatusFetcher($id, 60, 2, $debug);
 $fetcher->runOnce();
-
+?>
diff --git a/scripts/uncache_users.php b/scripts/uncache_users.php
index 5a1d330307..ee030f778f 100644
--- a/scripts/uncache_users.php
+++ b/scripts/uncache_users.php
@@ -50,3 +50,4 @@ foreach ($ids as $id) {
     $memc->delete(common_cache_key('user:notices_with_friends:'. $user->id));
     $memc->delete(common_cache_key('user:notices_with_friends:'. $user->id . ';last'));
 }
+?>
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index f145c1f0b6..f036657c54 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -96,3 +96,4 @@ function curl_get_file($url)
 
     return FALSE;
 }
+?>
diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index c7ed15e495..05c5f86ce7 100755
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -160,4 +160,4 @@ if (have_option('i')) {
 $handler = new XmppConfirmHandler($id);
 
 $handler->runOnce();
-
+?>
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 9e621e725a..eaebd59488 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -412,3 +412,4 @@ $foreground = have_option('f', 'foreground');
 $daemon = new XMPPDaemon($id, !$foreground);
 
 $daemon->runOnce();
+?>

From 4ed8055f86d3e3c517a9e367607f60d595b77f37 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 5 Oct 2009 09:57:59 -0700
Subject: [PATCH 205/247] New actions for managing subscriptions (friendships)

---
 actions/apifriendshipscreate.php  | 134 ++++++++++++++++
 actions/apifriendshipsdestroy.php | 136 ++++++++++++++++
 actions/apifriendshipsexists.php  | 128 +++++++++++++++
 actions/apifriendshipsshow.php    | 175 +++++++++++++++++++++
 actions/twitapifriendships.php    | 250 ------------------------------
 5 files changed, 573 insertions(+), 250 deletions(-)
 create mode 100644 actions/apifriendshipscreate.php
 create mode 100644 actions/apifriendshipsdestroy.php
 create mode 100644 actions/apifriendshipsexists.php
 create mode 100644 actions/apifriendshipsshow.php
 delete mode 100644 actions/twitapifriendships.php

diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
new file mode 100644
index 0000000000..d691b5b4f8
--- /dev/null
+++ b/actions/apifriendshipscreate.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Subscribe to a user via the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apiauth.php';
+
+/**
+ * Allows the authenticating users to follow (subscribe) the user specified in
+ * the ID parameter.  Returns the befriended user in the requested format when
+ * successful.  Returns a string describing the failure condition when unsuccessful.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiFriendshipsCreateAction extends ApiAuthAction
+{
+
+    var $format = null;
+    var $user   = null;
+    var $other  = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->format = $this->arg('format');
+        $this->user   = $this->auth_user;
+        $this->other  = $this->getTargetUser($id);
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Check the format and show the user info
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400,
+                $this->format
+            );
+            return;
+        }
+
+        if (empty($this->other)) {
+            $this->clientError(
+                _('Could not follow user: User not found.'),
+                403,
+                $this->format
+            );
+            return;
+        }
+
+        if ($this->user->isSubscribed($this->other)) {
+            $errmsg = sprintf(
+                _('Could not follow user: %s is already on your list.'),
+                $this->other->nickname
+            );
+            $this->clientError($errmsg, 403, $this->format);
+            return;
+        }
+
+        $result = subs_subscribe_to($this->user, $this->other);
+
+        if (is_string($result)) {
+            $this->clientError($result, 403, $this->format);
+            return;
+        }
+
+        $this->init_document($this->format);
+        $this->show_profile($this->other, $this->format);
+        $this->end_document($this->format);
+    }
+
+}
diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
new file mode 100644
index 0000000000..d97c5aa6db
--- /dev/null
+++ b/actions/apifriendshipsdestroy.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Unsubscribe to a user via API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apiauth.php';
+
+/**
+ * Allows the authenticating users to unfollow (unsubscribe) the user specified in
+ * the ID parameter.  Returns the unfollowed user in the requested format when
+ * successful.  Returns a string describing the failure condition when unsuccessful.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiFriendshipsDestroyAction extends ApiAuthAction
+{
+
+    var $format = null;
+    var $user   = null;
+    var $other  = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->format = $this->arg('format');
+        $this->user   = $this->auth_user;
+        $this->other  = $this->getTargetUser($id);
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Check the format and show the user info
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400,
+                $this->format
+            );
+            return;
+        }
+
+        if (empty($this->other)) {
+            $this->clientError(
+                _('Could not unfollow user: User not found.'),
+                403,
+                $this->format
+            );
+            return;
+        }
+
+        // Don't allow unsubscribing from yourself!
+
+        if ($this->user->id == $this->other->id) {
+            $this->clientError(
+                _("You cannot unfollow yourself!"),
+                403,
+                $this->format
+            );
+            return;
+        }
+
+        $result = subs_unsubscribe_user($this->user, $this->other->nickname);
+
+        if (is_string($result)) {
+            $this->clientError($result, 403, $this->format);
+            return;
+        }
+
+        $this->init_document($this->format);
+        $this->show_profile($this->other, $this->format);
+        $this->end_document($this->format);
+    }
+
+}
diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php
new file mode 100644
index 0000000000..3d6e7448de
--- /dev/null
+++ b/actions/apifriendshipsexists.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show whether there is a friendship between two users
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/twitterapi.php';
+
+/**
+ * Tests for the existence of friendship between two users. Will return true if 
+ * user_a follows user_b, otherwise will return false.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiFriendshipsExistsAction extends TwitterApiAction
+{
+
+    var $format = null;
+    var $user_a = null;
+    var $user_b = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->format = $this->arg('format');
+
+        $user_a_id = $this->trimmed('user_a');
+        $user_b_id = $this->trimmed('user_b');
+
+        common_debug("user_a = " . $user_a_id);
+        common_debug("user_b = " . $user_b_id);
+
+
+        $this->user_a = $this->getTargetUser($user_a_id);
+
+        if (empty($this->user_a)) {
+            common_debug('gargargra');
+        }
+
+        $this->user_b = $this->getTargetUser($user_b_id);
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Check the format and show the user info
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (empty($this->user_a) || empty($this->user_b)) {
+            $this->clientError(
+                _('Two user ids or screen_names must be supplied.'),
+                400,
+                $this->format
+            );
+            return;
+        }
+
+        $result = $this->user_a->isSubscribed($this->user_b);
+
+        switch ($this->format) {
+        case 'xml':
+            $this->init_document('xml');
+            $this->element('friends', null, $result);
+            $this->end_document('xml');
+            break;
+        case 'json':
+            $this->init_document('json');
+            print json_encode($result);
+            $this->end_document('json');
+            break;
+        default:
+            break;
+        }
+    }
+
+}
diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php
new file mode 100644
index 0000000000..d35825a433
--- /dev/null
+++ b/actions/apifriendshipsshow.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show information about the relationship between two users
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apibareauth.php';
+
+/**
+ * Outputs detailed information about the relationship between two users
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiFriendshipsShowAction extends ApiBareAuthAction
+{
+
+    var $format = null;
+    var $user   = null;
+    var $source = null;
+    var $target = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->format = $this->arg('format');
+
+        $source_id          = (int)$this->trimmed('source_id');
+        $source_screen_name = $this->trimmed('source_screen_name');
+        $target_id          = (int)$this->trimmed('target_id');
+        $target_screen_name = $this->trimmed('target_screen_name');
+    
+        if (!empty($source_id)) {
+            $this->source = User::staticGet($source_id);
+        } elseif (!empty($source_screen_name)) {
+            $this->source = User::staticGet('nickname', $source_screen_name);
+        } else {
+            $this->source = $this->auth_user;
+        }
+
+        if (!empty($target_id)) {
+            $this->target = User::staticGet($target_id);
+        } elseif (!empty($target_screen_name)) {
+            $this->target = User::staticGet('nickname', $target_screen_name);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Determines whether this API resource requires auth.  Overloaded to look
+     * return true in case source_id and source_screen_name are both empty
+     *
+     * @return boolean true or false
+     */
+       
+    function requiresAuth()
+    {
+        if (common_config('site', 'private')) {
+            return true;
+        }
+
+        $source_id          = $this->trimmed('source_id');
+        $source_screen_name = $this->trimmed('source_screen_name');
+
+        if (empty($source_id) && empty($source_screen_name)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Check the format and show the user info
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(_('API method not found!'), 404);
+            return;
+        }
+        
+        if (empty($this->source)) {
+            $this->clientError(
+                _('Could not determine source user.'),
+                404
+             );
+            return;
+        }
+              
+        if (empty($this->target)) {
+            $this->clientError(
+                _('Could not find target user.'),
+                404
+            );
+            return;
+        }
+        
+        $result = $this->twitter_relationship_array($this->source, $this->target);
+
+        switch ($this->format) {
+        case 'xml':
+            $this->init_document('xml');
+            $this->show_twitter_xml_relationship($result[relationship]);
+            $this->end_document('xml');
+            break;
+        case 'json':
+            $this->init_document('json');
+            print json_encode($result);
+            $this->end_document('json');
+            break;
+        default:
+            break;
+        }
+        
+    }
+
+}
diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
deleted file mode 100644
index eea8945c39..0000000000
--- a/actions/twitapifriendships.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, 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/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once(INSTALLDIR.'/lib/twitterapi.php');
-
-class TwitapifriendshipsAction extends TwitterapiAction
-{
-
-    function create($args, $apidata)
-    {
-        parent::handle($args);
-
-        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(_('This method requires a POST.'),
-                400, $apidata['content-type']);
-            return;
-        }
-
-        $id    = $apidata['api_arg'];
-        $other = $this->get_user($id);
-
-        if (empty($other)) {
-            $this->clientError(_('Could not follow user: User not found.'),
-                403, $apidata['content-type']);
-            return;
-        }
-
-        $user = $apidata['user'];
-
-        if ($user->isSubscribed($other)) {
-            $errmsg = sprintf(_('Could not follow user: %s is already on your list.'),
-                $other->nickname);
-            $this->clientError($errmsg, 403, $apidata['content-type']);
-            return;
-        }
-
-        $sub = new Subscription();
-
-        $sub->query('BEGIN');
-
-        $sub->subscriber = $user->id;
-        $sub->subscribed = $other->id;
-        $sub->created = DB_DataObject_Cast::dateTime(); # current time
-
-        $result = $sub->insert();
-
-        if (empty($result)) {
-            $errmsg = sprintf(_('Could not follow user: %s is already on your list.'),
-                $other->nickname);
-            $this->clientError($errmsg, 400, $apidata['content-type']);
-            return;
-        }
-
-        $sub->query('COMMIT');
-
-        mail_subscribe_notify($other, $user);
-
-        $type = $apidata['content-type'];
-        $this->init_document($type);
-        $this->show_profile($other, $type);
-        $this->end_document($type);
-
-    }
-
-    function destroy($args, $apidata)
-    {
-        parent::handle($args);
-
-        if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
-            $this->clientError(_('This method requires a POST or DELETE.'),
-                400, $apidata['content-type']);
-            return;
-        }
-
-        $id = $apidata['api_arg'];
-
-        # We can't subscribe to a remote person, but we can unsub
-
-        $other = $this->get_profile($id);
-        $user = $apidata['user']; // Alwyas the auth user
-
-	if ($user->id == $other->id) {
-	    $this->clientError(_("You cannot unfollow yourself!"),
-			       403, $apidata['content-type']);
-	    return;
-	}
-
-        $sub = new Subscription();
-        $sub->subscriber = $user->id;
-        $sub->subscribed = $other->id;
-
-        if ($sub->find(true)) {
-            $sub->query('BEGIN');
-            $sub->delete();
-            $sub->query('COMMIT');
-        } else {
-            $this->clientError(_('You are not friends with the specified user.'),
-                403, $apidata['content-type']);
-            return;
-        }
-
-        $type = $apidata['content-type'];
-        $this->init_document($type);
-        $this->show_profile($other, $type);
-        $this->end_document($type);
-
-    }
-
-    function exists($args, $apidata)
-    {
-        parent::handle($args);
-
-        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
-            return;
-        }
-
-        $user_a_id = $this->trimmed('user_a');
-        $user_b_id = $this->trimmed('user_b');
-
-        $user_a = $this->get_user($user_a_id);
-        $user_b = $this->get_user($user_b_id);
-
-        if (empty($user_a) || empty($user_b)) {
-            $this->clientError(_('Two user ids or screen_names must be supplied.'),
-                400, $apidata['content-type']);
-            return;
-        }
-
-        $result = $user_a->isSubscribed($user_b);
-
-        switch ($apidata['content-type']) {
-         case 'xml':
-            $this->init_document('xml');
-            $this->element('friends', null, $result);
-            $this->end_document('xml');
-            break;
-         case 'json':
-            $this->init_document('json');
-            print json_encode($result);
-            $this->end_document('json');
-            break;
-         default:
-            break;
-        }
-
-    }
-
-    function show($args, $apidata)
-    {
-        parent::handle($args);
-
-        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
-            return;
-        }
-
-        $source_id          = (int)$this->trimmed('source_id');
-        $source_screen_name = $this->trimmed('source_screen_name');
-
-        // If the source is not specified for an unauthenticated request,
-        // the method will return an HTTP 403.
-
-        if (empty($source_id) && empty($source_screen_name)) {
-            if (empty($apidata['user'])) {
-                $this->clientError(_('Could not determine source user.'),
-                        $code = 403);
-                return;
-            }
-        }
-
-        $source = null;
-
-        if (!empty($source_id)) {
-            $source = User::staticGet($source_id);
-        } elseif (!empty($source_screen_name)) {
-            $source = User::staticGet('nickname', $source_screen_name);
-        } else {
-            $source = $apidata['user'];
-        }
-
-        // If a source or target is specified but does not exist,
-        // the method will return an HTTP 404.
-
-        if (empty($source)) {
-            $this->clientError(_('Could not determine source user.'),
-                $code = 404);
-            return;
-        }
-
-        $target_id          = (int)$this->trimmed('target_id');
-        $target_screen_name = $this->trimmed('target_screen_name');
-
-        $target = null;
-
-        if (!empty($target_id)) {
-            $target = User::staticGet($target_id);
-        } elseif (!empty($target_screen_name)) {
-            $target = User::staticGet('nickname', $target_screen_name);
-        } else {
-            $this->clientError(_('Target user not specified.'),
-                $code = 403);
-            return;
-        }
-
-        if (empty($target)) {
-            $this->clientError(_('Could not find target user.'),
-                $code = 404);
-            return;
-        }
-
-        $result = $this->twitter_relationship_array($source, $target);
-
-        switch ($apidata['content-type']) {
-        case 'xml':
-            $this->init_document('xml');
-            $this->show_twitter_xml_relationship($result[relationship]);
-            $this->end_document('xml');
-            break;
-        case 'json':
-            $this->init_document('json');
-            print json_encode($result);
-            $this->end_document('json');
-            break;
-        default:
-            break;
-        }
-    }
-
-}

From ee207ffd8be4a7178d06ff7c6928dba3714146ec Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 5 Oct 2009 10:04:35 -0700
Subject: [PATCH 206/247] Routes for friendships actions

---
 lib/router.php | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/lib/router.php b/lib/router.php
index 75abf58ab8..5ee9396571 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -388,17 +388,33 @@ class Router
 
         // friendships
 
-        $m->connect('api/friendships/:method/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'friendships'),
-                    array('method' => '(create|destroy)'));
+        $m->connect('api/friendships/show.:format',
+                    array('action' => 'ApiFriendshipsShow',
+                          'format' => '(xml|json)'));
 
-        $m->connect('api/friendships/:method',
-                    array('action' => 'api',
-                          'apiaction' => 'friendships'),
-                    array('method' => '(show|exists)(\.(xml|json))'));
+        $m->connect('api/friendships/exists.:format',
+                    array('action' => 'ApiFriendshipsExists',
+                          'format' => '(xml|json)'));
 
-       // Social graph
+        $m->connect('api/friendships/create.:format',
+                    array('action' => 'ApiFriendshipsCreate',
+                          'format' => '(xml|json)'));
+
+        $m->connect('api/friendships/destroy.:format',
+                     array('action' => 'ApiFriendshipsDestroy',
+                          'format' => '(xml|json)'));
+
+        $m->connect('api/friendships/create/:id.:format',
+                    array('action' => 'ApiFriendshipsCreate',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json)'));
+
+        $m->connect('api/friendships/destroy/:id.:format',
+                    array('action' => 'ApiFriendshipsDestroy',
+                    'id' => '[a-zA-Z0-9]+',
+                    'format' => '(xml|json)'));
+
+        // Social graph
 
         $m->connect('api/friends/ids/:id.:format',
                     array('action' => 'apiFriends',

From 62d1475df1c85c63f6d0dc4628a912c7666c2d21 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 5 Oct 2009 13:25:34 -0700
Subject: [PATCH 207/247] Add in a check for proper format

---
 actions/apifriendshipscreate.php  | 9 +++++++++
 actions/apifriendshipsdestroy.php | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index d691b5b4f8..969fc12820 100644
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.php
@@ -101,6 +101,15 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
             return;
         }
 
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
         if (empty($this->other)) {
             $this->clientError(
                 _('Could not follow user: User not found.'),
diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
index d97c5aa6db..ef864c4db8 100644
--- a/actions/apifriendshipsdestroy.php
+++ b/actions/apifriendshipsdestroy.php
@@ -101,6 +101,15 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
             return;
         }
 
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
         if (empty($this->other)) {
             $this->clientError(
                 _('Could not unfollow user: User not found.'),

From dd0d90723142d8042991f998f2b0c355d47638b5 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 5 Oct 2009 13:50:01 -0700
Subject: [PATCH 208/247] New actions for favorites via the API

---
 actions/apifavoritecreate.php    | 175 +++++++++++++++++++++
 actions/apifavoritedestroy.php   | 154 +++++++++++++++++++
 actions/apitimelinefavorites.php | 255 +++++++++++++++++++++++++++++++
 actions/twitapifavorites.php     | 216 --------------------------
 lib/router.php                   |  30 ++--
 5 files changed, 600 insertions(+), 230 deletions(-)
 create mode 100644 actions/apifavoritecreate.php
 create mode 100644 actions/apifavoritedestroy.php
 create mode 100644 actions/apitimelinefavorites.php
 delete mode 100644 actions/twitapifavorites.php

diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php
new file mode 100644
index 0000000000..e45603c6a2
--- /dev/null
+++ b/actions/apifavoritecreate.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Add a notice to a user's list of favorite notices via the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apiauth.php';
+
+/**
+ * Favorites the status specified in the ID parameter as the authenticating user.
+ * Returns the favorite status when successful.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiFavoriteCreateAction extends ApiAuthAction
+{
+
+    var $format = null;
+    var $user   = null;
+    var $notice = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->format = $this->arg('format');
+        $this->user   = $this->auth_user;
+        $this->notice = Notice::staticGet($this->arg('id'));
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Check the format and show the user info
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400,
+                $this->format
+            );
+            return;
+        }
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
+        if (empty($this->notice)) {
+            $this->clientError(
+                _('No status found with that ID.'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
+        // Note: Twitter lets you fave things repeatedly via API.
+
+        if ($this->user->hasFave($this->notice)) {
+            $this->clientError(
+                _('This status is already a favorite!'),
+                403,
+                $this->format
+            );
+            return;
+        }
+
+        $fave = Fave::addNew($this->user, $this->notice);
+
+        if (empty($fave)) {
+            $this->clientError(
+                _('Could not create favorite.')
+                403,
+                $this->format
+            );
+            return;
+        }
+
+        $this->notify($fave, $this->notice, $this->user);
+        $this->user->blowFavesCache();
+
+        if ($this->format == 'xml') {
+            $this->show_single_xml_status($this->notice);
+        } elseif ($this->format == 'json') {
+            $this->show_single_json_status($this->notice);
+        }
+    }
+
+
+    /**
+     * Notify the author of the favorite that the user likes their notice
+     *
+     * @param Favorite $fave   the favorite in question
+     * @param Notice   $notice the notice that's been faved
+     * @param User     $user   the user doing the favoriting
+     *
+     * @return void
+     */
+    function notify($fave, $notice, $user)
+    {
+        $other = User::staticGet('id', $notice->profile_id);
+        if ($other && $other->id != $user->id) {
+            if ($other->email && $other->emailnotifyfav) {
+                mail_notify_fave($other, $user, $notice);
+            }
+            // XXX: notify by IM
+            // XXX: notify by SMS
+        }
+    }
+
+}
diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php
new file mode 100644
index 0000000000..a70d5c79b1
--- /dev/null
+++ b/actions/apifavoritedestroy.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Remote a notice from a user's list of favorite notices via the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apiauth.php';
+
+/**
+ * Un-favorites the status specified in the ID parameter as the authenticating user.
+ * Returns the un-favorited status in the requested format when successful.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiFavoriteDestroyAction extends ApiAuthAction
+{
+
+    var $format = null;
+    var $user   = null;
+    var $notice = null;
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->format = $this->arg('format');
+        $this->user   = $this->auth_user;
+        $this->notice = Notice::staticGet($this->arg('id'));
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Check the format and show the user info
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400,
+                $this->format
+            );
+            return;
+        }
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
+        if (empty($this->notice)) {
+            $this->clientError(
+                _('No status found with that ID.'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
+        $fave            = new Fave();
+        $fave->user_id   = $this->user->id;
+        $fave->notice_id = $this->notice->id;
+
+        if (!$fave->find(true)) {
+            $this->clientError(
+                _('That status is not a favorite!'),
+                403,
+                $this->favorite
+            );
+            return;
+        }
+
+        $result = $fave->delete();
+
+        if (!$result) {
+            common_log_db_error($fave, 'DELETE', __FILE__);
+            $this->clientError(
+                _('Could not delete favorite.'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
+        $this->user->blowFavesCache();
+
+        if ($this->format == 'xml') {
+            $this->show_single_xml_status($this->notice);
+        } elseif ($this->format == 'json') {
+            $this->show_single_json_status($this->notice);
+        }
+    }
+
+}
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
new file mode 100644
index 0000000000..9ccee5cfac
--- /dev/null
+++ b/actions/apitimelinefavorites.php
@@ -0,0 +1,255 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show a user's favorite notices
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apibareauth.php';
+
+/**
+ * Returns the 20 most recent favorite notices for the authenticating user or user
+ * specified by the ID parameter in the requested format.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiTimelineFavoritesAction extends ApiBareAuthAction
+{
+
+    var $user     = null;
+    var $notices  = null;
+    var $format   = null;
+    var $page     = null;
+    var $count    = null;
+    var $max_id   = null;
+    var $since_id = null;
+    var $since    = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->page     = (int)$this->arg('page', 1);
+        $this->count    = (int)$this->arg('count', 20);
+        $this->max_id   = (int)$this->arg('max_id', 0);
+        $this->since_id = (int)$this->arg('since_id', 0);
+        $this->since    = $this->arg('since');
+        $this->format   = $this->arg('format');
+
+        $this->user = $this->getTargetUser($this->arg('id'));
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user!'), 404, $this->format);
+            return;
+        }
+
+        $this->notices = $this->getNotices();
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Just show the notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showTimeline();
+    }
+
+    /**
+     * Show the timeline of notices
+     *
+     * @return void
+     */
+
+    function showTimeline()
+    {
+        $profile = $this->user->getProfile();
+
+        $sitename   = common_config('site', 'name');
+        $title      = sprintf(
+            _('%s / Favorites from %s'),
+            $sitename,
+            $this->user->nickname
+        );
+
+        $taguribase = common_config('integration', 'taguri');
+        $id         = "tag:$taguribase:Favorites:" . $this->user->id;
+        $link       = common_local_url(
+            'favorites',
+            array('nickname' => $this->user->nickname)
+        );
+        $subtitle   = sprintf(
+            _('%s updates favorited by %s / %s.'),
+            $sitename,
+            $profile->getBestName(),
+            $this->user->nickname
+        );
+
+        switch($this->format) {
+        case 'xml':
+            $this->show_xml_timeline($this->notices);
+            break;
+        case 'rss':
+            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            break;
+        case 'atom':
+            $selfuri = common_root_url() .
+                ltrim($_SERVER['QUERY_STRING'], 'p=');
+            $this->show_atom_timeline(
+                $this->notices, $title, $id, $link, $subtitle,
+                null, $selfuri
+            );
+            break;
+        case 'json':
+            $this->show_json_timeline($this->notices);
+            break;
+        default:
+            $this->clientError(_('API method not found!'), $code = 404);
+            break;
+        }
+    }
+
+    /**
+     * Get notices
+     *
+     * @return array notices
+     */
+
+    function getNotices()
+    {
+        $notices = array();
+
+        if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) {
+            $notice = $this->user->favoriteNotices(
+                ($this->page-1) * $this->count,
+                $this->count,
+                true
+            );
+        } else {
+            $notice = $this->user->favoriteNotices(
+                ($this->page-1) * $this->count,
+                $this->count,
+                false
+            );
+        }
+
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+        return $notices;
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this feed last modified?
+     *
+     * @return string datestamp of the latest notice in the stream
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+            return strtotime($this->notices[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this stream
+     *
+     * Returns an Etag based on the action name, language, user ID, and
+     * timestamps of the first and last notice in the timeline
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+
+            $last = count($this->notices) - 1;
+
+            return '"' . implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      $this->user->id,
+                      strtotime($this->notices[0]->created),
+                      strtotime($this->notices[$last]->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+}
diff --git a/actions/twitapifavorites.php b/actions/twitapifavorites.php
deleted file mode 100644
index f8943fe2dd..0000000000
--- a/actions/twitapifavorites.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, 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/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once(INSTALLDIR.'/lib/twitterapi.php');
-
-class TwitapifavoritesAction extends TwitterapiAction
-{
-
-    function favorites($args, $apidata)
-    {
-        parent::handle($args);
-
-        $this->auth_user = $apidata['user'];
-        $user = $this->get_user($apidata['api_arg'], $apidata);
-
-        if (empty($user)) {
-        if ($apidata['content-type'] == 'xml') {
-            $this->show_single_xml_status($notice);
-        } elseif ($apidata['content-type'] == 'json') {
-            $this->show_single_json_status($notice);
-        }
-            $this->clientError('Not Found', 404, $apidata['content-type']);
-            return;
-        }
-
-        $profile = $user->getProfile();
-
-        $sitename   = common_config('site', 'name');
-        $title      = sprintf(_('%s / Favorites from %s'), $sitename,
-            $user->nickname);
-        $taguribase = common_config('integration', 'taguri');
-        $id         = "tag:$taguribase:Favorites:".$user->id;
-        $link       = common_local_url('favorites',
-            array('nickname' => $user->nickname));
-        $subtitle   = sprintf(_('%s updates favorited by %s / %s.'), $sitename,
-            $profile->getBestName(), $user->nickname);
-
-        $page     = (int)$this->arg('page', 1);
-        $count    = (int)$this->arg('count', 20);
-        $max_id   = (int)$this->arg('max_id', 0);
-        $since_id = (int)$this->arg('since_id', 0);
-        $since    = $this->arg('since');
-
-        if (!empty($this->auth_user) && $this->auth_user->id == $user->id) {
-            $notice = $user->favoriteNotices(($page-1)*$count, $count, true);
-        } else {
-            $notice = $user->favoriteNotices(($page-1)*$count, $count, false);
-        }
-
-        switch($apidata['content-type']) {
-        case 'xml':
-            $this->show_xml_timeline($notice);
-            break;
-        case 'rss':
-            $this->show_rss_timeline($notice, $title, $link, $subtitle);
-            break;
-        case 'atom':
-            if (isset($apidata['api_arg'])) {
-                 $selfuri = $selfuri = common_root_url() .
-                     'api/favorites/' . $apidata['api_arg'] . '.atom';
-            } else {
-                 $selfuri = $selfuri = common_root_url() .
-                  'api/favorites.atom';
-            }
-            $this->show_atom_timeline($notice, $title, $id, $link,
-                $subtitle, null, $selfuri);
-            break;
-        case 'json':
-            $this->show_json_timeline($notice);
-            break;
-        default:
-            $this->clientError(_('API method not found!'), $code = 404);
-        }
-
-    }
-
-    function create($args, $apidata)
-    {
-        parent::handle($args);
-
-        // Check for RESTfulness
-        if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
-            $this->clientError(_('This method requires a POST or DELETE.'),
-                400, $apidata['content-type']);
-            return;
-        }
-
-        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
-            return;
-        }
-
-        $user      = $apidata['user']; // Always the auth user
-        $notice_id = $apidata['api_arg'];
-        $notice    = Notice::staticGet($notice_id);
-
-        if (empty($notice)) {
-            $this->clientError(_('No status found with that ID.'),
-                404, $apidata['content-type']);
-            return;
-        }
-
-        // XXX: Twitter lets you fave things repeatedly via api.
-        if ($user->hasFave($notice)) {
-            $this->clientError(_('This status is already a favorite!'),
-                403, $apidata['content-type']);
-            return;
-        }
-
-        $fave = Fave::addNew($user, $notice);
-
-        if (empty($fave)) {
-            $this->clientError(_('Could not create favorite.'));
-            return;
-        }
-
-        $this->notify($fave, $notice, $user);
-        $user->blowFavesCache();
-
-        if ($apidata['content-type'] == 'xml') {
-            $this->show_single_xml_status($notice);
-        } elseif ($apidata['content-type'] == 'json') {
-            $this->show_single_json_status($notice);
-        }
-
-    }
-
-    function destroy($args, $apidata)
-    {
-        parent::handle($args);
-
-        // Check for RESTfulness
-        if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
-            $this->clientError(_('This method requires a POST or DELETE.'),
-                400, $apidata['content-type']);
-            return;
-        }
-
-        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
-            return;
-        }
-
-        $user      = $apidata['user']; // Always the auth user
-        $notice_id = $apidata['api_arg'];
-        $notice    = Notice::staticGet($notice_id);
-
-        if (empty($notice)) {
-            $this->clientError(_('No status found with that ID.'),
-                404, $apidata['content-type']);
-            return;
-        }
-
-        $fave            = new Fave();
-        $fave->user_id   = $this->id;
-        $fave->notice_id = $notice->id;
-
-        if (!$fave->find(true)) {
-            $this->clientError(_('That status is not a favorite!'),
-                403, $apidata['content-type']);
-            return;
-        }
-
-        $result = $fave->delete();
-
-        if (!$result) {
-            common_log_db_error($fave, 'DELETE', __FILE__);
-            $this->clientError(_('Could not delete favorite.'), 404);
-            return;
-        }
-
-        $user->blowFavesCache();
-
-        if ($apidata['content-type'] == 'xml') {
-            $this->show_single_xml_status($notice);
-        } elseif ($apidata['content-type'] == 'json') {
-            $this->show_single_json_status($notice);
-        }
-
-    }
-
-    // XXX: these two funcs swiped from faves.
-    // Maybe put in util.php, or some common base class?
-
-    function notify($fave, $notice, $user)
-    {
-        $other = User::staticGet('id', $notice->profile_id);
-        if ($other && $other->id != $user->id) {
-            if ($other->email && $other->emailnotifyfav) {
-                mail_notify_fave($other, $user, $notice);
-            }
-            # XXX: notify by IM
-            # XXX: notify by SMS
-        }
-    }
-}
diff --git a/lib/router.php b/lib/router.php
index 5ee9396571..8e6db88809 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -440,22 +440,24 @@ class Router
 
         // favorites
 
-        $m->connect('api/favorites/:method/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'favorites',
-                          array('method' => '(create|destroy)')));
+        $m->connect('api/favorites.:format',
+                    array('action' => 'ApiTimelineFavorites',
+                    'format' => '(xml|json|rss|atom)'));
 
-        $m->connect('api/favorites/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'favorites',
-                          'method' => 'favorites'));
+        $m->connect('api/favorites/:id.:format',
+                    array('action' => 'ApiTimelineFavorites',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xmljson|rss|atom)'));
 
-        foreach (array('xml', 'json', 'rss', 'atom') as $e) {
-            $m->connect('api/favorites.'.$e,
-                        array('action' => 'api',
-                              'apiaction' => 'favorites',
-                              'method' => 'favorites.'.$e));
-        }
+        $m->connect('api/favorites/create/:id.:format',
+                    array('action' => 'ApiFavoriteCreate',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json)'));
+
+        $m->connect('api/favorites/destroy/:id.:format',
+                    array('action' => 'ApiFavoriteDestroy',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json)'));
 
         // notifications
 

From 475bdf6fba3ee8081f3726f98ecd3a50fdda305e Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 5 Oct 2009 17:10:30 -0700
Subject: [PATCH 209/247] New actions for the account methods we have
 implemented

---
 actions/apiaccountratelimitstatus.php   | 132 ++++++++++++++++++++++++
 actions/apiaccountverifycredentials.php | 104 +++++++++++++++++++
 actions/twitapiaccount.php              | 127 -----------------------
 lib/router.php                          |  13 ++-
 4 files changed, 246 insertions(+), 130 deletions(-)
 create mode 100644 actions/apiaccountratelimitstatus.php
 create mode 100644 actions/apiaccountverifycredentials.php
 delete mode 100644 actions/twitapiaccount.php

diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php
new file mode 100644
index 0000000000..3c6c3e714d
--- /dev/null
+++ b/actions/apiaccountratelimitstatus.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Dummy action that emulates Twitter's rate limit status API resource
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apibareauth.php';
+
+/**
+ * We don't have a rate limit, but some clients check this method.
+ * It always returns the same thing: 100 hits left.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
+{
+    var $format = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return false;
+            }
+        }
+
+        $this->format = $this->arg('format');
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Return some Twitter-ish data about API limits
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
+        $reset   = new DateTime();
+        $reset->modify('+1 hour');
+
+        $this->init_document($this->format);
+
+         if ($this->format == 'xml') {
+             $this->elementStart('hash');
+             $this->element('remaining-hits', array('type' => 'integer'), 150);
+             $this->element('hourly-limit', array('type' => 'integer'), 150);
+             $this->element(
+                 'reset-time', array('type' => 'datetime'),
+                 common_date_iso8601($reset->format('r'))
+             );
+             $this->element(
+                 'reset_time_in_seconds',
+                 array('type' => 'integer'),
+                 strtotime('+1 hour')
+             );
+             $this->elementEnd('hash');
+         } elseif ($this->format == 'json') {
+             $out = array(
+                 'reset_time_in_seconds' => strtotime('+1 hour'),
+                 'remaining_hits' => 150,
+                 'hourly_limit' => 150,
+                 'reset_time' => common_date_rfc2822(
+                     $reset->format('r')
+                  )
+             );
+             print json_encode($out);
+         }
+
+         $this->end_document($this->format);
+    }
+
+}
+
diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php
new file mode 100644
index 0000000000..b9c9bf0f72
--- /dev/null
+++ b/actions/apiaccountverifycredentials.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Test if supplied user credentials are valid.
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apiauth.php';
+
+/**
+ * Check a user's credentials. Returns an HTTP 200 OK response code and a
+ * representation of the requesting user if authentication was successful;
+ * returns a 401 status code and an error message if not.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiAccountVerifyCredentialsAction extends ApiAuthAction
+{
+    var $format                = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return false;
+            }
+        }
+
+        $this->format = $this->arg('format');
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Check whether the credentials are valid and output the result
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        switch ($this->format) {
+        case 'xml':
+        case 'json':
+            $args['id'] = $this->auth_user->id;
+            $action_obj = new ApiUserShowAction();
+            $action_obj->prepare($args);
+            $action_obj->handle($args);
+            break;
+        default:
+            header('Content-Type: text/html; charset=utf-8');
+            print 'Authorized';
+        }
+
+    }
+
+}
diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
deleted file mode 100644
index 93c8443c9f..0000000000
--- a/actions/twitapiaccount.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, 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/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once(INSTALLDIR.'/lib/twitterapi.php');
-
-class TwitapiaccountAction extends TwitterapiAction
-{
-    function verify_credentials($args, $apidata)
-    {
-        parent::handle($args);
-
-        switch ($apidata['content-type']) {
-        case 'xml':
-        case 'json':
-            $action_obj = new TwitapiusersAction();
-            $action_obj->prepare($args);
-            call_user_func(array($action_obj, 'show'), $args, $apidata);
-            break;
-        default:
-            header('Content-Type: text/html; charset=utf-8');
-            print 'Authorized';
-        }
-    }
-
-   function end_session($args, $apidata)
-    {
-        parent::handle($args);
-        $this->serverError(_('API method under construction.'), $code=501);
-    }
-
-    function update_location($args, $apidata)
-    {
-        parent::handle($args);
-
-        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(_('This method requires a POST.'),
-                400, $apidata['content-type']);
-            return;
-        }
-
-        $location = trim($this->arg('location'));
-
-        if (!is_null($location) && mb_strlen($location) > 255) {
-
-            // XXX: But Twitter just truncates and runs with it. -- Zach
-            $this->clientError(_('That\'s too long. Max notice size is 255 chars.'),
-                406, $apidate['content-type']);
-            return;
-        }
-
-        $user = $apidata['user']; // Always the auth user
-        $profile = $user->getProfile();
-
-        $orig_profile = clone($profile);
-        $profile->location = $location;
-
-        $result = $profile->update($orig_profile);
-
-        if (empty($result)) {
-            common_log_db_error($profile, 'UPDATE', __FILE__);
-            $this->serverError(_('Couldn\'t save profile.'));
-            return;
-        }
-
-        common_broadcast_profile($profile);
-        $type = $apidata['content-type'];
-
-        $this->init_document($type);
-        $this->show_profile($profile, $type);
-        $this->end_document($type);
-    }
-
-
-    function update_delivery_device($args, $apidata)
-    {
-        parent::handle($args);
-        $this->serverError(_('API method under construction.'), $code=501);
-    }
-
-    // We don't have a rate limit, but some clients check this method.
-    // It always returns the same thing: 100 hit left.
-    function rate_limit_status($args, $apidata)
-    {
-        parent::handle($args);
-
-        $type = $apidata['content-type'];
-        $this->init_document($type);
-
-        if ($apidata['content-type'] == 'xml') {
-            $this->elementStart('hash');
-            $this->element('remaining-hits', array('type' => 'integer'), 100);
-            $this->element('hourly-limit', array('type' => 'integer'), 100);
-            $this->element('reset-time', array('type' => 'datetime'), null);
-            $this->element('reset_time_in_seconds', array('type' => 'integer'), 0);
-            $this->elementEnd('hash');
-        } elseif ($apidata['content-type'] == 'json') {
-
-            $out = array('reset_time_in_seconds' => 0,
-                         'remaining_hits' => 100,
-                         'hourly_limit' => 100,
-                         'reset_time' => '');
-            print json_encode($out);
-        }
-
-        $this->end_document($type);
-    }
-}
diff --git a/lib/router.php b/lib/router.php
index 8e6db88809..6541d69f14 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -434,9 +434,16 @@ class Router
 
         // account
 
-        $m->connect('api/account/:method',
-                    array('action' => 'api',
-                          'apiaction' => 'account'));
+        $m->connect('api/account/verify_credentials.:format',
+                    array('action' => 'ApiAccountVerifyCredentials'));
+
+        // special case where verify_credentials is called w/out a format
+
+        $m->connect('api/account/verify_credentials',
+                    array('action' => 'ApiAccountVerifyCredentials'));
+
+        $m->connect('api/account/rate_limit_status.:format',
+                    array('action' => 'ApiAccountRateLimitStatus'));
 
         // favorites
 

From f7688bec0d7683f0bad1bbb9806a7a6f5a261901 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 5 Oct 2009 17:11:32 -0700
Subject: [PATCH 210/247] Better Twitter date output

---
 lib/twitterapi.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index b2104fddd6..2141194df6 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -884,12 +884,12 @@ class TwitterapiAction extends Action
         $this->end_document('xml');
     }
 
-    // Anyone know what date format this is?
-    // Twitter's dates look like this: "Mon Jul 14 23:52:38 +0000 2008" -- Zach
     function date_twitter($dt)
     {
-        $t = strtotime($dt);
-        return date("D M d H:i:s O Y", $t);
+        $dateStr = date('d F Y H:i:s', strtotime($dt));
+        $d = new DateTime($dateStr, new DateTimeZone('UTC'));
+        $d->setTimezone(new DateTimeZone(common_timezone()));
+        return $d->format('D M d H:i:s O Y');
     }
 
     // XXX: Candidate for a general utility method somewhere?

From e63a435868318bd183d8ae36ff0f6a110cdc85db Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Tue, 6 Oct 2009 17:16:28 +0200
Subject: [PATCH 211/247] Using 'CSS sprites' for common icons for the identica
 theme. Default theme will follow after some tests.

---
 theme/base/images/icons/icons-01.png | Bin 0 -> 3260 bytes
 theme/identica/css/display.css       |  48 +++++++++++++++------------
 2 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 theme/base/images/icons/icons-01.png

diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4e3713302fe9bea6d32d83bb2449a4c5107a6f3
GIT binary patch
literal 3260
zcmZ8kXHXMp6Gje03qqub^dhlQq_<E)C?drmy(<C&F*Kz~040J61Q9ukD7}dE-lRwo
z0!R%-;1VE8uM$F)`0?YsyZN3!`_Am_JkLI}J3B8HZfd~B!pA~KN5^J(Q}@nk<fEfw
zkY)m$zB)Fg-0A3mXhU77Mey_nkri&~M$hPrC<s(~Ur;wH;7Jf9J|+s)`E%D!j~SZD
z8_83ou7R!I#@KoF8jYYzi?8@X;o1~zr1WAg%7T99{3`}M3+=g`*DrQPk7u`zIe0+3
zcmKM+{7acK5Y~Q}xfL+@<z(^QOwMPM_V)IJIrRMUnBMysl=LjZ3}$Q$1e>HiKPRZ3
zwU8(^o{N&2^~sK^u9iPKSMiKOzS~gBYW{h|jhz${1Q8Gv9M|7{qA^{Eh&7WpxVON5
zy>fk6j;cbA1$o>b0c2!k1f83ye!zaTo5|#p8GI0vGimUFyvE5WWA^=lzkwvp<(b~h
z1yK=II)1W}ws5|6{Fx>CxvBxZurk8Ra1-@Wk&V6m?6epf&{pn6&X4aNbz{^+>R2WW
zErjk=UvTn3Up;3&7cn6mTQ3v6CT+c(OI<Z<P2TDsDlMVK;BZMr41mE7M0stocLGnk
zntcaRoW9>$pqrIP=Kdx`%Q7RROiC?abpFld%<kNHP5SqarrX#bP(<uR@XA8U9Op`|
z&;sJH_2*yY&st}OXC=e&y?*F?H%7b_;)nl|chPOgXVOsGTCAe?<r@bY_BM6M*sOR>
zo$lw%!8EK^hu;hFpMwYYy3;PEZfNpr{?PneoPF&Rma}IOma5^XY^Ir~uU<_p&(zD<
z0R<Eoq{~9*Hv(8lr1v+7-V#mNSIwRTI(7BCs}`uQtr`ynk(F2dIGevU&kL@x?I&)o
zn(ZYzzs@{zP~f1aFZdvq+0*ketHL+V<H!n*hQ3r$<#mNG4XQl{3ZKhmQq}YpU@0($
zZf8M*&2TDHm*tFwbFITJ2`i^h<pFv#)onhJNPK`!FU#g;aCT0Ixx#EwpGa?ed-juH
zE#l5quIaBL;a^hwG`K{o@Jq<)x}#s)npdLtX-T|?3pZ=Ljv){T7*nvr{h8wa!&2gs
ztEn5ok{JlJNZiHt2pPOwPGK2&>~wP6c_XCi+D=Ge;Y#64!5;_0Lgg71{^E{J&6uA*
zsV<$GiU4#uA5hJ)r>`AupQ#zfA?LyXA2+D0OVZQ4u+=-{J=OVEDu)oD4If^A+ZoCo
zxRnuC<~Rclx7uQuu(c8SwHUo{7p?~x0_lZYO$zn#BqY`>K2O>r{_x1&tLWYy<Or*?
zSFoQ{LaxqshFZ3~7}6|`DbTni_8U!FP0~Qr_W?_TUxdkxN!*#u%QuGQfm<O__m-o5
zffNmF{7<oMYy_9S54NMBbR@OrgbTcd=@s~>+5!8ybw3TQi{A-f(-{dx@{$5s4YcB!
zY(fplVY42Rs;?s#dSvdB%Lo-j3V$n;VdP2nqttyu$XDT;UC&DsywlJ}rN@d(rHb<h
zOHIDb*L46$OvkW^Y-*znC}Ab)<_)e+%jYMEi1Y5kx4P*;n<7r?G=Grux_Wx4Dt=m?
zYpX;H8>AsFi|`R^osQs149w_0s!&+hdK(Mt4fz_V#yaTojWyo!)9Ya)o5$qy?{r_C
zJd>YpQ%pXQ)fUF?qjEqQc2BESt$z>>Azf}f_v}$TtrtWeP|8HX#Y{^SBVXDr=H~nI
zbK8`&Ux1$4uhw@(bF`w5GdpNq0>OHDol=tAZ}i;ol4X*O65L+{!TdBag<XHqWbDud
z0h9KnP|g}gwi(`Mpfi=cEmA_>*&m9OoMT&W_O(PKxRv2HfsRp)F<^CRFO-M`J4IJ(
z02Cn~5Y)Vv6@MZw>mCYu7$|W!Z8=wv8IZ@FtYatcRd2C=5|9hBweI)(PUc35d$~kx
z3uylGIS<~%j0-6|dBg=i3;tw^t5S7Y7UBt&JkBFWgZTA?OXFK{RcrcGrv~0AN(3Z+
zsB6}gl>SuK{<bGOU%etA6Wj7uVo&bMRmQeF?n1jfjOhj2Yj7o^j#(myEK7t+O0iCN
zj1})ij(iP|ok4S#aExK_cZexQgLGZ#v515-)g)*6Jz>gvoRZb`F!-Hu4=v9DMeVdj
zHLLP;D(QQ%A3Y8dSd1NXyt3G<DvKhp^!sk>Xp*a9E!pb9uA*wWOrhcZR*A|I<qXw(
z68Dz7d4W?L*&2B1D^3H<s%NZY2c5&@OpL#9Jp{oHF-#Ci{rT=?prVaC7MuZkhhhJm
z&^dkm{2$cIwTve0G5rarE32)lwMa|F<&y&*y32-h*7~Zv!zI}3njfa$;j}m1ZY6uj
zeG)f57R9?GzOSmjcx^%G1-}zlI?7i8ny_l3$J?AD>kIRNhuUK<6}P#LVqr;Yt|8BJ
zx6<xsu&J6rl;)3_T8J49xS`0~#fBc@i#;~7j}4I6b|$}=1Nh^kV@>kYH3=_KQ}Gib
zOkNjLelVL1895L78)lrKW6zJwA7*X%M%y;LzxXb{G=49H_pgk+m%v@+sAoIPsX9y5
z-Q01)+mZ;uQ??H<nG@b9w9a=eUI&uSD$d$BWUm<iZeOkHLZDt5g&!Yu!pM>w02{ex
z<lvawSsOq!TOIks?a6hn#(n6|vAu5!jQP^b?l;p9S%5}>Z>vM$S4eI2XIqu<&Mvk-
zHyi7@Z%yoLH{IWt9DrUlwbHjubcn|m_694myIqF(jh}3&!D4=u!uEn%aBR$X29oNZ
zFx|SppF_UG<(r$Me^;pwz2VK;SXILhENiKWNX%RrrPOI&b(&;!>#_P|^V<0hII>*$
zQKQ7A$rU#IuW^AtYa8CPT%A@qqr78omVg4fF$($(v|R2}+UtqyPZ+-^p}tWBt6FS(
zX}knr=w0nk<MPQsA%qv4wGRhnuk43#Dvz3y9(Fr?mkKkFa{Us*mLgcn$5B&b?e?fN
zj6eSw!3;G2$Dce_1xe1Zm5C7-?Ok-Gigk-6s>>)UZy=a^g_WP<lKvnP*6>$^2rinC
zBo!#ZZJlhN9Xw0!vrFO<CDPa&-qC{cA_%Zh_+S-jT$H=5<Wrok>`omU?86qFVwa`V
zo^)h;HY08!DHdmoKqk1%ob_boJ71Gi&vJD}v#2SeEK@yC-@3Pwx*A~X-{4jD`uVrj
zfbduRuaUIqu@GV{<3iaw(jswW$nIffVHKjId3^cWwvh7_O0Ti#HcPy>RXJ<Cch8hx
zdcsiv`v#{H(eOcG8ZQ4WAlLO{DO05d?CacD&O_QBo?2VJ&e@ZVcToQ0gK4ISr||=a
zgK4>9D5GV_(-Mt~#nBZdSYSe!*ju9s-RQi5wWx;MGx5k_5XAk~aV2>;)6=(BuFo6|
zF>%EVw*5o~<;g5dD;2?3t#iKAcIB%kcgIpbx^<f%wW2TE{JtAvUOL_7VSM{{zMLPO
zy8%#q0_RQyjJsB4ee?{6x+B!8&jC!o7I3@P5g2|?Jt)D`PY(x8i`=Z^9bJY}qlk}&
z(T!s6$ps&M(9bycXpC<*6rj4l;cDjqLbO8dq}h*%&{}2hs`2C^w#jhUVHmGP=r^$Q
zH+g$F#okz9#xoN057MqyqvRb<)6B()+&CeN+V*Lai9)C%Z1stPZJZE}Bk^U`G{4ee
z3`+{~pCXJ9xLF?ur2@uVGoqB`ANmrAQh8<(q<+asVb4P;*+FrVVnS@(Z(+J)W2qa*
zW1-`7KG=(69?&5Bi-<q7qG>8t1okHLR6_tdd7(j{KfrF{r%Jp~mPmCv_+KjH*h$Qr
zT`$2z2Oift)^t99ES$nzw3aer92l2sh)(NT2mrUqjeO@!p2R4|{hxUyA;h-9l6soF
z5kVt3$ix*+;U&4ZR7+TQ{Y$VZUxrcqB~pz_^hwTFt}gkZp`x{wPgN%IA+!5R`g0+2
z3UU80>ADNBNFFa~y=H-2HWjVy+*B=WtvE_Xg<HcN`OC@=!-Iy2;onL_c1O@5%$NSl
zmd13-R!$X{;@#z7Af`~oOH+IlZ*g2GO4ENeWy<-FWx55_?UK{R>-_Cx7`?{$7v8M9
zM+YGBu4@KBuW59936x4?9nA}>8}oncA@o9|4D-*_fX3rbtr*&BF`@BWy0d$=8Ugle
zS5`kFatvjjHP5(kql4pk|D&n!!+Z>H3Tc(CXsf3pZRsdsYEw3N*4y1<=hP0iXhxrq
fKd-w4QM8=w8*6CnDx}k237w&yscxCh-N^p|k<&fP

literal 0
HcmV?d00001

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 9fc97180d4..aebbb54edf 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -88,7 +88,7 @@ color:#333333;
 color:#000000;
 }
 #form_notice label[for=notice_data-attach] {
-background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
 }
 #form_notice #notice_data-attach {
 opacity:0;
@@ -150,16 +150,18 @@ background-color:#9BB43E;
 
 #export_data li a {
 background-repeat:no-repeat;
-background-position:0 45%;
 }
 #export_data li a.rss {
-background-image:url(../../base/images/icons/icon_rss.png);
+background-image:url(../../base/images/icons/icons-01.png);
+background-position:0 -130px;
 }
 #export_data li a.atom {
-background-image:url(../../base/images/icons/icon_atom.png);
+background-image:url(../../base/images/icons/icons-01.png);
+background-position:0 -64px;
 }
 #export_data li a.foaf {
-background-image:url(../../base/images/icons/icon_foaf.gif);
+background-image:url(../../base/images/icons/icons-01.png);
+background-position:0 1px;
 }
 
 .entity_edit a,
@@ -171,7 +173,6 @@ background-image:url(../../base/images/icons/icon_foaf.gif);
 .form_group_unblock input.submit,
 .entity_nudge p,
 .form_make_admin input.submit {
-background-position: 0 40%;
 background-repeat: no-repeat;
 background-color:transparent;
 }
@@ -189,43 +190,48 @@ background-color:#87B4C8;
 }
 
 .entity_edit a {
-background-image:url(../../base/images/icons/twotone/green/edit.gif);
+background-image:url(../../base/images/icons/icons-01.png);
+background-position: 0 -718px;
 }
 .entity_send-a-message a {
-background-image:url(../../base/images/icons/twotone/green/quote.gif);
+background-image:url(../../base/images/icons/icons-01.png);
+background-position: 0 -785px;
 }
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-image:url(../../base/images/icons/twotone/green/mail.gif);
+background-image:url(../../base/images/icons/icons-01.png);
+background-position: 0 -950px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit {
-background-image:url(../../base/images/icons/twotone/green/shield.gif);
+background-image:url(../../base/images/icons/icons-01.png);
+background-position: 0 -918px;
 }
 .form_make_admin input.submit {
-background-image:url(../../base/images/icons/twotone/green/admin.gif);
+background-image:url(../../base/images/icons/icons-01.png);
+background-position: 0 -983px;
 }
 
 /* NOTICES */
 .notice .attachment {
-background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px;
 }
 #attachments .attachment {
 background:none;
 }
 .notice-options .notice_reply {
-background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px;
 }
 .notice-options form.form_favor input.submit {
-background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px;
 }
 .notice-options form.form_disfavor input.submit {
-background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px;
 }
 .notice-options .notice_delete {
-background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px;
 }
 
 .notices div.entry-content,
@@ -262,7 +268,7 @@ background-color:rgba(200, 200, 200, 0.300);
 /*END: NOTICES */
 
 #new_group a {
-background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px;
 }
 
 .pagination .nav_prev a,
@@ -271,10 +277,10 @@ background-repeat:no-repeat;
 border-color:#CEE1E9;
 }
 .pagination .nav_prev a {
-background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
-background-position:10% 45%;
+background-image:url(../../base/images/icons/icons-01.png);
+background-position:10% -187px;
 }
 .pagination .nav_next a {
-background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
-background-position:90% 45%;
+background-image:url(../../base/images/icons/icons-01.png);
+background-position:105% -252px;
 }

From d37bf29bba03f707a201e194c17ce8f0113c25be Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Tue, 6 Oct 2009 15:40:28 +0000
Subject: [PATCH 212/247] Fixed nudge and direct message background image
 alignment

---
 theme/identica/css/display.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index aebbb54edf..6339c9314e 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -195,12 +195,12 @@ background-position: 0 -718px;
 }
 .entity_send-a-message a {
 background-image:url(../../base/images/icons/icons-01.png);
-background-position: 0 -785px;
+background-position: 0 -849px;
 }
 .entity_nudge p,
 .form_user_nudge input.submit {
 background-image:url(../../base/images/icons/icons-01.png);
-background-position: 0 -950px;
+background-position: 0 -785px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,

From 7fe1facc99c0e5b2ffead9bb6def8438f7d011d4 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Tue, 6 Oct 2009 15:40:56 +0000
Subject: [PATCH 213/247] Fixed IE background image alignment for attach,
 favour and disfavour

---
 theme/identica/css/ie.css | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index 97cabc30a5..044c32ff16 100644
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -7,8 +7,14 @@ color:#FFFFFF;
 background-color:#D9DADB;
 }
 #form_notice .form_note + label {
-background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
 }
 #form_notice #notice_data-attach {
 filter: alpha(opacity=0);
 }
+.notice-options form.form_favor input.submit {
+background-position:0 -460px;
+}
+.notice-options form.form_disfavor input.submit {
+background-position:0 -526px;
+}

From 81199d0258115d02e1980ae7e5827b325f55629c Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Tue, 6 Oct 2009 15:51:06 +0000
Subject: [PATCH 214/247] Aligning notice attach label from right instead of
 left

---
 theme/base/css/display.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 76709113fc..d9dca98156 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -468,16 +468,15 @@ margin-bottom:7px;
 #form_notice #notice_data-attach {
 position:absolute;
 top:25px;
+right:10.5%;
 cursor:pointer;
 }
 #form_notice label[for=notice_data-attach] {
 text-indent:-9999px;
-left:86%;
 width:16px;
 height:16px;
 }
 #form_notice #notice_data-attach {
-left:40.6%;
 padding:0;
 height:16px;
 }

From f7d86f1cc62248c0de742bd44af5bf30e70add9d Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Tue, 6 Oct 2009 16:04:36 +0000
Subject: [PATCH 215/247] Returning false seems to fix IE from reclaiming
 window focus. I think 'WTF' best describes this behaviour. Further
 investigation required.

---
 plugins/Realtime/realtimeupdate.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 11e466325e..a75f17d8c5 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -25,6 +25,8 @@ RealtimeUpdate = {
             'border-top-color':'#AAAAAA',
             'border-top-style':'solid'
           });
+          
+          return false;
         });
      },
 

From 8d284ca82c1e33a102ef4cb7aa150dd54d876ec7 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 6 Oct 2009 15:39:13 -0700
Subject: [PATCH 216/247] New action for tag timelines in the API

---
 actions/apitimelinetag.php | 212 +++++++++++++++++++++++++++++++++++++
 actions/twitapitags.php    | 113 --------------------
 lib/router.php             |  10 +-
 3 files changed, 215 insertions(+), 120 deletions(-)
 create mode 100644 actions/apitimelinetag.php
 delete mode 100644 actions/twitapitags.php

diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
new file mode 100644
index 0000000000..1627763798
--- /dev/null
+++ b/actions/apitimelinetag.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show the latest notices for a given tag
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/twitterapi.php';
+
+/**
+ * Returns the 20 most recent notices tagged by a given tag
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiTimelineTagAction extends TwitterapiAction
+{
+
+    var $notices = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->page     = (int)$this->arg('page', 1);
+        $this->count    = (int)$this->arg('count', 20);
+        $this->tag      = $this->arg('tag');
+        $this->format   = $this->arg('format');
+
+        $this->notices = $this->getNotices();
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Just show the notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showTimeline();
+    }
+
+    /**
+     * Show the timeline of notices
+     *
+     * @return void
+     */
+
+    function showTimeline()
+    {
+        $sitename   = common_config('site', 'name');
+        $title      = sprintf(_("Notices tagged with %s"), $this->tag);
+        $link       = common_local_url('tag',
+            array('tag' => $this->tag));
+        $subtitle   = sprintf(_('Updates tagged with %1$s on %2$s!'),
+            $this->tag, $sitename);
+        $taguribase = common_config('integration', 'taguri');
+        $id         = "tag:$taguribase:TagTimeline:".$tag;
+
+        switch($this->format) {
+        case 'xml':
+            $this->show_xml_timeline($this->notices);
+            break;
+        case 'rss':
+            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            break;
+        case 'atom':
+            $selfuri = common_root_url() .
+                'api/statusnet/tags/timeline/' .
+                    $this->tag . '.atom';
+             $this->show_atom_timeline(
+                $this->notices, $title, $id, $link,
+                $subtitle, null, $selfuri
+            );
+            break;
+        case 'json':
+            $this->show_json_timeline($this->notices);
+            break;
+        default:
+            $this->clientError(_('API method not found!'), $code = 404);
+            break;
+        }
+    }
+
+    /**
+     * Get notices
+     *
+     * @return array notices
+     */
+
+    function getNotices()
+    {
+        $notices = array();
+
+        $notice = Notice_tag::getStream(
+            $this->tag,
+            ($this->page - 1) * $this->count,
+            $this->count + 1
+        );
+
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+        return $notices;
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this feed last modified?
+     *
+     * @return string datestamp of the latest notice in the stream
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+            return strtotime($this->notices[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this stream
+     *
+     * Returns an Etag based on the action name, language, and
+     * timestamps of the first and last notice in the timeline
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+
+            $last = count($this->notices) - 1;
+
+            return '"' . implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      $this->tag,
+                      strtotime($this->notices[0]->created),
+                      strtotime($this->notices[$last]->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+}
diff --git a/actions/twitapitags.php b/actions/twitapitags.php
deleted file mode 100644
index 0bcc55d378..0000000000
--- a/actions/twitapitags.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * StatusNet extensions to the Twitter-like API for groups
- *
- * 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  Twitter
- * @package   StatusNet
- * @author    Craig Andrews <candrews@integralblue.com>
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/twitterapi.php';
-
-/**
- * Group-specific API methods
- *
- * This class handles StatusNet group API methods.
- *
- * @category  Twitter
- * @package   StatusNet
- * @author    Craig Andrews <candrews@integralblue.com>
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
- class TwitapitagsAction extends TwitterapiAction
- {
-
-     function timeline($args, $apidata)
-     {
-         parent::handle($args);
-
-         common_debug("in tags api action");
-
-         $this->auth_user = $apidata['user'];
-         $tag = $apidata['api_arg'];
-
-         if (empty($tag)) {
-             $this->clientError('Not Found', 404, $apidata['content-type']);
-             return;
-         }
-
-         $sitename   = common_config('site', 'name');
-         $title      = sprintf(_("Notices tagged with %s"), $tag);
-         $taguribase = common_config('integration', 'taguri');
-         $id         = "tag:$taguribase:TagTimeline:".$tag;
-         $link       = common_local_url('tag',
-             array('tag' => $tag));
-         $subtitle   = sprintf(_('Updates tagged with %1$s on %2$s!'),
-             $tag, $sitename);
-
-         $page     = (int)$this->arg('page', 1);
-         $count    = (int)$this->arg('count', 20);
-         $max_id   = (int)$this->arg('max_id', 0);
-         $since_id = (int)$this->arg('since_id', 0);
-         $since    = $this->arg('since');
-
-         # XXX: support max_id, since_id, and since arguments
-         $notice = Notice_tag::getStream($tag, ($page-1)*$count, $count + 1);
-
-         switch($apidata['content-type']) {
-          case 'xml':
-             $this->show_xml_timeline($notice);
-             break;
-          case 'rss':
-             $this->show_rss_timeline($notice, $title, $link, $subtitle);
-             break;
-          case 'atom':
-             if (isset($apidata['api_arg'])) {
-                 $selfuri = common_root_url() .
-                     'api/statusnet/tags/timeline/' .
-                         $apidata['api_arg'] . '.atom';
-             } else {
-                 $selfuri = common_root_url() .
-                  'api/statusnet/tags/timeline.atom';
-             }
-             $this->show_atom_timeline($notice, $title, $id, $link,
-                 $subtitle, null, $selfuri);
-             break;
-          case 'json':
-             $this->show_json_timeline($notice);
-             break;
-          default:
-             $this->clientError(_('API method not found!'), $code = 404);
-         }
-     }
-
-}
diff --git a/lib/router.php b/lib/router.php
index 6541d69f14..03210ce98c 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -532,13 +532,9 @@ class Router
                           'apiaction' => 'groups'));
 
         // Tags
-        $m->connect('api/statusnet/tags/:method/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'tags'));
-
-        $m->connect('api/statusnet/tags/:method',
-                    array('action' => 'api',
-                          'apiaction' => 'tags'));
+        $m->connect('api/statusnet/tags/timeline/:tag.:format',
+                    array('action' => 'ApiTimelineTag',
+                          'format' => '(xmljson|rss|atom)'));
 
         // search
         $m->connect('api/search.atom', array('action' => 'twitapisearchatom'));

From 85af1c92adef021a91ed3618b748435248bf1023 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 6 Oct 2009 17:25:10 -0700
Subject: [PATCH 217/247] phpcs cleanup

---
 actions/apitimelinetag.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 1627763798..2a23bb72a2 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -97,10 +97,15 @@ class ApiTimelineTagAction extends TwitterapiAction
     {
         $sitename   = common_config('site', 'name');
         $title      = sprintf(_("Notices tagged with %s"), $this->tag);
-        $link       = common_local_url('tag',
-            array('tag' => $this->tag));
-        $subtitle   = sprintf(_('Updates tagged with %1$s on %2$s!'),
-            $this->tag, $sitename);
+        $link       = common_local_url(
+            'tag',
+            array('tag' => $this->tag)
+        );
+        $subtitle   = sprintf(
+            _('Updates tagged with %1$s on %2$s!'),
+            $this->tag,
+            $sitename
+        );
         $taguribase = common_config('integration', 'taguri');
         $id         = "tag:$taguribase:TagTimeline:".$tag;
 
@@ -115,9 +120,14 @@ class ApiTimelineTagAction extends TwitterapiAction
             $selfuri = common_root_url() .
                 'api/statusnet/tags/timeline/' .
                     $this->tag . '.atom';
-             $this->show_atom_timeline(
-                $this->notices, $title, $id, $link,
-                $subtitle, null, $selfuri
+            $this->show_atom_timeline(
+                $this->notices,
+                $title,
+                $id,
+                $link,
+                $subtitle,
+                null,
+                $selfuri
             );
             break;
         case 'json':

From 170b009865e3fcb183d562f47d66986b0e397f2d Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 6 Oct 2009 17:26:45 -0700
Subject: [PATCH 218/247] New action for group timelines via API

---
 actions/apitimelinegroup.php | 233 +++++++++++++++++++++++++++++++++++
 lib/router.php               |  15 +--
 lib/twitterapi.php           |   2 +-
 3 files changed, 240 insertions(+), 10 deletions(-)
 create mode 100644 actions/apitimelinegroup.php

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
new file mode 100644
index 0000000000..11f73eeedb
--- /dev/null
+++ b/actions/apitimelinegroup.php
@@ -0,0 +1,233 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show a group's notices
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/twitterapi.php';
+
+/**
+ * Returns the most recent notices (default 20) posted to the group specified by ID
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiTimelineGroupAction extends TwitterapiAction
+{
+
+    var $group   = null;
+    var $notices = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->page     = (int)$this->arg('page', 1);
+        $this->count    = (int)$this->arg('count', 20);
+        $this->max_id   = (int)$this->arg('max_id', 0);
+        $this->since_id = (int)$this->arg('since_id', 0);
+        $this->since    = $this->arg('since');
+
+        $this->group = $this->getTargetGroup($this->arg('id'));
+
+        $this->format  = $this->arg('format');
+        $this->notices = $this->getNotices();
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Just show the notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showTimeline();
+    }
+
+    /**
+     * Show the timeline of notices
+     *
+     * @return void
+     */
+
+    function showTimeline()
+    {
+        $sitename   = common_config('site', 'name');
+        $title      = sprintf(_("%s timeline"), $this->group->nickname);
+        $taguribase = common_config('integration', 'taguri');
+        $id         = "tag:$taguribase:GroupTimeline:" . $this->group->id;
+        $link       = common_local_url(
+            'showgroup',
+            array('nickname' => $this->group->nickname)
+        );
+        $subtitle   = sprintf(
+            _('Updates from %1$s on %2$s!'),
+            $this->group->nickname,
+            $sitename
+        );
+
+        switch($this->format) {
+        case 'xml':
+            $this->show_xml_timeline($this->notices);
+            break;
+        case 'rss':
+            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            break;
+        case 'atom':
+            $selfuri = common_root_url() .
+                'api/statusnet/groups/timeline/' .
+                    $this->group->nickname . '.atom';
+            $this->show_atom_timeline(
+                $this->notices,
+                $title,
+                $id,
+                $link,
+                $subtitle,
+                null,
+                $selfuri
+            );
+            break;
+        case 'json':
+            $this->show_json_timeline($this->notices);
+            break;
+        default:
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+            break;
+        }
+    }
+
+    /**
+     * Get notices
+     *
+     * @return array notices
+     */
+
+    function getNotices()
+    {
+        $notices = array();
+
+        $notice = $this->group->getNotices(
+            ($this->page-1) * $this->count,
+            $this->count,
+            $this->since_id,
+            $this->max_id,
+            $this->since
+        );
+
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+        return $notices;
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this feed last modified?
+     *
+     * @return string datestamp of the latest notice in the stream
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+            return strtotime($this->notices[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this stream
+     *
+     * Returns an Etag based on the action name, language, group ID and
+     * timestamps of the first and last notice in the timeline
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+
+            $last = count($this->notices) - 1;
+
+            return '"' . implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      $this->group->id,
+                      strtotime($this->notices[0]->created),
+                      strtotime($this->notices[$last]->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+}
diff --git a/lib/router.php b/lib/router.php
index 03210ce98c..dbe2be0bb4 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -501,6 +501,12 @@ class Router
 
         // Groups
         //'list' has to be handled differently, as php will not allow a method to be named 'list'
+
+        $m->connect('api/statusnet/groups/timeline/:id.:format',
+                    array('action' => 'ApiTimelineGroup',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xmljson|rss|atom)'));
+
         $m->connect('api/statusnet/groups/list/:argument',
                     array('action' => 'api',
                           'method' => 'list_groups',
@@ -518,15 +524,6 @@ class Router
                           'apiaction' => 'statuses'),
                     array('method' => '(list_all|)(\.(atom|rss|xml|json))?'));
 
-        $m->connect('api/statuses/:method/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'statuses'),
-                    array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
-
-        $m->connect('api/statusnet/groups/:method/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'groups'));
-
         $m->connect('api/statusnet/groups/:method',
                     array('action' => 'api',
                           'apiaction' => 'groups'));
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 2141194df6..5cd88628bb 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -1142,7 +1142,7 @@ class TwitterapiAction extends Action
         }
     }
 
-    function get_group($id, $apidata=null)
+    function getTargetGroup($id)
     {
         if (empty($id)) {
 

From 87f5c53dd0ff03600275077e7185291b62358ef2 Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Wed, 7 Oct 2009 16:18:05 +0800
Subject: [PATCH 219/247] Fixed E_NOTICE - GroupList expects an owner object in
 the constructor, not an array of search terms

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

diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index be15efc47c..517f127895 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -106,7 +106,7 @@ class GroupSearchResults extends GroupList
 
     function __construct($user_group, $terms, $action)
     {
-        parent::__construct($user_group, $terms, $action);
+        parent::__construct($user_group, null, $action);
         $this->terms = array_map('preg_quote',
                                  array_map('htmlspecialchars', $terms));
         $this->pattern = '/('.implode('|',$terms).')/i';

From 9449a1e39c8470072aa30ccde1ac5d2b55d65bad Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Wed, 7 Oct 2009 16:57:38 +0800
Subject: [PATCH 220/247] Fixed E_NOTICE when the "lite" parameter isn't
 included in the request

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

diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 41887a68f4..360dff27cb 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -454,7 +454,7 @@ class TwitapistatusesAction extends TwitterapiAction
     function friends($args, $apidata)
     {
         parent::handle($args);
-        $includeStatuses=! (boolean) $args['lite'];
+        $includeStatuses= !(array_key_exists('lite', $args) and $args['lite']);
         return $this->subscriptions($apidata, 'subscribed', 'subscriber', false, $includeStatuses);
     }
 
@@ -467,7 +467,7 @@ class TwitapistatusesAction extends TwitterapiAction
     function followers($args, $apidata)
     {
         parent::handle($args);
-        $includeStatuses=! (boolean) $args['lite'];
+        $includeStatuses= !(array_key_exists('lite', $args) and $args['lite']);
         return $this->subscriptions($apidata, 'subscriber', 'subscribed', false, $includeStatuses);
     }
 

From 838c13063a8371b858a249b3bc511b2b77ce1c5f Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Wed, 7 Oct 2009 17:09:00 +0800
Subject: [PATCH 221/247] Fixed E_NOTICE when returnto isn't set

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

diff --git a/lib/util.php b/lib/util.php
index a069ccf7b3..9b299cb14f 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -981,7 +981,7 @@ function common_set_returnto($url)
 function common_get_returnto()
 {
     common_ensure_session();
-    return $_SESSION['returnto'];
+    return (array_key_exists('returnto', $_SESSION)) ? $_SESSION['returnto'] : null;
 }
 
 function common_timestamp()

From 08de0f1ebdabdce561ce863bdec219a913e61d26 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 7 Oct 2009 17:20:08 -0700
Subject: [PATCH 222/247] New individual actions for dealing with groups via
 API

---
 actions/apigroupismember.php   | 125 +++++++++
 actions/apigroupjoin.php       | 167 ++++++++++++
 actions/apigroupleave.php      | 153 +++++++++++
 actions/apigrouplist.php       | 237 +++++++++++++++++
 actions/apigrouplistall.php    | 215 ++++++++++++++++
 actions/apigroupmembership.php | 200 +++++++++++++++
 actions/apigroupshow.php       | 148 +++++++++++
 actions/twitapigroups.php      | 453 ---------------------------------
 lib/router.php                 |  65 +++--
 lib/twitterapi.php             |   7 +-
 10 files changed, 1296 insertions(+), 474 deletions(-)
 create mode 100644 actions/apigroupismember.php
 create mode 100644 actions/apigroupjoin.php
 create mode 100644 actions/apigroupleave.php
 create mode 100644 actions/apigrouplist.php
 create mode 100644 actions/apigrouplistall.php
 create mode 100644 actions/apigroupmembership.php
 create mode 100644 actions/apigroupshow.php
 delete mode 100644 actions/twitapigroups.php

diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
new file mode 100644
index 0000000000..facc58174e
--- /dev/null
+++ b/actions/apigroupismember.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Check to see whether a user a member of a group
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apibareauth.php';
+
+/**
+ * Returns whether a user is a member of a specified group.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiGroupIsMemberAction extends ApiBareAuthAction
+{
+    var $format  = null;
+    var $user    = null;
+    var $group   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->user   = $this->getTargetUser(null);
+        $this->group  = $this->getTargetGroup(null);
+        $this->format = $this->arg('format');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Save the new message
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user!'), 404, $this->format);
+            return;
+        }
+
+        if (empty($this->group)) {
+            $this->clientError('Group not found!', 404, $this->format);
+            return false;
+        }
+
+        $is_member = $this->user->isMember($this->group);
+
+        switch($this->format) {
+        case 'xml':
+            $this->init_document('xml');
+            $this->element('is_member', null, $is_member);
+            $this->end_document('xml');
+            break;
+        case 'json':
+            $this->init_document('json');
+            $this->show_json_objects(array('is_member' => $is_member));
+            $this->end_document('json');
+            break;
+        default:
+            $this->clientError(
+                _('API method not found!'),
+                400,
+                $this->format
+            );
+            break;
+        }
+    }
+
+}
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
new file mode 100644
index 0000000000..c00d594631
--- /dev/null
+++ b/actions/apigroupjoin.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Join a group via the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Joins the authenticated user to the group speicified by ID
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiGroupJoinAction extends ApiAuthAction
+{
+    var $format  = null;
+    var $user    = null;
+    var $group   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->user  = $this->auth_user;
+        $this->group = $this->getTargetGroup($this->arg('id'));
+
+        $this->format = $this->arg('format');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Save the new message
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400,
+                $this->format
+            );
+            return;
+        }
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user!'), 404, $this->format);
+            return;
+        }
+
+        if (empty($this->group)) {
+            $this->clientError('Group not found!', 404, $this->format);
+            return false;
+        }
+
+        if ($this->user->isMember($this->group)) {
+            $this->clientError(
+                _('You are already a member of that group.'),
+                403,
+                $this->format
+            );
+            return;
+        }
+
+        if (Group_block::isBlocked($this->group, $this->user->getProfile())) {
+            $this->clientError(
+                _('You have been blocked from that group by the admin.'),
+                403,
+                $this->format
+            );
+            return;
+        }
+
+        $member = new Group_member();
+
+        $member->group_id   = $this->group->id;
+        $member->profile_id = $this->user->id;
+        $member->created    = common_sql_now();
+
+        $result = $member->insert();
+
+        if (!$result) {
+            common_log_db_error($member, 'INSERT', __FILE__);
+            $this->serverError(
+                sprintf(
+                    _('Could not join user %s to group %s.'),
+                    $this->user->nickname,
+                    $this->group->nickname
+                )
+            );
+            return;
+        }
+
+        switch($this->format) {
+        case 'xml':
+            $this->show_single_xml_group($this->group);
+            break;
+        case 'json':
+            $this->show_single_json_group($this->group);
+            break;
+        default:
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+            break;
+        }
+    }
+
+}
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
new file mode 100644
index 0000000000..568b04b7cf
--- /dev/null
+++ b/actions/apigroupleave.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Leave a group via the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Removes the authenticated user from the group specified by ID
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiGroupLeaveAction extends ApiAuthAction
+{
+    var $format  = null;
+    var $user    = null;
+    var $group   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->user  = $this->auth_user;
+        $this->group = $this->getTargetGroup($this->arg('id'));
+
+        $this->format = $this->arg('format');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Save the new message
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400,
+                $this->format
+            );
+            return;
+        }
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user!'), 404, $this->format);
+            return;
+        }
+
+        if (empty($this->group)) {
+            $this->clientError('Group not found!', 404, $this->format);
+            return false;
+        }
+
+        $member = new Group_member();
+
+        $member->group_id   = $this->group->id;
+        $member->profile_id = $this->auth->id;
+
+        if (!$member->find(true)) {
+            $this->serverError(_('You are not a member of this group.'));
+            return;
+        }
+
+        $result = $member->delete();
+
+        if (!$result) {
+            common_log_db_error($member, 'INSERT', __FILE__);
+            $this->serverError(
+                sprintf(
+                    _('Could not remove user %s to group %s.'),
+                    $this->user->nickname, 
+                    $this->$group->nickname
+                )
+            );
+            return;
+        }
+       
+        switch($this->format) {
+        case 'xml':
+            $this->show_single_xml_group($this->group);
+            break;
+        case 'json':
+            $this->show_single_json_group($this->group);
+            break;
+        default:
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+            break;
+        }
+    }
+
+}
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
new file mode 100644
index 0000000000..84b7fc1c8c
--- /dev/null
+++ b/actions/apigrouplist.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Check to see whether a user a member of a group
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apibareauth.php';
+
+/**
+ * Returns whether a user is a member of a specified group.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiGroupListAction extends ApiBareAuthAction
+{
+    var $format   = null;
+    var $user     = null;
+    var $page     = null;
+    var $count    = null;
+    var $max_id   = null;
+    var $since_id = null;
+    var $since    = null;
+    var $groups   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->page     = (int)$this->arg('page', 1);
+        $this->count    = (int)$this->arg('count', 20);
+        $this->max_id   = (int)$this->arg('max_id', 0);
+        $this->since_id = (int)$this->arg('since_id', 0);
+        $this->since    = $this->arg('since');
+        
+        $this->user   = $this->getTargetUser($id);
+        $this->format = $this->arg('format');
+        $this->groups = $this->getGroups();
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Show the user's groups
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (empty($this->user)) {
+            $this->clientError(_('No such user!'), 404, $this->format);
+            return;
+        }
+
+        $sitename   = common_config('site', 'name');
+        $title      = sprintf(_("%s's groups"), $this->user->nickname);
+        $taguribase = common_config('integration', 'taguri');
+        $id         = "tag:$taguribase:Groups";
+        $link       = common_local_url(
+            'usergroups',
+            array('nickname' => $this->user->nickname)
+        );
+        $subtitle   = sprintf(
+            _("Groups %s is a member of on %s."),
+            $this->user->nickname,
+            $sitename
+        );
+
+        switch($this->format) {
+        case 'xml':
+            $this->show_xml_groups($this->groups);
+            break;
+        case 'rss':
+            $this->show_rss_groups($this->groups, $title, $link, $subtitle);
+            break;
+        case 'atom':
+            $selfuri = common_root_url() . 'api/statusnet/groups/list/' .
+                $this->user->id . '.atom';
+            $this->show_atom_groups(
+                $this->groups,
+                $title,
+                $id,
+                $link,
+                $subtitle,
+                $selfuri
+            );
+            break;
+        case 'json':
+            $this->show_json_groups($this->groups);
+            break;
+        default:
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+            break;
+        }
+
+    }
+
+    /**
+     * Get groups
+     *
+     * @return array groups
+     */
+
+    function getGroups()
+    {
+        $groups = array();
+
+        $group = $this->user->getGroups(
+            ($this->page - 1) * $this->count,
+            $this->count,
+            $this->since_id,
+            $this->max_id,
+            $this->since
+        );
+
+        while ($group->fetch()) {
+            $groups[] = clone($group);
+        }
+
+        return $groups;
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this feed last modified?
+     *
+     * @return string datestamp of the latest group the user has joined
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->groups) && (count($this->groups) > 0)) {
+            return strtotime($this->groups[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this list of groups
+     *
+     * Returns an Etag based on the action name, language, user ID and
+     * timestamps of the first and last group the user has joined
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->groups) && (count($this->groups) > 0)) {
+
+            $last = count($this->groups) - 1;
+
+            return '"' . implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      $this->user->id,
+                      strtotime($this->groups[0]->created),
+                      strtotime($this->groups[$last]->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+}
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
new file mode 100644
index 0000000000..b1964d8005
--- /dev/null
+++ b/actions/apigrouplistall.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show the newest groups
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/twitterapi.php';
+
+/**
+ * Returns of the lastest 20 groups for the site
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiGroupListAllAction extends TwitterApiAction
+{
+    var $format   = null;
+    var $page     = null;
+    var $count    = null;
+    var $max_id   = null;
+    var $since_id = null;
+    var $since    = null;
+    var $groups   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->page     = (int)$this->arg('page', 1);
+        $this->count    = (int)$this->arg('count', 20);
+        $this->max_id   = (int)$this->arg('max_id', 0);
+        $this->since_id = (int)$this->arg('since_id', 0);
+        $this->since    = $this->arg('since');
+
+        $this->user   = $this->getTargetUser($id);
+        $this->format = $this->arg('format');
+        $this->groups = $this->getGroups();
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Show the user's groups
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $sitename   = common_config('site', 'name');
+        $title      = sprintf(_("%s groups"), $sitename);
+        $taguribase = common_config('integration', 'taguri');
+        $id         = "tag:$taguribase:Groups";
+        $link       = common_local_url('groups');
+        $subtitle   = sprintf(_("groups on %s"), $sitename);
+
+        switch($this->format) {
+        case 'xml':
+            $this->show_xml_groups($this->groups);
+            break;
+        case 'rss':
+            $this->show_rss_groups($this->groups, $title, $link, $subtitle);
+            break;
+        case 'atom':
+            $selfuri = common_root_url() .
+                'api/statusnet/groups/list_all.atom';
+            $this->show_atom_groups(
+                $this->groups,
+                $title,
+                $id,
+                $link,
+                $subtitle,
+                $selfuri
+            );
+            break;
+        case 'json':
+            $this->show_json_groups($this->groups);
+            break;
+        default:
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+            break;
+        }
+
+    }
+
+    /**
+     * Get groups
+     *
+     * @return array groups
+     */
+
+    function getGroups()
+    {
+        $groups = array();
+
+        // XXX: Use the $page, $count, $max_id, $since_id, and $since parameters
+
+        $group = new User_group();
+        $group->orderBy('created DESC');
+        $group->find();
+
+        while ($group->fetch()) {
+            $groups[] = clone($group);
+        }
+
+        return $groups;
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this feed last modified?
+     *
+     * @return string datestamp of the site's latest group
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->groups) && (count($this->groups) > 0)) {
+            return strtotime($this->groups[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this list of groups
+     *
+     * Returns an Etag based on the action name, language, and
+     * timestamps of the first and last group the user has joined
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->groups) && (count($this->groups) > 0)) {
+
+            $last = count($this->groups) - 1;
+
+            return '"' . implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      strtotime($this->groups[0]->created),
+                      strtotime($this->groups[$last]->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+}
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
new file mode 100644
index 0000000000..0cd3ed2906
--- /dev/null
+++ b/actions/apigroupmembership.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * List a group's members
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/twitterapi.php';
+
+/**
+ * List 20 newest members of the group specified by name or ID. 
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiGroupMembershipAction extends TwitterApiAction
+{
+    var $format   = null;
+    var $page     = null;
+    var $count    = null;
+    var $max_id   = null;
+    var $since_id = null;
+    var $since    = null;
+    var $group    = null;
+    var $profiles = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->page     = (int)$this->arg('page', 1);
+        $this->count    = (int)$this->arg('count', 20);
+        $this->max_id   = (int)$this->arg('max_id', 0);
+        $this->since_id = (int)$this->arg('since_id', 0);
+        $this->since    = $this->arg('since');
+
+        $this->format = $this->arg('format');
+        $this->group  = $this->getTargetGroup($this->arg('id'));
+
+        $this->profiles = $this->getProfiles();
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Show the members of the group
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        // XXX: RSS and Atom
+
+        switch($this->format) {
+        case 'xml':
+            $this->show_twitter_xml_users($this->profiles);
+            break;
+        case 'json':
+            $this->show_json_users($this->profiles);
+            break;
+        default:
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+            break;
+        }
+    }
+
+    /**
+     * Fetch the members of a group
+     *
+     * @return array $profiles list of profiles 
+     */
+
+    function getProfiles()
+    {
+        $profiles = array();
+
+        $profile = $this->group->getMembers(
+            ($this->page - 1) * $this->count,
+            $this->count, 
+            $this->since_id, 
+            $this->max_id, 
+            $this->since
+        );
+
+        while ($profile->fetch()) {
+            $profiles[] = clone($profile);
+        }
+
+        return $profiles;
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this list of profiles last modified?
+     *
+     * @return string datestamp of the lastest profile in the group
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->profiles) && (count($this->profiles) > 0)) {
+            return strtotime($this->profiles[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this list of groups
+     *
+     * Returns an Etag based on the action name, language
+     * the group id, and timestamps of the first and last 
+     * user who has joined the group
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->profiles) && (count($this->profiles) > 0)) {
+
+            $last = count($this->profiles) - 1;
+
+            return '"' . implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      $this->group->id,
+                      strtotime($this->profiles[0]->created),
+                      strtotime($this->profiles[$last]->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+}
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
new file mode 100644
index 0000000000..733c9ccfe6
--- /dev/null
+++ b/actions/apigroupshow.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show information about a group
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/twitterapi.php';
+
+/**
+ * Outputs detailed information about the group specified by ID
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiGroupShowAction extends TwitterApiAction
+{
+    var $format = null;
+    var $group = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->format = $this->arg('format');
+        $this->group = $this->getTargetGroup($this->arg('id'));
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Check the format and show the user info
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (empty($this->group)) {
+            $this->clientError(
+                'Group not found!',
+                404,
+                $this->format
+            );
+            return;
+        }
+
+        switch($this->format) {
+        case 'xml':
+            $this->show_single_xml_group($this->group);
+            break;
+        case 'json':
+            $this->show_single_json_group($this->group);
+            break;
+        default:
+            $this->clientError(_('API method not found!'), 404, $this->format);
+            break;
+        }
+
+    }
+
+    /**
+     * When was this group last modified?
+     *
+     * @return string datestamp of the latest notice in the stream
+     */
+
+    function lastModified()
+    {
+        if (!empty($this->group)) {
+            return strtotime($this->group->modified);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this group
+     *
+     * Returns an Etag based on the action name, language, and
+     * timestamps of the notice
+     *
+     * @return string etag
+     */
+
+    function etag()
+    {
+        if (!empty($this->group)) {
+
+            return '"' . implode(
+                ':',
+                array($this->arg('action'),
+                      common_language(),
+                      $this->group->id,
+                      strtotime($this->group->modified))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+}
diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
deleted file mode 100644
index 493144e77e..0000000000
--- a/actions/twitapigroups.php
+++ /dev/null
@@ -1,453 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * StatusNet extensions to the Twitter-like API for groups
- *
- * 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  Twitter
- * @package   StatusNet
- * @author    Craig Andrews <candrews@integralblue.com>
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/twitterapi.php';
-
-/**
- * Group-specific API methods
- *
- * This class handles StatusNet group API methods.
- *
- * @category  Twitter
- * @package   StatusNet
- * @author    Craig Andrews <candrews@integralblue.com>
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
- class TwitapigroupsAction extends TwitterapiAction
- {
-
-     function list_groups($args, $apidata)
-     {
-         parent::handle($args);
-         
-         common_debug("in groups api action");
-         
-         $this->auth_user = $apidata['user'];
-         $user = $this->get_user($apidata['api_arg'], $apidata);
-
-         if (empty($user)) {
-             $this->clientError('Not Found', 404, $apidata['content-type']);
-             return;
-         }
-
-         $page     = (int)$this->arg('page', 1);
-         $count    = (int)$this->arg('count', 20);
-         $max_id   = (int)$this->arg('max_id', 0);
-         $since_id = (int)$this->arg('since_id', 0);
-         $since    = $this->arg('since');
-         $group = $user->getGroups(($page-1)*$count,
-             $count, $since_id, $max_id, $since);
-
-         $sitename   = common_config('site', 'name');
-         $title      = sprintf(_("%s's groups"), $user->nickname);
-         $taguribase = common_config('integration', 'taguri');
-         $id         = "tag:$taguribase:Groups";
-         $link       = common_root_url();
-         $subtitle   = sprintf(_("groups %s is a member of on %s"), $user->nickname, $sitename);
-
-         switch($apidata['content-type']) {
-         case 'xml':
-             $this->show_xml_groups($group);
-             break;
-         case 'rss':
-             $this->show_rss_groups($group, $title, $link, $subtitle);
-             break;
-         case 'atom':
-             $selfuri = common_root_url() . 'api/statusnet/groups/list/' . $user->id . '.atom';
-             $this->show_atom_groups($group, $title, $id, $link,
-                 $subtitle, $selfuri);
-             break;
-         case 'json':
-             $this->show_json_groups($group);
-             break;
-         default:
-             $this->clientError(_('API method not found!'), $code = 404);
-             break;
-         }
-     }
-
-     function list_all($args, $apidata)
-     {
-         parent::handle($args);
-         
-         common_debug("in groups api action");
-         
-         $page     = (int)$this->arg('page', 1);
-         $count    = (int)$this->arg('count', 20);
-         $max_id   = (int)$this->arg('max_id', 0);
-         $since_id = (int)$this->arg('since_id', 0);
-         $since    = $this->arg('since');
-
-         /*	 TODO:
-         Use the $page, $count, $max_id, $since_id, and $since parameters
-         */
-         $group = new User_group();
-         $group->orderBy('created DESC');
-         $group->find();
-
-         $sitename   = common_config('site', 'name');
-         $title      = sprintf(_("%s groups"), $sitename);
-         $taguribase = common_config('integration', 'taguri');
-         $id         = "tag:$taguribase:Groups";
-         $link       = common_root_url();
-         $subtitle   = sprintf(_("groups on %s"), $sitename);
-
-         switch($apidata['content-type']) {
-         case 'xml':
-             $this->show_xml_groups($group);
-             break;
-         case 'rss':
-             $this->show_rss_groups($group, $title, $link, $subtitle);
-             break;
-         case 'atom':
-             $selfuri = common_root_url() . 'api/statusnet/groups/list_all.atom';
-             $this->show_atom_groups($group, $title, $id, $link,
-                 $subtitle, $selfuri);
-             break;
-         case 'json':
-             $this->show_json_groups($group);
-             break;
-         default:
-             $this->clientError(_('API method not found!'), $code = 404);
-             break;
-         }
-     }
-
-     function show($args, $apidata)
-     {
-         parent::handle($args);
-
-         common_debug("in groups api action");
-
-         $this->auth_user = $apidata['user'];
-         $group = $this->get_group($apidata['api_arg'], $apidata);
-
-         if (empty($group)) {
-             $this->clientError('Not Found', 404, $apidata['content-type']);
-             return;
-         }
-
-         switch($apidata['content-type']) {
-          case 'xml':
-             $this->show_single_xml_group($group);
-             break;
-          case 'json':
-             $this->show_single_json_group($group);
-             break;
-          default:
-             $this->clientError(_('API method not found!'), $code = 404);
-         }
-     }
-
-     function timeline($args, $apidata)
-     {
-         parent::handle($args);
-
-         common_debug("in groups api action");
-
-         $this->auth_user = $apidata['user'];
-         $group = $this->get_group($apidata['api_arg'], $apidata);
-
-         if (empty($group)) {
-             $this->clientError('Not Found', 404, $apidata['content-type']);
-             return;
-         }
-
-         $sitename   = common_config('site', 'name');
-         $title      = sprintf(_("%s timeline"), $group->nickname);
-         $taguribase = common_config('integration', 'taguri');
-         $id         = "tag:$taguribase:GroupTimeline:".$group->id;
-         $link       = common_local_url('showgroup',
-             array('nickname' => $group->nickname));
-         $subtitle   = sprintf(_('Updates from %1$s on %2$s!'),
-             $group->nickname, $sitename);
-
-         $page     = (int)$this->arg('page', 1);
-         $count    = (int)$this->arg('count', 20);
-         $max_id   = (int)$this->arg('max_id', 0);
-         $since_id = (int)$this->arg('since_id', 0);
-         $since    = $this->arg('since');
-
-         $notice = $group->getNotices(($page-1)*$count,
-             $count, $since_id, $max_id, $since);
-
-         switch($apidata['content-type']) {
-          case 'xml':
-             $this->show_xml_timeline($notice);
-             break;
-          case 'rss':
-             $this->show_rss_timeline($notice, $title, $link, $subtitle);
-             break;
-          case 'atom':
-             if (isset($apidata['api_arg'])) {
-                 $selfuri = common_root_url() .
-                     'api/statusnet/groups/timeline/' .
-                         $apidata['api_arg'] . '.atom';
-             } else {
-                 $selfuri = common_root_url() .
-                  'api/statusnet/groups/timeline.atom';
-             }
-             $this->show_atom_timeline($notice, $title, $id, $link,
-                 $subtitle, null, $selfuri);
-             break;
-          case 'json':
-             $this->show_json_timeline($notice);
-             break;
-          default:
-             $this->clientError(_('API method not found!'), $code = 404);
-         }
-     }
-
-     function membership($args, $apidata)
-     {
-         parent::handle($args);
-
-         common_debug("in groups api action");
-
-         $this->auth_user = $apidata['user'];
-         $group = $this->get_group($apidata['api_arg'], $apidata);
-         
-         if (empty($group)) {
-             $this->clientError('Not Found', 404, $apidata['content-type']);
-             return;
-         }
-
-         $sitename   = common_config('site', 'name');
-         $title      = sprintf(_("Members of %s group"), $group->nickname);
-         $taguribase = common_config('integration', 'taguri');
-         $id         = "tag:$taguribase:GroupMembership:".$group->id;
-         $link       = common_local_url('showgroup',
-             array('nickname' => $group->nickname));
-         $subtitle   = sprintf(_('Members of %1$s on %2$s'),
-             $group->nickname, $sitename);
-
-         $page     = (int)$this->arg('page', 1);
-         $count    = (int)$this->arg('count', 20);
-         $max_id   = (int)$this->arg('max_id', 0);
-         $since_id = (int)$this->arg('since_id', 0);
-         $since    = $this->arg('since');
-
-         $member = $group->getMembers(($page-1)*$count,
-             $count, $since_id, $max_id, $since);
-
-         switch($apidata['content-type']) {
-          case 'xml':
-             $this->show_twitter_xml_users($member);
-             break;
-          //TODO implement the RSS and ATOM content types
-          /*case 'rss':
-             $this->show_rss_users($member, $title, $link, $subtitle);
-             break;*/
-          /*case 'atom':
-             if (isset($apidata['api_arg'])) {
-                 $selfuri = common_root_url() .
-                     'api/statusnet/groups/membership/' .
-                         $apidata['api_arg'] . '.atom';
-             } else {
-                 $selfuri = common_root_url() .
-                  'api/statusnet/groups/membership.atom';
-             }
-             $this->show_atom_users($member, $title, $id, $link,
-                 $subtitle, null, $selfuri);
-             break;*/
-          case 'json':
-             $this->show_json_users($member);
-             break;
-          default:
-             $this->clientError(_('API method not found!'), $code = 404);
-         }
-     }
-
-     function join($args, $apidata)
-     {
-         parent::handle($args);
-
-         common_debug("in groups api action");
-
-         $this->auth_user = $apidata['user'];
-         $group = $this->get_group($apidata['api_arg'], $apidata);
-
-         if (empty($group)) {
-             $this->clientError('Not Found', 404, $apidata['content-type']);
-             return false;
-         }
-
-         if($this->auth_user->isMember($group)){
-            $this->clientError(_('You are already a member of that group'), $code = 403);
-            return false;
-         }
-
-         if (Group_block::isBlocked($group, $this->auth_user->getProfile())) {
-            $this->clientError(_('You have been blocked from that group by the admin.'), 403);
-            return false;
-         }
-
-         $member = new Group_member();
-
-         $member->group_id   = $group->id;
-         $member->profile_id = $this->auth_user->id;
-         $member->created    = common_sql_now();
-
-         $result = $member->insert();
-
-         if (!$result) {
-            common_log_db_error($member, 'INSERT', __FILE__);
-            $this->serverError(sprintf(_('Could not join user %s to group %s'),
-                                       $this->auth_user->nickname, $group->nickname));
-         }
-
-         switch($apidata['content-type']) {
-          case 'xml':
-             $this->show_single_xml_group($group);
-             break;
-          case 'json':
-             $this->show_single_json_group($group);
-             break;
-          default:
-             $this->clientError(_('API method not found!'), $code = 404);
-         }
-     }
-
-     function leave($args, $apidata)
-     {
-         parent::handle($args);
-
-         common_debug("in groups api action");
-
-         $this->auth_user = $apidata['user'];
-         $group = $this->get_group($apidata['api_arg'], $apidata);
-
-         if (empty($group)) {
-             $this->clientError('Not Found', 404, $apidata['content-type']);
-             return false;
-         }
-
-         if(! $this->auth_user->isMember($group)){
-            $this->clientError(_('You are not a member of that group'), $code = 403);
-            return false;
-         }
-
-         $member = new Group_member();
-
-         $member->group_id   = $group->id;
-         $member->profile_id = $this->auth_user->id;
-
-         if (!$member->find(true)) {
-            $this->serverError(_('Could not find membership record.'));
-            return;
-         }
-
-         $result = $member->delete();
-
-         if (!$result) {
-            common_log_db_error($member, 'INSERT', __FILE__);
-            $this->serverError(sprintf(_('Could not remove user %s to group %s'),
-                                       $this->auth_user->nickname, $group->nickname));
-         }
-
-         switch($apidata['content-type']) {
-          case 'xml':
-             $this->show_single_xml_group($group);
-             break;
-          case 'json':
-             $this->show_single_json_group($group);
-             break;
-          default:
-             $this->clientError(_('API method not found!'), $code = 404);
-         }
-     }
-
-     function is_member($args, $apidata)
-     {
-         parent::handle($args);
-
-         common_debug("in groups api action");
-
-         $this->auth_user = $apidata['user'];
-         $group = User_group::staticGet($args['group_id']);
-         if(! $group){
-            $this->clientError(_('Group not found'), $code = 500);
-         }
-         $user = User::staticGet('id', $args['user_id']);
-         if(! $user){
-            $this->clientError(_('User not found'), $code = 500);
-         }
-         
-         $is_member=$user->isMember($group);
-
-         switch($apidata['content-type']) {
-          case 'xml':
-             $this->init_document('xml');
-             $this->element('is_member', null, $is_member);
-             $this->end_document('xml');
-             break;
-          case 'json':
-             $this->init_document('json');
-             $this->show_json_objects(array('is_member'=>$is_member));
-             $this->end_document('json');
-             break;
-          default:
-             $this->clientError(_('API method not found!'), $code = 404);
-         }
-     }
-
-     function create($args, $apidata)
-     {
-        die("todo");
-     }
-
-     function update($args, $apidata)
-     {
-        die("todo");
-     }
-
-     function update_group_logo($args, $apidata)
-     {
-        die("todo");
-     }
-
-     function destroy($args, $apidata)
-     {
-        die("todo");
-     }
-
-     function tag($args, $apidata)
-     {
-        die("todo");
-     }
-}
diff --git a/lib/router.php b/lib/router.php
index dbe2be0bb4..1ea5885dac 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -507,27 +507,58 @@ class Router
                           'id' => '[a-zA-Z0-9]+',
                           'format' => '(xmljson|rss|atom)'));
 
-        $m->connect('api/statusnet/groups/list/:argument',
-                    array('action' => 'api',
-                          'method' => 'list_groups',
-                          'apiaction' => 'groups'));
+        $m->connect('api/statusnet/groups/show.:format',
+                    array('action' => 'ApiGroupShow',
+                    'format' => '(xml|json)'));
 
-        foreach (array('xml', 'json', 'rss', 'atom') as $e) {
-            $m->connect('api/statusnet/groups/list.' . $e,
-                    array('action' => 'api',
-                          'method' => 'list_groups.' . $e,
-                          'apiaction' => 'groups'));
-        }
+        $m->connect('api/statusnet/groups/show/:id.:format',
+                    array('action' => 'ApiGroupShow',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json)'));
 
-        $m->connect('api/statusnet/groups/:method',
-                    array('action' => 'api',
-                          'apiaction' => 'statuses'),
-                    array('method' => '(list_all|)(\.(atom|rss|xml|json))?'));
+        $m->connect('api/statusnet/groups/join.:format',
+                    array('action' => 'ApiGroupJoin',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json)'));
 
-        $m->connect('api/statusnet/groups/:method',
-                    array('action' => 'api',
-                          'apiaction' => 'groups'));
+        $m->connect('api/statusnet/groups/join/:id.:format',
+                    array('action' => 'ApiGroupJoin',
+                    'format' => '(xml|json)'));
 
+        $m->connect('api/statusnet/groups/leave.:format',
+                    array('action' => 'ApiGroupLeave',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json)'));
+
+        $m->connect('api/statusnet/groups/leave/:id.:format',
+                    array('action' => 'ApiGroupLeave',
+                          'format' => '(xml|json)'));
+
+        $m->connect('api/statusnet/groups/is_member.:format',
+                    array('action' => 'ApiGroupIsMember',
+                          'format' => '(xml|json)'));
+
+        $m->connect('api/statusnet/groups/list.:format',
+                    array('action' => 'ApiGroupList',
+                          'format' => '(xml|json|rss|atom)'));
+
+        $m->connect('api/statusnet/groups/list/:id.:format',
+                    array('action' => 'ApiGroupList',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json|rss|atom)'));
+
+        $m->connect('api/statusnet/groups/list_all.:format',
+                    array('action' => 'ApiGroupListAll',
+                          'format' => '(xml|json|rss|atom)'));
+
+        $m->connect('api/statusnet/groups/membership.:format',
+                    array('action' => 'ApiGroupMembership',
+                         'format' => '(xml|json)'));
+
+        $m->connect('api/statusnet/groups/membership/:id.:format',
+                     array('action' => 'ApiGroupMembership',
+                           'id' => '[a-zA-Z0-9]+',
+                           'format' => '(xml|json)'));
         // Tags
         $m->connect('api/statusnet/tags/timeline/:tag.:format',
                     array('action' => 'ApiTimelineTag',
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 5cd88628bb..e5904cc858 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -829,9 +829,9 @@ class TwitterapiAction extends Action
         $this->elementStart('users', array('type' => 'array'));
 
         if (is_array($user)) {
-            foreach ($group as $g) {
-                $twitter_user = $this->twitter_user_array($g);
-                $this->show_twitter_xml_user($twitter_user,'user');
+            foreach ($user as $u) {
+                $twitter_user = $this->twitter_user_array($u);
+                $this->show_twitter_xml_user($twitter_user);
             }
         } else {
             while ($user->fetch()) {
@@ -1145,7 +1145,6 @@ class TwitterapiAction extends Action
     function getTargetGroup($id)
     {
         if (empty($id)) {
-
             if (is_numeric($this->arg('id'))) {
                 return User_group::staticGet($this->arg('id'));
             } else if ($this->arg('id')) {

From daaa1d47908eba0d7b579222bd82994cb4fa01fb Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Thu, 8 Oct 2009 12:49:30 +0800
Subject: [PATCH 223/247] Don't show search suggestions for private sites

---
 lib/searchaction.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/searchaction.php b/lib/searchaction.php
index 0d9f85a8f1..130b28ff52 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -135,16 +135,21 @@ class SearchAction extends Action
     }
 
     function searchSuggestions($q) {
-        $qe = urlencode($q);
-        $message = sprintf(_(<<<E_O_T
+        $message = _(<<<E_O_T
 * Make sure all words are spelled correctly.
 * Try different keywords.
 * Try more general keywords.
 * Try fewer keywords.
 
+E_O_T
+);
+        if (!common_config('site', 'private')) {
+            $qe = urlencode($q);
+            $message .= sprintf(_(<<<E_O_T
+
 You can also try your search on other engines:
 
-* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=identi.ca)
+* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%site.server%%%%)
 * [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)
 * [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)
 * [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)
@@ -152,6 +157,7 @@ You can also try your search on other engines:
 
 E_O_T
 ), $qe, $qe, $qe, $qe, $qe);
+        }
         $this->elementStart('dl', array('id' => 'help_search', 'class' => 'help'));
         $this->element('dt', null, _('Search help'));
         $this->elementStart('dd', 'instructions');

From a6d4adc398d9d2d131df97007452c5c54072ddec Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 8 Oct 2009 11:41:39 -0400
Subject: [PATCH 224/247] Revert "Open tags should have closing tags"

This reverts commit aeca8807dbce951beccbc3fb0e5a4ae5600e5e5f.

We specifically DON'T have closing tags so we don't get errors with
whitespace after the closing tag.

I realize this is less of an issue with scripts, but we should still
not use closing tags.
---
 scripts/allsites.php               | 3 +--
 scripts/createsim.php              | 1 -
 scripts/decache.php                | 1 -
 scripts/deleteuser.php             | 1 -
 scripts/enjitqueuehandler.php      | 1 -
 scripts/facebookqueuehandler.php   | 1 -
 scripts/fixup_conversations.php    | 1 -
 scripts/fixup_hashtags.php         | 1 -
 scripts/fixup_inboxes.php          | 1 -
 scripts/fixup_notices_rendered.php | 1 -
 scripts/fixup_replies.php          | 1 -
 scripts/fixup_utf8.php             | 1 -
 scripts/getpiddir.php              | 1 -
 scripts/getvaliddaemons.php        | 1 -
 scripts/inbox_users.php            | 1 -
 scripts/jabberqueuehandler.php     | 1 -
 scripts/maildaemon.php             | 1 -
 scripts/ombqueuehandler.php        | 1 -
 scripts/pingqueuehandler.php       | 1 -
 scripts/publicqueuehandler.php     | 1 -
 scripts/reportsnapshot.php         | 1 -
 scripts/sessiongc.php              | 1 -
 scripts/setpassword.php            | 1 -
 scripts/showcache.php              | 1 -
 scripts/smsqueuehandler.php        | 1 -
 scripts/synctwitterfriends.php     | 2 +-
 scripts/triminboxes.php            | 1 -
 scripts/twitterqueuehandler.php    | 1 -
 scripts/twitterstatusfetcher.php   | 2 +-
 scripts/uncache_users.php          | 1 -
 scripts/update_translations.php    | 1 -
 scripts/xmppconfirmhandler.php     | 2 +-
 scripts/xmppdaemon.php             | 1 -
 33 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/scripts/allsites.php b/scripts/allsites.php
index ff9d8bc804..cf1419e550 100755
--- a/scripts/allsites.php
+++ b/scripts/allsites.php
@@ -37,5 +37,4 @@ if ($sn->find()) {
     while ($sn->fetch()) {
         print "$sn->nickname\n";
     }
-}
-?>
+}
\ No newline at end of file
diff --git a/scripts/createsim.php b/scripts/createsim.php
index 93f904506a..71ed3bf722 100644
--- a/scripts/createsim.php
+++ b/scripts/createsim.php
@@ -140,4 +140,3 @@ $tagmax     = (have_option('t', 'tags')) ? get_option_value('t', 'tags') : 10000
 $userprefix = (have_option('x', 'prefix')) ? get_option_value('x', 'prefix') : 'testuser';
 
 main($usercount, $noticeavg, $subsavg, $tagmax);
-?>
diff --git a/scripts/decache.php b/scripts/decache.php
index 9b820bd832..7cabd78ada 100644
--- a/scripts/decache.php
+++ b/scripts/decache.php
@@ -48,4 +48,3 @@ if (!$object) {
 }
 
 $result = $object->decache();
-?>
diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php
index 446f76878b..52389123c5 100644
--- a/scripts/deleteuser.php
+++ b/scripts/deleteuser.php
@@ -66,4 +66,3 @@ if (!have_option('y', 'yes')) {
 print "Deleting...";
 $user->delete();
 print "DONE.\n";
-?>
diff --git a/scripts/enjitqueuehandler.php b/scripts/enjitqueuehandler.php
index 5eda062f5a..08f733b07c 100755
--- a/scripts/enjitqueuehandler.php
+++ b/scripts/enjitqueuehandler.php
@@ -137,4 +137,3 @@ if ($handler->start()) {
 }
 
 $handler->finish();
-?>
diff --git a/scripts/facebookqueuehandler.php b/scripts/facebookqueuehandler.php
index dc17cb15a0..e13ac4e850 100755
--- a/scripts/facebookqueuehandler.php
+++ b/scripts/facebookqueuehandler.php
@@ -72,4 +72,3 @@ if (have_option('i')) {
 $handler = new FacebookQueueHandler($id);
 
 $handler->runOnce();
-?>
diff --git a/scripts/fixup_conversations.php b/scripts/fixup_conversations.php
index f79288f7b3..8a9f7bb577 100755
--- a/scripts/fixup_conversations.php
+++ b/scripts/fixup_conversations.php
@@ -68,4 +68,3 @@ while ($nid->fetch()) {
     
     print ".\n";
 }
-?>
diff --git a/scripts/fixup_hashtags.php b/scripts/fixup_hashtags.php
index bae0947b2d..5cfebd8ee8 100755
--- a/scripts/fixup_hashtags.php
+++ b/scripts/fixup_hashtags.php
@@ -45,4 +45,3 @@ while ($notice->fetch()) {
         common_log_db_error($notice, 'UPDATE', __FILE__);
     }
 }
-?>
diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php
index 9619f3226b..d55a538853 100755
--- a/scripts/fixup_inboxes.php
+++ b/scripts/fixup_inboxes.php
@@ -79,4 +79,3 @@ while ($user->fetch()) {
         $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
     }
 }
-?>
diff --git a/scripts/fixup_notices_rendered.php b/scripts/fixup_notices_rendered.php
index 4b928ecd22..359cd6cce4 100755
--- a/scripts/fixup_notices_rendered.php
+++ b/scripts/fixup_notices_rendered.php
@@ -49,4 +49,3 @@ while ($notice->fetch()) {
         common_log_db_error($notice, 'UPDATE', __FILE__);
     }
 }
-?>
diff --git a/scripts/fixup_replies.php b/scripts/fixup_replies.php
index 302c239151..7328635d3c 100755
--- a/scripts/fixup_replies.php
+++ b/scripts/fixup_replies.php
@@ -39,4 +39,3 @@ while ($notice->fetch()) {
     common_log(LOG_INFO, 'Getting replies for notice #' . $notice->id);
     common_save_replies($notice);
 }
-?>
diff --git a/scripts/fixup_utf8.php b/scripts/fixup_utf8.php
index 24d301dab8..5a9fba7c3f 100755
--- a/scripts/fixup_utf8.php
+++ b/scripts/fixup_utf8.php
@@ -363,4 +363,3 @@ $fixer = new UTF8FixerUpper(array('max_date' => $max_date,
 
 $fixer->fixup();
 
-?>
diff --git a/scripts/getpiddir.php b/scripts/getpiddir.php
index 5860655fd3..8274c37c0f 100755
--- a/scripts/getpiddir.php
+++ b/scripts/getpiddir.php
@@ -28,4 +28,3 @@ ENDOFHELP;
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 echo common_config('daemon', 'piddir');
-?>
diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 7fffac783b..8f48e8e6f0 100755
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -52,4 +52,3 @@ echo "pingqueuehandler.php ";
 if (common_config('sms', 'enabled')) {
     echo "smsqueuehandler.php ";
 }
-?>
diff --git a/scripts/inbox_users.php b/scripts/inbox_users.php
index 718dd856be..32adcea213 100755
--- a/scripts/inbox_users.php
+++ b/scripts/inbox_users.php
@@ -105,4 +105,3 @@ foreach ($ids as $id) {
 		$cache->delete(common_cache_key('user:notices_with_friends:' . $user->id . ';last'));
 	}
 }
-?>
diff --git a/scripts/jabberqueuehandler.php b/scripts/jabberqueuehandler.php
index b029ea1f1e..8f3a56944d 100755
--- a/scripts/jabberqueuehandler.php
+++ b/scripts/jabberqueuehandler.php
@@ -76,4 +76,3 @@ if (have_option('i')) {
 $handler = new JabberQueueHandler($id);
 
 $handler->runOnce();
-?>
diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index 19c77e077a..11911dcbdc 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -389,4 +389,3 @@ if (common_config('emailpost', 'enabled')) {
     $md = new MailerDaemon();
     $md->handle_message('php://stdin');
 }
-?>
diff --git a/scripts/ombqueuehandler.php b/scripts/ombqueuehandler.php
index a24185da35..8e685f1c8e 100755
--- a/scripts/ombqueuehandler.php
+++ b/scripts/ombqueuehandler.php
@@ -85,4 +85,3 @@ if (have_option('i')) {
 $handler = new OmbQueueHandler($id);
 
 $handler->runOnce();
-?>
diff --git a/scripts/pingqueuehandler.php b/scripts/pingqueuehandler.php
index 768c06c776..c92337e36c 100644
--- a/scripts/pingqueuehandler.php
+++ b/scripts/pingqueuehandler.php
@@ -67,4 +67,3 @@ if (have_option('i')) {
 $handler = new PingQueueHandler($id);
 
 $handler->runOnce();
-?>
diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index ffb5acdb64..50a11bcba0 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -74,4 +74,3 @@ if (have_option('i')) {
 $handler = new PublicQueueHandler($id);
 
 $handler->runOnce();
-?>
diff --git a/scripts/reportsnapshot.php b/scripts/reportsnapshot.php
index b8f8d2a7cf..71f1019ee6 100644
--- a/scripts/reportsnapshot.php
+++ b/scripts/reportsnapshot.php
@@ -28,4 +28,3 @@ END_OF_SNAPSHOT_HELP;
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
 Snapshot::check();
-?>
diff --git a/scripts/sessiongc.php b/scripts/sessiongc.php
index b5fdcbf341..af55ddf3f0 100644
--- a/scripts/sessiongc.php
+++ b/scripts/sessiongc.php
@@ -34,4 +34,3 @@ $maxlifetime = ini_get('session.gc_maxlifetime');
 print "Deleting sessions older than $maxlifetime seconds.\n";
 
 Session::gc($maxlifetime);
-?>
diff --git a/scripts/setpassword.php b/scripts/setpassword.php
index f951dccf78..50d49d7dbf 100755
--- a/scripts/setpassword.php
+++ b/scripts/setpassword.php
@@ -59,4 +59,3 @@ if (!$user->update($original)) {
     print "Password for user '$nickname' updated.\n";
     exit(0);
 }
-?>
diff --git a/scripts/showcache.php b/scripts/showcache.php
index fb0ccb5e03..f179795728 100644
--- a/scripts/showcache.php
+++ b/scripts/showcache.php
@@ -69,4 +69,3 @@ if (empty($obj)) {
     var_dump($obj);
     print "\n";
 }
-?>
diff --git a/scripts/smsqueuehandler.php b/scripts/smsqueuehandler.php
index 9e8de7a117..6583a77da8 100755
--- a/scripts/smsqueuehandler.php
+++ b/scripts/smsqueuehandler.php
@@ -71,4 +71,3 @@ if (have_option('i')) {
 $handler = new SmsQueueHandler($id);
 
 $handler->runOnce();
-?>
diff --git a/scripts/synctwitterfriends.php b/scripts/synctwitterfriends.php
index f582231e39..b30e700a1c 100755
--- a/scripts/synctwitterfriends.php
+++ b/scripts/synctwitterfriends.php
@@ -283,4 +283,4 @@ if (have_option('d') || have_option('debug')) {
 
 $syncer = new SyncTwitterFriendsDaemon($id, 60, 2, $debug);
 $syncer->runOnce();
-?>
+
diff --git a/scripts/triminboxes.php b/scripts/triminboxes.php
index 5153d17065..da09817e5b 100644
--- a/scripts/triminboxes.php
+++ b/scripts/triminboxes.php
@@ -54,4 +54,3 @@ $cnt = $user->find();
 while ($user->fetch()) {
     Notice_inbox::gc($user->id);
 }
-?>
diff --git a/scripts/twitterqueuehandler.php b/scripts/twitterqueuehandler.php
index 820baeb0a1..ce4d824d0d 100755
--- a/scripts/twitterqueuehandler.php
+++ b/scripts/twitterqueuehandler.php
@@ -72,4 +72,3 @@ if (have_option('i')) {
 $handler = new TwitterQueueHandler($id);
 
 $handler->runOnce();
-?>
diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php
index 726d2e2375..3cdf1867a1 100755
--- a/scripts/twitterstatusfetcher.php
+++ b/scripts/twitterstatusfetcher.php
@@ -562,4 +562,4 @@ if (have_option('d') || have_option('debug')) {
 
 $fetcher = new TwitterStatusFetcher($id, 60, 2, $debug);
 $fetcher->runOnce();
-?>
+
diff --git a/scripts/uncache_users.php b/scripts/uncache_users.php
index ee030f778f..5a1d330307 100644
--- a/scripts/uncache_users.php
+++ b/scripts/uncache_users.php
@@ -50,4 +50,3 @@ foreach ($ids as $id) {
     $memc->delete(common_cache_key('user:notices_with_friends:'. $user->id));
     $memc->delete(common_cache_key('user:notices_with_friends:'. $user->id . ';last'));
 }
-?>
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index f036657c54..f145c1f0b6 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -96,4 +96,3 @@ function curl_get_file($url)
 
     return FALSE;
 }
-?>
diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index 05c5f86ce7..c7ed15e495 100755
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -160,4 +160,4 @@ if (have_option('i')) {
 $handler = new XmppConfirmHandler($id);
 
 $handler->runOnce();
-?>
+
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index eaebd59488..9e621e725a 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -412,4 +412,3 @@ $foreground = have_option('f', 'foreground');
 $daemon = new XMPPDaemon($id, !$foreground);
 
 $daemon->runOnce();
-?>

From 62059fec832014411f604d9cc669b7d3201a60d5 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 8 Oct 2009 15:45:45 -0700
Subject: [PATCH 225/247] New actions for statusnet config and version API
 methods

---
 actions/apistatusnetconfig.php  | 143 ++++++++++++++++++++++++++
 actions/apistatusnetversion.php | 103 +++++++++++++++++++
 actions/twitapistatusnet.php    | 175 --------------------------------
 lib/router.php                  |  20 ++--
 4 files changed, 260 insertions(+), 181 deletions(-)
 create mode 100644 actions/apistatusnetconfig.php
 create mode 100644 actions/apistatusnetversion.php
 delete mode 100644 actions/twitapistatusnet.php

diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
new file mode 100644
index 0000000000..94bd5b4b3f
--- /dev/null
+++ b/actions/apistatusnetconfig.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Dump of configuration variables
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/twitterapi.php';
+
+/**
+ * Gives a full dump of configuration variables for this instance
+ * of StatusNet, minus variables that may be security-sensitive (like
+ * passwords).
+ * URL: http://identi.ca/api/statusnet/config.(xml|json)
+ * Formats: xml, json
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiStatusnetConfigAction extends TwitterApiAction
+{
+    var $format = null;
+
+    var $keys = array(
+        'site' => array('name', 'server', 'theme', 'path', 'fancy', 'language',
+                        'email', 'broughtby', 'broughtbyurl', 'closed',
+                        'inviteonly', 'private'),
+        'license' => array('url', 'title', 'image'),
+        'nickname' => array('featured'),
+        'throttle' => array('enabled', 'count', 'timespan'),
+        'xmpp' => array('enabled', 'server', 'user')
+    );
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->format = $this->arg('format');
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        switch ($this->format) {
+        case 'xml':
+            $this->init_document('xml');
+            $this->elementStart('config');
+
+            // XXX: check that all sections and settings are legal XML elements
+
+            common_debug(var_export($this->keys, true));
+
+            foreach ($this->keys as $section => $settings) {
+                $this->elementStart($section);
+                foreach ($settings as $setting) {
+                    $value = common_config($section, $setting);
+                    if (is_array($value)) {
+                        $value = implode(',', $value);
+                    } else if ($value === false) {
+                        $value = 'false';
+                    } else if ($value === true) {
+                        $value = 'true';
+                    }
+                    $this->element($setting, null, $value);
+                }
+                $this->elementEnd($section);
+            }
+            $this->elementEnd('config');
+            $this->end_document('xml');
+            break;
+        case 'json':
+            $result = array();
+            foreach ($this->keys as $section => $settings) {
+                $result[$section] = array();
+                foreach ($settings as $setting) {
+                    $result[$section][$setting]
+                        = common_config($section, $setting);
+                }
+            }
+            $this->init_document('json');
+            $this->show_json_objects($result);
+            $this->end_document('json');
+            break;
+        default:
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+            break;
+        }
+    }
+
+}
+
diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php
new file mode 100644
index 0000000000..471297ad55
--- /dev/null
+++ b/actions/apistatusnetversion.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * A version stamp for the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/twitterapi.php';
+
+/**
+ * Returns a version number for this version of StatusNet, which
+ * should make things a bit easier for upgrades.
+ * URL: http://identi.ca/api/statusnet/version.(xml|json)
+ * Formats: xml, js
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiStatusnetVersionAction extends TwitterApiAction
+{
+    var $format = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->format = $this->arg('format');
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        switch ($this->format) {
+        case 'xml':
+            $this->init_document('xml');
+            $this->element('version', null, STATUSNET_VERSION);
+            $this->end_document('xml');
+            break;
+        case 'json':
+            $this->init_document('json');
+            print '"'.STATUSNET_VERSION.'"';
+            $this->end_document('json');
+            break;
+        default:
+            $this->clientError(
+                _('API method not found!'), 
+                404, 
+                $this->format
+            );
+            break;
+        }
+    }
+
+}
+
diff --git a/actions/twitapistatusnet.php b/actions/twitapistatusnet.php
deleted file mode 100644
index 490f11dce2..0000000000
--- a/actions/twitapistatusnet.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * StatusNet-only extensions to the Twitter-like API
- *
- * 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  Twitter
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/twitterapi.php';
-
-/**
- * StatusNet-specific API methods
- *
- * This class handles all /statusnet/ API methods.
- *
- * @category  Twitter
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-class TwitapistatusnetAction extends TwitterapiAction
-{
-    /**
-     * A version stamp for the API
-     *
-     * Returns a version number for this version of StatusNet, which
-     * should make things a bit easier for upgrades.
-     * URL: http://identi.ca/api/statusnet/version.(xml|json)
-     * Formats: xml, json
-     *
-     * @param array $args    Web arguments
-     * @param array $apidata Twitter API data
-     *
-     * @return void
-     *
-     * @see ApiAction::process_command()
-     */
-
-    function version($args, $apidata)
-    {
-        parent::handle($args);
-        switch ($apidata['content-type']) {
-         case 'xml':
-            $this->init_document('xml');
-            $this->element('version', null, STATUSNET_VERSION);
-            $this->end_document('xml');
-            break;
-         case 'json':
-            $this->init_document('json');
-            print '"'.STATUSNET_VERSION.'"';
-            $this->end_document('json');
-            break;
-         default:
-            $this->clientError(_('API method not found!'), $code=404);
-        }
-    }
-
-    /**
-     * Dump of configuration variables
-     *
-     * Gives a full dump of configuration variables for this instance
-     * of StatusNet, minus variables that may be security-sensitive (like
-     * passwords).
-     * URL: http://identi.ca/api/statusnet/config.(xml|json)
-     * Formats: xml, json
-     *
-     * @param array $args    Web arguments
-     * @param array $apidata Twitter API data
-     *
-     * @return void
-     *
-     * @see ApiAction::process_command()
-     */
-
-    function config($args, $apidata)
-    {
-        static $keys = array('site' => array('name', 'server', 'theme', 'path', 'fancy', 'language',
-                                             'email', 'broughtby', 'broughtbyurl', 'closed',
-                                             'inviteonly', 'private'),
-                             'license' => array('url', 'title', 'image'),
-                             'nickname' => array('featured'),
-                             'throttle' => array('enabled', 'count', 'timespan'),
-                             'xmpp' => array('enabled', 'server', 'user'));
-
-        parent::handle($args);
-
-        switch ($apidata['content-type']) {
-         case 'xml':
-            $this->init_document('xml');
-            $this->elementStart('config');
-            // XXX: check that all sections and settings are legal XML elements
-            foreach ($keys as $section => $settings) {
-                $this->elementStart($section);
-                foreach ($settings as $setting) {
-                    $value = common_config($section, $setting);
-                    if (is_array($value)) {
-                        $value = implode(',', $value);
-                    } else if ($value === false) {
-                        $value = 'false';
-                    } else if ($value === true) {
-                        $value = 'true';
-                    }
-                    $this->element($setting, null, $value);
-                }
-                $this->elementEnd($section);
-            }
-            $this->elementEnd('config');
-            $this->end_document('xml');
-            break;
-         case 'json':
-            $result = array();
-            foreach ($keys as $section => $settings) {
-                $result[$section] = array();
-                foreach ($settings as $setting) {
-                    $result[$section][$setting] = common_config($section, $setting);
-                }
-            }
-            $this->init_document('json');
-            $this->show_json_objects($result);
-            $this->end_document('json');
-            break;
-         default:
-            $this->clientError(_('API method not found!'), $code=404);
-        }
-    }
-
-    /**
-     * WADL description of the API
-     *
-     * Gives a WADL description of the API provided by this version of the
-     * software.
-     *
-     * @param array $args    Web arguments
-     * @param array $apidata Twitter API data
-     *
-     * @return void
-     *
-     * @see ApiAction::process_command()
-     */
-
-    function wadl($args, $apidata)
-    {
-        parent::handle($args);
-        $this->serverError(_('API method under construction.'), 501);
-    }
-
-}
diff --git a/lib/router.php b/lib/router.php
index 1ea5885dac..3c50fb25ec 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -486,15 +486,23 @@ class Router
 
         // statusnet
 
-        $m->connect('api/statusnet/:method',
-                    array('action' => 'api',
-                          'apiaction' => 'statusnet'));
+        $m->connect('api/statusnet/version.:format',
+                    array('action' => 'ApiStatusnetVersion',
+                          'format' => '(xml|json)'));
+
+        $m->connect('api/statusnet/config.:format',
+                    array('action' => 'ApiStatusnetConfig',
+                   'format' => '(xml|json)'));
 
         // For older methods, we provide "laconica" base action
 
-        $m->connect('api/laconica/:method',
-                    array('action' => 'api',
-                          'apiaction' => 'statusnet'));
+        $m->connect('api/laconica/version.:format',
+                    array('action' => 'ApiStatusnetVersion',
+                          'format' => '(xml|json)'));
+
+        $m->connect('api/laconica/config.:format',
+                    array('action' => 'ApiStatusnetConfig',
+                    'format' => '(xml|json)'));
 
         // Groups and tags are newer than 0.8.1 so no backward-compatibility
         // necessary

From ada84698f2e82c1c659d872dea0c4545ef93509a Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 8 Oct 2009 15:59:00 -0700
Subject: [PATCH 226/247] New action for test/help API method

---
 actions/apihelptest.php | 96 +++++++++++++++++++++++++++++++++++++++++
 lib/router.php          |  6 +--
 2 files changed, 99 insertions(+), 3 deletions(-)
 create mode 100644 actions/apihelptest.php

diff --git a/actions/apihelptest.php b/actions/apihelptest.php
new file mode 100644
index 0000000000..5f32165cf6
--- /dev/null
+++ b/actions/apihelptest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Test that you can connect to the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/twitterapi.php';
+
+/**
+ * Returns the string "ok" in the requested format with a 200 OK HTTP status code.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiHelpTestAction extends TwitterApiAction
+{
+    var $format = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->format = $this->arg('format');
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($this->format == 'xml') {
+            $this->init_document('xml');
+            $this->element('ok', null, 'true');
+            $this->end_document('xml');
+        } elseif ($this->format == 'json') {
+            $this->init_document('json');
+            print '"ok"';
+            $this->end_document('json');
+        } else {
+            $this->clientError(
+                _('API method not found!'),
+                404,
+                $this->format
+            );
+        }
+    }
+
+}
+
diff --git a/lib/router.php b/lib/router.php
index 3c50fb25ec..cf5c06b26f 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -480,9 +480,9 @@ class Router
 
         // help
 
-        $m->connect('api/help/:method',
-                    array('action' => 'api',
-                          'apiaction' => 'help'));
+        $m->connect('api/help/test.:format',
+                    array('action' => 'ApiHelpTest',
+                          'format' => '(xml|json)'));
 
         // statusnet
 

From 2dc66035ba84368ad2b6fa5147ec23c5b147f18f Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Fri, 9 Oct 2009 11:16:04 +0800
Subject: [PATCH 227/247] Fixed twitter defaulting to disabled

---
 lib/common.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/common.php b/lib/common.php
index 88d77732f4..0b4e031845 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -196,15 +196,14 @@ $config =
         array('enabled' => true),
         'sms' =>
         array('enabled' => true),
-        'twitter' =>
-        array('enabled' => true),
         'twitterbridge' =>
         array('enabled' => false),
         'integration' =>
         array('source' => 'StatusNet', # source attribute for Twitter
               'taguri' => $_server.',2009'), # base for tag URIs
 	'twitter' =>
-	array('consumer_key'    => null,
+	array('enabled'         => true,
+              'consumer_key'    => null,
 	      'consumer_secret' => null),
         'memcached' =>
         array('enabled' => false,

From 11e36b18cc18890a2360e4cba14f5f2895f6eb3b Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Fri, 9 Oct 2009 11:25:31 +0800
Subject: [PATCH 228/247] Fixed facebook connect nav to obey sms/twitter
 disabled

---
 plugins/FBConnect/FBCSettingsNav.php | 42 +++++++++++++++-------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/plugins/FBConnect/FBCSettingsNav.php b/plugins/FBConnect/FBCSettingsNav.php
index 29724d6bdf..ed02371e25 100644
--- a/plugins/FBConnect/FBCSettingsNav.php
+++ b/plugins/FBConnect/FBCSettingsNav.php
@@ -77,32 +77,34 @@ class FBCSettingsNav extends Widget
         $this->action->elementStart('dd');
 
         # action => array('prompt', 'title')
-        $menu =
-          array('imsettings' =>
-                array(_('IM'),
-                      _('Updates by instant messenger (IM)')),
-                'smssettings' =>
-                array(_('SMS'),
-                      _('Updates by SMS')),
-                'twittersettings' =>
-                array(_('Twitter'),
-                      _('Twitter integration options')),
-                'FBConnectSettings' =>
-                array(_('Facebook'),
-                      _('Facebook Connect settings')));
+        $menu = array();
+        if (common_config('xmpp', 'enabled')) {
+            $menu['imsettings'] =
+              array(_('IM'),
+                    _('Updates by instant messenger (IM)'));
+        }
+        if (common_config('sms', 'enabled')) {
+            $menu['smssettings'] =
+              array(_('SMS'),
+                    _('Updates by SMS'));
+        }
+        if (common_config('twitter', 'enabled')) {
+            $menu['twittersettings'] =
+              array(_('Twitter'),
+                    _('Twitter integration options'));
+        }
+        $menu['FBConnectSettings'] =
+          array(_('Facebook'),
+                _('Facebook Connect settings'));
 
         $action_name = $this->action->trimmed('action');
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         foreach ($menu as $menuaction => $menudesc) {
-            if ($menuaction == 'imsettings' &&
-                !common_config('xmpp', 'enabled')) {
-                continue;
-            }
             $this->action->menuItem(common_local_url($menuaction),
-				    $menudesc[0],
-				    $menudesc[1],
-				    $action_name === $menuaction);
+                                    $menudesc[0],
+                                    $menudesc[1],
+                                    $action_name === $menuaction);
         }
 
         $this->action->elementEnd('ul');

From b8f8c41c18ae166a88c4a87f90602ad8e1ed2ede Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Fri, 9 Oct 2009 11:31:55 +0800
Subject: [PATCH 229/247] Fixed facebook connect login nav to obey openid
 settings

---
 plugins/FBConnect/FBCLoginGroupNav.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/plugins/FBConnect/FBCLoginGroupNav.php b/plugins/FBConnect/FBCLoginGroupNav.php
index 6e12c20403..81b2520a4c 100644
--- a/plugins/FBConnect/FBCLoginGroupNav.php
+++ b/plugins/FBConnect/FBCLoginGroupNav.php
@@ -78,16 +78,20 @@ class FBCLoginGroupNav extends Widget
         // action => array('prompt', 'title')
         $menu = array();
 
-        $menu['login'] = array(_('Login'),
-                         _('Login with a username and password'));
+        if (!common_config('site','openidonly')) {
+            $menu['login'] = array(_('Login'),
+                             _('Login with a username and password'));
 
-        if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
-            $menu['register'] = array(_('Register'),
-                                _('Sign up for a new account'));
+            if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
+                $menu['register'] = array(_('Register'),
+                                    _('Sign up for a new account'));
+            }
         }
 
-        $menu['openidlogin'] = array(_('OpenID'),
-                               _('Login or register with OpenID'));
+        if (common_config('openid', 'enabled')) {
+            $menu['openidlogin'] = array(_('OpenID'),
+                                   _('Login or register with OpenID'));
+        }
 
         $menu['FBConnectLogin'] = array(_('Facebook'),
                                _('Login or register using Facebook'));

From d13b0c385dbf6326ecec1c9a9abf9cac0f6ed4b2 Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Fri, 9 Oct 2009 11:50:04 +0800
Subject: [PATCH 230/247] Fixed facebook connect primary nav to obey
 sms/twitter/openid settings

---
 plugins/FBConnect/FBConnectPlugin.php | 32 +++++++++++++++++----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php
index 593b49b4ed..702aee3496 100644
--- a/plugins/FBConnect/FBConnectPlugin.php
+++ b/plugins/FBConnect/FBConnectPlugin.php
@@ -232,6 +232,14 @@ class FBConnectPlugin extends Plugin
     {
 
         $user = common_current_user();
+        $connect = 'FBConnectSettings';
+        if (common_config('xmpp', 'enabled')) {
+            $connect = 'imsettings';
+        } else if (common_config('sms', 'enabled')) {
+            $connect = 'smssettings';
+        } else if (common_config('twitter', 'enabled')) {
+            $connect = 'twittersettings';
+        }
 
         if (!empty($user)) {
 
@@ -266,13 +274,8 @@ class FBConnectPlugin extends Plugin
                 _('Home'), _('Personal profile and friends timeline'), false, 'nav_home');
             $action->menuItem(common_local_url('profilesettings'),
                 _('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
-            if (common_config('xmpp', 'enabled')) {
-                $action->menuItem(common_local_url('imsettings'),
-                    _('Connect'), _('Connect to IM, SMS, Twitter'), false, 'nav_connect');
-            } else {
-             $action->menuItem(common_local_url('smssettings'),
-                 _('Connect'), _('Connect to SMS, Twitter'), false, 'nav_connect');
-            }
+            $action->menuItem(common_local_url($connect),
+                _('Connect'), _('Connect to services'), false, 'nav_connect');
             if (common_config('invite', 'enabled')) {
                 $action->menuItem(common_local_url('invite'),
                     _('Invite'),
@@ -300,12 +303,17 @@ class FBConnectPlugin extends Plugin
              }
          }
          else {
-             if (!common_config('site', 'closed')) {
-                 $action->menuItem(common_local_url('register'),
-                     _('Register'), _('Create an account'), false, 'nav_register');
+             if (!common_config('site', 'openidonly')) {
+                 if (!common_config('site', 'closed')) {
+                     $action->menuItem(common_local_url('register'),
+                         _('Register'), _('Create an account'), false, 'nav_register');
+                 }
+                 $action->menuItem(common_local_url('login'),
+                     _('Login'), _('Login to the site'), false, 'nav_login');
+             } else {
+                 $this->menuItem(common_local_url('openidlogin'),
+                                 _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
              }
-             $action->menuItem(common_local_url('login'),
-                 _('Login'), _('Login to the site'), false, 'nav_login');
          }
 
          $action->menuItem(common_local_url('doc', array('title' => 'help')),

From c597aba342c2d4bd7ee53dc471d6b7deafb62a5e Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Fri, 9 Oct 2009 11:52:03 +0800
Subject: [PATCH 231/247] Fixed facebook connect primary nav to hide search
 option when site is private and user is not logged in

---
 plugins/FBConnect/FBConnectPlugin.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php
index 702aee3496..950718a33c 100644
--- a/plugins/FBConnect/FBConnectPlugin.php
+++ b/plugins/FBConnect/FBConnectPlugin.php
@@ -318,8 +318,10 @@ class FBConnectPlugin extends Plugin
 
          $action->menuItem(common_local_url('doc', array('title' => 'help')),
              _('Help'), _('Help me!'), false, 'nav_help');
-         $action->menuItem(common_local_url('peoplesearch'),
-             _('Search'), _('Search for people or text'), false, 'nav_search');
+         if ($user || !common_config('site', 'private')) {
+             $action->menuItem(common_local_url('peoplesearch'),
+                 _('Search'), _('Search for people or text'), false, 'nav_search');
+         }
 
         return false;
     }

From 88e7092d2326403ab5cb0c7261b665154491e75c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 9 Oct 2009 10:39:56 -0400
Subject: [PATCH 232/247] don't write session if it's unchanged

---
 classes/Session.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/classes/Session.php b/classes/Session.php
index d641edbbe4..79a69a96ea 100644
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -85,9 +85,18 @@ class Session extends Memcached_DataObject
 
             return $session->insert();
         } else {
-            $session->session_data = $session_data;
+            if (strcmp($session->session_data, $session_data) == 0) {
+                self::logdeb("Not writing session '$id'; unchanged");
+                return true;
+            } else {
+                self::logdeb("Session '$id' data changed; updating");
 
-            return $session->update();
+                $orig = clone($session);
+
+                $session->session_data = $session_data;
+
+                return $session->update($orig);
+            }
         }
     }
 

From e9d7f18f0c2ad05c0203bc347a74c0f69e497566 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 9 Oct 2009 14:06:08 -0400
Subject: [PATCH 233/247] fix FBConnect so it doesn't muffle EndPrimaryNav

---
 plugins/FBConnect/FBConnectPlugin.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php
index 593b49b4ed..cb19b05461 100644
--- a/plugins/FBConnect/FBConnectPlugin.php
+++ b/plugins/FBConnect/FBConnectPlugin.php
@@ -313,6 +313,11 @@ class FBConnectPlugin extends Plugin
          $action->menuItem(common_local_url('peoplesearch'),
              _('Search'), _('Search for people or text'), false, 'nav_search');
 
+        // We are replacing the primary nav entirely; give other
+        // plugins a chance to handle it here.
+
+        Event::handle('EndPrimaryNav', array($action));
+
         return false;
     }
 

From 09f4d1ef236c160afe6b9874793e43b501e1120a Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 9 Oct 2009 13:35:54 -0700
Subject: [PATCH 234/247] New actions for blocks via API

---
 actions/apiblockcreate.php  | 121 ++++++++++++++++++++++++++++++++++++
 actions/apiblockdestroy.php | 120 +++++++++++++++++++++++++++++++++++
 actions/twitapiblocks.php   |  74 ----------------------
 actions/twitapihelp.php     |  57 -----------------
 lib/router.php              |  11 +++-
 5 files changed, 249 insertions(+), 134 deletions(-)
 create mode 100644 actions/apiblockcreate.php
 create mode 100644 actions/apiblockdestroy.php
 delete mode 100644 actions/twitapiblocks.php
 delete mode 100644 actions/twitapihelp.php

diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
new file mode 100644
index 0000000000..ff303863ec
--- /dev/null
+++ b/actions/apiblockcreate.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Block a user via the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Blocks the user specified in the ID parameter as the authenticating user. 
+ * Destroys a friendship to the blocked user if it exists. Returns the 
+ * blocked user in the requested format when successful.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiBlockCreateAction extends ApiAuthAction
+{
+    var $format  = null;
+    var $user    = null;
+    var $other   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->user   = $this->auth_user;
+        $this->other  = $this->getTargetUser($this->arg('id'));
+        $this->format = $this->arg('format');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Save the new message
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400,
+                $this->format
+            );
+            return;
+        }
+        
+        if (empty($this->user) || empty($this->other)) {
+            $this->clientError(_('No such user!'), 404, $this->format);
+            return;
+        }
+        
+        if ($this->user->hasBlocked($this->other) 
+            || $this->user->block($this->other)
+        ) {
+            $this->init_document($this->format);
+            $this->show_profile($this->other, $this->format);
+            $this->end_document($this->format);
+        } else {
+            $this->serverError(_('Block user failed.'), 500, $this->format);
+        }
+        
+    }
+
+}
+
diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
new file mode 100644
index 0000000000..0f24be3aaf
--- /dev/null
+++ b/actions/apiblockdestroy.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Un-block a user via the API
+ *
+ * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Un-blocks the user specified in the ID parameter for the authenticating user.
+ * Returns the un-blocked user in the requested format when successful.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiBlockDestroyAction extends ApiAuthAction
+{
+    var $format  = null;
+    var $user    = null;
+    var $other   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            if ($this->checkBasicAuthUser() == false) {
+                return;
+            }
+        }
+
+        $this->user   = $this->auth_user;
+        $this->other  = $this->getTargetUser($this->arg('id'));
+        $this->format = $this->arg('format');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Save the new message
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(
+                _('This method requires a POST.'),
+                400,
+                $this->format
+            );
+            return;
+        }
+
+        if (empty($this->user) || empty($this->other)) {
+            $this->clientError(_('No such user!'), 404, $this->format);
+            return;
+        }
+
+        if (!$this->user->hasBlocked($this->other)
+            || $this->user->unblock($this->other)
+        ) {
+            $this->init_document($this->format);
+            $this->show_profile($this->other, $this->format);
+            $this->end_document($this->format);
+        } else {
+            $this->serverError(_('Unblock user failed.'));
+        }
+
+    }
+
+}
+
diff --git a/actions/twitapiblocks.php b/actions/twitapiblocks.php
deleted file mode 100644
index ed17946aef..0000000000
--- a/actions/twitapiblocks.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, 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/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once(INSTALLDIR.'/lib/twitterapi.php');
-
-class TwitapiblocksAction extends TwitterapiAction
-{
-
-    function create($args, $apidata)
-    {
-
-        parent::handle($args);
-
-        $blockee = $this->get_user($apidata['api_arg'], $apidata);
-
-        if (empty($blockee)) {
-            $this->clientError('Not Found', 404, $apidata['content-type']);
-            return;
-        }
-
-        $user = $apidata['user']; // Always the auth user
-
-        if ($user->hasBlocked($blockee) || $user->block($blockee)) {
-            $type = $apidata['content-type'];
-            $this->init_document($type);
-            $this->show_profile($blockee, $type);
-            $this->end_document($type);
-        } else {
-            $this->serverError(_('Block user failed.'));
-        }
-    }
-
-    function destroy($args, $apidata)
-    {
-        parent::handle($args);
-        $blockee = $this->get_user($apidata['api_arg'], $apidata);
-
-        if (empty($blockee)) {
-            $this->clientError('Not Found', 404, $apidata['content-type']);
-            return;
-        }
-
-        $user = $apidata['user'];
-
-        if (!$user->hasBlocked($blockee) || $user->unblock($blockee)) {
-            $type = $apidata['content-type'];
-            $this->init_document($type);
-            $this->show_profile($blockee, $type);
-            $this->end_document($type);
-        } else {
-            $this->serverError(_('Unblock user failed.'));
-        }
-    }
-}
\ No newline at end of file
diff --git a/actions/twitapihelp.php b/actions/twitapihelp.php
deleted file mode 100644
index 81381620e7..0000000000
--- a/actions/twitapihelp.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, 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/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once(INSTALLDIR.'/lib/twitterapi.php');
-
-class TwitapihelpAction extends TwitterapiAction
-{
-
-    /* Returns the string "ok" in the requested format with a 200 OK HTTP status code.
-     * URL:http://identi.ca/api/help/test.format
-     * Formats: xml, json
-     */
-    function test($args, $apidata)
-    {
-        parent::handle($args);
-
-        if ($apidata['content-type'] == 'xml') {
-            $this->init_document('xml');
-            $this->element('ok', null, 'true');
-            $this->end_document('xml');
-        } elseif ($apidata['content-type'] == 'json') {
-            $this->init_document('json');
-            print '"ok"';
-            $this->end_document('json');
-        } else {
-            $this->clientError(_('API method not found!'), $code=404);
-        }
-
-    }
-
-    function downtime_schedule($args, $apidata)
-    {
-        parent::handle($args);
-        $this->serverError(_('API method under construction.'), $code=501);
-    }
-
-}
\ No newline at end of file
diff --git a/lib/router.php b/lib/router.php
index cf5c06b26f..11f913f6e0 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -474,10 +474,15 @@ class Router
 
         // blocks
 
-        $m->connect('api/blocks/:method/:argument',
-                    array('action' => 'api',
-                          'apiaction' => 'blocks'));
+        $m->connect('api/blocks/create/:id.:format',
+                    array('action' => 'ApiBlockCreate',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json)'));
 
+        $m->connect('api/blocks/destroy/:id.:format',
+                    array('action' => 'ApiBlockDestroy',
+                          'id' => '[a-zA-Z0-9]+',
+                          'format' => '(xml|json)'));
         // help
 
         $m->connect('api/help/test.:format',

From bb08611def2309711f91c1ab6cdab92fb7c069b2 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 9 Oct 2009 14:22:18 -0700
Subject: [PATCH 235/247] Delete action/api.php and rename lib/twitterapi.php
 to lib/api.php

---
 actions/api.php                     | 306 ----------------------------
 actions/apifriendshipsexists.php    |   2 +-
 actions/apigrouplistall.php         |   2 +-
 actions/apigroupmembership.php      |   2 +-
 actions/apigroupshow.php            |   2 +-
 actions/apihelptest.php             |   2 +-
 actions/apistatusesshow.php         |   4 +-
 actions/apistatusnetconfig.php      |   2 +-
 actions/apistatusnetversion.php     |   2 +-
 actions/apitimelinegroup.php        |   4 +-
 actions/apitimelinepublic.php       |   4 +-
 actions/apitimelinetag.php          |   4 +-
 actions/apiusershow.php             |   2 +-
 actions/twitapinotifications.php    |  40 ----
 actions/twitapisearchatom.php       |   6 +-
 actions/twitapisearchjson.php       |   6 +-
 actions/twitapitrends.php           |   6 +-
 lib/{twitterapi.php => api.php}     |  32 ++-
 lib/apiauth.php                     |   4 +-
 plugins/Realtime/RealtimePlugin.php |   2 +-
 20 files changed, 54 insertions(+), 380 deletions(-)
 delete mode 100644 actions/api.php
 delete mode 100644 actions/twitapinotifications.php
 rename lib/{twitterapi.php => api.php} (98%)

diff --git a/actions/api.php b/actions/api.php
deleted file mode 100644
index 1bc90de110..0000000000
--- a/actions/api.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-/**
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, 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/>.
- *
- * @category Actions
- * @package  Actions
- * @author   Evan Prodromou <evan@status.net>
- * @author   Brenda Wallace <shiny@cpan.org>
- * @author   Jeffery To <jeffery.to@gmail.com>
- * @author   Robin Millette <millette@controlyourself.ca>
- * @author   Tom Adams <tom@holizz.com>
- * @author   Christopher Vollick <psycotica0@gmail.com>
- * @author   CiaranG <ciaran@ciarang.com>
- * @author   Craig Andrews <candrews@integralblue.com>
- * @author   Gina Haeussge <osd@foosel.net>
- * @author   Mike Cochrane <mikec@mikenz.geek.nz>
- * @author   Sarven Capadisli <csarven@status.net>
- * @license  GNU Affero General Public License http://www.gnu.org/licenses/
- * @link     http://status.net
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-class ApiAction extends Action
-{
-
-    var $user;
-    var $content_type;
-    var $api_arg;
-    var $api_method;
-    var $api_action;
-    var $auth_user;
-    var $auth_pw;
-
-    function handle($args)
-    {
-        parent::handle($args);
-
-        $this->api_action = $this->arg('apiaction');
-        $method = $this->arg('method');
-        $argument = $this->arg('argument');
-        $this->basic_auth_process_header();
-
-        if (isset($argument)) {
-            $cmdext = explode('.', $argument);
-            $this->api_arg =  $cmdext[0];
-            $this->api_method = $method;
-            $this->content_type = strtolower($cmdext[1]);
-        } else {
-
-            //Requested format / content-type will be an extension on the method
-            $cmdext = explode('.', $method);
-            $this->api_method = $cmdext[0];
-            $this->content_type = strtolower($cmdext[1]);
-        }
-
-        if ($this->requires_auth()) {
-            if (!isset($this->auth_user)) {
-
-                //This header makes basic auth go
-                header('WWW-Authenticate: Basic realm="StatusNet API"');
-
-                //If the user hits cancel -- bam!
-                $this->show_basic_auth_error();
-            } else {
-                $nickname = $this->auth_user;
-                $password = $this->auth_pw;
-                $user = common_check_user($nickname, $password);
-
-                if ($user) {
-                    $this->user = $user;
-                    $this->process_command();
-                } else {
-                    //basic authentication failed
-                    list($proxy, $ip) = common_client_ip();
-
-                    common_log(LOG_WARNING, "Failed API auth attempt, nickname = $nickname, proxy = $proxy, ip = $ip.");
-                    $this->show_basic_auth_error();
-                }
-            }
-        } else {
-
-            // Caller might give us a username even if not required
-            if (isset($this->auth_user)) {
-                $user = User::staticGet('nickname', $this->auth_user);
-                if ($user) {
-                    $this->user = $user;
-                }
-                //Twitter doesn't throw an error if the user isn't found
-            }
-
-            $this->process_command();
-        }
-    }
-
-    function process_command()
-    {
-        $action = "twitapi$this->api_action";
-        $actionfile = INSTALLDIR."/actions/$action.php";
-
-        if (file_exists($actionfile)) {
-            include_once $actionfile;
-            $action_class = ucfirst($action)."Action";
-            $action_obj = new $action_class();
-
-            if (!$action_obj->prepare($this->args)) {
-                return;
-            }
-
-            if (method_exists($action_obj, $this->api_method)) {
-                $apidata = array(    'content-type' => $this->content_type,
-                                    'api_method' => $this->api_method,
-                                    'api_arg' => $this->api_arg,
-                                    'user' => $this->user);
-
-                call_user_func(array($action_obj, $this->api_method), $_REQUEST, $apidata);
-            } else {
-                $this->clientError("API method not found!", $code = 404);
-            }
-        } else {
-            $this->clientError("API method not found!", $code = 404);
-        }
-    }
-
-    // Whitelist of API methods that don't need authentication
-    function requires_auth()
-    {
-        static $noauth = array( 'statuses/public_timeline',
-                                'statuses/show',
-                                'users/show',
-                                'help/test',
-                                'help/downtime_schedule',
-                                'statusnet/version',
-                                'statusnet/config',
-                                'statusnet/wadl',
-                                'tags/timeline',
-                                'oembed/oembed',
-                                'groups/show',
-                                'groups/timeline',
-                                'groups/list_all',
-                                'groups/membership',
-                                'groups/is_member',
-                                'groups/timeline');
-
-        static $bareauth = array('statuses/user_timeline',
-                                 'statuses/friends_timeline',
-				 'statuses/home_timeline',
-                                 'statuses/friends',
-                                 'statuses/replies',
-                                 'statuses/mentions',
-                                 'statuses/followers',
-                                 'favorites/favorites',
-                                 'friendships/show',
-                                 'groups/list_groups');
-
-        $fullname = "$this->api_action/$this->api_method";
-
-        // If the site is "private", all API methods except statusnet/config
-        // need authentication
-
-        if (common_config('site', 'private')) {
-            return $fullname != 'statusnet/config' || false;
-        }
-
-        // bareauth: only needs auth if without an argument or query param specifying user
-
-        if (in_array($fullname, $bareauth)) {
-
-            // Special case: friendships/show only needs auth if source_id or
-            // source_screen_name is not specified as a param
-
-            if ($fullname == 'friendships/show') {
-
-                $source_id          = $this->arg('source_id');
-                $source_screen_name = $this->arg('source_screen_name');
-
-                if (empty($source_id) && empty($source_screen_name)) {
-                    return true;
-                }
-
-                return false;
-            }
-
-            // if all of these are empty, auth is required
-
-            $id          = $this->arg('id');
-            $user_id     = $this->arg('user_id');
-            $screen_name = $this->arg('screen_name');
-
-            if (empty($this->api_arg)
-                && empty($id)
-                && empty($user_id)
-                && empty($screen_name)
-            ) {
-                return true;
-            } else {
-                return false;
-            }
-
-        } else if (in_array($fullname, $noauth)) {
-
-            // noauth: never needs auth
-
-            return false;
-        } else {
-
-            // everybody else needs auth
-
-            return true;
-        }
-    }
-
-    function basic_auth_process_header()
-    {
-        if (isset($_SERVER['AUTHORIZATION']) || isset($_SERVER['HTTP_AUTHORIZATION'])) {
-            $authorization_header = isset($_SERVER['HTTP_AUTHORIZATION'])? $_SERVER['HTTP_AUTHORIZATION'] : $_SERVER['AUTHORIZATION'];
-        }
-
-        if (isset($_SERVER['PHP_AUTH_USER'])) {
-            $this->auth_user = $_SERVER['PHP_AUTH_USER'];
-            $this->auth_pw = $_SERVER['PHP_AUTH_PW'];
-        } elseif (isset($authorization_header) && strstr(substr($authorization_header, 0, 5), 'Basic')) {
-            // decode the HTTP_AUTHORIZATION header on php-cgi server self
-            // on fcgid server the header name is AUTHORIZATION
-
-            $auth_hash = base64_decode(substr($authorization_header, 6));
-            list($this->auth_user, $this->auth_pw) = explode(':', $auth_hash);
-
-            // set all to null on a empty basic auth request
-            if ($this->auth_user == "") {
-                $this->auth_user = null;
-                $this->auth_pw = null;
-            }
-        } else {
-            $this->auth_user = null;
-            $this->auth_pw = null;
-        }
-    }
-
-    function show_basic_auth_error()
-    {
-        header('HTTP/1.1 401 Unauthorized');
-        $msg = 'Could not authenticate you.';
-
-        if ($this->content_type == 'xml') {
-            header('Content-Type: application/xml; charset=utf-8');
-            $this->startXML();
-            $this->elementStart('hash');
-            $this->element('error', null, $msg);
-            $this->element('request', null, $_SERVER['REQUEST_URI']);
-            $this->elementEnd('hash');
-            $this->endXML();
-        } else if ($this->content_type == 'json') {
-            header('Content-Type: application/json; charset=utf-8');
-            $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
-            print(json_encode($error_array));
-        } else {
-            header('Content-type: text/plain');
-            print "$msg\n";
-        }
-    }
-
-    function isReadOnly($args)
-    {
-        $apiaction = $args['apiaction'];
-        $method = $args['method'];
-
-        list($cmdtext, $fmt) = explode('.', $method);
-
-        static $write_methods = array(
-            'account' => array('update_location', 'update_delivery_device', 'end_session'),
-            'blocks' => array('create', 'destroy'),
-            'direct_messages' => array('create', 'destroy'),
-            'favorites' => array('create', 'destroy'),
-            'friendships' => array('create', 'destroy'),
-            'help' => array(),
-            'notifications' => array('follow', 'leave'),
-            'statuses' => array('update', 'destroy'),
-            'users' => array()
-        );
-
-        if (array_key_exists($apiaction, $write_methods)) {
-            if (!in_array($cmdtext, $write_methods[$apiaction])) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php
index 3d6e7448de..d1d5d520fc 100644
--- a/actions/apifriendshipsexists.php
+++ b/actions/apifriendshipsexists.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR.'/lib/api.php';
 
 /**
  * Tests for the existence of friendship between two users. Will return true if 
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index b1964d8005..80dcad9dcd 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/twitterapi.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * Returns of the lastest 20 groups for the site
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index 0cd3ed2906..872ee45eee 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/twitterapi.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * List 20 newest members of the group specified by name or ID. 
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index 733c9ccfe6..a38d50afe7 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR.'/lib/api.php';
 
 /**
  * Outputs detailed information about the group specified by ID
diff --git a/actions/apihelptest.php b/actions/apihelptest.php
index 5f32165cf6..2cec464627 100644
--- a/actions/apihelptest.php
+++ b/actions/apihelptest.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/twitterapi.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * Returns the string "ok" in the requested format with a 200 OK HTTP status code.
diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 55eea2356d..9e28fe2ab6 100644
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR.'/lib/api.php';
 
 /**
  * Returns the notice specified by id as a Twitter-style status and inline user
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @link     http://status.net/
  */
 
-class ApiStatusesShowAction extends TwitterapiAction
+class ApiStatusesShowAction extends ApiAction
 {
 
     var $notice_id = null;
diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
index 94bd5b4b3f..6847a48fe1 100644
--- a/actions/apistatusnetconfig.php
+++ b/actions/apistatusnetconfig.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/twitterapi.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * Gives a full dump of configuration variables for this instance
diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php
index 471297ad55..e6f35e7d29 100644
--- a/actions/apistatusnetversion.php
+++ b/actions/apistatusnetversion.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/twitterapi.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * Returns a version number for this version of StatusNet, which
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 11f73eeedb..9d6ac6ad18 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/twitterapi.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * Returns the most recent notices (default 20) posted to the group specified by ID
@@ -43,7 +43,7 @@ require_once INSTALLDIR . '/lib/twitterapi.php';
  * @link     http://status.net/
  */
 
-class ApiTimelineGroupAction extends TwitterapiAction
+class ApiTimelineGroupAction extends ApiAction
 {
 
     var $group   = null;
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 10bde6f37d..2638dd2926 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR.'/lib/api.php';
 
 /**
  * Returns the most recent notices (default 20) posted by everybody
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @link     http://status.net/
  */
 
-class ApiTimelinePublicAction extends TwitterapiAction
+class ApiTimelinePublicAction extends ApiAction
 {
 
     var $notices = null;
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 2a23bb72a2..0efe8d2449 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR.'/lib/api.php';
 
 /**
  * Returns the 20 most recent notices tagged by a given tag
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @link     http://status.net/
  */
 
-class ApiTimelineTagAction extends TwitterapiAction
+class ApiTimelineTagAction extends ApiAction
 {
 
     var $notices = null;
diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index 2e2ceab41b..afcbd3618d 100644
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR.'/lib/api.php';
 
 /**
  * Ouputs information for a user, specified by ID or screen name.
diff --git a/actions/twitapinotifications.php b/actions/twitapinotifications.php
deleted file mode 100644
index 0653e69ab5..0000000000
--- a/actions/twitapinotifications.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, 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/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-require_once(INSTALLDIR.'/lib/twitterapi.php');
-
-# This naming convention looks real sick
-class TwitapinotificationsAction extends TwitterapiAction
-{
-
-    function follow($args, $apidata)
-    {
-        parent::handle($args);
-        $this->serverError(_('API method under construction.'), $code=501);
-    }
-
-    function leave($args, $apidata)
-    {
-        parent::handle($args);
-        $this->serverError(_('API method under construction.'), $code=501);
-    }
-
-}
\ No newline at end of file
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 2f587d604f..0ef9d28260 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR.'/lib/api.php';
 
 /**
  * Action for outputting search results in Twitter compatible Atom
@@ -46,10 +46,10 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
- * @see      TwitterapiAction
+ * @see      ApiAction
  */
 
-class TwitapisearchatomAction extends TwitterapiAction
+class TwitapisearchatomAction extends ApiAction
 {
 
     var $cnt;
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index c628ee624a..5abff6496e 100644
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR.'/lib/api.php';
 require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
 
 /**
@@ -42,10 +42,10 @@ require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
- * @see      TwitterapiAction
+ * @see      ApiAction
  */
 
-class TwitapisearchjsonAction extends TwitterapiAction
+class TwitapisearchjsonAction extends ApiAction
 {
     var $query;
     var $lang;
diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
index 83ab28f35d..779405e6d6 100644
--- a/actions/twitapitrends.php
+++ b/actions/twitapitrends.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR.'/lib/api.php';
 
 /**
  *  Returns the top ten queries that are currently trending
@@ -42,10 +42,10 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
- * @see      TwitterapiAction
+ * @see      ApiAction
  */
 
-class TwitapitrendsAction extends TwitterapiAction
+class TwitapitrendsAction extends ApiAction
 {
 
     var $callback;
diff --git a/lib/twitterapi.php b/lib/api.php
similarity index 98%
rename from lib/twitterapi.php
rename to lib/api.php
index e5904cc858..93b4a75138 100644
--- a/lib/twitterapi.php
+++ b/lib/api.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+/**
+ * StatusNet, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Base API action
+ *
+ * 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.
@@ -15,13 +18,30 @@
  *
  * 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  API
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
-class TwitterapiAction extends Action
+/**
+ * Contains most of the Twitter-compatible API output functions.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiAction extends Action
 {
 
     /**
diff --git a/lib/apiauth.php b/lib/apiauth.php
index f0b4b6bf7f..d7f8017eb1 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/twitterapi.php';
+require_once INSTALLDIR.'/lib/api.php';
 
 /**
  * Actions extending this class will require auth
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @link     http://status.net/
  */
 
-class ApiAuthAction extends TwitterapiAction
+class ApiAuthAction extends ApiAction
 {
 
     var $auth_user = null;
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 1819279686..31e75221be 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -242,7 +242,7 @@ class RealtimePlugin extends Plugin
         // 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');
+        require_once(INSTALLDIR.'/lib/api.php');
 
         $act = new TwitterApiAction('/dev/null');
 

From f746993c2bfb674d397cf095a2ab2ff7e757818b Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 9 Oct 2009 14:42:01 -0700
Subject: [PATCH 236/247] $format is used by every API action. Set it in the
 base class.

---
 actions/apiaccountratelimitstatus.php   | 3 ---
 actions/apiaccountverifycredentials.php | 3 ---
 actions/apiblockcreate.php              | 2 --
 actions/apiblockdestroy.php             | 2 --
 actions/apidirectmessage.php            | 3 ---
 actions/apidirectmessagenew.php         | 3 ---
 actions/apifavoritecreate.php           | 3 ---
 actions/apifavoritedestroy.php          | 3 +--
 actions/apifriendshipscreate.php        | 3 ---
 actions/apifriendshipsdestroy.php       | 3 ---
 actions/apifriendshipsexists.php        | 4 ----
 actions/apifriendshipsshow.php          | 4 ----
 actions/apigroupshow.php                | 2 --
 actions/apihelptest.php                 | 2 --
 actions/apistatusnetconfig.php          | 3 ---
 actions/apistatusnetversion.php         | 3 ---
 actions/apiusershow.php                 | 4 ----
 lib/api.php                             | 2 ++
 18 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php
index 3c6c3e714d..9eba5c55db 100644
--- a/actions/apiaccountratelimitstatus.php
+++ b/actions/apiaccountratelimitstatus.php
@@ -46,8 +46,6 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
 
 class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
 {
-    var $format = null;
-
     /**
      * Take arguments for running
      *
@@ -67,7 +65,6 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
             }
         }
 
-        $this->format = $this->arg('format');
         return true;
     }
 
diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php
index b9c9bf0f72..0d4928f6ce 100644
--- a/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@ -47,8 +47,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiAccountVerifyCredentialsAction extends ApiAuthAction
 {
-    var $format                = null;
-
     /**
      * Take arguments for running
      *
@@ -68,7 +66,6 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction
             }
         }
 
-        $this->format = $this->arg('format');
         return true;
     }
 
diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
index ff303863ec..6421712713 100644
--- a/actions/apiblockcreate.php
+++ b/actions/apiblockcreate.php
@@ -47,7 +47,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiBlockCreateAction extends ApiAuthAction
 {
-    var $format  = null;
     var $user    = null;
     var $other   = null;
 
@@ -72,7 +71,6 @@ class ApiBlockCreateAction extends ApiAuthAction
 
         $this->user   = $this->auth_user;
         $this->other  = $this->getTargetUser($this->arg('id'));
-        $this->format = $this->arg('format');
 
         return true;
     }
diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
index 0f24be3aaf..109e66ac41 100644
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.php
@@ -46,7 +46,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiBlockDestroyAction extends ApiAuthAction
 {
-    var $format  = null;
     var $user    = null;
     var $other   = null;
 
@@ -71,7 +70,6 @@ class ApiBlockDestroyAction extends ApiAuthAction
 
         $this->user   = $this->auth_user;
         $this->other  = $this->getTargetUser($this->arg('id'));
-        $this->format = $this->arg('format');
 
         return true;
     }
diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index 87ae44d7a5..fa68833117 100644
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiDirectMessageAction extends ApiAuthAction
 {
-    var $format       = null;
     var $messages     = null;
     var $page         = null;
     var $count        = null;
@@ -122,8 +121,6 @@ class ApiDirectMessageAction extends ApiAuthAction
             $this->id = "tag:$taguribase:DirectMessages:" . $this->user->id;
         }
 
-        $this->format = $this->arg('format');
-
         $this->messages = $this->getMessages();
 
         return true;
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index d836409ae0..b531d7c5c7 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -46,7 +46,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiDirectMessageNewAction extends ApiAuthAction
 {
-    var $format  = null;
     var $source  = null;
     var $user    = null;
     var $other   = null;
@@ -97,8 +96,6 @@ class ApiDirectMessageNewAction extends ApiAuthAction
             $this->other = $this->getTargetUser($user_param);
         }
 
-        $this->format = $this->arg('format');
-
         return true;
     }
 
diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php
index e45603c6a2..6ee6960ba5 100644
--- a/actions/apifavoritecreate.php
+++ b/actions/apifavoritecreate.php
@@ -46,8 +46,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiFavoriteCreateAction extends ApiAuthAction
 {
-
-    var $format = null;
     var $user   = null;
     var $notice = null;
 
@@ -70,7 +68,6 @@ class ApiFavoriteCreateAction extends ApiAuthAction
             }
         }
 
-        $this->format = $this->arg('format');
         $this->user   = $this->auth_user;
         $this->notice = Notice::staticGet($this->arg('id'));
 
diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php
index a70d5c79b1..36946fbfbe 100644
--- a/actions/apifavoritedestroy.php
+++ b/actions/apifavoritedestroy.php
@@ -47,9 +47,9 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 class ApiFavoriteDestroyAction extends ApiAuthAction
 {
 
-    var $format = null;
     var $user   = null;
     var $notice = null;
+
     /**
      * Take arguments for running
      *
@@ -69,7 +69,6 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
             }
         }
 
-        $this->format = $this->arg('format');
         $this->user   = $this->auth_user;
         $this->notice = Notice::staticGet($this->arg('id'));
 
diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index 969fc12820..27bdbe0623 100644
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.php
@@ -47,8 +47,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiFriendshipsCreateAction extends ApiAuthAction
 {
-
-    var $format = null;
     var $user   = null;
     var $other  = null;
 
@@ -71,7 +69,6 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
             }
         }
 
-        $this->format = $this->arg('format');
         $this->user   = $this->auth_user;
         $this->other  = $this->getTargetUser($id);
 
diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
index ef864c4db8..3ad12156dd 100644
--- a/actions/apifriendshipsdestroy.php
+++ b/actions/apifriendshipsdestroy.php
@@ -47,8 +47,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiFriendshipsDestroyAction extends ApiAuthAction
 {
-
-    var $format = null;
     var $user   = null;
     var $other  = null;
 
@@ -71,7 +69,6 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
             }
         }
 
-        $this->format = $this->arg('format');
         $this->user   = $this->auth_user;
         $this->other  = $this->getTargetUser($id);
 
diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php
index d1d5d520fc..1ebfc9e8fd 100644
--- a/actions/apifriendshipsexists.php
+++ b/actions/apifriendshipsexists.php
@@ -46,8 +46,6 @@ require_once INSTALLDIR.'/lib/api.php';
 
 class ApiFriendshipsExistsAction extends TwitterApiAction
 {
-
-    var $format = null;
     var $user_a = null;
     var $user_b = null;
 
@@ -64,8 +62,6 @@ class ApiFriendshipsExistsAction extends TwitterApiAction
     {
         parent::prepare($args);
 
-        $this->format = $this->arg('format');
-
         $user_a_id = $this->trimmed('user_a');
         $user_b_id = $this->trimmed('user_b');
 
diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php
index d35825a433..2f975b121b 100644
--- a/actions/apifriendshipsshow.php
+++ b/actions/apifriendshipsshow.php
@@ -45,8 +45,6 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
 
 class ApiFriendshipsShowAction extends ApiBareAuthAction
 {
-
-    var $format = null;
     var $user   = null;
     var $source = null;
     var $target = null;
@@ -70,8 +68,6 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
             }
         }
 
-        $this->format = $this->arg('format');
-
         $source_id          = (int)$this->trimmed('source_id');
         $source_screen_name = $this->trimmed('source_screen_name');
         $target_id          = (int)$this->trimmed('target_id');
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index a38d50afe7..cdaf707aa9 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR.'/lib/api.php';
 
 class ApiGroupShowAction extends TwitterApiAction
 {
-    var $format = null;
     var $group = null;
 
     /**
@@ -61,7 +60,6 @@ class ApiGroupShowAction extends TwitterApiAction
     {
         parent::prepare($args);
 
-        $this->format = $this->arg('format');
         $this->group = $this->getTargetGroup($this->arg('id'));
 
         return true;
diff --git a/actions/apihelptest.php b/actions/apihelptest.php
index 2cec464627..ac1bb1a5b3 100644
--- a/actions/apihelptest.php
+++ b/actions/apihelptest.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/api.php';
 
 class ApiHelpTestAction extends TwitterApiAction
 {
-    var $format = null;
 
     /**
      * Take arguments for running
@@ -59,7 +58,6 @@ class ApiHelpTestAction extends TwitterApiAction
     function prepare($args)
     {
         parent::prepare($args);
-        $this->format = $this->arg('format');
         return true;
     }
 
diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
index 6847a48fe1..6fb65331f4 100644
--- a/actions/apistatusnetconfig.php
+++ b/actions/apistatusnetconfig.php
@@ -49,8 +49,6 @@ require_once INSTALLDIR . '/lib/api.php';
 
 class ApiStatusnetConfigAction extends TwitterApiAction
 {
-    var $format = null;
-
     var $keys = array(
         'site' => array('name', 'server', 'theme', 'path', 'fancy', 'language',
                         'email', 'broughtby', 'broughtbyurl', 'closed',
@@ -73,7 +71,6 @@ class ApiStatusnetConfigAction extends TwitterApiAction
     function prepare($args)
     {
         parent::prepare($args);
-        $this->format = $this->arg('format');
         return true;
     }
 
diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php
index e6f35e7d29..2cd99edb7a 100644
--- a/actions/apistatusnetversion.php
+++ b/actions/apistatusnetversion.php
@@ -48,8 +48,6 @@ require_once INSTALLDIR . '/lib/api.php';
 
 class ApiStatusnetVersionAction extends TwitterApiAction
 {
-    var $format = null;
-
     /**
      * Take arguments for running
      *
@@ -62,7 +60,6 @@ class ApiStatusnetVersionAction extends TwitterApiAction
     function prepare($args)
     {
         parent::prepare($args);
-        $this->format = $this->arg('format');
         return true;
     }
 
diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index afcbd3618d..1cd0cdfd5f 100644
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -46,8 +46,6 @@ require_once INSTALLDIR.'/lib/api.php';
 
 class ApiUserShowAction extends TwitterApiAction
 {
-
-    var $format = null;
     var $user   = null;
 
     /**
@@ -63,8 +61,6 @@ class ApiUserShowAction extends TwitterApiAction
     {
         parent::prepare($args);
 
-        $this->format = $this->arg('format');
-
         $email = $this->arg('email');
 
         // XXX: email field deprecated in Twitter's API
diff --git a/lib/api.php b/lib/api.php
index 93b4a75138..fb51d5260e 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -43,6 +43,7 @@ if (!defined('STATUSNET')) {
 
 class ApiAction extends Action
 {
+     var $format = null;
 
     /**
      * Initialization.
@@ -55,6 +56,7 @@ class ApiAction extends Action
     function prepare($args)
     {
         parent::prepare($args);
+        $this->format   = $this->arg('format');
         return true;
     }
 

From 743c844084bae75db02570d76694f4e9b79a9aa9 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 9 Oct 2009 16:57:22 -0700
Subject: [PATCH 237/247] Move all basic auth output and processing to base
 classes

---
 actions/apiaccountratelimitstatus.php   | 21 ---------------------
 actions/apiaccountverifycredentials.php | 21 ---------------------
 actions/apiblockcreate.php              |  6 ------
 actions/apiblockdestroy.php             |  6 ------
 actions/apidirectmessage.php            |  6 ------
 actions/apidirectmessagenew.php         |  6 ------
 actions/apifavoritecreate.php           |  6 ------
 actions/apifavoritedestroy.php          |  6 ------
 actions/apifriendshipscreate.php        |  6 ------
 actions/apifriendshipsdestroy.php       |  6 ------
 actions/apifriendshipsshow.php          |  6 ------
 actions/apigroupismember.php            |  6 ------
 actions/apigroupjoin.php                |  6 ------
 actions/apigroupleave.php               |  6 ------
 actions/apigrouplist.php                |  6 ------
 actions/apistatusesdestroy.php          |  6 ------
 actions/apistatusesupdate.php           |  6 ------
 actions/apisubscriptions.php            |  6 ------
 actions/apitimelinefavorites.php        |  6 ------
 actions/apitimelinefriends.php          |  6 ------
 actions/apitimelinementions.php         |  6 ------
 actions/apitimelineuser.php             |  6 ------
 lib/apiauth.php                         | 24 ++++++++++++++++++++++--
 lib/apibareauth.php                     | 16 ++++++++++++++++
 24 files changed, 38 insertions(+), 164 deletions(-)

diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php
index 9eba5c55db..b823e1cd2b 100644
--- a/actions/apiaccountratelimitstatus.php
+++ b/actions/apiaccountratelimitstatus.php
@@ -46,27 +46,6 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
 
 class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
 {
-    /**
-     * Take arguments for running
-     *
-     * @param array $args $_REQUEST args
-     *
-     * @return boolean success flag
-     *
-     */
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return false;
-            }
-        }
-
-        return true;
-    }
 
     /**
      * Handle the request
diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php
index 0d4928f6ce..104b9867fd 100644
--- a/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@ -47,27 +47,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiAccountVerifyCredentialsAction extends ApiAuthAction
 {
-    /**
-     * Take arguments for running
-     *
-     * @param array $args $_REQUEST args
-     *
-     * @return boolean success flag
-     *
-     */
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return false;
-            }
-        }
-
-        return true;
-    }
 
     /**
      * Handle the request
diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
index 6421712713..6dd28dd5ef 100644
--- a/actions/apiblockcreate.php
+++ b/actions/apiblockcreate.php
@@ -63,12 +63,6 @@ class ApiBlockCreateAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user   = $this->auth_user;
         $this->other  = $this->getTargetUser($this->arg('id'));
 
diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
index 109e66ac41..a869dfe466 100644
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.php
@@ -62,12 +62,6 @@ class ApiBlockDestroyAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user   = $this->auth_user;
         $this->other  = $this->getTargetUser($this->arg('id'));
 
diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index fa68833117..cede4c0721 100644
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -70,12 +70,6 @@ class ApiDirectMessageAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user = $this->auth_user;
 
         if (empty($this->user)) {
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index b531d7c5c7..6984c8d103 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -64,12 +64,6 @@ class ApiDirectMessageNewAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user = $this->auth_user;
 
         if (empty($this->user)) {
diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php
index 6ee6960ba5..db001561ec 100644
--- a/actions/apifavoritecreate.php
+++ b/actions/apifavoritecreate.php
@@ -62,12 +62,6 @@ class ApiFavoriteCreateAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user   = $this->auth_user;
         $this->notice = Notice::staticGet($this->arg('id'));
 
diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php
index 36946fbfbe..3640459f99 100644
--- a/actions/apifavoritedestroy.php
+++ b/actions/apifavoritedestroy.php
@@ -63,12 +63,6 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user   = $this->auth_user;
         $this->notice = Notice::staticGet($this->arg('id'));
 
diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index 27bdbe0623..85eaf3a296 100644
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.php
@@ -63,12 +63,6 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user   = $this->auth_user;
         $this->other  = $this->getTargetUser($id);
 
diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
index 3ad12156dd..2743780519 100644
--- a/actions/apifriendshipsdestroy.php
+++ b/actions/apifriendshipsdestroy.php
@@ -63,12 +63,6 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user   = $this->auth_user;
         $this->other  = $this->getTargetUser($id);
 
diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php
index 2f975b121b..0ae6a7b82b 100644
--- a/actions/apifriendshipsshow.php
+++ b/actions/apifriendshipsshow.php
@@ -62,12 +62,6 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $source_id          = (int)$this->trimmed('source_id');
         $source_screen_name = $this->trimmed('source_screen_name');
         $target_id          = (int)$this->trimmed('target_id');
diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index facc58174e..02079b6ffe 100644
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -62,12 +62,6 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user   = $this->getTargetUser(null);
         $this->group  = $this->getTargetGroup(null);
         $this->format = $this->arg('format');
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index c00d594631..7ab1b72723 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -62,12 +62,6 @@ class ApiGroupJoinAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user  = $this->auth_user;
         $this->group = $this->getTargetGroup($this->arg('id'));
 
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 568b04b7cf..86b56f5af0 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -62,12 +62,6 @@ class ApiGroupLeaveAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user  = $this->auth_user;
         $this->group = $this->getTargetGroup($this->arg('id'));
 
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 84b7fc1c8c..69c347de12 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -67,12 +67,6 @@ class ApiGroupListAction extends ApiBareAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->page     = (int)$this->arg('page', 1);
         $this->count    = (int)$this->arg('count', 20);
         $this->max_id   = (int)$this->arg('max_id', 0);
diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php
index ae0f4c4532..16a7cc376e 100644
--- a/actions/apistatusesdestroy.php
+++ b/actions/apistatusesdestroy.php
@@ -63,12 +63,6 @@ class ApiStatusesDestroyAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return false;
-            }
-        }
-
         $this->user = $this->auth_user;
         $this->notice_id = (int)$this->trimmed('id');
 
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index fb12785593..ab33d8a3e9 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -67,12 +67,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return false;
-            }
-        }
-
         $this->user = $this->auth_user;
 
         if (empty($this->user)) {
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index 78dcd722dd..bdaa0ea39a 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -84,12 +84,6 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
         $this->count    = isset($this->ids_only) ?
             5000 : (int)$this->arg('count', 100);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return false;
-            }
-        }
-
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 9ccee5cfac..35a996c9cb 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -69,12 +69,6 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->page     = (int)$this->arg('page', 1);
         $this->count    = (int)$this->arg('count', 20);
         $this->max_id   = (int)$this->arg('max_id', 0);
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 65bbb5a74a..92a8852936 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -75,12 +75,6 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
         $this->since    = $this->arg('since');
         $this->format   = $this->arg('format');
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index 93c6da3073..ecead98cce 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -68,12 +68,6 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
         $this->since_id = (int)$this->arg('since_id', 0);
         $this->since    = $this->arg('since');
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index c4d02bc622..d50648d7c9 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -70,12 +70,6 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         $this->since_id = (int)$this->arg('since_id', 0);
         $this->since    = $this->arg('since');
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
diff --git a/lib/apiauth.php b/lib/apiauth.php
index d7f8017eb1..9fc0e57124 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -48,6 +48,26 @@ class ApiAuthAction extends ApiAction
 
     var $auth_user = null;
 
+    /**
+     * Take arguments for running, and output basic auth header if needed
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($this->requiresAuth()) {
+            $this->checkBasicAuthUser();
+        }
+
+        return true;
+    }
+
     /**
      * Does this API resource require authentication?
      *
@@ -76,7 +96,7 @@ class ApiAuthAction extends ApiAction
             // show error if the user clicks 'cancel'
 
             $this->showBasicAuthError();
-            return false;
+            exit;
 
         } else {
             $nickname = $this->auth_user;
@@ -94,7 +114,7 @@ class ApiAuthAction extends ApiAction
                     "$nickname, proxy = $proxy, ip = $ip."
                 );
                 $this->showBasicAuthError();
-                return false;
+                exit;
             }
         }
         return true;
diff --git a/lib/apibareauth.php b/lib/apibareauth.php
index a99d450ecc..0ae477f468 100644
--- a/lib/apibareauth.php
+++ b/lib/apibareauth.php
@@ -48,6 +48,22 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiBareAuthAction extends ApiAuthAction
 {
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        return true;
+    }
+
     /**
      * Does this API resource require authentication?
      *

From 931e19073d522a41a54b5e9a77b213a10da95476 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 9 Oct 2009 17:01:37 -0700
Subject: [PATCH 238/247] Remove dead code

---
 lib/api.php | 63 -----------------------------------------------------
 1 file changed, 63 deletions(-)

diff --git a/lib/api.php b/lib/api.php
index fb51d5260e..3afb20612d 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -308,23 +308,6 @@ class ApiAction extends Action
             $entry['enclosures'] = $enclosures;
         }
 
-/*
-        // Enclosure
-        $attachments = $notice->attachments();
-        if($attachments){
-            $entry['enclosures']=array();
-            foreach($attachments as $attachment){
-                if ($attachment->isEnclosure()) {
-                    $enclosure=array();
-                    $enclosure['url']=$attachment->url;
-                    $enclosure['mimetype']=$attachment->mimetype;
-                    $enclosure['size']=$attachment->size;
-                    $entry['enclosures'][]=$enclosure;
-                }
-            }
-        }
-*/
-
         // Tags/Categories
         $tag = new Notice_tag();
         $tag->notice_id = $notice->id;
@@ -1100,38 +1083,6 @@ class ApiAction extends Action
         return;
     }
 
-    function get_user($id, $apidata=null)
-    {
-        if (empty($id)) {
-
-            // Twitter supports these other ways of passing the user ID
-            if (is_numeric($this->arg('id'))) {
-                return User::staticGet($this->arg('id'));
-            } else if ($this->arg('id')) {
-                $nickname = common_canonical_nickname($this->arg('id'));
-                return User::staticGet('nickname', $nickname);
-            } else if ($this->arg('user_id')) {
-                // This is to ensure that a non-numeric user_id still
-                // overrides screen_name even if it doesn't get used
-                if (is_numeric($this->arg('user_id'))) {
-                    return User::staticGet('id', $this->arg('user_id'));
-                }
-            } else if ($this->arg('screen_name')) {
-                $nickname = common_canonical_nickname($this->arg('screen_name'));
-                return User::staticGet('nickname', $nickname);
-            } else {
-                // Fall back to trying the currently authenticated user
-                return $apidata['user'];
-            }
-
-        } else if (is_numeric($id)) {
-            return User::staticGet($id);
-        } else {
-            $nickname = common_canonical_nickname($id);
-            return User::staticGet('nickname', $nickname);
-        }
-    }
-
     function getTargetUser($id)
     {
         if (empty($id)) {
@@ -1191,20 +1142,6 @@ class ApiAction extends Action
         }
     }
 
-    function get_profile($id)
-    {
-        if (is_numeric($id)) {
-            return Profile::staticGet($id);
-        } else {
-            $user = User::staticGet('nickname', $id);
-            if ($user) {
-                return $user->getProfile();
-            } else {
-                return null;
-            }
-        }
-    }
-
     function source_link($source)
     {
         $source_name = _($source);

From 559918826a714c1ee2ecdc49dcfc2b67451a9864 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 9 Oct 2009 17:11:40 -0700
Subject: [PATCH 239/247] Remove more redundant $formats

---
 actions/apigroupismember.php     | 2 --
 actions/apigroupjoin.php         | 3 ---
 actions/apigroupleave.php        | 3 ---
 actions/apigrouplist.php         | 2 --
 actions/apigrouplistall.php      | 2 --
 actions/apigroupmembership.php   | 2 --
 actions/apistatusesdestroy.php   | 2 --
 actions/apistatusesshow.php      | 2 --
 actions/apistatusesupdate.php    | 3 ---
 actions/apisubscriptions.php     | 2 --
 actions/apitimelinefavorites.php | 2 --
 actions/apitimelinefriends.php   | 2 --
 actions/apitimelinegroup.php     | 1 -
 actions/apitimelinementions.php  | 4 ++--
 actions/apitimelinepublic.php    | 2 +-
 actions/apitimelinetag.php       | 1 -
 actions/apitimelineuser.php      | 4 ++--
 lib/apiauth.php                  | 4 ++--
 18 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index 02079b6ffe..359b7ca4fa 100644
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/apibareauth.php';
 
 class ApiGroupIsMemberAction extends ApiBareAuthAction
 {
-    var $format  = null;
     var $user    = null;
     var $group   = null;
 
@@ -64,7 +63,6 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
 
         $this->user   = $this->getTargetUser(null);
         $this->group  = $this->getTargetGroup(null);
-        $this->format = $this->arg('format');
 
         return true;
     }
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 7ab1b72723..e51842bcb6 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiGroupJoinAction extends ApiAuthAction
 {
-    var $format  = null;
     var $user    = null;
     var $group   = null;
 
@@ -65,8 +64,6 @@ class ApiGroupJoinAction extends ApiAuthAction
         $this->user  = $this->auth_user;
         $this->group = $this->getTargetGroup($this->arg('id'));
 
-        $this->format = $this->arg('format');
-
         return true;
     }
 
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 86b56f5af0..332bd7b7b2 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiGroupLeaveAction extends ApiAuthAction
 {
-    var $format  = null;
     var $user    = null;
     var $group   = null;
 
@@ -65,8 +64,6 @@ class ApiGroupLeaveAction extends ApiAuthAction
         $this->user  = $this->auth_user;
         $this->group = $this->getTargetGroup($this->arg('id'));
 
-        $this->format = $this->arg('format');
-
         return true;
     }
 
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 69c347de12..00ceeed760 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/apibareauth.php';
 
 class ApiGroupListAction extends ApiBareAuthAction
 {
-    var $format   = null;
     var $user     = null;
     var $page     = null;
     var $count    = null;
@@ -74,7 +73,6 @@ class ApiGroupListAction extends ApiBareAuthAction
         $this->since    = $this->arg('since');
         
         $this->user   = $this->getTargetUser($id);
-        $this->format = $this->arg('format');
         $this->groups = $this->getGroups();
 
         return true;
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index 80dcad9dcd..a0f04ed760 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/api.php';
 
 class ApiGroupListAllAction extends TwitterApiAction
 {
-    var $format   = null;
     var $page     = null;
     var $count    = null;
     var $max_id   = null;
@@ -73,7 +72,6 @@ class ApiGroupListAllAction extends TwitterApiAction
         $this->since    = $this->arg('since');
 
         $this->user   = $this->getTargetUser($id);
-        $this->format = $this->arg('format');
         $this->groups = $this->getGroups();
 
         return true;
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index 872ee45eee..da510ff26b 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR . '/lib/api.php';
 
 class ApiGroupMembershipAction extends TwitterApiAction
 {
-    var $format   = null;
     var $page     = null;
     var $count    = null;
     var $max_id   = null;
@@ -73,7 +72,6 @@ class ApiGroupMembershipAction extends TwitterApiAction
         $this->since_id = (int)$this->arg('since_id', 0);
         $this->since    = $this->arg('since');
 
-        $this->format = $this->arg('format');
         $this->group  = $this->getTargetGroup($this->arg('id'));
 
         $this->profiles = $this->getProfiles();
diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php
index 16a7cc376e..7680f96dcf 100644
--- a/actions/apistatusesdestroy.php
+++ b/actions/apistatusesdestroy.php
@@ -48,7 +48,6 @@ class ApiStatusesDestroyAction extends ApiAuthAction
 
     var $user                  = null;
     var $status                = null;
-    var $format                = null;
 
     /**
      * Take arguments for running
@@ -70,7 +69,6 @@ class ApiStatusesDestroyAction extends ApiAuthAction
             $this->notice_id = (int)$this->arg('id');
         }
 
-        $this->format = $this->arg('format');
         $this->notice = Notice::staticGet((int)$this->notice_id);
 
         return true;
diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 9e28fe2ab6..0096cfe6b9 100644
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -48,7 +48,6 @@ class ApiStatusesShowAction extends ApiAction
 
     var $notice_id = null;
     var $notice    = null;
-    var $format    = null;
 
     /**
      * Take arguments for running
@@ -74,7 +73,6 @@ class ApiStatusesShowAction extends ApiAction
             $this->notice_id = (int)$this->arg('id');
         }
 
-        $this->format = $this->arg('format');
         $this->notice = Notice::staticGet((int)$this->notice_id);
 
         return true;
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index ab33d8a3e9..7d6a574ef0 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -50,7 +50,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction
     var $source                = null;
     var $status                = null;
     var $in_reply_to_status_id = null;
-    var $format                = null;
 
     static $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
 
@@ -92,8 +91,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction
             $this->source = 'api';
         }
 
-        $this->format = $this->arg('format');
-
         $this->in_reply_to_status_id
             = intval($this->trimmed('in_reply_to_status_id'));
 
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index bdaa0ea39a..9dbddbd9bd 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -52,7 +52,6 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
     var $count    = null;
     var $user     = null;
     var $profiles = null;
-    var $format   = null;
     var $tag      = null;
     var $lite     = null;
     var $ids_only = null;
@@ -72,7 +71,6 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
 
         $this->page     = (int)$this->arg('page', 1);
         $this->tag      = $this->arg('tag');
-        $this->format   = $this->arg('format');
 
         // Note: Twitter no longer supports 'lite'
         $this->lite     = $this->arg('lite');
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 35a996c9cb..231f2ae49c 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -49,7 +49,6 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
 
     var $user     = null;
     var $notices  = null;
-    var $format   = null;
     var $page     = null;
     var $count    = null;
     var $max_id   = null;
@@ -74,7 +73,6 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
         $this->max_id   = (int)$this->arg('max_id', 0);
         $this->since_id = (int)$this->arg('since_id', 0);
         $this->since    = $this->arg('since');
-        $this->format   = $this->arg('format');
 
         $this->user = $this->getTargetUser($this->arg('id'));
 
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 92a8852936..02e3525695 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -53,7 +53,6 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
     var $max_id   = null;
     var $since_id = null;
     var $since    = null;
-    var $format   = null;
 
     /**
      * Take arguments for running
@@ -73,7 +72,6 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
         $this->max_id   = (int)$this->arg('max_id', 0);
         $this->since_id = (int)$this->arg('since_id', 0);
         $this->since    = $this->arg('since');
-        $this->format   = $this->arg('format');
 
         $this->user = $this->getTargetUser($this->arg('id'));
 
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 9d6ac6ad18..abe7f0c5d8 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -70,7 +70,6 @@ class ApiTimelineGroupAction extends ApiAction
 
         $this->group = $this->getTargetGroup($this->arg('id'));
 
-        $this->format  = $this->arg('format');
         $this->notices = $this->getNotices();
 
         return true;
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index ecead98cce..7549b4722d 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -71,7 +71,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->arg('format'));
+            $this->clientError(_('No such user!'), 404, $this->format);
             return;
         }
 
@@ -122,7 +122,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
             $sitename, $this->user->nickname, $profile->getBestName()
         );
 
-        switch($this->arg('format')) {
+        switch($this->format) {
         case 'xml':
             $this->show_xml_timeline($this->notices);
             break;
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 2638dd2926..a635ddc91e 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -103,7 +103,7 @@ class ApiTimelinePublicAction extends ApiAction
         $link       = common_root_url();
         $subtitle   = sprintf(_("%s updates from everyone!"), $sitename);
 
-        switch($this->arg('format')) {
+        switch($this->format) {
         case 'xml':
             $this->show_xml_timeline($this->notices);
             break;
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 0efe8d2449..8211b01226 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -64,7 +64,6 @@ class ApiTimelineTagAction extends ApiAction
         $this->page     = (int)$this->arg('page', 1);
         $this->count    = (int)$this->arg('count', 20);
         $this->tag      = $this->arg('tag');
-        $this->format   = $this->arg('format');
 
         $this->notices = $this->getNotices();
 
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index d50648d7c9..81e23116b7 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -73,7 +73,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->arg('format'));
+            $this->clientError(_('No such user!'), 404, $this->format);
             return;
         }
 
@@ -127,7 +127,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         $suplink = common_local_url('sup', null, null, $this->user->id);
         header('X-SUP-ID: ' . $suplink);
 
-        switch($this->arg('format')) {
+        switch($this->format) {
         case 'xml':
             $this->show_xml_timeline($this->notices);
             break;
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 9fc0e57124..25bbae24e5 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -172,7 +172,7 @@ class ApiAuthAction extends ApiAction
         header('HTTP/1.1 401 Unauthorized');
         $msg = 'Could not authenticate you.';
 
-        if ($this->arg('format') == 'xml') {
+        if ($this->format == 'xml') {
             header('Content-Type: application/xml; charset=utf-8');
             $this->startXML();
             $this->elementStart('hash');
@@ -180,7 +180,7 @@ class ApiAuthAction extends ApiAction
             $this->element('request', null, $_SERVER['REQUEST_URI']);
             $this->elementEnd('hash');
             $this->endXML();
-        } elseif ($this->arg('format') == 'json') {
+        } elseif ($this->format == 'json') {
             header('Content-Type: application/json; charset=utf-8');
             $error_array = array('error' => $msg,
                                  'request' => $_SERVER['REQUEST_URI']);

From 57dfad64beae100187dcaf3c205645e89611e115 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 9 Oct 2009 17:21:22 -0700
Subject: [PATCH 240/247] Missed some of the references to the old
 TwitterApiAction - removed

---
 actions/apiaccountverifycredentials.php | 5 +++--
 actions/apifriendshipsexists.php        | 2 +-
 actions/apigrouplistall.php             | 2 +-
 actions/apigroupmembership.php          | 2 +-
 actions/apigroupshow.php                | 2 +-
 actions/apihelptest.php                 | 2 +-
 actions/apistatusnetconfig.php          | 2 +-
 actions/apistatusnetversion.php         | 2 +-
 actions/apiusershow.php                 | 2 +-
 plugins/Realtime/RealtimePlugin.php     | 4 ++--
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php
index 104b9867fd..8b976bbf3d 100644
--- a/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@ -67,8 +67,9 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction
         case 'json':
             $args['id'] = $this->auth_user->id;
             $action_obj = new ApiUserShowAction();
-            $action_obj->prepare($args);
-            $action_obj->handle($args);
+            if ($action_obj->prepare($args)) {
+                $action_obj->handle($args);
+            }
             break;
         default:
             header('Content-Type: text/html; charset=utf-8');
diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php
index 1ebfc9e8fd..df9f0c949c 100644
--- a/actions/apifriendshipsexists.php
+++ b/actions/apifriendshipsexists.php
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiFriendshipsExistsAction extends TwitterApiAction
+class ApiFriendshipsExistsAction extends ApiAction
 {
     var $user_a = null;
     var $user_b = null;
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index a0f04ed760..070927b1ea 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiGroupListAllAction extends TwitterApiAction
+class ApiGroupListAllAction extends ApiAction
 {
     var $page     = null;
     var $count    = null;
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index da510ff26b..0e9510d713 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiGroupMembershipAction extends TwitterApiAction
+class ApiGroupMembershipAction extends ApiAction
 {
     var $page     = null;
     var $count    = null;
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index cdaf707aa9..262fe67184 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiGroupShowAction extends TwitterApiAction
+class ApiGroupShowAction extends ApiAction
 {
     var $group = null;
 
diff --git a/actions/apihelptest.php b/actions/apihelptest.php
index ac1bb1a5b3..cd5b86cf93 100644
--- a/actions/apihelptest.php
+++ b/actions/apihelptest.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiHelpTestAction extends TwitterApiAction
+class ApiHelpTestAction extends ApiAction
 {
 
     /**
diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
index 6fb65331f4..356942a859 100644
--- a/actions/apistatusnetconfig.php
+++ b/actions/apistatusnetconfig.php
@@ -47,7 +47,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiStatusnetConfigAction extends TwitterApiAction
+class ApiStatusnetConfigAction extends ApiAction
 {
     var $keys = array(
         'site' => array('name', 'server', 'theme', 'path', 'fancy', 'language',
diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php
index 2cd99edb7a..fb632fd93b 100644
--- a/actions/apistatusnetversion.php
+++ b/actions/apistatusnetversion.php
@@ -46,7 +46,7 @@ require_once INSTALLDIR . '/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiStatusnetVersionAction extends TwitterApiAction
+class ApiStatusnetVersionAction extends ApiAction
 {
     /**
      * Take arguments for running
diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index 1cd0cdfd5f..442efc1943 100644
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/api.php';
  * @link     http://status.net/
  */
 
-class ApiUserShowAction extends TwitterApiAction
+class ApiUserShowAction extends ApiAction
 {
     var $user   = null;
 
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 31e75221be..9a750bbc8d 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -240,11 +240,11 @@ class RealtimePlugin extends Plugin
         // 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!
+        // the ApiAction method. Don't do this unless you're me!
 
         require_once(INSTALLDIR.'/lib/api.php');
 
-        $act = new TwitterApiAction('/dev/null');
+        $act = new ApiAction('/dev/null');
 
         $arr = $act->twitter_status_array($notice, true);
         $arr['url'] = $notice->bestUrl();

From b08d16ef2bf5995ca2feee2d2688e0080eaf5124 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 9 Oct 2009 17:32:53 -0700
Subject: [PATCH 241/247] These same params are used in most API actions; moved
 to base API class

---
 actions/apidirectmessage.php     | 11 -----------
 actions/apigrouplist.php         | 12 ------------
 actions/apigrouplistall.php      | 11 -----------
 actions/apigroupmembership.php   | 14 +-------------
 actions/apisubscriptions.php     |  5 -----
 actions/apitimelinefavorites.php | 13 -------------
 actions/apitimelinefriends.php   | 12 ------------
 actions/apitimelinegroup.php     |  9 +--------
 actions/apitimelinementions.php  |  6 ------
 actions/apitimelinepublic.php    |  6 ------
 actions/apitimelinetag.php       |  5 +----
 actions/apitimelineuser.php      |  6 ------
 lib/api.php                      | 17 +++++++++++++++--
 13 files changed, 18 insertions(+), 109 deletions(-)

diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index cede4c0721..f0013c54c5 100644
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -46,11 +46,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 class ApiDirectMessageAction extends ApiAuthAction
 {
     var $messages     = null;
-    var $page         = null;
-    var $count        = null;
-    var $max_id       = null;
-    var $since_id     = null;
-    var $since        = null;
     var $title        = null;
     var $subtitle     = null;
     var $link         = null;
@@ -77,12 +72,6 @@ class ApiDirectMessageAction extends ApiAuthAction
             return;
         }
 
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->max_id   = (int)$this->arg('max_id', 0);
-        $this->since_id = (int)$this->arg('since_id', 0);
-        $this->since    = $this->arg('since');
-
         $server   = common_root_url();
         $taguribase = common_config('integration', 'taguri');
 
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 00ceeed760..7a5aab72eb 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -45,12 +45,6 @@ require_once INSTALLDIR . '/lib/apibareauth.php';
 
 class ApiGroupListAction extends ApiBareAuthAction
 {
-    var $user     = null;
-    var $page     = null;
-    var $count    = null;
-    var $max_id   = null;
-    var $since_id = null;
-    var $since    = null;
     var $groups   = null;
 
     /**
@@ -65,12 +59,6 @@ class ApiGroupListAction extends ApiBareAuthAction
     function prepare($args)
     {
         parent::prepare($args);
-
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->max_id   = (int)$this->arg('max_id', 0);
-        $this->since_id = (int)$this->arg('since_id', 0);
-        $this->since    = $this->arg('since');
         
         $this->user   = $this->getTargetUser($id);
         $this->groups = $this->getGroups();
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index 070927b1ea..3e236816ab 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -45,11 +45,6 @@ require_once INSTALLDIR . '/lib/api.php';
 
 class ApiGroupListAllAction extends ApiAction
 {
-    var $page     = null;
-    var $count    = null;
-    var $max_id   = null;
-    var $since_id = null;
-    var $since    = null;
     var $groups   = null;
 
     /**
@@ -65,12 +60,6 @@ class ApiGroupListAllAction extends ApiAction
     {
         parent::prepare($args);
 
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->max_id   = (int)$this->arg('max_id', 0);
-        $this->since_id = (int)$this->arg('since_id', 0);
-        $this->since    = $this->arg('since');
-
         $this->user   = $this->getTargetUser($id);
         $this->groups = $this->getGroups();
 
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index 0e9510d713..0bc846d604 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -45,11 +45,6 @@ require_once INSTALLDIR . '/lib/api.php';
 
 class ApiGroupMembershipAction extends ApiAction
 {
-    var $page     = null;
-    var $count    = null;
-    var $max_id   = null;
-    var $since_id = null;
-    var $since    = null;
     var $group    = null;
     var $profiles = null;
 
@@ -66,14 +61,7 @@ class ApiGroupMembershipAction extends ApiAction
     {
         parent::prepare($args);
 
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->max_id   = (int)$this->arg('max_id', 0);
-        $this->since_id = (int)$this->arg('since_id', 0);
-        $this->since    = $this->arg('since');
-
-        $this->group  = $this->getTargetGroup($this->arg('id'));
-
+        $this->group    = $this->getTargetGroup($this->arg('id'));
         $this->profiles = $this->getProfiles();
 
         return true;
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index 9dbddbd9bd..1332fd71c6 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -47,10 +47,6 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
 
 class ApiSubscriptionsAction extends ApiBareAuthAction
 {
-
-    var $page     = null;
-    var $count    = null;
-    var $user     = null;
     var $profiles = null;
     var $tag      = null;
     var $lite     = null;
@@ -69,7 +65,6 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
     {
         parent::prepare($args);
 
-        $this->page     = (int)$this->arg('page', 1);
         $this->tag      = $this->arg('tag');
 
         // Note: Twitter no longer supports 'lite'
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 231f2ae49c..d35e051835 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -46,14 +46,7 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
 
 class ApiTimelineFavoritesAction extends ApiBareAuthAction
 {
-
-    var $user     = null;
     var $notices  = null;
-    var $page     = null;
-    var $count    = null;
-    var $max_id   = null;
-    var $since_id = null;
-    var $since    = null;
 
     /**
      * Take arguments for running
@@ -68,12 +61,6 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
     {
         parent::prepare($args);
 
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->max_id   = (int)$this->arg('max_id', 0);
-        $this->since_id = (int)$this->arg('since_id', 0);
-        $this->since    = $this->arg('since');
-
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 02e3525695..544824078e 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -46,13 +46,7 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
 
 class ApiTimelineFriendsAction extends ApiBareAuthAction
 {
-
-    var $user     = null;
     var $notices  = null;
-    var $count    = null;
-    var $max_id   = null;
-    var $since_id = null;
-    var $since    = null;
 
     /**
      * Take arguments for running
@@ -67,12 +61,6 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
     {
         parent::prepare($args);
 
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->max_id   = (int)$this->arg('max_id', 0);
-        $this->since_id = (int)$this->arg('since_id', 0);
-        $this->since    = $this->arg('since');
-
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index abe7f0c5d8..6f2043fb65 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -62,14 +62,7 @@ class ApiTimelineGroupAction extends ApiAction
     {
         parent::prepare($args);
 
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->max_id   = (int)$this->arg('max_id', 0);
-        $this->since_id = (int)$this->arg('since_id', 0);
-        $this->since    = $this->arg('since');
-
-        $this->group = $this->getTargetGroup($this->arg('id'));
-
+        $this->group   = $this->getTargetGroup($this->arg('id'));
         $this->notices = $this->getNotices();
 
         return true;
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index 7549b4722d..60669d9ba3 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -62,12 +62,6 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
     {
         parent::prepare($args);
 
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->max_id   = (int)$this->arg('max_id', 0);
-        $this->since_id = (int)$this->arg('since_id', 0);
-        $this->since    = $this->arg('since');
-
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index a635ddc91e..b992136d1f 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -61,12 +61,6 @@ class ApiTimelinePublicAction extends ApiAction
     {
         parent::prepare($args);
 
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->max_id   = (int)$this->arg('max_id', 0);
-        $this->since_id = (int)$this->arg('since_id', 0);
-        $this->since    = $this->arg('since');
-
         $this->notices = $this->getNotices();
 
         return true;
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 8211b01226..53e79e4b9e 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -61,10 +61,7 @@ class ApiTimelineTagAction extends ApiAction
     {
         parent::prepare($args);
 
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->tag      = $this->arg('tag');
-
+        $this->tag     = $this->arg('tag');
         $this->notices = $this->getNotices();
 
         return true;
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 81e23116b7..652a1b0d95 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -64,12 +64,6 @@ class ApiTimelineUserAction extends ApiBareAuthAction
     {
         parent::prepare($args);
 
-        $this->page     = (int)$this->arg('page', 1);
-        $this->count    = (int)$this->arg('count', 20);
-        $this->max_id   = (int)$this->arg('max_id', 0);
-        $this->since_id = (int)$this->arg('since_id', 0);
-        $this->since    = $this->arg('since');
-
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
diff --git a/lib/api.php b/lib/api.php
index 3afb20612d..95a0779add 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -43,8 +43,14 @@ if (!defined('STATUSNET')) {
 
 class ApiAction extends Action
 {
-     var $format = null;
-
+     var $format   = null;
+     var $user     = null;
+     var $page     = null;
+     var $count    = null;
+     var $max_id   = null;
+     var $since_id = null;
+     var $since    = null;
+     
     /**
      * Initialization.
      *
@@ -56,7 +62,14 @@ class ApiAction extends Action
     function prepare($args)
     {
         parent::prepare($args);
+        
         $this->format   = $this->arg('format');
+        $this->page     = (int)$this->arg('page', 1);
+        $this->count    = (int)$this->arg('count', 20);
+        $this->max_id   = (int)$this->arg('max_id', 0);
+        $this->since_id = (int)$this->arg('since_id', 0);
+        $this->since    = $this->arg('since');
+        
         return true;
     }
 

From 061af8fa06ccb98f667d1ee670da2dbb179d8b0e Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 9 Oct 2009 17:53:35 -0700
Subject: [PATCH 242/247] CamelCase all function names in the API code

---
 actions/apiaccountratelimitstatus.php |   4 +-
 actions/apiblockcreate.php            |   6 +-
 actions/apiblockdestroy.php           |   6 +-
 actions/apidirectmessage.php          |  20 +-
 actions/apifavoritecreate.php         |   2 +-
 actions/apifavoritedestroy.php        |   2 +-
 actions/apifriendshipscreate.php      |   6 +-
 actions/apifriendshipsdestroy.php     |   6 +-
 actions/apifriendshipsexists.php      |   8 +-
 actions/apifriendshipsshow.php        |  12 +-
 actions/apigroupismember.php          |  10 +-
 actions/apigroupjoin.php              |   2 +-
 actions/apigroupleave.php             |   2 +-
 actions/apigrouplist.php              |   8 +-
 actions/apigrouplistall.php           |   8 +-
 actions/apigroupmembership.php        |   4 +-
 actions/apigroupshow.php              |   2 +-
 actions/apihelptest.php               |   8 +-
 actions/apistatusesdestroy.php        |   4 +-
 actions/apistatusesshow.php           |   2 +-
 actions/apistatusesupdate.php         |   2 +-
 actions/apistatusnetconfig.php        |  10 +-
 actions/apistatusnetversion.php       |   8 +-
 actions/apisubscriptions.php          |   8 +-
 actions/apitimelinefavorites.php      |   8 +-
 actions/apitimelinefriends.php        |   8 +-
 actions/apitimelinegroup.php          |   8 +-
 actions/apitimelinementions.php       |   8 +-
 actions/apitimelinepublic.php         |   8 +-
 actions/apitimelinetag.php            |   8 +-
 actions/apitimelineuser.php           |   8 +-
 actions/apiusershow.php               |  14 +-
 actions/twitapisearchatom.php         |   2 +-
 actions/twitapisearchjson.php         |   4 +-
 lib/api.php                           | 295 ++++++++++++--------------
 lib/twitter.php                       |   4 +-
 plugins/Realtime/RealtimePlugin.php   |   2 +-
 37 files changed, 255 insertions(+), 272 deletions(-)

diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php
index b823e1cd2b..af86dae6a9 100644
--- a/actions/apiaccountratelimitstatus.php
+++ b/actions/apiaccountratelimitstatus.php
@@ -73,7 +73,7 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
         $reset   = new DateTime();
         $reset->modify('+1 hour');
 
-        $this->init_document($this->format);
+        $this->initDocument($this->format);
 
          if ($this->format == 'xml') {
              $this->elementStart('hash');
@@ -101,7 +101,7 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
              print json_encode($out);
          }
 
-         $this->end_document($this->format);
+         $this->endDocument($this->format);
     }
 
 }
diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
index 6dd28dd5ef..e003e5ee96 100644
--- a/actions/apiblockcreate.php
+++ b/actions/apiblockcreate.php
@@ -100,9 +100,9 @@ class ApiBlockCreateAction extends ApiAuthAction
         if ($this->user->hasBlocked($this->other) 
             || $this->user->block($this->other)
         ) {
-            $this->init_document($this->format);
-            $this->show_profile($this->other, $this->format);
-            $this->end_document($this->format);
+            $this->initDocument($this->format);
+            $this->showProfile($this->other, $this->format);
+            $this->endDocument($this->format);
         } else {
             $this->serverError(_('Block user failed.'), 500, $this->format);
         }
diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
index a869dfe466..470b60ea53 100644
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.php
@@ -99,9 +99,9 @@ class ApiBlockDestroyAction extends ApiAuthAction
         if (!$this->user->hasBlocked($this->other)
             || $this->user->unblock($this->other)
         ) {
-            $this->init_document($this->format);
-            $this->show_profile($this->other, $this->format);
-            $this->end_document($this->format);
+            $this->initDocument($this->format);
+            $this->showProfile($this->other, $this->format);
+            $this->endDocument($this->format);
         } else {
             $this->serverError(_('Unblock user failed.'));
         }
diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index f0013c54c5..4e55886d95 100644
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -230,7 +230,7 @@ class ApiDirectMessageAction extends ApiAuthAction
 
     function showXmlDirectMessages()
     {
-        $this->init_document('xml');
+        $this->initDocument('xml');
         $this->elementStart('direct-messages', array('type' => 'array'));
 
         foreach ($this->messages as $m) {
@@ -239,7 +239,7 @@ class ApiDirectMessageAction extends ApiAuthAction
         }
 
         $this->elementEnd('direct-messages');
-        $this->end_document('xml');
+        $this->endDocument('xml');
     }
 
     /**
@@ -250,7 +250,7 @@ class ApiDirectMessageAction extends ApiAuthAction
 
     function showJsonDirectMessages()
     {
-        $this->init_document('json');
+        $this->initDocument('json');
 
         $dmsgs = array();
 
@@ -259,8 +259,8 @@ class ApiDirectMessageAction extends ApiAuthAction
             array_push($dmsgs, $dm_array);
         }
 
-        $this->show_json_objects($dmsgs);
-        $this->end_document('json');
+        $this->showJsonObjects($dmsgs);
+        $this->endDocument('json');
     }
 
     /**
@@ -271,7 +271,7 @@ class ApiDirectMessageAction extends ApiAuthAction
 
     function showRssDirectMessages()
     {
-        $this->init_document('rss');
+        $this->initDocument('rss');
 
         $this->element('title', null, $this->title);
 
@@ -292,10 +292,10 @@ class ApiDirectMessageAction extends ApiAuthAction
 
         foreach ($this->messages as $m) {
             $entry = $this->rssDirectMessageArray($m);
-            $this->show_twitter_rss_item($entry);
+            $this->showTwitterRssItem($entry);
         }
 
-        $this->end_twitter_rss();
+        $this->endTwitterRss();
     }
 
     /**
@@ -306,7 +306,7 @@ class ApiDirectMessageAction extends ApiAuthAction
 
     function showAtomDirectMessages()
     {
-        $this->init_document('atom');
+        $this->initDocument('atom');
 
         $this->element('title', null, $this->title);
         $this->element('id', null, $this->id);
@@ -334,7 +334,7 @@ class ApiDirectMessageAction extends ApiAuthAction
             $this->showTwitterAtomEntry($entry);
         }
 
-        $this->end_document('atom');
+        $this->endDocument('atom');
     }
 
     /**
diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php
index db001561ec..1b05eb95c9 100644
--- a/actions/apifavoritecreate.php
+++ b/actions/apifavoritecreate.php
@@ -135,7 +135,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction
         $this->user->blowFavesCache();
 
         if ($this->format == 'xml') {
-            $this->show_single_xml_status($this->notice);
+            $this->showSingleXmlStatus($this->notice);
         } elseif ($this->format == 'json') {
             $this->show_single_json_status($this->notice);
         }
diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php
index 3640459f99..aac866d7e9 100644
--- a/actions/apifavoritedestroy.php
+++ b/actions/apifavoritedestroy.php
@@ -138,7 +138,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
         $this->user->blowFavesCache();
 
         if ($this->format == 'xml') {
-            $this->show_single_xml_status($this->notice);
+            $this->showSingleXmlStatus($this->notice);
         } elseif ($this->format == 'json') {
             $this->show_single_json_status($this->notice);
         }
diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index 85eaf3a296..6c44d79610 100644
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.php
@@ -126,9 +126,9 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
             return;
         }
 
-        $this->init_document($this->format);
-        $this->show_profile($this->other, $this->format);
-        $this->end_document($this->format);
+        $this->initDocument($this->format);
+        $this->showProfile($this->other, $this->format);
+        $this->endDocument($this->format);
     }
 
 }
diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
index 2743780519..a15f202aa8 100644
--- a/actions/apifriendshipsdestroy.php
+++ b/actions/apifriendshipsdestroy.php
@@ -128,9 +128,9 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
             return;
         }
 
-        $this->init_document($this->format);
-        $this->show_profile($this->other, $this->format);
-        $this->end_document($this->format);
+        $this->initDocument($this->format);
+        $this->showProfile($this->other, $this->format);
+        $this->endDocument($this->format);
     }
 
 }
diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php
index df9f0c949c..93be5f84ea 100644
--- a/actions/apifriendshipsexists.php
+++ b/actions/apifriendshipsexists.php
@@ -107,14 +107,14 @@ class ApiFriendshipsExistsAction extends ApiAction
 
         switch ($this->format) {
         case 'xml':
-            $this->init_document('xml');
+            $this->initDocument('xml');
             $this->element('friends', null, $result);
-            $this->end_document('xml');
+            $this->endDocument('xml');
             break;
         case 'json':
-            $this->init_document('json');
+            $this->initDocument('json');
             print json_encode($result);
-            $this->end_document('json');
+            $this->endDocument('json');
             break;
         default:
             break;
diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php
index 0ae6a7b82b..8850496c79 100644
--- a/actions/apifriendshipsshow.php
+++ b/actions/apifriendshipsshow.php
@@ -143,18 +143,18 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
             return;
         }
         
-        $result = $this->twitter_relationship_array($this->source, $this->target);
+        $result = $this->twitterRelationshipArray($this->source, $this->target);
 
         switch ($this->format) {
         case 'xml':
-            $this->init_document('xml');
-            $this->show_twitter_xml_relationship($result[relationship]);
-            $this->end_document('xml');
+            $this->initDocument('xml');
+            $this->showTwitterXmlRelationship($result[relationship]);
+            $this->endDocument('xml');
             break;
         case 'json':
-            $this->init_document('json');
+            $this->initDocument('json');
             print json_encode($result);
-            $this->end_document('json');
+            $this->endDocument('json');
             break;
         default:
             break;
diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index 359b7ca4fa..6cf3270129 100644
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -95,14 +95,14 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
 
         switch($this->format) {
         case 'xml':
-            $this->init_document('xml');
+            $this->initDocument('xml');
             $this->element('is_member', null, $is_member);
-            $this->end_document('xml');
+            $this->endDocument('xml');
             break;
         case 'json':
-            $this->init_document('json');
-            $this->show_json_objects(array('is_member' => $is_member));
-            $this->end_document('json');
+            $this->initDocument('json');
+            $this->showJsonObjects(array('is_member' => $is_member));
+            $this->endDocument('json');
             break;
         default:
             $this->clientError(
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index e51842bcb6..f930aa5190 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -143,7 +143,7 @@ class ApiGroupJoinAction extends ApiAuthAction
             $this->show_single_xml_group($this->group);
             break;
         case 'json':
-            $this->show_single_json_group($this->group);
+            $this->showSingleJsonGroup($this->group);
             break;
         default:
             $this->clientError(
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 332bd7b7b2..4e3192ac08 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -129,7 +129,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
             $this->show_single_xml_group($this->group);
             break;
         case 'json':
-            $this->show_single_json_group($this->group);
+            $this->showSingleJsonGroup($this->group);
             break;
         default:
             $this->clientError(
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 7a5aab72eb..1fc31831a0 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -101,15 +101,15 @@ class ApiGroupListAction extends ApiBareAuthAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_xml_groups($this->groups);
+            $this->showXmlGroups($this->groups);
             break;
         case 'rss':
-            $this->show_rss_groups($this->groups, $title, $link, $subtitle);
+            $this->showRssGroups($this->groups, $title, $link, $subtitle);
             break;
         case 'atom':
             $selfuri = common_root_url() . 'api/statusnet/groups/list/' .
                 $this->user->id . '.atom';
-            $this->show_atom_groups(
+            $this->showAtomGroups(
                 $this->groups,
                 $title,
                 $id,
@@ -119,7 +119,7 @@ class ApiGroupListAction extends ApiBareAuthAction
             );
             break;
         case 'json':
-            $this->show_json_groups($this->groups);
+            $this->showJsonGroups($this->groups);
             break;
         default:
             $this->clientError(
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index 3e236816ab..ef96a08bdd 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -89,15 +89,15 @@ class ApiGroupListAllAction extends ApiAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_xml_groups($this->groups);
+            $this->showXmlGroups($this->groups);
             break;
         case 'rss':
-            $this->show_rss_groups($this->groups, $title, $link, $subtitle);
+            $this->showRssGroups($this->groups, $title, $link, $subtitle);
             break;
         case 'atom':
             $selfuri = common_root_url() .
                 'api/statusnet/groups/list_all.atom';
-            $this->show_atom_groups(
+            $this->showAtomGroups(
                 $this->groups,
                 $title,
                 $id,
@@ -107,7 +107,7 @@ class ApiGroupListAllAction extends ApiAction
             );
             break;
         case 'json':
-            $this->show_json_groups($this->groups);
+            $this->showJsonGroups($this->groups);
             break;
         default:
             $this->clientError(
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index 0bc846d604..27f77029eb 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -85,10 +85,10 @@ class ApiGroupMembershipAction extends ApiAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_twitter_xml_users($this->profiles);
+            $this->showTwitterXmlUsers($this->profiles);
             break;
         case 'json':
-            $this->show_json_users($this->profiles);
+            $this->showJsonUsers($this->profiles);
             break;
         default:
             $this->clientError(
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index 262fe67184..8969ae194b 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -93,7 +93,7 @@ class ApiGroupShowAction extends ApiAction
             $this->show_single_xml_group($this->group);
             break;
         case 'json':
-            $this->show_single_json_group($this->group);
+            $this->showSingleJsonGroup($this->group);
             break;
         default:
             $this->clientError(_('API method not found!'), 404, $this->format);
diff --git a/actions/apihelptest.php b/actions/apihelptest.php
index cd5b86cf93..4691cbf99c 100644
--- a/actions/apihelptest.php
+++ b/actions/apihelptest.php
@@ -74,13 +74,13 @@ class ApiHelpTestAction extends ApiAction
         parent::handle($args);
 
         if ($this->format == 'xml') {
-            $this->init_document('xml');
+            $this->initDocument('xml');
             $this->element('ok', null, 'true');
-            $this->end_document('xml');
+            $this->endDocument('xml');
         } elseif ($this->format == 'json') {
-            $this->init_document('json');
+            $this->initDocument('json');
             print '"ok"';
-            $this->end_document('json');
+            $this->endDocument('json');
         } else {
             $this->clientError(
                 _('API method not found!'),
diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php
index 7680f96dcf..74a1310a22 100644
--- a/actions/apistatusesdestroy.php
+++ b/actions/apistatusesdestroy.php
@@ -112,7 +112,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction
              $this->notice->delete();
 
              if ($this->format == 'xml') {
-                 $this->show_single_xml_status($this->notice);
+                 $this->showSingleXmlStatus($this->notice);
              } elseif ($this->format == 'json') {
                  $this->show_single_json_status($this->notice);
              }
@@ -134,7 +134,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction
     {
         if (!empty($this->notice)) {
             if ($this->format == 'xml') {
-                $this->show_single_xml_status($this->notice);
+                $this->showSingleXmlStatus($this->notice);
             } elseif ($this->format == 'json') {
                 $this->show_single_json_status($this->notice);
             }
diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 0096cfe6b9..5d32a0bfc3 100644
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -110,7 +110,7 @@ class ApiStatusesShowAction extends ApiAction
     {
         if (!empty($this->notice)) {
             if ($this->format == 'xml') {
-                $this->show_single_xml_status($this->notice);
+                $this->showSingleXmlStatus($this->notice);
             } elseif ($this->format == 'json') {
                 $this->show_single_json_status($this->notice);
             }
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 7d6a574ef0..479654be8f 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -201,7 +201,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
     {
         if (!empty($this->notice)) {
             if ($this->format == 'xml') {
-                $this->show_single_xml_status($this->notice);
+                $this->showSingleXmlStatus($this->notice);
             } elseif ($this->format == 'json') {
                 $this->show_single_json_status($this->notice);
             }
diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
index 356942a859..a93570698d 100644
--- a/actions/apistatusnetconfig.php
+++ b/actions/apistatusnetconfig.php
@@ -88,7 +88,7 @@ class ApiStatusnetConfigAction extends ApiAction
 
         switch ($this->format) {
         case 'xml':
-            $this->init_document('xml');
+            $this->initDocument('xml');
             $this->elementStart('config');
 
             // XXX: check that all sections and settings are legal XML elements
@@ -111,7 +111,7 @@ class ApiStatusnetConfigAction extends ApiAction
                 $this->elementEnd($section);
             }
             $this->elementEnd('config');
-            $this->end_document('xml');
+            $this->endDocument('xml');
             break;
         case 'json':
             $result = array();
@@ -122,9 +122,9 @@ class ApiStatusnetConfigAction extends ApiAction
                         = common_config($section, $setting);
                 }
             }
-            $this->init_document('json');
-            $this->show_json_objects($result);
-            $this->end_document('json');
+            $this->initDocument('json');
+            $this->showJsonObjects($result);
+            $this->endDocument('json');
             break;
         default:
             $this->clientError(
diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php
index fb632fd93b..6af9bdd1a1 100644
--- a/actions/apistatusnetversion.php
+++ b/actions/apistatusnetversion.php
@@ -77,14 +77,14 @@ class ApiStatusnetVersionAction extends ApiAction
 
         switch ($this->format) {
         case 'xml':
-            $this->init_document('xml');
+            $this->initDocument('xml');
             $this->element('version', null, STATUSNET_VERSION);
-            $this->end_document('xml');
+            $this->endDocument('xml');
             break;
         case 'json':
-            $this->init_document('json');
+            $this->initDocument('json');
             print '"'.STATUSNET_VERSION.'"';
-            $this->end_document('json');
+            $this->endDocument('json');
             break;
         default:
             $this->clientError(
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index 1332fd71c6..a952e20b87 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -108,7 +108,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
             return;
         }
 
-        $this->init_document($this->format);
+        $this->initDocument($this->format);
 
         if (isset($this->ids_only)) {
             $this->showIds();
@@ -116,7 +116,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
             $this->showProfiles(isset($this->lite) ? false : true);
         }
 
-        $this->end_document($this->format);
+        $this->endDocument($this->format);
     }
 
     /**
@@ -204,7 +204,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
         case 'xml':
             $this->elementStart('users', array('type' => 'array'));
             foreach ($this->profiles as $profile) {
-                $this->show_profile(
+                $this->showProfile(
                     $profile,
                     $this->format,
                     null,
@@ -216,7 +216,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
         case 'json':
             $arrays = array();
             foreach ($this->profiles as $profile) {
-                $arrays[] = $this->twitter_user_array(
+                $arrays[] = $this->twitterUserArray(
                     $profile,
                     $include_statuses
                 );
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index d35e051835..c85e56264d 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -121,21 +121,21 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_xml_timeline($this->notices);
+            $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
             break;
         case 'atom':
             $selfuri = common_root_url() .
                 ltrim($_SERVER['QUERY_STRING'], 'p=');
-            $this->show_atom_timeline(
+            $this->showAtomTimeline(
                 $this->notices, $title, $id, $link, $subtitle,
                 null, $selfuri
             );
             break;
         case 'json':
-            $this->show_json_timeline($this->notices);
+            $this->showJsonTimeline($this->notices);
             break;
         default:
             $this->clientError(_('API method not found!'), $code = 404);
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 544824078e..90f3b3c064 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -112,10 +112,10 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_xml_timeline($this->notices);
+            $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
             break;
         case 'atom':
 
@@ -130,13 +130,13 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
                     'api/statuses/friends_timeline.atom';
             }
 
-            $this->show_atom_timeline(
+            $this->showAtomTimeline(
                 $this->notices, $title, $id, $link,
                 $subtitle, null, $selfuri
             );
             break;
         case 'json':
-            $this->show_json_timeline($this->notices);
+            $this->showJsonTimeline($this->notices);
             break;
         default:
             $this->clientError(_('API method not found!'), $code = 404);
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 6f2043fb65..2a6f35d728 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -108,16 +108,16 @@ class ApiTimelineGroupAction extends ApiAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_xml_timeline($this->notices);
+            $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
             break;
         case 'atom':
             $selfuri = common_root_url() .
                 'api/statusnet/groups/timeline/' .
                     $this->group->nickname . '.atom';
-            $this->show_atom_timeline(
+            $this->showAtomTimeline(
                 $this->notices,
                 $title,
                 $id,
@@ -128,7 +128,7 @@ class ApiTimelineGroupAction extends ApiAction
             );
             break;
         case 'json':
-            $this->show_json_timeline($this->notices);
+            $this->showJsonTimeline($this->notices);
             break;
         default:
             $this->clientError(
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index 60669d9ba3..c25fb0a0e9 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -118,21 +118,21 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_xml_timeline($this->notices);
+            $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
             break;
         case 'atom':
             $selfuri = common_root_url() .
                 ltrim($_SERVER['QUERY_STRING'], 'p=');
-            $this->show_atom_timeline(
+            $this->showAtomTimeline(
                 $this->notices, $title, $id, $link, $subtitle,
                 null, $selfuri
             );
             break;
         case 'json':
-            $this->show_json_timeline($this->notices);
+            $this->showJsonTimeline($this->notices);
             break;
         default:
             $this->clientError(_('API method not found!'), $code = 404);
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index b992136d1f..4bff4adb60 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -99,20 +99,20 @@ class ApiTimelinePublicAction extends ApiAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_xml_timeline($this->notices);
+            $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
             break;
         case 'atom':
             $selfuri = common_root_url() . 'api/statuses/public_timeline.atom';
-            $this->show_atom_timeline(
+            $this->showAtomTimeline(
                 $this->notices, $title, $id, $link,
                 $subtitle, null, $selfuri
             );
             break;
         case 'json':
-            $this->show_json_timeline($this->notices);
+            $this->showJsonTimeline($this->notices);
             break;
         default:
             $this->clientError(_('API method not found!'), $code = 404);
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 53e79e4b9e..cf211b173c 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -107,16 +107,16 @@ class ApiTimelineTagAction extends ApiAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_xml_timeline($this->notices);
+            $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->show_rss_timeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
             break;
         case 'atom':
             $selfuri = common_root_url() .
                 'api/statusnet/tags/timeline/' .
                     $this->tag . '.atom';
-            $this->show_atom_timeline(
+            $this->showAtomTimeline(
                 $this->notices,
                 $title,
                 $id,
@@ -127,7 +127,7 @@ class ApiTimelineTagAction extends ApiAction
             );
             break;
         case 'json':
-            $this->show_json_timeline($this->notices);
+            $this->showJsonTimeline($this->notices);
             break;
         default:
             $this->clientError(_('API method not found!'), $code = 404);
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 652a1b0d95..e7fac3e7a2 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -123,10 +123,10 @@ class ApiTimelineUserAction extends ApiBareAuthAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_xml_timeline($this->notices);
+            $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->show_rss_timeline(
+            $this->showRssTimeline(
                 $this->notices, $title, $link,
                 $subtitle, $suplink
             );
@@ -140,13 +140,13 @@ class ApiTimelineUserAction extends ApiBareAuthAction
                 $selfuri = common_root_url() .
                     'api/statuses/user_timeline.atom';
             }
-            $this->show_atom_timeline(
+            $this->showAtomTimeline(
                 $this->notices, $title, $id, $link,
                 $subtitle, $suplink, $selfuri
             );
             break;
         case 'json':
-            $this->show_json_timeline($this->notices);
+            $this->showJsonTimeline($this->notices);
             break;
         default:
             $this->clientError(_('API method not found!'), $code = 404);
diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index 442efc1943..d07040a43d 100644
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -105,16 +105,16 @@ class ApiUserShowAction extends ApiAction
             return;
         }
 
-        $twitter_user = $this->twitter_user_array($this->user->getProfile(), true);
+        $twitter_user = $this->twitterUserArray($this->user->getProfile(), true);
 
         if ($this->format == 'xml') {
-            $this->init_document('xml');
-            $this->show_twitter_xml_user($twitter_user);
-            $this->end_document('xml');
+            $this->initDocument('xml');
+            $this->showTwitterXmlUser($twitter_user);
+            $this->endDocument('xml');
         } elseif ($this->format == 'json') {
-            $this->init_document('json');
-            $this->show_json_objects($twitter_user);
-            $this->end_document('json');
+            $this->initDocument('json');
+            $this->showJsonObjects($twitter_user);
+            $this->endDocument('json');
         }
 
     }
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 0ef9d28260..7d618c471f 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -340,7 +340,7 @@ class TwitapisearchatomAction extends ApiAction
         // TODO: Here is where we'd put in a link to an atom feed for threads
 
         $this->element("twitter:source", null,
-            htmlentities($this->source_link($notice->source)));
+            htmlentities($this->sourceLink($notice->source)));
 
         $this->elementStart('author');
 
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index 5abff6496e..c7fa741a06 100644
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -134,9 +134,9 @@ class TwitapisearchjsonAction extends ApiAction
 
         $results = new JSONSearchResultsList($notice, $q, $this->rpp, $this->page);
 
-        $this->init_document('json');
+        $this->initDocument('json');
         $results->show();
-        $this->end_document('json');
+        $this->endDocument('json');
     }
 
     /**
diff --git a/lib/api.php b/lib/api.php
index 95a0779add..0801d28239 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -106,7 +106,7 @@ class ApiAction extends Action
         return parent::element($tag, $attrs, $content);
     }
 
-    function twitter_user_array($profile, $get_notice=false)
+    function twitterUserArray($profile, $get_notice=false)
     {
         $twitter_user = array();
 
@@ -133,7 +133,7 @@ class ApiAction extends Action
 
         $twitter_user['friends_count'] = $profile->subscriptionCount();
 
-        $twitter_user['created_at'] = $this->date_twitter($profile->created);
+        $twitter_user['created_at'] = $this->dateTwitter($profile->created);
 
         $twitter_user['favourites_count'] = $profile->faveCount(); // British spelling!
 
@@ -179,24 +179,24 @@ class ApiAction extends Action
             $notice = $profile->getCurrentNotice();
             if ($notice) {
                 # don't get user!
-                $twitter_user['status'] = $this->twitter_status_array($notice, false);
+                $twitter_user['status'] = $this->twitterStatusArray($notice, false);
             }
         }
 
         return $twitter_user;
     }
 
-    function twitter_status_array($notice, $include_user=true)
+    function twitterStatusArray($notice, $include_user=true)
     {
         $profile = $notice->getProfile();
 
         $twitter_status = array();
         $twitter_status['text'] = $notice->content;
         $twitter_status['truncated'] = false; # Not possible on StatusNet
-        $twitter_status['created_at'] = $this->date_twitter($notice->created);
+        $twitter_status['created_at'] = $this->dateTwitter($notice->created);
         $twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ?
             intval($notice->reply_to) : null;
-        $twitter_status['source'] = $this->source_link($notice->source);
+        $twitter_status['source'] = $this->sourceLink($notice->source);
         $twitter_status['id'] = intval($notice->id);
 
         $replier_profile = null;
@@ -239,14 +239,14 @@ class ApiAction extends Action
 
         if ($include_user) {
             # Don't get notice (recursive!)
-            $twitter_user = $this->twitter_user_array($profile, false);
+            $twitter_user = $this->twitterUserArray($profile, false);
             $twitter_status['user'] = $twitter_user;
         }
 
         return $twitter_status;
     }
 
-    function twitter_group_array($group)
+    function twitterGroupArray($group)
     {
         $twitter_group=array();
         $twitter_group['id']=$group->id;
@@ -261,12 +261,12 @@ class ApiAction extends Action
         $twitter_group['homepage']=$group->homepage;
         $twitter_group['description']=$group->description;
         $twitter_group['location']=$group->location;
-        $twitter_group['created']=$this->date_twitter($group->created);
-        $twitter_group['modified']=$this->date_twitter($group->modified);
+        $twitter_group['created']=$this->dateTwitter($group->created);
+        $twitter_group['modified']=$this->dateTwitter($group->modified);
         return $twitter_group;
     }
 
-    function twitter_rss_group_array($group)
+    function twitterRssGroupArray($group)
     {
         $entry = array();
         $entry['content']=$group->description;
@@ -284,7 +284,7 @@ class ApiAction extends Action
         return $entry;
     }
 
-    function twitter_rss_entry_array($notice)
+    function twitterRssEntryArray($notice)
     {
         $profile = $notice->getProfile();
         $entry = array();
@@ -341,19 +341,19 @@ class ApiAction extends Action
     }
 
 
-    function twitter_relationship_array($source, $target)
+    function twitterRelationshipArray($source, $target)
     {
         $relationship = array();
 
         $relationship['source'] =
-            $this->relationship_details_array($source, $target);
+            $this->relationshipDetailsArray($source, $target);
         $relationship['target'] =
-            $this->relationship_details_array($target, $source);
+            $this->relationshipDetailsArray($target, $source);
 
         return array('relationship' => $relationship);
     }
 
-    function relationship_details_array($source, $target)
+    function relationshipDetailsArray($source, $target)
     {
         $details = array();
 
@@ -380,14 +380,14 @@ class ApiAction extends Action
         return $details;
     }
 
-    function show_twitter_xml_relationship($relationship)
+    function showTwitterXmlRelationship($relationship)
     {
         $this->elementStart('relationship');
 
         foreach($relationship as $element => $value) {
             if ($element == 'source' || $element == 'target') {
                 $this->elementStart($element);
-                $this->show_xml_relationship_details($value);
+                $this->showXmlRelationshipDetails($value);
                 $this->elementEnd($element);
             }
         }
@@ -395,26 +395,26 @@ class ApiAction extends Action
         $this->elementEnd('relationship');
     }
 
-    function show_xml_relationship_details($details)
+    function showXmlRelationshipDetails($details)
     {
         foreach($details as $element => $value) {
             $this->element($element, null, $value);
         }
     }
 
-    function show_twitter_xml_status($twitter_status)
+    function showTwitterXmlStatus($twitter_status)
     {
         $this->elementStart('status');
         foreach($twitter_status as $element => $value) {
             switch ($element) {
             case 'user':
-                $this->show_twitter_xml_user($twitter_status['user']);
+                $this->showTwitterXmlUser($twitter_status['user']);
                 break;
             case 'text':
                 $this->element($element, null, common_xml_safe_str($value));
                 break;
             case 'attachments':
-                $this->show_xml_attachments($twitter_status['attachments']);
+                $this->showXmlAttachments($twitter_status['attachments']);
                 break;
             default:
                 $this->element($element, null, $value);
@@ -423,7 +423,7 @@ class ApiAction extends Action
         $this->elementEnd('status');
     }
 
-    function show_twitter_xml_group($twitter_group)
+    function showTwitterXmlGroup($twitter_group)
     {
         $this->elementStart('group');
         foreach($twitter_group as $element => $value) {
@@ -432,12 +432,12 @@ class ApiAction extends Action
         $this->elementEnd('group');
     }
 
-    function show_twitter_xml_user($twitter_user, $role='user')
+    function showTwitterXmlUser($twitter_user, $role='user')
     {
         $this->elementStart($role);
         foreach($twitter_user as $element => $value) {
             if ($element == 'status') {
-                $this->show_twitter_xml_status($twitter_user['status']);
+                $this->showTwitterXmlStatus($twitter_user['status']);
             } else {
                 $this->element($element, null, $value);
             }
@@ -445,7 +445,7 @@ class ApiAction extends Action
         $this->elementEnd($role);
     }
 
-    function show_xml_attachments($attachments) {
+    function showXmlAttachments($attachments) {
         if (!empty($attachments)) {
             $this->elementStart('attachments', array('type' => 'array'));
             foreach ($attachments as $attachment) {
@@ -459,7 +459,7 @@ class ApiAction extends Action
         }
     }
 
-    function show_twitter_rss_item($entry)
+    function showTwitterRssItem($entry)
     {
         $this->elementStart('item');
         $this->element('title', null, $entry['title']);
@@ -483,59 +483,59 @@ class ApiAction extends Action
         $this->elementEnd('item');
     }
 
-    function show_json_objects($objects)
+    function showJsonObjects($objects)
     {
         print(json_encode($objects));
     }
 
-    function show_single_xml_status($notice)
+    function showSingleXmlStatus($notice)
     {
-        $this->init_document('xml');
-        $twitter_status = $this->twitter_status_array($notice);
-        $this->show_twitter_xml_status($twitter_status);
-        $this->end_document('xml');
+        $this->initDocument('xml');
+        $twitter_status = $this->twitterStatusArray($notice);
+        $this->showTwitterXmlStatus($twitter_status);
+        $this->endDocument('xml');
     }
 
     function show_single_json_status($notice)
     {
-        $this->init_document('json');
-        $status = $this->twitter_status_array($notice);
-        $this->show_json_objects($status);
-        $this->end_document('json');
+        $this->initDocument('json');
+        $status = $this->twitterStatusArray($notice);
+        $this->showJsonObjects($status);
+        $this->endDocument('json');
     }
 
 
-    function show_xml_timeline($notice)
+    function showXmlTimeline($notice)
     {
 
-        $this->init_document('xml');
+        $this->initDocument('xml');
         $this->elementStart('statuses', array('type' => 'array'));
 
         if (is_array($notice)) {
             foreach ($notice as $n) {
-                $twitter_status = $this->twitter_status_array($n);
-                $this->show_twitter_xml_status($twitter_status);
+                $twitter_status = $this->twitterStatusArray($n);
+                $this->showTwitterXmlStatus($twitter_status);
             }
         } else {
             while ($notice->fetch()) {
-                $twitter_status = $this->twitter_status_array($notice);
-                $this->show_twitter_xml_status($twitter_status);
+                $twitter_status = $this->twitterStatusArray($notice);
+                $this->showTwitterXmlStatus($twitter_status);
             }
         }
 
         $this->elementEnd('statuses');
-        $this->end_document('xml');
+        $this->endDocument('xml');
     }
 
-    function show_rss_timeline($notice, $title, $link, $subtitle, $suplink=null)
+    function showRssTimeline($notice, $title, $link, $subtitle, $suplink=null)
     {
 
-        $this->init_document('rss');
+        $this->initDocument('rss');
 
         $this->element('title', null, $title);
         $this->element('link', null, $link);
         if (!is_null($suplink)) {
-            # For FriendFeed's SUP protocol
+            // For FriendFeed's SUP protocol
             $this->element('link', array('xmlns' => 'http://www.w3.org/2005/Atom',
                                          'rel' => 'http://api.friendfeed.com/2008/03#sup',
                                          'href' => $suplink,
@@ -547,23 +547,23 @@ class ApiAction extends Action
 
         if (is_array($notice)) {
             foreach ($notice as $n) {
-                $entry = $this->twitter_rss_entry_array($n);
-                $this->show_twitter_rss_item($entry);
+                $entry = $this->twitterRssEntryArray($n);
+                $this->showTwitterRssItem($entry);
             }
         } else {
             while ($notice->fetch()) {
-                $entry = $this->twitter_rss_entry_array($notice);
-                $this->show_twitter_rss_item($entry);
+                $entry = $this->twitterRssEntryArray($notice);
+                $this->showTwitterRssItem($entry);
             }
         }
 
-        $this->end_twitter_rss();
+        $this->endTwitterRss();
     }
 
-    function show_atom_timeline($notice, $title, $id, $link, $subtitle=null, $suplink=null, $selfuri=null)
+    function showAtomTimeline($notice, $title, $id, $link, $subtitle=null, $suplink=null, $selfuri=null)
     {
 
-        $this->init_document('atom');
+        $this->initDocument('atom');
 
         $this->element('title', null, $title);
         $this->element('id', null, $id);
@@ -594,14 +594,14 @@ class ApiAction extends Action
             }
         }
 
-        $this->end_document('atom');
+        $this->endDocument('atom');
 
     }
 
-    function show_rss_groups($group, $title, $link, $subtitle)
+    function showRssGroups($group, $title, $link, $subtitle)
     {
 
-        $this->init_document('rss');
+        $this->initDocument('rss');
 
         $this->element('title', null, $title);
         $this->element('link', null, $link);
@@ -611,17 +611,17 @@ class ApiAction extends Action
 
         if (is_array($group)) {
             foreach ($group as $g) {
-                $twitter_group = $this->twitter_rss_group_array($g);
-                $this->show_twitter_rss_item($twitter_group);
+                $twitter_group = $this->twitterRssGroupArray($g);
+                $this->showTwitterRssItem($twitter_group);
             }
         } else {
             while ($group->fetch()) {
-                $twitter_group = $this->twitter_rss_group_array($group);
-                $this->show_twitter_rss_item($twitter_group);
+                $twitter_group = $this->twitterRssGroupArray($group);
+                $this->showTwitterRssItem($twitter_group);
             }
         }
 
-        $this->end_twitter_rss();
+        $this->endTwitterRss();
     }
 
 
@@ -655,7 +655,7 @@ class ApiAction extends Action
             switch ($element) {
             case 'sender':
             case 'recipient':
-                $this->show_twitter_xml_user($value, $element);
+                $this->showTwitterXmlUser($value, $element);
                 break;
             case 'text':
                 $this->element($element, null, common_xml_safe_str($value));
@@ -679,11 +679,11 @@ class ApiAction extends Action
         $dmsg['sender_id'] = $message->from_profile;
         $dmsg['text'] = trim($message->content);
         $dmsg['recipient_id'] = $message->to_profile;
-        $dmsg['created_at'] = $this->date_twitter($message->created);
+        $dmsg['created_at'] = $this->dateTwitter($message->created);
         $dmsg['sender_screen_name'] = $from_profile->nickname;
         $dmsg['recipient_screen_name'] = $to_profile->nickname;
-        $dmsg['sender'] = $this->twitter_user_array($from_profile, false);
-        $dmsg['recipient'] = $this->twitter_user_array($to_profile, false);
+        $dmsg['sender'] = $this->twitterUserArray($from_profile, false);
+        $dmsg['recipient'] = $this->twitterUserArray($to_profile, false);
 
         return $dmsg;
     }
@@ -725,24 +725,24 @@ class ApiAction extends Action
 
     function showSingleXmlDirectMessage($message)
     {
-        $this->init_document('xml');
+        $this->initDocument('xml');
         $dmsg = $this->directMessageArray($message);
         $this->showXmlDirectMessage($dmsg);
-        $this->end_document('xml');
+        $this->endDocument('xml');
     }
 
     function showSingleJsonDirectMessage($message)
     {
-        $this->init_document('json');
+        $this->initDocument('json');
         $dmsg = $this->directMessageArray($message);
-        $this->show_json_objects($dmsg);
-        $this->end_document('json');
+        $this->showJsonObjects($dmsg);
+        $this->endDocument('json');
     }
 
-    function show_atom_groups($group, $title, $id, $link, $subtitle=null, $selfuri=null)
+    function showAtomGroups($group, $title, $id, $link, $subtitle=null, $selfuri=null)
     {
 
-        $this->init_document('atom');
+        $this->initDocument('atom');
 
         $this->element('title', null, $title);
         $this->element('id', null, $id);
@@ -766,143 +766,143 @@ class ApiAction extends Action
             }
         }
 
-        $this->end_document('atom');
+        $this->endDocument('atom');
 
     }
 
-    function show_json_timeline($notice)
+    function showJsonTimeline($notice)
     {
 
-        $this->init_document('json');
+        $this->initDocument('json');
 
         $statuses = array();
 
         if (is_array($notice)) {
             foreach ($notice as $n) {
-                $twitter_status = $this->twitter_status_array($n);
+                $twitter_status = $this->twitterStatusArray($n);
                 array_push($statuses, $twitter_status);
             }
         } else {
             while ($notice->fetch()) {
-                $twitter_status = $this->twitter_status_array($notice);
+                $twitter_status = $this->twitterStatusArray($notice);
                 array_push($statuses, $twitter_status);
             }
         }
 
-        $this->show_json_objects($statuses);
+        $this->showJsonObjects($statuses);
 
-        $this->end_document('json');
+        $this->endDocument('json');
     }
 
-    function show_json_groups($group)
+    function showJsonGroups($group)
     {
 
-        $this->init_document('json');
+        $this->initDocument('json');
 
         $groups = array();
 
         if (is_array($group)) {
             foreach ($group as $g) {
-                $twitter_group = $this->twitter_group_array($g);
+                $twitter_group = $this->twitterGroupArray($g);
                 array_push($groups, $twitter_group);
             }
         } else {
             while ($group->fetch()) {
-                $twitter_group = $this->twitter_group_array($group);
+                $twitter_group = $this->twitterGroupArray($group);
                 array_push($groups, $twitter_group);
             }
         }
 
-        $this->show_json_objects($groups);
+        $this->showJsonObjects($groups);
 
-        $this->end_document('json');
+        $this->endDocument('json');
     }
 
-    function show_xml_groups($group)
+    function showXmlGroups($group)
     {
 
-        $this->init_document('xml');
+        $this->initDocument('xml');
         $this->elementStart('groups', array('type' => 'array'));
 
         if (is_array($group)) {
             foreach ($group as $g) {
-                $twitter_group = $this->twitter_group_array($g);
-                $this->show_twitter_xml_group($twitter_group);
+                $twitter_group = $this->twitterGroupArray($g);
+                $this->showTwitterXmlGroup($twitter_group);
             }
         } else {
             while ($group->fetch()) {
-                $twitter_group = $this->twitter_group_array($group);
-                $this->show_twitter_xml_group($twitter_group);
+                $twitter_group = $this->twitterGroupArray($group);
+                $this->showTwitterXmlGroup($twitter_group);
             }
         }
 
         $this->elementEnd('groups');
-        $this->end_document('xml');
+        $this->endDocument('xml');
     }
 
-    function show_twitter_xml_users($user)
+    function showTwitterXmlUsers($user)
     {
 
-        $this->init_document('xml');
+        $this->initDocument('xml');
         $this->elementStart('users', array('type' => 'array'));
 
         if (is_array($user)) {
             foreach ($user as $u) {
-                $twitter_user = $this->twitter_user_array($u);
-                $this->show_twitter_xml_user($twitter_user);
+                $twitter_user = $this->twitterUserArray($u);
+                $this->showTwitterXmlUser($twitter_user);
             }
         } else {
             while ($user->fetch()) {
-                $twitter_user = $this->twitter_user_array($user);
-                $this->show_twitter_xml_user($twitter_user);
+                $twitter_user = $this->twitterUserArray($user);
+                $this->showTwitterXmlUser($twitter_user);
             }
         }
 
         $this->elementEnd('users');
-        $this->end_document('xml');
+        $this->endDocument('xml');
     }
 
-    function show_json_users($user)
+    function showJsonUsers($user)
     {
 
-        $this->init_document('json');
+        $this->initDocument('json');
 
         $users = array();
 
         if (is_array($user)) {
             foreach ($user as $u) {
-                $twitter_user = $this->twitter_user_array($u);
+                $twitter_user = $this->twitterUserArray($u);
                 array_push($users, $twitter_user);
             }
         } else {
             while ($user->fetch()) {
-                $twitter_user = $this->twitter_user_array($user);
+                $twitter_user = $this->twitterUserArray($user);
                 array_push($users, $twitter_user);
             }
         }
 
-        $this->show_json_objects($users);
+        $this->showJsonObjects($users);
 
-        $this->end_document('json');
+        $this->endDocument('json');
     }
 
-    function show_single_json_group($group)
+    function showSingleJsonGroup($group)
     {
-        $this->init_document('json');
-        $twitter_group = $this->twitter_group_array($group);
-        $this->show_json_objects($twitter_group);
-        $this->end_document('json');
+        $this->initDocument('json');
+        $twitter_group = $this->twitterGroupArray($group);
+        $this->showJsonObjects($twitter_group);
+        $this->endDocument('json');
     }
 
     function show_single_xml_group($group)
     {
-        $this->init_document('xml');
-        $twitter_group = $this->twitter_group_array($group);
-        $this->show_twitter_xml_group($twitter_group);
-        $this->end_document('xml');
+        $this->initDocument('xml');
+        $twitter_group = $this->twitterGroupArray($group);
+        $this->showTwitterXmlGroup($twitter_group);
+        $this->endDocument('xml');
     }
 
-    function date_twitter($dt)
+    function dateTwitter($dt)
     {
         $dateStr = date('d F Y H:i:s', strtotime($dt));
         $d = new DateTime($dateStr, new DateTimeZone('UTC'));
@@ -910,24 +910,7 @@ class ApiAction extends Action
         return $d->format('D M d H:i:s O Y');
     }
 
-    // XXX: Candidate for a general utility method somewhere?
-    function count_subscriptions($profile)
-    {
-
-        $count = 0;
-        $sub = new Subscription();
-        $sub->subscribed = $profile->id;
-
-        $count = $sub->find();
-
-        if ($count > 0) {
-            return $count - 1;
-        } else {
-            return 0;
-        }
-    }
-
-    function init_document($type='xml')
+    function initDocument($type='xml')
     {
         switch ($type) {
         case 'xml':
@@ -945,11 +928,11 @@ class ApiAction extends Action
             break;
         case 'rss':
             header("Content-Type: application/rss+xml; charset=utf-8");
-            $this->init_twitter_rss();
+            $this->initTwitterRss();
             break;
         case 'atom':
             header('Content-Type: application/atom+xml; charset=utf-8');
-            $this->init_twitter_atom();
+            $this->initTwitterAtom();
             break;
         default:
             $this->clientError(_('Not a supported data format.'));
@@ -959,7 +942,7 @@ class ApiAction extends Action
         return;
     }
 
-    function end_document($type='xml')
+    function endDocument($type='xml')
     {
         switch ($type) {
         case 'xml':
@@ -974,10 +957,10 @@ class ApiAction extends Action
             }
             break;
         case 'rss':
-            $this->end_twitter_rss();
+            $this->endTwitterRss();
             break;
         case 'atom':
-            $this->end_twitter_rss();
+            $this->endTwitterRss();
             break;
         default:
             $this->clientError(_('Not a supported data format.'));
@@ -1001,17 +984,17 @@ class ApiAction extends Action
         header('HTTP/1.1 '.$code.' '.$status_string);
 
         if ($format == 'xml') {
-            $this->init_document('xml');
+            $this->initDocument('xml');
             $this->elementStart('hash');
             $this->element('error', null, $msg);
             $this->element('request', null, $_SERVER['REQUEST_URI']);
             $this->elementEnd('hash');
-            $this->end_document('xml');
+            $this->endDocument('xml');
         } elseif ($format == 'json'){
-            $this->init_document('json');
+            $this->initDocument('json');
             $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
             print(json_encode($error_array));
-            $this->end_document('json');
+            $this->endDocument('json');
         } else {
 
             // If user didn't request a useful format, throw a regular client error
@@ -1034,21 +1017,21 @@ class ApiAction extends Action
         header('HTTP/1.1 '.$code.' '.$status_string);
 
         if ($content_type == 'xml') {
-            $this->init_document('xml');
+            $this->initDocument('xml');
             $this->elementStart('hash');
             $this->element('error', null, $msg);
             $this->element('request', null, $_SERVER['REQUEST_URI']);
             $this->elementEnd('hash');
-            $this->end_document('xml');
+            $this->endDocument('xml');
         } else {
-            $this->init_document('json');
+            $this->initDocument('json');
             $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
             print(json_encode($error_array));
-            $this->end_document('json');
+            $this->endDocument('json');
         }
     }
 
-    function init_twitter_rss()
+    function initTwitterRss()
     {
         $this->startXML();
         $this->elementStart('rss', array('version' => '2.0', 'xmlns:atom'=>'http://www.w3.org/2005/Atom'));
@@ -1056,14 +1039,14 @@ class ApiAction extends Action
         Event::handle('StartApiRss', array($this));
     }
 
-    function end_twitter_rss()
+    function endTwitterRss()
     {
         $this->elementEnd('channel');
         $this->elementEnd('rss');
         $this->endXML();
     }
 
-    function init_twitter_atom()
+    function initTwitterAtom()
     {
         $this->startXML();
         // FIXME: don't hardcode the language here!
@@ -1073,21 +1056,21 @@ class ApiAction extends Action
         Event::handle('StartApiAtom', array($this));
     }
 
-    function end_twitter_atom()
+    function endTwitterAtom()
     {
         $this->elementEnd('feed');
         $this->endXML();
     }
 
-    function show_profile($profile, $content_type='xml', $notice=null, $includeStatuses=true)
+    function showProfile($profile, $content_type='xml', $notice=null, $includeStatuses=true)
     {
-        $profile_array = $this->twitter_user_array($profile, $includeStatuses);
+        $profile_array = $this->twitterUserArray($profile, $includeStatuses);
         switch ($content_type) {
         case 'xml':
-            $this->show_twitter_xml_user($profile_array);
+            $this->showTwitterXmlUser($profile_array);
             break;
         case 'json':
-            $this->show_json_objects($profile_array);
+            $this->showJsonObjects($profile_array);
             break;
         default:
             $this->clientError(_('Not a supported data format.'));
@@ -1155,7 +1138,7 @@ class ApiAction extends Action
         }
     }
 
-    function source_link($source)
+    function sourceLink($source)
     {
         $source_name = _($source);
         switch ($source) {
diff --git a/lib/twitter.php b/lib/twitter.php
index b49e2e1190..afc3f55bab 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -23,7 +23,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 define('TWITTER_SERVICE', 1); // Twitter is foreign_service ID 1
 
-function update_twitter_user($twitter_id, $screen_name)
+function updateTwitter_user($twitter_id, $screen_name)
 {
     $uri = 'http://twitter.com/' . $screen_name;
     $fuser = new Foreign_user();
@@ -115,7 +115,7 @@ function save_twitter_user($twitter_id, $screen_name)
         // Only update if Twitter screen name has changed
 
         if ($fuser->nickname != $screen_name) {
-            $result = update_twitter_user($twitter_id, $screen_name);
+            $result = updateTwitter_user($twitter_id, $screen_name);
 
             common_debug('Twitter bridge - Updated nickname (and URI) for Twitter user ' .
                 "$fuser->id to $screen_name, was $fuser->nickname");
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 9a750bbc8d..0c7c1240c3 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -246,7 +246,7 @@ class RealtimePlugin extends Plugin
 
         $act = new ApiAction('/dev/null');
 
-        $arr = $act->twitter_status_array($notice, true);
+        $arr = $act->twitterStatusArray($notice, true);
         $arr['url'] = $notice->bestUrl();
         $arr['html'] = htmlspecialchars($notice->rendered);
         $arr['source'] = htmlspecialchars($arr['source']);

From 96d32fb8d0752c13cb1a768a3e4c3ad36a4a0188 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 30 Sep 2009 16:35:21 -0400
Subject: [PATCH 243/247] Implemented create group api

---
 actions/twitapigroups.php | 145 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 144 insertions(+), 1 deletion(-)

diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index 493144e77e..a294858835 100644
--- a/actions/twitapigroups.php
+++ b/actions/twitapigroups.php
@@ -428,7 +428,133 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
 
      function create($args, $apidata)
      {
-        die("todo");
+        parent::handle($args);
+
+        common_debug("in groups api action");
+        if (!common_config('inboxes','enabled')) {
+           $this->serverError(_('Inboxes must be enabled for groups to work'));
+           return false;
+        }
+
+        $this->auth_user = $apidata['user'];
+
+        $nickname    = $args['nickname'];
+        $fullname    = $args['full_name'];
+        $homepage    = $args['homepage'];
+        $description = $args['description'];
+        $location    = $args['location'];
+        $aliasstring = $args['aliases'];
+
+        if (!Validate::string($nickname, array('min_length' => 1,
+                                               'max_length' => 64,
+                                               'format' => NICKNAME_FMT))) {
+            $this->clientError(_('Nickname must have only lowercase letters '.
+                              'and numbers and no spaces.'), $code=403);
+            return;
+        } else if ($this->groupNicknameExists($nickname)) {
+            $this->clientError(_('Nickname already in use. Try another one.'), $code=403);
+            return;
+        } else if (!User_group::allowedNickname($nickname)) {
+            $this->clientError(_('Not a valid nickname.'), $code=403);
+            return;
+        } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
+                   !Validate::uri($homepage,
+                                  array('allowed_schemes' =>
+                                        array('http', 'https')))) {
+            $this->clientError(_('Homepage is not a valid URL.'), $code=403);
+            return;
+        } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
+            $this->clientError(_('Full name is too long (max 255 chars).'), $code=403);
+            return;
+        } else if (User_group::descriptionTooLong($description)) {
+            $this->clientError(sprintf(_('description is too long (max %d chars).'), User_group::maxDescription()), $code=403);
+            return;
+        } else if (!is_null($location) && mb_strlen($location) > 255) {
+            $this->clientError(_('Location is too long (max 255 chars).'), $code=403);
+            return;
+        }
+
+        if (!empty($aliasstring)) {
+            $aliases = array_map('common_canonical_nickname', array_unique(preg_split('/[\s,]+/', $aliasstring)));
+        } else {
+            $aliases = array();
+        }
+
+        if (count($aliases) > common_config('group', 'maxaliases')) {
+            $this->clientError(sprintf(_('Too many aliases! Maximum %d.'),
+                                    common_config('group', 'maxaliases')), $code=403);
+            return;
+        }
+
+        foreach ($aliases as $alias) {
+            if (!Validate::string($alias, array('min_length' => 1,
+                                                'max_length' => 64,
+                                                'format' => NICKNAME_FMT))) {
+                $this->clientError(sprintf(_('Invalid alias: "%s"'), $alias), $code=403);
+                return;
+            }
+            if ($this->groupNicknameExists($alias)) {
+                $this->clientError(sprintf(_('Alias "%s" already in use. Try another one.'),
+                                        $alias), $code=403);
+                return;
+            }
+            // XXX assumes alphanum nicknames
+            if (strcmp($alias, $nickname) == 0) {
+                $this->clientError(_('Alias can\'t be the same as nickname.'), $code=403);
+                return;
+            }
+        }
+
+        $group = new User_group();
+
+        $group->query('BEGIN');
+
+        $group->nickname    = $nickname;
+        $group->fullname    = $fullname;
+        $group->homepage    = $homepage;
+        $group->description = $description;
+        $group->location    = $location;
+        $group->created     = common_sql_now();
+
+        $result = $group->insert();
+
+        if (!$result) {
+            common_log_db_error($group, 'INSERT', __FILE__);
+            $this->serverError(_('Could not create group.'));
+        }
+
+        $result = $group->setAliases($aliases);
+
+        if (!$result) {
+            $this->serverError(_('Could not create aliases.'));
+        }
+
+        $member = new Group_member();
+
+        $member->group_id   = $group->id;
+        $member->profile_id = $this->auth_user->id;
+        $member->is_admin   = 1;
+        $member->created    = $group->created;
+
+        $result = $member->insert();
+
+        if (!$result) {
+            common_log_db_error($member, 'INSERT', __FILE__);
+            $this->serverError(_('Could not set group membership.'));
+        }
+
+        $group->query('COMMIT');
+
+        switch($apidata['content-type']) {
+          case 'xml':
+             $this->show_single_xml_group($group);
+             break;
+          case 'json':
+             $this->show_single_json_group($group);
+             break;
+          default:
+             $this->clientError(_('API method not found!'), $code = 404);
+         }
      }
 
      function update($args, $apidata)
@@ -450,4 +576,21 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
      {
         die("todo");
      }
+
+     function groupNicknameExists($nickname)
+     {
+        $group = User_group::staticGet('nickname', $nickname);
+
+        if (!empty($group)) {
+            return true;
+        }
+
+        $alias = Group_alias::staticGet('alias', $nickname);
+
+        if (!empty($alias)) {
+            return true;
+        }
+
+        return false;
+     }
 }

From 7fcaffdf86755a444ad9c24046161cb8a428c613 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 12 Oct 2009 14:07:00 -0700
Subject: [PATCH 244/247] Took out some unnecessary intializations

---
 actions/apifavoritecreate.php     | 2 --
 actions/apifavoritedestroy.php    | 1 -
 actions/apifriendshipscreate.php  | 1 -
 actions/apifriendshipsdestroy.php | 1 -
 actions/apifriendshipsshow.php    | 1 -
 actions/apiusershow.php           | 2 --
 6 files changed, 8 deletions(-)

diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php
index 1b05eb95c9..2a185f6073 100644
--- a/actions/apifavoritecreate.php
+++ b/actions/apifavoritecreate.php
@@ -46,7 +46,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiFavoriteCreateAction extends ApiAuthAction
 {
-    var $user   = null;
     var $notice = null;
 
     /**
@@ -141,7 +140,6 @@ class ApiFavoriteCreateAction extends ApiAuthAction
         }
     }
 
-
     /**
      * Notify the author of the favorite that the user likes their notice
      *
diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php
index aac866d7e9..f954a50760 100644
--- a/actions/apifavoritedestroy.php
+++ b/actions/apifavoritedestroy.php
@@ -47,7 +47,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 class ApiFavoriteDestroyAction extends ApiAuthAction
 {
 
-    var $user   = null;
     var $notice = null;
 
     /**
diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index 6c44d79610..fe4e9e9a2b 100644
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.php
@@ -47,7 +47,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiFriendshipsCreateAction extends ApiAuthAction
 {
-    var $user   = null;
     var $other  = null;
 
     /**
diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
index a15f202aa8..f0f6c062b5 100644
--- a/actions/apifriendshipsdestroy.php
+++ b/actions/apifriendshipsdestroy.php
@@ -47,7 +47,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiFriendshipsDestroyAction extends ApiAuthAction
 {
-    var $user   = null;
     var $other  = null;
 
     /**
diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php
index 8850496c79..c5aed238f4 100644
--- a/actions/apifriendshipsshow.php
+++ b/actions/apifriendshipsshow.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
 
 class ApiFriendshipsShowAction extends ApiBareAuthAction
 {
-    var $user   = null;
     var $source = null;
     var $target = null;
 
diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index d07040a43d..db942d1a58 100644
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -46,8 +46,6 @@ require_once INSTALLDIR.'/lib/api.php';
 
 class ApiUserShowAction extends ApiAction
 {
-    var $user   = null;
-
     /**
      * Take arguments for running
      *

From da9d02b0381e1acb2a5250392d91b0ebe6e87c1b Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 12 Oct 2009 14:46:22 -0700
Subject: [PATCH 245/247] Make apigroupcreate.php pass phpcs

---
 actions/apigroupcreate.php | 130 +++++++++++++++++++++----------------
 1 file changed, 73 insertions(+), 57 deletions(-)

diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php
index d6340eebfc..aeae1c2b2c 100644
--- a/actions/apigroupcreate.php
+++ b/actions/apigroupcreate.php
@@ -94,22 +94,22 @@ class ApiGroupCreateAction extends ApiAuthAction
     {
         parent::handle($args);
 
-        if (!common_config('inboxes','enabled')) {
-           $this->serverError(
-               _('Inboxes must be enabled for groups to work'),
-               400,
-               $this->format
-           );
-           return false;
-        }
-
-        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(
-                _('This method requires a POST.'),
+        if (!common_config('inboxes', 'enabled')) {
+            $this->serverError(
+                _('Inboxes must be enabled for groups to work'),
                 400,
                 $this->format
             );
-            return;
+            return false;
+        }
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+             $this->clientError(
+                 _('This method requires a POST.'),
+                 400,
+                 $this->format
+             );
+             return;
         }
 
         if (empty($this->user)) {
@@ -202,14 +202,15 @@ class ApiGroupCreateAction extends ApiAuthAction
 
     function validateParams()
     {
-        if (!Validate::string(
+        $valid = Validate::string(
             $this->nickname, array(
                 'min_length' => 1,
                 'max_length' => 64,
-                'format' => NICKNAME_FMT)
-                )
+                'format' => NICKNAME_FMT
             )
-        {
+        );
+
+        if (!$valid) {
             $this->clientError(
                 _(
                     'Nickname must have only lowercase letters ' .
@@ -234,24 +235,24 @@ class ApiGroupCreateAction extends ApiAuthAction
             );
             return false;
 
-        } elseif (!is_null($this->homepage)
+        } elseif (
+            !is_null($this->homepage)
             && strlen($this->homepage) > 0
             && !Validate::uri(
                 $this->homepage, array(
                     'allowed_schemes' =>
                     array('http', 'https')
                 )
-            ))
-        {
+            )) {
             $this->clientError(
                 _('Homepage is not a valid URL.'),
                 403,
                 $this->format
             );
             return false;
-        } elseif (!is_null($this->fullname)
-            && mb_strlen($this->fullname) > 255)
-            {
+        } elseif (
+            !is_null($this->fullname)
+            && mb_strlen($this->fullname) > 255) {
                 $this->clientError(
                     _('Full name is too long (max 255 chars).'),
                     403,
@@ -259,16 +260,18 @@ class ApiGroupCreateAction extends ApiAuthAction
                 );
             return false;
         } elseif (User_group::descriptionTooLong($this->description)) {
-            $this->clientError(sprintf(
-                _('Description is too long (max %d chars).'),
-                    User_group::maxDescription()),
-                    403,
-                    $this->format
-                );
+            $this->clientError(
+                sprintf(
+                    _('Description is too long (max %d chars).'),
+                    User_group::maxDescription()
+                ),
+                403,
+                $this->format
+            );
             return false;
-        } elseif (!is_null($this->location)
-            && mb_strlen($this->location) > 255)
-            {
+        } elseif (
+            !is_null($this->location)
+            && mb_strlen($this->location) > 255) {
                 $this->clientError(
                     _('Location is too long (max 255 chars).'),
                     403,
@@ -280,9 +283,7 @@ class ApiGroupCreateAction extends ApiAuthAction
         if (!empty($this->aliasstring)) {
             $this->aliases = array_map(
                 'common_canonical_nickname',
-                array_unique(preg_split('/[\s,]+/',
-                $this->aliasstring)
-                )
+                array_unique(preg_split('/[\s,]+/', $this->aliasstring))
             );
         } else {
             $this->aliases = array();
@@ -290,22 +291,27 @@ class ApiGroupCreateAction extends ApiAuthAction
 
         if (count($this->aliases) > common_config('group', 'maxaliases')) {
             $this->clientError(
-                sprintf(_('Too many aliases! Maximum %d.'),
-                    common_config('group', 'maxaliases')),
-                    403,
-                    $this->format
-                );
+                sprintf(
+                    _('Too many aliases! Maximum %d.'),
+                    common_config('group', 'maxaliases')
+                ),
+                403,
+                $this->format
+            );
             return false;
         }
 
         foreach ($this->aliases as $alias) {
-            if (!Validate::string($alias, array(
-                'min_length' => 1,
-                'max_length' => 64,
-                'format' => NICKNAME_FMT
+
+            $valid = Validate::string(
+                $alias, array(
+                    'min_length' => 1,
+                    'max_length' => 64,
+                    'format' => NICKNAME_FMT
                 )
-            ))
-            {
+            );
+
+            if (!$valid) {
                 $this->clientError(
                     sprintf(_('Invalid alias: "%s"'), $alias),
                     403,
@@ -315,8 +321,10 @@ class ApiGroupCreateAction extends ApiAuthAction
             }
             if ($this->groupNicknameExists($alias)) {
                 $this->clientError(
-                    sprintf(_('Alias "%s" already in use. Try another one.'),
-                    $alias),
+                    sprintf(
+                        _('Alias "%s" already in use. Try another one.'),
+                        $alias
+                    ),
                     403,
                     $this->format
                 );
@@ -340,21 +348,29 @@ class ApiGroupCreateAction extends ApiAuthAction
         return true;
     }
 
+    /**
+     * Check to see whether a nickname is already in use by a group
+     *
+     * @param String $nickname The nickname in question
+     *
+     * @return boolean true or false
+     */
+
     function groupNicknameExists($nickname)
     {
-       $group = User_group::staticGet('nickname', $nickname);
+        $group = User_group::staticGet('nickname', $nickname);
 
-       if (!empty($group)) {
-           return true;
-       }
+        if (!empty($group)) {
+            return true;
+        }
 
-       $alias = Group_alias::staticGet('alias', $nickname);
+        $alias = Group_alias::staticGet('alias', $nickname);
 
-       if (!empty($alias)) {
-           return true;
-       }
+        if (!empty($alias)) {
+            return true;
+        }
 
-       return false;
+        return false;
     }
 
 }

From 4efbe32f6ae2d0300299b1103294f881a03f929d Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 12 Oct 2009 15:12:20 -0700
Subject: [PATCH 246/247] Use site's name for basic auth realm

---
 lib/apiauth.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/apiauth.php b/lib/apiauth.php
index 25bbae24e5..4e5e0ccd99 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/api.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * Actions extending this class will require auth
@@ -90,8 +90,10 @@ class ApiAuthAction extends ApiAction
     {
         $this->basicAuthProcessHeader();
 
+        $realm = common_config('site', 'name') . ' API';
+
         if (!isset($this->auth_user)) {
-            header('WWW-Authenticate: Basic realm="StatusNet API"');
+            header('WWW-Authenticate: Basic realm="' . $realm . '"');
 
             // show error if the user clicks 'cancel'
 

From 870b091693531ba9aca20a0b0fa64ec326d72725 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 12 Oct 2009 16:36:00 -0700
Subject: [PATCH 247/247] Added in credits.

---
 actions/apiaccountratelimitstatus.php   |  8 ++++++--
 actions/apiaccountverifycredentials.php |  6 +++++-
 actions/apiblockcreate.php              | 15 ++++++++-------
 actions/apiblockdestroy.php             |  3 ++-
 actions/apidirectmessage.php            |  8 +++++++-
 actions/apidirectmessagenew.php         | 11 ++++++++---
 actions/apifavoritecreate.php           |  6 +++++-
 actions/apifavoritedestroy.php          |  6 +++++-
 actions/apifriendshipscreate.php        |  6 +++++-
 actions/apifriendshipsdestroy.php       |  6 +++++-
 actions/apifriendshipsexists.php        |  8 ++++++--
 actions/apifriendshipsshow.php          | 18 +++++++++++-------
 actions/apigroupcreate.php              |  5 +++++
 actions/apigroupismember.php            |  7 ++++++-
 actions/apigroupjoin.php                |  7 ++++++-
 actions/apigroupleave.php               | 11 ++++++++---
 actions/apigrouplist.php                |  8 +++++++-
 actions/apigrouplistall.php             |  6 ++++++
 actions/apigroupmembership.php          | 18 ++++++++++++------
 actions/apigroupshow.php                |  8 +++++++-
 actions/apihelptest.php                 |  2 ++
 actions/apistatusesdestroy.php          | 16 +++++++++++++---
 actions/apistatusesshow.php             | 14 +++++++++++++-
 actions/apistatusesupdate.php           | 16 +++++++++++++---
 actions/apistatusnetconfig.php          |  2 ++
 actions/apistatusnetversion.php         |  6 ++++--
 actions/apisubscriptions.php            |  6 +++++-
 actions/apitimelinefavorites.php        |  7 +++++--
 actions/apitimelinefriends.php          | 14 +++++++++++++-
 actions/apitimelinegroup.php            |  6 ++++++
 actions/apitimelinementions.php         | 15 +++++++++++++--
 actions/apitimelinepublic.php           | 14 +++++++++++++-
 actions/apitimelinetag.php              |  8 +++++++-
 actions/apitimelineuser.php             | 15 +++++++++++++--
 actions/apiuserfollowers.php            |  6 +++++-
 actions/apiuserfriends.php              |  6 +++++-
 actions/apiusershow.php                 |  8 +++++++-
 lib/api.php                             | 10 ++++++++++
 lib/apiauth.php                         |  9 ++++++++-
 lib/apibareauth.php                     | 16 +++++++++++++++-
 lib/twitterbasicauthclient.php          | 10 ++++++++--
 41 files changed, 310 insertions(+), 67 deletions(-)

diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php
index af86dae6a9..96179f175b 100644
--- a/actions/apiaccountratelimitstatus.php
+++ b/actions/apiaccountratelimitstatus.php
@@ -21,6 +21,8 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,14 +33,16 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
+require_once INSTALLDIR . '/lib/apibareauth.php';
 
 /**
  * We don't have a rate limit, but some clients check this method.
- * It always returns the same thing: 100 hits left.
+ * It always returns the same thing: 150 hits left.
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <robin@millette.info>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php
index 8b976bbf3d..08b201dbff 100644
--- a/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@ -21,6 +21,8 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +33,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Check a user's credentials. Returns an HTTP 200 OK response code and a
@@ -40,6 +42,8 @@ require_once INSTALLDIR.'/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <robin@millette.info>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
index e003e5ee96..1cab2df5d0 100644
--- a/actions/apiblockcreate.php
+++ b/actions/apiblockcreate.php
@@ -21,6 +21,7 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -34,12 +35,13 @@ if (!defined('STATUSNET')) {
 require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
- * Blocks the user specified in the ID parameter as the authenticating user. 
- * Destroys a friendship to the blocked user if it exists. Returns the 
+ * Blocks the user specified in the ID parameter as the authenticating user.
+ * Destroys a friendship to the blocked user if it exists. Returns the
  * blocked user in the requested format when successful.
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -47,7 +49,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiBlockCreateAction extends ApiAuthAction
 {
-    var $user    = null;
     var $other   = null;
 
     /**
@@ -91,13 +92,13 @@ class ApiBlockCreateAction extends ApiAuthAction
             );
             return;
         }
-        
+
         if (empty($this->user) || empty($this->other)) {
             $this->clientError(_('No such user!'), 404, $this->format);
             return;
         }
-        
-        if ($this->user->hasBlocked($this->other) 
+
+        if ($this->user->hasBlocked($this->other)
             || $this->user->block($this->other)
         ) {
             $this->initDocument($this->format);
@@ -106,7 +107,7 @@ class ApiBlockCreateAction extends ApiAuthAction
         } else {
             $this->serverError(_('Block user failed.'), 500, $this->format);
         }
-        
+
     }
 
 }
diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
index 470b60ea53..16dbf94caf 100644
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.php
@@ -21,6 +21,7 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -39,6 +40,7 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -46,7 +48,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiBlockDestroyAction extends ApiAuthAction
 {
-    var $user    = null;
     var $other   = null;
 
     /**
diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index 4e55886d95..a21fe86d20 100644
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Adrian Lang <mail@adrianlang.de>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,13 +34,16 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Show a list of direct messages from or to the authenticating user
  *
  * @category API
  * @package  StatusNet
+ * @author   Adrian Lang <mail@adrianlang.de>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <robin@millette.info>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index 6984c8d103..fa6cafbe8d 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Adrian Lang <mail@adrianlang.de>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Creates a new direct message from the authenticating user to
@@ -39,6 +42,9 @@ require_once INSTALLDIR.'/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Adrian Lang <mail@adrianlang.de>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <robin@millette.info>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -47,7 +53,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 class ApiDirectMessageNewAction extends ApiAuthAction
 {
     var $source  = null;
-    var $user    = null;
     var $other   = null;
     var $content = null;
 
@@ -151,7 +156,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
 
             // Note: sending msgs to yourself is allowed by Twitter
 
-            $errmsg = 'Don\'t send a message to yourself; ' . 
+            $errmsg = 'Don\'t send a message to yourself; ' .
                    'just say it to yourself quietly instead.'
 
             $this->clientError(_($errmsg), 403, $this->format);
diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php
index 2a185f6073..a80a6492e9 100644
--- a/actions/apifavoritecreate.php
+++ b/actions/apifavoritecreate.php
@@ -21,6 +21,8 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +33,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Favorites the status specified in the ID parameter as the authenticating user.
@@ -39,6 +41,8 @@ require_once INSTALLDIR.'/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php
index f954a50760..f131d1c7f2 100644
--- a/actions/apifavoritedestroy.php
+++ b/actions/apifavoritedestroy.php
@@ -21,6 +21,8 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +33,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Un-favorites the status specified in the ID parameter as the authenticating user.
@@ -39,6 +41,8 @@ require_once INSTALLDIR.'/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index fe4e9e9a2b..a824e734bf 100644
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.php
@@ -21,6 +21,8 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +33,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Allows the authenticating users to follow (subscribe) the user specified in
@@ -40,6 +42,8 @@ require_once INSTALLDIR.'/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
index f0f6c062b5..3d9b7e001c 100644
--- a/actions/apifriendshipsdestroy.php
+++ b/actions/apifriendshipsdestroy.php
@@ -21,6 +21,8 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +33,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Allows the authenticating users to unfollow (unsubscribe) the user specified in
@@ -40,6 +42,8 @@ require_once INSTALLDIR.'/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php
index 93be5f84ea..ae50c512c8 100644
--- a/actions/apifriendshipsexists.php
+++ b/actions/apifriendshipsexists.php
@@ -21,6 +21,8 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,14 +33,16 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/api.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
- * Tests for the existence of friendship between two users. Will return true if 
+ * Tests for the existence of friendship between two users. Will return true if
  * user_a follows user_b, otherwise will return false.
  *
  * @category API
  * @package  StatusNet
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php
index c5aed238f4..8fc4367388 100644
--- a/actions/apifriendshipsshow.php
+++ b/actions/apifriendshipsshow.php
@@ -21,6 +21,8 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,13 +33,15 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
+require_once INSTALLDIR . '/lib/apibareauth.php';
 
 /**
  * Outputs detailed information about the relationship between two users
  *
  * @category API
  * @package  StatusNet
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -65,7 +69,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
         $source_screen_name = $this->trimmed('source_screen_name');
         $target_id          = (int)$this->trimmed('target_id');
         $target_screen_name = $this->trimmed('target_screen_name');
-    
+
         if (!empty($source_id)) {
             $this->source = User::staticGet($source_id);
         } elseif (!empty($source_screen_name)) {
@@ -90,7 +94,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
      *
      * @return boolean true or false
      */
-       
+
     function requiresAuth()
     {
         if (common_config('site', 'private')) {
@@ -125,7 +129,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
             $this->clientError(_('API method not found!'), 404);
             return;
         }
-        
+
         if (empty($this->source)) {
             $this->clientError(
                 _('Could not determine source user.'),
@@ -133,7 +137,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
              );
             return;
         }
-              
+
         if (empty($this->target)) {
             $this->clientError(
                 _('Could not find target user.'),
@@ -141,7 +145,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
             );
             return;
         }
-        
+
         $result = $this->twitterRelationshipArray($this->source, $this->target);
 
         switch ($this->format) {
@@ -158,7 +162,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
         default:
             break;
         }
-        
+
     }
 
 }
diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php
index aeae1c2b2c..cdb2afb5be 100644
--- a/actions/apigroupcreate.php
+++ b/actions/apigroupcreate.php
@@ -22,6 +22,8 @@
  * @category  API
  * @package   StatusNet
  * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -39,6 +41,9 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index 6cf3270129..a8a40a6b3b 100644
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -38,6 +41,9 @@ require_once INSTALLDIR . '/lib/apibareauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -45,7 +51,6 @@ require_once INSTALLDIR . '/lib/apibareauth.php';
 
 class ApiGroupIsMemberAction extends ApiBareAuthAction
 {
-    var $user    = null;
     var $group   = null;
 
     /**
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index f930aa5190..071cd9290f 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -38,6 +41,9 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -45,7 +51,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiGroupJoinAction extends ApiAuthAction
 {
-    var $user    = null;
     var $group   = null;
 
     /**
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 4e3192ac08..0d4bb9e4d3 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -38,6 +41,9 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -45,7 +51,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
 
 class ApiGroupLeaveAction extends ApiAuthAction
 {
-    var $user    = null;
     var $group   = null;
 
     /**
@@ -117,13 +122,13 @@ class ApiGroupLeaveAction extends ApiAuthAction
             $this->serverError(
                 sprintf(
                     _('Could not remove user %s to group %s.'),
-                    $this->user->nickname, 
+                    $this->user->nickname,
                     $this->$group->nickname
                 )
             );
             return;
         }
-       
+
         switch($this->format) {
         case 'xml':
             $this->show_single_xml_group($this->group);
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 1fc31831a0..c529c1e408 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -38,6 +41,9 @@ require_once INSTALLDIR . '/lib/apibareauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -59,7 +65,7 @@ class ApiGroupListAction extends ApiBareAuthAction
     function prepare($args)
     {
         parent::prepare($args);
-        
+
         $this->user   = $this->getTargetUser($id);
         $this->groups = $this->getGroups();
 
diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index ef96a08bdd..89469f36f4 100644
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -38,6 +41,9 @@ require_once INSTALLDIR . '/lib/api.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index 27f77029eb..b31e47b398 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -34,10 +37,13 @@ if (!defined('STATUSNET')) {
 require_once INSTALLDIR . '/lib/api.php';
 
 /**
- * List 20 newest members of the group specified by name or ID. 
+ * List 20 newest members of the group specified by name or ID.
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -103,7 +109,7 @@ class ApiGroupMembershipAction extends ApiAction
     /**
      * Fetch the members of a group
      *
-     * @return array $profiles list of profiles 
+     * @return array $profiles list of profiles
      */
 
     function getProfiles()
@@ -112,9 +118,9 @@ class ApiGroupMembershipAction extends ApiAction
 
         $profile = $this->group->getMembers(
             ($this->page - 1) * $this->count,
-            $this->count, 
-            $this->since_id, 
-            $this->max_id, 
+            $this->count,
+            $this->since_id,
+            $this->max_id,
             $this->since
         );
 
@@ -157,7 +163,7 @@ class ApiGroupMembershipAction extends ApiAction
      * An entity tag for this list of groups
      *
      * Returns an Etag based on the action name, language
-     * the group id, and timestamps of the first and last 
+     * the group id, and timestamps of the first and last
      * user who has joined the group
      *
      * @return string etag
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index 8969ae194b..2bdb22bc41 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,13 +34,16 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/api.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * Outputs detailed information about the group specified by ID
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apihelptest.php b/actions/apihelptest.php
index 4691cbf99c..e4ef55f2e3 100644
--- a/actions/apihelptest.php
+++ b/actions/apihelptest.php
@@ -21,6 +21,7 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -38,6 +39,7 @@ require_once INSTALLDIR . '/lib/api.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php
index 74a1310a22..8dc8793b53 100644
--- a/actions/apistatusesdestroy.php
+++ b/actions/apistatusesdestroy.php
@@ -21,6 +21,12 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
+ * @author    Tom Blankenship <mac65@mac65.com>
+ * @author    Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,13 +37,19 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Deletes one of the authenticating user's statuses (notices).
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @author   Tom Blankenship <mac65@mac65.com>
+ * @author   Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author   Robin Millette <robin@millette.info>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -45,8 +57,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiStatusesDestroyAction extends ApiAuthAction
 {
-
-    var $user                  = null;
     var $status                = null;
 
     /**
diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 5d32a0bfc3..3be22ca597 100644
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -21,6 +21,12 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
+ * @author    Tom Blankenship <mac65@mac65.com>
+ * @author    Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,13 +37,19 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/api.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * Returns the notice specified by id as a Twitter-style status and inline user
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @author   Tom Blankenship <mac65@mac65.com>
+ * @author   Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author   Robin Millette <robin@millette.info>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 479654be8f..0d71e15128 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -21,6 +21,12 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
+ * @author    Tom Blankenship <mac65@mac65.com>
+ * @author    Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,13 +37,19 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Updates the authenticating user's status (posts a notice).
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @author   Tom Blankenship <mac65@mac65.com>
+ * @author   Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author   Robin Millette <robin@millette.info>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -45,8 +57,6 @@ require_once INSTALLDIR.'/lib/apiauth.php';
 
 class ApiStatusesUpdateAction extends ApiAuthAction
 {
-
-    var $user                  = null;
     var $source                = null;
     var $status                = null;
     var $in_reply_to_status_id = null;
diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
index a93570698d..ed1d151bfc 100644
--- a/actions/apistatusnetconfig.php
+++ b/actions/apistatusnetconfig.php
@@ -21,6 +21,7 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -42,6 +43,7 @@ require_once INSTALLDIR . '/lib/api.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php
index 6af9bdd1a1..e73ab983be 100644
--- a/actions/apistatusnetversion.php
+++ b/actions/apistatusnetversion.php
@@ -21,6 +21,7 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -41,6 +42,7 @@ require_once INSTALLDIR . '/lib/api.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -88,8 +90,8 @@ class ApiStatusnetVersionAction extends ApiAction
             break;
         default:
             $this->clientError(
-                _('API method not found!'), 
-                404, 
+                _('API method not found!'),
+                404,
                 $this->format
             );
             break;
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index a952e20b87..bc68dd192a 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -21,6 +21,8 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +33,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
+require_once INSTALLDIR . '/lib/apibareauth.php';
 
 /**
  * This class outputs a list of profiles as Twitter-style user and status objects.
@@ -40,6 +42,8 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index c85e56264d..b8ae74f137 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -21,8 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net> * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -39,6 +40,8 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 90f3b3c064..1ea35866e2 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -21,6 +21,12 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
+ * @author    mac65 <mac65@mac65.com>
+ * @author    Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +37,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
+require_once INSTALLDIR . '/lib/apibareauth.php';
 
 /**
  * Returns the most recent notices (default 20) posted by the target user.
@@ -39,6 +45,12 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @author   mac65 <mac65@mac65.com>
+ * @author   Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author   Robin Millette <robin@millette.info>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 2a6f35d728..5d05429185 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -38,6 +41,9 @@ require_once INSTALLDIR . '/lib/api.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index c25fb0a0e9..fe5ff0f28f 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -21,6 +21,12 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
+ * @author    mac65 <mac65@mac65.com>
+ * @author    Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,13 +37,19 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
+require_once INSTALLDIR . '/lib/apibareauth.php';
 
 /**
  * Returns the most recent (default 20) mentions (status containing @nickname)
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @author   mac65 <mac65@mac65.com>
+ * @author   Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author   Robin Millette <robin@millette.info>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -46,7 +58,6 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
 class ApiTimelineMentionsAction extends ApiBareAuthAction
 {
 
-    var $user    = null;
     var $notices = null;
 
     /**
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 4bff4adb60..58e2677348 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -21,6 +21,12 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
+ * @author    mac65 <mac65@mac65.com>
+ * @author    Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,13 +37,19 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/api.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * Returns the most recent notices (default 20) posted by everybody
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @author   mac65 <mac65@mac65.com>
+ * @author   Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author   Robin Millette <robin@millette.info>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index cf211b173c..a274daac00 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,13 +34,16 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/api.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * Returns the 20 most recent notices tagged by a given tag
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index e7fac3e7a2..285735fd1a 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -21,6 +21,12 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
+ * @author    mac65 <mac65@mac65.com>
+ * @author    Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +37,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
+require_once INSTALLDIR . '/lib/apibareauth.php';
 
 /**
  * Returns the most recent notices (default 20) posted by the authenticating
@@ -40,6 +46,12 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @author   mac65 <mac65@mac65.com>
+ * @author   Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author   Robin Millette <robin@millette.info>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
@@ -48,7 +60,6 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
 class ApiTimelineUserAction extends ApiBareAuthAction
 {
 
-    var $user    = null;
     var $notices = null;
 
     /**
diff --git a/actions/apiuserfollowers.php b/actions/apiuserfollowers.php
index 5c0243449b..e8d92a773e 100644
--- a/actions/apiuserfollowers.php
+++ b/actions/apiuserfollowers.php
@@ -21,6 +21,8 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +33,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
+require_once INSTALLDIR . '/lib/apibareauth.php';
 
 /**
  * Ouputs the authenticating user's followers (subscribers), each with
@@ -40,6 +42,8 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apiuserfriends.php b/actions/apiuserfriends.php
index 8a42e36b98..741a26e588 100644
--- a/actions/apiuserfriends.php
+++ b/actions/apiuserfriends.php
@@ -21,6 +21,8 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +33,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
+require_once INSTALLDIR . '/lib/apibareauth.php';
 
 /**
  * Ouputs the authenticating user's friends (subscriptions), each with
@@ -40,6 +42,8 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index db942d1a58..b3a939b431 100644
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    mac65 <mac65@mac65.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/api.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * Ouputs information for a user, specified by ID or screen name.
@@ -39,6 +42,9 @@ require_once INSTALLDIR.'/lib/api.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   mac65 <mac65@mac65.com>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/lib/api.php b/lib/api.php
index db2d24fbd5..7a63a4a785 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -21,6 +21,11 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Jeffery To <jeffery.to@gmail.com>
+ * @author    Toby Inkster <mail@tobyinkster.co.uk>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -36,6 +41,11 @@ if (!defined('STATUSNET')) {
  *
  * @category API
  * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @author   Toby Inkster <mail@tobyinkster.co.uk>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 4e5e0ccd99..2f2e44a264 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -21,7 +21,14 @@
  *
  * @category  API
  * @package   StatusNet
- * @author    Zach Copley <zach@status.net>
+ * @author    Adrian Lang <mail@adrianlang.de>
+ * @author    Brenda Wallace <shiny@cpan.org>
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    mEDI <medi@milaro.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @author    Zach Copley <zach@status.net> 
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/lib/apibareauth.php b/lib/apibareauth.php
index 0ae477f468..2d29c1ddd6 100644
--- a/lib/apibareauth.php
+++ b/lib/apibareauth.php
@@ -23,7 +23,14 @@
  *
  * @category  API
  * @package   StatusNet
- * @author    Zach Copley <zach@status.net>
+ * @author    Adrian Lang <mail@adrianlang.de>
+ * @author    Brenda Wallace <shiny@cpan.org>
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    mEDI <medi@milaro.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @author    Zach Copley <zach@status.net> 
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,6 +48,13 @@ require_once INSTALLDIR.'/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Adrian Lang <mail@adrianlang.de>
+ * @author   Brenda Wallace <shiny@cpan.org>
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   mEDI <medi@milaro.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
diff --git a/lib/twitterbasicauthclient.php b/lib/twitterbasicauthclient.php
index fd331fbdc9..1040d72fb6 100644
--- a/lib/twitterbasicauthclient.php
+++ b/lib/twitterbasicauthclient.php
@@ -36,8 +36,14 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  *
  * @category Integration
  * @package  StatusNet
- * @author   Zach Copley <zach@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @author Adrian Lang <mail@adrianlang.de>
+ * @author Brenda Wallace <shiny@cpan.org>
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @author Dan Moore <dan@moore.cx>
+ * @author Evan Prodromou <evan@status.net>
+ * @author mEDI <medi@milaro.net>
+ * @author Sarven Capadisli <csarven@status.net>
+ * @author Zach Copley <zach@status.net> * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
  */