Twitter integration - Add and remove Twitter accnt now working

[quix0rs-gnu-social.git] / actions / public.php

diff --git a/actions/public.php b/actions/public.php
index dc15a3a5e57ed9e1280e97fe319dc79edcdc5ace..f99215dadbdd8aec3759aa37ac53d7d67e9d9b28 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -26,9 +26,13 @@ class PublicAction extends StreamAction {
        function handle($args) {
                parent::handle($args);
 
-               $page = $this->arg('page') || 1;
+               $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-               common_show_header(_t('Public timeline'), array($this, 'show_header'));
+               header('X-XRDS-Location: '. common_local_url('publicxrds'));
+
+               common_show_header(_('Public timeline'),
+                                                  array($this, 'show_header'), NULL,
+                                                  array($this, 'show_top'));
 
                # XXX: Public sidebar here?
 
@@ -37,31 +41,56 @@ class PublicAction extends StreamAction {
                common_show_footer();
        }
 
+       function show_top() {
+               if (common_logged_in()) {
+                       common_notice_form('public');
+               }
+       }
+
        function show_header() {
                common_element('link', array('rel' => 'alternate',
                                                                         'href' => common_local_url('publicrss'),
                                                                         'type' => 'application/rss+xml',
-                                                                        'title' => _t('Public Stream Feed')));
+                                                                        'title' => _('Public Stream Feed')));
+               # for client side of OpenID authentication
+               common_element('meta', array('http-equiv' => 'X-XRDS-Location',
+                                                                        'content' => common_local_url('publicxrds')));
        }
-       
+
        function show_notices($page) {
 
-               $notice = DB_DataObject::factory('notice');
+               $notice = new Notice();
+
+               # XXX: sub-optimal
+
+               if (common_config('public', 'localonly')) {
+                       $notice->is_local = 1;
+               }
 
-               # XXX: filter out private notifications
+               $notice->orderBy('created DESC, notice.id DESC');
 
-               $notice->orderBy('created DESC');
-               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE);
+               # We fetch one extra, to see if we need an "older" link
 
-               $notice->find();
+               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
 
-               common_element_start('div', 'notices');
+               $cnt = $notice->find();
 
-               while ($notice->fetch()) {
-                       $this->show_notice($notice);
+               if ($cnt > 0) {
+                       common_element_start('ul', array('id' => 'notices'));
+            $iMax = min($cnt, NOTICES_PER_PAGE);
+                       for ($i = 0; $i < $iMax; $i++) {
+                               if ($notice->fetch()) {
+                                       $this->show_notice($notice);
+                               } else {
+                                       // shouldn't happen!
+                                       break;
+                               }
+                       }
+                       common_element_end('ul');
                }
 
-               common_element_end('div');
+               common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
+                                                 $page, 'public');
        }
 }