Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp

Conflicts:
	usr/local/www/interfaces.php

2 files changed, 18 insertions, 19 deletions

diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php
index 58e8351..e8e9409 100755
--- a/usr/local/www/diag_dhcp_leases.php
+++ b/usr/local/www/diag_dhcp_leases.php
@@ -354,7 +354,7 @@ foreach ($leases as $data) {
 		echo "<tr>\n";
                 echo "<td class=\"listlr\">{$fspans}{$data['ip']}{$fspane}&nbsp;</td>\n";
                 if ($data['online'] != "online") {
-                        echo "<td class=\"listr\">{$fspans}<a href=\"services_wol.php?if={$data['if']}&mac={$data['mac']}\" title=\"send Wake on Lan packet to mac\">{$data['mac']}</a>{$fspane}&nbsp;</td>\n";
+                        echo "<td class=\"listr\">{$fspans}<a href=\"services_wol.php?if={$data['if']}&mac={$data['mac']}\" title=\"send Wake on LAN packet to this MAC address\">{$data['mac']}</a>{$fspane}&nbsp;</td>\n";
                 } else {
                 	echo "<td class=\"listr\">{$fspans}{$data['mac']}{$fspane}&nbsp;</td>\n";
                 }
@@ -378,12 +378,12 @@ foreach ($leases as $data) {
 		}
 
                 echo "<td valign=\"middle\"><a href=\"services_wol_edit.php?if={$data['if']}&mac={$data['mac']}&descr={$data['hostname']}\">";
-		echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_wol_all.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"add a Wake on Lan mapping for this MAC address\"></a></td>\n";
+		echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_wol_all.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"add a Wake on LAN mapping for this MAC address\"></a></td>\n";
 
 		/* Only show the button for offline dynamic leases */
 		if (($data['type'] == "dynamic") && ($data['online'] != "online")) {
 			echo "<td class=\"list\" valign=\"middle\"><a href=\"diag_dhcp_leases.php?deleteip={$data['ip']}&all={$_GET['all']}\">";
-			echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_x.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"delete this dhcp lease\"></a></td>\n";
+			echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_x.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"delete this DHCP lease\"></a></td>\n";
 		}
                 echo "</tr>\n";
 	}
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 8a9d0a2..1cda057 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -985,12 +985,11 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe"
 								<select name="type" onChange="updateType(this.value);" class="formselect" id="type">
 								<?php 
 									foreach ($types as $key => $opt) { 
-										//echo "<option onClick=\"updateType('{$key}');\"";
-										echo "<option";
-										$select = "";
+										echo "<option onClick=\"updateType('{$key}');\"";
 										if ($key == $pconfig['type']) 
-											$select = "selected";
-										echo " value=\"{$key}\" {$select}>" . htmlspecialchars($opt) . "</option>";
+											echo " selected";
+										echo " value=\"{$key}\" >" . htmlspecialchars($opt);
+										echo "</option>";
 									} 
 								?>
 								</select>
@@ -1345,16 +1344,16 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe"
 						<tr>
 							<td valign="top" class="vncellreq">Standard</td>
 							<td class="vtable">
-								<select name="standard" class="formselect" id="standard">
-									<?php
-									foreach($wl_modes as $wl_standard => $wl_channels) {
-										echo "<option ";
-										if ($pconfig['standard'] == "$wl_standard")
-											echo "selected ";
-										echo "value=\"$wl_standard\">802.$wl_standard</option>\n";
-									}
-									?>
-								</select>
+							<select name="standard" class="formselect" id="standard">
+								<?php
+								foreach($wl_modes as $wl_standard => $wl_channels) {
+									echo "<option ";
+									if ($pconfig['standard'] == "$wl_standard")
+										echo "selected ";
+									echo "value=\"$wl_standard\">802.$wl_standard</option>\n";
+								}
+								?>
+							</select>
 							</td>
 						</tr>
 						<?php if (isset($wl_modes['11g'])): ?>
@@ -1748,6 +1747,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe"
 						</tr>
 					</table> <!-- End "allcfg" table -->
 					</div> <!-- End "allcfg" div -->
+
 					<table width="100%" border="0" cellpadding="6" cellspacing="0">
 						<tr>
 							<td width="100" valign="top">
@@ -1852,7 +1852,6 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe"
 		else
 			echo "show_allcfg(document.iform.enable);";
 		echo "updateType('{$pconfig['type']}');\n";
-		?>
 	</script>
 	<?php include("fend.inc"); ?>
 	</body>