From 4bcdc72b3f210be66e82b14ce44fa53fc0f657f0 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 1 Apr 2016 12:25:03 +0200
Subject: [PATCH] firewall: prune virtual ip section

---
 src/www/firewall_virtual_ip.php      | 158 +++++++-------
 src/www/firewall_virtual_ip_edit.php | 315 +++++++++++++--------------
 2 files changed, 232 insertions(+), 241 deletions(-)

diff --git a/src/www/firewall_virtual_ip.php b/src/www/firewall_virtual_ip.php
index 4321d865e..16f8e4125 100644
--- a/src/www/firewall_virtual_ip.php
+++ b/src/www/firewall_virtual_ip.php
@@ -292,98 +292,96 @@ $main_buttons = array(
             print_info_box_apply(gettext("The VIP configuration has been changed.")."<br />".gettext("You must apply the changes in order for them to take effect."));
         ?>
         <section class="col-xs-12">
-            <div class="content-box-main content-box">
-              <form action="firewall_virtual_ip.php" method="post" name="iform" id="iform">
-                <input type="hidden" id="id" name="id" value="" />
-                <input type="hidden" id="action" name="act" value="" />
-                <div class="table-responsive">
-                  <table class="table table-striped">
-                    <thead>
-                      <tr>
-                        <td></td>
-                        <td><?=gettext("Virtual IP address");?></td>
-                        <td><?=gettext("Interface");?></td>
-                        <td><?=gettext("Type");?></td>
-                        <td><?=gettext("Description");?></td>
-                        <td></td>
-                      </tr>
-                    </thead>
-                    <tbody>
+          <div class="content-box tab-content">
+            <form action="firewall_virtual_ip.php" method="post" name="iform" id="iform">
+              <input type="hidden" id="id" name="id" value="" />
+              <input type="hidden" id="action" name="act" value="" />
+              <table class="table table-striped">
+                <thead>
+                  <tr>
+                    <td></td>
+                    <td><?=gettext("Virtual IP address");?></td>
+                    <td><?=gettext("Interface");?></td>
+                    <td><?=gettext("Type");?></td>
+                    <td><?=gettext("Description");?></td>
+                    <td></td>
+                  </tr>
+                </thead>
+                <tbody>
 <?php
                   $interfaces = get_configured_interface_with_descr(false, true);
                   $interfaces['lo0'] = "Localhost";
                   $i = 0;
                   foreach ($a_vip as $vipent):
                     if(!empty($vipent['subnet']) || !empty($vipent['range']) || !empty($vipent['subnet_bits']) || (isset($vipent['range']['from']) && !empty($vipent['range']['from']))): ?>
-                      <tr ondblclick="document.location='firewall_virtual_ip_edit.php?id=<?=$i;?>';">
-                        <td>
-                          <input type="checkbox" name="rule[]" value="<?=$i;?>"  />
-                        </td>
-                        <td>
-                          <?=($vipent['type'] == "single" || $vipent['type'] == "network") && !empty($vipent['subnet_bits']) ? $vipent['subnet']."/".$vipent['subnet_bits'] : "";?>
-                          <?=$vipent['type'] == "range" ? $vipent['range']['from'] . "-" .  $vipent['range']['to'] : "";?>
-                          <?=$vipent['mode'] == "carp" ?  " (vhid {$vipent['vhid']} , freq. {$vipent['advbase']} / {$vipent['advskew']} )" : "";?>
-                        </td>
-                        <td>
-                          <?=htmlspecialchars($interfaces[$vipent['interface']]);?>
-                        </td>
-                        <td>
-                          <?=$vipent['mode'] == "proxyarp" ? "Proxy ARP" : "";?>
-                          <?=$vipent['mode'] == "carp" ? "CARP" : "";?>
-                          <?=$vipent['mode'] == "other" ? "Other" : "";?>
-                          <?=$vipent['mode'] == "ipalias" ? "IP Alias" :"";?>
-                        </td>
-                        <td>
-                          <?=htmlspecialchars($vipent['descr']);?>
-                        </td>
-                        <td>
-                          <a id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" title="<?=gettext("move selected virtual IPs before this entry");?>" class="act_move btn btn-default btn-xs">
-                            <span class="glyphicon glyphicon-arrow-left"></span>
-                          </a>
-                          <a href="firewall_virtual_ip_edit.php?id=<?=$i;?>" data-toggle="tooltip" title="<?=gettext("edit virtual IP");?>" class="btn btn-default btn-xs">
-                            <span class="glyphicon glyphicon-pencil"></span>
-                          </a>
-                          <a id="del_<?=$i;?>" title="<?=gettext("delete virtual IP"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                            <span class="fa fa-trash text-muted"></span>
-                          </a>
-                          <a href="firewall_virtual_ip_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=gettext("clone virtual IP");?>">
-                            <span class="fa fa-clone text-muted"></span>
-                          </a>
-                        </td>
-                      </tr>
+                  <tr ondblclick="document.location='firewall_virtual_ip_edit.php?id=<?=$i;?>';">
+                    <td>
+                      <input type="checkbox" name="rule[]" value="<?=$i;?>"  />
+                    </td>
+                    <td>
+                      <?=($vipent['type'] == "single" || $vipent['type'] == "network") && !empty($vipent['subnet_bits']) ? $vipent['subnet']."/".$vipent['subnet_bits'] : "";?>
+                      <?=$vipent['type'] == "range" ? $vipent['range']['from'] . "-" .  $vipent['range']['to'] : "";?>
+                      <?=$vipent['mode'] == "carp" ?  " (vhid {$vipent['vhid']} , freq. {$vipent['advbase']} / {$vipent['advskew']} )" : "";?>
+                    </td>
+                    <td>
+                      <?=htmlspecialchars($interfaces[$vipent['interface']]);?>
+                    </td>
+                    <td>
+                      <?=$vipent['mode'] == "proxyarp" ? "Proxy ARP" : "";?>
+                      <?=$vipent['mode'] == "carp" ? "CARP" : "";?>
+                      <?=$vipent['mode'] == "other" ? "Other" : "";?>
+                      <?=$vipent['mode'] == "ipalias" ? "IP Alias" :"";?>
+                    </td>
+                    <td>
+                      <?=htmlspecialchars($vipent['descr']);?>
+                    </td>
+                    <td>
+                      <a id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" title="<?=gettext("move selected virtual IPs before this entry");?>" class="act_move btn btn-default btn-xs">
+                        <span class="glyphicon glyphicon-arrow-left"></span>
+                      </a>
+                      <a href="firewall_virtual_ip_edit.php?id=<?=$i;?>" data-toggle="tooltip" title="<?=gettext("edit virtual IP");?>" class="btn btn-default btn-xs">
+                        <span class="glyphicon glyphicon-pencil"></span>
+                      </a>
+                      <a id="del_<?=$i;?>" title="<?=gettext("delete virtual IP"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
+                        <span class="fa fa-trash text-muted"></span>
+                      </a>
+                      <a href="firewall_virtual_ip_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=gettext("clone virtual IP");?>">
+                        <span class="fa fa-clone text-muted"></span>
+                      </a>
+                    </td>
+                  </tr>
 <?php
                       endif;
                       $i++;
                     endforeach;
                       ?>
                     <?php ?>
-                    <tr>
-                      <td colspan="5"></td>
-                      <td>
-                        <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" title="<?=gettext("move selected virtual IPs to end");?>" class="act_move btn btn-default btn-xs">
-                          <span class="glyphicon glyphicon-arrow-left"></span>
-                        </a>
-                        <a href="firewall_virtual_ip_edit.php" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=gettext("add new virtual IP");?>">
-                          <span class="glyphicon glyphicon-plus"></span>
-                        </a>
-                        <a id="del_x" title="<?=gettext("delete selected virtual IPs"); ?>" data-toggle="tooltip"  class="btn btn-default btn-xs">
-                          <span class="fa fa-trash text-muted"></span>
-                        </a>
-                      </td>
-                    </tr>
-                    </tbody>
-                  </table>
-                </div>
-                <div class="container-fluid">
-                  <p><span class="vexpl"><span class="text-danger"><strong><?=gettext("Note:");?><br />
-                  </strong></span><?=sprintf(gettext("The virtual IP addresses defined on this page may be used in %sNAT mappings%s."),'<a href="firewall_nat.php">','</a>');?><br />
-                  <?=sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %shere%s.'),'<a href="carp_status.php">','</a>')?></span></p>
-                </div>
-              </form>
-            </div>
-          </section>
-        </div>
+                  <tr>
+                    <td colspan="5"></td>
+                    <td>
+                      <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" title="<?=gettext("move selected virtual IPs to end");?>" class="act_move btn btn-default btn-xs">
+                        <span class="glyphicon glyphicon-arrow-left"></span>
+                      </a>
+                      <a href="firewall_virtual_ip_edit.php" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=gettext("add new virtual IP");?>">
+                        <span class="glyphicon glyphicon-plus"></span>
+                      </a>
+                      <a id="del_x" title="<?=gettext("delete selected virtual IPs"); ?>" data-toggle="tooltip"  class="btn btn-default btn-xs">
+                        <span class="fa fa-trash text-muted"></span>
+                      </a>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colspan="6">
+                      <?=sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %shere%s.'),'<a href="carp_status.php">','</a>')?></span>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </form>
+          </div>
+        </section>
       </div>
-    </section>
+    </div>
+  </section>
 
 <?php include("foot.inc"); ?>
diff --git a/src/www/firewall_virtual_ip_edit.php b/src/www/firewall_virtual_ip_edit.php
index 9b5f794cb..6cff8b4b3 100644
--- a/src/www/firewall_virtual_ip_edit.php
+++ b/src/www/firewall_virtual_ip_edit.php
@@ -308,178 +308,171 @@ $( document ).ready(function() {
       <div class="row">
         <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
         <section class="col-xs-12">
-          <div class="content-box">
+          <div class="content-box tab-content">
             <form action="firewall_virtual_ip_edit.php" method="post" name="iform" id="iform">
-              <div class="table-responsive">
-                <table class="table table-striped">
-                  <thead></thead>
-                  <tbody>
-                    <tr>
-                      <td width="22%"><strong><?=gettext("Edit Virtual IP");?></strong></td>
-                      <td  width="78%" align="right">
-                        <small><?=gettext("full help"); ?> </small>
-                        <i class="fa fa-toggle-off text-danger"  style="cursor: pointer;" id="show_all_help_page" type="button"></i>
-                      </td>
-                    </tr>
-                    <tr>
+              <table class="table table-striped">
+                <thead></thead>
+                <tbody>
+                  <tr>
+                    <td width="22%"><strong><?=gettext("Edit Virtual IP");?></strong></td>
+                    <td  width="78%" align="right">
+                      <small><?=gettext("full help"); ?> </small>
+                      <i class="fa fa-toggle-off text-danger"  style="cursor: pointer;" id="show_all_help_page" type="button"></i>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td><a id="help_for_mode" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Type');?></td>
+                    <td>
+                      <select id="mode" name="mode" class="selectpicker" data-width="auto" data-live-search="true">
+                        <option value="ipalias" <?=$pconfig['mode'] == "ipalias" ? "selected=\"selected\"" : ""; ?>><?=gettext("IP Alias");?></option>
+                        <option value="carp" <?=$pconfig['mode'] == "carp" ? "selected=\"selected\"" : ""; ?>><?=gettext("carp");?></option>
+                        <option value="proxyarp" <?=$pconfig['mode'] == "proxyarp" ? "selected=\"selected\"" : ""; ?>><?=gettext("Proxy ARP");?></option>
+                        <option value="other" <?=$pconfig['mode'] == "other" ? "selected=\"selected\"" : ""; ?>><?=gettext("Other");?></option>
+                      </select>
+                      <div class="hidden" for="help_for_mode">
+                        <?=gettext("Proxy ARP and other type Virtual IPs cannot be bound to by anything running on the firewall, such as IPsec, OpenVPN, etc. Use a CARP or IP Alias type address for these cases.");?>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Interface");?></td>
+                    <td>
+                      <select name="interface" class="selectpicker" data-width="auto">
+<?php
+                      $interfaces = get_configured_interface_with_descr(false, true);
+                      $interfaces['lo0'] = "Localhost";
+                      foreach ($interfaces as $iface => $ifacename): ?>
+                        <option value="<?=$iface;?>" <?= $iface == $pconfig['interface'] ? "selected=\"selected\"" :""; ?>>
+                          <?=htmlspecialchars($ifacename);?>
+                        </option>
+<?php
+                      endforeach; ?>
+                      </select>
+                    </td>
+                  </tr>
+                  <tr>
+                      <td><?=gettext("IP Address(es)");?></td>
+                      <td></td>
+                  </tr>
+                  <tr>
                       <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Type");?></td>
                       <td>
-                        <select id="mode" name="mode" class="selectpicker" data-width="auto" data-live-search="true">
-                          <option value="ipalias" <?=$pconfig['mode'] == "ipalias" ? "selected=\"selected\"" : ""; ?>><?=gettext("IP Alias");?></option>
-                          <option value="carp" <?=$pconfig['mode'] == "carp" ? "selected=\"selected\"" : ""; ?>><?=gettext("carp");?></option>
-                          <option value="proxyarp" <?=$pconfig['mode'] == "proxyarp" ? "selected=\"selected\"" : ""; ?>><?=gettext("Proxy ARP");?></option>
-                          <option value="other" <?=$pconfig['mode'] == "other" ? "selected=\"selected\"" : ""; ?>><?=gettext("Other");?></option>
-                        </select>
+                        <select name="type" class="selectpicker" data-width="auto" id="type">
+                            <option value="single" <?=(!empty($pconfig['subnet_bits']) && $pconfig['subnet_bits'] == 32) || !isset($pconfig['subnet']) ? "selected=\"selected\"" : "";?>>
+                              <?=gettext("Single address");?>
+                            </option>
+                            <option value="network" <?=empty($pconfig['subnet_bits']) || $pconfig['subnet_bits'] != 32 || isset($pconfig['subnet']) ? "selected=\"selected\"" : "";?>>
+                              <?=gettext("Network");?></option>
+                            </select>
                       </td>
-                    </tr>
-                    <tr>
-                      <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Interface");?></td>
+                  </tr>
+                  <tr>
+                      <td><a id="help_for_address" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Address");?></td>
                       <td>
-                        <select name="interface" class="selectpicker" data-width="auto">
+                        <table border="0" cellspacing="0" cellpadding="0">
+                          <tr>
+                            <td width="348px">
+                              <input name="subnet" type="text" class="form-control" id="subnet" size="28" value="<?=$pconfig['subnet'];?>" />
+                            </td>
+                            <td >
+                              <select name="subnet_bits" data-network-id="subnet" class="selectpicker ipv4v6net" data-size="10"  data-width="auto" id="subnet_bits">
+                                <option disabled="disabled"></option> <!-- workaround for selectpicker -->
 <?php
-                        $interfaces = get_configured_interface_with_descr(false, true);
-                        $interfaces['lo0'] = "Localhost";
-                        foreach ($interfaces as $iface => $ifacename): ?>
-                          <option value="<?=$iface;?>" <?= $iface == $pconfig['interface'] ? "selected=\"selected\"" :""; ?>>
-                            <?=htmlspecialchars($ifacename);?>
-                          </option>
+                                for ($i = 128; $i >= 1; $i--): ?>
+                                  <option value="<?=$i;?>" <?= $i == $pconfig['subnet_bits'] ? "selected=\"selected\"" :""; ?>>
+                                    <?=$i;?>
+                                  </option>
 <?php
-                        endforeach; ?>
-                        </select>
-                      </td>
-                    </tr>
-                    <tr>
-                        <td><?=gettext("IP Address(es)");?></td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Type");?></td>
-                        <td>
-                          <select name="type" class="selectpicker" data-width="auto" id="type">
-                              <option value="single" <?=(!empty($pconfig['subnet_bits']) && $pconfig['subnet_bits'] == 32) || !isset($pconfig['subnet']) ? "selected=\"selected\"" : "";?>>
-                                <?=gettext("Single address");?>
-                              </option>
-                              <option value="network" <?=empty($pconfig['subnet_bits']) || $pconfig['subnet_bits'] != 32 || isset($pconfig['subnet']) ? "selected=\"selected\"" : "";?>>
-                                <?=gettext("Network");?></option>
+                                endfor; ?>
                               </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><a id="help_for_address" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Address");?></td>
-                        <td>
-                          <table border="0" cellspacing="0" cellpadding="0">
-                            <tr>
-                              <td width="348px">
-                                <input name="subnet" type="text" class="form-control" id="subnet" size="28" value="<?=$pconfig['subnet'];?>" />
-                              </td>
-                              <td >
-                                <select name="subnet_bits" data-network-id="subnet" class="selectpicker ipv4v6net" data-size="10"  data-width="auto" id="subnet_bits">
-                                  <option disabled="disabled"></option> <!-- workaround for selectpicker -->
-<?php
-                                  for ($i = 128; $i >= 1; $i--): ?>
-                                    <option value="<?=$i;?>" <?= $i == $pconfig['subnet_bits'] ? "selected=\"selected\"" :""; ?>>
-                                      <?=$i;?>
-                                    </option>
-<?php
-                                  endfor; ?>
-                                </select>
-                              </td>
-                            </tr>
-                          </table>
-                          <div class="hidden" for="help_for_address">
-                              <i id="typenote"></i>
+                            </td>
+                          </tr>
+                        </table>
+                        <div class="hidden" for="help_for_address">
+                            <i id="typenote"></i>
+                        </div>
+                      </td>
+                  </tr>
+                  <tr id="noexpandrow">
+                      <td><a id="help_for_noexpand" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Expansion");?> </td>
+                      <td>
+                          <input id="noexpand" name="noexpand" type="checkbox" class="form-control unknown" id="noexpand" <?= !empty($pconfig['noexpand']) ? "checked=\"checked\"" : "" ; ?> />
+                          <div class="hidden" for="help_for_noexpand">
+                            <?=gettext("Disable expansion of this entry into IPs on NAT lists (e.g. 192.168.1.0/24 expands to 256 entries.");?>
                           </div>
-                        </td>
-                    </tr>
-                    <tr id="noexpandrow">
-                        <td><a id="help_for_noexpand" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Expansion");?> </td>
-                        <td>
-                            <input id="noexpand" name="noexpand" type="checkbox" class="form-control unknown" id="noexpand" <?= !empty($pconfig['noexpand']) ? "checked=\"checked\"" : "" ; ?> />
-                            <div class="hidden" for="help_for_noexpand">
-                              <?=gettext("Disable expansion of this entry into IPs on NAT lists (e.g. 192.168.1.0/24 expands to 256 entries.");?>
-                            </div>
-                    </tr>
-                    <tr>
-                      <td><a id="help_for_password" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Virtual IP Password");?></td>
-                      <td>
-                        <input type='password'  name='password' id="password" value="<?=$pconfig['password'];?>" />
-                        <div class="hidden" for="help_for_password">
-                          <?=gettext("Enter the VHID group password.");?>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td><a id="help_for_vhid" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("VHID Group");?></td>
-                      <td>
-                        <select id='vhid' name='vhid' class="selectpicker" data-size="10" data-width="auto">
-                          <?php for ($i = 1; $i <= 255; $i++): ?>
-                            <option value="<?=$i;?>" <?= $i == $pconfig['vhid'] ?  "selected=\"selected\"" : ""; ?>>
-                              <?=$i;?>
-                            </option>
-                          <?php endfor; ?>
-                        </select>
-                        <div class="hidden" for="help_for_vhid">
-                          <?=gettext("Enter the VHID group that the machines will share.");?>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td><a id="help_for_adv" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Advertising Frequency");?></td>
-                      <td>
-                        <?=gettext("Base");?>:
-                        <select id='advbase' name='advbase' class="selectpicker" data-size="10" data-width="auto">
-                          <?php for ($i = 1; $i <= 254; $i++): ?>
-                            <option value="<?=$i;?>" <?=$i == $pconfig['advbase'] ? "selected=\"selected\"" :""; ?>>
-                              <?=$i;?>
-                            </option>
-                          <?php endfor; ?>
-                        </select>
-                        <?=gettext("Skew");?>:
-                        <select id='advskew' name='advskew' class="selectpicker" data-size="10" data-width="auto">
-                          <?php for ($i = 0; $i <= 254; $i++): ?>
-                            <option value="<?=$i;?>" <?php if ($i == $pconfig['advskew']) echo "selected=\"selected\""; ?>>
-                              <?=$i;?>
-                            </option>
-                          <?php endfor; ?>
-                        </select>
+                  </tr>
+                  <tr>
+                    <td><a id="help_for_password" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Virtual IP Password");?></td>
+                    <td>
+                      <input type='password'  name='password' id="password" value="<?=$pconfig['password'];?>" />
+                      <div class="hidden" for="help_for_password">
+                        <?=gettext("Enter the VHID group password.");?>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td><a id="help_for_vhid" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("VHID Group");?></td>
+                    <td>
+                      <select id='vhid' name='vhid' class="selectpicker" data-size="10" data-width="auto">
+                        <?php for ($i = 1; $i <= 255; $i++): ?>
+                          <option value="<?=$i;?>" <?= $i == $pconfig['vhid'] ?  "selected=\"selected\"" : ""; ?>>
+                            <?=$i;?>
+                          </option>
+                        <?php endfor; ?>
+                      </select>
+                      <div class="hidden" for="help_for_vhid">
+                        <?=gettext("Enter the VHID group that the machines will share.");?>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td><a id="help_for_adv" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Advertising Frequency");?></td>
+                    <td>
+                      <?=gettext("Base");?>:
+                      <select id='advbase' name='advbase' class="selectpicker" data-size="10" data-width="auto">
+                        <?php for ($i = 1; $i <= 254; $i++): ?>
+                          <option value="<?=$i;?>" <?=$i == $pconfig['advbase'] ? "selected=\"selected\"" :""; ?>>
+                            <?=$i;?>
+                          </option>
+                        <?php endfor; ?>
+                      </select>
+                      <?=gettext("Skew");?>:
+                      <select id='advskew' name='advskew' class="selectpicker" data-size="10" data-width="auto">
+                        <?php for ($i = 0; $i <= 254; $i++): ?>
+                          <option value="<?=$i;?>" <?php if ($i == $pconfig['advskew']) echo "selected=\"selected\""; ?>>
+                            <?=$i;?>
+                          </option>
+                        <?php endfor; ?>
+                      </select>
 
-                        <div class="hidden" for="help_for_adv">
-                          <br/>
-                          <?=gettext("The frequency that this machine will advertise.  0 usually means master. Otherwise the lowest combination of both values in the cluster determines the master.");?>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td><a id="help_for_descr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description");?></td>
-                      <td>
-                        <input name="descr" type="text" class="form-control unknown" id="descr" size="40" value="<?=$pconfig['descr'];?>" />
-                        <div class="hidden" for="help_for_adv">
-                          <?=gettext("You may enter a description here for your reference (not parsed).");?>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>&nbsp;</td>
-                      <td>
-                        <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
-                        <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_virtual_ip.php');?>'" />
-                        <?php if (isset($id) && $a_vip[$id]): ?>
-                          <input name="id" type="hidden" value="<?=$id;?>" />
-                        <?php endif; ?>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
+                      <div class="hidden" for="help_for_adv">
+                        <br/>
+                        <?=gettext("The frequency that this machine will advertise.  0 usually means master. Otherwise the lowest combination of both values in the cluster determines the master.");?>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td><a id="help_for_descr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description");?></td>
+                    <td>
+                      <input name="descr" type="text" class="form-control unknown" id="descr" size="40" value="<?=$pconfig['descr'];?>" />
+                      <div class="hidden" for="help_for_adv">
+                        <?=gettext("You may enter a description here for your reference (not parsed).");?>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td>&nbsp;</td>
+                    <td>
+                      <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
+                      <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_virtual_ip.php');?>'" />
+                      <?php if (isset($id) && $a_vip[$id]): ?>
+                        <input name="id" type="hidden" value="<?=$id;?>" />
+                      <?php endif; ?>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
             </form>
-            <div class="container-fluid">
-              <span class="text-danger">
-                <strong><?=gettext("Note:");?><br /></strong>
-              </span>
-              <?=gettext("Proxy ARP and other type Virtual IPs cannot be bound to by anything running on the firewall, such as IPsec, OpenVPN, etc. Use a CARP or IP Alias type address for these cases.");?>
-              <br /><br />
-              <?= sprintf(gettext("For more information on CARP and the above values, visit the OpenBSD %sCARP FAQ%s."), "<a href='http://www.openbsd.org/faq/pf/carp.html'>","</a>" ) ?>
-            </div>
           </div>
         </section>
       </div>