X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=c191d3e170350859f30d6d3b3baeb90628ba1a6d;hb=3d55ef15467074fbf98fdf2217dc242c8a091ffc;hp=1a262f76057f9e78320b0d66ed38eb13a5bcd4dd;hpb=1bc4b2e0788ac11d3b377013b410f2250fff68aa;p=friendica.git diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 1a262f7605..c191d3e170 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -1,9 +1,23 @@ . + * + * Friendship acceptance for DFRN contacts * * There are two possible entry points and three scenarios. * @@ -19,7 +33,6 @@ */ use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; @@ -27,6 +40,7 @@ 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\Protocol\Activity; use Friendica\Util\Crypto; @@ -229,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); @@ -526,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'],