X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fmessage.php;h=0f4b53c626964a8122b1494032a000326f94990b;hb=1f0b759e2f6df7af4bc55571168bad3e3acbcd76;hp=ac14571721580f421d3b3f650d21f2a937cf969b;hpb=887372a0d777774b4e1b446f28c250949c6b50ed;p=friendica.git

diff --git a/include/message.php b/include/message.php
index ac14571721..0f4b53c626 100644
--- a/include/message.php
+++ b/include/message.php
@@ -26,6 +26,9 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		return -2;
 	}
 
+	$guid = get_guid(32);
+ 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $guid;
+
 	$convid = 0;
 	$reply = false;
 
@@ -42,19 +45,16 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 			$convid = $r[0]['convid'];
 	}
 
-	$recip_host = substr($contact[0]['url'],strpos($contact[0]['url'],'://')+3);
-	$recip_host = substr($recip_host,0,strpos($recip_host,'/'));
-
-	$recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host);
-	$sender_handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
-
-	$msg_guid = get_guid(32);
-	$uri = $recip_handle.':'.$msg_guid;
-
 	if(! $convid) {
 
 		// create a new conversation
 
+		$recip_host = substr($contact[0]['url'],strpos($contact[0]['url'],'://')+3);
+		$recip_host = substr($recip_host,0,strpos($recip_host,'/'));
+
+		$recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host);
+		$sender_handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
+
 		$conv_guid = get_guid(32);
 		$convuri = $recip_handle.':'.$conv_guid;
 
@@ -92,7 +92,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		`contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`)
 		VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s' )",
 		intval(local_user()),
-		dbesc($msg_guid),
+		dbesc($guid),
 		intval($convid),
 		dbesc($me[0]['name']),
 		dbesc($me[0]['thumb']),
@@ -172,8 +172,8 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 	if(! strlen($subject))
 		$subject = t('[no subject]');
 
-	$hash = random_string();
- 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
+	$guid = get_guid(32);
+ 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $guid;
 
 	$convid = 0;
 	$reply = false;
@@ -222,7 +222,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 		`contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`, `unknown`)
 		VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
 		intval($recipient['uid']),
-		dbesc(get_guid(32)),
+		dbesc($guid),
 		intval($convid),
 		dbesc($me['name']),
 		dbesc($me['photo']),