entrouvert
/
montpellier
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

simplesamlphp: fix post https to http for ff >= 23

This commit is contained in:
Jérôme Schneider 2013-09-07 13:36:21 +02:00
parent e964f29e48
commit 80dda26949
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drupal/simplesamlphp_auth/simplesamlphp/config/config.php
View File

@ -25,9 +25,10 @@ $config = array (
// prod
'baseurlpath' => 'https://www.montpellier-agglo.com/simplesamlphp/',
// recette
// 'baseurlpath' => 'https://www-test.entrouvert.montpellier-agglo.com/simplesamlphp/',
// 'baseurlpath' => 'https://www-test.entrouvert.montpellier-agglo.com/simplesamlphp/',
// dev
// 'baseurlpath' => 'simplesamlphp/',
// 'baseurlpath' => 'simplesamlphp/',
'baseurlpath' => 'https://www-test.entrouvert.montpellier-agglo.com/simplesamlphp/',
'certdir' => 'cert/',
'loggingdir' => 'log/',
'datadir' => 'data/',

5
drupal/simplesamlphp_auth/simplesamlphp_auth.module
View File

@ -174,6 +174,9 @@ function simplesamlphp_auth_loginpage() {
$gotourl = $returnto;
}
if (($_simplesamlphp_auth_as->isAuthenticated()) && (!empty($_SERVER['HTTPS'])) ) {
return drupal_goto("http://${_SERVER['SERVER_NAME']}/");
}
// If a ReturnTo has been set.
if ($gotourl) {
@ -469,7 +472,7 @@ function simplesamlphp_auth_user_logout($account) {
$gotourl = variable_get('simplesamlphp_auth_logoutgotourl', '');
}
$_simplesamlphp_auth_as->logout($gotourl);
$_simplesamlphp_auth_as->logout("http://${_SERVER['SERVER_NAME']}/");
}
}