X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fuserrss.php;h=8a940865f947f872e562faad8deb0bc2cb7d5fac;hb=da512ad8c2b4cba719204d8a8f42ecba9716702e;hp=b5cb5a40a062c446bb36a075a1d1fe7b83670ced;hpb=edbc0c665cc65875b4d14b79939233b1c9c06bb6;p=quix0rs-gnu-social.git

diff --git a/actions/userrss.php b/actions/userrss.php
index b5cb5a40a0..8a940865f9 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, 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
@@ -23,32 +23,57 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class UserrssAction extends Rss10Action {
+class UserrssAction extends Rss10Action
+{
+    var $user = null;
+    var $tag  = null;
 
-    var $user = NULL;
-
-    function init() {
-        $nickname = $this->trimmed('nickname');
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $nickname   = $this->trimmed('nickname');
         $this->user = User::staticGet('nickname', $nickname);
+        $this->tag  = $this->trimmed('tag');
 
         if (!$this->user) {
-            common_user_error(_('No such user.'));
+            $this->clientError(_('No such user.'));
             return false;
         } else {
             return true;
         }
     }
 
-    function get_notices($limit=0) {
+    function getTaggedNotices($tag = null, $limit=0)
+    {
+        $user = $this->user;
+
+        if (is_null($user)) {
+            return null;
+        }
+
+        $notice = $user->getTaggedNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit, 0, 0, null, $tag);
+
+        $notices = array();
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+        return $notices;
+    }
+
+
+    function getNotices($limit=0)
+    {
 
         $user = $this->user;
-        
+
         if (is_null($user)) {
-            return NULL;
+            return null;
         }
-        
+
         $notice = $user->getNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
-        
+
+        $notices = array();
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
@@ -56,7 +81,8 @@ class UserrssAction extends Rss10Action {
         return $notices;
     }
 
-    function get_channel() {
+    function getChannel()
+    {
         $user = $this->user;
         $profile = $user->getProfile();
         $c = array('url' => common_local_url('userrss',
@@ -68,23 +94,30 @@ class UserrssAction extends Rss10Action {
         return $c;
     }
 
-    function get_image() {
+    function getImage()
+    {
         $user = $this->user;
         $profile = $user->getProfile();
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            $this->server_error(_('User without matching profile'));
-            return NULL;
+            $this->serverError(_('User without matching profile'));
+            return null;
         }
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-        return ($avatar) ? $avatar->url : NULL;
+        return ($avatar) ? $avatar->url : null;
     }
 
     # override parent to add X-SUP-ID URL
-    
-    function init_rss($limit=0) {
-        $url = common_local_url('sup', NULL, $this->user->id);
+
+    function initRss($limit=0)
+    {
+        $url = common_local_url('sup', null, null, $this->user->id);
         header('X-SUP-ID: '.$url);
-        parent::init_rss($limit);
+        parent::initRss($limit);
+    }
+
+    function isReadOnly($args)
+    {
+        return true;
     }
-}
\ No newline at end of file
+}