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 +++++++++++++
 usr/local/www/interfaces_wireless_edit.php |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'usr')

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'])
diff --git a/usr/local/www/interfaces_wireless_edit.php b/usr/local/www/interfaces_wireless_edit.php
index 2f3a196..d40d52a 100644
--- a/usr/local/www/interfaces_wireless_edit.php
+++ b/usr/local/www/interfaces_wireless_edit.php
@@ -161,7 +161,7 @@ include("head.inc");
                     <select name="if" class="formselect">
                       <?php
                       foreach ($portlist as $ifn => $ifinfo)
-                        if (is_interface_wireless($ifn) && !stristr($ifn, "_wlan")) {
+                        if (is_interface_wireless($ifn)) {
                             echo "<option value=\"{$ifn}\"";
                             if ($ifn == $pconfig['if'])
                                 echo "selected";
-- 
cgit v1.1