Splash v2

5 files changed, 53 insertions, 2 deletions

diff --git a/files/www/cgi-bin/redirect b/files/www/cgi-bin/redirect
new file mode 100755
index 0000000..75979e2
--- /dev/null
+++ b/files/www/cgi-bin/redirect
@@ -0,0 +1,8 @@
+#!/bin/sh
+echo -en "Cache-Control: no-cache, max-age=0, no-store, must-revalidate\r\n"
+echo -en "Pragma: no-cache\r\n"
+echo -en "Expires: -1\r\n"
+echo -en "Status: 302 Temporary Redirect\r\n"
+echo -en "Location: http://"`uci get network.mesh.ipaddr`"/cgi-bin/splash?http://"`echo $HTTP_HOST$REQUEST_URI`"\r\n"
+echo -en "\r\n"
+exit 0
diff --git a/files/www/cgi-bin/splash b/files/www/cgi-bin/splash
new file mode 100755
index 0000000..2212eba
--- /dev/null
+++ b/files/www/cgi-bin/splash
@@ -0,0 +1,6 @@
+#!/bin/sh
+echo -en "Status: 200 OK\r\n"
+echo -en "Content-Type: text/html\r\n"
+echo -en "\r\n"
+targeturl=$(echo $QUERY_STRING | sed -f /etc/urlencode.sed)
+sed "s/targeturl/"$targeturl"/g" /www/splash.html 
diff --git a/files/www/cgi-bin/splash_click b/files/www/cgi-bin/splash_click
index 32fce2e..b868658 100755
--- a/files/www/cgi-bin/splash_click
+++ b/files/www/cgi-bin/splash_click
@@ -1,6 +1,6 @@
 #!/bin/sh
-echo -en "Status: 302 Temporary Redirect\r\n"
-echo -en "Location: http://www.freifunk-jena.de\r\n"
+echo -en "Status: 200 OK\r\n"
+echo -en "Content-Type: text/html\r\n"
 echo -en "\r\n"
                                     
 . $IPKG_INSTROOT/etc/functions.sh
@@ -14,12 +14,15 @@ is_ip() {
 }
 #check if user is alredy splashed
 config_foreach is_ip user
+targeturl=$(echo $QUERY_STRING | sed 's/+/ /g; s/%/\\x/g')
+sed "s/targeturl/"$targeturl"/g" /www/iframe.html
 
 if [ $ISSPLASHED -eq 1 ]; then
 	exit
 fi
 #User is now free to go
 iptables  -t nat -I ffj_splash 1 -s $REMOTE_HOST -j ACCEPT
+
 uci add splash_users user
 uci set splash_users.@user[-1].ip=$REMOTE_HOST
 uci set splash_users.@user[-1].time=`date +%s`
diff --git a/files/www/cgi-bin/status.xml b/files/www/cgi-bin/status.xml
new file mode 100755
index 0000000..8d45a90
--- /dev/null
+++ b/files/www/cgi-bin/status.xml
@@ -0,0 +1,3 @@
+#/bin/bash!
+hostname=`hostname`
+eval "echo \"$(cat template.status.xml)\"" 
diff --git a/files/www/cgi-bin/template.status.xml b/files/www/cgi-bin/template.status.xml
new file mode 100644
index 0000000..7df4e9f
--- /dev/null
+++ b/files/www/cgi-bin/template.status.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<node>
+    <hostname>$hostname</hostname>
+    <is_hna>0</is_hna>
+    <network>
+        <ip_4></ip_4>
+        <ip_6></ip_6>
+    </network>
+    <owner>Max Mustermann</owner>
+    <godfather>Susi Mustermann</godfather>
+    <position>
+        <lat></lat>
+        <long></long>
+        <text></text>    
+    </position>
+    <statistics>
+        <uptime></uptime>
+        <dhcp_leases></dhcp_leases>
+        <load></load>
+        
+    </statistics>
+
+    <batman-adv>
+        <route>
+            <hostname></hostname>
+            <mac></mac>
+        </route>
+    </batman-adv>
+</node>
+
+