X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=c191d3e170350859f30d6d3b3baeb90628ba1a6d;hb=9c36b63b33b7bae4da27a5d6257df9e74cf7c5f2;hp=a0752f8880e23ec54809bef58297335c62b5832b;hpb=5dfee31108fc92a7abca5f99b8fdf1b34aec5dd5;p=friendica.git

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index a0752f8880..c191d3e170 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * @file mod/dfrn_confirm.php
- * Module: dfrn_confirm
+ * @copyright Copyright (C) 2020, Friendica
  *
- * Purpose: Friendship acceptance for DFRN contacts
+ * @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/>.
+ *
+ * Friendship acceptance for DFRN contacts
  *
  * There are two possible entry points and three scenarios.
  *
@@ -19,8 +33,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -28,8 +40,8 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Notify\Type;
 use Friendica\Model\User;
-use Friendica\Network\Probe;
 use Friendica\Protocol\Activity;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
@@ -231,7 +243,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			return;
 		}
 
-		if (strlen($leading_junk) && Config::get('system', 'debugging')) {
+		if (strlen($leading_junk) && DI::config()->get('system', 'debugging')) {
 			// This might be more common. Mixed error text and some XML.
 			// If we're configured for debugging, show the text. Proceed in either case.
 			notice(DI::l10n()->t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL);
@@ -528,10 +540,10 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 		if (DBA::isResult($r)) {
 			$combined = $r[0];
 
-			if ($combined['notify-flags'] & NOTIFY_CONFIRM) {
+			if ($combined['notify-flags'] & Type::CONFIRM) {
 				$mutual = ($new_relation == Contact::FRIEND);
 				notification([
-					'type'         => NOTIFY_CONFIRM,
+					'type'         => Type::CONFIRM,
 					'notify_flags' => $combined['notify-flags'],
 					'language'     => $combined['language'],
 					'to_name'      => $combined['username'],