diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index bacdf3823d9..51941d88a6c 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -574,6 +574,9 @@ function write_conf_file($conffile) global $dolibarr_main_db_port,$dolibarr_main_db_name,$dolibarr_main_db_user,$dolibarr_main_db_pass; global $dolibarr_main_db_type,$dolibarr_main_db_character_set,$dolibarr_main_db_collation,$dolibarr_main_authentication; global $conffile,$conffiletoshow,$conffiletoshowshort; + global $force_dolibarr_lib_ADODB_PATH, $force_dolibarr_lib_NUSOAP_PATH; + global $force_dolibarr_lib_TCPDF_PATH, $force_dolibarr_lib_FPDI_PATH; + global $force_dolibarr_lib_PHPEXCEL_PATH, $force_dolibarr_lib_GEOIP_PATH; global $force_dolibarr_lib_ODTPHP_PATH, $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP; global $force_dolibarr_font_DOL_DEFAULT_TTF, $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD; @@ -659,6 +662,24 @@ function write_conf_file($conffile) // Write params to overwrites default lib path fputs($fp,"\n"); + if (empty($force_dolibarr_lib_ADODB_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_ADODB_PATH=''; } + fputs($fp, '$dolibarr_lib_ADODB_PATH=\''.$force_dolibarr_lib_ADODB_PATH.'\';'); + fputs($fp,"\n"); + if (empty($force_dolibarr_lib_NUSOAP_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_NUSOAP_PATH=''; } + fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\''.$force_dolibarr_lib_NUSOAP_PATH.'\';'); + fputs($fp,"\n"); + if (empty($force_dolibarr_lib_TCPDF_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_TCPDF_PATH=''; } + fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';'); + fputs($fp,"\n"); + if (empty($force_dolibarr_lib_FPDI_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_FPDI_PATH=''; } + fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';'); + fputs($fp,"\n"); + if (empty($force_dolibarr_lib_PHPEXCEL_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_PHPEXCEL_PATH=''; } + fputs($fp, '$dolibarr_lib_PHPEXCEL_PATH=\''.$force_dolibarr_lib_PHPEXCEL_PATH.'\';'); + fputs($fp,"\n"); + if (empty($force_dolibarr_lib_GEOIP_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_GEOIP_PATH=''; } + fputs($fp, '$dolibarr_lib_GEOIP_PATH=\''.$force_dolibarr_lib_GEOIP_PATH.'\';'); + fputs($fp,"\n"); if (empty($force_dolibarr_lib_ODTPHP_PATH)) { fputs($fp, '#'); $force_dolibarr_lib_ODTPHP_PATH=''; } fputs($fp, '$dolibarr_lib_ODTPHP_PATH=\''.$force_dolibarr_lib_ODTPHP_PATH.'\';'); fputs($fp,"\n");