From be42041bd54dcbce27fa7af67e1f771dc047e018 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 28 Jun 2015 11:50:43 +0200
Subject: [PATCH] (proxy) refactor proxy interface selection to use new
 fieldtype

---
 .../OPNsense/Proxy/Api/SettingsController.php | 25 -------------------
 .../mvc/app/models/OPNsense/Proxy/Proxy.xml   | 14 +++++++++--
 2 files changed, 12 insertions(+), 27 deletions(-)

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 f86d93c47..d0696bfe9 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php
@@ -47,31 +47,6 @@ class SettingsController extends ApiControllerBase
         $result = array();
         if ($this->request->isGet()) {
             $mdlProxy = new Proxy();
-
-            // Define array for selected interfaces
-            $selopt = array();
-
-            // Get ConfigObject
-            $configObj = Config::getInstance()->object();
-            // Iterate over all interfaces configuration
-            // TODO: replace for <interfaces> helper
-            foreach ($configObj->interfaces->children() as $key => $value) {
-                // Check if interface is enabled, if tag is <enable/> treat as enabled.
-                if (isset($value->enable) && $value->enable != '0') {
-                    // Check if interface has static ip
-                    if ($value->ipaddr != 'dhcp') {
-                        if ($value->descr == '') {
-                            $description = strtoupper($key); // Use interface name as description if none is given
-                        } else {
-                            $description = $value->descr;
-                        }
-                        $selopt[$key] = (string)$description; // Add Interface to selectable options.
-                    }
-                }
-            }
-
-            $mdlProxy->forward->interfaces->setSelectOptions($selopt);
-            $mdlProxy->forward->ftpInterfaces->setSelectOptions($selopt);
             $result['proxy'] = $mdlProxy->getNodes();
         }
 
diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
index 044a3ec3c..e2d7bd272 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
@@ -125,8 +125,13 @@
             </traffic>
         </general>
         <forward>
-            <interfaces type="CSVListField">
+            <interfaces type="InterfaceField">
                 <Required>N</Required>
+                <multiple>Y</multiple>
+                <filters>
+                    <enable>/^(?!0).*$/</enable>
+                    <ipaddr>/^((?!dhcp).)*$/</ipaddr>
+                </filters>
             </interfaces>
             <port type="IntegerField">
                 <default>3128</default>
@@ -135,8 +140,13 @@
                 <ValidationMessage>Proxy port needs to be an integer value between 1 and 65535</ValidationMessage>
                 <Required>Y</Required>
             </port>
-            <ftpInterfaces type="CSVListField">
+            <ftpInterfaces type="InterfaceField">
                 <Required>N</Required>
+                <multiple>Y</multiple>
+                <filters>
+                    <enable>/^(?!0).*$/</enable>
+                    <ipaddr>/^((?!dhcp).)*$/</ipaddr>
+                </filters>
             </ftpInterfaces>
             <ftpPort type="IntegerField">
                 <default>2121</default>