From fafe2a0d19ddf297ba27fc7cc85a6d2e604f4db5 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Fri, 4 Mar 2016 17:24:01 +0100 Subject: [PATCH] (legacy) refactor load_balancer_virtual_server.php --- src/www/load_balancer_virtual_server.php | 301 +++++++++++++---------- 1 file changed, 171 insertions(+), 130 deletions(-) diff --git a/src/www/load_balancer_virtual_server.php b/src/www/load_balancer_virtual_server.php index 7dcf4b1c3..7453fe9bb 100644 --- a/src/www/load_balancer_virtual_server.php +++ b/src/www/load_balancer_virtual_server.php @@ -1,30 +1,30 @@ . - All rights reserved. + Copyright (C) 2014-2016 Deciso B.V. + Copyright (C) 2005-2008 Bill Marquette . + All rights reserved. - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ require_once("guiconfig.inc"); @@ -37,143 +37,184 @@ require_once("interfaces.inc"); /* Cleanup relayd anchors that have been marked for cleanup. */ function cleanup_lb_marked() { - global $config; + global $config; - $filename = '/tmp/relayd_anchors_remove'; - $cleanup_anchors = array(); + $filename = '/tmp/relayd_anchors_remove'; + $cleanup_anchors = array(); - /* Nothing to do! */ - if (!file_exists($filename)) { - return; - } else { - $cleanup_anchors = explode("\n", file_get_contents($filename)); - /* Nothing to do! */ - if (empty($cleanup_anchors)) { - return; - } - } + /* Nothing to do! */ + if (!file_exists($filename)) { + return; + } else { + $cleanup_anchors = explode("\n", file_get_contents($filename)); + /* Nothing to do! */ + if (empty($cleanup_anchors)) { + return; + } + } - /* Load current names so we can make sure we don't remove an anchor that is still in use. */ - $vs_a = $config['load_balancer']['virtual_server']; - $active_vsnames = array(); - if (isset($vs_a)) { - foreach ($vs_a as $vs) { - $active_vsnames[] = $vs['name']; - } - } + /* Load current names so we can make sure we don't remove an anchor that is still in use. */ + $active_vsnames = array(); + if (isset($config['load_balancer']['virtual_server'])) { + foreach ($config['load_balancer']['virtual_server'] as $vs) { + $active_vsnames[] = $vs['name']; + } + } - foreach ($cleanup_anchors as $anchor) { - /* Only cleanup an anchor if it is not still active. */ - if (!in_array($anchor, $active_vsnames)) { - cleanup_lb_anchor($anchor); - } - } + foreach ($cleanup_anchors as $anchor) { + /* Only cleanup an anchor if it is not still active. */ + if (!in_array($anchor, $active_vsnames)) { + cleanup_lb_anchor($anchor); + } + } - @unlink($filename); + @unlink($filename); } -if (!is_array($config['load_balancer']['virtual_server'])) { - $config['load_balancer']['virtual_server'] = array(); +if (empty($config['load_balancer']['virtual_server']) || !is_array($config['load_balancer']['virtual_server'])) { + $config['load_balancer']['virtual_server'] = array(); } $a_vs = &$config['load_balancer']['virtual_server']; -if ($_POST) { - $pconfig = $_POST; - - if ($_POST['apply']) { - relayd_configure(); - filter_configure(); - $savemsg = get_std_save_message(); - /* Wipe out old relayd anchors no longer in use. */ - cleanup_lb_marked(); - clear_subsystem_dirty('loadbalancer'); - } -} - -if ($_GET['act'] == "del") { - if (array_key_exists($_GET['id'], $a_vs)) { - - if (!$input_errors) { - cleanup_lb_mark_anchor($a_vs[$_GET['id']]['name']); - unset($a_vs[$_GET['id']]); - write_config(); - mark_subsystem_dirty('loadbalancer'); - header("Location: load_balancer_virtual_server.php"); - exit; - } - } +if ($_SERVER['REQUEST_METHOD'] === 'POST') { + if (isset($_POST['act']) && $_POST['act'] == "del") { + if (isset($_POST['id']) && !empty($a_vs[$_POST['id']])){ + cleanup_lb_mark_anchor($a_vs[$_POST['id']]['name']); + unset($a_vs[$_POST['id']]); + write_config(); + mark_subsystem_dirty('loadbalancer'); + } + exit; + } elseif (!empty($_POST['apply'])) { + relayd_configure(); + filter_configure(); + /* Wipe out old relayd anchors no longer in use. */ + cleanup_lb_marked(); + clear_subsystem_dirty('loadbalancer'); + header("Location: load_balancer_virtual_server.php"); + exit; + } } /* Index lbpool array for easy hyperlinking */ $poodex = array(); for ($i = 0; isset($config['load_balancer']['lbpool'][$i]); $i++) { - $poodex[$config['load_balancer']['lbpool'][$i]['name']] = $i; -} -for ($i = 0; isset($config['load_balancer']['virtual_server'][$i]); $i++) { - if($a_vs[$i]) { - $a_vs[$i]['poolname'] = "{$a_vs[$i]['poolname']}"; - if ($a_vs[$i]['sitedown'] != '') { - $a_vs[$i]['sitedown'] = "{$a_vs[$i]['sitedown']}"; - } else { - $a_vs[$i]['sitedown'] = 'none'; - } - } + $poodex[$config['load_balancer']['lbpool'][$i]['name']] = $i; } + $service_hook = 'relayd'; include("head.inc"); - +legacy_html_escape_form_data($a_vs); $main_buttons = array( - array('label'=>gettext('Add'), 'href'=>'load_balancer_virtual_server_edit.php'), + array('label'=>gettext('Add'), 'href'=>'load_balancer_virtual_server_edit.php'), ); - ?> + -
-
-
- - 0) print_input_errors($input_errors); ?> - -
- " . gettext("You must apply the changes in order for them to take effect."));?>
- - -
- -
-
- -
- - edit_uri('load_balancer_virtual_server_edit.php'); - $t->my_uri('load_balancer_virtual_server.php'); - $t->add_column(gettext('Name'),'name',10); - $t->add_column(gettext('Protocol'),'relay_protocol',10); - $t->add_column(gettext('IP Address'),'ipaddr',10); - $t->add_column(gettext('Port'),'port',10); - $t->add_column(gettext('Pool'),'poolname',10); - $t->add_column(gettext('Fall Back Pool'),'sitedown',15); - $t->add_column(gettext('Description'),'descr',25); - $t->add_button('edit'); - $t->add_button('dup'); - $t->add_button('del'); - $t->add_content_array($a_vs); - $t->display(); - ?> -
-
-
-
-
-
-
+
+
+
+
+ " . gettext("You must apply the changes in order for them to take effect."));?>
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + "> + + +
+
+
+
+
+
+
+