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: 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 6cd2c08f9..7958ea5e9 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>
-- 
cgit v1.2.3-54-g00ecf


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: 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 3e95d2bea..256acf199 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;
 }
 
-- 
cgit v1.2.3-54-g00ecf


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: Markdown is not necessary

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

diff --git a/doc-src/bookmarklet b/doc-src/bookmarklet
index 7958ea5e9..e5ded7702 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>
-- 
cgit v1.2.3-54-g00ecf


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: 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 256acf199..292045928 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;
 
-- 
cgit v1.2.3-54-g00ecf


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: 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 292045928..b831859e9 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 87b537646..1c3f7cd96 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',
-- 
cgit v1.2.3-54-g00ecf


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: 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 96a4de6e8..308d0a771 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){
-- 
cgit v1.2.3-54-g00ecf


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: 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 85a24c132..45a11dfe4 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
+}
-- 
cgit v1.2.3-54-g00ecf


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: 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 fd4853554..648627b57 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'];
-- 
cgit v1.2.3-54-g00ecf


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: 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 abd9cba62..c9e90629c 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 dc59c1cb7..9fd97b4f5 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 6bcad3efd..055662133 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 f059b42f0..5d8b2996b 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);
-- 
cgit v1.2.3-54-g00ecf


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: 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 00a822860..6e3720e09 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 df585406c..432b7b329 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 1e3a45142..d1387b1b7 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 ec85e4a5c..6b2bccd97 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 00e728f55..0505c9942 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'),
-- 
cgit v1.2.3-54-g00ecf


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: 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 432b7b329..5bf4d7425 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);
-- 
cgit v1.2.3-54-g00ecf


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: 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 d1387b1b7..350e37db8 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);
 
-- 
cgit v1.2.3-54-g00ecf


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: 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 02a684b38..ded419dd7 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);
     }
-- 
cgit v1.2.3-54-g00ecf


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: 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 48fe1db08..a17efcdd5 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());
         }
