From 35f372be879120d8149b29884a696b2ca24eb28e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 1 Jul 2018 12:28:50 +0200
Subject: [PATCH] Revert "ditch tokenizer for static multiselects as discussed
 https://github.com/opnsense/core/issues/2381#issuecomment-389561854"

This reverts commit 966a6f6355120188910af0e8c301434faf426aee.
---
 .../opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml | 1 +
 .../OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml         | 1 +
 .../OPNsense/Quagga/forms/dialogEditOSPFInterface.xml          | 1 +
 .../mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml         | 2 ++
 .../mvc/app/controllers/OPNsense/Quagga/forms/ospf6.xml        | 1 +
 .../opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml | 2 ++
 .../app/controllers/OPNsense/HAProxy/forms/dialogAction.xml    | 1 +
 .../app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml   | 3 +++
 .../app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml  | 3 +++
 .../opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml | 1 +
 .../OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml         | 1 +
 .../OPNsense/Quagga/forms/dialogEditOSPFInterface.xml          | 1 +
 .../mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml         | 2 ++
 .../mvc/app/controllers/OPNsense/Quagga/forms/ospf6.xml        | 1 +
 .../opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml | 2 ++
 .../mvc/app/controllers/OPNsense/CICAP/forms/antivirus.xml     | 1 +
 16 files changed, 24 insertions(+)

diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
index 57a680a3c..5acd5fbcc 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
@@ -23,6 +23,7 @@
         <id>bgp.redistribute</id>
         <label>Route Redistribution</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select other routing sources, which should be redistributed to the other nodes.]]></help>
         <hint>Type or select a route source.</hint>
     </field>
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml
index 491f8a7b3..85777c46a 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml
@@ -7,6 +7,7 @@
   <field>
     <id>interface.interfacename</id>
     <label>Interface</label>
+    <style>tokenize</style>
     <type>select_multiple</type>
     <help>Select an interface where this settings apply to.</help>
   </field>
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml
index a5f58a52a..d2d878400 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml
@@ -7,6 +7,7 @@
   <field>
     <id>interface.interfacename</id>
     <label>Interface</label>
+    <style>tokenize</style>
     <type>select_multiple</type>
     <help>Select an interface where this settings apply to.</help>
   </field>
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml
index 48c3b72de..e4e5a9567 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml
@@ -16,6 +16,7 @@
         <id>ospf.passiveinterfaces</id>
         <label>Passive Interfaces</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select the interfaces, where no OSPF packets should be sent to.]]></help>
         <hint>Type or select interface.</hint>
     </field>
@@ -23,6 +24,7 @@
         <id>ospf.redistribute</id>
         <label>Route Redistribution</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select other routing sources, which should be redistributed to the other nodes.]]></help>
         <hint>Type or select a route source.</hint>
     </field>
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf6.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf6.xml
index 7f6139457..229bfa482 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf6.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf6.xml
@@ -9,6 +9,7 @@
         <id>ospf6.redistribute</id>
         <label>Route Redistribution</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select other routing sources, which should be redistributed to the other nodes.]]></help>
         <hint>Type or select a route source.</hint>
     </field>
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
index 6140168de..fb9175d64 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
@@ -15,6 +15,7 @@
         <id>rip.passiveinterfaces</id>
         <label>Passive Interfaces</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select the interfaces, where no RIP packets should be sent to.]]></help>
         <hint>Type or select interface.</hint>
     </field>
@@ -22,6 +23,7 @@
         <id>rip.redistribute</id>
         <label>Route Redistribution</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select other routing sources, which should be redistributed to the other nodes.]]></help>
         <hint>Type or select a route source.</hint>
     </field>
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml
index 34b90732b..55d8645ca 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml
@@ -25,6 +25,7 @@
         <id>action.linkedAcls</id>
         <label>Select conditions</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select one or more conditions to be used for this rule.]]></help>
     </field>
     <field>
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
index 5afb37e55..0d8171a1a 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
@@ -153,6 +153,7 @@
         <id>backend.stickiness_dataTypes</id>
         <label>Stored data types</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[This is used to store additional information in the stick-table. It may be used by ACLs in order to control various criteria related to the activity of the client matching the stick-table. Note that this directly impacts memory usage. See the <a target="_blank" href="http://cbonte.github.io/haproxy-dconv/1.8/configuration.html#stick-table">HAProxy documentation</a> for a full description.]]></help>
     </field>
     <field>
