diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index d837be49912..c9c0e6edce9 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -73,15 +73,8 @@ $configfileparameters=array( '?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' + '?dolibarr_lib_ODTPHP_PATH', + '?dolibarr_lib_ODTPHP_PATHTOPCLZIP' ); $configfilelib=array( // 'separator', @@ -111,16 +104,9 @@ $configfilelib=array( '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_ADODB_PATH', 'dolibarr_lib_ODTPHP_PATH', - 'dolibarr_lib_ODTPHP_PATHTOPCLZIP', - 'dolibarr_font_DOL_DEFAULT_TTF', - 'dolibarr_font_DOL_DEFAULT_TTF_BOLD' + 'dolibarr_lib_ODTPHP_PATHTOPCLZIP' ); $var=true; print ''; diff --git a/htdocs/webservices/admin/webservices.php b/htdocs/webservices/admin/webservices.php index 128b13106e6..8ab85c8ee05 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 ''; -dol_htmloutput_mesg($mesg); +if ($mesg) print '
'.$mesg; print '

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