From da7ea2678c23083e627f3e496ed613df5ea6999f Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 30 Apr 2007 11:33:10 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20manquait=20le=20d=E9cryptage=20du=20mot?=
 =?UTF-8?q?=20de=20passe=20de=20la=20base=20lors=20de=20l'upgrade?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/install/etape5.php   | 4 ++++
 htdocs/install/upgrade.php  | 4 ++++
 htdocs/install/upgrade2.php | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 2cea1d681b9..ececcc1fdbb 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -76,6 +76,10 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
 
     print '<table cellspacing="0" cellpadding="2" width="100%">';
     $error=0;
+    
+    // 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) $dolibarr_main_db_pass = dolibarr_decode($dolibarr_main_db_encrypted_pass);
 
     $conf->db->type = $dolibarr_main_db_type;
     $conf->db->host = $dolibarr_main_db_host;
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 9cb08358ae9..62a280e51fd 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -68,6 +68,10 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
 
     print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
     $error=0;
+    
+    // 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) $dolibarr_main_db_pass = dolibarr_decode($dolibarr_main_db_encrypted_pass);
 
     $conf = new Conf();// on pourrait s'en passer
     $conf->db->type = $dolibarr_main_db_type;
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 329458a83fb..08b15d12d67 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -73,6 +73,10 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
 	print '<h2>'.$langs->trans('DataMigration').'</h2>';
 
 	print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
+	
+	// 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) $dolibarr_main_db_pass = dolibarr_decode($dolibarr_main_db_encrypted_pass);
 
 	$conf = new Conf();// on pourrait s'en passer
 	$conf->db->type = $dolibarr_main_db_type;