src: try to unwind the wireless_regex global foo

src/etc/inc/config.console.inc

@@ -333,26 +333,34 @@ EODD;
 			if(isset($config['nat']))
 				unset($config['nat']);
 		}
-		if (preg_match($g['wireless_regex'], $lanif)) {
+
+		if (match_wireless_interface($lanif)) {
 			if (is_array($config['interfaces']['lan']) &&
-				(!is_array($config['interfaces']['lan']['wireless'])))
+				(!is_array($config['interfaces']['lan']['wireless']))) {
 				$config['interfaces']['lan']['wireless'] = array();
+			}
 		} else {
-			if (isset($config['interfaces']['lan']))
+			if (isset($config['interfaces']['lan'])) {
 				unset($config['interfaces']['lan']['wireless']);
+			}
 		}
 
-		if (!is_array($config['interfaces']['wan']))
+		if (!is_array($config['interfaces']['wan'])) {
 			$config['interfaces']['wan'] = array();
+		}
+
 		$config['interfaces']['wan']['if'] = $wanif;
 		$config['interfaces']['wan']['enable'] = true;
-		if (preg_match($g['wireless_regex'], $wanif)) {
+
+		if (match_wireless_interface($wanif)) {
 			if (is_array($config['interfaces']['wan']) &&
-				(!is_array($config['interfaces']['wan']['wireless'])))
+				(!is_array($config['interfaces']['wan']['wireless']))) {
 				$config['interfaces']['wan']['wireless'] = array();
+			}
 		} else {
-			if (isset($config['interfaces']['wan']))
+			if (isset($config['interfaces']['wan'])) {
 				unset($config['interfaces']['wan']['wireless']);
+			}
 		}
 
 		for ($i = 0; $i < count($optif); $i++) {
@@ -361,8 +369,7 @@ EODD;
 
 			$config['interfaces']['opt' . ($i+1)]['if'] = $optif[$i];
 
-			/* wireless interface? */
-			if (preg_match($g['wireless_regex'], $optif[$i])) {
+			if (match_wireless_interface($optif[$i])) {
 				if (!is_array($config['interfaces']['opt' . ($i+1)]['wireless']))
 					$config['interfaces']['opt' . ($i+1)]['wireless'] = array();
 			} else {

src/etc/inc/globals.inc

@@ -45,7 +45,6 @@ $g = array(
 	"product_copyright_years" => "2014 - 2015",
 	"product_copyright_url" => "https://www.deciso.com/",
 	"latest_config" => "11.2",
-	"wireless_regex" => "/^(ndis|wi|ath|an|ral|ural|iwi|wlan|rum|run|bwn|zyd|mwl|bwi|ipw|iwn|malo|uath|upgt|urtw|wpi)/",
 );
 
 /* IP TOS flags */
@@ -111,3 +110,9 @@ function is_install_media()
 
 	return true;
 }
+
+function match_wireless_interface($int)
+{
+	$wireless_regex = '/^(ndis|wi|ath|an|ral|ural|iwi|wlan|rum|run|bwn|zyd|mwl|bwi|ipw|iwn|malo|uath|upgt|urtw|wpi)/';
+	return preg_match($wireless_regex, $int);
+}

src/etc/inc/interfaces.inc

@@ -4336,10 +4336,11 @@ function get_real_interface($interface = "wan", $family = "all", $realv6iface =
 			case 'ppp':
 			case 'l2tp':
 			case 'pptp':
-				if( is_array($cfg['wireless']) || preg_match($g['wireless_regex'], $cfg['if']))
+				if (isset($cfg['wireless']) || match_wireless_interface($cfg['if'])) {
 					$wanif = interface_get_wireless_clone($cfg['if']);
-				else
+				} else {
 					$wanif = $cfg['if'];
+				}
 				break;
 			default:
 				switch ($cfg['ipaddr']) {
@@ -4358,10 +4359,11 @@ function get_real_interface($interface = "wan", $family = "all", $realv6iface =
 					}
 					break;
 				default:
-					if( is_array($cfg['wireless']) || preg_match($g['wireless_regex'], $cfg['if']))
+					if (isset($cfg['wireless']) || match_wireless_interface($cfg['if'])) {
 						$wanif = interface_get_wireless_clone($cfg['if']);
-					else
+					} else {
 						$wanif = $cfg['if'];
+					}
 					break;
 				}
 				break;
@@ -4370,10 +4372,11 @@ function get_real_interface($interface = "wan", $family = "all", $realv6iface =
 			// Wireless cloned NIC support (FreeBSD 8+)
 			// interface name format: $parentnic_wlanparentnic#
 			// example: ath0_wlan0
-			if( (isset($cfg['wireless']) && is_array($cfg['wireless'])) || preg_match($g['wireless_regex'], $cfg['if']))
+			if (isset($cfg['wireless']) || match_wireless_interface($cfg['if'])) {
 				$wanif = interface_get_wireless_clone($cfg['if']);
-			else
+			} else {
 				$wanif = $cfg['if'];
+			}
 		}
 		break;
 	}
@@ -5050,19 +5053,22 @@ function is_altq_capable($int)
  * RESULT
  *   $tmp       - Returns if an interface is wireless
  ******/
-function is_interface_wireless($interface) {
+function is_interface_wireless($interface)
+{
 	global $config, $g;
 
 	$friendly = convert_real_interface_to_friendly_interface_name($interface);
-	if(!isset($config['interfaces'][$friendly]['wireless'])) {
-		if (preg_match($g['wireless_regex'], $interface)) {
-			if (isset($config['interfaces'][$friendly]))
+	if (!isset($config['interfaces'][$friendly]['wireless'])) {
+		if (match_wireless_interface($interface)) {
+			if (isset($config['interfaces'][$friendly])) {
 				$config['interfaces'][$friendly]['wireless'] = array();
+			}
 			return true;
 		}
 		return false;
-	} else
-		return true;
+	}
+
+	return true;
 }
 
 function get_wireless_modes($interface) {

src/www/fbegin.inc

@@ -215,8 +215,9 @@ if(count($config['interfaces']) > 1)
 $ifentries = get_configured_interface_with_descr();
 foreach ($ifentries as $ent => $entdesc) {
 	if (is_array($config['interfaces'][$ent]['wireless']) &&
-		preg_match($g['wireless_regex'], $config['interfaces'][$ent]['if']))
+		match_wireless_interface($config['interfaces'][$ent]['if'])) {
 		$wifdescrs[$ent] = $entdesc;
+	}
 }
 if (count($wifdescrs) > 0)
 	$status_menu[] = array(gettext("Wireless"), "/status_wireless.php");

src/www/interfaces_assign.php

@@ -209,7 +209,7 @@ if (isset($_POST['add_x']) && isset($_POST['if_add'])) {
 		$config['interfaces'][$newifname] = array();
 		$config['interfaces'][$newifname]['descr'] = $descr;
 		$config['interfaces'][$newifname]['if'] = $_POST['if_add'];
-		if (preg_match($g['wireless_regex'], $_POST['if_add'])) {
+		if (match_wireless_interface($_POST['if_add'])) {
 			$config['interfaces'][$newifname]['wireless'] = array();
 			interface_sync_wireless_clones($config['interfaces'][$newifname], false);
 		}
@@ -315,7 +315,7 @@ if (isset($_POST['add_x']) && isset($_POST['if_add'])) {
 					}
 
 					/* check for wireless interfaces, set or clear ['wireless'] */
-					if (preg_match($g['wireless_regex'], $ifport)) {
+					if (match_wireless_interface($ifport)) {
 						if (!is_array($config['interfaces'][$ifname]['wireless']))
 							$config['interfaces'][$ifname]['wireless'] = array();
 					} else {
@@ -327,8 +327,9 @@ if (isset($_POST['add_x']) && isset($_POST['if_add'])) {
 						$config['interfaces'][$ifname]['descr'] = strtoupper($ifname);
 
 					if ($reloadif == true) {
-						if (preg_match($g['wireless_regex'], $ifport))
+						if (match_wireless_interface($ifport)) {
 							interface_sync_wireless_clones($config['interfaces'][$ifname], false);
+						}
 						/* Reload all for the interface. */
 						interface_configure($ifname, true);
 					}

src/www/interfaces_wireless_edit.php

 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2010 Erik Fonnesbeck
@@ -163,7 +164,7 @@ include("head.inc");
 					                    <select name="if" class="selectpicker">
 					                      <?php
 					                      foreach ($portlist as $ifn => $ifinfo)
-					                        if (preg_match($g['wireless_regex'], $ifn)) {
+					                        if (match_wireless_interface($ifn)) {
 					                            echo "<option value=\"{$ifn}\"";
 					                            if ($ifn == $pconfig['if'])
 					                                echo " selected=\"selected\"";