X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=bd64a7be4af48b813363ea2789270bfe2d01222b;hb=800c2e9a094681eff82aacdba6e5d22d547c4950;hp=0ac9943b854cb8c750c7d8ec796f0120546d147d;hpb=d0e8f8d8a260a614616ae567d891fab7f0a15672;p=quix0rs-gnu-social.git

diff --git a/actions/showstream.php b/actions/showstream.php
index 0ac9943b85..bd64a7be4a 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 record exists without 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)),
@@ -92,7 +92,7 @@ class ShowstreamAction extends StreamAction {
 	}
 
 	function no_such_user() {
-		common_user_error('No such user');
+		common_user_error(_('No such user.'));
 	}
 
 	function show_profile($profile) {
@@ -114,7 +114,7 @@ class ShowstreamAction extends StreamAction {
 
 		$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
 		common_element_start('div', array('id' => 'profile_avatar'));
-		common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_PROFILE_SIZE),
+		common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
 									'class' => 'avatar profile',
 									'width' => AVATAR_PROFILE_SIZE,
 									'height' => AVATAR_PROFILE_SIZE,
@@ -136,13 +136,17 @@ class ShowstreamAction extends StreamAction {
 		common_element_start('div', array('id' => 'profile_information'));
 
 		if ($profile->fullname) {
-			common_element('h1', NULL, $profile->fullname);
+			common_element('h1', NULL, $profile->fullname . ' (' . $profile->nickname . ')');
+		} else {
+			common_element('h1', NULL, $profile->nickname);
 		}
+
+
 		if ($profile->location) {
 			common_element('p', 'location', $profile->location);
 		}
 		if ($profile->bio) {
-			common_element('p', 'description', htmlspecialchars($profile->bio));
+			common_element('p', 'description', $profile->bio);
 		}
 		if ($profile->homepage) {
 			common_element_start('p', 'website');
@@ -157,7 +161,7 @@ class ShowstreamAction extends StreamAction {
 	}
 
 	function show_subscribe_form($profile) {
-		common_element_start('form', array('id' => 'subscribe', 'method' => 'POST',
+		common_element_start('form', array('id' => 'subscribe', 'method' => 'post',
 										   'action' => common_local_url('subscribe')));
 		common_element('input', array('id' => 'subscribeto',
 									  'name' => 'subscribeto',
@@ -165,19 +169,20 @@ class ShowstreamAction extends StreamAction {
 									  'value' => $profile->nickname));
 		common_element('input', array('type' => 'submit',
 									  'class' => 'submit',
-									  'value' => _t('Subscribe')));
+									  'value' => _('Subscribe')));
 		common_element_end('form');
 	}
 
 	function show_remote_subscribe_link($profile) {
 		$url = common_local_url('remotesubscribe',
-		                        array('nickname' => $profile->nickname);
-		common_element('a', array('href' => $url),
-					   _t('Subscribe'));
+		                        array('nickname' => $profile->nickname));
+		common_element('a', array('href' => $url,
+								  'id' => 'remotesubscribe'),
+					   _('Subscribe'));
 	}
 
 	function show_unsubscribe_form($profile) {
-		common_element_start('form', array('id' => 'unsubscribe', 'method' => 'POST',
+		common_element_start('form', array('id' => 'unsubscribe', 'method' => 'post',
 										   'action' => common_local_url('unsubscribe')));
 		common_element('input', array('id' => 'unsubscribeto',
 									  'name' => 'unsubscribeto',
@@ -185,7 +190,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');
 	}
 
@@ -204,7 +209,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) {
 
@@ -226,7 +231,7 @@ class ShowstreamAction extends StreamAction {
 												'href' => $other->profileurl,
 												'class' => 'subscription'));
 				$avatar = $other->getAvatar(AVATAR_MINI_SIZE);
-				common_element('img', array('src' => (($avatar) ? $avatar->url :  common_default_avatar(AVATAR_MINI_SIZE)),
+				common_element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
 											'width' => AVATAR_MINI_SIZE,
 											'height' => AVATAR_MINI_SIZE,
 											'class' => 'avatar mini',
@@ -246,7 +251,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');
 		}
 
@@ -269,24 +274,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', _('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');
@@ -325,17 +334,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');
 		}
 	}
@@ -348,13 +361,37 @@ 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' => 'notice',
-								  'href' => $noticeurl),
+		common_element('a', array('class' => 'permalink',
+								  'href' => $noticeurl,
+								  'title' => common_exact_date($notice->created)),
 					   common_date_string($notice->created));
+		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' => _('reply'),
+								   'class' => 'replybutton'));
+		common_raw('→');
+		common_element_end('a');
 		common_element_end('p');
 		common_element_end('li');
 	}
-}
+}
\ No newline at end of file