X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=2919a154f21710197d609a4244c35ad216e49ff8;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=419c4421ad1d1419a855d19b9a5cd5038b0b1fed;hpb=171bedf24bca7bd195dd4a8ee79cb3f04e6de5d5;p=quix0rs-gnu-social.git

diff --git a/actions/showstream.php b/actions/showstream.php
index 419c4421ad..2919a154f2 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -30,7 +30,20 @@ class ShowstreamAction extends StreamAction {
 
 		parent::handle($args);
 
-		$nickname = common_canonical_nickname($this->arg('nickname'));
+        $nickname_arg = $this->arg('nickname');
+		$nickname = common_canonical_nickname($nickname_arg);
+
+        # Permanent redirect on non-canonical nickname
+
+        if ($nickname_arg != $nickname) {
+            $args = array('nickname' => $nickname);
+            if ($this->arg('page') && $this->arg('page') != 1) {
+                $args['page'] = $this->arg['page'];
+            }
+            common_redirect(common_local_url('showstream', $args), 301);
+            return;
+        }
+
 		$user = User::staticGet('nickname', $nickname);
 
 		if (!$user) {
@@ -72,11 +85,11 @@ class ShowstreamAction extends StreamAction {
 
 		$this->views_menu();
 
-		$this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('nickname' => $user->nickname)), 
+		$this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('nickname' => $user->nickname)),
 											  'type' => 'rss',
 											  'version' => 'RSS 1.0',
 											  'item' => 'notices'),
-									 1=>array('href'=>common_local_url('usertimeline', array('nickname' => $user->nickname)), 
+									 1=>array('href'=>common_local_url('usertimeline', array('nickname' => $user->nickname)),
 											  'type' => 'atom',
 											  'version' => 'Atom 1.0',
 											  'item' => 'usertimeline'),
@@ -87,20 +100,17 @@ class ShowstreamAction extends StreamAction {
 											  'item' => 'foaf')));
 	}
 
