X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fall.php;h=b9f9bdd503608ea36335672b04dfe2240ef4f8f1;hb=c2db2483a0e315f0050710bf6f224b2be3290039;hp=2826319c0d9e59ffc56c0de40e9d561efdc418f0;hpb=55b4303ea4da2a74723f7df5dbd1d83ae3922d27;p=quix0rs-gnu-social.git

diff --git a/actions/all.php b/actions/all.php
index 2826319c0d..b9f9bdd503 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, 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
@@ -55,17 +55,21 @@ 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->noticeInboxThreaded(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+        $user = common_current_user();
+
+        if (!empty($user) && $user->streamModeOnly()) {
+            $stream = new InboxNoticeStream($this->user, Profile::current());
         } else {
-            $this->notice = $this->user->noticesWithFriendsThreaded(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+            $stream = new ThreadingInboxNoticeStream($this->user, Profile::current());
         }
 
+        $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
+                                            NOTICES_PER_PAGE + 1);
+
         if ($this->page > 1 && $this->notice->N == 0) {
             // TRANS: Server error when page not found (404).
-            $this->serverError(_('No such page.'), $code = 404);
+            $this->serverError(_('No such page.'), 404);
         }
 
         return true;
@@ -86,18 +90,30 @@ class AllAction extends ProfileAction
 
     function title()
     {
-        if ($this->page > 1) {
-            // TRANS: Page title. %1$s is user nickname, %2$d is page number
-            return sprintf(_('%1$s and friends, page %2$d'), $this->user->nickname, $this->page);
+        $user = common_current_user();
+        if (!empty($user) && $user->id == $this->user->id) {
+            // TRANS: Title of a user's own start page.
+            return _('Home timeline');
         } else {
-            // TRANS: Page title. %s is user nickname
-            return sprintf(_("%s and friends"), $this->user->nickname);
+            $profile = $this->user->getProfile();
+            // TRANS: Title of another user's start page.
+            // TRANS: %s is the other user's name.
+            return sprintf(_("%s's home timeline"), $profile->getBestName());
         }
     }
 
     function getFeeds()
     {
         return array(
+            new Feed(Feed::JSON,
+                common_local_url(
+                    'ApiTimelineFriends', array(
+                        'format' => 'as',
+                        'id' => $this->user->nickname
+                    )
+                ),
+                // TRANS: %s is user nickname.
+                sprintf(_('Feed for friends of %s (Activity Streams JSON)'), $this->user->nickname)),
             new Feed(Feed::RSS1,
                 common_local_url(
                     'allrss', array(
@@ -144,7 +160,7 @@ class AllAction extends ProfileAction
                 $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);
             }
         } else {
-            // TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+            // TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
             // TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
             $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->user->nickname);
         }
@@ -157,7 +173,20 @@ class AllAction extends ProfileAction
     function showContent()
     {
         if (Event::handle('StartShowAllContent', array($this))) {
-            $nl = new ThreadedNoticeList($this->notice, $this);
+
+            $profile = null;
+
+            $current_user = common_current_user();
+
+            if (!empty($current_user)) {
+                $profile = $current_user->getProfile();
+            }
+
+            if (!empty($current_user) && $current_user->streamModeOnly()) {
+                $nl = new NoticeList($this->notice, $this);
+            } else {
+                $nl = new ThreadedNoticeList($this->notice, $this, $profile);
+            }
 
             $cnt = $nl->show();
 
@@ -174,15 +203,38 @@ class AllAction extends ProfileAction
         }
     }
 
-    function showPageTitle()
+    function showSections()
     {
-        $user = common_current_user();
-        if ($user && ($user->id == $this->user->id)) {
-            // TRANS: H1 text for page when viewing a list for self.
-            $this->element('h1', null, _("You and friends"));
-        } else {
-            // TRANS: H1 text for page. %s is a user nickname.
-            $this->element('h1', null, sprintf(_('%s and friends'), $this->user->nickname));
+        // Show invite button, as long as site isn't closed, and
+        // we have a logged in user.
+        if (!common_config('site', 'closed') && common_logged_in()) {
+            if (!common_config('site', 'private')) {
+                $ibs = new InviteButtonSection(
+                    $this,
+                    // TRANS: Button text for inviting more users to the StatusNet instance.
+                    // TRANS: Less business/enterprise-oriented language for public sites.
+                    _m('BUTTON', 'Send invite')
+                );
+            } else {
+                $ibs = new InviteButtonSection($this);
+            }
+            $ibs->show();
         }
+        // XXX: make this a little more convenient
+
+        if (!common_config('performance', 'high')) {
+            $pop = new PopularNoticeSection($this, Profile::current());
+            $pop->show();
+            $pop = new InboxTagCloudSection($this, $this->user);
+            $pop->show();
+        }
+    }
+}
+
+class ThreadingInboxNoticeStream extends ThreadingNoticeStream
+{
+    function __construct($user, $profile)
+    {
+        parent::__construct(new InboxNoticeStream($user, $profile));
     }
 }