kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

moving https check down to AFTER hook/err initialization

This commit is contained in:
Benjamin Sonntag 2016-05-18 15:04:19 +02:00
parent bb7d78a48b
commit 06076b6fe0
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bureau/class/config.php
View File

@ -133,16 +133,6 @@ class DB_system extends DB_Sql {
$db = new DB_system(); $db = new DB_system();
// $db = new Sql($L_MYSQL_DATABASE, $L_MYSQL_HOST, $L_MYSQL_LOGIN, $L_MYSQL_PWD); // $db = new Sql($L_MYSQL_DATABASE, $L_MYSQL_HOST, $L_MYSQL_LOGIN, $L_MYSQL_PWD);
// https: Redirection if not calling https://!fqdn or if https is forced
if ((variable_get('force_https', '0', "This variable is set to 0 (default) if users can access the management desktop through HTTP, otherwise we force HTTPS")&&(!isset($_SERVER["HTTPS"])|| ($_SERVER["HTTPS"] != "on")))
||(isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on" && $host != $L_FQDN)) {
// do not redirect if access is not by HTTP(s)
if (isset($_SERVER['REQUEST_URI'])) {
header("Location: https://$L_FQDN".$_SERVER['REQUEST_URI']);
exit;
}
}
// Current User ID = the user whose commands are made on behalf of. // Current User ID = the user whose commands are made on behalf of.
$cuid = 0; $cuid = 0;
@ -177,6 +167,17 @@ $err = new m_err();
$authip = new m_authip(); $authip = new m_authip();
$hooks = new m_hooks(); $hooks = new m_hooks();
// https: Redirection if not calling https://!fqdn or if https is forced
if ((variable_get('force_https', '0', "This variable is set to 0 (default) if users can access the management desktop through HTTP, otherwise we force HTTPS")&&(!isset($_SERVER["HTTPS"])|| ($_SERVER["HTTPS"] != "on")))
||(isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on" && $host != $L_FQDN)) {
// do not redirect if access is not by HTTP(s)
if (isset($_SERVER['REQUEST_URI'])) {
header("Location: https://$L_FQDN".$_SERVER['REQUEST_URI']);
exit;
}
}
/* Check the User identity (if required) */ /* Check the User identity (if required) */
if (!defined('NOCHECK')) { if (!defined('NOCHECK')) {
if (!$mem->checkid()) { if (!$mem->checkid()) {