-
-
-
 	function show_header($user) {
 		# Feeds
 		common_element('link', array('rel' => 'alternate',
-									 'href' => common_local_url('api', 
+									 'href' => common_local_url('api',
 																array('apiaction' => 'statuses',
 																	  'method' => 'user_timeline.rss',
 																	  'argument' => $user->nickname)),
 									 'type' => 'application/rss+xml',
 									 'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
 		common_element('link', array('rel' => 'alternate feed',
-									 'href' => common_local_url('api', 
+									 'href' => common_local_url('api',
 																array('apiaction' => 'statuses',
 																	  'method' => 'user_timeline.atom',
 																	  'argument' => $user->nickname)),
@@ -136,6 +146,11 @@ class ShowstreamAction extends StreamAction {
 										 'content' => "xmpp+http:sha1:" . sha1(sha1('xmpp:' . $user->jabber) . sha1($profile->profileurl))));
 		}
 
+		# See https://wiki.mozilla.org/Microsummaries
+
+		common_element('link', array('rel' => 'microsummary',
+									 'href' => common_local_url('microsummary',
+																array('nickname' => $profile->nickname))));
 	}
 
 	function no_such_user() {
@@ -144,7 +159,7 @@ class ShowstreamAction extends StreamAction {
 
 	function show_profile($profile) {
 
-		common_element_start('div', array('id' => 'profile'));
+		common_element_start('div', array('id' => 'profile', 'class' => 'vcard'));
 
 		$this->show_personal($profile);
 
@@ -162,7 +177,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) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
-									'class' => 'avatar profile',
+									'class' => 'avatar profile photo',
 									'width' => AVATAR_PROFILE_SIZE,
 									'height' => AVATAR_PROFILE_SIZE,
 									'alt' => $profile->nickname));
@@ -183,33 +198,45 @@ class ShowstreamAction extends StreamAction {
 			$this->show_remote_subscribe_link($profile);
 		}
         common_element_end('li');
-		
+
 		$user = User::staticGet('id', $profile->id);
 		common_profile_new_message_nudge($cur, $user, $profile);
-        
+
+        if ($cur) {
+            $blocked = $cur->hasBlocked($profile);
+            common_element_start('li', array('id' => ($blocked) ? 'profile_unblock' : 'profile_block'));
+            if ($blocked) {
+                common_unblock_form($profile, array('action' => 'showstream',
+                                                    'nickname' => $profile->nickname));
+            } else {
+                common_block_form($profile, array('action' => 'showstream',
+                                                  'nickname' => $profile->nickname));
+            }
+            common_element_end('li');
+        }
+
 		common_element_end('ul');
-		
+
 		common_element_end('div');
 
 		common_element_start('div', array('id' => 'profile_information'));
 
 		if ($profile->fullname) {
-			common_element('h1', NULL, $profile->fullname . ' (' . $profile->nickname . ')');
+			common_element('h1', array('class' => 'fn'), $profile->fullname . ' (' . $profile->nickname . ')');
 		} else {
-			common_element('h1', NULL, $profile->nickname);
+			common_element('h1', array('class' => 'fn nickname'), $profile->nickname);
 		}
 
-
 		if ($profile->location) {
 			common_element('p', 'location', $profile->location);
 		}
 		if ($profile->bio) {
-			common_element('p', 'description', $profile->bio);
+			common_element('p', 'description note', $profile->bio);
 		}
 		if ($profile->homepage) {
 			common_element_start('p', 'website');
 			common_element('a', array('href' => $profile->homepage,
-									  'rel' => 'me'),
+									  'rel' => 'me', 'class' => 'url'),
 						   $profile->homepage);
 			common_element_end('p');
 		}
@@ -247,7 +274,7 @@ class ShowstreamAction extends StreamAction {
 		$subs = DB_DataObject::factory('subscription');
 		$subs->subscriber = $profile->id;
 		$subs->whereAdd('subscribed != ' . $profile->id);
-		
+
 		$subs->orderBy('created DESC');
 
 		# We ask for an extra one to know if we need to do another page
@@ -277,19 +304,19 @@ class ShowstreamAction extends StreamAction {
 					common_log_db_error($subs, 'SELECT', __FILE__);
 					continue;
 				}
-				
-				common_element_start('li');
+
+				common_element_start('li', 'vcard');
 				common_element_start('a', array('title' => ($other->fullname) ?
 												$other->fullname :
 												$other->nickname,
 												'href' => $other->profileurl,
 												'rel' => 'contact',
-												'class' => 'subscription'));
+ 												'class' => 'subscription fn url'));
 				$avatar = $other->getAvatar(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',
+											'class' => 'avatar mini photo',
 											'alt' =>  ($other->fullname) ?
 											$other->fullname :
 											$other->nickname));
@@ -355,14 +382,19 @@ class ShowstreamAction extends StreamAction {
 		common_element('dt', 'tags', _('Tags'));
 		common_element_start('dd', 'tags');
 		$tags = Profile_tag::getTags($profile->id, $profile->id);
+
+		common_element_start('ul', 'tags xoxo');
 		foreach ($tags as $tag) {
-			common_element('a', array('rel' => 'tag',
+			common_element_start('li');
+			common_element('a', array('rel' => 'bookmark tag',
 									  'href' => common_local_url('peopletag',
 																 array('tag' => $tag))),
 						   $tag);
+			common_element_end('li');
 		}
+		common_element_end('ul');
 	    common_element_end('dd');
-	
+
 		common_element_end('dl');
 
 		common_element_end('div');
@@ -373,13 +405,13 @@ class ShowstreamAction extends StreamAction {
 		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
 		$notice = $user->getNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-		
+
 		$cnt = 0;
 
 		if ($notice) {
-		
+
 			common_element_start('ul', array('id' => 'notices'));
-			
+
 			while ($notice->fetch()) {
 				$cnt++;
 				if ($cnt > NOTICES_PER_PAGE) {
@@ -390,7 +422,7 @@ class ShowstreamAction extends StreamAction {
 
 			common_element_end('ul');
 		}
-		
+
 		common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page,
 						  'showstream', array('nickname' => $user->nickname));
 	}
@@ -421,7 +453,7 @@ class ShowstreamAction extends StreamAction {
 		$user = common_current_user();
 
 		# XXX: RDFa
-		common_element_start('li', array('class' => 'notice_single',
+		common_element_start('li', array('class' => 'notice_single hentry',
 										 'id' => 'notice-' . $notice->id));
 		if ($user) {
 			if ($user->hasFave($notice)) {
@@ -432,7 +464,7 @@ class ShowstreamAction extends StreamAction {
 		}
 		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
 		# FIXME: URL, image, video, audio
-		common_element_start('p');
+		common_element_start('p', 'entry-title');
 		if ($notice->rendered) {
 			common_raw($notice->rendered);
 		} else {
@@ -443,10 +475,14 @@ class ShowstreamAction extends StreamAction {
 		}
 		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', array('class' => 'permalink',
+								  'rel' => 'bookmark',
+								  'href' => $noticeurl));
+		common_element('abbr', array('class' => 'published',
+									 'title' => common_date_iso8601($notice->created)),
+						common_date_string($notice->created));
+		common_element_end('a');
+
 		if ($notice->source) {
 			common_text(_(' from '));
 			$this->source_link($notice->source);
@@ -475,7 +511,7 @@ class ShowstreamAction extends StreamAction {
 			common_raw('×');
 			common_element_end('a');
 		}
-		
+
 		common_element_end('p');
 		common_element_end('li');
 	}