Skip to content
This repository has been archived by the owner on Feb 14, 2020. It is now read-only.

Replace SimpleSAML_Sesssion::getSession() #605

Merged
merged 5 commits into from
Sep 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion www/dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
require __DIR__ . '/_includes.php';

set_time_limit(180);
$session = SimpleSAML_Session::getSession();
$session = SimpleSAML_Session::getSessionFromRequest();
$config = SimpleSAML_Configuration::getInstance();
$janus_config = sspmod_janus_DiContainer::getInstance()->getConfig();
$csrf_provider = sspmod_janus_DiContainer::getInstance()->getCsrfProvider();
Expand Down
2 changes: 1 addition & 1 deletion www/editentity.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// Initial import
/** @var $session SimpleSAML_Session */
set_time_limit(180);
$session = SimpleSAML_Session::getSession();
$session = SimpleSAML_Session::getSessionFromRequest();
$config = SimpleSAML_Configuration::getInstance();
$janus_config = sspmod_janus_DiContainer::getInstance()->getConfig();

Expand Down
2 changes: 1 addition & 1 deletion www/exportentity.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
require __DIR__ . '/_includes.php';

/* Load simpleSAMLphp, configuration and metadata */
$session = SimpleSAML_Session::getSession();
$session = SimpleSAML_Session::getSessionFromRequest();
$config = SimpleSAML_Configuration::getInstance();
$janus_config = sspmod_janus_DiContainer::getInstance()->getConfig();

Expand Down
2 changes: 1 addition & 1 deletion www/metadataexport.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require __DIR__ . '/_includes.php';

// Get configuration
$session = SimpleSAML_Session::getSession();
$session = SimpleSAML_Session::getSessionFromRequest();
$config = SimpleSAML_Configuration::getInstance();
$janus_config = sspmod_janus_DiContainer::getInstance()->getConfig();
$util = new sspmod_janus_AdminUtil();
Expand Down
2 changes: 1 addition & 1 deletion www/noNewUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

require __DIR__ . '/_includes.php';

$session = SimpleSAML_Session::getSession();
$session = SimpleSAML_Session::getSessionFromRequest();
$config = SimpleSAML_Configuration::getInstance();
$janus_config = sspmod_janus_DiContainer::getInstance()->getConfig();

Expand Down