diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2008-04-26 02:07:01 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2008-04-26 02:07:01 +0000 |
commit | a007827a72bc83991e4ecf4b0aaefee217ad45cb (patch) | |
tree | 8cd62af28fc6ab6dc3f9f3f74a9363a6737b5d33 /usr | |
parent | 3ade6a7d490089f4bdad9274c300d82d5565ac3c (diff) | |
download | pfsense-a007827a72bc83991e4ecf4b0aaefee217ad45cb.zip pfsense-a007827a72bc83991e4ecf4b0aaefee217ad45cb.tar.gz |
Begin adding OpenVPN users feature.
Diffstat (limited to 'usr')
-rw-r--r-- | usr/local/pkg/openvpn.xml | 8 | ||||
-rw-r--r-- | usr/local/pkg/openvpn_cli.xml | 14 | ||||
-rw-r--r-- | usr/local/pkg/openvpn_csc.xml | 14 | ||||
-rwxr-xr-x | usr/local/www/guiconfig.inc | 10 | ||||
-rw-r--r-- | usr/local/www/vpn_openvpn_certs.php | 9 |
5 files changed, 39 insertions, 16 deletions
diff --git a/usr/local/pkg/openvpn.xml b/usr/local/pkg/openvpn.xml index 9a2aef1..647affd 100644 --- a/usr/local/pkg/openvpn.xml +++ b/usr/local/pkg/openvpn.xml @@ -15,13 +15,17 @@ <url>/pkg.php?xml=openvpn_cli.xml</url> </tab> <tab> - <text>Client-specific configuration</text> + <text>Client-specific overrides</text> <url>/pkg.php?xml=openvpn_csc.xml</url> </tab> <tab> - <text>Certificate generation</text> + <text>Certificate Authority</text> <url>/vpn_openvpn_certs.php</url> </tab> + <tab> + <text>Users</text> + <url>/vpn_openvpn_users.php</url> + </tab> </tabs> <adddeleteeditpagefields> <columnitem> diff --git a/usr/local/pkg/openvpn_cli.xml b/usr/local/pkg/openvpn_cli.xml index 2a2e2d7..528fc7a 100644 --- a/usr/local/pkg/openvpn_cli.xml +++ b/usr/local/pkg/openvpn_cli.xml @@ -15,13 +15,17 @@ <active/> </tab> <tab> - <text>Client-specific configuration</text> + <text>Client-specific overrides</text> <url>/pkg.php?xml=openvpn_csc.xml</url> </tab> - <tab> - <text>Certificate generation</text> - <url>/vpn_openvpn_certs.php</url> - </tab> + <tab> + <text>Certificate Authority</text> + <url>/vpn_openvpn_certs.php</url> + </tab> + <tab> + <text>Users</text> + <url>/vpn_openvpn_users.php</url> + </tab> </tabs> <adddeleteeditpagefields> <columnitem> diff --git a/usr/local/pkg/openvpn_csc.xml b/usr/local/pkg/openvpn_csc.xml index 70739ce..0e2f986 100644 --- a/usr/local/pkg/openvpn_csc.xml +++ b/usr/local/pkg/openvpn_csc.xml @@ -14,14 +14,18 @@ <url>/pkg.php?xml=openvpn_cli.xml</url> </tab> <tab> - <text>Client-specific configuration</text> + <text>Client-specific overrides</text> <url>/pkg.php?xml=openvpn_csc.xml</url> <active/> </tab> - <tab> - <text>Certificate generation</text> - <url>/vpn_openvpn_certs.php</url> - </tab> + <tab> + <text>Certificate Authority</text> + <url>/vpn_openvpn_certs.php</url> + </tab> + <tab> + <text>Users</text> + <url>/vpn_openvpn_users.php</url> + </tab> </tabs> <adddeleteeditpagefields> <columnitem> diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 7dfd164..4e55472 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -447,6 +447,16 @@ function pptpd_users_sort() { usort($config['pptpd']['user'], "usercmp"); } +function openvpn_users_sort() { + global $g, $config; + + function usercmp($a, $b) { + return strcasecmp($a['name'], $b['name']); + } + + usort($config['openvpn']['user'], "usercmp"); +} + function pppoe_users_sort() { global $g, $config; diff --git a/usr/local/www/vpn_openvpn_certs.php b/usr/local/www/vpn_openvpn_certs.php index 40ba6a9..d4c99cd 100644 --- a/usr/local/www/vpn_openvpn_certs.php +++ b/usr/local/www/vpn_openvpn_certs.php @@ -71,10 +71,11 @@ include("head.inc"); <tr><td> <?php $tab_array = array(); - $tab_array[0] = array("Server", false, "pkg.php?xml=openvpn.xml"); - $tab_array[1] = array("Client", false, "pkg.php?xml=openvpn_cli.xml"); - $tab_array[2] = array("Client-specific configuration", false, "pkg.php?xml=openvpn_csc.xml"); - $tab_array[3] = array("Certificate generation", true, "vpn_openvpn_certs.php"); + $tab_array[] = array("Server", false, "/pkg.php?xml=openvpn.xml"); + $tab_array[] = array("Client", false, "/pkg.php?xml=openvpn_cli.xml"); + $tab_array[] = array("Client-specific configuration", false, "openvpn_csc.xml"); + $tab_array[] = array("Certificate Authority", true, "/vpn_openvpn_certs.php"); + $tab_array[] = array("Users", false, "vpn_openvpn_users.php"); display_top_tabs($tab_array); ?> </td></tr> |