Merge remote branch 'mainline/master'

5 files changed, 10 insertions, 8 deletions

diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php
index 2c780b6..817c00f 100644
--- a/usr/local/www/edit.php
+++ b/usr/local/www/edit.php
@@ -56,6 +56,7 @@ if($_REQUEST['action']) {
 				echo "|No file name specified.|";
 			} else {
 				conf_mount_rw();
+				$_REQUEST['data'] = str_replace("\r", "", $_REQUEST['data']);
 				$ret = file_put_contents($_REQUEST['file'], $_REQUEST['data']);
 				conf_mount_ro();
 				if($_REQUEST['file'] == "config.xml")
diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
index 1d2e634..f4b4567 100755
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -72,7 +72,7 @@ if ($_POST) {
                         		interface_ipalias_configure($a_vip[$vid]);
                         		break;
                 		case "proxyarp":
-                        		interface_proxyarp_configure();
+                        		interface_proxyarp_configure($a_vip[$vid]['interface']);
                         		break;
                 		case "carp":
                         		interface_carp_configure($a_vip[$vid]);
@@ -85,6 +85,7 @@ if ($_POST) {
 				}
                 	}
         	}
+		@unlink("{$g['tmp_path']}/firewall_virtual_ip.apply");
 		$retval = 0;
 		$retval |= filter_configure();
 		$savemsg = get_std_save_message($retval);
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 0463750..68755f9 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -165,7 +165,7 @@ EOF;
 	if ($fd) {
 		while (!feof($fd)) {
 			$dmesgl = fgets($fd);
-			if (preg_match("/^hifn.: (.*?),/", $dmesgl, $matches) or preg_match("/.*(VIA Padlock)/", $dmesgl, $matches) or preg_match("/^safe.: (.*?),/", $dmesgl, $matches) or preg_match("/^ubsec.: (.*?),/", $dmesgl, $matches) or preg_match("/^padlock.: <(.*?)>,/", $dmesgl, $matches) or preg_match("/^glxsb.: (.*?),/", $dmesgl, $matches)) {
+			if (preg_match("/^hifn.: (.*?),/", $dmesgl, $matches) or preg_match("/.*(VIA Padlock)/", $dmesgl, $matches) or preg_match("/^safe.: (\w.*)/", $dmesgl, $matches) or preg_match("/^ubsec.: (.*?),/", $dmesgl, $matches) or preg_match("/^padlock.: <(.*?)>,/", $dmesgl, $matches) or preg_match("/^glxsb.: (.*?),/", $dmesgl, $matches)) {
 				$hwcrypto = $matches[1];
 				break;
 			}
diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php
index 11b74fd..52d6a93 100755
--- a/usr/local/www/status_interfaces.php
+++ b/usr/local/www/status_interfaces.php
@@ -151,10 +151,10 @@ include("head.inc");
 	</tr>
 	<?php  endif; if ($ifinfo['ppp_uptime'] || $ifinfo['ppp_uptime_accumulated']): ?>
 	<tr>
-                <td width="22%" class="vncellt">PPP uptime (historical)</td>
-                <td width="78%" class="listr">
-			<span id="uptime"><?=htmlspecialchars($ifinfo['ppp_uptime']);?></span><span id="uptime_hist"> (<?=htmlspecialchars($ifinfo['ppp_uptime_accumulated']);?>)</span>&nbsp;&nbsp;
-                </td>
+		<td width="22%" class="vncellt">Uptime <?php if ($ifinfo['ppp_uptime_accumulated']) echo "(historical)"; ?></td>
+		<td width="78%" class="listr">
+			<?=htmlspecialchars($ifinfo['ppp_uptime']);?> <?=htmlspecialchars($ifinfo['ppp_uptime_accumulated']);?>
+		</td>
         </tr>
 	<?php  endif; if ($ifinfo['macaddr']): ?>
 	<tr>
diff --git a/usr/local/www/status_wireless.php b/usr/local/www/status_wireless.php
index 37ef825..751810a 100755
--- a/usr/local/www/status_wireless.php
+++ b/usr/local/www/status_wireless.php
@@ -50,7 +50,7 @@ if(empty($if)) {
 	/* Find the first interface
 	   that is wireless */
 	foreach($ciflist as $interface => $ifdescr) {
-		if(is_interface_wireless($interface))
+		if(is_interface_wireless(get_real_interface($interface)))
 			$if = $interface;
 	}
 }
@@ -68,7 +68,7 @@ include("fbegin.inc");
 <?php
 $tab_array = array();
 foreach($ciflist as $interface => $ifdescr) {
-	if (is_interface_wireless($interface)) {
+	if (is_interface_wireless(get_real_interface($interface))) {
 		$enabled = false;
 		if($if == $interface)
 			$enabled = true;