X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fsubscriptionlist.php;h=f882b90c7f30b6e76094521914986943626ebd40;hb=3f28b17c86c4cd88d4f39629ea8a89ec3a820790;hp=23da64cca897989149907e6f75eb77bbfe956f6f;hpb=c2ba727d6154394fe234e9297b430ac69fd24c88;p=quix0rs-gnu-social.git

diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 23da64cca8..f882b90c7f 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -1,7 +1,6 @@
 <?php
-
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Widget to show a list of profiles
  *
@@ -21,30 +20,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Public
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008-2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/profilelist.php';
-
 /**
  * Widget to show a list of subscriptions
  *
  * @category Public
- * @package  Laconica
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @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,54 +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);
-
-        $this->out->elementStart('dl', 'entity_tags');
-        $this->out->elementStart('dt');
-        if ($this->isOwn()) {
-            $this->out->element('a', array('href' => common_local_url('tagother',
-                                                                      array('id' => $this->profile->id))),
-                                _('Tags'));
-        } else {
-            $this->out->text(_('Tags'));
-        }
-        $this->out->elementEnd('dt');
-        $this->out->elementStart('dd');
-        if ($tags) {
-            $this->out->elementStart('ul', 'tags xoxo');
-            foreach ($tags as $tag) {
-                $this->out->elementStart('li');
-                $this->out->element('span', 'mark_hash', '#');
-                $this->out->element('a', array('rel' => 'tag',
-                                               'href' => common_local_url($this->action->trimmed('action'),
-                                                                          array('nickname' => $this->owner->nickname,
-                                                                                'tag' => $tag))),
-                                    $tag);
-                $this->out->elementEnd('li');
-            }
-            $this->out->elementEnd('ul');
-        } else {
-            $this->out->text(_('(none)'));
-        }
-        $this->out->elementEnd('dd');
-        $this->out->elementEnd('dl');
+        $user = common_current_user();
+        return (!empty($user) && ($this->owner->id == $user->id));
     }
 }