Merge branch '0.8.x' into userdesign

* 0.8.x: (32 commits)
  updates to Status_network
  makeadmin action
  make admins of groups
  show aliases when showing a group
  Link and distribute notices tagged for a group alias
  Code for adding and saving group aliases
  Styles for group block
  add correct li for css magic for block stuff
  typo in profileminilist class
  return count from show
  try to get the right class for profileminilist
  fix perms for classes/statusnet.ini
  fixup perms for classes
  Added Group_alias class
  add a table for group aliases
  Cross-browser notice_attach
  Allow users to be unblocked from a group
  Some UI improvements for blocking and unblocking
  The rest of the things necessary to make group block work
  Make group block work
  ...

Conflicts:
	db/laconica.sql
	lib/common.php

1 files changed, 131 insertions, 0 deletions

diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
new file mode 100644
index 000000000..23da64cca
--- /dev/null
+++ b/lib/subscriptionlist.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Widget to show a list of profiles
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * 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.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!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>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class SubscriptionList extends ProfileList
+{
+    /** Owner of this list */
+    var $owner = null;
+
+    function __construct($profile, $owner=null, $action=null)
+    {
+        parent::__construct($profile, $action);
+
+        $this->owner = $owner;
+    }
+
+    function newListItem($profile)
+    {
+        return new SubscriptionListItem($profile, $this->owner, $this->action);
+    }
+}
+
+class SubscriptionListItem extends ProfileListItem
+{
+    /** Owner of this list */
+    var $owner = null;
+
+    function __construct($profile, $owner, $action)
+    {
+        parent::__construct($profile, $action);
+
+        $this->owner = $owner;
+    }
+
+    function showProfile()
+    {
+        $this->startProfile();
+        $this->showAvatar();
+        $this->showFullName();
+        $this->showLocation();
+        $this->showHomepage();
+        $this->showBio();
+        // Relevant portion!
+        $this->showTags();
+        $this->endProfile();
+    }
+
+    function isOwn()
+    {
+        $user = common_current_user();
+        return (!empty($user) && ($this->owner->id == $user->id));
+    }
+
+    function showTags()
+    {
+        $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');
+    }
+}