X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FMail.php;h=24a174b6b58251df7c5dd674c4ad75d207c50b46;hb=2a7327a41c3ea9b9910c9426956c93761bf56121;hp=1e5c8648721cf2a973a189d845a95aff955883c1;hpb=4e44b07dfe07dde78fe8a095fbb43d9ec1ffcb53;p=friendica.git

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 1e5c864872..24a174b6b5 100644
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -8,8 +8,7 @@ namespace Friendica\Model;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 
@@ -40,8 +39,8 @@ class Mail
 			$subject = L10n::t('[no subject]');
 		}
 
-		$me = dba::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
-		$contact = dba::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
+		$me = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
+		$contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
 
 		if (!(count($me) && (count($contact)))) {
 			return -2;
@@ -57,13 +56,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'];
 			}
 		}
 
@@ -84,8 +81,8 @@ class Mail
 			$fields = ['uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle,
 				'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(),
 				'subject' => $subject, 'recips' => $handles];
-			if (dba::insert('conv', $fields)) {
-				$convid = dba::lastInsertId();
+			if (DBA::insert('conv', $fields)) {
+				$convid = DBA::lastInsertId();
 			}
 		}
 
@@ -99,7 +96,7 @@ class Mail
 		}
 
 		$post_id = null;
-		$success = dba::insert(
+		$success = DBA::insert(
 			'mail',
 			[
 				'uid' => local_user(),
@@ -121,7 +118,7 @@ class Mail
 		);
 
 		if ($success) {
-			$post_id = dba::lastInsertId();
+			$post_id = DBA::lastInsertId();
 		}
 
 		/**
@@ -145,7 +142,7 @@ class Mail
 					}
 					$image_uri = substr($image, strrpos($image, '/') + 1);
 					$image_uri = substr($image_uri, 0, strpos($image_uri, '-'));
-					dba::update('photo', ['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_uri, 'album' => 'Wall Photos', 'uid' => local_user()]);
+					DBA::update('photo', ['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_uri, 'album' => 'Wall Photos', 'uid' => local_user()]);
 				}
 			}
 		}
@@ -198,8 +195,8 @@ class Mail
 		$fields = ['uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle,
 			'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(),
 			'subject' => $subject, 'recips' => $handles];
-		if (dba::insert('conv', $fields)) {
-			$convid = dba::lastInsertId();
+		if (DBA::insert('conv', $fields)) {
+			$convid = DBA::lastInsertId();
 		}
 
 		if (!$convid) {
@@ -207,7 +204,7 @@ class Mail
 			return -4;
 		}
 
-		dba::insert(
+		DBA::insert(
 			'mail',
 			[
 				'uid' => $recipient['uid'],