diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index af09e33cfeb..d837be49912 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -63,14 +63,25 @@ $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' + '?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_TCPDF_PATH', + '?dolibarr_lib_FPDFI_PATH', + '?dolibarr_lib_NUSOAP_PATH', + '?dolibarr_lib_PHPEXCEL_PATH', + '?dolibarr_lib_GEOIP_PATH', + '?dolibarr_lib_ODTPHP_PATH', + '?dolibarr_lib_ODTPHP_PATHTOPCLZIP', + '?dolibarr_font_DOL_DEFAULT_TTF', + '?dolibarr_font_DOL_DEFAULT_TTF_BOLD' ); $configfilelib=array( // 'separator', @@ -98,7 +109,18 @@ $configfilelib=array( 'dolibarr_main_auth_ldap_dn', 'dolibarr_main_auth_ldap_admin_login', 'dolibarr_main_auth_ldap_admin_pass', - 'dolibarr_main_auth_ldap_debug' + 'dolibarr_main_auth_ldap_debug', + 'separator', + 'dolibarr_lib_ADODB_PATH', + 'dolibarr_lib_TCPDF_PATH', + 'dolibarr_lib_FPDFI_PATH', + 'dolibarr_lib_NUSOAP_PATH', + 'dolibarr_lib_PHPEXCEL_PATH', + 'dolibarr_lib_GEOIP_PATH', + 'dolibarr_lib_ODTPHP_PATH', + 'dolibarr_lib_ODTPHP_PATHTOPCLZIP', + 'dolibarr_font_DOL_DEFAULT_TTF', + 'dolibarr_font_DOL_DEFAULT_TTF_BOLD' ); $var=true; print ''; @@ -116,9 +138,23 @@ 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 ($key == 'separator') + if ($newkey == 'separator') { print ''; } @@ -127,16 +163,17 @@ foreach($configfileparameters as $key) // Label print "'; // Key - print ''; + print ''; // Value print ""; } print "\n"; + $lastkeyshown=$newkey; } $i++; } diff --git a/htdocs/webservices/admin/webservices.php b/htdocs/webservices/admin/webservices.php index 8ab85c8ee05..128b13106e6 100644 --- a/htdocs/webservices/admin/webservices.php +++ b/htdocs/webservices/admin/webservices.php @@ -2,7 +2,7 @@ /* Copyright (C) 2004 Rodolphe Quiedeville * Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2011 Juanjo Menent - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -92,7 +92,7 @@ print ""; print ''; -if ($mesg) print '
'.$mesg; +dol_htmloutput_mesg($mesg); print '

'; @@ -140,7 +140,6 @@ if ($conf->fournisseur->enabled) } print '
'; -dol_htmloutput_mesg($mesg); $db->close(); diff --git a/htdocs/webservices/index.php b/htdocs/webservices/index.php index 097c53bfe87..d99da75f9aa 100644 --- a/htdocs/webservices/index.php +++ b/htdocs/webservices/index.php @@ -91,6 +91,9 @@ if ($conf->fournisseur->enabled) } print '
'; +print '
'; +print 'NUSoap library path used by Dolibarr: '.NUSOAP_PATH.'
'; +print '
'; $db->close();
 ".$configfilelib[$i].''.$key.''.$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}; + 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}; print "