From d0940e865c3a59e858a59f7e1dd0316bdc340f2a Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 29 Oct 2015 09:28:11 +0000
Subject: [PATCH] (legacy, ipsec) flip ipv4/ipv6 subnet in ipsec phase2, closes
 https://github.com/opnsense/core/issues/446

---
 src/www/vpn_ipsec_phase2.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/www/vpn_ipsec_phase2.php b/src/www/vpn_ipsec_phase2.php
index 04ce1bf7d..28a8999c6 100644
--- a/src/www/vpn_ipsec_phase2.php
+++ b/src/www/vpn_ipsec_phase2.php
@@ -458,6 +458,11 @@ $( document ).ready(function() {
   typesel_change_remote(<?=$pconfig['remoteid_netbits']?>);
     <?php
 endif; ?>
+
+  $( document ).ready(function() {
+      // hook in, ipv4/ipv6 selector events
+      hook_ipv4v6('ipv4v6net', 'network-id');
+  });
 });
 
 function change_mode() {
@@ -617,8 +622,6 @@ function change_protocol() {
 //]]>
 </script>
 
-
-
 <?php
 if (isset($input_errors) && count($input_errors) > 0) {
     print_input_errors($input_errors);
@@ -707,7 +710,7 @@ endforeach;
                   <td>
                     <input name="localid_address" type="text" id="localid_address" size="28" value="<?=$pconfig['localid_address'];?>" />
                     /
-                    <select name="localid_netbits" id="localid_netbits">
+                    <select name="localid_netbits" data-network-id="localid_address" class="ipv4v6net" id="localid_netbits">
 <?php              for ($i = 128; $i >= 0; $i--) :
 ?>
                       <option value="<?=$i;
@@ -746,7 +749,7 @@ endfor; ?>
                   <td>
                     <input name="natlocalid_address" type="text" class="formfld unknown ipv4v6" id="natlocalid_address" size="28" value="<?=isset($pconfig['natlocalid_address']) ? $pconfig['natlocalid_address'] : "";?>" />
                     /
-                    <select name="natlocalid_netbits" class="formselect ipv4v6" id="natlocalid_netbits">
+                    <select name="natlocalid_netbits"  data-network-id="natlocalid_address" class="formselect ipv4v6net" id="natlocalid_netbits">
                     <?php for ($i = 128; $i >= 0; $i--) :
 ?>
                       <option value="<?=$i;?>" <?php if (isset($pconfig['natlocalid_netbits']) && $i == $pconfig['natlocalid_netbits']) {
@@ -806,7 +809,7 @@ endif; ?>
                 <tr>
                   <td><a id="help_for_proto" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Protocol"); ?></td>
                   <td width="78%" class="vtable">
-                    <select name="protocol" class="formselect" onchange="change_protocol()">
+                    <select name="protocol" id="proto" class="formselect" onchange="change_protocol()">
     <?php
     foreach (array('esp' => 'ESP','ah' => 'AH') as $proto => $protoname) :
     ?>