Merge remote branch 'mainline/master' into inc

Conflicts:
	etc/inc/filter.inc

1 files changed, 16 insertions, 49 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index a8e9c01..a1a8762 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -439,7 +439,7 @@ function is_hostname($hostname) {
 	if (!is_string($hostname))
 		return false;
 
-	if (preg_match("/^([_a-z0-9\-]+\.?)+$/i", $hostname))
+	if (preg_match('/^(?:(?:[a-z0-9_]|[a-z0-9_][a-z0-9_\-]*[a-z0-9_])\.)*(?:[a-z0-9_]|[a-z0-9_][a-z0-9_\-]*[a-z0-9_])$/i', $hostname))
 		return true;
 	else
 		return false;
@@ -450,7 +450,7 @@ function is_domain($domain) {
 	if (!is_string($domain))
 		return false;
 
-	if (preg_match("/^([a-z0-9\-]+\.?)+$/i", $domain))
+	if (preg_match('/^(?:(?:[a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*(?:[a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$/i', $domain))
 		return true;
 	else
 		return false;
@@ -567,16 +567,9 @@ function get_configured_interface_list($only_opt = false, $withdisabled = false)
 
 	$iflist = array();
 
-	if (!$only_opt) {
-		if (isset($config['interfaces']['wan']))
-			$iflist['wan'] = "wan";
-		if (isset($config['interfaces']['lan']))
-			$iflist['lan'] = "lan";
-	}
-
 	/* if list */
-        foreach($config['interfaces'] as $if => $ifdetail) {
-		if ($if == "wan" || $if == "lan")
+	foreach($config['interfaces'] as $if => $ifdetail) {
+		if ($only_opt && ($if == "wan" || $if == "lan"))
 			continue;
 		if (isset($ifdetail['enable']) || $withdisabled == true)
 			$iflist[$if] = $if;
@@ -587,35 +580,22 @@ function get_configured_interface_list($only_opt = false, $withdisabled = false)
 
 /* return the configured interfaces list. */
 function get_configured_interface_list_by_realif($only_opt = false, $withdisabled = false) {
-        global $config;
-
-        $iflist = array();
+	global $config;
 
-        if (!$only_opt) {
-                if (isset($config['interfaces']['wan'])) {
-			$tmpif = get_real_interface("wan");
-			if (!empty($tmpif))
-				$iflist[$tmpif] = "wan";
-		}
-                if (isset($config['interfaces']['lan'])) {
-			$tmpif = get_real_interface("lan");
-			if (!empty($tmpif))
-				$iflist[$tmpif] = "lan";
-		}
-        }
+	$iflist = array();
 
-        /* if list */
-        foreach($config['interfaces'] as $if => $ifdetail) {
-                if ($if == "wan" || $if == "lan")
-                        continue;
-                if (isset($ifdetail['enable']) || $withdisabled == true) {
+	/* if list */
+	foreach($config['interfaces'] as $if => $ifdetail) {
+		if ($only_opt && ($if == "wan" || $if == "lan"))
+			continue;
+		if (isset($ifdetail['enable']) || $withdisabled == true) {
 			$tmpif = get_real_interface($if);
 			if (!empty($tmpif))
 				$iflist[$tmpif] = $if;
 		}
-        }
+	}
 
-        return $iflist;
+	return $iflist;
 }
 
 /* return the configured interfaces list with their description. */
@@ -624,25 +604,12 @@ function get_configured_interface_with_descr($only_opt = false, $withdisabled =
 
 	$iflist = array();
 
-	if (!$only_opt) {
-		if (isset($config['interfaces']['wan'])) {
-			if (empty($config['interfaces']['wan']['descr']))
-				$iflist['wan'] = "WAN";
-			else
-				$iflist['wan'] = strtoupper($config['interfaces']['wan']['descr']);
-		}
-		if (isset($config['interfaces']['lan'])) {
-			if (empty($config['interfaces']['lan']['descr']))
-				$iflist['lan'] = "LAN";
-			else
-				$iflist['lan'] = strtoupper($config['interfaces']['lan']['descr']);
-		}
-	}
-
 	/* if list */
 	foreach($config['interfaces'] as $if => $ifdetail) {
+		if ($only_opt && ($if == "wan" || $if == "lan"))
+			continue;
 		if (isset($ifdetail['enable']) || $withdisabled == true) {
-			if($ifdetail['descr'] == "")
+			if(empty($ifdetail['descr']))
 				$iflist[$if] = strtoupper($if);
 			else
 				$iflist[$if] = strtoupper($ifdetail['descr']);