Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/showgroup.php b/actions/showgroup.php
index 9d4051bd89dd03db8b39d38ca2629b88f018629c..da95b6a411b4b811c4ae4bc81edb21fdd27c2130 100644 (file)
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -56,7 +56,7 @@ class ShowgroupAction extends GroupAction
      *
      * @return boolean true
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
@@ -91,16 +91,21 @@ class ShowgroupAction extends GroupAction
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-
         $this->userProfile = Profile::current();
 
-        $stream = new ThreadingGroupNoticeStream($this->group, $this->userProfile);
+        $user = common_current_user();
+
+        if (!empty($user) && $user->streamModeOnly()) {
+            $stream = new GroupNoticeStream($this->group, $this->userProfile);
+        } else {
+            $stream = new ThreadingGroupNoticeStream($this->group, $this->userProfile);
+        }
 
         $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
                                             NOTICES_PER_PAGE + 1);
@@ -118,8 +123,9 @@ class ShowgroupAction extends GroupAction
      *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
+        parent::handle();
         $this->showPage();
     }
 
@@ -140,7 +146,14 @@ class ShowgroupAction extends GroupAction
      */
     function showGroupNotices()
     {
-        $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
+        $user = common_current_user();
+
+        if (!empty($user) && $user->streamModeOnly()) {
+            $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE));
+        } else {
+            $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
+        } 
+
         $cnt = $nl->show();
 
         $this->pagination($this->page > 1,
@@ -199,28 +212,34 @@ class ShowgroupAction extends GroupAction
     function showAnonymousMessage()
     {
         if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
-            // @todo FIXME: use group full name here if available instead of (uglier) primary alias.
             // TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-            // TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+            // TRANS: %s is the group name, %%%%site.name%%%% is the site name,
             // TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
             // TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
             $m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                 'based on the Free Software [StatusNet](http://status.net/) tool. Its members share ' .
                 'short messages about their life and interests. '.
                 '[Join now](%%%%action.register%%%%) to become part of this group and many more! ([Read more](%%%%doc.help%%%%))'),
-                     $this->group->nickname);
+                     $this->group->getBestName());
         } else {
-            // @todo FIXME: use group full name here if available instead of (uglier) primary alias.
             // TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-            // TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+            // TRANS: %s is the group name, %%%%site.name%%%% is the site name,
             // TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
             $m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                 'based on the Free Software [StatusNet](http://status.net/) tool. Its members share ' .
-                'short messages about their life and interests. '),
-                     $this->group->nickname);
+                'short messages about their life and interests.'),
+                     $this->group->getBestName());
         }
         $this->elementStart('div', array('id' => 'anon_notice'));
         $this->raw(common_markup_to_html($m));
         $this->elementEnd('div');
     }
+
+    function extraHead()
+    {
+        if ($this->page != 1) {
+            $this->element('link', array('rel' => 'canonical',
+                                         'href' => $this->group->homeUrl()));
+        }
+    }
 }