lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove filter reload, closes https://github.com/opnsense/core/issues/1800

Browse Source
This commit is contained in:
Ad Schellevis 2017-09-01 19:43:43 +02:00
parent 6ce13946ea
commit 8be01ff9fa
5 changed files with 2 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
View File

@ -184,7 +184,6 @@
<Advanced order="300" url="/system_advanced_firewall.php"/>
</Settings>
<Diagnostics order="500" cssClass="fa fa-medkit fa-fw">
<FilterReload order="20" VisibleName="Filter Reload" url="/status_filter_reload.php"/>
<pfInfo order="30" url="/diag_pf_info.php" VisibleName="pfInfo"/>
<pfTop order="40" url="/diag_system_pftop.php" VisibleName="pfTop"/>
<pfTables order="50" url="/diag_tables.php">

6
src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
View File

@ -518,12 +518,6 @@
<pattern>status_dhcpv6_leases.php*</pattern>
</patterns>
</page-status-dhcpv6leases>
<page-status-filterreloadstatus>
<name>Status: Filter Reload Status</name>
<patterns>
<pattern>status_filter_reload.php*</pattern>
</patterns>
</page-status-filterreloadstatus>
<page-status-gatewaygroups>
<name>Status: Gateway Groups</name>
<patterns>

9
src/www/firewall_rules.php
View File

@ -49,14 +49,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
system_cron_configure();
filter_configure();
clear_subsystem_dirty('filter');
$savemsg = sprintf(
gettext(
'The settings have been applied and the rules are now reloading ' .
'in the background. You can monitor the reload progress %shere%s.'
),
'<a href="status_filter_reload.php">',
'</a>'
);
$savemsg = gettext('The settings have been applied and the rules are now reloading in the background.');
} elseif (isset($pconfig['act']) && $pconfig['act'] == 'del' && isset($id)) {
// delete single item
if (!empty($a_filter[$id]['associated-rule-id'])) {

9
src/www/firewall_scrub.php
View File

@ -37,14 +37,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig['scrubrnid'] = !empty($config['system']['scrubrnid']);
$pconfig['scrub_interface_disable'] = !empty($config['system']['scrub_interface_disable']);
if (!empty($_GET['savemsg'])) {
$savemsg = sprintf(
gettext(
'The settings have been applied and the rules are now reloading ' .
'in the background. You can monitor the reload progress %shere%s.'
),
'<a href="status_filter_reload.php">',
'</a>'
);
$savemsg = gettext('The settings have been applied and the rules are now reloading in the background.');
}
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
$pconfig = $_POST;

99
src/www/status_filter_reload.php
View File

@ -1,99 +0,0 @@
<?php
/*
Copyright (C) 2006 Scott Ullrich <sullrich@gmail.com>
All rights reserved.
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.
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.
*/
require_once("guiconfig.inc");
if($_GET['getstatus']) {
$status = '';
if (file_exists('/var/run/filter_reload_status')) {
$status = file_get_contents('/var/run/filter_reload_status');
}
echo $status;
exit;
}
if ($_POST['reloadfilter']) {
configd_run("filter reload");
if ( isset($config['hasync']['synchronizetoip']) && trim($config['hasync']['synchronizetoip']) != "") {
// only try to sync when hasync is configured
configd_run("filter sync reload");
}
header(url_safe('Location: /status_filter_reload.php'));
exit;
}
if ($_POST['syncfilter']) {
configd_run("filter sync");
header(url_safe('Location: /status_filter_reload.php'));
exit;
}
include("head.inc");
?>
<body>
<script type="text/javascript">
$( document ).ready(function() {
function refresh_data() {
$.ajax("status_filter_reload.php?getstatus=true", {
type: 'get',
cache: false,
dataType: "html",
data: {},
success: function (data) {
$('#status').html(data);
setTimeout(refresh_data, 200);
}
});
}
refresh_data();
});
</script>
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<?php print_service_banner('firewall'); ?>
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<section class="col-xs-12">
<div class="content-box ">
<div class="col-xs-12">
<p><form method="post" name="filter">
<input type="submit" value="<?= gettext('Reload Filter') ?>" class="btn btn-primary" name="reloadfilter" id="reloadfilter" />
<?php if (!empty($config['hasync']['synchronizetoip'])): ?>
<input type="submit" value="<?= gettext('Force Config Sync') ?>" class="btn btn-primary" name="syncfilter" id="syncfilter" />
<?php endif; ?>
</form></p>
<pre id="status"></pre>
</div>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>