X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshownotice.php;h=f9531b3c40378bf27cd4e5fc13c4896a0f1381f4;hb=0625f18c8e29bd840546136abe9e869b145fc497;hp=4bf4238cd44ecd9f8d1e9aa2458861aa1800811a;hpb=9d9588a3deefbd908210ea3b47575e6d1e70939d;p=quix0rs-gnu-social.git

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 4bf4238cd4..f9531b3c40 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -19,7 +19,9 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class ShownoticeAction extends Action {
+require_once(INSTALLDIR.'/lib/stream.php');
+
+class ShownoticeAction extends StreamAction {
 
 	function handle($args) {
 		parent::handle($args);
@@ -27,52 +29,57 @@ class ShownoticeAction extends Action {
 		$notice = Notice::staticGet($id);
 
 		if (!$notice) {
-			$this->no_such_notice();
+			$this->client_error(_('No such notice.'), 404);
+			return;
 		}
 
-		if (!$notice->getProfile()) {
-			$this->no_such_notice();
+		$profile = $notice->getProfile();
+
+		if (!$profile) {
+			$this->server_error(_('Notice has no profile'), 500);
+			return;
 		}
 
 		# Looks like we're good; show the header
 
-		common_show_header($profile->nickname." status on ".$notice->created);
+		common_show_header(sprintf(_('%1$s\'s status on %2$s'), $profile->nickname, common_exact_date($notice->created)),
+						   array($this, 'show_header'), $notice,
+						   array($this, 'show_top'));
 
+		common_element_start('ul', array('id' => 'notices'));
 		$this->show_notice($notice);
+		common_element_end('ul');
 
 		common_show_footer();
 	}
 
-	function no_such_notice() {
-		common_user_error('No such notice.');
+	function show_header($notice)
+	{
+		$profile = $notice->getProfile();
+		$user = User::staticGet($profile->id);
+		if (!$user) {
+			return;
+		}
+		if ($user->emailmicroid && $user->email && $notice->uri) {
+			common_element('meta', array('name' => 'microid',
+										 'content' => "mailto+http:sha1:" . sha1(sha1('mailto:' . $user->email) . sha1($notice->uri))));
+		}
+		if ($user->jabbermicroid && $user->jabber && $notice->uri) {
+			common_element('meta', array('name' => 'microid',
+										 'content' => "xmpp+http:sha1:" . sha1(sha1('xmpp:' . $user->jabber) . sha1($notice->uri))));
+		}
 	}
 
-	function show_notice($notice) {
-		$profile = $notice->getProfile();
-		# XXX: RDFa
-		common_element_start('div', array('class' => 'notice greenBg'));
-		$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-		if ($avatar) {
-			common_element('img', array('src' => $avatar->url,
-										'class' => 'avatar profile',
-										'width' => AVATAR_PROFILE_SIZE,
-										'height' => AVATAR_PROFILE_SIZE,
-										'alt' =>
-										($profile->fullname) ? $profile->fullname :
-										                       $profile->nickname));
+	function show_top($notice) {
+		$user = $notice->getProfile();
+		$cur = common_current_user();
+
+		if ($cur && $cur->id == $user->id) {
+			common_notice_form();
 		}
-		common_element('a', array('href' => $profile->profileurl,
-								  'class' => 'nickname',
-								  'title' =>
-								  ($profile->fullname) ? $profile->fullname :
-								  $profile->nickname),
-					   $profile->nickname);
-		# FIXME: URL, image, video, audio
-		common_element_start('span', array('class' => 'content'));
-		common_raw(common_render_content($notice->content, $notice));
-		common_element_end('span');
-		common_element('span', array('class' => 'date'),
-					   common_date_string($notice->created));
-		common_element_end('div');
+	}
+
+	function no_such_notice() {
+		common_user_error(_('No such notice.'));
 	}
 }