From 19906eb7dbf1969d2f2aa460304f9018ab657109 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@ffgraz.net>
Date: Tue, 19 Nov 2013 02:02:28 +0000
Subject: bssid finally works

---
 bssid.shtml | 12 +++++++++---
 essid.shtml | 11 +++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/bssid.shtml b/bssid.shtml
index 7813997..857276b 100644
--- a/bssid.shtml
+++ b/bssid.shtml
@@ -3,9 +3,15 @@
 <!--#elif expr="$POL == l"--><!--#set var="POLCODED" value="6"-->
 <!--#elif expr="$POL == r"--><!--#set var="POLCODED" value="2"-->
 <!--#endif-->
-<!--#if expr="$CHAN = /^([0-9]|1[0-3])$/"-->C<!--#echo var="POLCODED"-->:00:24:00:C0:<!--#if expr="$CHAN = /^[1-9]$/"-->0<!--#endif--><!--#echo var="CHAN"-->
-<!--#elif expr="$CHAN = /^(36|40|44|48|52|56|60|64)$/"-->C<!--#echo var="POLCODED"-->:00:50:00:C0:<!--#echo var="CHAN"-->
-<!--#elif expr="$CHAN = /^1(00|04|08|12|16|20|24|28|32|36|40)$/"-->C<!--#echo var="POLCODED"-->:00:50:00:C1:<!--#if expr="$CHAN = /^1([1-9]{2})$/"--><!--#echo var="$1"--><!--#endif-->
+<!--#if expr="$CHAN = /^([1-9]|1[0-3])$/"-->
+  <!--#if expr="$CHAN = /^[1-9]$/"-->0<!--#endif--><!--#if expr="$CHAN == 3"-->2<!--#else--><!--#echo var="CHAN"--><!--#endif-->:CA:FF:EE:BA:BE<br/>
+  <em>oder / ali / or</em> <br/>
+  C<!--#echo var="POLCODED"-->:00:24:00:C0:<!--#if expr="$CHAN = /^[1-9]$/"-->0<!--#endif--><!--#echo var="CHAN"-->
+<!--#elif expr="$CHAN = /^(36|40|44|48|52|56|60|64)$/"-->
+  C<!--#echo var="POLCODED"-->:00:50:00:C0:<!--#echo var="CHAN"-->
+<!--#elif expr="$CHAN = /^1(00|04|08|12|16|20|24|28|32|36|40)$/"-->
+  <!--#set var="CHANLOW" value="$1"-->
+  C<!--#echo var="POLCODED"-->:00:50:00:C1:<!--#echo var="CHANLOW"-->
 <!--#else-->??:??:??:C?:??
 <!--#endif-->
 
diff --git a/essid.shtml b/essid.shtml
index 082896f..cf95e78 100644
--- a/essid.shtml
+++ b/essid.shtml
@@ -23,10 +23,13 @@ Kanal / channel <!--#echo var="CHAN"--> (<!--#include file="freq.shtml"--> MHz)
 <!--#endif--></em>
 </p>
 <p>
-SSID: http://graz.funkfeuer.at/<!--#echo var="POL"--><!--#echo var="CHAN"--><br/>
-BSSID: <!--#if expr="$CHAN = /^[1-9]$/"-->0<!--#endif--><!--#echo var="CHAN"-->:CA:FF:EE:BA:BE
-<em><nbsp;><nbsp;>oder / ali / or<nbsp;><nbsp;></em>
-<!--#include file="bssid.shtml"-->
+<table>
+<tr>
+ <td valign="top">SSID:</td><td>http://graz.funkfeuer.at/<!--#echo var="POL"--><!--#echo var="CHAN"--></td>
+</tr><tr>
+ <td valign="top">BSSID:</td><td> <!--#include file="bssid.shtml"--> </td>
+</tr>
+<table>
 </p>
 </div>
 
-- 
cgit v1.2.1