diff options
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/load_balancer_monitor.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/load_balancer_pool.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/load_balancer_pool_edit.php | 4 | ||||
| -rwxr-xr-x | usr/local/www/load_balancer_relay_action.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/load_balancer_relay_protocol.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/load_balancer_virtual_server.php | 4 | ||||
| -rwxr-xr-x | usr/local/www/load_balancer_virtual_server_edit.php | 6 |
7 files changed, 11 insertions, 11 deletions
diff --git a/usr/local/www/load_balancer_monitor.php b/usr/local/www/load_balancer_monitor.php index 0f2bddb..03d3103 100755 --- a/usr/local/www/load_balancer_monitor.php +++ b/usr/local/www/load_balancer_monitor.php @@ -67,7 +67,7 @@ if ($_GET['act'] == "del") { if ($a_monitor[$_GET['id']]) { /* make sure no pools reference this entry */ if (is_array($config['load_balancer']['lbpool'])) { - foreach ($config['load_balancer']['pool'] as $pool) { + foreach ($config['load_balancer']['lbpool'] as $pool) { if ($pool['monitor'] == $a_monitor[$_GET['id']]['name']) { $input_errors[] = gettext("This entry cannot be deleted because it is still referenced by at least one pool."); break; diff --git a/usr/local/www/load_balancer_pool.php b/usr/local/www/load_balancer_pool.php index 584d184..0c57359 100755 --- a/usr/local/www/load_balancer_pool.php +++ b/usr/local/www/load_balancer_pool.php @@ -68,7 +68,7 @@ if ($_GET['act'] == "del") { /* make sure no virtual servers reference this entry */ if (is_array($config['load_balancer']['virtual_server'])) { foreach ($config['load_balancer']['virtual_server'] as $vs) { - if ($vs['pool'] == $a_pool[$_GET['id']]['name']) { + if ($vs['poolname'] == $a_pool[$_GET['id']]['name']) { $input_errors[] = gettext("This entry cannot be deleted because it is still referenced by at least one virtual server."); break; } diff --git a/usr/local/www/load_balancer_pool_edit.php b/usr/local/www/load_balancer_pool_edit.php index 252c13b..32b2e4f 100755 --- a/usr/local/www/load_balancer_pool_edit.php +++ b/usr/local/www/load_balancer_pool_edit.php @@ -138,8 +138,8 @@ if ($_POST) { if (isset($id) && $a_pool[$id]) { /* modify all virtual servers with this name */ for ($i = 0; isset($config['load_balancer']['virtual_server'][$i]); $i++) { - if ($config['load_balancer']['virtual_server'][$i]['pool'] == $a_pool[$id]['name']) - $config['load_balancer']['virtual_server'][$i]['pool'] = $poolent['name']; + if ($config['load_balancer']['virtual_server'][$i]['lbpool'] == $a_pool[$id]['name']) + $config['load_balancer']['virtual_server'][$i]['lbpool'] = $poolent['name']; } $a_pool[$id] = $poolent; } else diff --git a/usr/local/www/load_balancer_relay_action.php b/usr/local/www/load_balancer_relay_action.php index ce853ca..c7d8120 100755 --- a/usr/local/www/load_balancer_relay_action.php +++ b/usr/local/www/load_balancer_relay_action.php @@ -92,7 +92,7 @@ if ($_GET['act'] == "del") { /* for ($i = 0; isset($config['load_balancer']['lbprotocol'][$i]); $i++) { for ($o = 0; isset($config['load_balancer']['lbprotocol'][$i]['options'][$o]); o++) { $a_vs[$i]['options'][$o] = " - $a_vs[$i]['pool'] = "<a href=\"/load_balancer_pool_edit.php?id={$poodex[$a_vs[$i]['pool']]}\">{$a_vs[$i]['pool']}</a>"; + $a_vs[$i]['poolname'] = "<a href=\"/load_balancer_pool_edit.php?id={$poodex[$a_vs[$i]['poolname']]}\">{$a_vs[$i]['poolname']}</a>"; if ($a_vs[$i]['sitedown'] != '') { $a_vs[$i]['sitedown'] = "<a href=\"/load_balancer_pool_edit.php?id={$poodex[$a_vs[$i]['sitedown']]}\">{$a_vs[$i]['sitedown']}</a>"; } else { diff --git a/usr/local/www/load_balancer_relay_protocol.php b/usr/local/www/load_balancer_relay_protocol.php index b25c840..e531c80 100755 --- a/usr/local/www/load_balancer_relay_protocol.php +++ b/usr/local/www/load_balancer_relay_protocol.php @@ -88,7 +88,7 @@ if ($_GET['act'] == "del") { /* for ($i = 0; isset($config['load_balancer']['lbprotocol'][$i]); $i++) { for ($o = 0; isset($config['load_balancer']['lbprotocol'][$i]['options'][$o]); o++) { $a_vs[$i]['options'][$o] = " - $a_vs[$i]['pool'] = "<a href=\"/load_balancer_pool_edit.php?id={$poodex[$a_vs[$i]['pool']]}\">{$a_vs[$i]['pool']}</a>"; + $a_vs[$i]['poolname'] = "<a href=\"/load_balancer_pool_edit.php?id={$poodex[$a_vs[$i]['poolname']]}\">{$a_vs[$i]['poolname']}</a>"; if ($a_vs[$i]['sitedown'] != '') { $a_vs[$i]['sitedown'] = "<a href=\"/load_balancer_pool_edit.php?id={$poodex[$a_vs[$i]['sitedown']]}\">{$a_vs[$i]['sitedown']}</a>"; } else { diff --git a/usr/local/www/load_balancer_virtual_server.php b/usr/local/www/load_balancer_virtual_server.php index 6ed11d4..a3f21b5 100755 --- a/usr/local/www/load_balancer_virtual_server.php +++ b/usr/local/www/load_balancer_virtual_server.php @@ -82,7 +82,7 @@ for ($i = 0; isset($config['load_balancer']['lbpool'][$i]); $i++) { } for ($i = 0; isset($config['load_balancer']['virtual_server'][$i]); $i++) { if($a_vs[$i]) { - $a_vs[$i]['pool'] = "<a href=\"/load_balancer_pool_edit.php?id={$poodex[$a_vs[$i]['pool']]}\">{$a_vs[$i]['pool']}</a>"; + $a_vs[$i]['poolname'] = "<a href=\"/load_balancer_pool_edit.php?id={$poodex[$a_vs[$i]['poolname']]}\">{$a_vs[$i]['poolname']}</a>"; if ($a_vs[$i]['sitedown'] != '') { $a_vs[$i]['sitedown'] = "<a href=\"/load_balancer_pool_edit.php?id={$poodex[$a_vs[$i]['sitedown']]}\">{$a_vs[$i]['sitedown']}</a>"; } else { @@ -128,7 +128,7 @@ include("head.inc"); $t->add_column(gettext('Protocol'),'relay_protocol',10); $t->add_column(gettext('IP Address'),'ipaddr',15); $t->add_column(gettext('Port'),'port',10); - $t->add_column(gettext('Pool'),'pool',15); + $t->add_column(gettext('Pool'),'poolname',15); $t->add_column(gettext('Fall Back Pool'),'sitedown',15); $t->add_column(gettext('Description'),'descr',30); $t->add_button('edit'); diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php index 01b0ef3..554bf36 100755 --- a/usr/local/www/load_balancer_virtual_server_edit.php +++ b/usr/local/www/load_balancer_virtual_server_edit.php @@ -107,7 +107,7 @@ if ($_POST) { update_if_changed("name", $vsent['name'], $_POST['name']); update_if_changed("descr", $vsent['descr'], $_POST['descr']); - update_if_changed("pool", $vsent['pool'], $_POST['pool']); + update_if_changed("poolname", $vsent['poolname'], $_POST['poolname']); update_if_changed("port", $vsent['port'], $_POST['port']); update_if_changed("sitedown", $vsent['sitedown'], $_POST['sitedown']); update_if_changed("ipaddr", $vsent['ipaddr'], $_POST['ipaddr']); @@ -198,11 +198,11 @@ include("head.inc"); <?php if(count($config['load_balancer']['lbpool']) == 0): ?> <b><?=gettext("NOTE:"); ?></b> <?=gettext("Please add a pool on the Pools tab to use this feature."); ?> <?php else: ?> - <select id="pool" name="pool"> + <select id="poolname" name="poolname"> <?php for ($i = 0; isset($config['load_balancer']['lbpool'][$i]); $i++) { $selected = ""; - if ( $config['load_balancer']['lbpool'][$i]['name'] == $pconfig['pool'] ) + if ( $config['load_balancer']['lbpool'][$i]['name'] == $pconfig['poolname'] ) $selected = " SELECTED"; echo "<option value=\"{$config['load_balancer']['lbpool'][$i]['name']}\"{$selected}>{$config['load_balancer']['lbpool'][$i]['name']}</option>"; } |
