X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fshowstream.php;h=bccdd3cc86bc8160367d8ca1bd7509c14d44048a;hb=12b7f23ed2fd05a29dcd5ab7700a25330ffd5d5f;hp=4060535313f0923a3bc632bac3bd5a588c8c1580;hpb=e6d2f5a3a4410d8a1b9b5b78241852a763b3be87;p=quix0rs-gnu-social.git

diff --git a/actions/showstream.php b/actions/showstream.php
index 4060535313..bccdd3cc86 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -41,7 +41,7 @@ class ShowstreamAction extends StreamAction {
 		$profile = $user->getProfile();
 
 		if (!$profile) {
-			common_server_error(_t('User record exists without profile.'));
+			common_server_error(_('User has no profile.'));
 			return;
 		}
 
@@ -79,7 +79,7 @@ class ShowstreamAction extends StreamAction {
 									 'href' => common_local_url('userrss', array('nickname' =>
 																			   $user->nickname)),
 									 'type' => 'application/rss+xml',
-									 'title' => _t('Notice feed for ') . $user->nickname));
+									 'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
 		common_element('link', array('rel' => 'meta',
 									 'href' => common_local_url('foaf', array('nickname' =>
 																			  $user->nickname)),
@@ -89,10 +89,15 @@ class ShowstreamAction extends StreamAction {
 		common_element('meta', array('http-equiv' => 'X-XRDS-Location',
 									 'content' => common_local_url('xrds', array('nickname' =>
 																			   $user->nickname))));
+		$profile = $user->getProfile();
+		if ($profile->bio) {
+			common_element('meta', array('name' => 'description',
+										 'content' => $profile->bio));
+		}
 	}
 
 	function no_such_user() {
-		common_user_error('No such user');
+		common_user_error(_('No such user.'));
 	}
 
 	function show_profile($profile) {
@@ -141,7 +146,7 @@ class ShowstreamAction extends StreamAction {
 			common_element('h1', NULL, $profile->nickname);
 		}
 
-		
+
 		if ($profile->location) {
 			common_element('p', 'location', $profile->location);
 		}
@@ -150,7 +155,8 @@ class ShowstreamAction extends StreamAction {
 		}
 		if ($profile->homepage) {
 			common_element_start('p', 'website');
-			common_element('a', array('href' => $profile->homepage),
+			common_element('a', array('href' => $profile->homepage,
+									  'rel' => 'me'),
 						   $profile->homepage);
 			common_element_end('p');
 		}
@@ -169,7 +175,7 @@ class ShowstreamAction extends StreamAction {
 									  'value' => $profile->nickname));
 		common_element('input', array('type' => 'submit',
 									  'class' => 'submit',
-									  'value' => _t('Subscribe')));
+									  'value' => _('Subscribe')));
 		common_element_end('form');
 	}
 
@@ -178,7 +184,7 @@ class ShowstreamAction extends StreamAction {
 		                        array('nickname' => $profile->nickname));
 		common_element('a', array('href' => $url,
 								  'id' => 'remotesubscribe'),
-					   _t('Subscribe'));
+					   _('Subscribe'));
 	}
 
 	function show_unsubscribe_form($profile) {
@@ -190,7 +196,7 @@ class ShowstreamAction extends StreamAction {
 									  'value' => $profile->nickname));
 		common_element('input', array('type' => 'submit',
 									  'class' => 'submit',
-									  'value' => _t('Unsubscribe')));
+									  'value' => _('Unsubscribe')));
 		common_element_end('form');
 	}
 
