Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX #25580 install/step1.php - wrong command line argument used for $main_dir (#25581)

Browse Source 
Co-authored-by: Olivier Lesueur <o.lesueur@crm.fnattp.fr>
This commit is contained in:
Olivier Lesueur 2023-08-08 21:30:27 +02:00 committed by GitHub
parent 76f0a57e91
commit 3bc698d0ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/install/step1.php
View File

@ -84,22 +84,34 @@ if (@file_exists($forcedfile)) {
// If forced install is enabled, replace the post values. These are empty because form fields are disabled.
if ($force_install_noedit) {
$main_dir = detect_dolibarr_main_document_root();
if (!empty($argv[1])) {
$main_dir = $argv[1]; // override when executing the script in command line
if (!empty($argv[3])) {
$main_dir = $argv[3]; // override when executing the script in command line
}
if (!empty($force_install_main_data_root)) {
$main_data_dir = $force_install_main_data_root;
} else {
$main_data_dir = detect_dolibarr_main_data_root($main_dir);
}
if (!empty($argv[4])) {
$main_data_dir = $argv[4]; // override when executing the script in command line
}
$main_url = detect_dolibarr_main_url_root();
if (!empty($argv[5])) {
$main_url = $argv[5]; // override when executing the script in command line
}
if (!empty($force_install_databaserootlogin)) {
$userroot = parse_database_login($force_install_databaserootlogin);
}
if (!empty($argv[6])) {
$userroot = $argv[6]; // override when executing the script in command line
}
if (!empty($force_install_databaserootpass)) {
$passroot = parse_database_pass($force_install_databaserootpass);
}
if (!empty($argv[7])) {
$passroot = $argv[7]; // override when executing the script in command line
}
}
if ($force_install_noedit == 2) {
if (!empty($force_install_type)) {