From 4a674804a45aaf5ad471a44c1cf69b72ebf993d8 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 8 Dec 2015 16:24:54 +0100 Subject: [PATCH] (legacy) refactor system_advanced_sysctl.php --- src/www/system_advanced_sysctl.php | 382 ++++++++++++++--------------- 1 file changed, 191 insertions(+), 191 deletions(-) diff --git a/src/www/system_advanced_sysctl.php b/src/www/system_advanced_sysctl.php index 611061031..5d7021473 100644 --- a/src/www/system_advanced_sysctl.php +++ b/src/www/system_advanced_sysctl.php @@ -1,245 +1,245 @@ . - All rights reserved. + Copyright (C) 2014-2015 Deciso B.V. + Copyright (C) 2005-2007 Scott Ullrich + Copyright (C) 2008 Shrew Soft Inc + Copyright (C) 2003-2004 Manuel Kasper . + 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"); require_once("system.inc"); -$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_advanced_sysctl.php'); - -if (!is_array($config['sysctl']['item'])) { +if (!isset($config['sysctl']['item']) || !is_array($config['sysctl']['item'])) { $config['sysctl']['item'] = array(); } - $a_tunable = &$config['sysctl']['item']; -if (is_numericint($_GET['id'])) { - $id = $_GET['id']; -} -if (isset($_POST['id']) && is_numericint($_POST['id'])) { - $id = $_POST['id']; -} - -$act = $_GET['act']; -if (isset($_POST['act'])) { - $act = $_POST['act']; -} - -if ($act == "edit") { - if ($a_tunable[$id]) { +if ($_SERVER['REQUEST_METHOD'] === 'GET') { + if (isset($_GET['id']) && isset($a_tunable[$_GET['id']])) { + $id = $_GET['id']; + } + if (isset($_GET['act'])) { + $act = $_GET['act']; + } else { + $act = null; + } + $pconfig = array(); + if (isset($id)) { $pconfig['tunable'] = $a_tunable[$id]['tunable']; $pconfig['value'] = $a_tunable[$id]['value']; $pconfig['descr'] = $a_tunable[$id]['descr']; + } else { + $pconfig['tunable'] = null; + $pconfig['value'] = null; + $pconfig['descr'] = null; } -} - -if ($act == "del") { - if ($a_tunable[$id]) { - if (!$input_errors) { - unset($a_tunable[$id]); - write_config(); - mark_subsystem_dirty('sysctl'); - header("Location: system_advanced_sysctl.php"); - exit; - } +} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') { + if (isset($_POST['id']) && isset($a_tunable[$_POST['id']])) { + $id = $_POST['id']; + } + if (isset($_POST['act'])) { + $act = $_POST['act']; + } else { + $act = null; } -} - -if ($_POST) { - unset($input_errors); $pconfig = $_POST; - if ($_POST['apply']) { - $retval = 0; + if (isset($id) && $act == "del") { + unset($a_tunable[$id]); + write_config(); + mark_subsystem_dirty('sysctl'); + header("Location: system_advanced_sysctl.php"); + exit; + } else if (!empty($pconfig['apply'])) { system_setup_sysctl(); - $savemsg = get_std_save_message(); clear_subsystem_dirty('sysctl'); - } - - if ($_POST['Submit'] == gettext("Save")) { + header("Location: system_advanced_sysctl.php"); + exit; + } elseif (!empty($pconfig['Submit'])) { $tunableent = array(); + $tunableent['tunable'] = $pconfig['tunable']; + $tunableent['value'] = $pconfig['value']; + $tunableent['descr'] = $pconfig['descr']; - $tunableent['tunable'] = $_POST['tunable']; - $tunableent['value'] = $_POST['value']; - $tunableent['descr'] = $_POST['descr']; - - if (isset($id) && $a_tunable[$id]) { + if (isset($id)) { $a_tunable[$id] = $tunableent; } else { $a_tunable[] = $tunableent; } mark_subsystem_dirty('sysctl'); - write_config(); - header("Location: system_advanced_sysctl.php"); exit; } + } -$pgtitle = array(gettext('System'), gettext('Settings'), gettext('Tunables')); +legacy_html_escape_form_data($a_tunable); if ($act != 'edit') { - $main_buttons = array( - array('href' => 'system_advanced_sysctl.php?act=edit', 'label' => gettext('Add a new tunable')), - ); + $main_buttons = array( + array('href' => 'system_advanced_sysctl.php?act=edit', 'label' => gettext('Add a new tunable')), + ); } include("head.inc"); - ?> + +
-
-
+
+
+ +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + " class="glyphicon glyphicon-pencil"> + + " data-toggle="tooltip" class="act_delete btn btn-default btn-xs"> + + +
+
- 0) { - print_input_errors($input_errors); - } - if (isset($savemsg)) { - print_info_box($savemsg); - } - if (is_subsystem_dirty('sysctl') && ($act != "edit" )) { - print_info_box_apply(gettext("The firewall tunables have changed. You must apply the configuration to take affect.")); - } - ?> -
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
  + " /> + " onclick="window.location.href=''" /> -
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
- - " class="glyphicon glyphicon-pencil"> - - - ')" class="btn btn-default btn-xs"> - " class="glyphicon glyphicon-remove"> - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
  - " /> - " onclick="window.location.href=''" /> - - - - -
-
- -
-
- - + + + +
+ + +
+
+
+
-