From: Mikael Nordfeldth Date: Fri, 10 Jul 2015 21:19:54 +0000 (+0200) Subject: Cleaning up Directory plugin lists X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=961031bc28714e008497b2ce9f89d2f69f7f2d39;p=quix0rs-gnu-social.git Cleaning up Directory plugin lists --- diff --git a/lib/profilelistitem.php b/lib/profilelistitem.php index e21ff04ebe..6fe7b99c7b 100644 --- a/lib/profilelistitem.php +++ b/lib/profilelistitem.php @@ -37,7 +37,8 @@ class ProfileListItem extends Widget /** Action object using us. */ var $action = null; - function __construct(Profile $target, HTMLOutputter $action) + // FIXME: Directory plugin sends a User_group here, but should send a Profile and handle User_group specifics itself + function __construct($target, HTMLOutputter $action) { parent::__construct($action); diff --git a/plugins/Directory/lib/sortablegrouplist.php b/plugins/Directory/lib/sortablegrouplist.php index 7474d0daa6..ab00068f6d 100644 --- a/plugins/Directory/lib/sortablegrouplist.php +++ b/plugins/Directory/lib/sortablegrouplist.php @@ -27,11 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { - exit(1); -} - -require_once INSTALLDIR . '/lib/subscriptionlist.php'; +if (!defined('GNUSOCIAL')) { exit(1); } /** * Widget to show a sortable list of subscriptions @@ -44,16 +40,6 @@ require_once INSTALLDIR . '/lib/subscriptionlist.php'; */ class SortableGroupList extends SortableSubscriptionList { - /** Owner of this list */ - var $owner = null; - - function __construct($profile, $owner=null, $action=null) - { - parent::__construct($profile, $owner, $action); - - $this->owner = $owner; - } - function startList() { $this->out->elementStart('table', array('class' => 'profile_list xoxo')); @@ -119,25 +105,14 @@ class SortableGroupList extends SortableSubscriptionList $this->out->elementStart('tbody'); } - function newListItem($profile, $odd) + function newListItem($profile) { - return new SortableGroupListItem($profile, $this->owner, $this->action, $odd); + return new SortableGroupListItem($profile, $this->owner, $this->action); } } class SortableGroupListItem extends SortableSubscriptionListItem { - /** Owner of this list */ - var $owner = null; - - function __construct($profile, $owner, $action, $alt) - { - parent::__construct($profile, $owner, $action, $alt); - - $this->alt = $alt; // is this row alternate? - $this->owner = $owner; - } - function showHomepage() { if (!empty($this->profile->homepage)) { diff --git a/plugins/Directory/lib/sortablesubscriptionlist.php b/plugins/Directory/lib/sortablesubscriptionlist.php index d6df6c64cd..719834bc91 100644 --- a/plugins/Directory/lib/sortablesubscriptionlist.php +++ b/plugins/Directory/lib/sortablesubscriptionlist.php @@ -40,16 +40,6 @@ if (!defined('GNUSOCIAL')) { exit(1); } */ class SortableSubscriptionList extends SubscriptionList { - /** Owner of this list */ - var $owner = null; - - function __construct($profile, $owner=null, $action=null) - { - parent::__construct($profile, $owner, $action); - - $this->owner = $owner; - } - function startList() { $this->out->elementStart('table', array('class' => 'profile_list xoxo')); @@ -132,16 +122,6 @@ class SortableSubscriptionList extends SubscriptionList class SortableSubscriptionListItem extends SubscriptionListItem { - /** Owner of this list */ - var $owner = null; - - function __construct($profile, $owner, $action) - { - parent::__construct($profile, $owner, $action); - - $this->owner = $owner; - } - function startItem() { $attr = array(