From f4fcce2744520c0288dcbee310eeb09213c387c1 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 10 Mar 2016 17:19:35 +0100 Subject: [PATCH] (legacy) refactor services_wol_edit.php --- src/www/services_wol_edit.php | 298 ++++++++++++++++------------------ 1 file changed, 143 insertions(+), 155 deletions(-) diff --git a/src/www/services_wol_edit.php b/src/www/services_wol_edit.php index 5163d1de0..ddd7ed03d 100644 --- a/src/www/services_wol_edit.php +++ b/src/www/services_wol_edit.php @@ -1,185 +1,173 @@ . - All rights reserved. + Copyright (C) 2014-2016 Deciso B.V. + 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. */ -function wolcmp($a, $b) { - return strcmp($a['descr'], $b['descr']); -} - -function wol_sort() { - global $config; - - usort($config['wol']['wolentry'], "wolcmp"); -} - require_once("guiconfig.inc"); require_once("interfaces.inc"); -$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_wol.php'); - -if (!isset($config['wol']) || !is_array($config['wol'])) { - $config['wol'] = array(); +function wolcmp($a, $b) { + return strcmp($a['descr'], $b['descr']); } -if (!is_array($config['wol']['wolentry'])) { - $config['wol']['wolentry'] = array(); + + +if (empty($config['wol']['wolentry']) || !is_array($config['wol']['wolentry'])) { + $config['wol'] = array(); + $config['wol']['wolentry'] = array(); } $a_wol = &$config['wol']['wolentry']; -if (is_numericint($_GET['id'])) - $id = $_GET['id']; -if (isset($_POST['id']) && is_numericint($_POST['id'])) - $id = $_POST['id']; +if ($_SERVER['REQUEST_METHOD'] === 'GET') { + if (isset($_GET['id']) && !empty($a_wol[$_GET['id']])) { + $id = $_GET['id']; + } + $pconfig = array(); + foreach (array('interface', 'mac', 'descr') as $fieldname) { + if (isset($id) && isset($a_wol[$id][$fieldname])) { + $pconfig[$fieldname] = $a_wol[$id][$fieldname]; + } elseif (isset($_GET[$fieldname])) { + $pconfig[$fieldname] = $_GET[$fieldname]; + } else { + $pconfig[$fieldname] = null; + } + } +} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') { + if (isset($_POST['id']) && !empty($a_wol[$_POST['id']])) { + $id = $_POST['id']; + } + $pconfig = $_POST; + $input_errors = array(); -if (isset($id) && $a_wol[$id]) { - $pconfig['interface'] = $a_wol[$id]['interface']; - $pconfig['mac'] = $a_wol[$id]['mac']; - $pconfig['descr'] = $a_wol[$id]['descr']; -} -else -{ - $pconfig['interface'] = $_GET['if']; - $pconfig['mac'] = $_GET['mac']; - $pconfig['descr'] = $_GET['descr']; -} + /* input validation */ + $reqdfields = explode(" ", "interface mac"); + $reqdfieldsn = array(gettext("Interface"),gettext("MAC address")); -if ($_POST) { + do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors); - unset($input_errors); - $pconfig = $_POST; + /* normalize MAC addresses - lowercase and convert Windows-ized hyphenated MACs to colon delimited */ + $pconfig['mac'] = strtolower(str_replace("-", ":", $pconfig['mac'])); - /* input validation */ - $reqdfields = explode(" ", "interface mac"); - $reqdfieldsn = array(gettext("Interface"),gettext("MAC address")); + if (!empty($pconfig['mac']) && !is_macaddr($_POST['mac'])) { + $input_errors[] = gettext("A valid MAC address must be specified."); + } + if (count($input_errors) == 0) { + $wolent = array(); + $wolent['interface'] = $_POST['interface']; + $wolent['mac'] = $_POST['mac']; + $wolent['descr'] = $_POST['descr']; - do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); + if (isset($id)) { + $a_wol[$id] = $wolent; + } else { + $a_wol[] = $wolent; + } + usort($config['wol']['wolentry'], "wolcmp"); + write_config(); - /* normalize MAC addresses - lowercase and convert Windows-ized hyphenated MACs to colon delimited */ - $_POST['mac'] = strtolower(str_replace("-", ":", $_POST['mac'])); - - if (($_POST['mac'] && !is_macaddr($_POST['mac']))) { - $input_errors[] = gettext("A valid MAC address must be specified."); - } - - if (!$input_errors) { - $wolent = array(); - $wolent['interface'] = $_POST['interface']; - $wolent['mac'] = $_POST['mac']; - $wolent['descr'] = $_POST['descr']; - - if (isset($id) && $a_wol[$id]) - $a_wol[$id] = $wolent; - else - $a_wol[] = $wolent; - wol_sort(); - - write_config(); - - header("Location: services_wol.php"); - exit; - } + header("Location: services_wol.php"); + exit; + } } include("head.inc"); - +legacy_html_escape_form_data($pconfig); ?> - -
- -
- -
- 0) print_input_errors($input_errors); ?> - - -
- -
- -
-

-
- -
- -
- -
- - - - - - - - - - - - - - - - - -
-
-
- -
-
- -
  - " /> - " onclick="window.location.href=''" /> - - - -
-
-
-
-
-
-
-
-
- +
+
+
+ 0) print_input_errors($input_errors); ?> +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + +
+ + +
+ + +
  + " /> + " onclick="window.location.href=''" /> + + + +
+
+
+
+
+
+
+