X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FRealtime%2FRealtimePlugin.php;h=181927968648a132f2ef9754725502f3b8d4b5af;hb=1ccfb5d9d34128005bc10d89e3ed56ff0e643969;hp=fde30602166e7b859c85abd4a459a9f7354e7a14;hpb=bdbc2cb8de370eef6d5d06412746f52797ea0458;p=quix0rs-gnu-social.git diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index fde3060216..1819279686 100644 --- 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,13 +97,20 @@ class RealtimePlugin extends Plugin $user_id = 0; } + 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.'"); '. '}); '; - $action->raw($script); $action->elementEnd('script'); @@ -223,7 +228,9 @@ class RealtimePlugin extends Plugin if (common_logged_in()) { $action->showNoticeForm(); } - $action->showContent(); + + $action->showContentBlock(); + $action->showScripts(); $action->elementEnd('body'); return false; // No default processing }