X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fmessage.php;h=377d7c715b15d7eabd8e41a4d6a2f92194822073;hb=082ad499c6bceadb2a1bc5127229bd0f86ee3895;hp=baf1bb2d5c6f4c6158130a3d95cd10e1558ec23a;hpb=d2e110abf5c530b6e4f2e32bf8812faa3fa131f2;p=friendica.git

diff --git a/include/message.php b/include/message.php
index baf1bb2d5c..377d7c715b 100644
--- a/include/message.php
+++ b/include/message.php
@@ -1,10 +1,12 @@
 <?php
+
 	// send a private message
 	
 
 
 
 function send_message($recipient=0, $body='', $subject='', $replyto=''){ 
+
 	$a = get_app();
 
 	if(! $recipient) return -1;
@@ -28,22 +30,21 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
  	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
 
 	$convid = 0;
+	$reply = false;
 
 	// look for any existing conversation structure
 
 	if(strlen($replyto)) {
-		$r = q("select convid from mail where uid = %d and uri = '%s' limit 1",
+		$reply = true;
+		$r = q("select convid from mail where uid = %d and ( uri = '%s' or `parent-uri` = '%s' ) limit 1",
 			intval(local_user()),
+			dbesc($replyto),
 			dbesc($replyto)
 		);
 		if(count($r))
 			$convid = $r[0]['convid'];
 	}		
 
-	if(! strlen($replyto))
-		$replyto = $uri;
-
-
 	if(! $convid) {
 
 		// create a new conversation
@@ -58,11 +59,16 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 
 		$handles = $recip_handle . ';' . $sender_handle;
 
-		$r = q("insert into conv (uid,guid,recips) values (%d, '%s', '%s') ",
+		$r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
 			intval(local_user()),
 			dbesc($conv_guid),
+			dbesc($sender_handle),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			dbesc($subject),
 			dbesc($handles)
 		);
+
 		$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
 			dbesc($conv_guid),
 			intval(local_user())
@@ -76,10 +82,16 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		return -4;
 	}
 
-	$r = q("INSERT INTO `mail` ( `uid`, `convid`, `from-name`, `from-photo`, `from-url`, 
-		`contact-id`, `title`, `body`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
-		VALUES ( %d, %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', '%s' )",
+	if(! strlen($replyto)) {
+		$replyto = $uri;
+	}
+
+
+	$r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, 
+		`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()),
 		intval($convid),
 		dbesc($me[0]['name']),
 		dbesc($me[0]['thumb']),
@@ -88,11 +100,14 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		dbesc($subject),
 		dbesc($body),
 		1,
+		intval($reply),
 		0,
 		dbesc($uri),
 		dbesc($replyto),
 		datetime_convert()
 	);
+
+
 	$r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1",
 		dbesc($uri),
 		intval(local_user())
@@ -141,3 +156,87 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 	}
 
 }
+
+
+
+
+
+function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){ 
+
+	$a = get_app();
+
+	if(! $recipient) return -1;
+	
+	if(! strlen($subject))
+		$subject = t('[no subject]');
+
+	$hash = random_string();
+ 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
+
+	$convid = 0;
+	$reply = false;
+
+	require_once('include/Scrape.php');
+
+	$me = probe_url($replyto);
+
+	if(! $me['name'])
+		return -2;
+
+	$conv_guid = get_guid();
+
+	$recip_handle = $recipient['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
+
+	$sender_nick = basename($replyto);
+	$sender_host = substr($replyto,strpos($replyto,'://')+3);
+	$sender_host = substr($sender_host,0,strpos($sender_host,'/'));
+	$sender_handle = $sender_nick . '@' . $sender_host;
+
+	$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') ",
+		intval(local_user()),
+		dbesc($conv_guid),
+		dbesc($sender_handle),
+		dbesc(datetime_convert()),
+		dbesc(datetime_convert()),
+		dbesc($subject),
+		dbesc($handles)
+	);
+
+	$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
+		dbesc($conv_guid),
+		intval($recipient['uid'])
+	);
+	if(count($r))
+		$convid = $r[0]['id'];
+
+	if(! $convid) {
+		logger('send message: conversation not found.');
+		return -4;
+	}
+
+	$r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, 
+		`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()),
+		intval($convid),
+		dbesc($me['name']),
+		dbesc($me['photo']),
+		dbesc($me['url']),
+		0,
+		dbesc($subject),
+		dbesc($body),
+		0,
+		0,
+		0,
+		dbesc($uri),
+		dbesc($replyto),
+		datetime_convert(),
+		1
+	);
+
+	return 0;
+
+}