diff --git a/htdocs/webservices/server.php b/htdocs/webservices/server.php index ca60a396106..d4f539ae49b 100644 --- a/htdocs/webservices/server.php +++ b/htdocs/webservices/server.php @@ -26,6 +26,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); require_once("../master.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP @@ -51,7 +52,7 @@ $server->register('getVersions', // Tableau parametres entree array(), // Tableau parametres sortie -array('dolibarr'=>'xsd:string','mysql'=>'xsd:string','apache'=>'xsd:string'), +array('dolibarr'=>'xsd:string','os'=>'xsd:string','php'=>'xsd:string','webserver'=>'xsd:string'), $ns); @@ -67,9 +68,10 @@ function getVersions() $versions_array=array(); - $versions_array['dolibarr']=DOL_VERSION; - $versions_array['mysql']='NA'; - $versions_array['apache']='NA'; + $versions_array['dolibarr']=version_dolibarr(); + $versions_array['os']=version_os(); + $versions_array['php']=version_php(); + $versions_array['webserver']=version_webserver(); return $versions_array; } diff --git a/htdocs/webservices/server.wsdl b/htdocs/webservices/server.wsdl index 7cf73426b56..a971b61c5e5 100644 --- a/htdocs/webservices/server.wsdl +++ b/htdocs/webservices/server.wsdl @@ -1,12 +1,13 @@ - + - + - +