Merge remote-tracking branch 'upstream/develop' into 1508-random-becomes-guid

include/diaspora.php

@@ -1791,7 +1791,7 @@ function diaspora_message($importer,$xml,$msg) {
 	$msg_diaspora_handle = notags(unxmlify($xml->diaspora_handle));
 	$msg_conversation_guid = notags(unxmlify($xml->conversation_guid));
 
-	$parent_uri = $diaspora_handle . ':' . $msg_parent_guid;
+	$parent_uri = $msg_diaspora_handle . ':' . $msg_parent_guid;
 
 	$contact = diaspora_get_contact_by_handle($importer['uid'],$msg_diaspora_handle);
 	if(! $contact) {
@@ -2999,7 +2999,7 @@ function diaspora_send_mail($item,$owner,$contact) {
 	$msg = array(
 		'guid' => xmlify($item['guid']),
 		'parent_guid' => xmlify($cnv['guid']),
-		'parent_author_signature' => (($item['reply']) ? null : xmlify($sig)),
+		'parent_author_signature' => xmlify($sig),
 		'author_signature' => xmlify($sig),
 		'text' => xmlify($body),
 		'created_at' => xmlify($created),

include/message.php

@@ -26,9 +26,6 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		return -2;
 	}
 
-	$hash = random_string();
- 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
-
 	$convid = 0;
 	$reply = false;
 
@@ -45,18 +42,22 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 			$convid = $r[0]['convid'];
 	}
 
-	if(! $convid) {
-
-		// create a new conversation
-
-		$conv_guid = get_guid();
-
 	$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
+
+		$conv_guid = get_guid(32);
+		$convuri = $recip_handle.':'.$conv_guid;
+
 		$handles = $recip_handle . ';' . $sender_handle;
 
 		$r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
@@ -83,7 +84,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 	}
 
 	if(! strlen($replyto)) {
-		$replyto = $uri;
+		$replyto = $convuri;
 	}
 
 
@@ -91,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(get_guid()),
+		dbesc($msg_guid),
 		intval($convid),
 		dbesc($me[0]['name']),
 		dbesc($me[0]['thumb']),
@@ -184,7 +185,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 	if(! $me['name'])
 		return -2;
 
-	$conv_guid = get_guid();
+	$conv_guid = get_guid(32);
 
 	$recip_handle = $recipient['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
 
@@ -221,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()),
+		dbesc(get_guid(32)),
 		intval($convid),
 		dbesc($me['name']),
 		dbesc($me['photo']),

mod/admin.php

@@ -857,7 +857,7 @@ function admin_page_users_post(&$a){
 	$nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : '');
 	$nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : '');
 
-	check_form_security_token_redirectOnErr($a->get_baseurl().'/admin/users', 'admin_users');
+	check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
 
 	if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) {
 		require_once('include/user.php');

mod/regmod.php

@@ -121,13 +121,13 @@ function regmod_content(&$a) {
 
 	if($cmd === 'deny') {
 		user_deny($hash);
-		goaway("/admin/users/");
+		goaway($a->get_baseurl()."/admin/users/");
 		killme();
 	}
 
 	if($cmd === 'allow') {
 		user_allow($hash);
-		goaway("/admin/users/");
+		goaway($a->get_baseurl()."/admin/users/");
 		killme();
 	}
 }

view/templates/diaspora_message.tpl

@@ -4,6 +4,9 @@
       <message>
         <guid>{{$msg.guid}}</guid>
         <parent_guid>{{$msg.parent_guid}}</parent_guid>
+	{{if $msg.parent_author_signature}}
+        <parent_author_signature>{{$msg.parent_author_signature}}</parent_author_signature>
+        {{/if}}
         <author_signature>{{$msg.author_signature}}</author_signature>
         <text>{{$msg.text}}</text>
         <created_at>{{$msg.created_at}}</created_at>