diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 9dbe838d2ad..1ae18e623cd 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,9 +1,5 @@ # This file is useless. # It is provided as example to know contexts modified by installer # to make Dolibarr working. -# -# Note: To allow temporary write permission for httpd: -# chcon -R -h -t httpd_sys_script_rw_t /dirtoallow -# /etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 /var/lib/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index c9c0e6edce9..af09e33cfeb 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -63,18 +63,14 @@ $configfileparameters=array( 'separator', 'dolibarr_main_authentication', 'separator', - '?dolibarr_main_auth_ldap_login_attribute', - '?dolibarr_main_auth_ldap_host', - '?dolibarr_main_auth_ldap_port', - '?dolibarr_main_auth_ldap_version', - '?dolibarr_main_auth_ldap_dn', - '?dolibarr_main_auth_ldap_admin_login', - '?dolibarr_main_auth_ldap_admin_pass', - '?dolibarr_main_auth_ldap_debug', - 'separator', - '?dolibarr_lib_ADODB_PATH', - '?dolibarr_lib_ODTPHP_PATH', - '?dolibarr_lib_ODTPHP_PATHTOPCLZIP' + 'dolibarr_main_auth_ldap_login_attribute', + 'dolibarr_main_auth_ldap_host', + 'dolibarr_main_auth_ldap_port', + 'dolibarr_main_auth_ldap_version', + 'dolibarr_main_auth_ldap_dn', + 'dolibarr_main_auth_ldap_admin_login', + 'dolibarr_main_auth_ldap_admin_pass', + 'dolibarr_main_auth_ldap_debug' ); $configfilelib=array( // 'separator', @@ -102,11 +98,7 @@ $configfilelib=array( 'dolibarr_main_auth_ldap_dn', 'dolibarr_main_auth_ldap_admin_login', 'dolibarr_main_auth_ldap_admin_pass', - 'dolibarr_main_auth_ldap_debug', - 'separator', - 'dolibarr_lib_ADODB_PATH', - 'dolibarr_lib_ODTPHP_PATH', - 'dolibarr_lib_ODTPHP_PATHTOPCLZIP' + 'dolibarr_main_auth_ldap_debug' ); $var=true; print ''; @@ -124,23 +116,9 @@ foreach($configfileparameters as $key) if (empty($ignore)) { - $newkey = preg_replace('/^\?/','',$key); - - if (preg_match('/^\?/',$key) && empty(${$newkey})) - { - $i++; - continue; // We discard parametes starting with ? - } - - if ($newkey == 'separator' && $lastkeyshown == 'separator') - { - $i++; - continue; - } - $var=!$var; print ""; - if ($newkey == 'separator') + if ($key == 'separator') { print ''; } @@ -149,17 +127,16 @@ foreach($configfileparameters as $key) // Label print "'; // Key - print ''; + print ''; // Value print ""; } print "\n"; - $lastkeyshown=$newkey; } $i++; } diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 9d59caf0cc4..4b04789c404 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -254,13 +254,13 @@ $dolibarr_main_prod='0'; ############################## # Value to overwrite path to use shared libraries instead of embedded one -#$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; +#$dolibarr_lib_ADODB_PATH=''; # Value to overwrite path to use shared libraries instead of embedded one #$dolibarr_lib_TCPDF_PATH=''; # Value to overwrite path to use shared libraries instead of embedded one #$dolibarr_lib_FPDFI_PATH=''; # Value to overwrite path to use shared libraries instead of embedded one -#$dolibarr_lib_NUSOAP_PATH='/usr/share/nusoap/'; +#$dolibarr_lib_NUSOAP_PATH=''; # Value to overwrite path to use shared libraries instead of embedded one #$dolibarr_lib_PHPEXCEL_PATH=''; # Value to overwrite path to use shared libraries instead of embedded one
 ".$configfilelib[$i].''.$newkey.''.$key.'"; - if ($newkey == 'dolibarr_main_db_pass') print preg_replace('/./i','*',${$newkey}); - else if ($newkey == 'dolibarr_main_url_root' && preg_match('/__auto__/',${$newkey})) print ${$newkey}.' => '.constant('DOL_MAIN_URL_ROOT'); - else if ($newkey == 'dolibarr_main_url_root_alt' && preg_match('/__auto__/',${$newkey})) print ${$newkey}.' => '.constant('DOL_MAIN_URL_ROOT_ALT'); - else print ${$newkey}; + if ($key == 'dolibarr_main_db_pass') print preg_replace('/./i','*',${$key}); + else if ($key == 'dolibarr_main_url_root' && preg_match('/__auto__/',${$key})) print ${$key}.' => '.constant('DOL_MAIN_URL_ROOT'); + else if ($key == 'dolibarr_main_url_root_alt' && preg_match('/__auto__/',${$key})) print ${$key}.' => '.constant('DOL_MAIN_URL_ROOT_ALT'); + else print ${$key}; print "