generate an etag for shownotice

[quix0rs-gnu-social.git] / actions / all.php

diff --git a/actions/all.php b/actions/all.php
index c19440052f157b5e18eed24e7d7b22dc5450b947..729b8dd16aec644e619fa6040967e5baa0e64216 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -31,77 +31,76 @@ class AllAction extends StreamAction {
                $user = User::staticGet('nickname', $nickname);
 
                if (!$user) {
-                       $this->client_error(_t('No such user: ') . $nickname);
+                       $this->client_error(_('No such user.'));
                        return;
                }
 
                $profile = $user->getProfile();
 
                if (!$profile) {
-                       common_server_error(_t('User record exists without profile.'));
+                       common_server_error(_('User has no profile.'));
                        return;
                }
 
                # Looks like we're good; show the header
 
-               common_show_header($profile->nickname . _t(" and friends"),
+               common_show_header(sprintf(_("%s and friends"), $profile->nickname),
                                                   array($this, 'show_header'), $user,
                                                   array($this, 'show_top'));
-               
-               $this->show_notices($profile);
-               
+
+               $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' => _t('Feed for friends of ') . $user->nickname));
+                                                                        '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();
-       }
-       
-       function show_notices($profile) {
-
-               $notice = DB_DataObject::factory('notice');
 
-               # XXX: chokety and bad
-
-               $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$profile->id.' and subscribed = notice.profile_id)', 'OR');
-               $notice->whereAdd('profile_id = ' . $profile->id, 'OR');
-
-               $notice->orderBy('created DESC');
-
-               $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+               $this->views_menu();
 
-               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
+               $this->show_feeds_list(array(0=>array('href'=>common_local_url('allrss', array('nickname' => $user->nickname)),
+                                                                                         'type' => 'rss',
+                                                                                         'version' => 'RSS 1.0',
+                                                                                         'item' => 'allrss')));
+       }
 
-               $cnt = $notice->find();
+       function show_notices($user) {
 
-               if ($cnt > 0) {
-                       common_element_start('ul', array('id' => 'notices'));
-                       for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-                               if ($notice->fetch()) {
-                                       $this->show_notice($notice);
-                               } else {
-                                       // shouldn't happen!
-                                       break;
-                               }
-                       }
-                       common_element_end('ul');
+               $page = $this->trimmed('page');
+               if (!$page) {
+                       $page = 1;
                }
                
+               $notice = $user->noticesWithFriends(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+                                                                                       
+               common_element_start('ul', array('id' => 'notices'));
+               
+               $cnt = 0;
+               
+               while ($notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
+                       $cnt++;
+                       
+                       if ($cnt > NOTICES_PER_PAGE) {
+                               break;
+                       }
+                       
+                       $this->show_notice($notice);
+               }
+               common_element_end('ul');
+
                common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-                                                 $page, 'all', array('nickname' => $profile->nickname));
+                                                 $page, 'all', array('nickname' => $user->nickname));
        }
 }