From 6b3a73985c6c5dce18f9ea70f16cf87bec2d1c5b Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Fri, 19 Nov 2004 21:54:22 +0000
Subject: Load balancing makes more sense on the outgoing tab

---
 usr/local/www/firewall_nat.php     | 12 +-----------
 usr/local/www/firewall_nat_out.php | 11 +++++++++--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
index c0ba7e7..806327f 100755
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -58,8 +58,7 @@ if ($_POST) {
 		}
 	}
 
-	$pconfig['nat']['enableoutboundloadbalancing'] = $_POST['enableoutboundloadbalancing'] ? true : false;
-	write_config();
+
 
 }
 
@@ -99,15 +98,6 @@ if ($_GET['act'] == "del") {
     <li class="tabinact"><a href="firewall_nat_out.php">Outbound</a></li>
   </ul>
   </td></tr>
-
-  <tr>
-    <td class="tabcont"><p><span class="vexpl"> </span>
-     <input name="enableoutboundloadbalancing" type="checkbox" id="enableoutboundloadbalancing" value="yes" <?php if ($pconfig['enableoutboundloadbalancing'] == "yes") echo "checked";?>>
-     <strong>Enable outbound load balancing.<hr>
-     </strong></p><input name="submit" type="submit" class="formbtn" value="Save">
-    </td>
-  </tr>
-
   <tr>
     <td class="tabcont">
               <table width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index 3b2c046..e78883f 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -42,6 +42,7 @@ if ($_POST) {
     $pconfig = $_POST;
 
     $config['nat']['advancedoutbound']['enable'] = ($_POST['enable']) ? true : false;
+    $pconfig['nat']['enableoutboundloadbalancing'] = $_POST['enableoutboundloadbalancing'] ? true : false;
     write_config();
 
     $retval = 0;
@@ -103,14 +104,20 @@ if ($_GET['act'] == "del") {
                   <td class="vtable"><p>
                       <input name="enable" type="checkbox" id="enable" value="yes" <?php if (isset($config['nat']['advancedoutbound']['enable'])) echo "checked";?>>
                       <strong>Enable advanced outbound NAT<br>
-                      </strong></p></td>
+                      </strong></p>
+                  </td>
+                  <td class="vtable"><p>
+                        <input name="enableoutboundloadbalancing" type="checkbox" id="enableoutboundloadbalancing" value="yes" <?php if ($pconfig['enableoutboundloadbalancing'] == "yes") echo "checked";?>>
+                        <strong>Enable outbound load balancing.<br>
+                        </strong></p>
+                  </td>
                 </tr>
                 <tr>
                   <td> <input name="submit" type="submit" class="formbtn" value="Save">
                   </td>
                 </tr>
                 <tr>
-                  <td><p><span class="vexpl"><span class="red"><strong>Note:<br>
+                  <td colspan="2"><p><span class="vexpl"><span class="red"><strong>Note:<br>
                       </strong></span>If advanced outbound NAT is enabled, no outbound NAT
                       rules will be automatically generated anymore. Instead, only the mappings
                       you specify below will be used. With advanced outbound NAT disabled,
-- 
cgit v1.1