Skip to content

O
OpnSense
Commit 181dd67b authored by Ad Schellevis's avatar Ad Schellevis
Browse files
Options

(legacy) refactor vpn_pppoe.php

parent 89eb450b
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 112 deletions
src/www/vpn_pppoe.php
View file @ 181dd67b
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2010 Ermal Luci Copyright (C) 2010 Ermal Luci
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");
...@@ -32,22 +32,16 @@ require_once("filter.inc"); ...@@ -32,22 +32,16 @@ require_once("filter.inc");
require_once("plugins.inc.d/vpn.inc"); require_once("plugins.inc.d/vpn.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
if (!is_array($config['pppoes'])) { if (empty($config['pppoes']['pppoe']) || !is_array($config['pppoes']['pppoe'])) {
$config['pppoes'] = array(); $config['pppoes'] = array();
}
if (!is_array($config['pppoes']['pppoe'])) {
$config['pppoes']['pppoe'] = array(); $config['pppoes']['pppoe'] = array();
} }
$a_pppoes = &$config['pppoes']['pppoe']; $a_pppoes = &$config['pppoes']['pppoe'];
if ($_POST) { if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$pconfig = $_POST; if (!empty($_POST['apply'])) {
if ($_POST['apply']) {
if (file_exists('/tmp/.vpn_pppoe.apply')) { if (file_exists('/tmp/.vpn_pppoe.apply')) {
$toapplylist = unserialize(file_get_contents('/tmp/.vpn_pppoe.apply')); $toapplylist = unserialize(file_get_contents('/tmp/.vpn_pppoe.apply'));
foreach ($toapplylist as $pppoeid) { foreach ($toapplylist as $pppoeid) {
if (!is_numeric($pppoeid)) { if (!is_numeric($pppoeid)) {
continue; continue;
...@@ -65,24 +59,24 @@ if ($_POST) { ...@@ -65,24 +59,24 @@ if ($_POST) {
} }
filter_configure(); filter_configure();
$savemsg = get_std_save_message();
clear_subsystem_dirty('vpnpppoe'); clear_subsystem_dirty('vpnpppoe');
}
}
if ($_GET['act'] == "del") {
if ($a_pppoes[$_GET['id']]) {
killbypid("/var/run/pppoe{$a_pppoes[$_GET['id']]['pppoeid']}-vpn.pid");
mwexecf('/bin/rm -r %s', "/var/etc/pppoe{$a_pppoes[$_GET['id']]['pppoeid']}");
unset($a_pppoes[$_GET['id']]);
write_config();
header("Location: vpn_pppoe.php"); header("Location: vpn_pppoe.php");
exit; exit;
} elseif (!empty($_POST['act']) && $_POST['act'] == "del") {
if (!empty($a_pppoes[$_POST['id']])) {
killbypid("/var/run/pppoe{$a_pppoes[$_POST['id']]['pppoeid']}-vpn.pid");
mwexecf('/bin/rm -r %s', "/var/etc/pppoe{$a_pppoes[$_POST['id']]['pppoeid']}");
unset($a_pppoes[$_POST['id']]);
write_config();
exit;
}
} }
} }
include("head.inc"); include("head.inc");
legacy_html_escape_form_data($a_pppoes);
$main_buttons = array( $main_buttons = array(
array('label'=>gettext("add a new pppoe instance"), 'href'=>'vpn_pppoe_edit.php'), array('label'=>gettext("add a new pppoe instance"), 'href'=>'vpn_pppoe_edit.php'),
); );
...@@ -90,71 +84,77 @@ $main_buttons = array( ...@@ -90,71 +84,77 @@ $main_buttons = array(
?> ?>
<body> <body>
<?php include("fbegin.inc"); ?> <script type="text/javascript">
<section class="page-content-main"> $( document ).ready(function() {
<div class="container-fluid"> // delete pppoe action
<div class="row"> $(".act_delete_pppoe").click(function(event){
event.preventDefault();
<?php if (isset($savemsg)) { print_info_box($savemsg); } ?> var id = $(this).data("id");
<?php if (is_subsystem_dirty('vpnpppoe')) : ?><br/> // delete single
<?php print_info_box_apply(gettext("The PPPoE entry list has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?> BootstrapDialog.show({
<?php endif; ?> type:BootstrapDialog.TYPE_DANGER,
title: "<?= gettext("PPPoE");?>",
message: "<?=gettext("Do you really want to delete this entry? All elements that still use it will become invalid (e.g. filter rules)!");?>",
<section class="col-xs-12"> buttons: [{
label: "<?= gettext("No");?>",
action: function(dialogRef) {
dialogRef.close();
<div class="content-box col-xs-12"> }}, {
label: "<?= gettext("Yes");?>",
<form action="vpn_pppoe.php" method="post" name="iform" id="iform"> action: function(dialogRef) {
$.post(window.location, {act: 'del', id:id}, function(data) {
<div class="table-responsive"> location.reload();
<table class="table table-striped table-sort"> });
<tr> }
<td width="15%" class="listhdrr"><?=gettext("Interface");?></td> }]
<td width="10%" class="listhdrr"><?=gettext("Local IP");?></td> });
<td width="20%" class="listhdrr"><?=gettext("Number of users");?></td> });
<td width="25%" class="listhdr"><?=gettext("Description");?></td> });
<td width="10%" class="list"> </script>
</td> <?php include("fbegin.inc"); ?>
</tr> <section class="page-content-main">
<?php $i = 0; foreach ($a_pppoes as $pppoe) : <div class="container-fluid">
?> <div class="row">
<tr> <?php if (is_subsystem_dirty('vpnpppoe')) : ?><br/>
<td class="listlr" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';"> <?php print_info_box_apply(gettext("The PPPoE entry list has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?>
<?=htmlspecialchars(strtoupper($pppoe['interface']));?> <?php endif; ?>
</td> <section class="col-xs-12">
<td class="listlr" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';"> <div class="content-box">
<?=htmlspecialchars($pppoe['localip']);?> <form method="post" name="iform" id="iform">
</td> <div class="table-responsive">
<td class="listr" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';"> <table class="table table-striped">
<?=htmlspecialchars($pppoe['n_pppoe_units']);?> <tr>
</td> <td><?=gettext("Interface");?></td>
<td class="listbg" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';"> <td><?=gettext("Local IP");?></td>
<?=htmlspecialchars($pppoe['descr']);?>&nbsp; <td><?=gettext("Number of users");?></td>
</td> <td><?=gettext("Description");?></td>
<td valign="middle" class="list nowrap"> <td>
<a href="vpn_pppoe_edit.php?id=<?=$i; </td>
?>" title="<?=gettext("edit pppoe instance"); ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a> </tr>
<?php
<a href="vpn_pppoe.php?act=del&amp;id=<?=$i; $i = 0;
?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry? All elements that still use it will become invalid (e.g. filter rules)!"); foreach ($a_pppoes as $pppoe) :?>
?>')" title="<?=gettext("delete pppoe instance");?>" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a> <tr>
</td> <td><?=strtoupper($pppoe['interface']);?></td>
</tr> <td><?=$pppoe['localip'];?></td>
<?php $i++; <td><?=$pppoe['n_pppoe_units'];?></td>
<td><?=$pppoe['descr'];?></td>
endforeach; ?> <td>
<a href="vpn_pppoe_edit.php?id=<?=$i;?>" title="<?=gettext("edit pppoe instance"); ?>" class="btn btn-default btn-xs">
</table> <span class="glyphicon glyphicon-pencil"></span>
</div> </a>
</form> <button data-id="<?=$i;?>" type="button" class="act_delete_pppoe btn btn-xs btn-default"><span class="fa fa-trash text-muted"></span></button>
</td>
</div> </tr>
</section> <?php
</div> $i++;
</div> endforeach; ?>
</section> </table>
</div>
</form>
</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