Skip to content

INTGRTNS-371 Openprovider does not filter all the additional fields in dist.additionalfield.php #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YumeChaan wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −28
Open

INTGRTNS-371 Openprovider does not filter all the additional fields in dist.additionalfield.php #543

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 31 additions & 28 deletions ...les/registrars/openprovider/vendor/wedevelopcoffee/wpower/src/Domain/AdditionalFields.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,34 +74,37 @@ public function getFilteredAdditionalFields()
{
// Get the distribution fields.
$this->getDistAdditionalFields();
// Loop through the fields and compile a finished additional fields set.
$additionalField = [];
foreach ($this->registrarAdditionalFields as $tld => $fields) {
$additionalFields = [];

//Loop over all registrar TLDs
foreach (array_keys((array)$this->registrarTlds) as $tld) {

// Use custom fields if present; otherwise empty array
$fields = $this->registrarAdditionalFields[$tld] ?? [];

// Set the additional fields.
$additionalFields[$tld] = $fields;

$tmpRegistrarFields = [];
// Only override TLDs that belong to this registrar.
if (isset($this->registrarTlds[$tld])) {
// Set the additional fields.
$additionalFields[$tld] = $fields;
// Temporarily store the field names to prevent that they will get removed from WHMCS.
foreach ($fields as $field) {
$tmpRegistrarFields[$field['Name']] = true;
}
// Remove the distributed fields.
if (isset($this->distAdditionalFields[$tld])) {
// Disable the additional fields.
foreach ($this->distAdditionalFields[$tld] as $whmcsField) {
if (!is_array($whmcsField)) {
$name = $whmcsField;
$whmcsField = array();
$whmcsField['Name'] = $name;
}
// Only remove fields that are not in the Registrars field.
if (!isset($tmpRegistrarFields[$whmcsField['Name']])) {
$removeField = [];
$removeField['Name'] = $whmcsField['Name'];
$removeField['Remove'] = true;
$additionalFields[$tld][] = $removeField;
}
// Temporarily store the field names to prevent that they will get removed from WHMCS.
foreach ($fields as $field) {
$tmpRegistrarFields[$field['Name']] = true;
}
// Remove the distributed fields.
if (isset($this->distAdditionalFields[$tld])) {
// Disable the additional fields.
foreach ($this->distAdditionalFields[$tld] as $whmcsField) {
if (!is_array($whmcsField)) {
$name = $whmcsField;
$whmcsField = array();
$whmcsField['Name'] = $name;
}
// Only remove fields that are not in the Registrars field.
if (!isset($tmpRegistrarFields[$whmcsField['Name']])) {
$removeField = [];
$removeField['Name'] = $whmcsField['Name'];
$removeField['Remove'] = true;
$additionalFields[$tld][] = $removeField;
}
}
}
Expand Down Expand Up @@ -133,4 +136,4 @@ public function setRegistrarName($registrar)
$this->registrarTlds = $this->registrar->getTlds($registrar);
return $this;
}
}
}