checks for user and sub in validate and better error check in remote save

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

diff --git a/actions/all.php b/actions/all.php
index 93be7290f339f01ac773fd20bcbedded04f14011..70641a0f652afdee3fe0752e6eb9bf43d6ed67f4 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -44,7 +44,8 @@ class AllAction extends StreamAction {
 
                # Looks like we're good; show the header
 
-               common_show_header($profile->nickname . _t(" and friends"));
+               common_show_header($profile->nickname . _t(" and friends"),
+                                                  array($this, 'show_header'), $user);
 
                $cur = common_current_user();
 
@@ -56,6 +57,14 @@ class AllAction extends StreamAction {
                
                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));
+       }
 
        function show_notices($profile) {
 
@@ -68,17 +77,42 @@ class AllAction extends StreamAction {
 
                $notice->orderBy('created DESC');
 
-               $page = $this->arg('page') || 1;
+               $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE);
+               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
 
-               $notice->find();
+               $cnt = $notice->find();
 
                common_element_start('div', 'notices width100');
                common_element('h2', 'notices', _t('Notices'));
 
-               while ($notice->fetch()) {
-                       $this->show_notice($notice);
+               for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
+                       if ($notice->fetch()) {
+                               $this->show_notice($notice);
+                       } else {
+                               // shouldn't happen!
+                               break;
+                       }
+               }
+
+               if ($page > 1) {
+                       common_element_start('span', 'floatLeft width25');
+                       common_element('a', array('href' => common_local_url('all',
+                                                                                                                                array('nickname' => $profile->nickname,
+                                                                                                                                          'page' => $page-1)),
+                                                                         'class' => 'newer'),
+                                                  _t('Newer'));
+                       common_element_end('span');
+               }
+               
+               if ($cnt > NOTICES_PER_PAGE) {
+                       common_element_start('span', 'floatRight width25');
+                       common_element('a', array('href' => common_local_url('all', 
+                                                                                                                                array('nickname' => $profile->nickname,
+                                                                                                                                          'page' => $page+1)),
+                                                                         'class' => 'older'),
+                                                  _t('Older'));
+                       common_element_end('span');
                }
 
                # XXX: show a link for the next page