Merge remote-tracking branch 'upstream/nightly' into nightly

[quix0rs-gnu-social.git] / lib / groupaction.php

diff --git a/lib/groupaction.php b/lib/groupaction.php
index a5e62a2a5a523f3e3ea456bd4a833a4fcc0931ef..08864607377dbc2e3a357a5499e52bcde7304e40 100644 (file)
--- a/lib/groupaction.php
+++ b/lib/groupaction.php
@@ -27,9 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 define('MEMBERS_PER_SECTION', 27);
 
@@ -46,7 +44,7 @@ class GroupAction extends Action
 {
     protected $group;
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -61,40 +59,35 @@ class GroupAction extends Action
                 $args['page'] = $this->page;
             }
             common_redirect(common_local_url('showgroup', $args), 301);
-            return false;
         }
 
         if (!$nickname) {
             // TRANS: Client error displayed if no nickname argument was given requesting a group page.
             $this->clientError(_('No nickname.'), 404);
-            return false;
         }
 
-        $local = Local_group::staticGet('nickname', $nickname);
+        $local = Local_group::getKV('nickname', $nickname);
 
         if (!$local) {
-            $alias = Group_alias::staticGet('alias', $nickname);
+            $alias = Group_alias::getKV('alias', $nickname);
             if ($alias) {
                 $args = array('id' => $alias->group_id);
                 if ($this->page != 1) {
                     $args['page'] = $this->page;
                 }
                 common_redirect(common_local_url('groupbyid', $args), 301);
-                return false;
             } else {
                 common_log(LOG_NOTICE, "Couldn't find local group for nickname '$nickname'");
                 // TRANS: Client error displayed if no remote group with a given name was found requesting group page.
                 $this->clientError(_('No such group.'), 404);
-                return false;
             }
         }
 
-        $this->group = User_group::staticGet('id', $local->group_id);
+        $this->group = User_group::getKV('id', $local->group_id);
 
-        if (!$this->group) {
+        if (!$this->group instanceof User_group) {
             // TRANS: Client error displayed if no local group with a given name was found requesting group page.
             $this->clientError(_('No such group.'), 404);
-            return false;
         }
     }
 
@@ -227,10 +220,6 @@ class GroupAction extends Action
     {
         $blocked = $this->group->getBlocked(0, MEMBERS_PER_SECTION);
 
-        if (!$blocked) {
-            return;
-        }
-
         $this->elementStart('div', array('id' => 'entity_blocked',
                                          'class' => 'section'));
 
@@ -293,88 +282,9 @@ class GroupAction extends Action
 
         return $options;
     }
-}
-
-class GroupAdminSection extends ProfileSection
-{
-    var $group;
-
-    function __construct($out, $group)
-    {
-        parent::__construct($out);
-        $this->group = $group;
-    }
-
-    function getProfiles()
-    {
-        return $this->group->getAdmins();
-    }
-
-    function title()
-    {
-        // TRANS: Title for list of group administrators on a group page.
-        return _m('TITLE','Admins');
-    }
-
-    function divId()
-    {
-        return 'group_admins';
-    }
-
-    function moreUrl()
-    {
-        return null;
-    }
-}
-
-class GroupMembersMiniList extends ProfileMiniList
-{
-    function newListItem($profile)
-    {
-        return new GroupMembersMiniListItem($profile, $this->action);
-    }
-}
 
-class GroupMembersMiniListItem extends ProfileMiniListItem
-{
-    function linkAttributes()
-    {
-        $aAttrs = parent::linkAttributes();
-
-        if (common_config('nofollow', 'members')) {
-            $aAttrs['rel'] .= ' nofollow';
-        }
-
-        return $aAttrs;
-    }
-}
-
-class GroupBlockedMiniList extends ProfileMiniList
-{
-    function newListItem($profile)
-    {
-        return new GroupBlockedMiniListItem($profile, $this->action);
-    }
-}
-
-class GroupBlockedMiniListItem extends ProfileMiniListItem
-{
-    function linkAttributes()
-    {
-        $aAttrs = parent::linkAttributes();
-
-        if (common_config('nofollow', 'members')) {
-            $aAttrs['rel'] .= ' nofollow';
-        }
-
-        return $aAttrs;
-    }
-}
-
-class ThreadingGroupNoticeStream extends ThreadingNoticeStream
-{
-    function __construct($group, $profile)
+    function getGroup()
     {
-        parent::__construct(new GroupNoticeStream($group, $profile));
+        return $this->group;
     }
 }