save notice to inbox on saveNew

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

diff --git a/actions/public.php b/actions/public.php
index dc15a3a5e57ed9e1280e97fe319dc79edcdc5ace..43beaffc6a6074790fbc42e186f0eeb099afb026 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,41 @@ 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');
 
-               # XXX: filter out private notifications
-
-               $notice->orderBy('created DESC');
-               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE);
-
-               $notice->find();
-
-               common_element_start('div', 'notices');
+       function show_notices($page) {
 
-               while ($notice->fetch()) {
-                       $this->show_notice($notice);
+               $cnt = 0;
+               $notice = Notice::publicStream(($page-1)*NOTICES_PER_PAGE,
+                                                                          NOTICES_PER_PAGE + 1);
+               
+               if ($notice) {
+                       common_element_start('ul', array('id' => 'notices'));
+                       while ($notice->fetch()) {
+                               $cnt++;
+                               if ($cnt > NOTICES_PER_PAGE) {
+                                       break;
+                               }
+                               $this->show_notice($notice);
+                       }
+                       common_element_end('ul');
                }
 
-               common_element_end('div');
+               common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
+                                                 $page, 'public');
        }
-}
-
+}
\ No newline at end of file