From 49317dc29ca09685c5a69bf3af2d995a87a03bfd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 10 Oct 2008 20:39:16 +0000
Subject: [PATCH] Remove deprecated code

---
 htdocs/admin/system/dolibarr.php | 4 ++--
 htdocs/main.inc.php              | 1 +
 htdocs/user/logout.php           | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 0352df21e8c..606f467ac9f 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -103,8 +103,8 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Session").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
 $var=!$var;
 print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("SessionId")."</td><td>".session_id()."</td></tr>\n";
-$var=!$var;
-print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentSessionTimeOut")."</td><td>".ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds")."</td></tr>\n";
+//$var=!$var;
+//print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentSessionTimeOut")."</td><td>".ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds")."</td></tr>\n";
 $var=!$var;
 print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentTheme")."</td><td>".$conf->theme."</td></tr>\n";
 $var=!$var;
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1bbb8efe897..75bed021629 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -140,6 +140,7 @@ if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_D
 
 // Init session
 $sessionname="DOLSESSID_".$dolibarr_main_db_name;
+//ini_set('session.gc_maxlifetime',10);
 session_name($sessionname);
 session_start();
 dolibarr_syslog("Session name=".$sessionname." Session id()=".session_id().", _SESSION['dol_login']=".$_SESSION["dol_login"]);
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index d110163d62f..4078438b66f 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -43,7 +43,8 @@ if ($conf->phenix->enabled && $conf->phenix->cookie)
 dolibarr_syslog("End session in DOLSESSID_".$dolibarr_main_db_name);
 
 session_destroy();
-session_name("DOLSESSID_".$dolibarr_main_db_name);
+$sessionname="DOLSESSID_".$dolibarr_main_db_name;
+session_name($sessionname);
 session_start();
 session_unregister("dol_login");