@@ -283,6 +284,7 @@
         <id>backend.linkedActions</id>
         <label>Select Rules</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Choose rules to be included in this Backend Pool.]]></help>
         <hint>Choose rules.</hint>
     </field>
@@ -294,6 +296,7 @@
         <id>backend.linkedErrorfiles</id>
         <label>Select Error Messages</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Choose error messages to be included in this Backend Pool.]]></help>
         <hint>Choose error messages.</hint>
     </field>
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
index cd7d458fc..65cda8171 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
@@ -223,6 +223,7 @@
         <id>frontend.stickiness_dataTypes</id>
         <label>Stored data types</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[This is used to store additional information in the stick-table. It may be used by ACLs in order to control various criteria related to the activity of the client matching the stick-table. Note that this directly impacts memory usage. See the <a target="_blank" href="http://cbonte.github.io/haproxy-dconv/1.8/configuration.html#stick-table">HAProxy documentation</a> for a full description.]]></help>
     </field>
     <field>
@@ -328,6 +329,7 @@
         <id>frontend.linkedActions</id>
         <label>Select Rules</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Choose rules to be included in this Public Service.]]></help>
         <hint>Choose rules.</hint>
     </field>
@@ -339,6 +341,7 @@
         <id>frontend.linkedErrorfiles</id>
         <label>Select Error Messages</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Choose error messages to be included in this Public Service.]]></help>
         <hint>Choose error messages.</hint>
     </field>
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
index 57a680a3c..5acd5fbcc 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
@@ -23,6 +23,7 @@
         <id>bgp.redistribute</id>
         <label>Route Redistribution</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select other routing sources, which should be redistributed to the other nodes.]]></help>
         <hint>Type or select a route source.</hint>
     </field>
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml
index 491f8a7b3..85777c46a 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPF6Interface.xml
@@ -7,6 +7,7 @@
   <field>
     <id>interface.interfacename</id>
     <label>Interface</label>
+    <style>tokenize</style>
     <type>select_multiple</type>
     <help>Select an interface where this settings apply to.</help>
   </field>
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml
index a5f58a52a..d2d878400 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml
@@ -7,6 +7,7 @@
   <field>
     <id>interface.interfacename</id>
     <label>Interface</label>
+    <style>tokenize</style>
     <type>select_multiple</type>
     <help>Select an interface where this settings apply to.</help>
   </field>
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml
index 48c3b72de..e4e5a9567 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml
@@ -16,6 +16,7 @@
         <id>ospf.passiveinterfaces</id>
         <label>Passive Interfaces</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select the interfaces, where no OSPF packets should be sent to.]]></help>
         <hint>Type or select interface.</hint>
     </field>
@@ -23,6 +24,7 @@
         <id>ospf.redistribute</id>
         <label>Route Redistribution</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select other routing sources, which should be redistributed to the other nodes.]]></help>
         <hint>Type or select a route source.</hint>
     </field>
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf6.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf6.xml
index 7f6139457..229bfa482 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf6.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf6.xml
@@ -9,6 +9,7 @@
         <id>ospf6.redistribute</id>
         <label>Route Redistribution</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select other routing sources, which should be redistributed to the other nodes.]]></help>
         <hint>Type or select a route source.</hint>
     </field>
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
index 6140168de..fb9175d64 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
@@ -15,6 +15,7 @@
         <id>rip.passiveinterfaces</id>
         <label>Passive Interfaces</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select the interfaces, where no RIP packets should be sent to.]]></help>
         <hint>Type or select interface.</hint>
     </field>
@@ -22,6 +23,7 @@
         <id>rip.redistribute</id>
         <label>Route Redistribution</label>
         <type>select_multiple</type>
+        <style>tokenize</style>
         <help><![CDATA[Select other routing sources, which should be redistributed to the other nodes.]]></help>
         <hint>Type or select a route source.</hint>
     </field>
diff --git a/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/forms/antivirus.xml b/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/forms/antivirus.xml
index 7a4236cb0..970cf7aa1 100644
--- a/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/forms/antivirus.xml
+++ b/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/forms/antivirus.xml
@@ -9,6 +9,7 @@
         <id>antivirus.scanfiletypes</id>
         <label>Scan for filetypes</label>
         <type>select_multiple</type>
+		<style>tokenize</style>
         <help>Choose for which file types to scan, if unsure select all.</help>
     </field>
     <field>