diff --git a/src/www/interfaces_ppps.php b/src/www/interfaces_ppps.php index 9752eefe1..b206912c2 100644 --- a/src/www/interfaces_ppps.php +++ b/src/www/interfaces_ppps.php @@ -1,146 +1,163 @@ . - All rights reserved. + Copyright (C) 2014-2015 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. */ require_once("guiconfig.inc"); require_once("interfaces.inc"); -function ppp_inuse($num) { - global $config, $g; - $iflist = get_configured_interface_list(false, true); - if (!is_array($config['ppps']['ppp'])) - return false; - - foreach ($iflist as $if) { - if ($config['interfaces'][$if]['if'] == $config['ppps']['ppp'][$num]['if']) - return true; - } - return false; +function ppp_inuse($ppp_intf) { + global $config; + if (isset($config['ppps']['ppp']) && !is_array($config['ppps']['ppp'])) { + foreach ($config['interfaces'] as $intf) { + if ($intf['if'] == $ppp_intf) { + return true; + } + } + } + return false; } -if ($_GET['act'] == "del") { - /* check if still in use */ - if (ppp_inuse($_GET['id'])) { - $input_errors[] = gettext("This point-to-point link cannot be deleted because it is still being used as an interface."); - } elseif (is_array($config['ppps']['ppp']) && is_array($config['ppps']['ppp'][$_GET['id']])) { - - unset($config['ppps']['ppp'][$_GET['id']]['pppoe-reset-type']); - handle_pppoe_reset($config['ppps']['ppp'][$_GET['id']]); - unset($config['ppps']['ppp'][$_GET['id']]); - write_config(); - header("Location: interfaces_ppps.php"); - exit; - } +if (!isset($config['ppps']['ppp']) || !is_array($config['ppps']['ppp'])) { + $a_ppps = array(); +} else { + $a_ppps = &$config['ppps']['ppp']; } -if (!is_array($config['ppps'])) { - $config['ppps'] = array(); -} +if ($_SERVER['REQUEST_METHOD'] === 'POST') { + if (!empty($a_ppps[$_POST['id']])) { + $id = $_POST['id']; + } -if (!is_array($config['ppps']['ppp'])) { - $config['ppps']['ppp'] = array(); + if (!empty($_POST['action']) && $_POST['action'] == "del" && isset($id)) { + if (ppp_inuse($a_ppps[$id]['if'])) { + $input_errors[] = gettext("This point-to-point link cannot be deleted because it is still being used as an interface."); + } else { + unset($a_ppps[$id]['pppoe-reset-type']); + handle_pppoe_reset($a_ppps[$id]); + unset($a_ppps[$id]); + write_config(); + header("Location: interfaces_ppps.php"); + exit; + } + } } -$a_ppps = $config['ppps']['ppp']; - include("head.inc"); - +legacy_html_escape_form_data($a_ppps); $main_buttons = array( - array('href'=>'interfaces_ppps_edit.php', 'label'=>gettext('Add')), + array('href'=>'interfaces_ppps_edit.php', 'label'=>gettext('Add')), ); ?> - + +
+
+
+ 0) print_input_errors($input_errors); ?> +
+
+
+ + +
+ + + + + + + + + + -
-
-
- - 0) print_input_errors($input_errors); ?> - -
- -
- - - -
-
- - - - - - - - - - - - - $ppp): ?> - - - - - - - - -
 
- - - $port) { - if ($port != get_real_interface($port) && $ppp['type'] != "ppp") - $portlist[$portid] = convert_friendly_interface_to_friendly_descr($port); - } - echo htmlspecialchars(implode(",", $portlist)); - ?> - -   - - - "> - - ')"> - -
-
-
- -
-
-
-
-
+ $ppp): ?> + + + + $port) { + if ($port != get_real_interface($port) && $ppp['type'] != "ppp") + $portlist[$portid] = convert_friendly_interface_to_friendly_descr($port); + }?> + + + + + "> + + + + + + + + + + + + +