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, 82 insertions, 71 deletions

diff --git a/actions/all.php b/actions/all.php
index 2a26e48d4..428466f24 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -19,75 +19,86 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once(INSTALLDIR.'/actions/showstream.php');
-
-class AllAction extends StreamAction {
-
-	function handle($args) {
-
-		parent::handle($args);
-
-		$nickname = common_canonical_nickname($this->arg('nickname'));
-		$user = User::staticGet('nickname', $nickname);
-
-		if (!$user) {
-			$this->client_error(_('No such user.'));
-			return;
-		}
-
-		$profile = $user->getProfile();
-
-		if (!$profile) {
-			common_server_error(_('User has no profile.'));
-			return;
-		}
-
-		# Looks like we're good; show the header
-
-		common_show_header(sprintf(_("%s and friends"), $profile->nickname),
-						   array($this, 'show_header'), $user,
-						   array($this, 'show_top'));
-
-		$this->show_notices($user);
-
-		common_show_footer();
-	}
-
-	function show_header($user) {
-		common_element('link', array('rel' => 'alternate',
-									 'href' => common_local_url('allrss', array('nickname' =>
-																			   $user->nickname)),
-									 'type' => 'application/rss+xml',
-									 'title' => sprintf(_('Feed for friends of %s'), $user->nickname)));
-	}
-
-	function show_top($user) {
-		$cur = common_current_user();
-
-		if ($cur && $cur->id == $user->id) {
-			common_notice_form('all');
-		}
-
-		$this->views_menu();
-
-		$this->show_feeds_list(array(0=>array('href'=>common_local_url('allrss', array('nickname' => $user->nickname)),
-											  'type' => 'rss',
-											  'version' => 'RSS 1.0',
-											  'item' => 'allrss')));
-	}
-
-	function show_notices($user) {
-
-		$page = $this->trimmed('page');
-		if (!$page) {
-			$page = 1;
-		}
-
-		$notice = $user->noticesWithFriends(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-
-        $cnt = $this->show_notice_list($notice);
-
-		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-						  $page, 'all', array('nickname' => $user->nickname));
-	}
+require_once INSTALLDIR.'/lib/personalgroupnav.php';
+require_once INSTALLDIR.'/lib/noticelist.php';
+require_once INSTALLDIR.'/lib/feedlist.php';
+
+class AllAction extends Action
+{
+    var $user = null;
+    var $page = null;
+
+    function isReadOnly()
+    {
+        return true;
+    }
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $nickname = common_canonical_nickname($this->arg('nickname'));
+        $this->user = User::staticGet('nickname', $nickname);
+        $this->page = $this->trimmed('page');
+        if (!$this->page) {
+            $this->page = 1;
+        }
+        return true;
+    }
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (!$this->user) {
+            $this->clientError(_('No such user.'));
+            return;
+        }
+
+        $this->showPage();
+    }
+
+    function title()
+    {
+        if ($this->page > 1) {
+            return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page);
+        } else {
+            return sprintf(_("%s and friends"), $this->user->nickname);
+        }
+    }
+
+    function showFeeds()
+    {
+        $this->element('link', array('rel' => 'alternate',
+                                     'href' => common_local_url('allrss', array('nickname' =>
+                                                                                $this->user->nickname)),
+                                     'type' => 'application/rss+xml',
+                                     'title' => sprintf(_('Feed for friends of %s'), $this->user->nickname)));
+    }
+
+    function showLocalNav()
+    {
+        $nav = new PersonalGroupNav($this);
+        $nav->show();
+    }
+
+    function showExportData()
+    {
+        $fl = new FeedList($this);
+        $fl->show(array(0=>array('href'=>common_local_url('allrss', array('nickname' => $this->user->nickname)),
+                                 'type' => 'rss',
+                                 'version' => 'RSS 1.0',
+                                 'item' => 'allrss')));
+    }
+
+    function showContent()
+    {
+        $notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+
+        $nl = new NoticeList($notice, $this);
+
+        $cnt = $nl->show();
+
+        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
+                          $this->page, 'all', array('nickname' => $this->user->nickname));
+    }
 }