Reworked "remote" cookie handling

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index 1df7060fa603f7baeebd7b9ca9e9fbed9bb30a20..6b492473a0dd24742e129e85e9dbc0dbed87d476 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -66,20 +66,11 @@ function redir_init(App $a) {
                        // with the local contact. Otherwise the local user would ask the local contact
                        // for authentification everytime he/she is visiting a profile page of the local
                        // contact.
-                       if ($host == $remotehost
-                               && !empty($_SESSION['remote'])
-                               && is_array($_SESSION['remote']))
-                       {
-                               foreach ($_SESSION['remote'] as $v) {
-                                       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);
-                                               $a->redirect($target_url);
-                                       }
-                               }
+                       if (($host == $remotehost) && (remote_user(Session::get('visitor_visiting')) == 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);
+                               $a->redirect($target_url);
                        }
                }