firewall: can't change mode, cluster menu features; closes #921

Not really satisfied with the HA split but let's just say it's a
work in progress...

src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml

@@ -34,9 +34,8 @@
             <Defaults order="50" url="/diag_defaults.php"/>
         </Firmware>
         <HighAvailability order="50" VisibleName="High Availability" cssClass="fa fa-refresh fa-fw">
-            <Synchronization url="/system_hasync.php"/>
-            <CARPStatus order="100" VisibleName="CARP Status" url="/carp_status.php"/>
-            <HAStatus order="200" VisibleName="HA backup status" url="/status_habackup.php"/>
+            <Settings order="100" url="/system_hasync.php"/>
+            <Status order="200" url="/status_habackup.php"/>
         </HighAvailability>
         <Routes order="40" cssClass="fa fa-map-signs fa-fw">
             <All order="10" url="/system_routes.php">
@@ -164,9 +163,12 @@
                 <Edit url="/firewall_nat_npt_edit.php*" visibility="hidden"/>
             </NPT>
         </NAT>
-        <VirtualIPs order="50" VisibleName="Virtual IPs" url="/firewall_virtual_ip.php" cssClass="fa fa-clone fa-fw">
-            <VirtualIPEdit url="/firewall_virtual_ip_edit.php*" visibility="hidden"/>
-        </VirtualIPs>
+        <VIP order="50" VisibleName="Virtual IPs" cssClass="fa fa-clone fa-fw">
+            <Settings url="/firewall_virtual_ip.php">
+                <Edit url="/firewall_virtual_ip_edit.php*" visibility="hidden"/>
+            </Settings>
+            <Status url="/carp_status.php"/>
+        </VIP>
         <Schedules order="100" url="/firewall_schedule.php" cssClass="fa fa-calendar fa-fw">
             <SchedulesEdit url="/firewall_schedule_edit.php*" visibility="hidden"/>
         </Schedules>

src/www/firewall_virtual_ip.php

@@ -338,9 +338,7 @@ $main_buttons = array(
                       ?>
                     <?php ?>
                   <tr>
-                    <td colspan="5">
-                      <?=sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %shere%s.'),'<a href="carp_status.php">','</a>')?></span>
-                    </td>
+                    <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>

src/www/firewall_virtual_ip_edit.php

@@ -103,6 +103,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $reqdfieldsn = array(gettext("Type"));
     do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
 
+    if (isset($id) && $pconfig['mode'] != $a_vip[$id]['mode']) {
+        $input_errors[] = gettext("Virtual IP mode may not be changed for an existing entry.");
+    } else {
         if (isset($pconfig['subnet'])) {
             $pconfig['subnet'] = trim($pconfig['subnet']);
             if (!is_ipaddr($pconfig['subnet'])) {
@@ -117,12 +120,14 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                 }
             }
         }
+
         $natiflist = get_configured_interface_with_descr();
         foreach ($natiflist as $natif => $natdescr) {
             if ($pconfig['interface'] == $natif && (empty($config['interfaces'][$natif]['ipaddr']) && empty($config['interfaces'][$natif]['ipaddrv6']))) {
                 $input_errors[] = gettext("The interface chosen for the VIP has no IPv4 or IPv6 address configured so it cannot be used as a parent for the VIP.");
             }
         }
+
         /* ipalias and carp should not use network or broadcast address */
         if ($pconfig['mode'] == "ipalias" || $pconfig['mode'] == "carp") {
             if (is_ipaddrv4($pconfig['subnet']) && $pconfig['subnet_bits'] != "32") {
@@ -174,7 +179,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
         } else if ($pconfig['mode'] != 'ipalias' && $pconfig['interface'] == "lo0") {
             $input_errors[] = gettext("For this type of vip localhost is not allowed.");
         }
-
+    }
 
     if (count($input_errors) == 0) {
         $vipent = array();
@@ -321,7 +326,7 @@ $( document ).ready(function() {
                     </td>
                   </tr>
                   <tr>
-                    <td><a id="help_for_mode" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Type');?></td>
+                    <td><a id="help_for_mode" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Mode');?></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>