tazpanel rev 322
network.cgi: add ap
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Jun 30 21:13:11 2012 +0200 (2012-06-30) |
parents | 186f45ca4d04 |
children | be0625b4e659 |
files | network.cgi |
line diff
1.1 --- a/network.cgi Sat Jun 30 14:36:32 2012 +0200 1.2 +++ b/network.cgi Sat Jun 30 21:13:11 2012 +0200 1.3 @@ -33,17 +33,22 @@ 1.4 for i in $(iwlist $WIFI_INTERFACE scan | sed '/Cell /!d;s/.*Cell \([^ ]*\).*/Cell.\1/') 1.5 do 1.6 SCAN=$(iwlist $WIFI_INTERFACE scan last | sed "/$i/,/Cell/!d" | sed '$d') 1.7 - ESSID=$(echo $SCAN | sed '/ESSID/!d;s/.*ESSID:"\(.*\)"$/\1/') 1.8 + ESSID=$(echo $SCAN | sed 's/.*ESSID:"\([^"]*\).*/\1/') 1.9 if echo "$SCAN" | grep -q Quality; then 1.10 - QUALITY=$(echo $SCAN | sed '/Quality/!d;s/.*Quality:\([^ ]*\).*/\1/') 1.11 + QUALITY=$(echo $SCAN | sed 's/.*Quality:\([^ ]*\).*/\1/') 1.12 else 1.13 QUALITY="-" 1.14 fi 1.15 - ENCRYPTION=$(echo $SCAN | sed '/key:/!d;s/.*key:\([^ ]*\).*/\1/') 1.16 + ENCRYPTION=$(echo $SCAN | sed 's/.*key:\([^ ]*\).*/\1/') 1.17 # Check encryption type 1.18 if echo "$SCAN" | grep -q WPA*; then 1.19 ENCRYPTION="WPA" 1.20 fi 1.21 + if echo $SCAN | grep -q 'Mode:Managed'; then 1.22 + AP="&ap=$(echo $SCAN | sed 's/.*Address: \([^ ]*\).*/\1/')" 1.23 + else 1.24 + AP="" 1.25 + fi 1.26 # Connected or not connected... 1.27 if ifconfig | grep -A 1 $WIFI_INTERFACE | \ 1.28 fgrep -q inet && iwconfig $WIFI_INTERFACE | \ 1.29 @@ -53,7 +58,7 @@ 1.30 status="---" 1.31 fi 1.32 echo '<tr>' 1.33 - echo "<td><a href=\"$SCRIPT_NAME?wifi&select=$ESSID&keytype=$ENCRYPTION\"> 1.34 + echo "<td><a href=\"$SCRIPT_NAME?wifi&select=$ESSID&keytype=$ENCRYPTION&$AP\"> 1.35 <img src='$IMAGES/wireless.png' />$ESSID</a></td>" 1.36 echo "<td>$QUALITY</td><td>$ENCRYPTION</td><td>$status $ip</td>" 1.37 echo '</tr>' 1.38 @@ -216,10 +221,11 @@ 1.39 </div> 1.40 $(detect_wifi_networks) 1.41 EOT 1.42 + WIFI_AP="$(GET ap)" 1.43 WIFI_KEY="$(GET key)" 1.44 case "$(GET keytype)" in 1.45 ''|off) WIFI_KEY_TYPE=none ;; 1.46 - * WIFI_KEY_TYPE=any ;; 1.47 + *) WIFI_KEY_TYPE=any ;; 1.48 esac 1.49 if [ "$(GET essid)" ]; then 1.50 /etc/init.d/network.sh stop | log 1.51 @@ -227,6 +233,7 @@ 1.52 -e s"/^WIFI_ESSID=.*/WIFI_ESSID=\"$(GET essid)\""/ \ 1.53 -e s"/^WIFI_KEY=.*/WIFI_KEY=\"$WIFI_KEY\"/" \ 1.54 -e s"/^WIFI_KEY_TYPE=.*/WIFI_KEY_TYPE=\"$WIFI_KEY_TYPE\"/" \ 1.55 + -e s"/^WIFI_AP=.*/WIFI_AP=\"$WIFI_AP\"/" \ 1.56 /etc/network.conf 1.57 . /etc/network.conf 1.58 start_wifi 1.59 @@ -262,6 +269,10 @@ 1.60 <td>$(gettext 'Encryption type')</td> 1.61 <td><input type="text" name="keytype" size="30" value="$WIFI_KEY_TYPE" /></td> 1.62 </tr> 1.63 + <tr> 1.64 + <td>$(gettext 'Access point')</td> 1.65 + <td><input type="text" name="ap" size="30" value="$WIFI_AP" /></td> 1.66 + </tr> 1.67 $(table_end) 1.68 <input type="submit" name="wifi" value="$(gettext 'Configure')" /> 1.69 </form>