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

diff --git a/actions/showstream.php b/actions/showstream.php
index a9073df86a..8f06d60e6c 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -52,7 +52,7 @@ class ShowstreamAction extends StreamAction {
 		header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' =>
 																   $user->nickname)));
 
-		common_show_header($profile->nickname, 
+		common_show_header($profile->nickname,
 						   array($this, 'show_header'), $user,
 						   array($this, 'show_top'));
 
@@ -64,16 +64,16 @@ class ShowstreamAction extends StreamAction {
 	}
 
 	function show_top($user) {
-		
+
 		$cur = common_current_user();
-		
+
 		if ($cur && $cur->id == $user->id) {
-			common_notice_form();
+			common_notice_form('showstream');
 		}
-		
+
 		$this->views_menu();
 	}
-	
+
 	function show_header($user) {
 		common_element('link', array('rel' => 'alternate',
 									 'href' => common_local_url('userrss', array('nickname' =>
@@ -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,
@@ -129,20 +129,24 @@ class ShowstreamAction extends StreamAction {
 				}
 			}
 		} else {
-			$this->show_remote_subscribe_form($profile);
+			$this->show_remote_subscribe_link($profile);
 		}
 		common_element_end('div');
 
 		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');
@@ -150,51 +154,42 @@ class ShowstreamAction extends StreamAction {
 						   $profile->homepage);
 			common_element_end('p');
 		}
-		
+
 		$this->show_statistics($profile);
 
 		common_element_end('div');
 	}
 
 	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',
 									  'type' => 'hidden',
 									  'value' => $profile->nickname));
 		common_element('input', array('type' => 'submit',
-									  'class' => 'button',
+									  'class' => 'submit',
 									  'value' => _t('Subscribe')));
 		common_element_end('form');
 	}
 
-	function show_remote_subscribe_form($profile) {
-		common_element_start('form', array('id' => 'remotesubscribe',
-										   'method' => 'POST',
-										   'action' => common_local_url('remotesubscribe')));
-		common_hidden('nickname', $profile->nickname);
-		common_element('input', array('name' => 'profile_url',
-									  'type' => 'text',
-									  'id' => 'profile_url',
-									  'size' => '15'));
-		common_element('input', array('type' => 'submit',
-									  'id' => 'submit',
-									  'name' => 'submit',
-									  'value' => _t('Subscribe'),
-									  'class' => 'button'));
-		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,
+								  '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',
 									  'type' => 'hidden',
 									  'value' => $profile->nickname));
 		common_element('input', array('type' => 'submit',
-									  'class' => 'button',
+									  'class' => 'submit',
 									  'value' => _t('Unsubscribe')));
 		common_element_end('form');
 	}
@@ -204,6 +199,7 @@ class ShowstreamAction extends StreamAction {
 
 		$subs = DB_DataObject::factory('subscription');
 		$subs->subscriber = $profile->id;
+		$subs->orderBy('created DESC');
 
 		# We ask for an extra one to know if we need to do another page
 
@@ -216,11 +212,11 @@ class ShowstreamAction extends StreamAction {
 		common_element('h2', NULL, _t('Subscriptions'));
 
 		if ($subs_count > 0) {
-			
+
 			common_element_start('ul', array('id' => 'subscriptions_avatars'));
-			
+
 			for ($i = 0; $i < min($subs_count, SUBSCRIPTIONS); $i++) {
-				
+
 				if (!$subs->fetch()) {
 					common_debug('Weirdly, broke out of subscriptions loop early', __FILE__);
 					break;
@@ -235,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',
@@ -245,20 +241,20 @@ class ShowstreamAction extends StreamAction {
 				common_element_end('a');
 				common_element_end('li');
 			}
-			
+
 			common_element_end('ul');
 		}
 
 		if ($subs_count > SUBSCRIPTIONS) {
 			common_element_start('p', array('id' => 'subscriptions_viewall'));
-			
+
 			common_element('a', array('href' => common_local_url('subscriptions',
 																 array('nickname' => $profile->nickname)),
 									  'class' => 'moresubscriptions'),
 						   _t('All subscriptions'));
 			common_element_end('p');
 		}
-		
+
 		common_element_end('div');
 	}
 
@@ -282,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))),
@@ -289,7 +289,7 @@ class ShowstreamAction extends StreamAction {
 		common_element_end('dt');
 		common_element('dd', 'subscriptions', $subs_count);
 		common_element_start('dt', 'subscribers');
-		common_element('a', array('href' => common_local_url('subscribed',
+		common_element('a', array('href' => common_local_url('subscribers',
 															 array('nickname' => $profile->nickname))),
 					   _t('Subscribers'));
 		common_element_end('dt');
@@ -316,7 +316,7 @@ class ShowstreamAction extends StreamAction {
 
 		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);
@@ -325,7 +325,7 @@ class ShowstreamAction extends StreamAction {
 					break;
 				}
 			}
-			
+
 			common_element_end('ul');
 		}
 		common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page,