Merge pull request #8140 from annando/mail-probe

[friendica.git] / src / Worker / Delivery.php

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index ef5a7b9f20a979c8a9daa01934148f3360ae60b4..4f9d522df9eb32ae5b7691910fd570e9a9ca5503 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -5,10 +5,8 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model;
@@ -140,7 +138,7 @@ class Delivery
                        // if $parent['wall'] == 1 we will already have the parent message in our array
                        // and we will relay the whole lot.
 
-                       $localhost = DI::app()->getHostName();
+                       $localhost = DI::baseUrl()->getHostname();
                        if (strpos($localhost, ':')) {
                                $localhost = substr($localhost, 0, strpos($localhost, ':'));
                        }
@@ -198,6 +196,11 @@ class Delivery
                        $contact['network'] = Protocol::DIASPORA;
                }
 
+               // Ensure that local contacts are delivered locally
+               if (Model\Contact::isLocal($contact['url'])) {
+                       $contact['network'] = Protocol::DFRN;
+               }
+
                Logger::notice('Delivering', ['cmd' => $cmd, 'target' => $target_id, 'followup' => $followup, 'network' => $contact['network']]);
 
                switch ($contact['network']) {
@@ -236,7 +239,7 @@ class Delivery
        }
 
        /**
-        * @brief Deliver content via DFRN
+        * Deliver content via DFRN
         *
         * @param string  $cmd            Command
         * @param array   $contact        Contact record of the receiver
@@ -288,11 +291,8 @@ class Delivery
 
                Logger::debug('Notifier entry: ' . $contact["url"] . ' ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' entry: ' . $atom);
 
-               $basepath =  implode('/', array_slice(explode('/', $contact['url']), 0, 3));
-
                // perform local delivery if we are on the same site
-
-               if (Strings::compareLink($basepath, System::baseUrl())) {
+               if (Model\Contact::isLocal($contact['url'])) {
                        $condition = ['nurl' => Strings::normaliseLink($contact['url']), 'self' => true];
                        $target_self = DBA::selectFirst('contact', ['uid'], $condition);
                        if (!DBA::isResult($target_self)) {
@@ -388,7 +388,7 @@ class Delivery
        }
 
        /**
-        * @brief Deliver content via Diaspora
+        * Deliver content via Diaspora
         *
         * @param string  $cmd            Command
         * @param array   $contact        Contact record of the receiver
@@ -483,7 +483,7 @@ class Delivery
        }
 
        /**
-        * @brief Deliver content via mail
+        * Deliver content via mail
         *
         * @param string $cmd         Command
         * @param array  $contact     Contact record of the receiver
@@ -536,7 +536,7 @@ class Delivery
                        $reply_to = $mailacct['reply_to'];
                }
 
-               $subject  = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : L10n::t("\x28no subject\x29"));
+               $subject  = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : DI::l10n()->t("\x28no subject\x29"));
 
                // only expose our real email address to true friends
 
@@ -548,7 +548,7 @@ class Delivery
                                $headers  = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n";
                        }
                } else {
-                       $headers  = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . DI::app()->getHostName() . '>' . "\n";
+                       $headers  = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . DI::baseUrl()->getHostname() . '>' . "\n";
                }
 
                $headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";