X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fredir.php;h=3acf960dab7b2556218dd2ed7a2a52d1501ff4fe;hb=9de0d354506fdb20929e68d10cf3680181d4382c;hp=20e2050764a3890420f68c0b529da7f8e1d3501f;hpb=af6dbc654f82225cfc647fe2072662acae388e47;p=friendica.git

diff --git a/mod/redir.php b/mod/redir.php
index 20e2050764..3acf960dab 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -2,9 +2,9 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 
@@ -23,16 +23,16 @@ function redir_init(App $a) {
 	}
 
 	if (!empty($cid)) {
-		$fields = ['id', 'uid', 'nurl', 'url', 'addr', 'name', 'network', 'poll', 'issued-id', 'dfrn-id', 'duplex'];
+		$fields = ['id', 'uid', 'nurl', 'url', 'addr', 'name', 'network', 'poll', 'issued-id', 'dfrn-id', 'duplex', 'pending'];
 		$contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => [0, local_user()]]);
-		if (!DBM::is_result($contact)) {
+		if (!DBA::isResult($contact)) {
 			notice(L10n::t('Contact not found.'));
 			goaway(System::baseUrl());
 		}
 
 		$contact_url = $contact['url'];
 
-		if ($contact['network'] !== NETWORK_DFRN // Authentication isn't supported for non DFRN contacts.
+		if ($contact['network'] !== Protocol::DFRN // Authentication isn't supported for non DFRN contacts.
 			|| (!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
 			|| (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated.
 		{
@@ -44,7 +44,7 @@ function redir_init(App $a) {
 			// between the puplic contact we have found and the local user.
 			$contact = DBA::selectFirst('contact', $fields, ['nurl' => $contact['nurl'], 'uid' => local_user()]);
 
-			if (DBM::is_result($contact)) {
+			if (DBA::isResult($contact)) {
 				$cid = $contact['id'];
 			}
 
@@ -80,7 +80,7 @@ function redir_init(App $a) {
 		}
 
 		// Doing remote auth with dfrn.
-		if (local_user()&& (!empty($contact['dfrn-id']) || !empty($contact['issued-id']))) {
+		if (local_user() && (!empty($contact['dfrn-id']) || !empty($contact['issued-id'])) && empty($contact['pending'])) {
 			$dfrn_id = $orig_id = (($contact['issued-id']) ? $contact['issued-id'] : $contact['dfrn-id']);
 
 			if ($contact['duplex'] && $contact['issued-id']) {