use Friendica\App;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
+use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
-use Friendica\Util\Strings;
use Friendica\Util\Network;
+use Friendica\Util\Strings;
function redir_init(App $a) {
&& is_array($_SESSION['remote']))
{
foreach ($_SESSION['remote'] as $v) {
- if ($v['uid'] == $_SESSION['visitor_visiting'] && $v['cid'] == $_SESSION['visitor_id']) {
+ if (!empty($v['uid']) && !empty($v['cid']) &&
+ $v['uid'] == Session::get('visitor_visiting') &&
+ $v['cid'] == Session::get('visitor_id')) {
// Remote user is already authenticated.
$target_url = defaults($url, $contact_url);
Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
// When the remote page does support OWA, then we enforce the use of it
$basepath = Contact::getBasepath($contact_url);
- $serverret = Network::curl($basepath . '/magic');
- if ($serverret->isSuccess()) {
- $contact['issued-id'] = '';
- $contact['dfrn-id'] = '';
+ if (Strings::compareLink($basepath, System::baseUrl())) {
+ $use_magic = true;
+ } else {
+ $serverret = Network::curl($basepath . '/magic');
+ $use_magic = $serverret->isSuccess();
}
// Doing remote auth with dfrn.
- if (local_user() && (!empty($contact['dfrn-id']) || !empty($contact['issued-id'])) && empty($contact['pending'])) {
+ if (local_user() && !$use_magic && (!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']) {