Merge remote branch 'upstream/master'

Conflicts:
	etc/inc/filter.inc
	usr/local/www/themes/the_wall/rrdcolors.inc.php

12 files changed, 129 insertions, 75 deletions

diff --git a/usr/local/sbin/ovpn-linkup b/usr/local/sbin/ovpn-linkup
index 60489c2..613822c 100755
--- a/usr/local/sbin/ovpn-linkup
+++ b/usr/local/sbin/ovpn-linkup
@@ -2,7 +2,11 @@
 
 # let the configuration system know that the ip has changed.
 #/usr/local/sbin/pfSctl -c "interface newip $interface"
-/bin/echo $4 > /tmp/$1_router
+if [ -n $route_vpn_gateway ]; then
+	/bin/echo $route_vpn_gateway > /tmp/$1_router
+else
+	/bin/echo $4 > /tmp/$1_router
+fi
 /usr/bin/touch /tmp/$1up
 # reload filter 
 /usr/local/sbin/pfSctl -c "interface newip $1"
diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php
index 135dd99..e9f4577 100755
--- a/usr/local/www/firewall_nat_1to1_edit.php
+++ b/usr/local/www/firewall_nat_1to1_edit.php
@@ -288,7 +288,7 @@ function typesel_change() {
 						$interfaces['pppoe'] = "PPPoE VPN";
 
 					/* add ipsec interfaces */
-					if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
+					if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
 						if(have_ruleint_access("enc0"))
 							$interfaces["enc0"] = "IPsec";
 
diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index 361d324..3dc1d83 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -482,7 +482,7 @@ include("fbegin.inc"); ?>
 							$interfaces['pppoe'] = "PPPoE VPN";
 
 						/* add ipsec interfaces */
-						if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
+						if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
 							if(have_ruleint_access("enc0"))
 								$interfaces["enc0"] = "IPsec";
 
diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index db6d03d..4d960f2 100755
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -416,7 +416,7 @@ function poolopts_change() {
 					$interfaces['pppoe'] = "PPPoE VPN";
 
 				/* add ipsec interfaces */
-				if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
+				if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
 					if(have_ruleint_access("enc0"))
 						$interfaces["enc0"] = "IPsec";
 
diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index 1f511c6..81be4d4 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -169,7 +169,7 @@ if (is_array($config['pppoes']['pppoe'])) {
 }
 
 /* add ipsec interfaces */
-if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
+if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
 	if(have_ruleint_access("enc0")) 
 		$iflist["enc0"] = "IPsec";
 
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index a8a6fe3..542f832 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -699,7 +699,7 @@ include("head.inc");
 					if (is_pppoe_server_enabled() && have_ruleint_access("pppoe"))
 						$interfaces['pppoe'] = "PPPoE VPN";
 					/* add ipsec interfaces */
-					if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable']))
+					if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
 						if(have_ruleint_access("enc0")) 
 							$interfaces["enc0"] = "IPsec";
 					/* add openvpn/tun interfaces */
diff --git a/usr/local/www/status_graph.php b/usr/local/www/status_graph.php
index 4527a71..6c00da4 100755
--- a/usr/local/www/status_graph.php
+++ b/usr/local/www/status_graph.php
@@ -163,7 +163,7 @@ function updateBandwidthHosts(data){
 <?php
 
 /* link the ipsec interface magically */
-if (isset($config['ipsec']['enable']) || isset($config['ipsec']['mobileclients']['enable'])) 
+if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) 
 	$ifdescrs['enc0'] = "IPsec";
 
 ?>
diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php
index 00df6c1..553a629 100644
--- a/usr/local/www/status_rrd_graph_img.php
+++ b/usr/local/www/status_rrd_graph_img.php
@@ -350,7 +350,8 @@ if((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdatabas
 	$graphcmd .= "CDEF:\"$curif-bytes_t_block6=$curif-bytes_in6_t_block,$curif-bytes_out6_t_block,+\" ";
 	$graphcmd .= "CDEF:\"$curif-bytes_t6=$curif-bytes_in6_t_pass,$curif-bytes_out6_t_block,+\" ";
 	$graphcmd .= "VDEF:\"$curif-in_bits_95=$curif-in_bits,95,PERCENT\" ";
-	$graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits,95,PERCENT\" ";
+	$graphcmd .= "CDEF:\"$curif-out_bits_mul=$curif-out_bits,$multiplier,*\" ";
+	$graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits_mul,95,PERCENT\" ";
 
 	$graphcmd .= "AREA:\"$curif-in_bits_block#{$colortrafficdown[1]}:$curif-in-block\" ";
 	$graphcmd .= "AREA:\"$curif-in_bits_pass#{$colortrafficdown[0]}:$curif-in-pass:STACK\" ";
@@ -981,42 +982,42 @@ elseif((strstr($curdatabase, "-quality.rrd")) && (file_exists("$rrddbpath$curdat
 }
 elseif((strstr($curdatabase, "spamd.rrd")) && (file_exists("$rrddbpath$curdatabase"))) {
 	/* graph a spamd statistics graph */
-	$graphcmd = "$rrdtool graph $rrdtmppath$curdatabase-$curgraph.png ";
-	$graphcmd .= "--start $start --end $end ";
-	$graphcmd .= "--title \"`hostname` - {$prettydb} - {$hperiod} - {$havg} average\" ";
-	$graphcmd .= "--color SHADEA#eeeeee --color SHADEB#eeeeee ";
-	$graphcmd .= "--vertical-label=\"Conn / Time, sec.\" ";
-	$graphcmd .= "--height 200 --width 620 --no-gridfit ";
-	$graphcmd .= "--lower-limit 0 ";
-	$graphcmd .= "DEF:\"consmin=$rrddbpath$curdatabase:conn:MIN\" ";
-	$graphcmd .= "DEF:\"consavg=$rrddbpath$curdatabase:conn:AVERAGE\" ";
-	$graphcmd .= "DEF:\"consmax=$rrddbpath$curdatabase:conn:MAX\" ";
-	$graphcmd .= "DEF:\"timemin=$rrddbpath$curdatabase:time:MIN\" ";
-	$graphcmd .= "DEF:\"timeavg=$rrddbpath$curdatabase:time:AVERAGE\" ";
-	$graphcmd .= "DEF:\"timemax=$rrddbpath$curdatabase:time:MAX\" ";
-	$graphcmd .= "CDEF:\"timeminadj=timemin,0,86400,LIMIT,UN,0,timemin,IF\" ";
-	$graphcmd .= "CDEF:\"timeavgadj=timeavg,0,86400,LIMIT,UN,0,timeavg,IF\" ";
-	$graphcmd .= "CDEF:\"timemaxadj=timemax,0,86400,LIMIT,UN,0,timemax,IF\" ";
-	$graphcmd .= "CDEF:\"t1=timeminadj,timeavgadj,+,2,/,timeminadj,-\" ";
-	$graphcmd .= "CDEF:\"t2=timeavgadj,timemaxadj,+,2,/,timeminadj,-,t1,-\" ";
-	$graphcmd .= "CDEF:\"t3=timemaxadj,timeminadj,-,t1,-,t2,-\" ";
-	$graphcmd .= "AREA:\"timeminadj\" ";
-	$graphcmd .= "AREA:\"t1#$colorspamdtime[0]::STACK\" ";
-	$graphcmd .= "AREA:\"t2#$colorspamdtime[1]::STACK\" ";
-	$graphcmd .= "AREA:\"t3#$colorspamdtime[2]::STACK\" ";
-	$graphcmd .= "LINE2:\"timeavgadj#$colorspamdtime[3]:\"Time \" ";
-	$graphcmd .= "GPRINT:\"timeminadj:MIN:\"Min\\:%6.2lf\\t\" ";
-	$graphcmd .= "GPRINT:\"timeavgadj:AVERAGE:\"Avg\\:%6.2lf\\t\" ";
-	$graphcmd .= "GPRINT:\"timemaxadj:MAX:\"Max\\:%6.2lf\\n\" ";
-	$graphcmd .= "AREA:\"consmax#$colorspamdconn[0]\" ";
-	$graphcmd .= "AREA:\"consmin#$colorspamdconn[1]\" ";
-	$graphcmd .= "LINE1:\"consmin#$colorspamdconn[2]\" ";
-	$graphcmd .= "LINE1:\"consmax#$colorspamdconn[3]\" ";
-	$graphcmd .= "LINE1:\"consavg#$colorspamdconn[4]:\"Cons \" ";
-	$graphcmd .= "GPRINT:\"consmin:MIN:\"Min\\:%6.2lf\\t\" ";
-	$graphcmd .= "GPRINT:\"consavg:AVERAGE:\"Avg\\:%6.2lf\\t\" ";
-	$graphcmd .= "GPRINT:\"consmax:MAX:\"Max\\:%6.2lf\\n\" ";
-	$graphcmd .= "COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\" ";
+	$graphcmd = "$rrdtool graph $rrdtmppath$curdatabase-$curgraph.png \\
+		--start $start --end $end \\
+		--title \"`hostname` - {$prettydb} - {$hperiod} - {$havg} average\" \\
+		--color SHADEA#eeeeee --color SHADEB#eeeeee \\
+		--vertical-label=\"Conn / Time, sec.\" \\
+		--height 200 --width 620 --no-gridfit \\
+		--lower-limit 0 \\
+		DEF:consmin=$rrddbpath$curdatabase:conn:MIN \\
+		DEF:consavg=$rrddbpath$curdatabase:conn:AVERAGE \\
+		DEF:consmax=$rrddbpath$curdatabase:conn:MAX \\
+		DEF:timemin=$rrddbpath$curdatabase:time:MIN \\
+		DEF:timeavg=$rrddbpath$curdatabase:time:AVERAGE \\
+		DEF:timemax=$rrddbpath$curdatabase:time:MAX \\
+		\"CDEF:timeminadj=timemin,0,86400,LIMIT,UN,0,timemin,IF\" \\
+		\"CDEF:timeavgadj=timeavg,0,86400,LIMIT,UN,0,timeavg,IF\" \\
+		\"CDEF:timemaxadj=timemax,0,86400,LIMIT,UN,0,timemax,IF\" \\
+		\"CDEF:t1=timeminadj,timeavgadj,+,2,/,timeminadj,-\" \\
+		\"CDEF:t2=timeavgadj,timemaxadj,+,2,/,timeminadj,-,t1,-\" \\
+		\"CDEF:t3=timemaxadj,timeminadj,-,t1,-,t2,-\" \\
+		AREA:timeminadj \\
+		AREA:t1#$colorspamdtime[0]::STACK \\
+		AREA:t2#$colorspamdtime[1]::STACK \\
+		AREA:t3#$colorspamdtime[2]::STACK \\
+		LINE2:timeavgadj#$colorspamdtime[3]:\"Time \" \\
+		GPRINT:timeminadj:MIN:\"Min\\:%6.2lf\\t\" \\
+		GPRINT:timeavgadj:AVERAGE:\"Avg\\:%6.2lf\\t\" \\
+		GPRINT:timemaxadj:MAX:\"Max\\:%6.2lf\\n\" \\
+		AREA:consmax#$colorspamdconn[0] \\
+		AREA:consmin#$colorspamdconn[1] \\
+		LINE1:consmin#$colorspamdconn[2] \\
+		LINE1:consmax#$colorspamdconn[3] \\
+		LINE1:consavg#$colorspamdconn[4]:\"Cons \" \\
+		GPRINT:consmin:MIN:\"Min\\:%6.2lf\\t\" \\
+		GPRINT:consavg:AVERAGE:\"Avg\\:%6.2lf\\t\" \\
+		GPRINT:consmax:MAX:\"Max\\:%6.2lf\\n\" \\
+		COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\" ";
 }
 elseif((strstr($curdatabase, "-cellular.rrd")) && (file_exists("$rrddbpath$curdatabase"))) {
 	$graphcmd = "$rrdtool graph $rrdtmppath$curdatabase-$curgraph.png ";
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index e23ceb0..9f8b2d7 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -331,7 +331,7 @@ function prot_change() {
 								<td width="22%" valign="top" class="vncell"><?=gettext("WebGUI login messages"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="quietlogin" type="checkbox" id="quietlogin" value="yes" <?php if ($pconfig['quietlogin']) echo "checked"; ?> />
-									<strong><?=gettext("Disable webConfigurator successful logins"); ?></strong>
+									<strong><?=gettext("Disable logging of webConfigurator successful logins"); ?></strong>
 									<br/>
 									<?php echo gettext("When this is checked, successful logins to the webConfigurator " .
 									"will not be logged.");
diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php
index 6eddd39..3bf1165 100644
--- a/usr/local/www/system_camanager.php
+++ b/usr/local/www/system_camanager.php
@@ -84,6 +84,19 @@ if ($act == "del") {
 	$savemsg = sprintf(gettext("Certificate Authority %s successfully deleted"), $name) . "<br/>";
 }
 
+if ($act == "edit") {
+	if (!$a_ca[$id]) {
+		pfSenseHeader("system_camanager.php");
+		exit;
+	}
+	$pconfig['descr']  = $a_ca[$id]['descr'];
+	$pconfig['refid']  = $a_ca[$id]['refid'];
+	$pconfig['cert']   = base64_decode($a_ca[$id]['crt']);
+	$pconfig['serial'] = $a_ca[$id]['serial'];
+	if (!empty($a_ca[$id]['prv']))
+		$pconfig['key'] = base64_decode($a_ca[$id]['prv']);
+}
+
 if ($act == "new") {
 	$pconfig['method'] = $_GET['method'];
 	$pconfig['keylen'] = "2048";
@@ -169,26 +182,37 @@ if ($_POST) {
 	if (!$input_errors) {
 
 		$ca = array();
-		$ca['refid'] = uniqid();
+		if (!isset($pconfig['refid']) || empty($pconfig['refid']))
+			$ca['refid'] = uniqid();
+		else
+			$ca['refid'] = $pconfig['refid'];
+
 		if (isset($id) && $a_ca[$id])
 			$ca = $a_ca[$id];
 
-	    $ca['descr'] = $pconfig['descr'];
-
-		if ($pconfig['method'] == "existing")
-			ca_import($ca, $pconfig['cert'], $pconfig['key']);
-
-		if ($pconfig['method'] == "internal")
-		{
-			$dn = array(
-				'countryName' => $pconfig['dn_country'],
-				'stateOrProvinceName' => $pconfig['dn_state'],
-				'localityName' => $pconfig['dn_city'],
-				'organizationName' => $pconfig['dn_organization'],
-				'emailAddress' => $pconfig['dn_email'],
-				'commonName' => $pconfig['dn_commonname']);
-
-			ca_create($ca, $pconfig['keylen'], $pconfig['lifetime'], $dn);
+		$ca['descr'] = $pconfig['descr'];
+
+		if ($_POST['edit'] == "edit") {
+			$ca['descr']  = $pconfig['descr'];
+			$ca['refid']  = $pconfig['refid'];
+			$ca['serial'] = $pconfig['serial'];
+			$ca['crt']    = base64_encode($pconfig['cert']);
+			if (!empty($pconfig['key']))
+				$ca['prv']    = base64_encode($pconfig['key']);
+		} else {
+			if ($pconfig['method'] == "existing")
+				ca_import($ca, $pconfig['cert'], $pconfig['key'], $pconfig['serial']);
+
+			if ($pconfig['method'] == "internal") {
+				$dn = array(
+					'countryName' => $pconfig['dn_country'],
+					'stateOrProvinceName' => $pconfig['dn_state'],
+					'localityName' => $pconfig['dn_city'],
+					'organizationName' => $pconfig['dn_organization'],
+					'emailAddress' => $pconfig['dn_email'],
+					'commonName' => $pconfig['dn_commonname']);
+				ca_create($ca, $pconfig['keylen'], $pconfig['lifetime'], $dn);
+			}
 		}
 
 		if (isset($id) && $a_ca[$id])
@@ -250,9 +274,14 @@ function method_change() {
 		<td id="mainarea">
 			<div class="tabcont">
 
-				<?php if ($act == "new" || $act == gettext("Save") || $input_errors): ?>
+				<?php if ($act == "new" || $act == "edit" || $act == gettext("Save") || $input_errors): ?>
 
 				<form action="system_camanager.php" method="post" name="iform" id="iform">
+					<?php if ($act == "edit"): ?>
+					<input type="hidden" name="edit" value="edit" id="edit">
+					<input type="hidden" name="id" value="<?php echo $id; ?>" id="id">
+					<input type="hidden" name="refid" value="<?php echo $pconfig['refid']; ?>" id="refid">
+					<?php endif; ?>
 					<table width="100%" border="0" cellpadding="6" cellspacing="0">
 						<tr>
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td>
@@ -260,7 +289,7 @@ function method_change() {
 								<input name="descr" type="text" class="formfld unknown" id="descr" size="20" value="<?=htmlspecialchars($pconfig['descr']);?>"/>
 							</td>
 						</tr>
-						<?php if (!isset($id)): ?>
+						<?php if (!isset($id) || $act == "edit"): ?>
 						<tr>
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Method");?></td>
 							<td width="78%" class="vtable">
@@ -303,6 +332,15 @@ function method_change() {
 								<?=gettext("Paste the private key for the above certificate here. This is optional in most cases, but required if you need to generate a Certificate Revocation List (CRL).");?></td>
 							</td>
 						</tr>
+
+					<?php if (!isset($id) || $act == "edit"): ?>
+						<tr>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Serial");?></td>
+							<td width="78%" class="vtable">
+								<input name="serial" type="text" class="formfld unknown" id="serial" size="20" value="<?=htmlspecialchars($pconfig['serial']);?>"/>
+							</td>
+						</tr>
+					<?php endif; ?>
 					</table>
 
 					<table width="100%" border="0" cellpadding="6" cellspacing="0" id="internal">
@@ -482,6 +520,9 @@ function method_change() {
 						<td class="listr"><?=$certcount;?>&nbsp;</td>
 						<td class="listr"><?=$subj;?>&nbsp;</td>
 						<td valign="middle" nowrap class="list">
+							<a href="system_camanager.php?act=edit&id=<?=$i;?>")">
+								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("export ca");?>" alt="<?=gettext("edit ca");?>" width="17" height="17" border="0" />
+							</a>
 							<a href="system_camanager.php?act=exp&id=<?=$i;?>")">
 								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export ca");?>" alt="<?=gettext("export ca");?>" width="17" height="17" border="0" />
 							</a>
diff --git a/usr/local/www/system_crlmanager.php b/usr/local/www/system_crlmanager.php
index 90b61d6..67e4b2f 100644
--- a/usr/local/www/system_crlmanager.php
+++ b/usr/local/www/system_crlmanager.php
@@ -253,14 +253,14 @@ include("head.inc");
 
 function method_change() {
 
-	method = document.iform.method.selectedIndex;
+	method = document.iform.method.value;
 
 	switch (method) {
-		case 0:
+		case "internal":
 			document.getElementById("existing").style.display="none";
 			document.getElementById("internal").style.display="";
 			break;
-		case 1:
+		case "existing":
 			document.getElementById("existing").style.display="";
 			document.getElementById("internal").style.display="none";
 			break;
@@ -302,6 +302,8 @@ function method_change() {
 								<select name='method' id='method' class="formselect" onchange='method_change()'>
 								<?php
 									foreach($crl_methods as $method => $desc):
+									if (($_GET['importonly'] == "yes") && ($method != "existing"))
+										continue;
 									$selected = "";
 									if ($pconfig['method'] == $method)
 										$selected = "selected";
@@ -502,9 +504,9 @@ function method_change() {
 
 							if($ca['prv']) {
 								$caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png";
-								$internal = "YES";
+								$cainternal = "YES";
 							} else 
-								continue;
+								$cainternal = "NO";
 					?>
 					<tr>
 						<td class="listlr" colspan="4">
@@ -520,9 +522,15 @@ function method_change() {
 							</table>
 						</td>
 						<td class="list">
+						<?php if ($cainternal == "YES"): ?>
 							<a href="system_crlmanager.php?act=new&caref=<?php echo $ca['refid']; ?>">
 								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("Add or Import CRL for ") . $ca['descr'];?>" alt="<?=gettext("add crl");?>" width="17" height="17" border="0" />
 							</a>
+						<?php else: ?>
+							<a href="system_crlmanager.php?act=new&caref=<?php echo $ca['refid']; ?>&importonly=yes">
+								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("Import CRL for ") . $ca['descr'];?>" alt="<?=gettext("add crl");?>" width="17" height="17" border="0" />
+							</a>
+						<?php endif; ?>
 						</td>
 					</tr>
 					
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")