Merge pull request #8271 from MrPetovan/bug/8229-frio-mobile-back-to-top

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 3d27593aaf51a6c93f93c01aa128b32364cc6166..2e1f51a11c056344c20041035165554fe2875086 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -1,16 +1,32 @@
 <?php
-
 /**
- * @file mod/dfrn_notify.php
- * @brief The dfrn notify endpoint
+ * @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/>.
+ *
+ * The dfrn notify endpoint
+ *
  * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
 use Friendica\Protocol\DFRN;
@@ -128,7 +144,7 @@ function dfrn_notify_post(App $a) {
                System::xmlExit(0, 'relationship dissolved');
        }
 
-       $rino = Config::get('system', 'rino_encrypt');
+       $rino = DI::config()->get('system', 'rino_encrypt');
        $rino = intval($rino);
 
        if (strlen($key)) {
@@ -214,7 +230,7 @@ function dfrn_dispatch_public($postdata)
 
 function dfrn_dispatch_private($user, $postdata)
 {
-       $msg = Diaspora::decodeRaw($postdata, $user);
+       $msg = Diaspora::decodeRaw($postdata, $user['prvkey'] ?? '');
        if (!$msg) {
                System::xmlExit(4, 'Unable to parse message');
        }
@@ -343,7 +359,7 @@ function dfrn_notify_content(App $a) {
                $encrypted_id = bin2hex($encrypted_id);
 
 
-               $rino = Config::get('system', 'rino_encrypt');
+               $rino = DI::config()->get('system', 'rino_encrypt');
                $rino = intval($rino);
 
                Logger::log("Local rino version: ". $rino, Logger::DATA);