Merge remote branch 'upstream/master'

Conflicts:
	conf.default/config.xml
	etc/inc/filter.inc
	etc/inc/globals.inc
	etc/inc/pfsense-utils.inc
	etc/inc/upgrade_config.inc
	usr/local/www/interfaces.php

1 files changed, 43 insertions, 0 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 572333a..ddbecbb 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -2264,4 +2264,47 @@ function load_mac_manufacturer_table() {
 		return -1;
 
 }
+<<<<<<< HEAD
 ?>
+=======
+
+/****f* pfsense-utils/is_ipaddr_configured
+ * NAME
+ *   is_ipaddr_configured
+ * INPUTS
+ *   IP Address to check.
+ * RESULT
+ *   returns true if the IP Address is
+ *   configured and present on this device.
+*/
+function is_ipaddr_configured($ipaddr) {
+	$interface_list_ips = get_configured_ip_addresses();
+	foreach($interface_list_ips as $ilips) {
+		if(strcasecmp($ipaddr, $ilips) == 0) 
+				return true;
+	}	
+}
+
+/****f* pfsense-utils/pfSense_handle_custom_code
+ * NAME
+ *   pfSense_handle_custom_code
+ * INPUTS
+ *   directory name to process
+ * RESULT
+ *   globs the directory and includes the files
+ */
+function pfSense_handle_custom_code($src_dir) {
+	// Allow extending of the nat edit page and include custom input validation 
+	if(is_dir("$src_dir")) {
+		$cf = glob($src_dir . "/*.inc");
+		foreach($cf as $nf) {
+			if($nf == "." || $nf == "..") 
+				continue;
+			// Include the extra handler
+			include("$nf");
+		}
+	}
+}
+
+?>
+>>>>>>> upstream/master