X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpublic.php;h=7e47b9f759935bb5a3ac17c73f2fe154d0e00d5a;hb=d0559fdf4dafcaf8446b437f4af089c944a23d09;hp=5b1e50fa3f1ce82c5d1a7fd3e61c0eed2a67ead1;hpb=d748318f7f0a421e6947903b0b9504aabd4d6a17;p=quix0rs-gnu-social.git

diff --git a/actions/public.php b/actions/public.php
index 5b1e50fa3f..7e47b9f759 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -1,18 +1,18 @@
 <?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/>.
  */
@@ -26,9 +26,11 @@ 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'), NULL,  
+						   array($this, 'show_top'));
 
 		# XXX: Public sidebar here?
 
@@ -37,24 +39,50 @@ class PublicAction extends StreamAction {
 		common_show_footer();
 	}
 
+	function show_top() {
+		if (common_logged_in()) {
+			common_notice_form();
+		}
+	}
+	
+	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');
 
-		# XXX: filter out private notifications
+		# FIXME: bad performance
+		
+		$notice->whereAdd('EXISTS (SELECT user.id from user where user.id = notice.profile_id)');
 
 		$notice->orderBy('created DESC');
-		$notice->limit((($page-1)*NOTICES_PER_PAGE) + 1, NOTICES_PER_PAGE);
-
-		$notice->find();
-
-		common_element_start('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();
+
+		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');
 		}
-
-		common_element_end('div');
+		
+		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
+						  $page, 'public');
 	}
 }