From b9f7e6768b56300255c6edb6681f6015bd422c3e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 25 Apr 2007 14:16:27 +0000
Subject: [PATCH] Fix: changement du fonctionnement de l'encryption

---
 htdocs/lib/functions.inc.php | 28 +++++++++-------------------
 htdocs/master.inc.php        |  2 +-
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 783a4e76a0e..fe24f2e507b 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -2415,30 +2415,20 @@ function encodedecode_dbpassconf($level=0)
 		while(!feof($fp))
 		{
 			$buffer = fgets($fp,4096);
-			if (strstr($buffer,"\$dolibarr_main_db_encrypted_pass"))
+			
+			if (strstr($buffer,"\$dolibarr_main_db_encrypted_pass") && $level == 0)
 			{
-				if ($level == 0)
-				{
-					$config .= "\$dolibarr_main_db_encrypted_pass=0;\n";
-				}
-				else if ($level == 1)
-				{
-					$config .= "\$dolibarr_main_db_encrypted_pass=1;\n";
-				}
+				$passwd = strstr($buffer,"$dolibarr_main_db_encrypted_pass=");
+				$passwd = substr(substr($passwd,2),0,-3);
+				$passwd = dolibarr_decode($passwd);
+				$config .= "\$dolibarr_main_db_pass=\"$passwd\";\n";
 			}
-			else if (strstr($buffer,"\$dolibarr_main_db_pass"))
+			else if (strstr($buffer,"\$dolibarr_main_db_pass") && $level == 1)
 			{
 				$passwd = strstr($buffer,"$dolibarr_main_db_pass=");
 				$passwd = substr(substr($passwd,2),0,-3);
-				if ($level == 0)
-				{
-					$passwd = dolibarr_decode($passwd);
-				}
-				else if ($level == 1)
-				{
-					$passwd = dolibarr_encode($passwd);
-				}
-				$config .= "\$dolibarr_main_db_pass=\"$passwd\";\n";
+				$passwd = dolibarr_encode($passwd);
+				$config .= "\$dolibarr_main_db_encrypted_pass=\"$passwd\";\n";
 			}
 			else
 			{
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 18e1ce5f915..691ab12426d 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -87,7 +87,7 @@ define('DOL_URL_ROOT', $pos);								// URL racine relative
 
 // on décode le mot de passe de la base si besoin
 require_once(DOL_DOCUMENT_ROOT ."/lib/functions.inc.php");
-if ($dolibarr_main_db_encrypted_pass == 1) $dolibarr_main_db_pass = dolibarr_decode($dolibarr_main_db_pass);
+if ($dolibarr_main_db_encrypted_pass) $dolibarr_main_db_pass = dolibarr_decode($dolibarr_main_db_encrypted_pass);
 
 require_once(DOL_DOCUMENT_ROOT."/conf/conf.class.php");