Fix outbound NAT rules when interface is deleted:

- When delete interface, do not touch outbound NAT rules
- Skip outbound NAT rules when interface doesn't exist
- Bump latest_config to 9.2
- Since rules with no interface were considered as wan, convert old
  rules adding interface 'wan' to avoid breaking old configs

It should fix #2338

2 files changed, 9 insertions, 12 deletions

diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index 7485965..3c3fc54 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -368,16 +368,19 @@ include("head.inc");
 		  </td>
                 </tr>
               <?php $nnats = $i = 0; foreach ($a_out as $natent): ?>
+	        <?php
+			global $FilterIflist;
+			if(empty($FilterIflist)) {
+				filter_generate_optcfg_array();
+			}
+			if (!$natent['interface'] || !isset($FilterIflist[$natent['interface']]))
+				continue;
+		?>
                 <tr valign="top" id="fr<?=$nnats;?>">
                   <td class="listt"><input type="checkbox" id="frc<?=$nnats;?>" name="rule[]" value="<?=$i;?>" onClick="fr_bgcolor('<?=$nnats;?>')" style="margin: 0; padding: 0; width: 15px; height: 15px;"></td>
                   <td class="listt" align="center"></td>
                   <td class="listlr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_out_edit.php?id=<?=$nnats;?>';">
-                    <?php
-					if (!$natent['interface'])
-					  	echo htmlspecialchars(convert_friendly_interface_to_friendly_descr("wan"));
-					else
-						echo htmlspecialchars(convert_friendly_interface_to_friendly_descr($natent['interface']));
-					?>
+                    <?php echo htmlspecialchars(convert_friendly_interface_to_friendly_descr($natent['interface'])); ?>
                                         &nbsp;
                   </td>
                   <td class="listr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_out_edit.php?id=<?=$nnats;?>';">
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index 565dca7..88b7bae 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -284,12 +284,6 @@ if ($_GET['act'] == "del") {
 					unset($config['filter']['rule'][$x]);
 			}
         	}
-		if (is_array($config['nat']['advancedoutbound']) && count($config['nat']['advancedoutbound']['rule']) > 0) {
-        	foreach ($config['nat']['advancedoutbound']['rule'] as $x => $rule) {
-				if($rule['interface'] == $id)
-					unset($config['nat']['advancedoutbound']['rule'][$x]['interface']);
-        		}
-		}
 		if (is_array($config['nat']['rule']) && count($config['nat']['rule']) > 0) {
 			foreach ($config['nat']['rule'] as $x => $rule) {
 				if($rule['interface'] == $id)