Skip to content

O
OpnSense
Commit 2faeb8e8 authored by Ad Schellevis's avatar Ad Schellevis Committed by Franco Fichtner
Browse files
Options

(legacy) refactor load_balancer_virtual_server.php 

(cherry picked from commit fafe2a0d)
parent 8cd37c6f
Show whitespace changes
Inline Side-by-side
Showing with 180 additions and 139 deletions
src/www/load_balancer_virtual_server.php
View file @ 2faeb8e8
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2005-2008 Bill Marquette <bill.marquette@gmail.com>. Copyright (C) 2005-2008 Bill Marquette <bill.marquette@gmail.com>.
All rights reserved. All rights reserved.
...@@ -54,10 +54,9 @@ function cleanup_lb_marked() ...@@ -54,10 +54,9 @@ function cleanup_lb_marked()
} }
/* Load current names so we can make sure we don't remove an anchor that is still in use. */ /* 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(); $active_vsnames = array();
if (isset($vs_a)) { if (isset($config['load_balancer']['virtual_server'])) {
foreach ($vs_a as $vs) { foreach ($config['load_balancer']['virtual_server'] as $vs) {
$active_vsnames[] = $vs['name']; $active_vsnames[] = $vs['name'];
} }
} }
...@@ -73,36 +72,29 @@ function cleanup_lb_marked() ...@@ -73,36 +72,29 @@ function cleanup_lb_marked()
} }
if (!is_array($config['load_balancer']['virtual_server'])) { if (empty($config['load_balancer']['virtual_server']) || !is_array($config['load_balancer']['virtual_server'])) {
$config['load_balancer']['virtual_server'] = array(); $config['load_balancer']['virtual_server'] = array();
} }
$a_vs = &$config['load_balancer']['virtual_server']; $a_vs = &$config['load_balancer']['virtual_server'];
if ($_POST) { if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$pconfig = $_POST; if (isset($_POST['act']) && $_POST['act'] == "del") {
if (isset($_POST['id']) && !empty($a_vs[$_POST['id']])){
if ($_POST['apply']) { 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(); relayd_configure();
filter_configure(); filter_configure();
$savemsg = get_std_save_message();
/* Wipe out old relayd anchors no longer in use. */ /* Wipe out old relayd anchors no longer in use. */
cleanup_lb_marked(); cleanup_lb_marked();
clear_subsystem_dirty('loadbalancer'); 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"); header("Location: load_balancer_virtual_server.php");
exit; exit;
} }
}
} }
/* Index lbpool array for easy hyperlinking */ /* Index lbpool array for easy hyperlinking */
...@@ -110,64 +102,113 @@ $poodex = array(); ...@@ -110,64 +102,113 @@ $poodex = array();
for ($i = 0; isset($config['load_balancer']['lbpool'][$i]); $i++) { for ($i = 0; isset($config['load_balancer']['lbpool'][$i]); $i++) {
$poodex[$config['load_balancer']['lbpool'][$i]['name']] = $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 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 {
$a_vs[$i]['sitedown'] = 'none';
}
}
}
$service_hook = 'relayd'; $service_hook = 'relayd';
include("head.inc"); include("head.inc");
legacy_html_escape_form_data($a_vs);
$main_buttons = array( $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'),
); );
?> ?>
<body> <body>
<script type="text/javascript">
$( document ).ready(function() {
// delete host action
$(".act_delete").click(function(event){
event.preventDefault();
var id = $(this).data("id");
// delete single
BootstrapDialog.show({
type:BootstrapDialog.TYPE_DANGER,
title: "<?= gettext("Load Balancer: Virtual Server Setup");?>",
message: "<?=gettext("Do you really want to delete this entry?");?>",
buttons: [{
label: "<?= gettext("No");?>",
action: function(dialogRef) {
dialogRef.close();
}}, {
label: "<?= gettext("Yes");?>",
action: function(dialogRef) {
$.post(window.location, {act: 'del', id:id}, function(data) {
location.reload();
});
}
}]
});
});
});
//]]>
</script>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<?php if (isset($savemsg)) print_info_box($savemsg); ?>
<?php if (is_subsystem_dirty('loadbalancer')): ?><br/> <?php if (is_subsystem_dirty('loadbalancer')): ?><br/>
<?php print_info_box_apply(gettext("The virtual server configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br /> <?php print_info_box_apply(gettext("The virtual server configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />
<?php endif; ?> <?php endif; ?>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<form action="load_balancer_virtual_server.php" method="post" name="iform" id="iform"> <form method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped">
<?php <thead>
$t = new MainTable(); <tr>
$t->edit_uri('load_balancer_virtual_server_edit.php'); <th><?=gettext("Name");?></th>
$t->my_uri('load_balancer_virtual_server.php'); <th><?=gettext("Protocol");?></th>
$t->add_column(gettext('Name'),'name',10); <th><?=gettext("IP Address");?></th>
$t->add_column(gettext('Protocol'),'relay_protocol',10); <th><?=gettext('Port');?></th>
$t->add_column(gettext('IP Address'),'ipaddr',10); <th><?=gettext('Pool');?></th>
$t->add_column(gettext('Port'),'port',10); <th><?=gettext('Fall Back Pool');?></th>
$t->add_column(gettext('Pool'),'poolname',10); <th><?=gettext("Description");?></th>
$t->add_column(gettext('Fall Back Pool'),'sitedown',15); <th></th>
$t->add_column(gettext('Description'),'descr',25); </tr>
$t->add_button('edit'); </thead>
$t->add_button('dup'); <tbody>
$t->add_button('del'); <?php
$t->add_content_array($a_vs); $i=0;
$t->display(); foreach ($a_vs as $vs):?>
?> <tr>
<td><?=$vs['name'];?></td>
<td><?=$vs['relay_protocol'];?></td>
<td><?=$vs['ipaddr'];?></td>
<td><?=$vs['port'];?></td>
<td>
<a href="load_balancer_pool_edit.php?id=<?=$poodex[$vs['poolname']];?>">
<?=$vs['poolname'];?>
</a>
<td>
<?php
if(!empty($vs['sitedown'])):?>
<a href="load_balancer_pool_edit.php?id=<?=$poodex[$vs['sitedown']];?>">
<?=$vs['sitedown'];?>
</a>
<?php
else:?>
<?=gettext("none");?>
<?php
endif;?>
<td><?=$vs['descr'];?></td>
<td>
<a href="load_balancer_virtual_server_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a data-id="<?=$i;?>" class="act_delete btn btn-default btn-xs">
<span class="fa fa-trash text-muted"></span>
</a>
<a href="load_balancer_virtual_server_edit.php?act=dup&id=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=gettext("clone rule");?>">
<span class="fa fa-clone text-muted"></span>
</a>
</td>
</tr>
<?php
++$i;
endforeach;?>
</tbody>
</table>
</div> </div>
</form> </form>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023