X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fpublic.php;h=89b12493a3ff241fc4a77c985960b62a692f1028;hb=b899ff617f757e234d1954d4c71e4d55e739a1dd;hp=698f991952afb2be1c652f9775cfa71cb2fbf4d1;hpb=3b14b7901c65144835d74b712279d0492c267c0c;p=quix0rs-gnu-social.git

diff --git a/actions/public.php b/actions/public.php
index 698f991952..89b12493a3 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -1,32 +1,34 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * 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.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * 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/>.
  */
 
 if (!defined('LACONICA')) { exit(1); }
 
+require_once(INSTALLDIR.'/lib/stream.php');
+
 class PublicAction extends StreamAction {
 
 	function handle($args) {
 		parent::handle($args);
 
-		$page = $this->arg('page') || 1;
+		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-		common_show_header(_t('Public timeline'));
+		common_show_header(_t('Public timeline'), array($this, 'show_header'));
 
 		# XXX: Public sidebar here?
 
@@ -35,6 +37,13 @@ class PublicAction extends StreamAction {
 		common_show_footer();
 	}
 
+	function show_header() {
+		common_element('link', array('rel' => 'alternate',
+									 'href' => common_local_url('publicrss'),
+									 'type' => 'application/rss+xml',
+									 'title' => _t('Public Stream Feed')));
+	}
+	
 	function show_notices($page) {
 
 		$notice = DB_DataObject::factory('notice');
@@ -42,17 +51,42 @@ class PublicAction extends StreamAction {
 		# XXX: filter out private notifications
 
 		$notice->orderBy('created DESC');
-		$notice->limit((($page-1)*NOTICES_PER_PAGE) + 1, NOTICES_PER_PAGE);
-
-		$notice->find();
-
-		common_start_element('div', 'notices');
-
-		while ($notice->fetch()) {
-			$this->show_notice($notice);
+		
+		# We fetch one extra, to see if we need an "older" link
+		
+		$notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
+
+		$cnt = $notice->find();
+
+		common_element_start('div', 'notices');
+
+		for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
+			if ($notice->fetch()) {
+				$this->show_notice($notice);
+			} else {
+				// shouldn't happen!
+				break;
+			}
 		}
 
-		common_end_element('div');
+		if ($page > 1) {
+			common_element_start('span', 'floatLeft width25');
+			common_element('a', array('href' => common_local_url('public',
+																 array('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('public',
+																 array('page' => $page+1)),
+									  'class' => 'older'),
+						   _t('Older'));
+			common_element_end('span');
+		}
+		common_element_end('div');
 	}
 }