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

diff --git a/actions/showstream.php b/actions/showstream.php
index 0ac9943b85..8f06d60e6c 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -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',
@@ -171,13 +175,14 @@ class ShowstreamAction extends StreamAction {
 
 	function show_remote_subscribe_link($profile) {
 		$url = common_local_url('remotesubscribe',
-		                        array('nickname' => $profile->nickname);
-		common_element('a', array('href' => $url),
+		                        array('nickname' => $profile->nickname));
+		common_element('a', array('href' => $url,
+								  'id' => 'remotesubscribe'),
 					   _t('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',
@@ -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',
@@ -273,6 +278,10 @@ class ShowstreamAction extends StreamAction {
 
 		# Other stats...?
 		common_element_start('dl', 'statistics');
+		common_element('dt', 'membersince', _t('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))),