X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=f0ab7d2ac907683519cfa1bd1a7bb1d12a8089bf;hb=e4ec867df3377acbec6325e7023b814129981d31;hp=8c4151542d1185d476ebc84f5a21f5072cebd13f;hpb=d928928fda160b242870bfa2ac8e289b384c5bff;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index 8c4151542d..f0ab7d2ac9 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -183,7 +183,7 @@ function message_content(&$a) {
 		return;
 	}
 
-	$myprofile = 'profile/' . $a->user['nickname'];
+	$myprofile = $a->get_baseurl().'/profile/' . $a->user['nickname'];
 
 	$tpl = get_markup_template('mail_head.tpl');
 	$header = replace_macros($tpl, array(
@@ -305,15 +305,29 @@ function message_content(&$a) {
 		$prename = $preurl = $preid = '';
 
 		if($preselect) {
-			$r = q("select name, url, id from contact where uid = %d and id = %d limit 1",
+			$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `id` = %d LIMIT 1",
 				intval(local_user()),
 				intval($a->argv[2])
 			);
+			if(!$r) {
+				$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
+					intval(local_user()),
+					dbesc(normalise_link(base64_decode($a->argv[2])))
+				);
+			}
+			if(!$r) {
+				$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
+					intval(local_user()),
+					dbesc(base64_decode($a->argv[2]))
+				);
+			}
 			if(count($r)) {
 				$prename = $r[0]['name'];
 				$preurl = $r[0]['url'];
 				$preid = $r[0]['id'];
-			}
+				$preselect = array($preid);
+			} else
+				$preselect = false;
 		}
 
 		$prefill = (($preselect) ? $prename  : '');
@@ -342,7 +356,6 @@ function message_content(&$a) {
 			'$wait' => t('Please wait'),
 			'$submit' => t('Submit')
 		));
-
 		return $o;
 	}
 
@@ -357,8 +370,7 @@ function message_content(&$a) {
 
 		$r = q("SELECT count(*) AS `total` FROM `mail`
 			WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
-			intval(local_user()),
-			dbesc($myprofile)
+			intval(local_user())
 		);
 
 		if(count($r)) $a->set_pager_total($r[0]['total']);
@@ -447,9 +459,11 @@ function message_content(&$a) {
 			if($message['from-url'] == $myprofile) {
 				$from_url = $myprofile;
 				$sparkle = '';
-			}
-			else {
-				$from_url = 'redir/' . $message['contact-id'];
+			} elseif ($message['contact-id'] != 0) {
+				$from_url = 'redir/'.$message['contact-id'];
+				$sparkle = ' sparkle';
+			} else {
+				$from_url = $message['from-url']."?zrl=".urlencode($myprofile);
 				$sparkle = ' sparkle';
 			}
 
@@ -463,8 +477,7 @@ function message_content(&$a) {
 				$subject_e = template_escape($message['title']);
 				$body_e = template_escape(Smilies::replace(bbcode($message['body'])));
 				$to_name_e = template_escape($message['name']);
-			}
-			else {
+			} else {
 				$from_name_e = $message['from-name'];
 				$subject_e = $message['title'];
 				$body_e = Smilies::replace(bbcode($message['body']));
@@ -550,19 +563,16 @@ function render_messages($msg, $t) {
 	$tpl = get_markup_template($t);
 	$rslt = '';
 
-	$myprofile = 'profile/' . $a->user['nickname'];
+	$myprofile = $a->get_baseurl().'/profile/' . $a->user['nickname'];
 
 	foreach($msg as $rr) {
 
-		if($rr['unknown']) {
+		if($rr['unknown'])
 			$participants = sprintf( t("Unknown sender - %s"),$rr['from-name']);
-		}
-		elseif (link_compare($rr['from-url'], $myprofile)){
+		elseif (link_compare($rr['from-url'], $myprofile))
 			$participants = sprintf( t("You and %s"), $rr['name']);
-		}
-		else {
-			$participants = sprintf( t("%s and You"), $rr['from-name']);
-		}
+		else
+			$participants = sprintf(t("%s and You"), $rr['from-name']);
 
 		if($a->theme['template_engine'] === 'internal') {
 			$subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'));