Skip to content

O
OpnSense
Commit 1e3b92e9 authored by Ad Schellevis's avatar Ad Schellevis
Browse files
Options

(legacy) refactor system_routes.php

parent 48acede9
Hide whitespace changes
Inline Side-by-side
Showing with 259 additions and 322 deletions
src/www/system_routes.php
View file @ 1e3b92e9
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, 1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer. this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 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 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
require_once("guiconfig.inc"); require_once("guiconfig.inc");
...@@ -34,44 +34,6 @@ require_once("system.inc"); ...@@ -34,44 +34,6 @@ require_once("system.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("rrd.inc"); require_once("rrd.inc");
if (!is_array($config['staticroutes'])) {
$config['staticroutes'] = array();
}
if (!is_array($config['staticroutes']['route'])) {
$config['staticroutes']['route'] = array();
}
$a_routes = &$config['staticroutes']['route'];
$a_gateways = return_gateways_array(true, true, true);
if ($_POST) {
$pconfig = $_POST;
if ($_POST['apply']) {
$retval = 0;
if (file_exists('/tmp/.system_routes.apply')) {
$toapplylist = unserialize(file_get_contents('/tmp/.system_routes.apply'));
foreach ($toapplylist as $toapply) {
mwexec("{$toapply}");
}
@unlink('/tmp/.system_routes.apply');
}
$retval = system_routing_configure();
$retval |= filter_configure();
/* reconfigure our gateway monitor */
setup_gateways_monitor();
$savemsg = get_std_save_message();
if ($retval == 0) {
clear_subsystem_dirty('staticroutes');
}
}
}
function delete_static_route($id) function delete_static_route($id)
{ {
global $config, $a_routes; global $config, $a_routes;
...@@ -105,296 +67,271 @@ function delete_static_route($id) ...@@ -105,296 +67,271 @@ function delete_static_route($id)
unset($targets); unset($targets);
} }
if ($_GET['act'] == "del") { if (!isset($config['staticroutes']['route']) || !is_array($config['staticroutes']['route'])) {
if ($a_routes[$_GET['id']]) { $a_routes = array();
delete_static_route($_GET['id']); } else {
unset($a_routes[$_GET['id']]); $a_routes = &$config['staticroutes']['route'];
write_config();
header("Location: system_routes.php");
exit;
}
} }
if (isset($_POST['del_x'])) { if ($_SERVER['REQUEST_METHOD'] === 'POST') {
/* delete selected routes */ $pconfig = $_POST;
if (is_array($_POST['route']) && count($_POST['route'])) { if (isset($_POST['id']) && isset($a_routes[$_POST['id']])) {
foreach ($_POST['route'] as $routei) { $id = $_POST['id'];
delete_static_route($routei);
unset($a_routes[$routei]);
}
write_config();
header("Location: system_routes.php");
exit;
}
} elseif ($_GET['act'] == "toggle") {
if ($a_routes[$_GET['id']]) {
if (isset($a_routes[$_GET['id']]['disabled'])) {
unset($a_routes[$_GET['id']]['disabled']);
} else {
delete_static_route($_GET['id']);
$a_routes[$_GET['id']]['disabled'] = true;
}
write_config();
mark_subsystem_dirty('staticroutes');
header("Location: system_routes.php");
exit;
} }
} else { if (!empty($_POST['act'])) {
/* yuck - IE won't send value attributes for image buttons, while Mozilla does - so we use .x/.y to find move button clicks instead... */ $act = $_POST['act'];
unset($movebtn); } else {
foreach ($_POST as $pn => $pd) { $act = null;
if (preg_match("/move_(\d+)_x/", $pn, $matches)) {
$movebtn = $matches[1];
break;
}
} }
/* move selected routes before this route */
if (isset($movebtn) && is_array($_POST['route']) && count($_POST['route'])) {
$a_routes_new = array();
/* copy all routes < $movebtn and not selected */ if (!empty($pconfig['apply'])) {
for ($i = 0; $i < $movebtn; $i++) { // todo: remove this ugly hook
if (!in_array($i, $_POST['route'])) { if (file_exists('/tmp/.system_routes.apply')) {
$a_routes_new[] = $a_routes[$i]; $toapplylist = unserialize(file_get_contents('/tmp/.system_routes.apply'));
foreach ($toapplylist as $toapply) {
mwexec("{$toapply}");
} }
@unlink('/tmp/.system_routes.apply');
} }
/* copy all selected routes */ $retval = system_routing_configure();
for ($i = 0; $i < count($a_routes); $i++) { $retval |= filter_configure();
if ($i == $movebtn) { /* reconfigure our gateway monitor */
continue; setup_gateways_monitor();
}
if (in_array($i, $_POST['route'])) {
$a_routes_new[] = $a_routes[$i];
}
}
/* copy $movebtn route */ if ($retval == 0) {
if ($movebtn < count($a_routes)) { clear_subsystem_dirty('staticroutes');
$a_routes_new[] = $a_routes[$movebtn];
} }
} elseif (isset($id) && $act == 'del') {
/* copy all routes > $movebtn and not selected */ delete_static_route($id);
for ($i = $movebtn+1; $i < count($a_routes); $i++) { unset($a_routes[$id]);
if (!in_array($i, $_POST['route'])) { write_config();
$a_routes_new[] = $a_routes[$i]; } elseif ($act == 'del_x' && isset($pconfig['route'])) {
/* delete selected routes */
if (is_array($pconfig['route'])) {
foreach ($_POST['route'] as $routei) {
delete_static_route($routei);
unset($a_routes[$routei]);
} }
write_config();
} }
if (count($a_routes_new) > 0) { } elseif (isset($id) && $act == "toggle") {
$a_routes = $a_routes_new; if (isset($a_routes[$id]['disabled'])) {
unset($a_routes[$id]['disabled']);
} else {
delete_static_route($id);
$a_routes[$id]['disabled'] = true;
} }
if (write_config()) { write_config();
mark_subsystem_dirty('staticroutes'); mark_subsystem_dirty('staticroutes');
} } elseif ( $act == 'move' && isset($pconfig['route']) && count($pconfig['route']) > 0) {
header("Location: system_routes.php"); // move selected rules
exit; if (!isset($id)) {
} // if rule not set/found, move to end
$id = count($a_routes);
}
$a_routes = legacy_move_config_list_items($a_routes, $id, $pconfig['route']);
if (write_config()) {
mark_subsystem_dirty('staticroutes');
}
}
header("Location: system_routes.php");
exit;
} }
$a_gateways = return_gateways_array(true, true, true);
legacy_html_escape_form_data($a_routes);
legacy_html_escape_form_data($a_gateways);
$pgtitle = array(gettext('System'), gettext('Routes')); $pgtitle = array(gettext('System'), gettext('Routes'));
$shortcut_section = "routing"; $shortcut_section = "routing";
include("head.inc");
$main_buttons = array( $main_buttons = array(
array('label'=> gettext('Add route'), 'href'=>'system_routes_edit.php'), array('label'=> gettext('Add route'), 'href'=>'system_routes_edit.php'),
); );
include("head.inc");
?> ?>
<script type="text/javascript">
$( document ).ready(function() {
// link remove route
$(".act-del-route").click(function(event){
var id = $(this).data('id');
event.preventDefault();
BootstrapDialog.show({
type:BootstrapDialog.TYPE_INFO,
title: "<?= gettext("Route");?>",
message: '<?=gettext("Do you really want to delete this route?");?>',
buttons: [{
label: "<?= gettext("No");?>",
action: function(dialogRef) {
dialogRef.close();
}}, {
label: "<?= gettext("Yes");?>",
action: function(dialogRef) {
$("#id").val(id);
$("#act").val("del");
$("#iform").submit();
}
}]
});
});
// link remove list of routes
$("#del_x").click(function(event){
event.preventDefault();
BootstrapDialog.show({
type:BootstrapDialog.TYPE_INFO,
title: "<?= gettext("Route");?>",
message: '<?=gettext("Do you really want to delete the selected routes?");?>',
buttons: [{
label: "<?= gettext("No");?>",
action: function(dialogRef) {
dialogRef.close();
}}, {
label: "<?= gettext("Yes");?>",
action: function(dialogRef) {
$("#id").val(id);
$("#act").val("del_x");
$("#iform").submit();
}
}]
});
});
// link toggle buttons
$(".act_toggle").click(function(event){
event.preventDefault();
var id = $(this).data("id");
$("#id").val(id);
$("#act").val("toggle");
$("#iform").submit();
});
// link move buttons
$(".act_move").click(function(){
var id = $(this).data("id");
$("#id").val(id);
$("#act").val("move");
$("#iform").submit();
});
});
</script>
<body> <body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<script type="text/javascript" src="/javascript/row_toggle.js"></script> <section class="page-content-main">
<div class="container-fluid">
<section class="page-content-main"> <div class="row">
<div class="container-fluid"> <?php
<div class="row"> if (is_subsystem_dirty('staticroutes')):?><p>
<?php print_info_box_apply(sprintf(gettext("The static route configuration has been changed.%sYou must apply the changes in order for them to take effect."), "<br />"));?><br /></p>
<?php if (isset($savemsg)) { <?php
print_info_box($savemsg);
} ?>
<?php if (is_subsystem_dirty('staticroutes')) :
?><p>
<?php print_info_box_apply(sprintf(gettext("The static route configuration has been changed.%sYou must apply the changes in order for them to take effect."), "<br />"));?><br /></p>
<?php
endif; ?> endif; ?>
<section class="col-xs-12">
<div class="tab-content content-box col-xs-12">
<form action="system_routes.php" method="post" name="iform" id="iform">
<input type="hidden" id="act" name="act" value="" />
<input type="hidden" id="id" name="id" value="" />
<div class="table-responsive">
<table class="table table-striped table-sort">
<tr>
<td></td>
<td></td>
<td><?=gettext("Network");?></td>
<td><?=gettext("Gateway");?></td>
<td><?=gettext("Interface");?></td>
<td><?=gettext("Description");?></td>
<td></td>
</tr>
<?php
$i = 0;
foreach ($a_routes as $route) :?>
<tr class="<?=isset($route['disabled']) ? "text-muted" : "";?>">
<td>
<input type="checkbox" name="route[]" value="<?=$i;?>"/>
</td>
<td>
<a href="#" class="act_toggle" data-id="<?=$i;?>">
<span class="glyphicon glyphicon-play <?=isset($route['disabled']) ? "text-muted" : "text-success" ;?>"
title="<?=gettext("click to toggle enabled/disabled status");?>" alt="icon">
</span>
</a>
</td>
<td>
<?=strtolower($route['network']);?>
</td>
<td>
<?=$a_gateways[$route['gateway']]['name'] . " - " . $a_gateways[$route['gateway']]['gateway'];?>
</td>
<td>
<?=convert_friendly_interface_to_friendly_descr($a_gateways[$route['gateway']]['friendlyiface']);?>
</td>
<td>
<?=$route['descr'];?>
</td>
<td>
<a data-id="<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span>
</a>
<a class="btn btn-default btn-xs" href="system_routes_edit.php?id=<?=$i;?>">
<span class="glyphicon glyphicon-pencil" title="<?=gettext("edit rule");?>" alt="edit"></span>
</a>
<button type="button" class="btn btn-default btn-xs act-del-route"
data-id="<?=$i?>" title="<?=gettext("delete route");?>" data-toggle="tooltip"
data-placement="left" ><span class="glyphicon glyphicon-remove"></span>
</button>
<a class="btn btn-default btn-xs" href="system_routes_edit.php?dup=<?=$i;?>">
<span class="glyphicon glyphicon-plus" title="<?=gettext("add a new rule based on this one");?>" alt="duplicate"></span>
</a>
</td>
</tr>
<section class="col-xs-12"> <?php
$i++;
<div class="tab-content content-box col-xs-12"> endforeach; ?>
<tr>
<form action="system_routes.php" method="post" name="iform" id="iform"> <td colspan="6"></td>
<td>
<?php
<div class="table-responsive"> if ($i == 0) :?>
<table class="table table-striped table-sort"> <span class="glyphicon glyphicon-arrow-left text-muted"
title="<?=gettext("move selected routes to end");?>" alt="move" />
<tr id="frheader"> <?php
<td width="2%" class="list">&nbsp;</td> else :?>
<td width="2%" class="list">&nbsp;</td> <button type="submit" data-id="<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules to end");?>" class="act_move btn btn-default btn-xs">
<td width="22%" class="listhdrr"><?=gettext("Network");?></td> <span class="glyphicon glyphicon-arrow-left"></span>
<td width="20%" class="listhdrr"><?=gettext("Gateway");?></td> </button>
<td width="15%" class="listhdrr"><?=gettext("Interface");?></td> <?php
<td width="29%" class="listhdr"><?=gettext("Description");?></td> endif;?>
<td width="10%" class="list"> <a href="system_routes_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
<?php
</td> if ($i == 0) :?>
</tr>
<?php $i = 0; foreach ($a_routes as $route) :
?>
<tr valign="top" id="fr<?=$i;?>">
<?php
$iconfn = "glyphicon glyphicon-play text-success";
if (isset($route['disabled'])) {
$textss = "<span class=\"gray\">";
$textse = "</span>";
$iconfn .= "glyphicon glyphicon-play text-muted";
} else {
$textss = $textse = "";
}
?>
<td class="listt">
<input type="checkbox" id="frc<?=$i;
?>" name="route[]" value="<?=$i;
?>" onclick="fr_bgcolor('<?=$i;?>')" />
</td>
<td class="listt" align="center">
<a href="?act=toggle&amp;id=<?=$i;?>">
<span class="<?=$iconfn;
?>" title="<?=gettext("click to toggle enabled/disabled status");?>" alt="icon"></span>
</a>
</td>
<td class="listlr" onclick="fr_toggle(<?=$i;
?>)" id="frd<?=$i;
?>" ondblclick="document.location='system_routes_edit.php?id=<?=$i;?>';">
<?=$textss;
?><?=strtolower($route['network']);
?><?=$textse;?>
</td>
<td class="listr" onclick="fr_toggle(<?=$i;
?>)" id="frd<?=$i;
?>" ondblclick="document.location='system_routes_edit.php?id=<?=$i;?>';">
<?=$textss;?>
<?php
echo htmlentities($a_gateways[$route['gateway']]['name']) . " - " . htmlentities($a_gateways[$route['gateway']]['gateway']);
?>
<?=$textse;?>
</td>
<td class="listr" onclick="fr_toggle(<?=$i;
?>)" id="frd<?=$i;
?>" ondblclick="document.location='system_routes_edit.php?id=<?=$i;?>';">
<?=$textss;?>
<?php
echo convert_friendly_interface_to_friendly_descr($a_gateways[$route['gateway']]['friendlyiface']) . " ";
?>
<?=$textse;?>
</td>
<td class="listbg" onclick="fr_toggle(<?=$i;
?>)" ondblclick="document.location='system_routes_edit.php?id=<?=$i;?>';">
<?=$textss;
?><?=htmlspecialchars($route['descr']);
?>&nbsp;<?=$textse;?>
</td>
<td class="list nowrap" valign="middle">
<table border="0" cellspacing="0" cellpadding="1" summary="move">
<tr>
<td align="center" valign="middle">
<button onmouseover="fr_insline(<?=$i;
?>, true)" onmouseout="fr_insline(<?=$i;
?>, false)" name="move_<?=$i;?>"
class="btn btn-default btn-xs"
title="<?=gettext("move selected rules before this rule");?>"
type="submit"><span class="glyphicon glyphicon-arrow-left"></span></button>
</td>
<td>
<a class="btn btn-default btn-xs" href="system_routes_edit.php?id=<?=$i;?>">
<span class="glyphicon glyphicon-pencil" title="<?=gettext("edit rule");?>" alt="edit"></span>
</a>
</td>
</tr>
<tr>
<td align="center" valign="middle">
<a class="btn btn-default btn-xs" href="system_routes.php?act=del&amp;id=<?=$i;
?>" onclick="return confirm('<?=gettext("Do you really want to delete this rule?");?>')">
<span class="glyphicon glyphicon-remove" title="<?=gettext("delete rule");?>" alt="delete"></span>
</a>
</td>
<td>
<a class="btn btn-default btn-xs" href="system_routes_edit.php?dup=<?=$i;?>">
<span class="glyphicon glyphicon-plus" title="<?=gettext("add a new rule based on this one");?>" alt="duplicate"></span>
</a>
</td>
</tr>
</table>
</td>
</tr>
<?php $i++;
endforeach; ?>
<tr>
<td class="list" colspan="6"></td>
<td class="list nowrap" valign="middle">
<table border="0" cellspacing="0" cellpadding="1" summary="edit">
<tr>
<td>
<?php
if ($i == 0) :
?>
<span class="glyphicon glyphicon-arrow-left text-muted"
title="<?=gettext("move selected routes to end");?>" alt="move" />
<?php
else :
?>
<button name="move_<?=$i;?>" type="submit" class="btn btn-default btn-xs"
title="<?=gettext("move selected routes to end");?>"><span class="glyphicon glyphicon-arrow-left"></span></button>
<?php
endif;
?>
</td>
<td>
<a href="system_routes_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
</td>
</tr>
<tr>
<td>
<?php
if ($i == 0) :
?>
<span class="btn btn-default btn-xs"> <span class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove text-muted"></span> <span class="glyphicon glyphicon-remove text-muted"></span>
</span> </span>
<?php <?php
else : else :?>
?> <button id="del_x" title="<?=gettext("delete selected routes");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></button>
<button name="del_x" type="submit" title="<?=gettext("delete selected routes");?>" <?php
onclick="return confirm('<?=gettext("Do you really want to delete the selected routes?");?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></button> endif;?>
<?php </td>
endif; </tr>
?> <tr>
</td> <td colspan="7">
</tr> <strong><?= gettext('Note:') ?></strong><br/>
</table> <?=gettext("Do not enter static routes for networks assigned on any interface of this firewall. Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.");?>
</td> </td>
</tr> </tr>
<tr><td colspan="7"> </table>
<?= gettext('Note:') ?> </div>
<?=gettext("Do not enter static routes for networks assigned on any interface of this firewall. Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.");?> </form>
</td></tr> </div>
</table> </section>
</div> </div>
</div>
</form> </section>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); <?php include("foot.inc");
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