Merge branch '0.8.x' of git://gitorious.org/~brion/statusnet/brion-fixes into 0.8.x

[quix0rs-gnu-social.git] / plugins / Realtime / RealtimePlugin.php

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 157c800d95d05e856c8b47475c35f103f810efff..e30c4115676b3740205af9caec39936a7b1c03eb 100644 (file)
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -77,14 +77,12 @@ class RealtimePlugin extends Plugin
         }
 
         $base = $action->selfUrl();
-        if (mb_strstr($url, '?')) {
+        if (mb_strstr($base, '?')) {
             $url = $base . '&realtime=1';
         } else {
             $url = $base . '?realtime=1';
         }
 
-        $title = $action->title();
-
         $scripts = $this->_getScripts();
 
         foreach ($scripts as $script) {
@@ -99,15 +97,20 @@ class RealtimePlugin extends Plugin
             $user_id = 0;
         }
 
-        $iconurl = $base.'plugins/Realtime/icon_external.gif';
+        if ($action->boolean('realtime')) {
+            $realtimeUI = ' RealtimeUpdate.initPopupWindow();';
+        }
+        else {
+            $iconurl = common_path('plugins/Realtime/icon_external.gif');
+            $realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$timeline.'", "'. $iconurl .'");';
+        }
 
         $action->elementStart('script', array('type' => 'text/javascript'));
 
         $script = ' $(document).ready(function() { '.
+          $realtimeUI.
           $this->_updateInitialize($timeline, $user_id).
-          ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'", "'. $iconurl .'");'
           '}); ';
-
         $action->raw($script);
 
         $action->elementEnd('script');
@@ -213,6 +216,8 @@ class RealtimePlugin extends Plugin
                                                               'class' => 'user_in')
                               : array('id' => $action->trimmed('action')));
 
+        $action->elementStart('div', array('id' => 'header'));
+
         // XXX hack to deal with JS that tries to get the
         // root url from page output
 
@@ -225,7 +230,9 @@ class RealtimePlugin extends Plugin
         if (common_logged_in()) {
             $action->showNoticeForm();
         }
-        $action->showContent();
+        $action->elementEnd('div');
+
+        $action->showContentBlock();
         $action->elementEnd('body');
         return false; // No default processing
     }