diff --git a/trunk/conf/config.inc.php b/trunk/conf/config.inc.php index 7e0b1c36..d489b312 100644 --- a/trunk/conf/config.inc.php +++ b/trunk/conf/config.inc.php @@ -28,6 +28,7 @@ $GLOBALS['LSconfig'] = array( 'cacheLSprofiles' => true, 'cacheSubDn' => true, 'cacheSearch' => true, + 'keepLSsessionActive' => true, 'ldap_servers' => array ( array ( 'name' => 'LSexample', diff --git a/trunk/includes/class/class.LSsession.php b/trunk/includes/class/class.LSsession.php index cfbf7e53..4a353ead 100644 --- a/trunk/includes/class/class.LSsession.php +++ b/trunk/includes/class/class.LSsession.php @@ -1008,7 +1008,19 @@ class LSsession { $JSscript_txt.="\n"; } - if (!isset(self :: $ldapServer['keepLSsessionActive']) || (self :: $ldapServer['keepLSsessionActive'])) { + if ( + ( + (!isset(self :: $ldapServer['keepLSsessionActive'])) + && + ( + (!isset($GLOBALS['LSconfig']['keepLSsessionActive'])) + || + ($GLOBALS['LSconfig']['keepLSsessionActive']) + ) + ) + || + (self :: $ldapServer['keepLSsessionActive']) + ) { self :: addJSconfigParam('keepLSsessionActive',ini_get('session.gc_maxlifetime')); }