Merge remote branch 'mainline/master'

Conflicts:
	etc/inc/filter.inc

7 files changed, 56 insertions, 23 deletions

diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index 3f69cd6..29b9464 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -105,12 +105,11 @@ $interfaces_menu = msort(array_merge($interfaces_menu, return_ext_menu("Interfac
 // Firewall
 $firewall_menu = array();
 $firewall_menu[] = array("Aliases", "/firewall_aliases.php");
-if($config['interfaces']['lan']) 
+if(count($config['interfaces']) > 1) 
 	$firewall_menu[] = array("NAT", "/firewall_nat.php");
 $firewall_menu[] = array("Rules", "/firewall_rules.php");
 $firewall_menu[] = array("Schedules", "/firewall_schedule.php");
-if($config['interfaces']['lan']) 
-	$firewall_menu[] = array("Traffic Shaper", "/firewall_shaper.php");
+$firewall_menu[] = array("Traffic Shaper", "/firewall_shaper.php");
 $firewall_menu[] = array("Virtual IPs", "/firewall_virtual_ip.php");
 $firewall_menu = msort(array_merge($firewall_menu, return_ext_menu("Firewall")),0);
 
@@ -128,7 +127,7 @@ $services_menu[] = array("OLSR", "/pkg_edit.php?xml=olsrd.xml&id=0");
 $services_menu[] = array("PPPoE Server", "/vpn_pppoe.php");
 $services_menu[] = array("RIP", "/pkg_edit.php?xml=routed/routed.xml&id=0");
 $services_menu[] = array("SNMP", "/services_snmp.php");
-if($config['interfaces']['lan']) {
+if(count($config['interfaces']) > 1) {
 	/* no use for UPnP in single-interface deployments
 	remove to reduce user confusion
 	*/
@@ -166,7 +165,7 @@ $status_menu[] = array("RRD Graphs", "/status_rrd_graph.php");
 $status_menu[] = array("Services", "/status_services.php");
 $status_menu[] = array("System Logs", "/diag_logs.php");
 $status_menu[] = array("Traffic Graph", "/status_graph.php?if=wan");
-if($config['interfaces']['lan']) 
+if(count($config['interfaces']) > 1) 
 	$status_menu[] = array("UPnP", "/status_upnp.php");
 $ifentries = get_configured_interface_with_descr();
 foreach ($ifentries as $ent => $entdesc) {
diff --git a/usr/local/www/interfaces_gif_edit.php b/usr/local/www/interfaces_gif_edit.php
index ba7f7aa..908277f 100644
--- a/usr/local/www/interfaces_gif_edit.php
+++ b/usr/local/www/interfaces_gif_edit.php
@@ -75,7 +75,7 @@ if ($_POST) {
 
 	if ((!is_ipaddr($_POST['tunnel-local-addr'])) || (!is_ipaddr($_POST['tunnel-remote-addr'])) ||
 			(!is_ipaddr($_POST['remote-addr']))) {
-		$input_errors[] = "All fildes must have valid ip addresses.";
+		$input_errors[] = "The tunnel local and tunnel remote fields must have valid IP addresses.";
 	}
 
 	foreach ($a_gifs as $gif) {
diff --git a/usr/local/www/interfaces_gre_edit.php b/usr/local/www/interfaces_gre_edit.php
index 5fee315..1144bcd 100644
--- a/usr/local/www/interfaces_gre_edit.php
+++ b/usr/local/www/interfaces_gre_edit.php
@@ -76,7 +76,7 @@ if ($_POST) {
 
 	if ((!is_ipaddr($_POST['tunnel-local-addr'])) || (!is_ipaddr($_POST['tunnel-remote-addr'])) ||
 			(!is_ipaddr($_POST['remote-addr']))) {
-		$input_errors[] = "All fildes must have valid ip addresses.";
+		$input_errors[] = "The tunnel local and tunnel remote fields must have valid IP addresses.";
 	}
 
 	foreach ($a_gres as $gre) {
diff --git a/usr/local/www/javascript/sorttable.js b/usr/local/www/javascript/sorttable.js
index b7950f1..c8c72be 100644
--- a/usr/local/www/javascript/sorttable.js
+++ b/usr/local/www/javascript/sorttable.js
@@ -363,18 +363,6 @@ if (document.addEventListener) {
     document.addEventListener("DOMContentLoaded", sorttable.init, false);
 }
 
-/* for Internet Explorer */
-/*@cc_on @*/
-/*@if (@_win32)
-    document.write("<script id=__ie_onload defer src=javascript:void(0)><\/script>");
-    var script = document.getElementById("__ie_onload");
-    script.onreadystatechange = function() {
-        if (this.readyState == "complete") {
-            sorttable.init(); // call the onload handler
-        }
-    };
-/*@end @*/
-
 /* for Safari */
 if (/WebKit/i.test(navigator.userAgent)) { // sniff
     var _timer = setInterval(function() {
diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php
index d9db0fb..7a3cd93 100644
--- a/usr/local/www/system_advanced_firewall.php
+++ b/usr/local/www/system_advanced_firewall.php
@@ -121,6 +121,11 @@ if ($_POST) {
 		else
 			unset($config['system']['disablescrub']);
 
+		if ($_POST['tftpinterface'])
+			$config['system']['tftpinterface'] = implode(",", $_POST['tftpinterface']);
+		else
+			unset($config['system']['tftpinterface']);
+	
 		write_config();
 
 		/* 
@@ -287,7 +292,7 @@ function update_description(itemnum) {
 							<tr>
 								<td colspan="2" class="list" height="12">&nbsp;</td>
 							</tr>
-							<?php if($config['interfaces']['lan']): ?>
+							<?php if(count($config['interfaces']) > 1): ?>
 							<tr>
 								<td colspan="2" valign="top" class="listtopic">Network Address Translation</td>
 							</tr>		
@@ -306,6 +311,20 @@ function update_description(itemnum) {
 								</td>
 							</tr>
 							<tr>
+								<td width="22%" valign="top" class="vncell">TFTP Proxy</td>
+								<td width="78%" class="vtable">
+									<select name="tftpinterface[]" multiple="true" class="formselect" size="3">
+<?php
+                                					$ifdescs = get_configured_interface_with_descr();
+                                					foreach ($ifdescs as $ifent => $ifdesc):
+?>
+										<option value="<?=$ifent;?>" <?php if (stristr($pconfig['tftpinterface'], $ifent)) echo "selected"; ?>><?=gettext($ifdesc);?></option>
+<?php                           						endforeach; ?>
+                                					</select>
+									<strong>Choose the interfaces where you want TFTP proxy help to be enabled.</strong>
+								</td>
+							</tr>
+							<tr>
 								<td colspan="2" class="list" height="12">&nbsp;</td>
 							</tr>
 							<?php endif; ?>
diff --git a/usr/local/www/system_advanced_notifications.php b/usr/local/www/system_advanced_notifications.php
index 1905a51..6b8b121 100644
--- a/usr/local/www/system_advanced_notifications.php
+++ b/usr/local/www/system_advanced_notifications.php
@@ -46,6 +46,17 @@ if($config['notifications']['growl']['password'])
 if($config['notifications']['growl']['ipaddress']) 
 	$pconfig['ipaddress'] = $config['notifications']['growl']['ipaddress'];
 
+if($config['notifications']['growl']['notification_name']) 
+	$pconfig['notification_name'] = $config['notifications']['growl']['notification_name'];
+else
+  $pconfig['notification_name'] = 'pfSense growl alert';
+  
+if($config['notifications']['growl']['name']) 
+	$pconfig['name'] = $config['notifications']['growl']['name'];
+else
+  $pconfig['name'] = 'PHP-Growl';
+
+
 // SMTP
 if($config['notifications']['smtp']['ipaddress']) 
 	$pconfig['smtpipaddress'] = $config['notifications']['smtp']['ipaddress'];
@@ -81,6 +92,8 @@ if ($_POST) {
 		// Growl
 		$config['notifications']['growl']['ipaddress'] = $_POST['ipaddress'];
 		$config['notifications']['growl']['password'] = $_POST['password'];
+		$config['notifications']['growl']['name'] = $_POST['name'];
+		$config['notifications']['growl']['notification_name'] = $_POST['notification_name'];
 
 		// SMTP
 		$config['notifications']['smtp']['ipaddress'] = $_POST['smtpipaddress'];
@@ -148,6 +161,20 @@ include("head.inc");
 							<td colspan="2" valign="top" class="listtopic">Growl</td>
 						</tr>
 						<tr>
+							<td width="22%" valign="top" class="vncell">Registration Name</td>
+							<td width="78%" class="vtable">
+								<input name='name' value='<?php echo $pconfig['name']; ?>'><br/>
+								Enter the name to register with the Growl server (default: PHP-Growl).
+							</td>
+						</tr>
+  					<tr>
+							<td width="22%" valign="top" class="vncell">Notification Name</td>
+							<td width="78%" class="vtable">
+								<input name='notification_name' value='<?php echo $pconfig['notification_name']; ?>'><br/>
+								Enter a name for the Growl notifications (default: pfSense growl alert).
+							</td>
+						</tr>
+						<tr>
 							<td width="22%" valign="top" class="vncell">IP Address</td>
 							<td width="78%" class="vtable">
 								<input name='ipaddress' value='<?php echo $pconfig['ipaddress']; ?>'><br/>
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index f77c8cb..fdf4af4 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -1178,7 +1178,7 @@ function netbios_change() {
 			<table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
 				<tr>
 					<td width="10%" class="listhdrr">Disabled</td>
-					<td width="10%" class="listhdrr">Protocol</td>
+					<td width="10%" class="listhdrr">Protocol / Port</td>
 					<td width="30%" class="listhdrr">Tunnel Network</td>
 					<td width="40%" class="listhdrr">Description</td>
 					<td width="10%" class="list"></td>
@@ -1195,7 +1195,7 @@ function netbios_change() {
 						<?=$disabled;?>
 					</td>
 					<td class="listr" ondblclick="document.location='vpn_openvpn_server.php?act=edit&id=<?=$i;?>'">
-						<?=htmlspecialchars($server['protocol']);?>
+						<?=htmlspecialchars($server['protocol']);?> / <?=htmlspecialchars($server['local_port']);?>
 					</td>
 					<td class="listr" ondblclick="document.location='vpn_openvpn_server.php?act=edit&id=<?=$i;?>'">
 						<?=htmlspecialchars($server['tunnel_network']);?>
@@ -1260,4 +1260,4 @@ function set_checked($var,& $chk) {
         $chk = '';
 }
 
-?>
+?>
\ No newline at end of file