Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/publicrss.php b/actions/publicrss.php
index 5c08de641dbdb06696723fff221019837841b440..85da8ed0c99263caf695d8309ce0c3663fa633e2 100644 (file)
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -1,19 +1,18 @@
 <?php
-
 /**
  * Public RSS action class.
  *
  * PHP version 5
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, 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
@@ -29,11 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/rssaction.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * RSS feed for public timeline.
@@ -41,24 +36,14 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  * Formatting of RSS handled by Rss10Action
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class PublicrssAction extends Rss10Action
 {
-    /**
-     * Initialization.
-     * 
-     * @return boolean true
-     */
-    function init()
-    {
-        return true;
-    }
-
     /**
      * Get notices
      *
@@ -66,15 +51,10 @@ class PublicrssAction extends Rss10Action
      *
      * @return array notices
      */
-    function getNotices($limit=0)
+    protected function getNotices()
     {
-        $notices = array();
-        $notice  = Notice::publicStream(0, ($limit == 0) ? 48 : $limit);
-        while ($notice->fetch()) {
-            $notices[] = clone($notice);
-        }
-        
-        return $notices;
+        $stream  = Notice::publicStream(0, $this->limit);
+        return $stream->fetchAll();
     }
 
      /**
@@ -84,11 +64,14 @@ class PublicrssAction extends Rss10Action
      */
     function getChannel()
     {
+        $sitename = common_config('site', 'name');
         $c = array(
-              'url' => common_local_url('publicrss')
-            , 'title' => sprintf(_('%s public timeline'), common_config('site', 'name'))
-            , 'link' => common_local_url('public')
-            , 'description' => sprintf(_('%s updates from everyone!'), common_config('site', 'name')));
+              'url' => common_local_url('publicrss'),
+            // TRANS: Public RSS feed title. %s is the StatusNet site name.
+              'title' => sprintf(_('%s public timeline'), $sitename),
+              'link' => common_local_url('public'),
+            // TRANS: Public RSS feed description. %s is the StatusNet site name.
+              'description' => sprintf(_('%s updates from everyone.'), $sitename));
         return $c;
     }
 
@@ -96,15 +79,14 @@ class PublicrssAction extends Rss10Action
      * Get image.
      *
      * @return nothing
-    */
+     */
     function getImage()
     {
         // nop
     }
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
 }
-