X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fallrss.php;h=56818d605c708de1d24130eeebfadba118eeabd4;hb=6edbf3ca781d20f2ec98daf32080c60e804d8215;hp=e9280024c4886bf09d51b660695ae9970437534f;hpb=0f502b8d8656bf9f1340611893dd0e4d736aeea3;p=quix0rs-gnu-social.git

diff --git a/actions/allrss.php b/actions/allrss.php
index e9280024c4..56818d605c 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -23,62 +23,60 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class AllrssAction extends Rss10Action {
-
-	var $user = NULL;
-
-	function init() {
-		$nickname = $this->trimmed('nickname');
-		$this->user = User::staticGet('nickname', $nickname);
-
-		if (!$this->user) {
-			common_user_error(_('No such nickname.'));
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	function get_notices($limit=0) {
-
-		$user = $this->user;
-		$notices = array();
-
-		$notice = DB_DataObject::factory('notice');
-
-		$notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$user->id.' and subscribed = notice.profile_id)', 'OR');
-		$notice->whereAdd('profile_id = ' . $user->id, 'OR');
-
-		$notice->orderBy('created DESC');
-		if ($limit != 0) {
-			$notice->limit(0, $limit);
-		}
-		$notice->find();
-
-		while ($notice->fetch()) {
-			$notices[] = clone($notice);
-		}
-
-		return $notices;
-	}
-
-	function get_channel() {
-		$user = $this->user;
-		$c = array('url' => common_local_url('allrss',
-											 array('nickname' =>
-												   $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));
-		return $c;
-	}
-
-	function get_image() {
-		$user = $this->user;
-		$profile = $user->getProfile();
-		$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-		return ($avatar) ? $avatar->url : NULL;
-	}
+class AllrssAction extends Rss10Action
+{
+
+    var $user = null;
+
+    function init()
+    {
+        $nickname = $this->trimmed('nickname');
+        $this->user = User::staticGet('nickname', $nickname);
+
+        if (!$this->user) {
+            $this->clientError(_('No such user.'));
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    function get_notices($limit=0)
+    {
+
+        $user = $this->user;
+        
+        $notice = $user->noticesWithFriends(0, $limit);
+                                            
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+        return $notices;
+    }
+
+    function get_channel()
+    {
+        $user = $this->user;
+        $c = array('url' => common_local_url('allrss',
+                                             array('nickname' =>
+                                                   $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));
+        return $c;
+    }
+
+    function get_image()
+    {
+        $user = $this->user;
+        $profile = $user->getProfile();
+        if (!$profile) {
+            return null;
+        }
+        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+        return ($avatar) ? $avatar->url : null;
+    }
 }
\ No newline at end of file