X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fmessage.php;h=d6b1601110e9bb58f06cbd853e140d5f41e257d6;hb=17f29285358cd4cf5292b72624c378e466c6ad7b;hp=0c1ffff7cfaeec71ca374195f2d47af37e3b6216;hpb=4e49939421d39dfa971d8744691568bcdbdca15e;p=friendica.git

diff --git a/include/message.php b/include/message.php
index 0c1ffff7cf..d6b1601110 100644
--- a/include/message.php
+++ b/include/message.php
@@ -3,6 +3,7 @@
 // send a private message
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function send_message($recipient=0, $body='', $subject='', $replyto=''){
 
@@ -26,7 +27,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 	}
 
 	$guid = get_guid(32);
- 	$uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;
+ 	$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
 	$convid = 0;
 	$reply = false;
@@ -52,29 +53,21 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		$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(App::get_baseurl(), strpos(App::get_baseurl(),'://') + 3);
+		$sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3);
 
 		$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') ",
-			intval(local_user()),
-			dbesc($conv_guid),
-			dbesc($sender_handle),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			dbesc($subject),
-			dbesc($handles)
-		);
+		$fields = array('uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle,
+				'created' => datetime_convert(), 'updated' => datetime_convert(),
+				'subject' => $subject, 'recips' => $handles);
+		$r = dba::insert('conv', $fields);
 
-		$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
-			dbesc($conv_guid),
-			intval(local_user())
-		);
+		$r = dba::select('conv', array('id'), array('guid' => $conv_guid, 'uid' => local_user()), array('limit' => 1));
 		if (dbm::is_result($r))
-			$convid = $r[0]['id'];
+			$convid = $r['id'];
 	}
 
 	if (! $convid) {
@@ -133,7 +126,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		$images = $match[1];
 		if (count($images)) {
 			foreach ($images as $image) {
-				if (! stristr($image,App::get_baseurl() . '/photo/')) {
+				if (! stristr($image,System::baseUrl() . '/photo/')) {
 					continue;
 				}
 				$image_uri = substr($image,strrpos($image,'/') + 1);
@@ -169,7 +162,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 	}
 
 	$guid = get_guid(32);
- 	$uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;
+ 	$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
 	$convid = 0;
 	$reply = false;
@@ -184,7 +177,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 
 	$conv_guid = get_guid(32);
 
-	$recip_handle = $recipient['nickname'] . '@' . substr(App::get_baseurl(), strpos(App::get_baseurl(),'://') + 3);
+	$recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3);
 
 	$sender_nick = basename($replyto);
 	$sender_host = substr($replyto,strpos($replyto,'://')+3);
@@ -193,28 +186,18 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 
 	$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($recipient['uid']),
-		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'])
-	);
-
+	$fields = array('uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle,
+			'created' => datetime_convert(), 'updated' => datetime_convert(),
+			'subject' => $subject, 'recips' => $handles);
+	$r = dba::insert('conv', $fields);
 
-	if (! dbm::is_result($r)) {
+	$r = dba::select('conv', array('id'), array('guid' => $conv_guid, 'uid' => $recipient['uid']), array('limit' => 1));
+	if (!dbm::is_result($r)) {
 		logger('send message: conversation not found.');
 		return -4;
 	}
 
-	$convid = $r[0]['id'];
+	$convid = $r['id'];
 
 	$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`)