X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fstream.php;h=ea452096cc937a42b0f14a862b977295b558b221;hb=8250d8a350f91494a4ca5d71e711aa5ecd91dff5;hp=4001ca47bba5c8785d2fa91e3d681f1dbc93246f;hpb=e65bf0a25028d4aae4a8c6b33750aacaa4e182a8;p=quix0rs-gnu-social.git

diff --git a/lib/stream.php b/lib/stream.php
index 4001ca47bb..ea452096cc 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -19,63 +19,25 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class StreamAction extends Action {
+require_once(INSTALLDIR.'/lib/personal.php');
 
-	function is_readonly() {
-		return true;
-	}
-
-	function handle($args) {
-		parent::handle($args);
-                common_set_returnto($this->self_url());
-	}
-
-	function views_menu() {
-
-		$user = NULL;
-		$action = $this->trimmed('action');
-		$nickname = $this->trimmed('nickname');
-
-		if ($nickname) {
-			$user = User::staticGet('nickname', $nickname);
-			$user_profile = $user->getProfile();
-		} else {
-			$user_profile = false;
-		}
-
-		common_element_start('ul', array('id' => 'nav_views'));
-
-		common_menu_item(common_local_url('all', array('nickname' =>
-													   $nickname)),
-						 _('Personal'),
-						 sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
-						 $action == 'all');
-		common_menu_item(common_local_url('replies', array('nickname' =>
-															  $nickname)),
-						 _('Replies'),
-						 sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
-						 $action == 'replies');
-		common_menu_item(common_local_url('showstream', array('nickname' =>
-															  $nickname)),
-						 _('Profile'),
-						 ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
-						 $action == 'showstream');
-		common_element_end('ul');
-	}
+class StreamAction extends PersonalAction {
 
 	function show_notice($notice) {
 		global $config;
 		$profile = $notice->getProfile();
-		if (common_logged_in()) {
-			$user = common_current_user();
-			$user_profile = $user->getProfile();
-		} else {
-			$user_profile = false;
-		}
+		$user = common_current_user();
 
 		# XXX: RDFa
 		common_element_start('li', array('class' => 'notice_single',
 										  'id' => 'notice-' . $notice->id));
+		if ($user) {
+			if ($user->hasFave($notice)) {
+				common_disfavor_form($notice);
+			} else {
+				common_favor_form($notice);
+			}
+		}
 		$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
 		common_element_start('a', array('href' => $profile->profileurl));
 		common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
@@ -101,6 +63,10 @@ class StreamAction extends Action {
 		}
 		common_element_end('p');
 		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
+		# XXX: we need to figure this out better. Is this right?
+		if (strcmp($notice->uri, $noticeurl) != 0 && preg_match('/^http/', $notice->uri)) {
+			$noticeurl = $notice->uri;
+		}
 		common_element_start('p', 'time');
 		common_element('a', array('class' => 'permalink',
 								  'href' => $noticeurl,
@@ -121,41 +87,20 @@ class StreamAction extends Action {
 		common_element_start('a',
 							 array('href' => common_local_url('newnotice',
 															  array('replyto' => $profile->nickname)),
-								   'onclick' => 'doreply("'.$profile->nickname.'"); return false',
+								   'onclick' => 'return doreply("'.$profile->nickname.'", '.$notice->id.');',
 								   'title' => _('reply'),
 								   'class' => 'replybutton'));
 		common_raw('→');
 		common_element_end('a');
-		common_element_end('p');
-		if ($user_profile && $notice->profile_id == $user_profile->id) {
+		if ($user && $notice->profile_id == $user->id) {
 			$deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
-			common_element('a', array('class' => 'deletenotice',
-									 'href' => $deleteurl),
-						   _('delete'));
+			common_element_start('a', array('class' => 'deletenotice',
+											'href' => $deleteurl,
+											'title' => _('delete')));
+			common_raw('×');
+			common_element_end('a');
 		}
+		common_element_end('p');
 		common_element_end('li');
 	}
-	
-	function source_link($source) {
-		$source_name = _($source);
-		switch ($source) {
-		 case 'web':
-		 case 'xmpp':
-		 case 'mail':
-		 case 'omb':
-		 case 'api':
-			common_element('span', 'noticesource', $source_name);
-			break;
-		 default:
-			$ns = Notice_source::staticGet($source);
-			if ($ns) {
-				common_element('a', array('href' => $ns->url),
-							   $ns->name);
-			} else {
-				common_element('span', 'noticesource', $source_name);
-			}
-			break;
-		}
-		return;
-	}
 }