X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpublic.php;h=43beaffc6a6074790fbc42e186f0eeb099afb026;hb=4f3d1e93e97365deac2366bfe422e8301d773a25;hp=763f278bdf75818d784a2e5f67abc5517249bbc5;hpb=52205fc6be6560d97aa8f3dc99da597498cc182e;p=quix0rs-gnu-social.git

diff --git a/actions/public.php b/actions/public.php
index 763f278bdf..43beaffc6a 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -28,8 +28,10 @@ class PublicAction extends StreamAction {
 
 		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-		common_show_header(_t('Public timeline'), 
-						   array($this, 'show_header'), NULL,  
+		header('X-XRDS-Location: '. common_local_url('publicxrds'));
+
+		common_show_header(_('Public timeline'),
+						   array($this, 'show_header'), NULL,
 						   array($this, 'show_top'));
 
 		# XXX: Public sidebar here?
@@ -40,52 +42,40 @@ class PublicAction extends StreamAction {
 	}
 
 	function show_top() {
-
 		if (common_logged_in()) {
-			common_notice_form();
+			common_notice_form('public');
 		}
-		
-		$this->views_menu();
 	}
-	
+
 	function show_header() {
 		common_element('link', array('rel' => 'alternate',
 									 'href' => common_local_url('publicrss'),
 									 'type' => 'application/rss+xml',
-									 'title' => _t('Public Stream Feed')));
+									 'title' => _('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');
 
-		# FIXME: bad performance
-		
-		$notice->whereAdd('EXISTS (SELECT user.id from user where user.id = notice.profile_id)');
+	function show_notices($page) {
 
-		$notice->orderBy('created DESC');
-		
-		# We fetch one extra, to see if we need an "older" link
+		$cnt = 0;
+		$notice = Notice::publicStream(($page-1)*NOTICES_PER_PAGE,
+									   NOTICES_PER_PAGE + 1);
 		
-		$notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
-
-		$cnt = $notice->find();
-
-		if ($cnt > 0) {
+		if ($notice) {
 			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!
+			while ($notice->fetch()) {
+				$cnt++;
+				if ($cnt > NOTICES_PER_PAGE) {
 					break;
 				}
+				$this->show_notice($notice);
 			}
 			common_element_end('ul');
 		}
-		
+
 		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
 						  $page, 'public');
 	}
-}
-
+}
\ No newline at end of file