GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Cleaning up Directory plugin lists

This commit is contained in:
Mikael Nordfeldth 2015-07-10 23:19:54 +02:00
parent ad453785f0
commit 961031bc28
3 changed files with 5 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/profilelistitem.php
View File

@ -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);

31
plugins/Directory/lib/sortablegrouplist.php
View File

@ -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)) {

20
plugins/Directory/lib/sortablesubscriptionlist.php
View File

@ -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(