summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2017-03-06 13:13:45 +0545
committerPhil Davis <phil.davis@inf.org>2017-03-06 13:13:45 +0545
commit8725f4a5b2d9ee2d82e27e4d9c45303c14d8acd1 (patch)
treea698882c6db1f27270348e2fba9ebdd7596bd507 /src/usr
parentfc970ca2967ef4250925cd44a8dd0acee18078c0 (diff)
downloadpfsense-8725f4a5b2d9ee2d82e27e4d9c45303c14d8acd1.zip
pfsense-8725f4a5b2d9ee2d82e27e4d9c45303c14d8acd1.tar.gz
Add reason to write_config() calls for OpenVPN
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/local/www/vpn_openvpn_client.php9
-rw-r--r--src/usr/local/www/vpn_openvpn_csc.php7
-rw-r--r--src/usr/local/www/vpn_openvpn_server.php9
3 files changed, 19 insertions, 6 deletions
diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php
index cde6e74..9bf5a7a 100644
--- a/src/usr/local/www/vpn_openvpn_client.php
+++ b/src/usr/local/www/vpn_openvpn_client.php
@@ -77,9 +77,12 @@ if ($_POST['act'] == "del") {
}
if (!empty($a_client[$id])) {
openvpn_delete('client', $a_client[$id]);
+ $wc_msg = sprintf(gettext('Deleted OpenVPN client to server %1$s:%2$s %3$s'), $a_client[$id]['server_addr'], $a_client[$id]['server_port'], $a_client[$id]['description']);
+ } else {
+ $wc_msg = gettext('Deleted empty OpenVPN client');
}
unset($a_client[$id]);
- write_config();
+ write_config($wc_msg);
$savemsg = gettext("Client successfully deleted.");
}
@@ -424,11 +427,13 @@ if ($_POST['save']) {
if (isset($id) && $a_client[$id]) {
$a_client[$id] = $client;
+ $wc_msg = sprintf(gettext('Updated OpenVPN client to server %1$s:%2$s %3$s'), $client['server_addr'], $client['server_port'], $client['description']);
} else {
$a_client[] = $client;
+ $wc_msg = sprintf(gettext('Added OpenVPN client to server %1$s:%2$s %3$s'), $client['server_addr'], $client['server_port'], $client['description']);
}
- write_config();
+ write_config($wc_msg);
openvpn_resync('client', $client);
header("Location: vpn_openvpn_client.php");
diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php
index c61dc82..f801689 100644
--- a/src/usr/local/www/vpn_openvpn_csc.php
+++ b/src/usr/local/www/vpn_openvpn_csc.php
@@ -53,9 +53,10 @@ if ($_POST['act'] == "del") {
exit;
}
+ $wc_msg = sprintf(gettext('Deleted OpenVPN client specific override %1$s %2$s'), $a_csc[$id]['common_name'], $a_csc[$id]['description']);
openvpn_delete_csc($a_csc[$id]);
unset($a_csc[$id]);
- write_config();
+ write_config($wc_msg);
$savemsg = gettext("Client specific override successfully deleted.");
}
@@ -260,15 +261,17 @@ if ($_POST['save']) {
if (isset($id) && $a_csc[$id]) {
$old_csc = $a_csc[$id];
$a_csc[$id] = $csc;
+ $wc_msg = sprintf(gettext('Updated OpenVPN client specific override %1$s %2$s'), $csc['common_name'], $csc['description']);
} else {
$a_csc[] = $csc;
+ $wc_msg = sprintf(gettext('Added OpenVPN client specific override %1$s %2$s'), $csc['common_name'], $csc['description']);
}
if (!empty($old_csc['common_name'])) {
openvpn_delete_csc($old_csc);
}
openvpn_resync_csc($csc);
- write_config();
+ write_config($wc_msg);
header("Location: vpn_openvpn_csc.php");
exit;
diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php
index ff04e59..e44296d 100644
--- a/src/usr/local/www/vpn_openvpn_server.php
+++ b/src/usr/local/www/vpn_openvpn_server.php
@@ -85,9 +85,12 @@ if ($_POST['act'] == "del") {
}
if (!empty($a_server[$id])) {
openvpn_delete('server', $a_server[$id]);
+ $wc_msg = sprintf(gettext('Deleted OpenVPN server from %1$s:%2$s %3$s'), convert_friendly_interface_to_friendly_descr($a_server[$id]['interface']), $a_server[$id]['local_port'], $a_server[$id]['description']);
+ } else {
+ $wc_msg = gettext('Deleted empty OpenVPN server');
}
unset($a_server[$id]);
- write_config();
+ write_config($wc_msg);
$savemsg = gettext("Server successfully deleted.");
}
@@ -605,11 +608,13 @@ if ($_POST['save']) {
if (isset($id) && $a_server[$id]) {
$a_server[$id] = $server;
+ $wc_msg = sprintf(gettext('Updated OpenVPN server on %1$s:%2$s %3$s'), convert_friendly_interface_to_friendly_descr($server['interface']), $server['local_port'], $server['description']);
} else {
$a_server[] = $server;
+ $wc_msg = sprintf(gettext('Added OpenVPN server on %1$s:%2$s %3$s'), convert_friendly_interface_to_friendly_descr($server['interface']), $server['local_port'], $server['description']);
}
- write_config();
+ write_config($wc_msg);
openvpn_resync('server', $server);
openvpn_resync_csc_all();
OpenPOWER on IntegriCloud