@@ -209,7 +215,7 @@ class ShowstreamAction extends StreamAction {
 
 		common_element_start('div', array('id' => 'subscriptions'));
 
-		common_element('h2', NULL, _t('Subscriptions'));
+		common_element('h2', NULL, _('Subscriptions'));
 
 		if ($subs_count > 0) {
 
@@ -251,7 +257,7 @@ class ShowstreamAction extends StreamAction {
 			common_element('a', array('href' => common_local_url('subscriptions',
 																 array('nickname' => $profile->nickname)),
 									  'class' => 'moresubscriptions'),
-						   _t('All subscriptions'));
+						   _('All subscriptions'));
 			common_element_end('p');
 		}
 
@@ -274,28 +280,28 @@ class ShowstreamAction extends StreamAction {
 		$notice_count = (int) $notices->count();
 
 		common_element_start('div', 'statistics');
-		common_element('h2', 'statistics', _t('Statistics'));
+		common_element('h2', 'statistics', _('Statistics'));
 
 		# Other stats...?
 		common_element_start('dl', 'statistics');
-		common_element('dt', 'membersince', _t('Member since'));
-		common_element('dd', 'membersince', date('j M Y', 
+		common_element('dt', 'membersince', _('Member since'));
+		common_element('dd', 'membersince', date('j M Y',
 												 strtotime($profile->created)));
-		
+
 		common_element_start('dt', 'subscriptions');
 		common_element('a', array('href' => common_local_url('subscriptions',
 															 array('nickname' => $profile->nickname))),
-					   _t('Subscriptions'));
+					   _('Subscriptions'));
 		common_element_end('dt');
-		common_element('dd', 'subscriptions', $subs_count);
+		common_element('dd', 'subscriptions', (is_int($subs_count)) ? $subs_count : '0');
 		common_element_start('dt', 'subscribers');
 		common_element('a', array('href' => common_local_url('subscribers',
 															 array('nickname' => $profile->nickname))),
-					   _t('Subscribers'));
+					   _('Subscribers'));
 		common_element_end('dt');
-		common_element('dd', 'subscribers', $subbed_count);
-		common_element('dt', 'notices', _t('Notices'));
-		common_element('dd', 'notices', $notice_count);
+		common_element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0');
+		common_element('dt', 'notices', _('Notices'));
+		common_element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0');
 		common_element_end('dl');
 
 		common_element_end('div');
@@ -306,7 +312,7 @@ class ShowstreamAction extends StreamAction {
 		$notice = DB_DataObject::factory('notice');
 		$notice->profile_id = $profile->id;
 
-		$notice->orderBy('created DESC');
+		$notice->orderBy('created DESC, notice.id DESC');
 
 		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
@@ -334,17 +340,21 @@ class ShowstreamAction extends StreamAction {
 
 	function show_last_notice($profile) {
 
-		common_element('h2', NULL, _t('Currently'));
+		common_element('h2', NULL, _('Currently'));
 
-		$notice = DB_DataObject::factory('notice');
-		$notice->profile_id = $profile->id;
-		$notice->orderBy('created DESC');
-		$notice->limit(0, 1);
+		$notice = $profile->getCurrentNotice();
 
-		if ($notice->find(true)) {
+		if ($notice) {
 			# FIXME: URL, image, video, audio
 			common_element_start('p', array('class' => 'notice_current'));
-			common_raw(common_render_content($notice->content, $notice));
+			if ($notice->rendered) {
+				common_raw($notice->rendered);
+			} else {
+				# XXX: may be some uncooked notices in the DB,
+				# we cook them right now. This can probably disappear in future
+				# versions (>> 0.4.x)
+				common_raw(common_render_content($notice->content, $notice));
+			}
 			common_element_end('p');
 		}
 	}
@@ -357,18 +367,33 @@ class ShowstreamAction extends StreamAction {
 		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
 		# FIXME: URL, image, video, audio
 		common_element_start('p');
-		common_raw(common_render_content($notice->content, $notice));
+		if ($notice->rendered) {
+			common_raw($notice->rendered);
+		} else {
+			# XXX: may be some uncooked notices in the DB,
+			# we cook them right now. This can probably disappear in future
+			# versions (>> 0.4.x)
+			common_raw(common_render_content($notice->content, $notice));
+		}
 		common_element_end('p');
 		common_element_start('p', array('class' => 'time'));
 		common_element('a', array('class' => 'permalink',
 								  'href' => $noticeurl,
 								  'title' => common_exact_date($notice->created)),
 					   common_date_string($notice->created));
-		common_element_start('a', 
+		if ($notice->reply_to) {
+			$replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
+			common_text(' (');
+			common_element('a', array('class' => 'inreplyto',
+									  'href' => $replyurl),
+						   _('in reply to...'));
+			common_text(')');
+		}
+		common_element_start('a',
 							 array('href' => common_local_url('newnotice',
 															  array('replyto' => $profile->nickname)),
 								   'onclick' => 'doreply("'.$profile->nickname.'"); return false',
-								   'title' => _t('reply'),
+								   'title' => _('reply'),
 								   'class' => 'replybutton'));
 		common_raw('→');
 		common_element_end('a');