Fix: 2.9.0 version and https option
This commit is contained in:
parent
a850ece673
commit
d53743b6fe
@ -2,7 +2,7 @@
|
|||||||
# \file dolibarr.pl
|
# \file dolibarr.pl
|
||||||
# \brief Dolibarr script install for Virtualmin Pro
|
# \brief Dolibarr script install for Virtualmin Pro
|
||||||
# \version $Revision$
|
# \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()
|
# script_dolibarr_versions()
|
||||||
sub 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
|
sub script_dolibarr_category
|
||||||
@ -46,7 +46,7 @@ return ( 5 );
|
|||||||
|
|
||||||
sub script_dolibarr_php_vars
|
sub script_dolibarr_php_vars
|
||||||
{
|
{
|
||||||
return ( [ 'memory_limit', '32M', '+' ],
|
return ( [ 'memory_limit', '64M', '+' ],
|
||||||
[ 'upload_max_filesize', '10M', '+' ],
|
[ 'upload_max_filesize', '10M', '+' ],
|
||||||
[ 'max_execution_time', '60', '+' ] );
|
[ 'max_execution_time', '60', '+' ] );
|
||||||
}
|
}
|
||||||
@ -87,6 +87,8 @@ else {
|
|||||||
$rv .= &ui_table_row("Install sub-directory under <tt>$hdir</tt>",
|
$rv .= &ui_table_row("Install sub-directory under <tt>$hdir</tt>",
|
||||||
&ui_opt_textbox("dir", "dolibarr", 30,
|
&ui_opt_textbox("dir", "dolibarr", 30,
|
||||||
"At top level"));
|
"At top level"));
|
||||||
|
$rv .= &ui_table_row("Force https connection?",
|
||||||
|
&ui_yesno_radio("forcehttps", 0));
|
||||||
#$rv .= &ui_table_row("Install sample content?",
|
#$rv .= &ui_table_row("Install sample content?",
|
||||||
# &ui_yesno_radio("sample", 0));
|
# &ui_yesno_radio("sample", 0));
|
||||||
}
|
}
|
||||||
@ -253,6 +255,7 @@ else {
|
|||||||
[ "db_name", $dbname ],
|
[ "db_name", $dbname ],
|
||||||
[ "db_user", $dbuser ],
|
[ "db_user", $dbuser ],
|
||||||
[ "db_pass", $dbpass ],
|
[ "db_pass", $dbpass ],
|
||||||
|
[ "main_force_https", $forcehttps ],
|
||||||
[ "action", "set" ],
|
[ "action", "set" ],
|
||||||
);
|
);
|
||||||
local $err = &call_dolibarr_wizard_page(\@params, "etape1", $d, $opts);
|
local $err = &call_dolibarr_wizard_page(\@params, "etape1", $d, $opts);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user