From 50d86c13771164ab18c0de426f434f55c9b0cdce Mon Sep 17 00:00:00 2001
From: Bill Marquette <billm@pfsense.org>
Date: Tue, 5 Aug 2008 05:03:55 +0000
Subject: Bring in new server load balancing code, this introduces: * The
 ability to create your own monitors (tcp, http, https, send/expect) * A new
 way of displaying 'standard tables' - MainTable class * monitor_type array
 type

---
 .../www/load_balancer_virtual_server_edit.php      | 26 +++++++++-------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'usr/local/www/load_balancer_virtual_server_edit.php')

diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php
index e24cb63..e6c7f0e 100755
--- a/usr/local/www/load_balancer_virtual_server_edit.php
+++ b/usr/local/www/load_balancer_virtual_server_edit.php
@@ -4,7 +4,7 @@
         load_balancer_virtual_server_edit.php
         part of pfSense (http://www.pfsense.com/)
 
-        Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>.
+        Copyright (C) 2005-2008 Bill Marquette <bill.marquette@gmail.com>.
         All rights reserved.
 
         Redistribution and use in source and binary forms, with or without
@@ -158,30 +158,26 @@ include("head.inc");
                     <select id="pool" name="pool">
 			<?php
 				for ($i = 0; isset($config['load_balancer']['lbpool'][$i]); $i++) {
-					if ($config['load_balancer']['lbpool'][$i]['type'] == "server") {
-						$selected = "";
-						if ( $config['load_balancer']['lbpool'][$i]['name'] == $pconfig['pool'] )
-							$selected = " SELECTED";
-						echo "<option value=\"{$config['load_balancer']['lbpool'][$i]['name']}\"{$selected}>{$config['load_balancer']['lbpool'][$i]['name']}</option>";
-					}
+					$selected = "";
+					if ( $config['load_balancer']['lbpool'][$i]['name'] == $pconfig['pool'] )
+						$selected = " SELECTED";
+					echo "<option value=\"{$config['load_balancer']['lbpool'][$i]['name']}\"{$selected}>{$config['load_balancer']['lbpool'][$i]['name']}</option>";
 				}
 			?>
 			</select>
                   </td>
 		</tr>
                 <tr align="left">
-		  <td width="22%" valign="top" class="vncellreq">Pool Down Server</td>
+		  <td width="22%" valign="top" class="vncellreq">Fall Back Pool</td>
                   <td width="78%" class="vtable" colspan="2">
                                 <select id="sitedown" name="sitedown">
                                 <option value=""<?="selected" ? $pconfig['sitedown'] == '' : ''?>>none</option>
             			<?php
             				for ($i = 0; isset($config['load_balancer']['lbpool'][$i]); $i++) {
-            					if ($config['load_balancer']['lbpool'][$i]['type'] == "server") {
-            						$selected = "";
-            						if ( $config['load_balancer']['lbpool'][$i]['name'] == $pconfig['sitedown'] )
-            							$selected = " SELECTED";
-            						echo "<option value=\"{$config['load_balancer']['lbpool'][$i]['name']}\"{$selected}>{$config['load_balancer']['lbpool'][$i]['name']}</option>";
-            					}
+            					$selected = "";
+            					if ( $config['load_balancer']['lbpool'][$i]['name'] == $pconfig['sitedown'] )
+            						$selected = " SELECTED";
+            					echo "<option value=\"{$config['load_balancer']['lbpool'][$i]['name']}\"{$selected}>{$config['load_balancer']['lbpool'][$i]['name']}</option>";
             				}
             			?>
             			</select>
@@ -190,7 +186,7 @@ include("head.inc");
 		</tr>
                 <tr align="left">
                   <td align="left" valign="bottom">
-			<input name="Submit" type="submit" class="formbtn" value="Submit">
+			<input name="Submit" type="submit" class="formbtn" value="Submit"><input type="button" class="formbtn" value="Cancel" onclick="history.back()">
 			<?php if (isset($id) && $a_vs[$id]): ?>
 			<input name="id" type="hidden" value="<?=$id;?>">
 			<?php endif; ?>
-- 
cgit v1.1