# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1302842265 -7200
# Node ID 21a86f36336d4c79097cb1aaddafff38a32ca8fc
# Parent  c847b9bf07c226e84db61511f2136ac1a7b6e9cd
network.cgi: Improve wifi settings

diff -r c847b9bf07c2 -r 21a86f36336d network.cgi
--- a/network.cgi	Fri Apr 15 05:52:46 2011 +0200
+++ b/network.cgi	Fri Apr 15 06:37:45 2011 +0200
@@ -5,6 +5,7 @@
 
 # Common functions from libtazpanel
 . lib/libtazpanel
+. /etc/network.conf
 get_config
 header
 
@@ -17,6 +18,56 @@
 
 TITLE="- Network"
 
+# Catch ESSIDs and format output for GTK tree. We get the list of
+# networks by Cell and without spaces.
+detect_wifi_networks()
+{
+	table_start
+	cat << EOT
+<thead>
+	<tr>
+		<td>$(gettext "Name")</td>
+		<td>$(gettext "Quality")</td>
+		<td>$(gettext "Encryption")</td>
+		<td>$(gettext "Status")</td>
+	</tr>
+</thead>
+EOT
+	if [ -d /sys/class/net/$WIFI_INTERFACE/wireless ]; then
+		ifconfig $WIFI_INTERFACE up
+		for i in `iwlist $WIFI_INTERFACE scan | sed s/"Cell "/Cell-/ | grep "Cell-" | awk '{print $1}'`
+		do
+			SCAN=`iwlist $WIFI_INTERFACE scan last | \
+				awk '/(Cell|ESS|Qual|Encry|IE: WPA)/ {print}' | \
+				sed s/"Cell "/Cell-/ | grep -A 5 "$i"`
+			ESSID=`echo $SCAN | cut -d '"' -f 2`
+			if echo "$SCAN" | grep -q Quality; then
+				QUALITY=`echo $SCAN | sed 's/.*Quality=\([^ ]*\).*/\1/' | sed 's/.*Quality:\([^ ]*\).*/\1/'`
+			else
+				QUALITY="-"
+			fi
+			ENCRYPTION=`echo $SCAN | sed 's/.*key:\([^ ]*\).*/\1/'`
+			# Check encryption type
+			if echo "$SCAN" | grep -q WPA; then
+				ENCRYPTION="${ENCRYPTION} (WPA)"
+			fi
+			# Connected or not connected...
+			if ifconfig | grep -A 1 $WIFI_INTERFACE | \
+				grep -q inet && iwconfig $WIFI_INTERFACE | \
+				grep ESSID | grep -q -w "$ESSID"; then
+				STATUS=$(gettext "Connected")
+			else
+				STATUS="-"
+			fi
+			echo '<tr>'
+			echo "<td><img src='$IMAGES/wireless.png' />$ESSID</td>"
+			echo "<td>$QUALITY</td><td>$ENCRYPTION</td><td>$STATUS</td>"
+			echo '</tr>'
+		done
+	fi
+	table_end
+}
+
 # Actions commands before page is displayed
 case " $(GET) " in
 	*\ start\ *)
@@ -49,9 +100,17 @@
 	*\ wifi\ *)
 		# Wireless connections settings
 		xhtml_header
+		LOADING_MSG=$(gettext "Scanning wireless interface...")
+		loading_msg
 		cat << EOT
 <h2>`gettext "Wireless connection`</h2>
-
+<div id="actions">
+	<a class="button" href="$SCRIPT_NAME?wifi=scan">
+		<img src="$IMAGES/recharge.png" />$(gettext "Scan")</a>
+</div>
+$(detect_wifi_networks)
+EOT
+	cat << EOT
 <h3>$(gettext "Configuration file")</h3>
 <p>
 $(gettext "These values are the wifi settings in the main
@@ -62,12 +121,16 @@
 </pre>
 <a class="button" href="index.cgi?file=/etc/network.conf&action=edit">
 	<img src="$IMAGES/edit.png" />$(gettext "Manual Edit")</a>
+
+<h3>$(gettext "Output of") iwconfig</h3>
+<pre>
+$(iwconfig)
+</pre>
 EOT
 		;;
 	*)
 		# Main Network page starting with a summary
 		xhtml_header
-		
 		cat << EOT
 <h2>`gettext "Networking`</h2>
 <p>
@@ -85,26 +148,26 @@
 	</div>
 </div>
 
-`list_network_interfaces`
+$(list_network_interfaces)
 
-<h3>`gettext "Output of ifconfig"`</h3>
+<h3>$(gettext "Output of ") ifconfig</h3>
 <pre>
-`ifconfig`
+$(ifconfig)
 </pre>
 
 <h3>`gettext "Routing table"`</h3>
 <pre>
-`route -n`
+$(route -n)
 </pre>
 
 <h3>`gettext "Domain name resolution"`</h3>
 <pre>
-`cat /etc/resolv.conf`
+$(cat /etc/resolv.conf)
 </pre>
 
 <h3>`gettext "ARP table"`</h3>
 <pre>
-`arp`
+$(arp)
 </pre>
 EOT
 		;;