netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

www/web-proxy-useracl: undo internal idn magic for previous

Browse Source
This commit is contained in:
Franco Fichtner
2018-04-20 21:54:12 +02:00
parent 9c063bddbc
commit 2dc65c2b82
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php
+2 -21
View File
@@ -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);
}
}