Merge remote branch 'upstream/master'

1 files changed, 28 insertions, 0 deletions

diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
index 34ac040..3dbb31c 100755
--- a/usr/local/www/firewall_virtual_ip_edit.php
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -87,6 +87,7 @@ if (isset($id) && $a_vip[$id]) {
 	$pconfig['range'] = $a_vip[$id]['range'];
 	$pconfig['subnet'] = $a_vip[$id]['subnet'];
 	$pconfig['subnet_bits'] = $a_vip[$id]['subnet_bits'];
+	$pconfig['noexpand'] = $a_vip[$id]['noexpand'];
 	$pconfig['descr'] = $a_vip[$id]['descr'];
 	$pconfig['type'] = $a_vip[$id]['type'];
 	$pconfig['interface'] = $a_vip[$id]['interface'];
@@ -215,7 +216,9 @@ if ($_POST) {
 			if ($_POST['type'] == "range") {
 				$vipent['range']['from'] = $_POST['range_from'];
 				$vipent['range']['to'] = $_POST['range_to'];
+
 			}
+			$vipent['noexpand'] = isset($_POST['noexpand']);
 		}
 
 		/* CARP specific fields */
@@ -304,6 +307,8 @@ function enable_change(enable_over) {
                 document.iform.type.disabled = 1;
                 document.iform.subnet_bits.disabled = 0;
 		document.iform.subnet.disabled = 0;
+		document.iform.noexpand.disabled = 1;
+		$('noexpandrow').style.display = 'none';
 		if (note.firstChild == null) {
 			note.appendChild(carpnote);
 		} else {
@@ -318,6 +323,8 @@ function enable_change(enable_over) {
                 document.iform.type.disabled = 0;
                 document.iform.subnet_bits.disabled = 1;
 		document.iform.subnet.disabled = 0;
+		document.iform.noexpand.disabled = 0;
+		$('noexpandrow').style.display = '';
 		if (note.firstChild == null) {
 			note.appendChild(proxyarpnote);
 		} else {
@@ -331,6 +338,8 @@ function enable_change(enable_over) {
 			note.removeChild(note.firstChild);
 		}
 		document.iform.subnet.disabled = 0;
+		document.iform.noexpand.disabled = 1;
+		$('noexpandrow').style.display = 'none';
 	}
 	if (get_radio_value(document.iform.mode) == "ipalias") {
 		document.iform.type.disabled = 1;
@@ -338,6 +347,8 @@ function enable_change(enable_over) {
 		note.appendChild(ipaliasnote);
 		document.iform.subnet_bits.disabled = 0;
 		document.iform.subnet.disabled = 0;		
+		document.iform.noexpand.disabled = 1;
+		$('noexpandrow').style.display = 'none';
 	}
 	if (get_radio_value(document.iform.mode) == "carpdev-dhcp") {
 		document.iform.type.disabled = 1;
@@ -351,29 +362,40 @@ function enable_change(enable_over) {
         	document.iform.password.disabled = 0;
         	document.iform.advskew.disabled = 0;
         	document.iform.advbase.disabled = 0;
+		document.iform.noexpand.disabled = 1;
+		$('noexpandrow').style.display = 'none';
 	}
+	typesel_change();
 }
 function typesel_change() {
     switch (document.iform.type.selectedIndex) {
         case 0: // single
             document.iform.subnet.disabled = 0;
             if((get_radio_value(document.iform.mode) == "proxyarp")) document.iform.subnet_bits.disabled = 1;
+	    document.iform.noexpand.disabled = 1;
+	    $('noexpandrow').style.display = 'none';
             break;
         case 1: // network
             document.iform.subnet.disabled = 0;
             document.iform.subnet_bits.disabled = 0;
+	    document.iform.noexpand.disabled = 0;
+	    $('noexpandrow').style.display = '';
             //document.iform.range_from.disabled = 1;
             //document.iform.range_to.disabled = 1;
             break;
         case 2: // range
             document.iform.subnet.disabled = 1;
             document.iform.subnet_bits.disabled = 1;
+	    document.iform.noexpand.disabled = 1;
+	    $('noexpandrow').style.display = 'none';
             //document.iform.range_from.disabled = 0;
             //document.iform.range_to.disabled = 0;
             break;
 	case 3: // IP alias
             document.iform.subnet.disabled = 1;
             document.iform.subnet_bits.disabled = 0;
+	    document.iform.noexpand.disabled = 1;
+	    $('noexpandrow').style.display = 'none';
             //document.iform.range_from.disabled = 0;
             //document.iform.range_to.disabled = 0;
             break;
@@ -452,6 +474,12 @@ function typesel_change() {
                       </select> <i id="typenote"></i>
  						</td>
                       </tr>
+                      <tr id="noexpandrow">
+                        <td><?=gettext("Expansion:");?>&nbsp;&nbsp;</td>
+                        <td><input name="noexpand" type="checkbox" class="formfld unknown" id="noexpand" <?php echo (isset($pconfig['noexpand'])) ? "checked" : "" ; ?>>
+                        	Disable expansion of this entry into IPs on NAT lists (e.g. 192.168.1.0/24 expands to 256 entries.)
+                        	</td>
+                      </tr>
 		      <?php
 		      /*
                         <tr>