From f7acd0f5c3bc66668a8aedecf401aefa8e4b6a53 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 16 Apr 2012 11:07:09 +0200
Subject: [PATCH] Fix: Bad path for instal.lock

---
 htdocs/admin/tools/update.php | 15 +++++++--------
 htdocs/langs/en_US/admin.lang |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 7e56a51f426..f041907f974 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -39,7 +39,7 @@ $urldolibarrmodules='http://www.dolistore.com/';
 $urldolibarrthemes='http://www.dolistore.com/';
 $dolibarrroot=preg_replace('/([\\/]+)$/i','',DOL_DOCUMENT_ROOT);
 $dolibarrroot=preg_replace('/([^\\/]+)$/i','',$dolibarrroot);
-
+$dolibarrdataroot=preg_replace('/([\\/]+)$/i','',DOL_DATA_ROOT);
 
 /*
  *	Actions
@@ -93,10 +93,7 @@ print $langs->trans("CurrentVersion").' : <b>'.DOL_VERSION.'</b><br>';
 print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("FeatureNotYetAvailable").'</b><br>';
 print '<br>';
 
-if ($mesg)
-{
-	print '<div class="error">'.$mesg.'</div><br>';
-}
+dol_htmloutput_errors($mesg);
 
 print $langs->trans("Upgrade").'<br>';
 print '<hr>';
@@ -107,12 +104,12 @@ print $langs->trans("DownloadPackageFromWebSite",$fullurl).'<br>';
 print '<b>'.$langs->trans("StepNb",2).'</b>: ';
 print $langs->trans("UnpackPackageInDolibarrRoot",$dolibarrroot).'<br>';
 print '<b>'.$langs->trans("StepNb",3).'</b>: ';
-print $langs->trans("RemoveLock",$dolibarrroot.'install.lock').'<br>';
+print $langs->trans("RemoveLock",$dolibarrdataroot.'/install.lock').'<br>';
 print '<b>'.$langs->trans("StepNb",4).'</b>: ';
 $fullurl='<a href="'.DOL_URL_ROOT.'/install/" target="_blank">'.DOL_URL_ROOT.'/install/</a>';
 print $langs->trans("CallUpdatePage",$fullurl).'<br>';
 print '<b>'.$langs->trans("StepNb",5).'</b>: ';
-print $langs->trans("RestoreLock",$dolibarrroot.'install.lock').'<br>';
+print $langs->trans("RestoreLock",$dolibarrdataroot.'/install.lock').'<br>';
 
 print '<br>';
 print '<br>';
@@ -141,4 +138,6 @@ print $langs->trans("SetupIsReadyForUse").'<br>';
 print '</form>';
 
 llxFooter();
+
+$db->close();
 ?>
\ No newline at end of file
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 38b3fe7728e..03f3d7c4483 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -38,7 +38,7 @@ SetupArea=Setup area
 FormToTestFileUploadForm=Form to test file upload (according to setup)
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Replace file <b>%s</b>, with read permission only, to disable any usage of update tool.
+RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
 SecuritySetup=Security setup
 ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher