diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-04-12 10:39:20 +0200 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-04-12 10:39:20 +0200 |
| commit | 86966fba757f554967773f518ef707f461b84636 (patch) | |
| tree | 90318ca3a7fe4151b851ec768055d095b8bc01be /usr/local/www/vpn_openvpn_server.php | |
| parent | d68647a11a553ad6bec1993385196b4ecdba5a46 (diff) | |
| parent | d7f4030ad861859312c20510bbe788be67c2454b (diff) | |
| download | pfsense-86966fba757f554967773f518ef707f461b84636.zip pfsense-86966fba757f554967773f518ef707f461b84636.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/filter.inc
usr/local/www/themes/the_wall/rrdcolors.inc.php
Diffstat (limited to 'usr/local/www/vpn_openvpn_server.php')
| -rw-r--r-- | usr/local/www/vpn_openvpn_server.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index ef82716..cc38e65 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -91,7 +91,7 @@ if($_GET['act']=="new"){ $pconfig['tlsauth_enable'] = "yes"; $pconfig['autotls_enable'] = "yes"; $pconfig['dh_length'] = 1024; - $pconfig['device_mode'] = "tun"; + $pconfig['dev_mode'] = "tun"; $pconfig['interface'] = "wan"; $pconfig['local_port'] = openvpn_port_next('UDP'); $pconfig['pool_enable'] = "yes"; @@ -105,7 +105,7 @@ if($_GET['act']=="edit"){ $pconfig['mode'] = $a_server[$id]['mode']; $pconfig['protocol'] = $a_server[$id]['protocol']; $pconfig['authmode'] = $a_server[$id]['authmode']; - $pconfig['device_mode'] = $a_server[$id]['device_mode']; + $pconfig['dev_mode'] = $a_server[$id]['dev_mode']; $pconfig['interface'] = $a_server[$id]['interface']; if (!empty($a_server[$id]['ipaddr'])) { $pconfig['interface'] = $pconfig['interface'] . '|' . $a_server[$id]['ipaddr']; @@ -306,7 +306,7 @@ if ($_POST) { if (!empty($pconfig['authmode'])) $server['authmode'] = implode(",", $pconfig['authmode']); $server['protocol'] = $pconfig['protocol']; - $server['device_mode'] = $pconfig['device_mode']; + $server['dev_mode'] = $pconfig['dev_mode']; list($server['interface'], $server['ipaddr']) = explode ("|",$pconfig['interface']); $server['local_port'] = $pconfig['local_port']; $server['description'] = $pconfig['description']; @@ -668,12 +668,12 @@ if ($savemsg) <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Device Mode"); ?></td> <td width="78%" class="vtable"> - <select name="device_mode" class="formselect"> + <select name="dev_mode" class="formselect"> <?php foreach ($openvpn_dev_mode as $device): $selected = ""; - if (! empty($pconfig['device_mode'])) { - if ($pconfig['device_mode'] == $device) + if (! empty($pconfig['dev_mode'])) { + if ($pconfig['dev_mode'] == $device) $selected = "selected"; } else { if ($device == "tun") |
