From 370750b4990241544494f5bbaf53239ca7756458 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 19 Apr 2018 16:25:31 +0200
Subject: [PATCH] Revert "Add support UTF-8 domain names in black, white and
 exclude lists. (#1892)"

This reverts commit baab54de6f29c92aa3ed27c1f78c85e9b9d8c2ba.
---
 Makefile                                      |  1 -
 .../OPNsense/Proxy/Api/SettingsController.php | 69 -------------------
 2 files changed, 70 deletions(-)

diff --git a/Makefile b/Makefile
index 48b66f95d..4257b4ee3 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,6 @@ CORE_DEPENDS?=		${CORE_DEPENDS_${CORE_ARCH}} \
 			php${CORE_PHP}-filter \
 			php${CORE_PHP}-gettext \
 			php${CORE_PHP}-hash \
-			php${CORE_PHP}-intl \
 			php${CORE_PHP}-json \
 			php${CORE_PHP}-ldap \
 			php${CORE_PHP}-mcrypt \
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php
index d1246f59f..a7534981f 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php
@@ -240,73 +240,4 @@ class SettingsController extends ApiMutableModelControllerBase
 
         return $result;
     }
-
-    /**
-     * get action
-     * @return array
-     */
-    public function getAction()
-    {
-        $result = parent::getAction();
-        if (isset($result['proxy']['forward']['acl']['whiteList'])) {
-            $result['proxy']['forward']['acl']['whiteList'] = self::decode($result['proxy']['forward']['acl']['whiteList']);
-        }
-        if (isset($result['proxy']['forward']['acl']['blackList'])) {
-            $result['proxy']['forward']['acl']['blackList'] = self::decode($result['proxy']['forward']['acl']['blackList']);
-        }
-        if (isset($result['proxy']['forward']['icap']['exclude'])) {
-            $result['proxy']['forward']['icap']['exclude'] = self::decode($result['proxy']['forward']['icap']['exclude']);
-        }
-        return $result;
-    }
-
-    /**
-     * set action
-     * @return array status
-     */
-    public function setAction()
-    {
-        $result = parent::setAction();
-        $mdlProxy = $this->getModel();
-        if (isset($mdlProxy->forward->acl->whiteList)) {
-            $mdlProxy->forward->acl->whiteList = self::decode($mdlProxy->forward->acl->whiteList);
-        }
-        if (isset($mdlProxy->forward->acl->blackList)) {
-            $mdlProxy->forward->acl->blackList = self::decode($mdlProxy->forward->acl->blackList);
-        }
-        if (isset($mdlProxy->forward->icap->exclude)) {
-            $mdlProxy->forward->icap->exclude = self::decode($mdlProxy->forward->icap->exclude);
-        }
-        return $result;
-    }
-
-    /**
-     * Encode a given UTF-8 domain name
-     * @param    string   Domain name (UTF-8 or UCS-4)
-     * @return   string   Encoded Domain name (ACE string)
-     */
-    public static function encode($domains)
-    {
-        $result = array();
-        foreach (explode(",", $domains) as $domain) {
-            if ($domain != "") {
-                $result[] = ($domain[0] == "." ? "." : "") . idn_to_ascii($domain);
-            }
-        }
-        return implode(",", $result);
-    }
-
-    /**
-     * Decode a given ACE domain name
-     * @param    string   Domain name (ACE string)
-     * @return   string   Decoded Domain name (UTF-8 or UCS-4)
-     */
-    public static function decode($domains)
-    {
-        $result = array();
-        foreach ($domains as $domain => $element) {
-            $result[idn_to_utf8($domain)] = array('value' => idn_to_utf8($element['value']), 'selected' => $element['selected']);
-        }
-        return $result;
-    }
 }