upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: testing sweep for mpd5 servers done; minor issues in gui fixed

Browse source
This commit is contained in:
Franco Fichtner 2016-06-03 15:44:28 +02:00
parent df43b7678c
commit 80056bfc16
11 changed files with 20 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/l2tp/Makefile
View file

@ -1,6 +1,6 @@
PLUGIN_NAME= l2tp
PLUGIN_PRIVATE= yes
PLUGIN_VERSION= 0.3
PLUGIN_VERSION= 0.4
PLUGIN_DEPENDS= clog mpd5
PLUGIN_COMMENT= LT2P server based on MPD5
PLUGIN_MAINTAINER= franco@opnsense.org

5
net/l2tp/src/www/vpn_l2tp.php
View file

@ -33,7 +33,7 @@ require_once("interfaces.inc");
require_once("services.inc");
require_once("system.inc");
require_once("plugins.inc");
require_once("plugins.inc.d/vpn.inc");
require_once("plugins.inc.d/if_l2tp.inc");
if (!isset($config['l2tp']['radius']) || !is_array($config['l2tp']['radius'])) {
$config['l2tp']['radius'] = array();
@ -151,8 +151,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
write_config();
vpn_l2tp_configure();
if_l2tp_configure_do();
header("Location: vpn_l2tp.php");
exit;
}

6
net/l2tp/src/www/vpn_l2tp_log.php
View file

