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;
}
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.
{
// 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'];
}
}
if (remote_user()) {
- $host = substr(System::baseUrl() . ($a->urlpath ? '/' . $a->urlpath : ''), strpos(System::baseUrl(), '://') + 3);
+ $host = substr(System::baseUrl() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''), strpos(System::baseUrl(), '://') + 3);
$remotehost = substr($contact['addr'], strpos($contact['addr'], '@') + 1);
// On a local instance we have to check if the local user has already authenticated
}
// 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']) {