X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fsubscriptionlist.php;h=f882b90c7f30b6e76094521914986943626ebd40;hb=3f28b17c86c4cd88d4f39629ea8a89ec3a820790;hp=ea0aa7f1abe498914afcb632aeeb2b957ee89cfa;hpb=b1d451f98bb1ac7567be68cb1168b69447b3bef0;p=quix0rs-gnu-social.git
diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index ea0aa7f1ab..f882b90c7f 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/profilelist.php';
-
/**
* Widget to show a list of subscriptions
*
@@ -43,7 +41,6 @@ require_once INSTALLDIR.'/lib/profilelist.php';
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-
class SubscriptionList extends ProfileList
{
/** Owner of this list */
@@ -56,7 +53,7 @@ class SubscriptionList extends ProfileList
$this->owner = $owner;
}
- function newListItem($profile)
+ function newListItem(Profile $profile)
{
return new SubscriptionListItem($profile, $this->owner, $this->action);
}
@@ -77,52 +74,28 @@ class SubscriptionListItem extends ProfileListItem
function showProfile()
{
$this->startProfile();
- $this->showAvatar();
+ $this->showAvatar($this->profile);
+ $this->showNickname();
$this->showFullName();
$this->showLocation();
$this->showHomepage();
$this->showBio();
// Relevant portion!
$this->showTags();
+ if ($this->isOwn()) {
+ $this->showOwnerControls();
+ }
$this->endProfile();
}
- function isOwn()
+ function showOwnerControls()
{
- $user = common_current_user();
- return (!empty($user) && ($this->owner->id == $user->id));
+ // pass
}
- function showTags()
+ function isOwn()
{
- $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
-
- if ($this->isOwn()) {
- $this->out->element('a', array('href' => common_local_url('tagother',
- array('id' => $this->profile->id))),
- // TRANS: Description for link to "tag other users" in widget to show a list of profiles.
- _('Tags'));
- } else {
- // TRANS: Text widget to show a list of profiles with their tags.
- $this->out->text(_('Tags'));
- }
- if ($tags) {
- $this->out->elementStart('ul', 'tags xoxo entity_tags');
- foreach ($tags as $tag) {
- $this->out->elementStart('li');
- // Avoid space by using raw output.
- $pt = '#' . $tag . '';
- $this->out->raw($pt);
- $this->out->elementEnd('li');
- }
- $this->out->elementEnd('ul');
- } else {
- // TRANS: Text if there are no tags in widget to show a list of profiles by tag.
- $this->out->text(_('(None)'));
- }
+ $user = common_current_user();
+ return (!empty($user) && ($this->owner->id == $user->id));
}
}