ipsec: move deprecated disablevpnrules to its only user

(cherry picked from commit 83e21691)

src/www/system_advanced_firewall.php

@@ -66,7 +66,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig['enablebinatreflection'] = !empty($config['system']['enablebinatreflection']);
     $pconfig['enablenatreflectionhelper'] = isset($config['system']['enablenatreflectionhelper']) ? $config['system']['enablenatreflectionhelper'] : null;
     $pconfig['bypassstaticroutes'] = isset($config['filter']['bypassstaticroutes']);
-    $pconfig['disablevpnrules'] = isset($config['system']['disablevpnrules']);
 } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
     $pconfig = $_POST;
     $old_aliasesresolveinterval = $config['system']['aliasesresolveinterval'];
@@ -117,12 +116,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             unset($config['system']['disablefilter']);
         }
 
-        if (!empty($pconfig['disablevpnrules'])) {
-            $config['system']['disablevpnrules'] = true;
-        }  elseif (isset($config['system']['disablevpnrules'])) {
-            unset($config['system']['disablevpnrules']);
-        }
-
         if (!empty($pconfig['adaptiveend'])) {
             $config['system']['adaptiveend'] = $pconfig['adaptiveend'];
         } elseif (isset($config['system']['adaptiveend'])) {
@@ -519,16 +512,6 @@ include("head.inc");
                     </div>
                   </td>
                 </tr>
-                <tr>
-                  <td><a id="help_for_disablevpnrules" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Disable Auto-added VPN rules') ?></td>
-                  <td>
-                    <input name="disablevpnrules" type="checkbox" value="yes" <?=!empty($pconfig['disablevpnrules']) ? "checked=\"checked\"" :"";?> />
-                    <strong><?=gettext("Disable all auto-added VPN rules.");?></strong>
-                    <div class="hidden" for="help_for_disablevpnrules">
-                      <?=gettext("Note: This disables automatically added rules for IPsec, PPTP.");?>
-                    </div>
-                  </td>
-                </tr>
                 <tr>
                   <td><a id="help_for_disablereplyto" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Disable reply-to') ?></td>
                   <td>

src/www/vpn_ipsec_settings.php

@@ -41,6 +41,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     // fetch form data
     $pconfig  = array();
     $pconfig['noinstalllanspd'] = isset($config['system']['noinstalllanspd']);
+    $pconfig['disablevpnrules'] = isset($config['system']['disablevpnrules']);
     $pconfig['preferoldsa_enable'] = isset($config['ipsec']['preferoldsa']);
     foreach ($ipsec_loglevels as $lkey => $ldescr) {
         if (!empty($config['ipsec']["ipsec_{$lkey}"])) {
@@ -57,6 +58,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     } elseif (isset($config['system']['noinstalllanspd'])) {
         unset($config['system']['noinstalllanspd']);
     }
+    if (!empty($pconfig['disablevpnrules'])) {
+        $config['system']['disablevpnrules'] = true;
+    }  elseif (isset($config['system']['disablevpnrules'])) {
+        unset($config['system']['disablevpnrules']);
+    }
     if (isset($pconfig['preferoldsa_enable']) && $pconfig['preferoldsa_enable'] == "yes") {
         $config['ipsec']['preferoldsa'] = true;
     } elseif (isset($config['ipsec']['preferoldsa'])) {
@@ -123,6 +129,13 @@ if (isset($input_errors) && count($input_errors) > 0) {
                         </div>
                       </td>
                     </tr>
+                    <tr>
+                      <td><i class="fa fa-info-circle text-muted"></i> <?=gettext('Disable Auto-added VPN rules') ?></td>
+                      <td>
+                        <input name="disablevpnrules" type="checkbox" value="yes" <?=!empty($pconfig['disablevpnrules']) ? "checked=\"checked\"" :"";?> />
+                        <strong><?=gettext("Disable all auto-added VPN rules.");?></strong>
+                      </td>
+                    </tr>
                     <tr>
                       <td><a id="help_for_preferoldsa_enable" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Security Associations"); ?></td>
                       <td width="78%" class="vtable">