Merge branch '1.1.x'

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

diff --git a/actions/all.php b/actions/all.php
index a7f325e014567da447ee4b6f852809ca28d8477b..1d9509f6db14a29333b82a1da533855024ce9907 100644 (file)
--- 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
@@ -56,7 +56,13 @@ class AllAction extends ProfileAction
     {
         parent::prepare($args);
 
-        $stream = new ThreadingInboxNoticeStream($this->user, Profile::current());
+        $user = common_current_user();
+
+        if (!empty($user) && $user->streamModeOnly()) {
+            $stream = new InboxNoticeStream($this->user, Profile::current());
+        } else {
+            $stream = new ThreadingInboxNoticeStream($this->user, Profile::current());
+        }
 
         $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
                                             NOTICES_PER_PAGE + 1);
@@ -85,7 +91,7 @@ class AllAction extends ProfileAction
     function title()
     {
         $user = common_current_user();
-        if ($user->id == $this->user->id) {
+        if (!empty($user) && $user->id == $this->user->id) {
             // TRANS: Title of a user's own start page.
             return _('Home timeline');
         } else {
@@ -176,7 +182,11 @@ class AllAction extends ProfileAction
                 $profile = $current_user->getProfile();
             }
 
-            $nl = new ThreadedNoticeList($this->notice, $this, $profile);
+            if (!empty($current_user) && $current_user->streamModeOnly()) {
+                $nl = new NoticeList($this->notice, $this);
+            } else {
+                $nl = new ThreadedNoticeList($this->notice, $this, $profile);
+            }
 
             $cnt = $nl->show();
 
@@ -197,7 +207,7 @@ class AllAction extends ProfileAction
     {
         // 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('invite', 'enabled') && !common_config('site', 'closed') && common_logged_in()) {
             if (!common_config('site', 'private')) {
                 $ibs = new InviteButtonSection(
                     $this,
@@ -210,10 +220,14 @@ class AllAction extends ProfileAction
             }
             $ibs->show();
         }
-        $pop = new PopularNoticeSection($this);
-        $pop->show();
-        //        $pop = new InboxTagCloudSection($this, $this->user);
-        //        $pop->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();
+        }
     }
 }