Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

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

diff --git a/actions/public.php b/actions/public.php
index 395d28819e710b58160d204e5867aa74ed9c2099..a20ae40321ca17b36ae28313f4a87eac90d69f92 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -56,6 +56,11 @@ class PublicAction extends Action
 
     var $page = null;
 
+    function isReadOnly()
+    {
+        return true;
+    }
+
     /**
      * Read and validate arguments
      *
@@ -68,6 +73,9 @@ class PublicAction extends Action
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
@@ -111,12 +119,20 @@ class PublicAction extends Action
      * @return void
      */
 
-    function showFeeds()
+    function getFeeds()
     {
-        $this->element('link', array('rel' => 'alternate',
-                                     'href' => common_local_url('publicrss'),
-                                     'type' => 'application/rss+xml',
-                                     'title' => _('Public Stream Feed')));
+        return array(new Feed(Feed::RSS1, common_local_url('publicrss'),
+                              _('Public Stream Feed (RSS 1.0)')),
+                     new Feed(Feed::RSS2,
+                              common_local_url('api',
+                                               array('apiaction' => 'statuses',
+                                                     'method' => 'public_timeline.rss')),
+                              _('Public Stream Feed (RSS 2.0)')),
+                     new Feed(Feed::ATOM,
+                              common_local_url('api',
+                                               array('apiaction' => 'statuses',
+                                                     'method' => 'public_timeline.atom')),
+                              _('Public Stream Feed (Atom)')));
     }
 
     /**
@@ -177,31 +193,10 @@ class PublicAction extends Action
                           $this->page, 'public');
     }
 
-    /**
-     * Makes a list of exported feeds for this page
-     *
-     * @return void
-     *
-     * @todo I18N
-     */
-
-    function showExportData()
-    {
-        $fl = new FeedList($this);
-        $fl->show(array(0 => array('href' => common_local_url('publicrss'),
-                                   'type' => 'rss',
-                                   'version' => 'RSS 1.0',
-                                   'item' => 'publicrss'),
-                        1 => array('href' => common_local_url('publicatom'),
-                                   'type' => 'atom',
-                                   'version' => 'Atom 1.0',
-                                   'item' => 'publicatom')));
-    }
-
     function showSections()
     {
-        $top = new TopPostersSection($this);
-        $top->show();
+        // $top = new TopPostersSection($this);
+        // $top->show();
         $pop = new PopularNoticeSection($this);
         $pop->show();
         $gbp = new GroupsByPostsSection($this);
@@ -215,8 +210,8 @@ class PublicAction extends Action
                $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
                '[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))');
-        $this->elementStart('p', 'anonymous');
+        $this->elementStart('div', array('id' => 'anon_notice'));
         $this->raw(common_markup_to_html($m));
-        $this->elementEnd('p');
+        $this->elementEnd('div');
     }
 }