Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 3ca4603948004536195bca3e04d828dc68df743d..f882b90c7f30b6e76094521914986943626ebd40 100644 (file)
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
@@ -32,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/profilelist.php';
-
 /**
  * Widget to show a list of subscriptions
  *
@@ -44,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 */
@@ -57,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);
     }
@@ -78,49 +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))),
-                                _('Tags'));
-        } else {
-            $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 = '<span class="mark_hash">#</span><a rel="tag" href="' .
-                  common_local_url($this->action->trimmed('action'),
-                                   array('nickname' => $this->owner->nickname,
-                                   'tag' => $tag)) .
-                  '">' . $tag . '</a>';
-                $this->out->raw($pt);
-                $this->out->elementEnd('li');
-            }
-            $this->out->elementEnd('ul');
-        } else {
-            $this->out->text(_('(None)'));
-        }
+        $user = common_current_user();
+        return (!empty($user) && ($this->owner->id == $user->id));
     }
 }