From a42d1da22e436ded8b9b27b603290062601570b2 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@sullrich-MacBookPro.geekgod.com>
Date: Mon, 1 Jun 2009 17:54:04 -0400
Subject: Add plip exclusion

---
 etc/inc/util.inc | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'etc/inc/util.inc')

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index f440bbf..6708594 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -387,36 +387,36 @@ function get_configured_interface_list_by_realif($only_opt = false, $withdisable
 
 /* return the configured interfaces list with their description. */
 function get_configured_interface_with_descr($only_opt = false, $withdisabled = false) {
-        global $config;
+	global $config;
 
-        $iflist = array();
+	$iflist = array();
 
 	if (!$only_opt) {
-                if (isset($config['interfaces']['wan'])) {
+		if (isset($config['interfaces']['wan'])) {
 			if (empty($config['interfaces']['wan']['descr']))
 				$iflist['wan'] = "WAN";
 			else
-				$iflist['wan'] = $config['interfaces']['wan']['descr'];
+				$iflist['wan'] = strtoupper($config['interfaces']['wan']['descr']);
 		}
-                if (isset($config['interfaces']['lan'])) {
+		if (isset($config['interfaces']['lan'])) {
 			if (empty($config['interfaces']['lan']['descr']))
-                                $iflist['lan'] = "LAN";
-                        else
-                                $iflist['lan'] = $config['interfaces']['lan']['descr'];
+				$iflist['lan'] = "LAN";
+			else
+				$iflist['lan'] = strtoupper($config['interfaces']['lan']['descr']);
 		}
-        }
+	}
 
-        /* if list */
-        foreach($config['interfaces'] as $if => $ifdetail) {
+	/* if list */
+	foreach($config['interfaces'] as $if => $ifdetail) {
 		if (isset($ifdetail['enable']) || $withdisabled == true) {
 			if($ifdetail['descr'] == "")
 				$iflist[$if] = strtoupper($if);
-                        else
+			else
 				$iflist[$if] = strtoupper($ifdetail['descr']);
 		}
 	}
 
-        return $iflist;
+	return $iflist;
 }
 
 
@@ -444,6 +444,7 @@ function get_interface_list($mode = "active", $keyby = "physical", $vfaces = "")
 				'ng',
 				'vlan',
 				'pflog',
+				'plip',
 				'pfsync',
 				'enc',
 				'tun',
-- 
cgit v1.1