From 2ae1a4ae2f2f1f35eabdfd73ee4f3978b330c70e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 10 May 2010 06:15:17 +0000
Subject: [PATCH] Add possibility to defined "main_force_https" in install mode
---
htdocs/install/etape1.php | 8 +++++++-
htdocs/install/fileconf.php | 9 +++++++++
htdocs/langs/en_US/install.lang | 2 ++
htdocs/langs/fr_FR/install.lang | 2 ++
4 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 41e1dbcf587..efbd24a4c3b 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -27,7 +27,7 @@
* \version $Id$
*/
-define('DONOTLOADCONF',1); // To avoid loading conf by file inc..php
+define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php
include("./inc.php");
$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto');
@@ -201,6 +201,9 @@ if ($_POST["action"] == "set")
}
}
}
+
+ // Force https
+ $_POST["main_force_https"] = ((isset($_POST["main_force_https"]) && $_POST["main_force_https"] == "on")?'1':'0');
// Write conf file on disk
if (! $error)
@@ -559,6 +562,9 @@ function write_conf_file($conffile)
/* Authentication */
fputs($fp, '$dolibarr_main_authentication=\'dolibarr\';');
fputs($fp,"\n");
+
+ fputs($fp, '$dolibarr_main_force_https=\''.$_POST["main_force_https"].'\';');
+ fputs($fp,"\n");
fputs($fp, '?>');
fclose($fp);
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index aedcf8307f3..fede5598795 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 ($force_install_mainforcehttps) print ' checked="on"'; ?>></td>
+<td class="comment">
+<?php echo $langs->trans("CheckToForceHttps"); ?>
+</td>
+</tr>
+
<!-- Dolibarr database -->
<tr>
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index d3e2d19e895..76585cb2816 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -38,6 +38,8 @@ ConfigurationFile=Configuration file
WebPagesDirectory=Directory where web pages are stored
DocumentsDirectory=Directory to store uploaded and generated documents
URLRoot=URL Root
+ForceHttps=Force secure connections (https)
+CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
DolibarrDatabase=Dolibarr Database
DatabaseChoice=Database choice
DatabaseType=Database type
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index d9e63c4778e..58d1637a433 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -38,6 +38,8 @@ ConfigurationFile=Fichier de configuration
WebPagesDirectory=Répertoire contenant les pages web
DocumentsDirectory=Répertoire devant contenir les documents générés (PDF, etc.)
URLRoot=URL Racine
+ForceHttps=Forcer les connexions sécurisées (https)
+CheckToForceHttps=Cochez cette option pour forcer les connexions sécurisées (https).<br>Ceci nécessite que le serveur web soit configuré avec un certificat SSL.
DolibarrDatabase=Base de données Dolibarr
DatabaseChoice=Choix de la base de données
DatabaseType=Type de la base de données
--
GitLab