From a54bf85dcd898bcd18298bb3d9687514bf71f08b Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 5 Jun 2016 18:33:47 +0200
Subject: [PATCH] Renamed and moved field "Enable VLANs" (previously "Type of
 access")

---
 plugins/dynamix/Eth0.page | 153 ++++++++++++++++++++++++++------------
 plugins/dynamix/EthX.page |  85 +++++++++++++++++----
 2 files changed, 174 insertions(+), 64 deletions(-)

diff --git a/plugins/dynamix/Eth0.page b/plugins/dynamix/Eth0.page
index 229c25cd4..11b2140b1 100644
--- a/plugins/dynamix/Eth0.page
+++ b/plugins/dynamix/Eth0.page
@@ -53,7 +53,7 @@ $vlan_eth0 = [0];
 if (isset($eth0)) foreach ($eth0 as $key => $val) if (substr($key,0,6)=='VLANID') $vlan_eth0[] = substr($key,7);
 ?>
 <style>
-span.pin{margin:0;padding:0;font-size:16px;cursor:pointer;}
+span.pin{font-size:16px;cursor:pointer;}
 span.no-int{color:#E68A00;}
 div.shade-white{background-color:#F8F8F8;}
 div.shade-black{background-color:#0C0C0C;}
@@ -276,7 +276,8 @@ Bonding mode:
   <?=mk_option($eth0['BONDING_MODE'], "4", "802.3ad (4)");?>
   <?=mk_option($eth0['BONDING_MODE'], "5", "balance-tlb (5)");?>
   <?=mk_option($eth0['BONDING_MODE'], "6", "balance-alb (6)");?>
-  </select><span id="attention0" style="display:none"><b>Attention:</b> this mode requires a network switch with proper setup and support...</span>
+  </select>
+  <span id="attention0" style="display:none"><b>Attention:</b> this mode requires a network switch with proper setup and support...</span>
 
 > Mode 1 (active-backup) is the recommended default. Other modes allow you to set up a specific environment, but may require proper switch support.
 > Choosing a unsupported mode can result in a disrupted communication. Use with caution.
@@ -313,17 +314,96 @@ Bridging members:
 > Select which interfaces are member of the *bridged* interface. By default eth0 is a member, while other interfaces are optional.
 
 </div>
-Type of access:
+Interface description:
+: <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="40" value="<?=$eth0["DESCRIPTION:$i"]?>" onchange="exitCode(this.form,true)">
+
+> Use this optional field to provide addditional information about the purpose of the connection.
+
+IP address assignment:
+: <select name="USE_DHCP:<?=$i?>" size="1" onchange="checkNetworkSettings(this.form,<?=$i?>)">
+  <?=mk_option($eth0["USE_DHCP:$i"], 'yes', 'Automatic');?>
+  <?=mk_option($eth0["USE_DHCP:$i"], 'no', 'Static');?>
+  </select>
+
+> The following settings are possible:
+>
+> *Automatic* - the server will attempt to obtain its IP address from the local DHCP server<br>
+> *Static* - the IP address is manually set for this interface<br>
+> *None* - no IP address is assigned to the interface (only available for VLANs)
+
+IP address:
+: <input type="text" name="IPADDR:<?=$i?>" maxlength="40" value="<?=$eth0["IPADDR:$i"]?>" class="narrow" pattern="<?=$validIP?>" title="IP address A.B.C.D">
+
+> Greyed out when using DHCP server. Otherwise specify here the IP address of the system.
+
+Network mask:
+: <select name="NETMASK:<?=$i?>" size="1">
+  <?=mk_option($eth0["NETMASK:$i"], "255.255.0.0", "255.255.0.0");?>
+  <?=mk_option($eth0["NETMASK:$i"], "255.255.252.0", "255.255.252.0");?>
+  <?=mk_option($eth0["NETMASK:$i"], "255.255.254.0", "255.255.254.0");?>
+  <?=mk_option($eth0["NETMASK:$i"], "255.255.255.0", "255.255.255.0");?>
+  <?=mk_option($eth0["NETMASK:$i"], "255.255.255.128", "255.255.255.128");?>
+  <?=mk_option($eth0["NETMASK:$i"], "255.255.255.192", "255.255.255.192");?>
+  <?=mk_option($eth0["NETMASK:$i"], "255.255.255.224", "255.255.255.224");?>
+  <?=mk_option($eth0["NETMASK:$i"], "255.255.255.240", "255.255.255.240");?>
+  <?=mk_option($eth0["NETMASK:$i"], "255.255.255.248", "255.255.255.248");?>
+  <?=mk_option($eth0["NETMASK:$i"], "255.255.255.252", "255.255.255.252");?>
+  </select>
+
+> Greyed out when using DHCP server. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
+
+Default gateway:
+: <input type="text" name="GATEWAY" maxlength="40" value="<?=$eth0['GATEWAY']?>" class="narrow" pattern="<?=$validIP?>" title="IP address A.B.C.D">
+
+> Greyed out when using DHCP server. Otherwise specify here the IP address of your router.
+
+DNS server assignment:
+: <select name="DHCP_KEEPRESOLV" size="1" onchange="checkDNSSettings(this.form)">
+  <?=mk_option($eth0['DHCP_KEEPRESOLV'], "no", "Automatic");?>
+  <?=mk_option($eth0['DHCP_KEEPRESOLV'], "yes", "Static");?>
+  </select>
+
+> If set to *Automatic* the server will use DNS server IP address returned by the local DHCP server.<br>
+> If set to *Static* you may enter your own list.
+>
+> This is useful in Active Directory configurations where you need to set the first DNS Server entry to the IP address of your AD Domain server.
+
+DNS server 1:
+: <input type="text" name="DNS_SERVER1" maxlength="80" value="<?=$eth0['DNS_SERVER1'];?>" class="narrow" pattern="<?=$validIP?>" title="IP address A.B.C.D">
+
+> This is the primary DNS server to use. Enter a FQDN or an IP address.
+>
+> Note: for *Active Directory* you **must** ensure this is set to the IP address of your AD Domain server.
+
+DNS server 2:
+: <input type="text" name="DNS_SERVER2" maxlength="80" value="<?=$eth0['DNS_SERVER2'];?>" class="narrow" pattern="<?=$validIP?>" title="IP address A.B.C.D">
+
+> This is the DNS server to use when DNS Server 1 is down.
+
+DNS server 3:
+: <input type="text" name="DNS_SERVER3" maxlength="80" value="<?=$eth0['DNS_SERVER3'];?>" class="narrow" pattern="<?=$validIP?>" title="IP address A.B.C.D">
+
+> This is the DNS server to use when DNS Servers 1 and 2 are both down.
+
+Desired MTU:
+: <input type="number" name="MTU" min="68" max="9198" value="<?=$eth0['MTU']?>" class="narrow">
+
+> This is the MTU size to use on the physical Ethernet interface.
+> If left blank, the MTU will automatically be determined (by default 1500 bytes).
+
+Enable VLANs:
 : <select name="TYPE" size="1" onchange="checkNetworkAccess(this.form,'eth0')">
-  <?=mk_option($eth0['TYPE'], 'access', 'Untagged');?>
-  <?=mk_option($eth0['TYPE'], 'trunk', 'Tagged');?>
-  </select><span class="access-eth0 pin" title="Add VLAN" style="display:none" onclick="addVLAN('eth0',<?=$disabled?'true':'false'?>)"><i class="fa fa-plus-circle green"></i></span>
+  <?=mk_option($eth0['TYPE'], 'access', 'No');?>
+  <?=mk_option($eth0['TYPE'], 'trunk', 'Yes');?>
+  </select>
+  <span class="access-eth0 pin" title="Add VLAN" style="display:none" onclick="addVLAN('eth0',<?=$disabled?'true':'false'?>)"><i class="fa fa-plus-circle green"></i></span>
 <?else:?>
 <div class="access-eth0 shade-<?=$display['theme']?>" style="display:none" markdown="1">
 VLAN number:
 : <input type="number" name="VLANID:<?=$i?>" min="1" max="4095" value="<?=$eth0["VLANID:$i"]?>" class="narrow" required>
   <span class="pin" title="Remove VLAN" onclick="removeVLAN($('#index-eth0-<?=$i?>'),<?=$disabled?'true':'false'?>)"><i class="fa fa-minus-circle red"></i></span>
-<?endif;?>
+
+> Give each VLAN a unique identifier. Numbers range from 1 to 4095.
 
 Interface description:
 : <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="40" value="<?=$eth0["DESCRIPTION:$i"]?>" onchange="exitCode(this.form,true)">
@@ -366,47 +446,6 @@ Network mask:
 
 > Greyed out when using DHCP server. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
 
-<?if ($i==0):?>
-Default gateway:
-: <input type="text" name="GATEWAY" maxlength="40" value="<?=$eth0['GATEWAY']?>" class="narrow" pattern="<?=$validIP?>" title="IP address A.B.C.D">
-
-> Greyed out when using DHCP server. Otherwise specify here the IP address of your router.
-
-DNS server assignment:
-: <select name="DHCP_KEEPRESOLV" size="1" onchange="checkDNSSettings(this.form)">
-  <?=mk_option($eth0['DHCP_KEEPRESOLV'], "no", "Automatic");?>
-  <?=mk_option($eth0['DHCP_KEEPRESOLV'], "yes", "Static");?>
-  </select>
-
-> If set to *Automatic* the server will use DNS server IP address returned by the local DHCP server.<br>
-> If set to *Static* you may enter your own list.
->
-> This is useful in Active Directory configurations where you need to set the first DNS Server entry to the IP address of your AD Domain server.
-
-DNS server 1:
-: <input type="text" name="DNS_SERVER1" maxlength="80" value="<?=$eth0['DNS_SERVER1'];?>" class="narrow" pattern="<?=$validIP?>" title="IP address A.B.C.D">
-
-> This is the primary DNS server to use. Enter a FQDN or an IP address.
->
-> Note: for *Active Directory* you **must** ensure this is set to the IP address of your AD Domain server.
-
-DNS server 2:
-: <input type="text" name="DNS_SERVER2" maxlength="80" value="<?=$eth0['DNS_SERVER2'];?>" class="narrow" pattern="<?=$validIP?>" title="IP address A.B.C.D">
-
-> This is the DNS server to use when DNS Server 1 is down.
-
-DNS server 3:
-: <input type="text" name="DNS_SERVER3" maxlength="80" value="<?=$eth0['DNS_SERVER3'];?>" class="narrow" pattern="<?=$validIP?>" title="IP address A.B.C.D">
-
-> This is the DNS server to use when DNS Servers 1 and 2 are both down.
-
-Desired MTU:
-: <input type="number" name="MTU" min="68" max="9198" value="<?=$eth0['MTU']?>" class="narrow">
-
-> This is the MTU size to use on the physical Ethernet interface.
-> If left blank, the MTU will automatically be determined (by default 1500 bytes).
-
-<?else:?>
 </div>
 <?endif;?>
 </div>
@@ -415,11 +454,16 @@ Desired MTU:
 <script type="text/html" id="network-template-eth0" markdown="1">
 <div id="index-eth0-INDEX" class="access-eth0 shade-<?=$display['theme']?>" markdown="1">
 VLAN number:
-: <input type="number" name="VLANID:INDEX" min="1" max="4095" value="<?=$eth0["VLANID:INDEX"]?>" class="narrow" required><span class="pin" title="Remove VLAN" onclick="removeVLAN($('#index-eth0-INDEX'),false)"><i class="fa fa-minus-circle red"></i></span>
+: <input type="number" name="VLANID:INDEX" min="1" max="4095" value="<?=$eth0["VLANID:INDEX"]?>" class="narrow" required>
+  <span class="pin" title="Remove VLAN" onclick="removeVLAN($('#index-eth0-INDEX'),false)"><i class="fa fa-minus-circle red"></i></span>
+
+> Give each VLAN a unique identifier. Numbers range from 1 to 4095.
 
 Interface description:
 : <input type="text" name="DESCRIPTION:INDEX" maxlength="40" value="<?=$eth0["DESCRIPTION:INDEX"]?>" onchange="exitCode(this.form,true)">
 
+> Use this optional field to provide addditional information about the purpose of the connection.
+
 IP address assignment:
 : <select name="USE_DHCP:INDEX" size="1" onchange="checkNetworkSettings(this.form,INDEX)">
   <?=mk_option($eth0["USE_DHCP:INDEX"], 'yes', 'Automatic');?>
@@ -427,9 +471,17 @@ IP address assignment:
   <?=mk_option($eth0["USE_DHCP:INDEX"], '', 'None');?>
   </select>
 
+> The following settings are possible:
+>
+> *Automatic* - the server will attempt to obtain its IP address from the local DHCP server<br>
+> *Static* - the IP address is manually set for this interface<br>
+> *None* - no IP address is assigned to the interface (only available for VLANs)
+
 IP address:
 : <input type="text" name="IPADDR:INDEX" maxlength="40" value="<?=$eth0["IPADDR:INDEX"]?>" class="narrow" pattern="<?=$validIP?>" title="IP address A.B.C.D">
 
+> Greyed out when using DHCP server or NONE assignment. Otherwise specify here the IP address of the system.
+
 Network mask:
 : <select name="NETMASK:INDEX" size="1">
   <?=mk_option($eth0["NETMASK:INDEX"], "255.255.0.0", "255.255.0.0");?>
@@ -443,6 +495,9 @@ Network mask:
   <?=mk_option($eth0["NETMASK:INDEX"], "255.255.255.248", "255.255.255.248");?>
   <?=mk_option($eth0["NETMASK:INDEX"], "255.255.255.252", "255.255.255.252");?>
   </select>
+
+> Greyed out when using DHCP server or NONE assignment. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
+
 </div>
 </script>
 
diff --git a/plugins/dynamix/EthX.page b/plugins/dynamix/EthX.page
index add4d734e..a383dc2b7 100644
--- a/plugins/dynamix/EthX.page
+++ b/plugins/dynamix/EthX.page
@@ -84,18 +84,6 @@ Enable bridging:
 
 > Bridging is a feature which creates a virtual bridge and allows VMs to communicate directly with the physical Ethernet port.
 
-Type of access:
-: <select name="TYPE" size="1" onchange="checkNetworkAccess(this.form,'ethX')">
-  <?=mk_option($ethX['TYPE'], 'access', 'Untagged');?>
-  <?=mk_option($ethX['TYPE'], 'trunk', 'Tagged');?>
-  </select><span class="access-ethX pin" title="Add VLAN" style="display:none" onclick="addVLAN('ethX',<?=$disabled?'true':'false'?>)"><i class="fa fa-plus-circle green"></i></span>
-<?else:?>
-<div class="access-ethX shade-<?=$display['theme']?>" style="display:none" markdown="1">
-VLAN number:
-: <input type="number" name="VLANID:<?=$i?>" min="1" max="4095" value="<?=$ethX["VLANID:$i"]?>" class="narrow" required>
-  <span class="pin" title="Remove VLAN" onclick="removeVLAN($('#index-ethX-<?=$i?>'),<?=$disabled?'true':'false'?>)"><i class="fa fa-minus-circle red"></i></span>
-<?endif;?>
-
 Interface description:
 : <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="40" value="<?=$ethX["DESCRIPTION:$i"]?>" onchange="exitCode(this.form,true)">
 
@@ -135,14 +123,65 @@ Network mask:
 
 > Greyed out when using DHCP server. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
 
-<?if ($i==0):?>
 Desired MTU:
 : <input type="number" name="MTU" min="68" max="9198" value="<?=$ethX['MTU']?>" class="narrow">
 
 > This is the MTU size to use on the physical Ethernet interface.
 > If left blank, the MTU will automatically be determined (by default 1500 bytes).
 
-<?else:;?>
+Enable VLANs:
+: <select name="TYPE" size="1" onchange="checkNetworkAccess(this.form,'ethX')">
+  <?=mk_option($ethX['TYPE'], 'access', 'No');?>
+  <?=mk_option($ethX['TYPE'], 'trunk', 'Yes');?>
+  </select>
+  <span class="pin access-ethX" title="Add VLAN" style="display:none" onclick="addVLAN('ethX',<?=$disabled?'true':'false'?>)"><i class="fa fa-plus-circle green"></i></span>
+<?else:?>
+<div class="access-ethX shade-<?=$display['theme']?>" style="display:none" markdown="1">
+VLAN number:
+: <input type="number" name="VLANID:<?=$i?>" min="1" max="4095" value="<?=$ethX["VLANID:$i"]?>" class="narrow" required>
+  <span class="pin" title="Remove VLAN" onclick="removeVLAN($('#index-ethX-<?=$i?>'),<?=$disabled?'true':'false'?>)"><i class="fa fa-minus-circle red"></i></span>
+
+> Give each VLAN a unique identifier. Numbers range from 1 to 4095.
+
+Interface description:
+: <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="40" value="<?=$ethX["DESCRIPTION:$i"]?>" onchange="exitCode(this.form,true)">
+
+> Use this field to give addditional information about the purpose of the connection.
+
+IP address assignment:
+: <select name="USE_DHCP:<?=$i?>" size="1" onchange="checkNetworkSettings(this.form,<?=$i?>)">
+  <?=mk_option($ethX["USE_DHCP:$i"], 'yes', 'Automatic');?>
+  <?=mk_option($ethX["USE_DHCP:$i"], 'no', 'Static');?>
+  <?=mk_option($ethX["USE_DHCP:$i"], '', 'None');?>
+  </select>
+
+> The following settings are possible:
+>
+> *Automatic* - the server will attempt to obtain its IP address from the local DHCP server<br>
+> *Static* - the IP address is manually set for this interface<br>
+> *None* - no IP address is assigned to the interface
+
+IP address:
+: <input type="text" name="IPADDR:<?=$i?>" maxlength="40" value="<?=$ethX["IPADDR:$i"]?>" class="narrow" pattern="<?=$validIP?>" title="IP address A.B.C.D">
+
+> Greyed out when using DHCP server or NONE assignment. Otherwise specify here the IP address of the interface.
+
+Network mask:
+: <select name="NETMASK:<?=$i?>" size="1">
+  <?=mk_option($ethX["NETMASK:$i"], "255.255.0.0", "255.255.0.0");?>
+  <?=mk_option($ethX["NETMASK:$i"], "255.255.252.0", "255.255.252.0");?>
+  <?=mk_option($ethX["NETMASK:$i"], "255.255.254.0", "255.255.254.0");?>
+  <?=mk_option($ethX["NETMASK:$i"], "255.255.255.0", "255.255.255.0");?>
+  <?=mk_option($ethX["NETMASK:$i"], "255.255.255.128", "255.255.255.128");?>
+  <?=mk_option($ethX["NETMASK:$i"], "255.255.255.192", "255.255.255.192");?>
+  <?=mk_option($ethX["NETMASK:$i"], "255.255.255.224", "255.255.255.224");?>
+  <?=mk_option($ethX["NETMASK:$i"], "255.255.255.240", "255.255.255.240");?>
+  <?=mk_option($ethX["NETMASK:$i"], "255.255.255.248", "255.255.255.248");?>
+  <?=mk_option($ethX["NETMASK:$i"], "255.255.255.252", "255.255.255.252");?>
+  </select>
+
+> Greyed out when using DHCP server or NONE assignment. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
+
 </div>
 <?endif;?>
 </div>
@@ -151,11 +190,16 @@ Desired MTU:
 <script type="text/html" id="network-template-ethX" markdown="1">
 <div id="index-ethX-INDEX" class="access-ethX shade-<?=$display['theme']?>" markdown="1">
 VLAN number:
-: <input type="number" name="VLANID:INDEX" min="1" max="4095" value="<?=$ethX["VLANID:INDEX"]?>" class="narrow" required><span class="pin" title="Remove VLAN" onclick="removeVLAN($('#index-ethX-INDEX'),false)"><i class="fa fa-minus-circle red"></i></span>
+: <input type="number" name="VLANID:INDEX" min="1" max="4095" value="<?=$ethX["VLANID:INDEX"]?>" class="narrow" required>
+  <span class="pin" title="Remove VLAN" onclick="removeVLAN($('#index-ethX-INDEX'),false)"><i class="fa fa-minus-circle red"></i></span>
+
+> Give each VLAN a unique identifier. Numbers range from 1 to 4095.
 
 Interface description:
 : <input type="text" name="DESCRIPTION:INDEX" maxlength="40" value="<?=$ethX["DESCRIPTION:INDEX"]?>" onchange="exitCode(this.form,true)">
 
+> Use this field to give addditional information about the purpose of the connection.
+
 IP address assignment:
 : <select name="USE_DHCP:INDEX" size="1" onchange="checkNetworkSettings(this.form,INDEX)">
   <?=mk_option($ethX["USE_DHCP:INDEX"], 'yes', 'Automatic');?>
@@ -163,9 +207,17 @@ IP address assignment:
   <?=mk_option($ethX["USE_DHCP:INDEX"], '', 'None');?>
   </select>
 
+> The following settings are possible:
+>
+> *Automatic* - the server will attempt to obtain its IP address from the local DHCP server<br>
+> *Static* - the IP address is manually set for this interface<br>
+> *None* - no IP address is assigned to the interface
+
 IP address:
 : <input type="text" name="IPADDR:INDEX" maxlength="40" value="<?=$ethX["IPADDR:INDEX"]?>" class="narrow" pattern="<?=$validIP?>" title="IP address A.B.C.D">
 
+> Greyed out when using DHCP server or NONE assignment. Otherwise specify here the IP address of the interface.
+
 Network mask:
 : <select name="NETMASK:INDEX" size="1">
   <?=mk_option($ethX["NETMASK:INDEX"], "255.255.0.0", "255.255.0.0");?>
@@ -179,6 +231,9 @@ Network mask:
   <?=mk_option($ethX["NETMASK:INDEX"], "255.255.255.248", "255.255.255.248");?>
   <?=mk_option($ethX["NETMASK:INDEX"], "255.255.255.252", "255.255.255.252");?>
   </select>
+
+> Greyed out when using DHCP server or NONE assignment. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
+
 </div>
 </script>