Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/groupaction.php b/lib/groupaction.php
index b1a5d771979caf5c432882ada033e0eddedd3d8c..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);
 
@@ -87,7 +85,7 @@ class GroupAction extends Action
 
         $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);
         }
@@ -290,87 +288,3 @@ class GroupAction extends Action
         return $this->group;
     }
 }
-
-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 $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 $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)
-    {
-        parent::__construct(new GroupNoticeStream($group, $profile));
-    }
-}