Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 94 insertions, 44 deletions

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index f518a1f92..d7ba0d624 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * List of a user's subscriptions
+ *
+ * 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.
@@ -15,64 +18,111 @@
  *
  * 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  Social
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@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);
+}
+
+/**
+ * A list of the user's subscriptions
+ *
+ * @category Social
+ * @package  Laconica
+ * @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/
  */
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once(INSTALLDIR.'/lib/gallery.php');
+class SubscriptionsAction extends GalleryAction
+{
+    function title()
+    {
+        if ($this->page == 1) {
+            return sprintf(_('%s subscriptions'), $this->user->nickname);
+        } else {
+            return sprintf(_('%s subscriptions, page %d'),
+                           $this->user->nickname,
+                           $this->page);
+        }
+    }
+
+    function showPageNotice()
+    {
+        $user =& common_current_user();
+        if ($user && ($user->id == $this->profile->id)) {
+            $this->element('p', null,
+                           _('These are the people whose notices '.
+                             'you listen to.'));
+        } else {
+            $this->element('p', null,
+                           sprintf(_('These are the people whose '.
+                                     'notices %s listens to.'),
+                                   $this->profile->nickname));
+        }
+    }
 
-class SubscriptionsAction extends GalleryAction {
+    function getAllTags()
+    {
+        return $this->getTags('subscribed', 'subscriber');
+    }
 
-	function gallery_type() {
-		return _('Subscriptions');
-	}
+    function showContent()
+    {
+        parent::showContent();
 
-	function get_instructions(&$profile) {
-		$user =& common_current_user();
-		if ($user && ($user->id == $profile->id)) {
-			return _('These are the people whose notices you listen to.');
-		} else {
-			return sprintf(_('These are the people whose notices %s listens to.'), $profile->nickname);
-		}
-	}
+        $offset = ($this->page-1) * PROFILES_PER_PAGE;
+        $limit =  PROFILES_PER_PAGE + 1;
 
-	function fields() {
-		return array('subscribed', 'subscriber');
-	}
+        if ($this->tag) {
+            $subscriptions = $this->user->getTaggedSubscriptions($this->tag, $offset, $limit);
+        } else {
+            $subscriptions = $this->user->getSubscriptions($offset, $limit);
+        }
 
-	function div_class() {
-		return 'subscriptions';
-	}
+        if ($subscriptions) {
+            $subscriptions_list = new SubscriptionsList($subscriptions, $this->user, $this);
+            $subscriptions_list->show();
+        }
 
-	function get_other(&$subs) {
-		return $subs->subscribed;
-	}
+        $subscriptions->free();
 
-    function profile_list_class() {
-        return 'SubscriptionsList';
+        $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
+                          $this->page, 'subscriptions',
+                          array('nickname' => $this->user->nickname));
     }
 }
 
-class SubscriptionsList extends ProfileList {
-
-    function show_owner_controls($profile) {
-
-		$sub = Subscription::pkeyGet(array('subscriber' => $this->owner->id,
-										   'subscribed' => $profile->id));
+class SubscriptionsList extends ProfileList
+{
+    function showOwnerControls($profile)
+    {
+        $sub = Subscription::pkeyGet(array('subscriber' => $this->owner->id,
+                                           'subscribed' => $profile->id));
         if (!$sub) {
             return;
         }
 
-        common_element_start('form', array('id' => 'subedit-' . $profile->id,
-                                           'method' => 'post',
-                                           'class' => 'subedit',
-                                           'action' => common_local_url('subedit')));
-        common_hidden('token', common_session_token());
-        common_hidden('profile', $profile->id);
-        common_checkbox('jabber', _('Jabber'), $sub->jabber);
-        common_checkbox('sms', _('SMS'), $sub->sms);
-        common_submit('save', _('Save'));
-        common_element_end('form');
+        $this->out->elementStart('form', array('id' => 'subedit-' . $profile->id,
+                                          'method' => 'post',
+                                          'class' => 'form_subcription_edit',
+                                          'action' => common_local_url('subedit')));
+        $this->out->hidden('token', common_session_token());
+        $this->out->hidden('profile', $profile->id);
+        $this->out->checkbox('jabber', _('Jabber'), $sub->jabber);
+        $this->out->checkbox('sms', _('SMS'), $sub->sms);
+        $this->out->submit('save', _('Save'));
+        $this->out->elementEnd('form');
         return;
     }
 }