Merge branch 'master' into gettext

Resolved conflicts:
	usr/local/www/system_advanced_firewall.php
	usr/local/www/system_routes.php
	usr/local/www/system_routes_edit.php

8 files changed, 53 insertions, 29 deletions

diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index 0ad4d4f..65e1e41 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -728,7 +728,7 @@ function display_row($trc, $value, $fieldname, $type, $rowhelper, $size) {
 		  	} else {
 				$source_value = $opt[$rowhelper['value']];
 		  	}
-			if($opt['value'] == $value) 
+			if($source_value == $value) 
 				$selected = " SELECTED";
 			$text .= "<option value='" . $source_value . "'" . $selected . ">" . $source_name . "</option>";
 			echo "<option value='" . $source_value . "'" . $selected . ">" . $source_name . "</option>\n";
diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php
index a4c17e7..81a4b6b 100644
--- a/usr/local/www/system_advanced_firewall.php
+++ b/usr/local/www/system_advanced_firewall.php
@@ -59,6 +59,7 @@ $pconfig['disablenatreflection'] = $config['system']['disablenatreflection'];
 $pconfig['reflectiontimeout'] = $config['system']['reflectiontimeout'];
 $pconfig['bypassstaticroutes'] = isset($config['filter']['bypassstaticroutes']);
 $pconfig['disablescrub'] = isset($config['system']['disablescrub']);
