From 8a51a59e3b37f7aa7772ea3011ae459c615a9fb3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Mar 2023 01:59:48 +0100 Subject: [PATCH] Fix infinite redirect when $dolibarr_main_authentication not set --- htdocs/main.inc.php | 2 +- htdocs/master.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index b9469cf55ea..2465d3ccd08 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -666,7 +666,7 @@ if (!defined('NOLOGIN')) { } else { // Authentication mode if (empty($dolibarr_main_authentication)) { - $dolibarr_main_authentication = 'http,dolibarr'; + $dolibarr_main_authentication = 'dolibarr'; } // Authentication mode: forceuser if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) { diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 69ce82e5657..39c6128435b 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -78,7 +78,7 @@ $conf->file->main_limit_users = $dolibarr_main_limit_users; $conf->file->mailing_limit_sendbyweb = empty($dolibarr_mailing_limit_sendbyweb) ? 0 : $dolibarr_mailing_limit_sendbyweb; $conf->file->mailing_limit_sendbycli = empty($dolibarr_mailing_limit_sendbycli) ? 0 : $dolibarr_mailing_limit_sendbycli; $conf->file->mailing_limit_sendbyday = empty($dolibarr_mailing_limit_sendbyday) ? 0 : $dolibarr_mailing_limit_sendbyday; -$conf->file->main_authentication = empty($dolibarr_main_authentication) ? '' : $dolibarr_main_authentication; // Identification mode +$conf->file->main_authentication = empty($dolibarr_main_authentication) ? 'dolibarr' : $dolibarr_main_authentication; // Identification mode $conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $dolibarr_main_force_https; // Force https $conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug) $conf->file->instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance