better output for registration confirmation

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

diff --git a/actions/public.php b/actions/public.php
index 871859cd331edc43c6c72a0ffd94d204c500753a..6ab9d1de9c0687bcf51a4cde115c991fe75ac8c7 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -59,6 +59,7 @@ class PublicAction extends Action
 
     var $page = null;
     var $notice;
+    var $userProfile = null;
 
     function isReadOnly($args)
     {
@@ -85,11 +86,12 @@ class PublicAction extends Action
 
         common_set_returnto($this->selfUrl());
 
-        $stream = new PublicNoticeStream(PublicNoticeStream::THREADED);
+        $this->userProfile = Profile::current();
+
+        $stream = new ThreadingPublicNoticeStream($this->userProfile);
+
         $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
-                                            NOTICES_PER_PAGE + 1,
-                                            0,
-                                            0);
+                                            NOTICES_PER_PAGE + 1);
 
         if (!$this->notice) {
             // TRANS: Server error displayed when a public timeline cannot be retrieved.
@@ -206,7 +208,7 @@ class PublicAction extends Action
      */
     function showContent()
     {
-        $nl = new ThreadedNoticeList($this->notice, $this);
+        $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
 
         $cnt = $nl->show();
 
@@ -220,14 +222,12 @@ class PublicAction extends Action
 
     function showSections()
     {
-        // $top = new TopPostersSection($this);
-        // $top->show();
+        $ibs = new InviteButtonSection($this);
+        $ibs->show();
         $pop = new PopularNoticeSection($this);
         $pop->show();
         $gbp = new GroupsByMembersSection($this);
         $gbp->show();
-        $ptp = new PeopletagsBySubsSection($this);
-        $ptp->show();
         $feat = new FeaturedUsersSection($this);
         $feat->show();
     }
@@ -252,3 +252,11 @@ class PublicAction extends Action
         $this->elementEnd('div');
     }
 }
+
+class ThreadingPublicNoticeStream extends ThreadingNoticeStream
+{
+    function __construct($profile)
+    {
+        parent::__construct(new PublicNoticeStream($profile));
+    }
+}