Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

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

diff --git a/actions/all.php b/actions/all.php
index b65335abcdf3d2cf27aff4fe7e95261ee8771871..74a0059346b57d497867bb00e98a7037fa398b1f 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -55,17 +55,17 @@ class AllAction extends ProfileAction
     function prepare($args)
     {
         parent::prepare($args);
-        $cur = common_current_user();
 
-        if (!empty($cur) && $cur->id == $this->user->id) {
-            $this->notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-        } else {
-            $this->notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-        }
+        $stream = new InboxNoticeStream($this->user);
+
+        $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
+                                            NOTICES_PER_PAGE + 1,
+                                            null,
+                                            null);
 
         if ($this->page > 1 && $this->notice->N == 0) {
-            // TRANS: Server error when page not found (404)
-            $this->serverError(_('No such page.'), $code = 404);
+            // TRANS: Server error when page not found (404).
+            $this->serverError(_('No such page.'), 404);
         }
 
         return true;
@@ -76,6 +76,7 @@ class AllAction extends ProfileAction
         parent::handle($args);
 
         if (!$this->user) {
+            // TRANS: Client error when user not found for an action.
             $this->clientError(_('No such user.'));
             return;
         }
@@ -103,7 +104,7 @@ class AllAction extends ProfileAction
                         'nickname' =>
                         $this->user->nickname)
                 ),
-            // TRANS: %s is user nickname
+                // TRANS: %s is user nickname.
                 sprintf(_('Feed for friends of %s (RSS 1.0)'), $this->user->nickname)),
             new Feed(Feed::RSS2,
                 common_local_url(
@@ -112,7 +113,7 @@ class AllAction extends ProfileAction
                         'id' => $this->user->nickname
                     )
                 ),
-            // TRANS: %s is user nickname
+                // TRANS: %s is user nickname.
                 sprintf(_('Feed for friends of %s (RSS 2.0)'), $this->user->nickname)),
             new Feed(Feed::ATOM,
                 common_local_url(
@@ -121,20 +122,14 @@ class AllAction extends ProfileAction
                         'id' => $this->user->nickname
                     )
                 ),
-                // TRANS: %s is user nickname
+                // TRANS: %s is user nickname.
                 sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname))
         );
     }
 
-    function showLocalNav()
-    {
-        $nav = new PersonalGroupNav($this);
-        $nav->show();
-    }
-
     function showEmptyListMessage()
     {
-        // TRANS: %s is user nickname
+        // TRANS: Empty list message. %s is a user nickname.
         $message = sprintf(_('This is the timeline for %s and friends but no one has posted anything yet.'), $this->user->nickname) . ' ';
 
         if (common_logged_in()) {
@@ -144,7 +139,7 @@ class AllAction extends ProfileAction
                 // TRANS: This message contains Markdown links. Keep "](" together.
                 $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
             } else {
-                // TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
+                // TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
                 // TRANS: This message contains Markdown links. Keep "](" together.
                 $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from their profile or [post something to them](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
             }
@@ -162,7 +157,7 @@ class AllAction extends ProfileAction
     function showContent()
     {
         if (Event::handle('StartShowAllContent', array($this))) {
-            $nl = new NoticeList($this->notice, $this);
+            $nl = new ThreadedNoticeList($this->notice, $this);
 
             $cnt = $nl->show();
 
@@ -183,10 +178,10 @@ class AllAction extends ProfileAction
     {
         $user = common_current_user();
         if ($user && ($user->id == $this->user->id)) {
-            // TRANS: H1 text
+            // TRANS: H1 text for page when viewing a list for self.
             $this->element('h1', null, _("You and friends"));
         } else {
-            // TRANS: H1 text. %s is a user nickname
+            // TRANS: H1 text for page. %s is a user nickname.
             $this->element('h1', null, sprintf(_('%s and friends'), $this->user->nickname));
         }
     }