Merge commit 'mainline/master'

3 files changed, 13 insertions, 6 deletions

diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index d8a9fb6..6c91743 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -434,16 +434,20 @@ include("fbegin.inc"); ?>
 				<?php endif; ?>
                 <?php if ((!(isset($id) && $a_nat[$id])) || (isset($_GET['dup']))): ?>
                 <tr>
-                  <td width="22%" valign="top">Filter rule association</td>
+                  <td width="22%" valign="top" class="vncell">Filter rule association</td>
                   <td width="78%">
                     <select name="filter-rule-association" id="filter-rule-association">
 						<option value="">None</option>
-						<option value="add-associated" selected="selected">Add associated rule</option>
-						<option value="add-unassociated">Add unassociated rule</option>
+						<option value="add-associated" selected="selected">Add associated filter rule</option>
+						<option value="add-unassociated">Add unassociated filter rule</option>
 						<option value="pass">Pass</option>
 					</select>
 				  </td>
                 </tr><?php endif; ?>
+				<tr>
+                  <td width="22%" valign="top">&nbsp;</td>
+                  <td width="78%">&nbsp;</td>
+				</tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%">
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 64d9662..0312974 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -286,6 +286,9 @@ if ($_POST) {
 			$input_errors[] = "An interface with the specified description already exists.";
 	}
 	/* input validation */
+	if (isset($config['dhcpd']) && isset($config['dhcpd'][$if]) && $_POST['type'] != "static")
+		$input_errors[] = "Dhcpd service is active on this interface and it can be used only with a static ip configuration. Please disable the service first and than change the interface configuration.";
+
 	if ($_POST['type'] == "static") {
 		$reqdfields = explode(" ", "ipaddr subnet gateway");
 		$reqdfieldsn = explode(",", "IP address,Subnet bit count,Gateway");
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php
index bf0b92f..0955efc 100755
--- a/usr/local/www/system_firmware.php
+++ b/usr/local/www/system_firmware.php
@@ -50,10 +50,10 @@ require_once("xmlrpc_client.inc");
 ini_set('max_execution_time', '9999');
 ini_set('max_input_time', '9999');
 
-function file_is_for_platform($filename) {
+function file_is_for_platform($filename, $ul_name) {
 	global $g;
 	if($g['platform'] == "nanobsd") {
-		if(stristr($filename, "nanobsd"))
+		if(stristr($ul_name, "nanobsd"))
 			return true;
 		else
 			return false;		
@@ -140,7 +140,7 @@ if ($_POST && !is_subsystem_dirty('firmwarelock')) {
 			    $errortext = "(" . file_upload_error_message($_FILES['ulfile']['error']) . ")";
 			if (is_uploaded_file($_FILES['ulfile']['tmp_name'])) {
 				/* verify firmware image(s) */
-				if (file_is_for_platform($_FILES['ulfile']['tmp_name']) == false && !$_POST['sig_override'])
+				if (file_is_for_platform($_FILES['ulfile']['tmp_name'], $_FILES['ulfile']['name']) == false && !$_POST['sig_override'])
 					$input_errors[] = "The uploaded image file is not for this platform ({$g['platform']}).";
 				else if (!file_exists($_FILES['ulfile']['tmp_name'])) {
 					/* probably out of memory for the MFS */