From b66f3a2de2449ed253101a9fadedce64e13a71fe Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Sat, 21 Feb 2009 11:42:26 +0000
Subject: [PATCH] =?UTF-8?q?-=20LSsession=20:=20Ajout=20d'un=20param=C3=A8t?=
 =?UTF-8?q?rage=20global=20pour=20'keepLSsessionActive'.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 trunk/conf/config.inc.php                |  1 +
 trunk/includes/class/class.LSsession.php | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

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.="<script src='".$script['path'].$script['file']."' type='text/javascript'></script>\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'));
     }