X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FMail.php;h=12b4985526b9a9b137dfa7f07b84e36ce0f9e1d8;hb=8c328a3c60d3bcbc8b091158383bf829064d2c9c;hp=de351db4aae333ef75c1c96853be22640800ee0c;hpb=1bc4b2e0788ac11d3b377013b410f2250fff68aa;p=friendica.git

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index de351db4aa..12b4985526 100644
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -1,8 +1,24 @@
 <?php
-
 /**
- * @file src/Model/Mail.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Model;
 
 use Friendica\Core\Logger;
@@ -10,7 +26,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\DI;
 use Friendica\Database\DBA;
-use Friendica\Network\Probe;
+use Friendica\Model\Notify\Type;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Worker\Delivery;
@@ -68,14 +84,14 @@ class Mail
 
 		// send notifications.
 		$notif_params = [
-			'type' => NOTIFY_MAIL,
+			'type' => Type::MAIL,
 			'notify_flags' => $user['notify-flags'],
 			'language' => $user['language'],
 			'to_name' => $user['username'],
 			'to_email' => $user['email'],
 			'uid' => $user['uid'],
 			'item' => $msg,
-			'parent' => 0,
+			'parent' => $msg['id'],
 			'source_name' => $msg['from-name'],
 			'source_link' => $msg['from-url'],
 			'source_photo' => $msg['from-photo'],
@@ -113,9 +129,12 @@ class Mail
 		}
 
 		$me = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
-		$contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
+		if (!DBA::isResult($me)) {
+			return -2;
+		}
 
-		if (!(count($me) && (count($contact)))) {
+		$contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
+		if (!DBA::isResult($contact)) {
 			return -2;
 		}
 
@@ -250,8 +269,7 @@ class Mail
 		$guid = System::createUUID();
 		$uri = Item::newURI(local_user(), $guid);
 
-		$me = Probe::uri($replyto);
-
+		$me = Contact::getByURL($replyto);
 		if (!$me['name']) {
 			return -2;
 		}
@@ -260,10 +278,7 @@ class Mail
 
 		$recip_handle = $recipient['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::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;
+		$sender_handle = $me['addr'];
 
 		$handles = $recip_handle . ';' . $sender_handle;
 
@@ -296,7 +311,7 @@ class Mail
 				'reply' => 0,
 				'replied' => 0,
 				'uri' => $uri,
-				'parent-uri' => $replyto,
+				'parent-uri' => $me['url'],
 				'created' => DateTimeFormat::utcNow(),
 				'unknown' => 1
 			]