Ensure *toArray returns an array

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index 931e07c770905a26450077180c86816511f30baf..c99e1823c76c84f05de01e5a7a3adbe622909e34 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -70,10 +71,9 @@ function redir_init(App $a) {
                                && is_array($_SESSION['remote']))
                        {
                                foreach ($_SESSION['remote'] as $v) {
-                                       if (!empty($v['uid']) && !empty($_SESSION['visitor_visiting']) &&
-                                           !empty($v['cid']) && !empty($_SESSION['visitor_id']) &&
-                                           $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);
@@ -85,7 +85,7 @@ function redir_init(App $a) {
 
                // When the remote page does support OWA, then we enforce the use of it
                $basepath = Contact::getBasepath($contact_url);
-               if ($basepath == System::baseUrl()) {
+               if (Strings::compareLink($basepath, System::baseUrl())) {
                        $use_magic = true;
                } else {
                        $serverret = Network::curl($basepath . '/magic');