From a9c6f68a30f780a5ffc5c60374c7f4d8edea4dc8 Mon Sep 17 00:00:00 2001 From: Bill Marquette Date: Sat, 6 Aug 2005 22:13:11 +0000 Subject: Fixes - moved to lbpool instead of pool as we had a small listtags conflict --- usr/local/www/load_balancer_pool.php | 6 +++--- usr/local/www/load_balancer_pool_edit.php | 10 +++++----- usr/local/www/load_balancer_virtual_server.php | 17 ++++------------- usr/local/www/load_balancer_virtual_server_edit.php | 11 +++-------- 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/usr/local/www/load_balancer_pool.php b/usr/local/www/load_balancer_pool.php index 8085250..bef38b9 100755 --- a/usr/local/www/load_balancer_pool.php +++ b/usr/local/www/load_balancer_pool.php @@ -32,10 +32,10 @@ require("guiconfig.inc"); -if (!is_array($config['load_balancer']['pool'])) { - $config['load_balancer']['pool'] = array(); +if (!is_array($config['load_balancer']['lbpool'])) { + $config['load_balancer']['lbpool'] = array(); } -$a_pool = &$config['load_balancer']['pool']; +$a_pool = &$config['load_balancer']['lbpool']; if ($_POST) { $pconfig = $_POST; diff --git a/usr/local/www/load_balancer_pool_edit.php b/usr/local/www/load_balancer_pool_edit.php index 9fadbc3..5f420d2 100755 --- a/usr/local/www/load_balancer_pool_edit.php +++ b/usr/local/www/load_balancer_pool_edit.php @@ -31,10 +31,10 @@ */ require("guiconfig.inc"); -if (!is_array($config['load_balancer']['pool'])) { - $config['load_balancer']['pool'] = array(); +if (!is_array($config['load_balancer']['lbpool'])) { + $config['load_balancer']['lbpool'] = array(); } -$a_pool = &$config['load_balancer']['pool']; +$a_pool = &$config['load_balancer']['lbpool']; if (isset($_POST['id'])) $id = $_POST['id']; @@ -60,8 +60,8 @@ if ($_POST) { do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); /* Ensure that our pool names are unique */ - for ($i=0; isset($config['load_balancer']['pool'][$i]); $i++) - if (($_POST['name'] == $config['load_balancer']['pool'][$i]['name']) && ($i != $id)) + for ($i=0; isset($config['load_balancer']['lbpool'][$i]); $i++) + if (($_POST['name'] == $config['load_balancer']['lbpool'][$i]['name']) && ($i != $id)) $input_errors[] = "This pool name has already been used. Pool names must be unique."; if (!$input_errors) { diff --git a/usr/local/www/load_balancer_virtual_server.php b/usr/local/www/load_balancer_virtual_server.php index 6b5a910..64c6963 100755 --- a/usr/local/www/load_balancer_virtual_server.php +++ b/usr/local/www/load_balancer_virtual_server.php @@ -54,21 +54,12 @@ if ($_POST) { if ($_GET['act'] == "del") { if ($a_vs[$_GET['id']]) { - /* make sure no inbound NAT mappings reference this entry */ - if (is_array($config['nat']['rule'])) { - foreach ($config['nat']['rule'] as $rule) { - if ($rule['external-address'] == $a_vs[$_GET['id']]['ipaddr']) { - $input_errors[] = "This entry cannot be deleted because it is still referenced by at least one NAT mapping."; - break; - } - } - } if (!$input_errors) { unset($a_vs[$_GET['id']]); write_config(); touch($d_vsconfdirty_path); - header("Location: firewall_virtual_ip.php"); + header("Location: load_balancer_virtual_server.php"); exit; } } @@ -81,11 +72,11 @@ include("head.inc");

-You must apply the changes in order for them to take effect.");?>
+You must apply the changes in order for them to take effect.");?>
diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php index 8272fc6..417a16c 100755 --- a/usr/local/www/load_balancer_virtual_server_edit.php +++ b/usr/local/www/load_balancer_virtual_server_edit.php @@ -58,11 +58,6 @@ if ($_POST) { do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); - /* Ensure that our pool names are unique */ - for ($i=0; isset($config['load_balancer']['pool'][$i]); $i++) - if (($_POST['name'] == $config['load_balancer']['pool'][$i]['name']) && ($i != $id)) - $input_errors[] = "This pool name has already been used. Pool names must be unique."; - if (!$input_errors) { $vsent = array(); @@ -120,10 +115,10 @@ include("head.inc");

@@ -125,7 +116,7 @@ include("head.inc"); - +

Virtual Server Pool - {$config['load_balancer']['pool'][$i]['name']}"; + for ($i = 0; isset($config['load_balancer']['lbpool'][$i]); $i++) { + echo ""; } ?> -- cgit v1.1