-- 
cgit v1.2.3-54-g00ecf


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: 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 055606f58..0e94df296 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());
-- 
cgit v1.2.3-54-g00ecf


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: 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 fafb2c6fc..670eb498c 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) {
-- 
cgit v1.2.3-54-g00ecf


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: 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 b831859e9..5b57b79b5 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'))
-- 
cgit v1.2.3-54-g00ecf


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: Generate ETags for pages which don't specify themselves.

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

diff --git a/index.php b/index.php
index 7669778f6..72ceb45df 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 670eb498c..06cdbdfe0 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -873,38 +873,71 @@ class Action extends HTMLOutputter // lawsuit
     }
 
     /**
-     * Handler method
+     * 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 handle($argarray=null)
+    function handleWrapper($argarray=null)
     {
-        header('Vary: Accept-Encoding,Cookie');
+        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_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');
+                        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
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return boolean is read only action?
+     */
+    function handle($argarray=null)
+    {
     }
 
     /**
-- 
cgit v1.2.3-54-g00ecf


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: 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 6ad0e7a3a..c4fb3a543 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)) {
-- 
cgit v1.2.3-54-g00ecf


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: 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 dfadea004..3eff685a8 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 b75397270..baaec73c1 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 000000000..96d54af8d
--- /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";
+        }
+    }
+}
-- 
cgit v1.2.3-54-g00ecf


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: 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 45104947d..b5fc627a0 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 4854f12bb..7232d6cbd 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 4c24c6006..fcefa964a 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 c49043e5c..39984aa08 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()
-- 
cgit v1.2.3-54-g00ecf


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: 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 39984aa08..30dd34496 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']);
-- 
cgit v1.2.3-54-g00ecf


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: 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 c722a4e2c..631f6d9bb 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
-- 
cgit v1.2.3-54-g00ecf


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: 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 3851bc057..3fe05eb3d 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%;
 }
 
-- 
cgit v1.2.3-54-g00ecf


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: 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 d55db5859..eba8ac1d9 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;
      },
-- 
cgit v1.2.3-54-g00ecf


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: 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 f2ea46910..eea8945c3 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;
-- 
cgit v1.2.3-54-g00ecf


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: 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 c4fb3a543..6ad0e7a3a 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 96d54af8d..4379a86f2 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');
             }
         }
-- 
cgit v1.2.3-54-g00ecf


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: 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 c9e90629c..abd9cba62 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 9fd97b4f5..dc59c1cb7 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 055662133..6bcad3efd 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 5d8b2996b..f059b42f0 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);
-- 
cgit v1.2.3-54-g00ecf


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: 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 06cdbdfe0..ebef4f9e4 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);
             }
-- 
cgit v1.2.3-54-g00ecf


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: 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 f590d1b97..2657763f4 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()),
-- 
cgit v1.2.3-54-g00ecf


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: 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 4d3067eed..89285b13c 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()
-- 
cgit v1.2.3-54-g00ecf


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: 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 eba8ac1d9..b2c8bb56d 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>";
-- 
cgit v1.2.3-54-g00ecf


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: 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 45a11dfe4..e36bd1c5c 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 ) {}
-- 
cgit v1.2.3-54-g00ecf


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: 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 b2c8bb56d..faec8d89c 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>";
-- 
cgit v1.2.3-54-g00ecf


From fc0f871bfe653a635d5e86986f2c8510434f74c3 Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Fri, 18 Sep 2009 08:27:09 +0100
Subject: 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 ce23a2695..b996f96cc 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
-- 
cgit v1.2.3-54-g00ecf


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: 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 6b2bccd97..336457b45 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();
-- 
cgit v1.2.3-54-g00ecf


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: 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 6b2bccd97..507413da7 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,
-- 
cgit v1.2.3-54-g00ecf


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: 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 14d3cf54f..8386f1e18 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);
     }
-- 
cgit v1.2.3-54-g00ecf


From 61121c192a30abdb33ac98cca9962942645df58e Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Sat, 19 Sep 2009 12:09:49 +0100
Subject: 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 3272aa1ee..1db4c6565 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
-- 
cgit v1.2.3-54-g00ecf


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: 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 72ceb45df..fa94f0c75 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;
     }
-- 
cgit v1.2.3-54-g00ecf


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: 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 edee239a0..5e2867ea8 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 0505c9942..5529e60ac 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',
-- 
cgit v1.2.3-54-g00ecf


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: Make the infinite scroll plugin have a non-infinite scroll (button
 click to scroll) mode

---
 plugins/InfiniteScroll/InfiniteScrollPlugin.php |  2 +-
 plugins/InfiniteScroll/infinitescroll.js        |  2 +-
 plugins/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 c955298cb..5928c007f 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 6513072d0..ae4d53d09 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 670686b0e..ec31bb086 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",
-- 
cgit v1.2.3-54-g00ecf


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: 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 fdc05562e..820d534f2 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');
-- 
cgit v1.2.3-54-g00ecf


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: 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 2e688336f..e8bca3eb4 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 82eca3d08..1703ef099 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);
-- 
cgit v1.2.3-54-g00ecf


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: 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 e8bca3eb4..939aed00a 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();
+        }
+    }
 }();
 
-- 
cgit v1.2.3-54-g00ecf


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: 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 939aed00a..82594d91c 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()
 {
-- 
cgit v1.2.3-54-g00ecf


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: 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 82594d91c..a7c87330c 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);
                 }
             };
-- 
cgit v1.2.3-54-g00ecf


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: 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 a7c87330c..91d12cde9 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);
                 }
-- 
cgit v1.2.3-54-g00ecf


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: 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 1703ef099..7a612a406 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;
-- 
cgit v1.2.3-54-g00ecf


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: 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     | 263 +++++++++++++++++++--------------
 4 files changed, 225 insertions(+), 112 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 7a612a406..611b1d86c 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 000000000..c4118d53b
Binary files /dev/null and b/plugins/Realtime/icon_external.gif differ
diff --git a/plugins/Realtime/jquery.getUrlParam.js b/plugins/Realtime/jquery.getUrlParam.js
new file mode 100644
index 000000000..e8f73eb47
--- /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 faec8d89c..da2f9ed3a 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
-
-RealtimeUpdate = {
-     _userid: 0,
-     _replyurl: '',
-     _favorurl: '',
-     _deleteurl: '',
-
-     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 "+
-               "<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']) {
+$(document).ready(function() {
+    if (!$(document).getUrlParam('realtime')) {
+        $('#site_nav_local_views .current a').append('<button id="realtime_timeline" title="Pop this tab">&#8599;</button>');
+
+        $('#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'
+        });
+
+        $('#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');
+
+            return false;
+        });
+    }
+    else {
+        window.resizeTo(575, 640);
+        address = $('address');
+        content = $('#content');
+        $('body').html(address);
+        $('address').hide();
+        $('body').append(content);
+        $('#content').css({'width':'92%'});
+    }
+
+
+    // add a notice encoded as JSON into the current timeline
+    //
+    // TODO: i18n
+
+    RealtimeUpdate = {
+        _userid: 0,
+        _replyurl: '',
+        _favorurl: '',
+        _deleteurl: '',
+
+        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 "+
+                "<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;
-     },
-
-     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;
-     },
-
-     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);
-
-          dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
-
-          return dl;
-     },
-}
+                }
+             }
+
+            ni = ni+"</div>"+
+            "</li>";
+            return ni;
+        },
+
+        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;
+        },
+
+        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);
+
+            dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
+
+            return dl;
+        }
+    }
+
+});
+
-- 
cgit v1.2.3-54-g00ecf


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: 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 fa94f0c75..362ab3cd3 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 ebef4f9e4..670eb498c 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)
-    {
     }
 
     /**
-- 
cgit v1.2.3-54-g00ecf


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: 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 5b57b79b5..b831859e9 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'))
-- 
cgit v1.2.3-54-g00ecf