From d53743b6fecf5adeb694009e16f5c319bbe8919d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 4 Oct 2010 13:22:13 +0000
Subject: [PATCH] Fix: 2.9.0 version and https option

---
 build/perl/virtualmin/dolibarr.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index a082609c94e..6f48fa35dc2 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -2,7 +2,7 @@
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
 # \version      $Revision$
-# \author       (c)2009 Regis Houssin  <regis@dolibarr.fr>
+# \author       (c)2009-2010 Regis Houssin  <regis@dolibarr.fr>
 #----------------------------------------------------------------------------
 
 
@@ -31,7 +31,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "2.9.0", "2.8.1", "2.7.1" );
+return ( "2.9.0", "2.8.1" );
 }
 
 sub script_dolibarr_category
@@ -46,7 +46,7 @@ return ( 5 );
 
 sub script_dolibarr_php_vars
 {
-return ( [ 'memory_limit', '32M', '+' ],
+return ( [ 'memory_limit', '64M', '+' ],
 	[ 'upload_max_filesize', '10M', '+' ],
 	[ 'max_execution_time', '60', '+' ] );
 }
@@ -87,6 +87,8 @@ else {
 	$rv .= &ui_table_row("Install sub-directory under <tt>$hdir</tt>",
 			     &ui_opt_textbox("dir", "dolibarr", 30,
 					     "At top level"));
+	$rv .= &ui_table_row("Force https connection?",
+			     &ui_yesno_radio("forcehttps", 0));
 	#$rv .= &ui_table_row("Install sample content?",
 	#		     &ui_yesno_radio("sample", 0));
 	}
@@ -253,6 +255,7 @@ else {
 			  [ "db_name", $dbname ],
 			  [ "db_user", $dbuser ],
 			  [ "db_pass", $dbpass ],
+			  [ "main_force_https", $forcehttps ],
 			  [ "action", "set" ],
 			 );
 	local $err = &call_dolibarr_wizard_page(\@params, "etape1", $d, $opts);