From 79637b03ffd5fff43c5a15435c752f811b40cd29 Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Mon, 15 Feb 2010 02:01:40 -0700
Subject: Add wireless tab to Interfaces: (assign) now that the configuration
 page is functional.

---
 usr/local/www/interfaces_assign.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'usr/local/www/interfaces_assign.php')

diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index 66cb0d0..a2ca45a 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -354,13 +354,14 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed"))
 	$tab_array = array();
 	$tab_array[0] = array("Interface assignments", true, "interfaces_assign.php");
 	$tab_array[1] = array("Interface Groups", false, "interfaces_groups.php");
-	$tab_array[2] = array("VLANs", false, "interfaces_vlan.php");
-	$tab_array[3] = array("QinQs", false, "interfaces_qinq.php");
-	$tab_array[4] = array("PPP", false, "interfaces_ppp.php");
-        $tab_array[5] = array("GRE", false, "interfaces_gre.php");
-        $tab_array[6] = array("GIF", false, "interfaces_gif.php");
-	$tab_array[7] = array("Bridges", false, "interfaces_bridge.php");
-	$tab_array[8] = array("LAGG", false, "interfaces_lagg.php");
+	$tab_array[2] = array("Wireless", false, "interfaces_wireless.php");
+	$tab_array[3] = array("VLANs", false, "interfaces_vlan.php");
+	$tab_array[4] = array("QinQs", false, "interfaces_qinq.php");
+	$tab_array[5] = array("PPP", false, "interfaces_ppp.php");
+        $tab_array[6] = array("GRE", false, "interfaces_gre.php");
+        $tab_array[7] = array("GIF", false, "interfaces_gif.php");
+	$tab_array[8] = array("Bridges", false, "interfaces_bridge.php");
+	$tab_array[9] = array("LAGG", false, "interfaces_lagg.php");
 	display_top_tabs($tab_array);
 ?>  
   </td></tr>
-- 
cgit v1.1


From 8f0289e7ec338869f28467b748e27f580792b201 Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Mon, 22 Feb 2010 13:08:09 -0700
Subject: Sync configuration of shared settings between wireless clones.

---
 usr/local/www/interfaces_assign.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'usr/local/www/interfaces_assign.php')

diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index a2ca45a..8e5cb05 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -310,8 +310,10 @@ if ($_GET['act'] == "add") {
 		}
 		if (!$portused) {
 			$config['interfaces'][$newifname]['if'] = $portname;
-			if (preg_match($g['wireless_regex'], $portname))
+			if (preg_match($g['wireless_regex'], $portname)) {
 				$config['interfaces'][$newifname]['wireless'] = array();
+				interface_sync_wireless_clones($config['interfaces'][$newifname], false);
+			}
 			break;
 		}
 	}
-- 
cgit v1.1


From 7c53bc7b0809d5ed47199327404dcd62484f4fbd Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Tue, 23 Feb 2010 06:00:00 -0700
Subject: Change method of displaying wireless clone interfaces on the
 assignment page.

---
 usr/local/www/interfaces_assign.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'usr/local/www/interfaces_assign.php')

diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index 8e5cb05..53875fe 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -58,6 +58,14 @@ require("rrd.inc");
 /* get list without VLAN interfaces */
 $portlist = get_interface_list();
 
+/* add wireless clone interfaces */
+if (is_array($config['wireless']['clone']) && count($config['wireless']['clone'])) {
+	foreach ($config['wireless']['clone'] as $clone) {
+		$portlist[$clone['cloneif']] = $clone;
+		$portlist[$clone['cloneif']]['iswlclone'] = true;
+	}
+}
+
 /* add VLAN interfaces */
 if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
 	foreach ($config['vlans']['vlan'] as $vlan) {
@@ -393,6 +401,11 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed"))
 		if ($portinfo['descr'])
 			$descr .= " (" . $portinfo['descr'] . ")";
 			echo htmlspecialchars($descr);
+                } elseif ($portinfo['iswlclone']) {
+                        $descr = $portinfo['cloneif'];
+                        if ($portinfo['descr'])
+				$descr .= " (" . $portinfo['descr'] . ")";
+                        echo htmlspecialchars($descr);
 		} elseif ($portinfo['isppp']) {
 			$descr = "PPP {$portinfo['port']}";
 			if ($portinfo['descr'])
-- 
cgit v1.1