From d765d6d7d11a5bc97f4f9e1d0871cf903325fb79 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 20 Aug 2010 11:58:28 +0000
Subject: [PATCH] Fix: the name of a database can contain a hyphen

---
 htdocs/install/fileconf.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index aedcf8307f3..62f6d98c89b 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -198,6 +198,15 @@ print $langs->trans("Examples").":<br>";
 </ul>
 </tr>
 
+<tr>
+<td valign="top" class="label">
+<?php echo $langs->trans("ForceHttps"); ?>
+<td class="label" valign="top"><input type="checkbox" name="main_force_https"<?php if (! empty($force_install_mainforcehttps)) print ' checked="on"'; ?>></td>
+<td class="comment">
+<?php echo $langs->trans("CheckToForceHttps"); ?>
+</td>
+</tr>
+
 <!-- Dolibarr database -->
 
 <tr>
@@ -394,7 +403,7 @@ while (($file = readdir($handle))!==false)
 <script type="text/javascript" language="javascript">
 
 function checkDatabaseName(databasename) {
-	if (databasename.match(/[-;\.]/)) { return false; }
+	if (databasename.match(/[;\.]/)) { return false; }
 	return true;
 }