Replace $_SESSION with Session::get()

This commit is contained in:
Philipp Holzer 2019-05-30 10:18:52 +02:00
parent 694cd82d0e
commit e4a63bc219
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90

View File

@ -3,6 +3,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Session;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model\Contact;
@ -70,10 +71,9 @@ function redir_init(App $a) {
&& is_array($_SESSION['remote'])) && is_array($_SESSION['remote']))
{ {
foreach ($_SESSION['remote'] as $v) { foreach ($_SESSION['remote'] as $v) {
if (!empty($v['uid']) && !empty($_SESSION['visitor_visiting']) && if (!empty($v['uid']) && !empty($v['cid']) &&
!empty($v['cid']) && !empty($_SESSION['visitor_id']) && $v['uid'] === Session::get('visitor_visiting') &&
$v['uid'] == $_SESSION['visitor_visiting'] && $v['cid'] === Session::get('visitor_id')) {
$v['cid'] == $_SESSION['visitor_id']) {
// Remote user is already authenticated. // Remote user is already authenticated.
$target_url = defaults($url, $contact_url); $target_url = defaults($url, $contact_url);
Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG); Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);