@ -17,9 +17,9 @@ if ($mode != 'raw') {
$logtype = 'l2tp';
$tab_array = array();
$tab_array[] = array(gettext('L2TP Logins'), $mode != 'raw', '/vpn_l2tp_logs.php');
$tab_array[] = array(gettext('L2TP Raw'), $mode == 'raw', '/vpn_l2tp_logs.php?mode=raw');
$tab_array[] = array(gettext('L2TP Logins'), $mode != 'raw', '/vpn_l2tp_log.php');
$tab_array[] = array(gettext('L2TP Raw'), $mode == 'raw', '/vpn_l2tp_log.php?mode=raw');
$service_hook = 'l2tpd';
require_once 'vpn_l2tp_logs.inc';
require_once 'vpn_l2tp_log.inc';

4
net/l2tp/src/www/vpn_l2tp_users.php
View file

@ -31,7 +31,7 @@ require_once("guiconfig.inc");
require_once("services.inc");
require_once("system.inc");
require_once("plugins.inc");
require_once("plugins.inc.d/vpn.inc");
require_once("plugins.inc.d/if_l2tp.inc");
if (!isset($config['l2tp']['user'])) {
$config['l2tp']['user'] = array();
@ -47,7 +47,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
exit;
} elseif (!empty($_POST['apply'])) {
vpn_l2tp_configure();
if_l2tp_configure_do();
clear_subsystem_dirty('l2tpusers');
header("Location: vpn_l2tp_users.php");
exit;

5
net/l2tp/src/www/vpn_l2tp_users_edit.php
View file

@ -47,7 +47,7 @@ require_once("guiconfig.inc");
require_once("services.inc");
require_once("system.inc");
require_once("plugins.inc");
require_once("plugins.inc.d/vpn.inc");
require_once("plugins.inc.d/if_l2tp.inc");
if (empty($config['l2tp']['user']) || !is_array($config['l2tp']['user'])) {
@ -129,8 +129,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
l2tp_users_sort();
write_config();
vpn_l2tp_configure();
if_l2tp_configure_do();
header("Location: vpn_l2tp_users.php");
exit;
}

2
net/pppoe/Makefile
View file

@ -1,6 +1,6 @@
PLUGIN_NAME= pppoe
PLUGIN_PRIVATE= yes
PLUGIN_VERSION= 0.3
PLUGIN_VERSION= 0.4
PLUGIN_DEPENDS= clog mpd5
PLUGIN_COMMENT= PPPoE server based on MPD5
PLUGIN_MAINTAINER= franco@opnsense.org

4
net/pppoe/src/www/vpn_pppoe.php
View file

@ -29,7 +29,7 @@
require_once("guiconfig.inc");
require_once("filter.inc");
require_once("plugins.inc.d/vpn.inc");
require_once("plugins.inc.d/if_pppoe.inc");
require_once("interfaces.inc");
if (empty($config['pppoes']['pppoe']) || !is_array($config['pppoes']['pppoe'])) {
@ -49,7 +49,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (isset($config['pppoes']['pppoe'])) {
foreach ($config['pppoes']['pppoe'] as $pppoe) {
if ($pppoe['pppoeid'] == $pppoeid) {
vpn_pppoe_configure($pppoe);
if_pppoe_configure_single($pppoe);
break;
}
}

2
net/pptp/Makefile
View file

@ -1,6 +1,6 @@
PLUGIN_NAME= pptp
PLUGIN_PRIVATE= yes
PLUGIN_VERSION= 0.3
PLUGIN_VERSION= 0.4
PLUGIN_DEPENDS= clog mpd5
PLUGIN_COMMENT= PPTP server based on MPD5
PLUGIN_MAINTAINER= franco@opnsense.org

14
net/pptp/src/www/vpn_pptp.php
View file

@ -34,7 +34,7 @@ require_once('services.inc');
require_once("system.inc");
require_once("plugins.inc");
require_once("pfsense-utils.inc");
require_once('plugins.inc.d/vpn.inc');
require_once('plugins.inc.d/if_pptp.inc');
if (!is_array($config['pptpd']['radius'])) {
$config['pptpd']['radius'] = array();
@ -173,7 +173,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
write_config();
$savemsg = get_std_save_message();
vpn_pptpd_configure();
if_pptp_configure_do();
filter_configure();
}
}
@ -195,16 +195,6 @@ include("head.inc");
<?php if (isset($savemsg)) {
print_info_box($savemsg);
} ?>
<?php print_alert_box(
gettext(
'PPTP is not considered a secure VPN technology, because it relies upon ' .
'the compromised MS-CHAPv2 protocol. If you choose to use PPTP, be aware ' .
'that your traffic can be decrypted by virtually any third party. ' .
'It should be considered an unencrypted tunneling protocol.'
) . ' <a href="https://isc.sans.edu/diary/End+of+Days+for+MS-CHAPv2/13807">' .
gettext('Read more') . '</a>.',
'warning'
); ?>
<section class="col-xs-12">
<div class="tab-content content-box col-xs-12">
<form method="post" name="iform" id="iform">

4
net/pptp/src/www/vpn_pptp_users.php
View file

@ -31,7 +31,7 @@ require_once('guiconfig.inc');
require_once('services.inc');
require_once("system.inc");
require_once("plugins.inc");
require_once('plugins.inc.d/vpn.inc');
require_once('plugins.inc.d/if_pptp.inc');
if (!is_array($config['pptpd']['user'])) {
$config['pptpd']['user'] = array();
@ -48,7 +48,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
exit;
} elseif (!empty($_POST['apply'])) {
vpn_pptpd_configure();
if_pptp_configure_do();
clear_subsystem_dirty('pptpusers');
header("Location: vpn_pptp_users.php");
exit;

5
net/pptp/src/www/vpn_pptp_users_edit.php
View file

@ -47,7 +47,7 @@ require_once('guiconfig.inc');
require_once('services.inc');
require_once("system.inc");
require_once("plugins.inc");
require_once('plugins.inc.d/vpn.inc');
require_once('plugins.inc.d/if_pptp.inc');
if (!is_array($config['pptpd']['user'])) {
$config['pptpd']['user'] = array();
@ -132,8 +132,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
pptpd_users_sort();
write_config();
vpn_pptpd_configure();
if_pptp_configure_do();
header("Location: vpn_pptp_users.php");
exit;
}