Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix CI

Browse Source
This commit is contained in:
ldestailleur
2025-07-29 12:03:53 +02:00
parent 6d791919ea
commit 31d8bbc75c
5 changed files with 81 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/install/check.php
View File

@@ -33,6 +33,9 @@ define('ALLOWED_IF_UPGRADE_UNLOCK_FOUND', 1);
include_once 'inc.php';
/**
* @var string $conffile
* @var string $conffiletoshow
*
* @var Conf $conf already created in inc.php
* @var Translate $langs
*
@@ -42,8 +45,6 @@ include_once 'inc.php';
* @var string $dolibarr_main_db_user
* @var string $dolibarr_main_db_pass
* @var string $dolibarr_main_db_encrypted_pass
* @var string $conffile
* @var string $conffiletoshow
*/
$err = 0;

36
htdocs/install/step1.php
View File

@@ -32,12 +32,27 @@ define('DONOTLOADCONF', 1); // To avoid loading conf by file inc.php
include 'inc.php';
global $langs;
/**
* @var string $conffile
* @var string $conffiletoshow
*
* @var Conf $conf
* @var Translate $langs
*
* @var string $dolibarr_main_db_type
* @var string $dolibarr_main_db_host
* @var string $dolibarr_main_db_port
* @var string $dolibarr_main_db_name
* @var string $dolibarr_main_db_user
* @var string $dolibarr_main_db_pass
* @var string $dolibarr_main_document_root
* @var string $dolibarr_main_db_encryption
* @var string $dolibarr_main_db_encrypted_pass
* @var string $dolibarr_main_db_cryptkey
*/
global $langs;
$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
$setuplang = GETPOST('selectlang', 'aZ09', 3) ? GETPOST('selectlang', 'aZ09', 3) : (empty($argv[2]) ? 'auto' : $argv[2]);
$langs->setDefaultLang($setuplang);
@@ -87,6 +102,23 @@ if ($conffile == "/etc/dolibarr/conf.php") {
if (@file_exists($forcedfile)) {
$useforcedwizard = true;
include_once $forcedfile;
/**
* @var string $force_install_noedit
* @var string $force_install_main_data_root
* @var string $force_install_databaserootlogin
* @var string $force_install_databaserootpass
* @var string $force_install_type
* @var string $force_install_dbserver
* @var string $force_install_database
* @var string $force_install_databaselogin
* @var string $force_install_databasepass
* @var string $force_install_port
* @var string $force_install_prefix
* @var string $force_install_createdatabase
* @var string $force_install_createuser
* @var string $force_install_mainforcehttps
* @var string $force_install_distrib
*/
// 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();

12
htdocs/install/step2.php
View File

@@ -26,13 +26,23 @@
*/
include 'inc.php';
/**
* @var string $conffile
* @var string $conffiletoshow
*
* @var Conf $conf
* @var Translate $langs
*
* @var string $dolibarr_main_document_root
*/
require_once $dolibarr_main_document_root.'/core/class/conf.class.php';
require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';
global $langs;
$step = 2;
$ok = 0;

11
htdocs/install/step4.php
View File

@@ -28,6 +28,17 @@
include_once 'inc.php';
/**
* @var string $conffile
* @var string $conffiletoshow
*
* @var Conf $conf
* @var Translate $langs
*
* @var string $dolibarr_main_document_root
*/
require_once $dolibarr_main_document_root.'/core/class/conf.class.php';
require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';

22
htdocs/install/step5.php
View File

@@ -39,9 +39,31 @@
define('ALLOWED_IF_UPGRADE_UNLOCK_FOUND', 1);
include_once 'inc.php';
/**
* @var string $conffile
* @var string $conffiletoshow
*/
if (file_exists($conffile)) {
include_once $conffile;
}
/**
* @var Conf $conf
* @var Translate $langs
*
* @var string $dolibarr_main_db_type
* @var string $dolibarr_main_db_host
* @var string $dolibarr_main_db_port
* @var string $dolibarr_main_db_name
* @var string $dolibarr_main_db_user
* @var string $dolibarr_main_db_pass
* @var string $dolibarr_main_document_root
* @var string $dolibarr_main_db_encryption
* @var string $dolibarr_main_db_encrypted_pass
* @var string $dolibarr_main_db_cryptkey
* @var string $modulesdir
*/
require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
require_once $dolibarr_main_document_root.'/core/lib/security.lib.php'; // for dol_hash
require_once $dolibarr_main_document_root.'/core/lib/functions2.lib.php';