X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fall.php;h=bd5b9f01e5f5dce8f642ea28300ee47d6d6734a1;hb=69a1cea319f22362d197cb8a0fc9ab19abdf8548;hp=a8b08565aa83e1884fcaba3b08cdbfd08544c68e;hpb=50c7e4c722a39582c185eafe452f0b321dd39e7e;p=quix0rs-gnu-social.git

diff --git a/actions/all.php b/actions/all.php
index a8b08565aa..bd5b9f01e5 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -31,77 +31,71 @@ class AllAction extends StreamAction {
 		$user = User::staticGet('nickname', $nickname);
 
 		if (!$user) {
-			$this->no_such_user();
+			$this->client_error(_('No such user.'));
 			return;
 		}
 
 		$profile = $user->getProfile();
 
 		if (!$profile) {
-			common_server_error(_t('User record exists without profile.'));
+			common_server_error(_('User has no profile.'));
 			return;
 		}
 
 		# Looks like we're good; show the header
 
-		common_show_header($profile->nickname . _t(" and friends"),
+		common_show_header(sprintf(_("%s and friends"), $profile->nickname),
 						   array($this, 'show_header'), $user,
 						   array($this, 'show_top'));
-		
-		$this->show_notices($profile);
-		
+
+		$this->show_notices($user);
+
 		common_show_footer();
 	}
-	
+
 	function show_header($user) {
 		common_element('link', array('rel' => 'alternate',
 									 'href' => common_local_url('allrss', array('nickname' =>
 																			   $user->nickname)),
 									 'type' => 'application/rss+xml',
-									 'title' => _t('Feed for friends of ') . $user->nickname));
+									 'title' => sprintf(_('Feed for friends of %s'), $user->nickname)));
 	}
 
 	function show_top($user) {
 		$cur = common_current_user();
-		
+
 		if ($cur && $cur->id == $user->id) {
 			common_notice_form('all');
 		}
-		
+
 		$this->views_menu();
 	}
-	
-	function show_notices($profile) {
-
-		$notice = DB_DataObject::factory('notice');
-
-		# XXX: chokety and bad
 
-		$notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$profile->id.' and subscribed = notice.profile_id)', 'OR');
-		$notice->whereAdd('profile_id = ' . $profile->id, 'OR');
+	function show_notices($user) {
 
-		$notice->orderBy('created DESC');
-
-		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-
-		$notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
-
-		$cnt = $notice->find();
-
-		if ($cnt > 0) {
-			common_element_start('ul', array('id' => 'notices'));
-			for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-				if ($notice->fetch()) {
-					$this->show_notice($notice);
-				} else {
-					// shouldn't happen!
-					break;
-				}
-			}
-			common_element_end('ul');
+		$page = $this->trimmed('page');
+		if (!$page) {
+			$page = 1;
 		}
 		
+		$notice = $user->noticesWithFriends(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+											
+		common_element_start('ul', array('id' => 'notices'));
+		
+		$cnt = 0;
+		
+		while ($notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
+			$cnt++;
+			
+			if ($cnt > NOTICES_PER_PAGE) {
+				break;
+			}
+			
+			$this->show_notice($notice);
+		}
+		common_element_end('ul');
+
 		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-						  $page, 'all', array('nickname' => $profile->nickname));
+						  $page, 'all', array('nickname' => $user->nickname));
 	}
 }