From 0114f6fc99e8759086c585070f516847845a3bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 18 Feb 2024 15:25:07 +0100 Subject: [PATCH] Fix warnings in checkVatPopup.php (#28232) --- htdocs/societe/checkvat/checkVatPopup.php | 29 ++++++++++------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php index ba9d77715eb..229cf5ce9bf 100644 --- a/htdocs/societe/checkvat/checkVatPopup.php +++ b/htdocs/societe/checkvat/checkVatPopup.php @@ -63,8 +63,10 @@ if (!$vatNumber) { print '
'; // Set the parameters to send to the WebService - $parameters = array("countryCode" => $countryCode, - "vatNumber" => $vatNumber); + $parameters = array( + "countryCode" => $countryCode, + "vatNumber" => $vatNumber, + ); // Set the WebService URL dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL." WSDL=".$WS_DOL_URL_WSDL); @@ -87,30 +89,23 @@ if (!$vatNumber) { dol_syslog("Call method ".$WS_METHOD); $result = $soapclient->call($WS_METHOD, $parameters); - //var_dump($parameters); - //var_dump($soapclient); - //print "x".is_array($result)."i"; - //var_dump($result); - //print $soapclient->request.'
'; - //print $soapclient->response.'
'; - $messagetoshow = ''; print ''.$langs->trans("Response").':
'; - + $faultstring = $result['faultstring'] ?? ''; // Service indisponible - if (!is_array($result) || preg_match('/SERVICE_UNAVAILABLE/i', $result['faultstring'])) { + if (!is_array($result) || preg_match('/SERVICE_UNAVAILABLE/i', $faultstring)) { print ''.$langs->trans("ErrorServiceUnavailableTryLater").'
'; $messagetoshow = $soapclient->response; - } elseif (preg_match('/TIMEOUT/i', $result['faultstring'])) { + } elseif (preg_match('/TIMEOUT/i', $faultstring)) { print ''.$langs->trans("ErrorServiceUnavailableTryLater").'
'; $messagetoshow = $soapclient->response; - } elseif (preg_match('/SERVER_BUSY/i', $result['faultstring'])) { + } elseif (preg_match('/SERVER_BUSY/i', $faultstring)) { print ''.$langs->trans("ErrorServiceUnavailableTryLater").'
'; $messagetoshow = $soapclient->response; - } elseif ($result['faultstring']) { + } elseif ($faultstring) { print ''.$langs->trans("Error").'
'; - $messagetoshow = $result['faultstring']; - } elseif (preg_match('/INVALID_INPUT/i', $result['faultstring']) + $messagetoshow = $faultstring; + } elseif (preg_match('/INVALID_INPUT/i', $faultstring) || ($result['requestDate'] && !$result['valid'])) { // Syntax ko if ($result['requestDate']) { @@ -126,7 +121,7 @@ if (!$vatNumber) { } print $langs->trans("VATIntraSyntaxIsValid").': '.$langs->trans("Yes").'
'; print $langs->trans("ValueIsValid").': '; - if (preg_match('/MS_UNAVAILABLE/i', $result['faultstring'])) { + if (preg_match('/MS_UNAVAILABLE/i', $faultstring)) { print ''.$langs->trans("ErrorVATCheckMS_UNAVAILABLE", $countryCode).'
'; } else { if (!empty($result['valid']) && ($result['valid'] == 1 || $result['valid'] == 'true')) {