X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpublic.php;h=23d9f039788749d2b45a9528fc3d9f1b8a8464f8;hb=3f1f1427d9d65215af7546de2ad5c16120f44857;hp=dc15a3a5e57ed9e1280e97fe319dc79edcdc5ace;hpb=735b8ddc676cc7d85ca4256994755e61ea6023a1;p=quix0rs-gnu-social.git

diff --git a/actions/public.php b/actions/public.php
index dc15a3a5e5..23d9f03978 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -26,9 +26,13 @@ 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'), array($this, 'show_header'));
+		header('X-XRDS-Location: '. common_local_url('publicxrds'));
+		
+		common_show_header(_t('Public timeline'), 
+						   array($this, 'show_header'), NULL,  
+						   array($this, 'show_top'));
 
 		# XXX: Public sidebar here?
 
@@ -37,31 +41,53 @@ class PublicAction extends StreamAction {
 		common_show_footer();
 	}
 
+	function show_top() {
+		if (common_logged_in()) {
+			common_notice_form('public');
+		}
+	}
+	
 	function show_header() {
 		common_element('link', array('rel' => 'alternate',
 									 'href' => common_local_url('publicrss'),
 									 'type' => 'application/rss+xml',
 									 'title' => _t('Public Stream Feed')));
+		# for client side of OpenID authentication
+		common_element('meta', array('http-equiv' => 'X-XRDS-Location',
+									 'content' => common_local_url('publicxrds')));
 	}
 	
 	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), 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');
 	}
 }