Changeset 450 for scripts/splash

Timestamp:

Aug 31, 2011 1:37:39 AM (9 months ago)

Author:

bjo

Message:

fixed some bugs, ip-deletion did not work with new sudo

Location:

scripts/splash

Files:

• index.php (modified) (2 diffs)
• splash.sh (modified) (1 diff)

scripts/splash/index.php

@@ -2 +2 @@
 
 //Configuration
-$path_to_unlock_script = "/etc/ff/splash.sh";
+$path_to_unlock_script = "sudo /etc/ff/splash.sh";
 
 //Script
@@ -11 +11 @@
 if(empty($_POST['accept'])) {
         $browser_agent = getenv("HTTP_USER_AGENT");
-        $Browser = checkBrowser(getenv("HTTP_USER_AGENT"));
-        
-
-$myFile = "./agent.log";
-$fh = fopen($myFile, 'w') or die("can't open file");
-$stringData = date('H:m Y-m-d').": agent: $browser_agent, browser: $Browser, referer: $_SERVER[HTTP_REFERER]\n";
-fwrite($fh, $stringData);
-fclose($fh);
-
-
+        $Browser = checkBrowser($browser_agent);
+
+        //Write agent log for debugging information
+        $myFile = "./agent.log";
+        $fh = fopen($myFile, 'a') or die("can't open file");
+        $stringData = date('H:m Y-m-d')."- ip address: \"$_SERVER[REMOTE_ADDR]\" agent: \"$browser_agent\", browser: \"$Browser\", referer: \"$_SERVER[HTTP_REFERER]\"\n";
+        fwrite($fh, $stringData);
+        fclose($fh);
 
         //Redirekt fpr MOBILE devices
         if ($Browser != "OTHER" OR empty($browser_agent)) {
-                /*unlockAndRedirect*/($path_to_unlock_script);
+                /*unlockAndRedirect*/
+                unlockAndRedirect($path_to_unlock_script);
         } else {
         //Splashpage for other (bigger) devices

scripts/splash/splash.sh

@@ -20 +20 @@
 echo "splashing $3 and adding $2" >>/var/log/splash.log
 echo $2 >> /etc/ff/macs
-iptables -t nat -A PREROUTING -p tcp -s $3 ! -d 78.46.28.198 --dport 80 -j DNAT --to-destination 10.18.0.1
+/sbin/iptables -t nat -A PREROUTING -p tcp -s $3 ! -d 91.121.204.103 --dport 80 -j DNAT --to-destination 10.18.0.1
 fi
 
 if [ "$1" = "del" ]; then
 echo "$3 went away" >>/var/log/splash.log
-iptables -t nat -D PREROUTING -p tcp -s $3 ! -d 78.46.28.198 --dport 80 -j DNAT --to-destination 10.18.0.1
+/sbin/iptables -t nat -D PREROUTING -p tcp -s $3 ! -d 91.121.204.103 --dport 80 -j DNAT --to-destination 10.18.0.1
 fi
 
 
 if [ "$1" = "delete" ]; then
-#echo "$2 desplashed" >>/var/log/fflog
-sudo iptables -t nat -D PREROUTING -p tcp -s $2 ! -d 78.46.28.198 --dport 80 -j DNAT --to-destination 10.18.0.1
+echo "$2 desplashed" >>/var/log/fflog
+/sbin/iptables -t nat -D PREROUTING -p tcp -s $2 ! -d 91.121.204.103 --dport 80 -j DNAT --to-destination 10.18.0.1
 fi