diff --git a/www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php b/www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php index 298866378..f57b7b93a 100644 --- a/www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php +++ b/www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php @@ -54,15 +54,11 @@ class SettingsController extends ApiMutableModelControllerBase { $this->sessionClose(); $mdlProxyUserACL = $this->getModel(); - foreach ($mdlProxyUserACL->general->ACLs->ACL->getNodes() as $uuid => $acl) { - $mdlProxyUserACL->general->ACLs->ACL->{$uuid}->Domains = - $this->decode($mdlProxyUserACL->general->ACLs->ACL->{$uuid}->Domains); - } $grid = new UIModelGrid($mdlProxyUserACL->general->ACLs->ACL); return $grid->fetchBindRequest( $this->request, - array("Group", "Name", "Domains", "Black", "Priority", "uuid"), - "Priority" + array('Group', 'Name', 'Domains', 'Black', 'Priority', 'uuid'), + 'Priority' ); } @@ -93,7 +89,6 @@ class SettingsController extends ApiMutableModelControllerBase $mdlProxyUserACL->general->ACLs->ACL->{$key}->Priority = (string)($priority + 1); } $node = $mdlProxyUserACL->general->ACLs->ACL->Add(); - $post["Domains"] = \OPNsense\Proxy\Api\SettingsController::encode($post["Domains"]); $node->setNodes($post); $find = $this->checkName($post["Name"], $post["Group"]); if ($find !== true) { @@ -133,8 +128,6 @@ class SettingsController extends ApiMutableModelControllerBase $node = $mdlProxyUserACL->getNodeByReference('general.ACLs.ACL.' . $uuid); if ($node != null) { - // return node - $node->Domains = $this->decode((string)$node->Domains); return array("ACL" => $node->getNodes()); } @@ -157,7 +150,6 @@ class SettingsController extends ApiMutableModelControllerBase $result = array("result" => "failed", "validations" => array()); $ACLInfo = $this->request->getPost("ACL"); $ACLInfo["Hex"] = $this->strToHex($ACLInfo["Name"]); - $ACLInfo["Domains"] = \OPNsense\Proxy\Api\SettingsController::encode($ACLInfo["Domains"]); $old_priority = (string)$node->Priority; $new_priority = $ACLInfo["Priority"]; @@ -366,15 +358,4 @@ class SettingsController extends ApiMutableModelControllerBase } return $hex; } - - private function decode($domains) - { - $result = array(); - foreach (explode(",", $domains) as $domain) { - if ($domain != "") { - $result[] = idn_to_utf8($domain); - } - } - return implode(",", $result); - } }