X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpublic.php;h=06ee75b8d1c5fa9b72b52393b0554c90f1669f3a;hb=0a2c51510ca785b5e3564fc0830518527929dc38;hp=d2b0373dc69382aad8951b88cc9f664117e90164;hpb=31c1177970124cee31823cab3a11542c23b4126d;p=quix0rs-gnu-social.git

diff --git a/actions/public.php b/actions/public.php
index d2b0373dc6..06ee75b8d1 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -27,13 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/publicgroupnav.php';
-require_once INSTALLDIR.'/lib/noticelist.php';
-require_once INSTALLDIR.'/lib/feedlist.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 // Farther than any human will go
 
@@ -51,7 +45,7 @@ define('MAX_PUBLIC_PAGE', 100);
  * @see      PublicrssAction
  * @see      PublicxrdsAction
  */
-class PublicAction extends Action
+class PublicAction extends ManagedAction
 {
     /**
      * page of the stream we're on; default = 1
@@ -60,21 +54,15 @@ class PublicAction extends Action
     var $page = null;
     var $notice;
 
+    protected $stream = null;
+
     function isReadOnly($args)
     {
         return true;
     }
 
-    /**
-     * Read and validate arguments
-     *
-     * @param array $args URL parameters
-     *
-     * @return boolean success value
-     */
-    function prepare($args)
+    protected function doPreparation()
     {
-        parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
         if ($this->page > MAX_PUBLIC_PAGE) {
@@ -85,37 +73,31 @@ class PublicAction extends Action
 
         common_set_returnto($this->selfUrl());
 
-        $this->notice = Notice::publicStream(($this->page-1)*NOTICES_PER_PAGE,
-                                       NOTICES_PER_PAGE + 1);
+        $this->streamPrepare();
+
+        $this->notice = $this->stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
+                                            NOTICES_PER_PAGE + 1);
 
         if (!$this->notice) {
             // TRANS: Server error displayed when a public timeline cannot be retrieved.
-            $this->serverError(_('Could not retrieve public stream.'));
-            return;
+            $this->serverError(_('Could not retrieve public timeline.'));
         }
 
-        if($this->page > 1 && $this->notice->N == 0){
-            // TRANS: Server error when page not found (404).
-            $this->serverError(_('No such page.'),$code=404);
+        if ($this->page > 1 && $this->notice->N == 0){
+            // TRANS: Client error when page not found (404).
+            $this->clientError(_('No such page.'), 404);
         }
 
         return true;
     }
 
-    /**
-     * handle request
-     *
-     * Show the public stream, using recipe method showPage()
-     *
-     * @param array $args arguments, mostly unused
-     *
-     * @return void
-     */
-    function handle($args)
+    protected function streamPrepare()
     {
-        parent::handle($args);
-
-        $this->showPage();
+        if ($this->scoped instanceof Profile && $this->scoped->isLocal() && $this->scoped->getUser()->streamModeOnly()) {
+            $this->stream = new PublicNoticeStream($this->scoped);
+        } else {
+            $this->stream = new ThreadingPublicNoticeStream($this->scoped);
+        }
     }
 
     /**
@@ -148,6 +130,11 @@ class PublicAction extends Action
         $this->element('link', array('rel' => 'EditURI',
                                      'type' => 'application/rsd+xml',
                                      'href' => $rsd));
+
+        if ($this->page != 1) {
+            $this->element('link', array('rel' => 'canonical',
+                                         'href' => common_local_url('public')));
+        }
     }
 
     /**
@@ -157,19 +144,24 @@ class PublicAction extends Action
      */
     function getFeeds()
     {
-        return array(new Feed(Feed::RSS1, common_local_url('publicrss'),
+        return array(new Feed(Feed::JSON,
+                              common_local_url('ApiTimelinePublic',
+                                               array('format' => 'as')),
+                              // TRANS: Link description for public timeline feed.
+                              _('Public Timeline Feed (Activity Streams JSON)')),
+                    new Feed(Feed::RSS1, common_local_url('publicrss'),
                               // TRANS: Link description for public timeline feed.
-                              _('Public Stream Feed (RSS 1.0)')),
+                              _('Public Timeline Feed (RSS 1.0)')),
                      new Feed(Feed::RSS2,
                               common_local_url('ApiTimelinePublic',
                                                array('format' => 'rss')),
                               // TRANS: Link description for public timeline feed.
-                              _('Public Stream Feed (RSS 2.0)')),
+                              _('Public Timeline Feed (RSS 2.0)')),
                      new Feed(Feed::ATOM,
                               common_local_url('ApiTimelinePublic',
                                                array('format' => 'atom')),
                               // TRANS: Link description for public timeline feed.
-                              _('Public Stream Feed (Atom)')));
+                              _('Public Timeline Feed (Atom)')));
     }
 
     function showEmptyList()
@@ -203,7 +195,11 @@ class PublicAction extends Action
      */
     function showContent()
     {
-        $nl = new ThreadedNoticeList($this->notice, $this);
+        if ($this->scoped instanceof Profile && $this->scoped->isLocal() && $this->scoped->getUser()->streamModeOnly()) {
+            $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE));
+        } else {
+            $nl = new ThreadedNoticeList($this->notice, $this, $this->scoped);
+        }
 
         $cnt = $nl->show();
 
@@ -212,19 +208,33 @@ class PublicAction extends Action
         }
 
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
-                          $this->page, 'public');
+                          $this->page, $this->action);
     }
 
     function showSections()
     {
-        // $top = new TopPostersSection($this);
-        // $top->show();
-        $pop = new PopularNoticeSection($this);
-        $pop->show();
-        $gbp = new GroupsByMembersSection($this);
-        $gbp->show();
-        $ptp = new PeopletagsBySubsSection($this);
-        $ptp->show();
+        // Show invite button, as long as site isn't closed, and
+        // we have a logged in user.
+        if (common_config('invite', 'enabled') && !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();
+        }
+
+        $p = Profile::current();
+
+        if (!common_config('performance', 'high')) {
+            $cloud = new PublicTagCloudSection($this);
+            $cloud->show();
+        }
         $feat = new FeaturedUsersSection($this);
         $feat->show();
     }