Merge branch 'master' into groups

Conflicts:

	.gitignore

1 files changed, 53 insertions, 47 deletions

diff --git a/actions/all.php b/actions/all.php
index 526ac5f40..428466f24 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -19,80 +19,86 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once(INSTALLDIR.'/actions/showstream.php');
+require_once INSTALLDIR.'/lib/personalgroupnav.php';
+require_once INSTALLDIR.'/lib/noticelist.php';
+require_once INSTALLDIR.'/lib/feedlist.php';
 
-class AllAction extends StreamAction
+class AllAction extends Action
 {
+    var $user = null;
+    var $page = null;
 
-    function handle($args)
+    function isReadOnly()
     {
+        return true;
+    }
 
-        parent::handle($args);
-
+    function prepare($args)
+    {
+        parent::prepare($args);
         $nickname = common_canonical_nickname($this->arg('nickname'));
-        $user = User::staticGet('nickname', $nickname);
-
-        if (!$user) {
-            $this->client_error(_('No such user.'));
-            return;
+        $this->user = User::staticGet('nickname', $nickname);
+        $this->page = $this->trimmed('page');
+        if (!$this->page) {
+            $this->page = 1;
         }
+        return true;
+    }
 
-        $profile = $user->getProfile();
+    function handle($args)
+    {
+        parent::handle($args);
 
-        if (!$profile) {
-            common_server_error(_('User has no profile.'));
+        if (!$this->user) {
+            $this->clientError(_('No such user.'));
             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);
+        $this->showPage();
+    }
 
-        common_show_footer();
+    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 show_header($user)
+    function showFeeds()
     {
-        common_element('link', array('rel' => 'alternate',
+        $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('allrss', array('nickname' =>
-                                                                               $user->nickname)),
+                                                                                $this->user->nickname)),
                                      'type' => 'application/rss+xml',
-                                     'title' => sprintf(_('Feed for friends of %s'), $user->nickname)));
+                                     'title' => sprintf(_('Feed for friends of %s'), $this->user->nickname)));
     }
 
-    function show_top($user)
+    function showLocalNav()
     {
-        $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')));
+        $nav = new PersonalGroupNav($this);
+        $nav->show();
     }
 
-    function show_notices($user)
+    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')));
+    }
 
-        $page = $this->trimmed('page');
-        if (!$page) {
-            $page = 1;
-        }
+    function showContent()
+    {
+        $notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
 
-        $notice = $user->noticesWithFriends(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+        $nl = new NoticeList($notice, $this);
 
-        $cnt = $this->show_notice_list($notice);
+        $cnt = $nl->show();
 
-        common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-                          $page, 'all', array('nickname' => $user->nickname));
+        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
+                          $this->page, 'all', array('nickname' => $this->user->nickname));
     }
 }