X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fallrss.php;h=573bb4eb2fac27c83a200df9d8b40bfa6347ed2a;hb=fb315c6f618d8b1635442c70964f7ab14e53385e;hp=bacb343ce089954417e4af6da52f78d895107f6c;hpb=f06c5f78733790aa5888510bd97b198a4278e826;p=quix0rs-gnu-social.git

diff --git a/actions/allrss.php b/actions/allrss.php
index bacb343ce0..573bb4eb2f 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -1,19 +1,18 @@
 <?php
-
 /**
- * Public RSS action class.
+ * RSS feed for user and friends timeline 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, Controlez-Vous, 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,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -41,31 +40,36 @@ 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 AllrssAction extends Rss10Action
 {
-
     var $user = null;
 
     /**
      * Initialization.
-     * 
+     *
+     * @param array $args Web and URL arguments
+     *
      * @return boolean false if user doesn't exist
+     *
      */
-    function init()
+    function prepare($args)
     {
+        parent::prepare($args);
         $nickname   = $this->trimmed('nickname');
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
+            // TRANS: Client error when user not found for an rss related action.
             $this->clientError(_('No such user.'));
             return false;
         } else {
+            $this->notices = $this->getNotices($this->limit);
             return true;
         }
     }
@@ -79,9 +83,18 @@ class AllrssAction extends Rss10Action
      */
     function getNotices($limit=0)
     {
-        $user   = $this->user;
-        $notice = $user->noticesWithFriends(0, $limit);
-                                            
+        $cur = common_current_user();
+        $user = $this->user;
+
+        if (!empty($cur) && $cur->id == $user->id) {
+            $notice = $this->user->noticeInbox(0, $limit);
+        } else {
+            $notice = $this->user->noticesWithFriends(0, $limit);
+        }
+
+        $notice  = $user->noticesWithFriends(0, $limit);
+        $notices = array();
+
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
@@ -100,11 +113,14 @@ class AllrssAction extends Rss10Action
         $c    = array('url' => common_local_url('allrss',
                                              array('nickname' =>
                                                    $user->nickname)),
+                   // TRANS: Message is used as link title. %s is a user nickname.
                    'title' => sprintf(_('%s and friends'), $user->nickname),
                    'link' => common_local_url('all',
                                              array('nickname' =>
                                                    $user->nickname)),
-                   'description' => sprintf(_('Feed for friends of %s'), $user->nickname));
+                   // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+                   'description' => sprintf(_('Updates from %1$s and friends on %2$s!'),
+                                            $user->nickname, common_config('site', 'name')));
         return $c;
     }
 
@@ -112,7 +128,7 @@ class AllrssAction extends Rss10Action
      * Get image.
      *
      * @return string user avatar URL or null
-    */
+     */
     function getImage()
     {
         $user    = $this->user;
@@ -124,4 +140,3 @@ class AllrssAction extends Rss10Action
         return $avatar ? $avatar->url : null;
     }
 }
-