From 15d553faa500ac8aefb7eec7b11d49b4eef4175b Mon Sep 17 00:00:00 2001 From: Felix Soederhuyzen Date: Wed, 22 May 2024 15:48:25 +0200 Subject: [PATCH 1/5] fix: wrong count nameservers --- modules/registrars/inwx/inwx.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/registrars/inwx/inwx.php b/modules/registrars/inwx/inwx.php index a8fd011..92f67b7 100644 --- a/modules/registrars/inwx/inwx.php +++ b/modules/registrars/inwx/inwx.php @@ -1021,7 +1021,11 @@ function inwx_GetDomainInformation(array $params): Domain } if (isset($response['resData']['ns'])) { - $domain->setNameservers($response['resData']['ns']); + $nameservers = []; + for ($i = 0; $i <= count($response['resData']['ns']); $i++) { + $nameservers['ns' . ($i + 1)] = $response['resData']['ns'][$i]; + } + $domain->setNameservers($nameservers); } if (isset($response['resData']['status'])) { From f72fed0de9019fe59cacda77452de5e53db4e422 Mon Sep 17 00:00:00 2001 From: Felix Soederhuyzen Date: Wed, 22 May 2024 15:48:58 +0200 Subject: [PATCH 2/5] fix: correct use WHMCS Carbon --- modules/registrars/inwx/inwx.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/registrars/inwx/inwx.php b/modules/registrars/inwx/inwx.php index 92f67b7..59c2ee3 100644 --- a/modules/registrars/inwx/inwx.php +++ b/modules/registrars/inwx/inwx.php @@ -4,6 +4,7 @@ use WHMCS\Domain\TopLevel\ImportItem; use WHMCS\Domains\DomainLookup\ResultsList; use WHMCS\Domains\DomainLookup\SearchResult; +use WHMCS\Carbon; include_once 'helpers.php'; From f7f8305c3dbe4902f7334163d8f111892a820649 Mon Sep 17 00:00:00 2001 From: Felix Soederhuyzen Date: Wed, 22 May 2024 16:04:30 +0200 Subject: [PATCH 3/5] fix: out of bounds array --- modules/registrars/inwx/inwx.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/registrars/inwx/inwx.php b/modules/registrars/inwx/inwx.php index 59c2ee3..e54a294 100644 --- a/modules/registrars/inwx/inwx.php +++ b/modules/registrars/inwx/inwx.php @@ -1023,7 +1023,7 @@ function inwx_GetDomainInformation(array $params): Domain if (isset($response['resData']['ns'])) { $nameservers = []; - for ($i = 0; $i <= count($response['resData']['ns']); $i++) { + for ($i = 0; $i < count($response['resData']['ns']); $i++) { $nameservers['ns' . ($i + 1)] = $response['resData']['ns'][$i]; } $domain->setNameservers($nameservers); From 5feec8123be3189a52370620945a36de52b75548 Mon Sep 17 00:00:00 2001 From: Felix Soederhuyzen Date: Thu, 23 May 2024 12:02:29 +0200 Subject: [PATCH 4/5] fix: could not convert api date to carbon --- modules/registrars/inwx/inwx.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/registrars/inwx/inwx.php b/modules/registrars/inwx/inwx.php index e54a294..88d75ce 100644 --- a/modules/registrars/inwx/inwx.php +++ b/modules/registrars/inwx/inwx.php @@ -1058,7 +1058,7 @@ function inwx_GetDomainInformation(array $params): Domain } if (isset($response['resData']['exDate'])) { - $domain->setExpiryDate(Carbon::createFromFormat('Y-m-d', $response['resData']['exDate']['scalar'])); + $domain->setExpiryDate(Carbon::parse($response['resData']['exDate']['scalar'])); } if (isset($response['resData']['registrantVerificationStatus']) && isset($response['resData']['verificationStatus'])) { From d0bb54e8ee93397e73f451d8ff1dd57870dd2743 Mon Sep 17 00:00:00 2001 From: Felix Soederhuyzen Date: Thu, 23 May 2024 13:03:51 +0200 Subject: [PATCH 5/5] fix: non-reachable statement --- modules/registrars/inwx/inwx.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/registrars/inwx/inwx.php b/modules/registrars/inwx/inwx.php index 88d75ce..082f7ab 100644 --- a/modules/registrars/inwx/inwx.php +++ b/modules/registrars/inwx/inwx.php @@ -493,7 +493,7 @@ function inwx_RegisterDomain(array $params): array // Registrant creation $pRegistrant['type'] = 'PERSON'; $pRegistrant['name'] = $params['firstname'] . ' ' . $params['lastname']; - if (isset($params['companyname']) && empty($params['companyname'])) { + if (isset($params['companyname']) && !empty($params['companyname'])) { $pRegistrant['org'] = $params['companyname']; } $pRegistrant['street'] = $params['address1']; @@ -525,7 +525,7 @@ function inwx_RegisterDomain(array $params): array // Admin creation $pAdmin['type'] = 'PERSON'; $pAdmin['name'] = $params['adminfirstname'] . ' ' . $params['adminlastname']; - if (isset($params['admincompanyname']) && empty($params['admincompanyname'])) { + if (isset($params['admincompanyname']) && !empty($params['admincompanyname'])) { $pAdmin['org'] = $params['admincompanyname']; } $pAdmin['street'] = $params['adminaddress1']; @@ -629,7 +629,7 @@ function inwx_TransferDomain(array $params): array // Registrant creation $pRegistrant['type'] = 'PERSON'; $pRegistrant['name'] = $params['firstname'] . ' ' . $params['lastname']; - if (isset($params['companyname']) && empty($params['companyname'])) { + if (isset($params['companyname']) && !empty($params['companyname'])) { $pRegistrant['org'] = $params['companyname']; } $pRegistrant['street'] = $params['address1']; @@ -661,7 +661,7 @@ function inwx_TransferDomain(array $params): array // Admin creation $pAdmin['type'] = 'PERSON'; $pAdmin['name'] = $params['adminfirstname'] . ' ' . $params['adminlastname']; - if (isset($params['admincompanyname']) && empty($params['admincompanyname'])) { + if (isset($params['admincompanyname']) && !empty($params['admincompanyname'])) { $pAdmin['org'] = $params['admincompanyname']; } $pAdmin['street'] = $params['adminaddress1'];