Unbreak static routes

Add initial NPt Network Prefix Translation pages

6 files changed, 7 insertions, 6 deletions

diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 520fd01..395aa3a 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -444,8 +444,6 @@ function system_routing_configure($interface = "") {
 				continue;
 			}
 			$gateway = $gateways_arr[$rtent['gateway']];
-			if ($interface != $gateway['friendlyiface'])
-				continue;
 			$gatewayip = $gateway['gateway'];
 			$interfacegw = $gateway['interface'];
 			$action = "add";
diff --git a/etc/inc/xmlparse.inc b/etc/inc/xmlparse.inc
index 3e32d68..1304c4e 100644
--- a/etc/inc/xmlparse.inc
+++ b/etc/inc/xmlparse.inc
@@ -47,7 +47,7 @@ function listtags() {
 		"option package passthrumac phase1 phase2 ppp pppoe priv proxyarpnet qinqentry queue ".
 		"pages pipe roll route row rrddatafile rule schedule service servernat servers ".
 		"serversdisabled earlyshellcmd shellcmd staticmap subqueue timerange ".
-		"tunnel user vip virtual_server vlan winsserver wolentry widget"
+		"tunnel user vip virtual_server vlan winsserver wolentry widget npt"
 		);
 	return $ret;
 }
@@ -298,4 +298,4 @@ function dump_xml_config_raw($arr, $rootobj) {
 	return $xmlconfig;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/etc/inc/xmlreader.inc b/etc/inc/xmlreader.inc
index 0beeb74..ce0289b 100644
--- a/etc/inc/xmlreader.inc
+++ b/etc/inc/xmlreader.inc
@@ -51,7 +51,7 @@ function listtags() {
                 "option package passthrumac phase1 phase2 ppp pppoe priv proxyarpnet qinqentry queue ".
                 "pages pipe roll route row rrddatafile rule schedule service servernat servers ".
                 "serversdisabled earlyshellcmd shellcmd staticmap subqueue timerange ".
-                "tunnel user vip virtual_server vlan winsserver wolentry widget"
+                "tunnel user vip virtual_server vlan winsserver wolentry widget npt"
                 );
 	return array_flip($ret);
 }
@@ -217,4 +217,4 @@ function dump_xml_config_raw($arr, $rootobj) {
         return $xmlconfig;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
index 06da39d..ac67291 100755
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -179,6 +179,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 	$tab_array[] = array(gettext("Port Forward"), true, "firewall_nat.php");
 	$tab_array[] = array(gettext("1:1"), false, "firewall_nat_1to1.php");
 	$tab_array[] = array(gettext("Outbound"), false, "firewall_nat_out.php");
+	$tab_array[] = array(gettext("NPt"), false, "firewall_nat_npt.php");
 	display_top_tabs($tab_array);
 ?>
  </td></tr>
diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php
index 60f1189..d5f42c2 100755
--- a/usr/local/www/firewall_nat_1to1.php
+++ b/usr/local/www/firewall_nat_1to1.php
@@ -92,6 +92,7 @@ include("head.inc");
 	$tab_array[] = array(gettext("Port Forward"), false, "firewall_nat.php");
 	$tab_array[] = array(gettext("1:1"), true, "firewall_nat_1to1.php");
 	$tab_array[] = array(gettext("Outbound"), false, "firewall_nat_out.php");
+	$tab_array[] = array(gettext("NPt"), false, "firewall_nat_npt.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index 85c4550..ae901d3 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -289,6 +289,7 @@ include("head.inc");
 	$tab_array[] = array(gettext("Port Forward"), false, "firewall_nat.php");
 	$tab_array[] = array(gettext("1:1"), false, "firewall_nat_1to1.php");
 	$tab_array[] = array(gettext("Outbound"), true, "firewall_nat_out.php");
+	$tab_array[] = array(gettext("NPt"), false, "firewall_nat_npt.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>