From 10e3eca8968e7c3e53b5dccdb2045840249ff7ed Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 4 Jan 2008 22:05:55 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20on=20v=E9rifie=20la=20validit=E9=20du=20?=
 =?UTF-8?q?mot=20de=20passe=20et=20on=20indique=20si=20celui-ci=20doit=20e?=
 =?UTF-8?q?tre=20modifi=E9=20sur=20le=20domaine=20=E0=20la=20prochaine=20c?=
 =?UTF-8?q?onnexion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/includes/login/functions_ldap.php | 34 ++++--------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/htdocs/includes/login/functions_ldap.php b/htdocs/includes/login/functions_ldap.php
index 1ce166291dd..59c3882224c 100644
--- a/htdocs/includes/login/functions_ldap.php
+++ b/htdocs/includes/login/functions_ldap.php
@@ -110,21 +110,16 @@ function check_user_password_ldap($usertotest,$passwordtotest)
 		if ($result)
 		{
 			$ldap->fetch($_POST["username"]);
-			// On stop si le mot de passe ldap doit etre modifie
-			if ($ldap->pwdlastset == 0)
+			// On stop si le mot de passe ldap doit etre modifie sur le domaine
+			if ($ldap->pwdlastset <= 0)
 			{
-				session_destroy();
-				dolibarr_syslog('User '.$login.' must change password next logon');
+				dolibarr_syslog('functions_ldap::User '.$login.' must change password next logon');
 				if ($ldapdebug) print "DEBUG: User ".$login." must change password<br>\n";
 				$ldap->close();
-						
-				// On repart sur page accueil
-				session_name($sessionname);
-				session_start();
+				sleep(1);
 				$langs->load('ldap');
 				$_SESSION["dol_loginmesg"]=$langs->trans("UserMustChangePassNextLogon");
-				header('Location: '.DOL_URL_ROOT.'/index.php');
-				exit;
+				return $login;
 			}
 			else
 			{
@@ -156,25 +151,6 @@ function check_user_password_ldap($usertotest,$passwordtotest)
 					if ($ldapdebug) print "DEBUG: pwdLastSet = ".dolibarr_print_date($ldap->pwdlastset,'day')."<br>\n";
 					if ($ldapdebug) print "DEBUG: badPasswordTime = ".dolibarr_print_date($ldap->badpwdtime,'day')."<br>\n";
 					
-					/*
-					// On stop si le mot de passe ldap doit etre modifie
-					if ($ldap->pwdlastset == 0)
-					{
-						session_destroy();
-						dolibarr_syslog('User '.$login.' must change password next logon');
-						if ($ldapdebug) print "DEBUG: User ".$login." must change password<br>\n";
-						$ldap->close();
-						
-						// On repart sur page accueil
-						session_name($sessionname);
-						session_start();
-						$langs->load('ldap');
-						$_SESSION["dol_loginmesg"]=$langs->trans("UserMustChangePassNextLogon");
-						header('Location: '.DOL_URL_ROOT.'/index.php');
-						exit;
-					}
-					*/
-					
 					// On recherche le user dolibarr en fonction de son SID ldap
 					$sid = $ldap->getObjectSid($login);
 					if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";