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, 78 insertions, 33 deletions

diff --git a/actions/subscribers.php b/actions/subscribers.php
index ae52526e1..be9df2b12 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.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 a user's subscribers
+ *
+ * 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,47 +18,89 @@
  *
  * 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); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/gallery.php');
+/**
+ * List a user's subscribers
+ *
+ * @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/
+ */
 
-class SubscribersAction extends GalleryAction {
+class SubscribersAction extends GalleryAction
+{
+    function title()
+    {
+        if ($this->page == 1) {
+            return sprintf(_('%s subscribers'), $this->user->nickname);
+        } else {
+            return sprintf(_('%s subscribers, page %d'),
+                           $this->user->nickname,
+                           $this->page);
+        }
+    }
 
-	function gallery_type() {
-		return _('Subscribers');
-	}
+    function showPageNotice()
+    {
+        $user =& common_current_user();
+        if ($user && ($user->id == $this->profile->id)) {
+            $this->element('p', null,
+                           _('These are the people who listen to '.
+                             'your notices.'));
+        } else {
+            $this->element('p', null,
+                           sprintf(_('These are the people who '.
+                                     'listen to %s\'s notices.'),
+                                   $this->profile->nickname));
+        }
+    }
 
-	function get_instructions(&$profile) {
-		$user =& common_current_user();
-		if ($user && ($user->id == $profile->id)) {
-			return _('These are the people who listen to your notices.');
-		} else {
-			return sprintf(_('These are the people who listen to %s\'s notices.'), $profile->nickname);
-		}
-	}
+    function showContent()
+    {
+        $offset = ($this->page-1) * PROFILES_PER_PAGE;
+        $limit =  PROFILES_PER_PAGE + 1;
 
-	function fields() {
-		return array('subscriber', 'subscribed');
-	}
+        if ($this->tag) {
+            $subscribers = $this->user->getTaggedSubscribers($this->tag, $offset, $limit);
+        } else {
+            $subscribers = $this->user->getSubscribers($offset, $limit);
+        }
 
-	function div_class() {
-		return 'subscribers';
-	}
+        if ($subscribers) {
+            $subscribers_list = new SubscribersList($subscribers, $this->user, $this);
+            $subscribers_list->show();
+        }
 
-	function get_other(&$subs) {
-		return $subs->subscriber;
-	}
+        $subscribers->free();
 
-    function profile_list_class() {
-        return 'SubscribersList';
+        $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
+                          $this->page, 'subscribers',
+                          array('nickname' => $this->user->nickname));
     }
 }
 
-class SubscribersList extends ProfileList {
-    function show_owner_controls($profile) {
-        common_block_form($profile, array('action' => 'subscribers',
-                                          'nickname' => $this->owner->nickname));
+class SubscribersList extends ProfileList
+{
+    function showOwnerControls($profile)
+    {
+        $bf = new BlockForm($this->out, $profile,
+                            array('action' => 'subscribers',
+                                  'nickname' => $this->owner->nickname));
+        $bf->show();
     }
 }