From 3f2c5304b7ddcc34e6f4209a97c17ec6bd2247d2 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 11 Feb 2016 14:36:03 +0100 Subject: [PATCH] (legacy) fix spacing, add toggle in vpn_openvpn_server.php --- src/www/vpn_openvpn_server.php | 785 ++++++++++++++++----------------- 1 file changed, 387 insertions(+), 398 deletions(-) diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php index 08dfdb0e4..b78aea6ac 100644 --- a/src/www/vpn_openvpn_server.php +++ b/src/www/vpn_openvpn_server.php @@ -40,7 +40,7 @@ $a_server = &$config['openvpn']['openvpn-server']; $act = null; if ($_SERVER['REQUEST_METHOD'] === 'GET') { - // fetch id if provided + // fetch id if provided if (isset($_GET['id']) && is_numericint($_GET['id'])) { $id = $_GET['id']; } @@ -48,7 +48,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $act = $_GET['act']; } $pconfig = array(); - // defaults + // defaults $vpnid = 0; $pconfig['verbosity_level'] = 1; $pconfig['digest'] = "SHA1"; // OpenVPN Defaults to SHA1 if unset @@ -61,16 +61,16 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { // 1 on 1 copy of config attributes $copy_fields = "mode,protocol,authmode,dev_mode,interface,local_port - ,description,custom_options,crypto,engine,tunnel_network - ,tunnel_networkv6,remote_network,remote_networkv6,gwredir,local_network - ,local_networkv6,maxclients,compression,passtos,client2client - ,dynamic_ip,pool_enable,topology_subnet,serverbridge_dhcp - ,serverbridge_interface,serverbridge_dhcp_start,serverbridge_dhcp_end - ,dns_server1,dns_server2,dns_server3,dns_server4,ntp_server1 - ,ntp_server2,netbios_enable,netbios_ntype,netbios_scope,wins_server1 - ,wins_server2,no_tun_ipv6,push_register_dns,dns_domain - ,client_mgmt_port,verbosity_level,caref,crlref,certref,dh_length - ,cert_depth,strictusercn,digest,disable,duplicate_cn,vpnid"; + ,description,custom_options,crypto,engine,tunnel_network + ,tunnel_networkv6,remote_network,remote_networkv6,gwredir,local_network + ,local_networkv6,maxclients,compression,passtos,client2client + ,dynamic_ip,pool_enable,topology_subnet,serverbridge_dhcp + ,serverbridge_interface,serverbridge_dhcp_start,serverbridge_dhcp_end + ,dns_server1,dns_server2,dns_server3,dns_server4,ntp_server1 + ,ntp_server2,netbios_enable,netbios_ntype,netbios_scope,wins_server1 + ,wins_server2,no_tun_ipv6,push_register_dns,dns_domain + ,client_mgmt_port,verbosity_level,caref,crlref,certref,dh_length + ,cert_depth,strictusercn,digest,disable,duplicate_cn,vpnid"; foreach (explode(",", $copy_fields) as $fieldname) { $fieldname = trim($fieldname); @@ -108,16 +108,16 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $pconfig['cert_depth'] = 1; // init all fields used in the form $init_fields = "mode,protocol,authmode,dev_mode,interface,local_port - ,description,custom_options,crypto,engine,tunnel_network - ,tunnel_networkv6,remote_network,remote_networkv6,gwredir,local_network - ,local_networkv6,maxclients,compression,passtos,client2client - ,dynamic_ip,pool_enable,topology_subnet,serverbridge_dhcp - ,serverbridge_interface,serverbridge_dhcp_start,serverbridge_dhcp_end - ,dns_server1,dns_server2,dns_server3,dns_server4,ntp_server1 - ,ntp_server2,netbios_enable,netbios_ntype,netbios_scope,wins_server1 - ,wins_server2,no_tun_ipv6,push_register_dns,dns_domain - ,client_mgmt_port,verbosity_level,caref,crlref,certref,dh_length - ,cert_depth,strictusercn,digest,disable,duplicate_cn,vpnid,shared_key,tls"; + ,description,custom_options,crypto,engine,tunnel_network + ,tunnel_networkv6,remote_network,remote_networkv6,gwredir,local_network + ,local_networkv6,maxclients,compression,passtos,client2client + ,dynamic_ip,pool_enable,topology_subnet,serverbridge_dhcp + ,serverbridge_interface,serverbridge_dhcp_start,serverbridge_dhcp_end + ,dns_server1,dns_server2,dns_server3,dns_server4,ntp_server1 + ,ntp_server2,netbios_enable,netbios_ntype,netbios_scope,wins_server1 + ,wins_server2,no_tun_ipv6,push_register_dns,dns_domain + ,client_mgmt_port,verbosity_level,caref,crlref,certref,dh_length + ,cert_depth,strictusercn,digest,disable,duplicate_cn,vpnid,shared_key,tls"; foreach (explode(",", $init_fields) as $fieldname) { $fieldname = trim($fieldname); if (!isset($pconfig[$fieldname])) { @@ -127,7 +127,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { } } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') { - if (isset($_POST['id']) && is_numericint($_POST['id'])) { + if (isset($_POST['id']) && isset($a_server[$_POST['id']])) { $id = $_POST['id']; } if (isset($_POST['act'])) { @@ -136,15 +136,25 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { if ($act == "del") { // action delete - if (!isset($a_server[$id])) { - header("Location: vpn_openvpn_server.php"); - exit; - } - if (!empty($a_server[$id])) { + if (isset($a_server[$id])) { openvpn_delete('server', $a_server[$id]); + unset($a_server[$id]); + write_config(); } - unset($a_server[$id]); - write_config(); + header("Location: vpn_openvpn_server.php"); + exit; + } elseif ($act == "toggle") { + if (isset($id)) { + if (isset($a_server[$id]['disable'])) { + unset($a_server[$id]['disable']); + } else { + $a_server[$id]['disable'] = true; + } + openvpn_resync('server', $a_server[$id]); + write_config(); + } + header("Location: vpn_openvpn_server.php"); + exit; } else { // action add/update $input_errors = array(); @@ -321,14 +331,14 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { } // 1 on 1 copy of config attributes $copy_fields = "mode,protocol,dev_mode,local_port,description,crypto,digest,engine - ,tunnel_network,tunnel_networkv6,remote_network,remote_networkv6 - ,gwredir,local_network,local_networkv6,maxclients,compression - ,passtos,client2client,dynamic_ip,pool_enable,topology_subnet - ,serverbridge_dhcp,serverbridge_interface,serverbridge_dhcp_start - ,serverbridge_dhcp_end,dns_domain,dns_server1,dns_server2,dns_server3 - ,dns_server4,push_register_dns,ntp_server1,ntp_server2,netbios_enable - ,netbios_ntype,netbios_scope,no_tun_ipv6,verbosity_level,wins_server1 - ,wins_server2,client_mgmt_port,strictusercn"; + ,tunnel_network,tunnel_networkv6,remote_network,remote_networkv6 + ,gwredir,local_network,local_networkv6,maxclients,compression + ,passtos,client2client,dynamic_ip,pool_enable,topology_subnet + ,serverbridge_dhcp,serverbridge_interface,serverbridge_dhcp_start + ,serverbridge_dhcp_end,dns_domain,dns_server1,dns_server2,dns_server3 + ,dns_server4,push_register_dns,ntp_server1,ntp_server2,netbios_enable + ,netbios_ntype,netbios_scope,no_tun_ipv6,verbosity_level,wins_server1 + ,wins_server2,client_mgmt_port,strictusercn"; foreach (explode(",", $copy_fields) as $fieldname) { $fieldname = trim($fieldname); @@ -439,6 +449,14 @@ $( document ).ready(function() { }] }); }); + + // link toggle buttons + $(".act_toggle").click(function(){ + $.post(window.location, {act: 'toggle', id:$(this).data("id")}, function(data) { + location.reload(); + }); + }); + // init form (old stuff) if (document.iform != undefined) { mode_change(); @@ -700,24 +718,18 @@ function tuntap_change() {
- - 0) { print_input_errors($input_errors); } if (isset($savemsg)) { print_info_box($savemsg); - } - ?> - -
- + }?> +
- - +
-
@@ -745,90 +757,81 @@ function tuntap_change() { - - + + + @@ -836,38 +839,39 @@ function tuntap_change() { @@ -887,7 +891,7 @@ function tuntap_change() { - + @@ -936,75 +940,71 @@ endif; ?> + + + + +
. + + - + + +
. + + - + + + + +
- + + + -

- - - -
. - -
- + + - -
. - -
- + + - -
. - + + +
. +
- +
- +
@@ -1079,8 +1077,8 @@ endif; ?>
- + @@ -1115,18 +1113,19 @@ endif; ?> @@ -1159,26 +1159,28 @@ endif; ?> - + + + - + @@ -1250,29 +1252,28 @@ endif; ?> - + @@ -1497,7 +1498,7 @@ endif; ?> @@ -1578,18 +1579,16 @@ endif; ?> :  - + @@ -1666,18 +1665,19 @@ endif; ?>
@@ -1095,19 +1093,19 @@ endif; ?>
-
+
- /> - + /> +
" /> - + - +
+ + + + + + + + + + + - -
- + + - - - - - - - - - - - - - - + + - + - + + - - - - - - -
- - - / - + + "> + "> + + + / + - + - - " class="btn btn-default btn-xs"> - " class="act_delete btn btn-default btn-xs"> - + " class="btn btn-default btn-xs"> + " class="act_delete btn btn-default btn-xs"> +
 
- -   -
- - - + +
 
+ +   +
+
-
+