Merge remote-tracking branch 'upstream/develop' into write-tags

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

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 37a4ec445a999ad85805db8685f4ffcca7d72fe7..94a0f4902b0ba3c441e0cfe915b6c740fd985711 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -1,11 +1,26 @@
 <?php
 /**
- * @file src/Worker/Delivery.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\Worker;
 
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -161,7 +176,7 @@ class Delivery
                                && empty($parent['allow_gid'])
                                && empty($parent['deny_cid'])
                                && empty($parent['deny_gid'])
-                               && !$parent["private"]) {
+                               && ($parent["private"] != Model\Item::PRIVATE)) {
                                $public_message = true;
                        }
                }
@@ -240,7 +255,7 @@ class Delivery
        }
 
        /**
-        * @brief Deliver content via DFRN
+        * Deliver content via DFRN
         *
         * @param string  $cmd            Command
         * @param array   $contact        Contact record of the receiver
@@ -389,7 +404,7 @@ class Delivery
        }
 
        /**
-        * @brief Deliver content via Diaspora
+        * Deliver content via Diaspora
         *
         * @param string  $cmd            Command
         * @param array   $contact        Contact record of the receiver
@@ -415,7 +430,7 @@ class Delivery
 
                Logger::notice('Deliver via Diaspora', ['target' => $target_item['id'], 'guid' => $target_item['guid'], 'to' => $loc]);
 
-               if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) {
+               if (DI::config()->get('system', 'dfrn_only') || !DI::config()->get('system', 'diaspora_enabled')) {
                        return;
                }
 
@@ -484,7 +499,7 @@ class Delivery
        }
 
        /**
-        * @brief Deliver content via mail
+        * Deliver content via mail
         *
         * @param string $cmd         Command
         * @param array  $contact     Contact record of the receiver
@@ -496,7 +511,7 @@ class Delivery
         */
        private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent)
        {
-               if (Config::get('system','dfrn_only')) {
+               if (DI::config()->get('system','dfrn_only')) {
                        return;
                }
 
@@ -537,7 +552,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
 
@@ -549,7 +564,8 @@ 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::baseUrl()->getHostname() . '>' . "\n";
+                       $sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHostname());
+                       $headers  = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <' . $sender . '>' . "\n";
                }
 
                $headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";