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

diff --git a/actions/public.php b/actions/public.php
index 89b12493a3..7e47b9f759 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -28,7 +28,9 @@ class PublicAction extends StreamAction {
 
 		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-		common_show_header(_t('Public timeline'), array($this, 'show_header'));
+		common_show_header(_t('Public timeline'), 
+						   array($this, 'show_header'), NULL,  
+						   array($this, 'show_top'));
 
 		# XXX: Public sidebar here?
 
@@ -37,6 +39,12 @@ 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'),
@@ -48,7 +56,9 @@ class PublicAction extends StreamAction {
 
 		$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');
 		
@@ -58,35 +68,21 @@ class PublicAction extends StreamAction {
 
 		$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;
+		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;
+				}
 			}
-		}
-
-		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');
+			common_element_end('ul');
 		}
 		
-		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');
+		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
+						  $page, 'public');
 	}
 }