From d93113c98cf5dbaa8eb7d7939359e91b7f96dea8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 12 May 2008 22:40:56 +0000
Subject: [PATCH] New: Add a way to lock install without removing directory

---
 htdocs/install/inc.php          | 7 +++++--
 htdocs/langs/en_US/install.lang | 2 +-
 htdocs/langs/fr_FR/install.lang | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index e5bfd231846..871390d7e31 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -112,9 +112,12 @@ if (! isset($conf->db->user)) $conf->db->user='';
 
 	
 // Security check
-if (eregi('install.norun',$_SERVER["SCRIPT_FILENAME"])) 
+if (eregi('install.lock',$_SERVER["SCRIPT_FILENAME"])) 
 {
-	print 'Install pages have been disabled for security reason (directory renamed with .norun).';
+	print 'Install pages have been disabled for security reason (directory renamed with .lock).';
+	print '<a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
+	print 'Click here to go to Dolibarr';
+	print '</a>';
 	exit;
 }
 if (file_exists('../../install.lock'))
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 47d82e8bde3..9fb25352c77 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -87,7 +87,7 @@ LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
 FailedToCreateAdminLogin=Failed to create Dolibarr administator account.
 AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists.
-WarningRemoveInstallDir=Warning, for security reasons, once install or upgrade is finished, you have to remove the install directory.
+WarningRemoveInstallDir=Warning, for security reasons, once install or upgrade is finished, you have to remove the <b>install<b> directory or to put inside a file called <b>install.lock</b>.
 ThisPHPDoesNotSupportTypeBase=This PHP system does not support interfaces to access database type %s
 FunctionNotAvailableInThisPHP=Not available on this PHP
 MigrateScript=Migrate script
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 6d45e89a9f6..5f4a3ff9012 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -88,7 +88,7 @@ LoginAlreadyExists=Existe d
 DolibarrAdminLogin=Login de l'utilisateur administrateur de Dolibarr
 FailedToCreateAdminLogin=Echec de la création du compte administrateur Dolibarr.
 AdminLoginAlreadyExists=Compte administrateur Dolibarr '<b>%s</b>' déjà existant.
-WarningRemoveInstallDir=Attention, pour des raisons de sécurité, une fois l'installation terminée, il est nécessaire de supprimer le répertoire install.
+WarningRemoveInstallDir=Attention, pour des raisons de sécurité, une fois l'installation terminée, il est nécessaire de supprimer le répertoire <b>install</b>, ou d'y placer un fichier nommé <b>install.lock</b>.
 ThisPHPDoesNotSupportTypeBase=Le système PHP ne supporta pas les interfaces d'accès pour les bases %s
 FunctionNotAvailableInThisPHP=Non disponible sur ce PHP
 MigrateScript=Script de migration