Add hybrid and disabled outbound NAT, fixes #2416:

- Add 2 new outbound NAT modes, hybrid and disabled, manual and advanced
  keep working the same way
- Hybrid mode applies manual rules first, automatic after
- Disabled do no create any outbound NAT rules
- Remove ipsecpassthru config field and rename advancedoutbound to
  outbound
- Save mode on $config['nat']['outbound']['mode'] to simplify the logic
- Modify config.default to reflect changes
- Add code to upgrade config, and change latest_version to 10.3
- Use html to align modes and remove some hacks to align using  

1 files changed, 5 insertions, 5 deletions

diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index 5b2fb87..5e113a5 100755
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -45,14 +45,14 @@ require("guiconfig.inc");
 require_once("filter.inc");
 require("shaper.inc");
 
-if (!is_array($config['nat']['advancedoutbound']))
-	$config['nat']['advancedoutbound'] = array();
+if (!is_array($config['nat']['outbound']))
+	$config['nat']['outbound'] = array();
 
-if (!is_array($config['nat']['advancedoutbound']['rule'])) {
-	$config['nat']['advancedoutbound']['rule'] = array();
+if (!is_array($config['nat']['outbound']['rule'])) {
+	$config['nat']['outbound']['rule'] = array();
 }
 
-$a_out = &$config['nat']['advancedoutbound']['rule'];
+$a_out = &$config['nat']['outbound']['rule'];
 
 if (!is_array($config['aliases']['alias']))
 	$config['aliases']['alias'] = array();