summaryrefslogtreecommitdiff
path: root/files/common/www/service/cgi-bin/splash
diff options
context:
space:
mode:
authorKatze Miau <miaukatzemiau@priveasy.de>2011-12-20 16:30:27 (GMT)
committerKatze Miau <miaukatzemiau@priveasy.de>2011-12-20 16:30:27 (GMT)
commit8ebdb23cff88abd518c8f631eb5e8cc65036d08e (patch)
treee223ba0259f69ff66d239cc498eedc6944d62f91 /files/common/www/service/cgi-bin/splash
parent2c089f72e227ec7229709c7903d322ef42986abd (diff)
reintegrate splash
- add cronjob for splash_sync (every minute for debugging; to be increased) - add redirection for unsplashed users in queen.enter, remove it in queen.leave - add /etc/splash.sh to centralize functionality used in /sbin/splash_sync and /www/service/*splash* - make splash_sync to use a transactional update approach: insert iptable rules for all splashed MACs into a new chain, then replace old and new chain; this avoids downtime even if splash_sync is slow - remove allowed services for splashed users; this is intended to not move old cruft over to new code; if any of the those services shall be reenabled, it should happen in /etc/firewall.user - make /sbin/splash_sync aware of the current state of FSM inetable (read via /sbin/fsm with optional command line override); this allows to unconditionally call splash_sync via cron - add locks to all places where the splash state is touched - remove multiple escaping/quoting/encoding problems in splash cgi scripts - reenable link to the page the user initially demanded in /www/service/cgi-bin/splash_click
Diffstat (limited to 'files/common/www/service/cgi-bin/splash')
-rwxr-xr-xfiles/common/www/service/cgi-bin/splash7
1 files changed, 3 insertions, 4 deletions
diff --git a/files/common/www/service/cgi-bin/splash b/files/common/www/service/cgi-bin/splash
index ee907d6..086fa82 100755
--- a/files/common/www/service/cgi-bin/splash
+++ b/files/common/www/service/cgi-bin/splash
@@ -2,7 +2,6 @@
echo -en "Status: 200 OK\r\n"
echo -en "Content-Type: text/html\r\n"
echo -en "\r\n"
-#targeturl=$(echo $QUERY_STRING)
-#targeturl=$(echo $QUERY_STRING | sed -f /etc/urlencode.sed)
-targeturl=`echo $QUERY_STRING`
-sed "s/targeturl/"$targeturl"/g" /www/splash.html
+
+targeturl="$(echo "$QUERY_STRING" | tr -d '/')"
+sed "s/targeturl/"$targeturl"/g" splash.html
contact: Jan Huwald // Impressum