From: acid-burn <acidburn@opendreambox.org>
Date: Wed, 11 Nov 2009 17:34:04 +0000 (+0100)
Subject: WirelessLan/plugin.py: - always use quotes for the ssid name, small cleanup
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=a87dcad83a4096c1d29ccdf5cda873ee43629f70

WirelessLan/plugin.py: - always use quotes for the ssid name, small cleanup
---

diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index 9f6a13f..b7a64b9 100755
--- a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
@@ -271,22 +271,14 @@ def callFunction(iface):
 
 def configStrings(iface):
 	driver = iNetwork.detectWlanModule()
-	print "WLAN-MODULE",driver
-	if driver == 'ralink':
-		return "	pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -Dralink\n	post-down wpa_cli terminate"
-	if driver == 'madwifi':
+	print "Found WLAN-Driver:",driver
+	if driver  in ('ralink', 'zydas'):
+		return "	pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -D"+driver+"\n	post-down wpa_cli terminate"
+	else:
 		if config.plugins.wlan.essid.value == "hidden...":
-			if ' ' in config.plugins.wlan.hiddenessid.value:
-				return '	pre-up iwconfig '+iface+' essid "'+config.plugins.wlan.hiddenessid.value+'"\n	pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -Dmadwifi\n	post-down wpa_cli terminate'
-			else:
-				return '	pre-up iwconfig '+iface+' essid '+config.plugins.wlan.hiddenessid.value+'\n	pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -Dmadwifi\n	post-down wpa_cli terminate'
+			return '	pre-up iwconfig '+iface+' essid "'+config.plugins.wlan.hiddenessid.value+'"\n	pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -D'+driver+'\n	post-down wpa_cli terminate'
 		else:
-			if ' ' in config.plugins.wlan.essid.value:
-				return '	pre-up iwconfig '+iface+' essid "'+config.plugins.wlan.essid.value+'"\n	pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -Dmadwifi\n	post-down wpa_cli terminate'
-			else:
-				return '	pre-up iwconfig '+iface+' essid '+config.plugins.wlan.essid.value+'\n	pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -Dmadwifi\n	post-down wpa_cli terminate'
-	if driver == 'zydas':
-		return "	pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -dd -Dzydas\n	post-down wpa_cli terminate"
+			return '	pre-up iwconfig '+iface+' essid "'+config.plugins.wlan.essid.value+'"\n	pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -D'+driver+'\n	post-down wpa_cli terminate'
 
 def Plugins(**kwargs):
 	return PluginDescriptor(name=_("Wireless LAN"), description=_("Connect to a Wireless Network"), where = PluginDescriptor.WHERE_NETWORKSETUP, fnc={"ifaceSupported": callFunction, "configStrings": configStrings, "WlanPluginEntry": lambda x: "Wireless Network Configuartion..."})