Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix minor

Browse Source
This commit is contained in:
Laurent Destailleur
2018-01-14 20:11:38 +01:00
parent cc5dcde9e1
commit 90fc086814
5 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/main.inc.php
View File

@@ -210,8 +210,11 @@ if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
}
// Init session. Name of session is specific to Dolibarr instance.
// Note: the function dol_getprefix have been redefined to manage another area to protect with a different cookie.
$prefix=dol_getprefix('');
$sessionname='DOLSESSID_'.$prefix;
$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
@@ -375,12 +378,19 @@ $login='';
if (! defined('NOLOGIN'))
{
// $authmode lists the different means of identification to be tested in order of preference.
// Example: 'http', 'dolibarr', 'ldap', 'http,forceuser'
// Example: 'http', 'dolibarr', 'ldap', 'http,forceuser', '...'
// Authentication mode
if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
// Authentication mode: forceuser
if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
if (defined('MAIN_AUTHENTICATION_MODE'))
{
$dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
}
else
{
// Authentication mode
if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
// Authentication mode: forceuser
if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
}
// Set authmode
$authmode=explode(',',$dolibarr_main_authentication);