Commit 181dd67b authored by Ad Schellevis's avatar Ad Schellevis

(legacy) refactor vpn_pppoe.php

parent 89eb450b
<?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.
...@@ -32,20 +32,14 @@ require_once("filter.inc"); ...@@ -32,20 +32,14 @@ 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) {
...@@ -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>
<script type="text/javascript">
$( document ).ready(function() {
// delete pppoe action
$(".act_delete_pppoe").click(function(event){
event.preventDefault();
var id = $(this).data("id");
// delete single
BootstrapDialog.show({
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)!");?>",
buttons: [{
label: "<?= gettext("No");?>",
action: function(dialogRef) {
dialogRef.close();
}}, {
label: "<?= gettext("Yes");?>",
action: function(dialogRef) {
$.post(window.location, {act: 'del', id:id}, function(data) {
location.reload();
});
}
}]
});
});
});
</script>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if (isset($savemsg)) { print_info_box($savemsg); } ?>
<?php if (is_subsystem_dirty('vpnpppoe')) : ?><br/> <?php if (is_subsystem_dirty('vpnpppoe')) : ?><br/>
<?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."));?> <?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."));?>
<?php endif; ?> <?php endif; ?>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box">
<form method="post" name="iform" id="iform">
<div class="content-box col-xs-12">
<form action="vpn_pppoe.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped">
<tr> <tr>
<td width="15%" class="listhdrr"><?=gettext("Interface");?></td> <td><?=gettext("Interface");?></td>
<td width="10%" class="listhdrr"><?=gettext("Local IP");?></td> <td><?=gettext("Local IP");?></td>
<td width="20%" class="listhdrr"><?=gettext("Number of users");?></td> <td><?=gettext("Number of users");?></td>
<td width="25%" class="listhdr"><?=gettext("Description");?></td> <td><?=gettext("Description");?></td>
<td width="10%" class="list"> <td>
</td> </td>
</tr> </tr>
<?php $i = 0; foreach ($a_pppoes as $pppoe) : <?php
?> $i = 0;
foreach ($a_pppoes as $pppoe) :?>
<tr> <tr>
<td class="listlr" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';"> <td><?=strtoupper($pppoe['interface']);?></td>
<?=htmlspecialchars(strtoupper($pppoe['interface']));?> <td><?=$pppoe['localip'];?></td>
</td> <td><?=$pppoe['n_pppoe_units'];?></td>
<td class="listlr" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';"> <td><?=$pppoe['descr'];?></td>
<?=htmlspecialchars($pppoe['localip']);?> <td>
</td> <a href="vpn_pppoe_edit.php?id=<?=$i;?>" title="<?=gettext("edit pppoe instance"); ?>" class="btn btn-default btn-xs">
<td class="listr" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';"> <span class="glyphicon glyphicon-pencil"></span>
<?=htmlspecialchars($pppoe['n_pppoe_units']);?> </a>
</td> <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 class="listbg" ondblclick="document.location='vpn_pppoe_edit.php?id=<?=$i;?>';">
<?=htmlspecialchars($pppoe['descr']);?>&nbsp;
</td>
<td valign="middle" class="list nowrap">
<a href="vpn_pppoe_edit.php?id=<?=$i;
?>" title="<?=gettext("edit pppoe instance"); ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
<a href="vpn_pppoe.php?act=del&amp;id=<?=$i;
?>" 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)!");
?>')" title="<?=gettext("delete pppoe instance");?>" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
</td> </td>
</tr> </tr>
<?php $i++; <?php
$i++;
endforeach; ?> endforeach; ?>
</table> </table>
</div> </div>
</form> </form>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </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