+$pconfig['tftpinterface'] = $config['system']['tftpinterface']; 
 
 if ($_POST) {
 
@@ -321,7 +322,7 @@ function update_description(itemnum) {
 											<option value="<?=$ifent;?>" <?php if (stristr($pconfig['tftpinterface'], $ifent)) echo "selected"; ?>><?=gettext($ifdesc);?></option>
 <?php									endforeach; ?>
 									</select>
-									<strong><?=gettext("Choose the interfaces where you want TFTP proxy help to be enabled.");?></strong>
+									<strong><?=gettext("Choose the interfaces where you want TFTP proxy helper to be enabled.");?></strong>
 								</td>
 							</tr>
 							<tr>
diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php
index 9defed7..9057afc 100755
--- a/usr/local/www/system_routes.php
+++ b/usr/local/www/system_routes.php
@@ -47,11 +47,8 @@ require_once("shaper.inc");
 if (!is_array($config['staticroutes']['route']))
 	$config['staticroutes']['route'] = array();
 
-if (!is_array($config['gateways']['gateway_item']))
-	$config['gateways']['gateway_item'] = array();
-
 $a_routes = &$config['staticroutes']['route'];
-$a_gateways = &$config['gateways']['gateway_item'];
+$a_gateways = return_gateways_array(true);
 $changedesc = gettext("Static Routes") . ": ";
 
 if ($_POST) {
@@ -92,6 +89,7 @@ if ($_POST) {
 if ($_GET['act'] == "del") {
 	if ($a_routes[$_GET['id']]) {
 		$changedesc .= gettext("removed route to") . " " . $a_routes[$_GET['id']['route']];
+		mwexec("/sbin/route delete " . escapeshellarg($a_routes[$_GET['id']]['network']));
 		unset($a_routes[$_GET['id']]);
 		write_config($changedesc);
 		mark_subsystem_dirty('staticroutes');
@@ -160,17 +158,12 @@ include("head.inc");
                   </td>
                   <td class="listr" ondblclick="document.location='system_routes_edit.php?id=<?=$i;?>';">
 			<?php
-				echo $route['gateway'] . " ";
+				echo $a_gateways[$route['gateway']]['name'] . " ";
 			?>
                   </td>
                   <td class="listr" ondblclick="document.location='system_routes_edit.php?id=<?=$i;?>';">
 			<?php
-				foreach($a_gateways as $gateway) {
-					if($gateway['name'] == $route['gateway']) {
-						echo strtoupper($gateway['interface']) . " ";
-					}
-				}
-
+				echo convert_friendly_interface_to_friendly_descr($a_gateways[$route['gateway']]['friendlyiface']) . " ";
 			?>
                   </td>
                   <td class="listbg" ondblclick="document.location='system_routes_edit.php?id=<?=$i;?>';">
diff --git a/usr/local/www/system_routes_edit.php b/usr/local/www/system_routes_edit.php
index b8e7fa0..3fce917 100755
--- a/usr/local/www/system_routes_edit.php
+++ b/usr/local/www/system_routes_edit.php
@@ -57,11 +57,9 @@ require("guiconfig.inc");
 
 if (!is_array($config['staticroutes']['route']))
 	$config['staticroutes']['route'] = array();
-if (!is_array($config['gateways']['gateway_item']))
-	$config['gateways']['gateway_item'] = array();
 
 $a_routes = &$config['staticroutes']['route'];
-$a_gateways = &$config['gateways']['gateway_item'];
+$a_gateways = return_gateways_array(true);
 
 $id = $_GET['id'];
 if (isset($_POST['id']))
@@ -102,13 +100,7 @@ if ($_POST) {
 		$input_errors[] = gettext("A valid destination network bit count must be specified.");
 	}
 	if ($_POST['gateway']) {
-		$match = false;
-		foreach($a_gateways as $gateway) {
-			if(in_array($_POST['gateway'], $gateway)) {
-				$match = true;
-			}
-		}
-		if(!$match)
+		if (!isset($a_gateways[$_POST['gateway']]))
 			$input_errors[] = gettext("A valid gateway must be specified.");
 	}
 
@@ -177,11 +169,19 @@ include("head.inc");
                   <td width="78%" class="vtable">
 			<select name="gateway" id="gateway" class="formselect">
 			<?php
-				foreach ($a_gateways as $gateway): ?>
-	                      <option value="<?=$gateway['name'];?>" <?php if ($gateway['name'] == $pconfig['gateway']) echo "selected"; ?>> 
-	                      <?=htmlspecialchars($gateway['name']);?>
-                      </option>
-                      <?php endforeach; ?>
+				foreach ($a_gateways as $gateway) {
+					if ($gateway['attribute'] == "system") {
+	                      			echo "<option value='{$gateway['friendlyiface']}' ";
+						if ($gateway['friendlyiface'] == $pconfig['gateway'])
+							echo "selected";
+					} else {
+	                      			echo "<option value='{$gateway['name']}' ";
+						if ($gateway['name'] == $pconfig['gateway'])
+							echo "selected";
+					}
+	                      		echo ">" . htmlspecialchars($gateway['name']) . "</option>\n";
+				}
+			?>
                     </select> <br />
 			<div id='addgwbox'>
 				<?=gettext("Choose which gateway this route applies to or"); ?> <a OnClick="show_add_gateway();" href="#">add a new one</a>.
diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php
index 1298852..289d7fe 100755
--- a/usr/local/www/system_usermanager_settings.php
+++ b/usr/local/www/system_usermanager_settings.php
@@ -125,7 +125,7 @@ if(!$pconfig['backend'])
                         <td width="78%" class="vtable">
 				<input name="session_timeout" id="session_timeout" type="text" size="8" value="<?=htmlspecialchars($pconfig['session_timeout']);?>" />
                           	<br />
-                          	<?=gettext("Time in minutes to expire idle management sessions. The default is 4 hours (240 minutes). <br/> 0 means to never expire sessions. NOTE: This is a security risk!");?><br />
+                          	<?=gettext("Time in minutes to expire idle management sessions. The default is 4 hours (240 minutes). <br/> Enter 0 to never expire sessions. NOTE: This is a security risk!");?><br />
 			</td>
 		</tr>
 		<tr>
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index fdf4af4..4f0d59d 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -112,6 +112,7 @@ if($_GET['act']=="edit"){
 		$pconfig['passtos'] = $a_server[$id]['passtos'];
 		$pconfig['client2client'] = $a_server[$id]['client2client'];
 
+		$pconfig['dynamic_ip'] = $a_server[$id]['dynamic_ip'];
 		$pconfig['pool_enable'] = $a_server[$id]['pool_enable'];
 
 		$pconfig['dns_domain'] = $a_server[$id]['dns_domain'];
@@ -299,6 +300,7 @@ if ($_POST) {
 		$server['passtos'] = $pconfig['passtos'];
 		$server['client2client'] = $pconfig['client2client'];
 
+		$server['dynamic_ip'] = $pconfig['dynamic_ip'];
 		$server['pool_enable'] = $pconfig['pool_enable'];
 
 		if ($pconfig['dns_domain_enable'])
@@ -906,6 +908,24 @@ function netbios_change() {
 						<td colspan="2" valign="top" class="listtopic">Client Settings</td>
 					</tr>
 					<tr>
+						<td width="22%" valign="top" class="vncell">Dynamic IP</td>
+						<td width="78%" class="vtable">
+							<table border="0" cellpadding="2" cellspacing="0">
+								<tr>
+									<td>
+										<?php set_checked($pconfig['dynamic_ip'],$chk); ?>
+										<input name="dynamic_ip" type="checkbox" id="dynamic_ip" value="yes" <?=$chk;?>">
+									</td>
+									<td>
+										<span class="vexpl">
+											Allow connected clients to retain their connections if their IP address changes.<br>
+										</span>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+					<tr>
 						<td width="22%" valign="top" class="vncell">Address Pool</td>
 						<td width="78%" class="vtable">
 							<table border="0" cellpadding="2" cellspacing="0">
diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc
index eea1a85..9be787c 100644
--- a/usr/local/www/wizards/openvpn_wizard.inc
+++ b/usr/local/www/wizards/openvpn_wizard.inc
@@ -538,6 +538,8 @@ function step12_submitphpaction() {
 		$server['passtos'] = $pconfig['step10']['tos'];
 	if (isset($pconfig['step10']['interclient']))
 		$server['client2client'] = $pconfig['step10']['interclient'];
+	if (isset($pconfig['step10']['dynip']))
+		$server['dynamic_ip'] = $pconfig['step10']['dynip'];
 	if (isset($pconfig['step10']['addrpool']))
 		$server['pool_enable'] = $pconfig['step10']['addrpool'];
 	if (isset($pconfig['step10']['defaultdomain']))
diff --git a/usr/local/www/wizards/openvpn_wizard.xml b/usr/local/www/wizards/openvpn_wizard.xml
index 2bc6db1..bba38c8 100644
--- a/usr/local/www/wizards/openvpn_wizard.xml
+++ b/usr/local/www/wizards/openvpn_wizard.xml
@@ -757,6 +757,14 @@
 			<name>Client Settings</name>
 		</field>
 		<field>
+			<displayname>Dynamic IP</displayname>
+			<name>dynip</name>
+			<type>checkbox</type>
+			<value>on</value>
+			<description>Allow connected clients to retain their connections if their IP address changes.</description>
+			<bindstofield>ovpnserver->step10->dynip</bindstofield>
+		</field>
+		<field>
 			<displayname>Address Pool</displayname>
 			<name>addrpool</name>
 			<type>checkbox</type>