use notice URIs in RSS feeds

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

diff --git a/actions/public.php b/actions/public.php
index 8cb854fec170227a1b14cd46d2174e049b06fd24..dc15a3a5e57ed9e1280e97fe319dc79edcdc5ace 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -1,23 +1,25 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * 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/>.
  */
 
-if (!defined('LACONICA')) { exit(1) }
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/lib/stream.php');
 
 class PublicAction extends StreamAction {
 
@@ -26,7 +28,7 @@ class PublicAction extends StreamAction {
 
                $page = $this->arg('page') || 1;
 
-               common_show_header(_t('Public timeline'));
+               common_show_header(_t('Public timeline'), array($this, 'show_header'));
 
                # XXX: Public sidebar here?
 
@@ -35,6 +37,13 @@ class PublicAction extends StreamAction {
                common_show_footer();
        }
 
+       function show_header() {
+               common_element('link', array('rel' => 'alternate',
+                                                                        'href' => common_local_url('publicrss'),
+                                                                        'type' => 'application/rss+xml',
+                                                                        'title' => _t('Public Stream Feed')));
+       }
+       
        function show_notices($page) {
 
                $notice = DB_DataObject::factory('notice');
@@ -42,17 +51,17 @@ class PublicAction extends StreamAction {
                # XXX: filter out private notifications
 
                $notice->orderBy('created DESC');
-               $notice->limit((($page-1)*NOTICES_PER_PAGE) + 1, NOTICES_PER_PAGE);
+               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE);
 
                $notice->find();
 
-               common_start_element('div', 'notices');
+               common_element_start('div', 'notices');
 
                while ($notice->fetch()) {
                        $this->show_notice($notice);
                }
 
-               common_end_element('div');
+               common_element_end('div');
        }
 }