X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FMail.php;h=815b0051d9df1ff0b5cc7ef2d2c3eea09fb85053;hb=d50a1edef468b9e3de456cb7c4570da5272b0cd8;hp=b56b65f72c2ae17630ba8efafc2b60213de68cce;hpb=af6dbc654f82225cfc647fe2072662acae388e47;p=friendica.git

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index b56b65f72c..815b0051d9 100644
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -6,10 +6,10 @@
 namespace Friendica\Model;
 
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 
@@ -47,7 +47,7 @@ class Mail
 			return -2;
 		}
 
-		$guid = System::createGUID(32);
+		$guid = System::createUUID();
 		$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
 		$convid = 0;
@@ -57,13 +57,11 @@ class Mail
 
 		if (strlen($replyto)) {
 			$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 (DBM::is_result($r)) {
-				$convid = $r[0]['convid'];
+			$condition = ["`uid` = ? AND (`uri` = ? OR `parent-uri` = ?)",
+				local_user(), $replyto, $replyto];
+			$mail = DBA::selectFirst('mail', ['convid'], $condition);
+			if (DBA::isResult($mail)) {
+				$convid = $mail['convid'];
 			}
 		}
 
@@ -76,7 +74,7 @@ class Mail
 			$recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
 			$sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
 
-			$conv_guid = System::createGUID(32);
+			$conv_guid = System::createUUID();
 			$convuri = $recip_handle . ':' . $conv_guid;
 
 			$handles = $recip_handle . ';' . $sender_handle;
@@ -90,7 +88,7 @@ class Mail
 		}
 
 		if (!$convid) {
-			logger('send message: conversation not found.');
+			Logger::log('send message: conversation not found.');
 			return -4;
 		}
 
@@ -174,7 +172,7 @@ class Mail
 			$subject = L10n::t('[no subject]');
 		}
 
-		$guid = System::createGUID(32);
+		$guid = System::createUUID();
 		$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
 		$me = Probe::uri($replyto);
@@ -183,7 +181,7 @@ class Mail
 			return -2;
 		}
 
-		$conv_guid = System::createGUID(32);
+		$conv_guid = System::createUUID();
 
 		$recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
 
@@ -203,7 +201,7 @@ class Mail
 		}
 
 		if (!$convid) {
-			logger('send message: conversation not found.');
+			Logger::log('send message: conversation not found.');
 			return -4;
 		}