diff -r e2ac834162fb -r 3ad193634e5d details.php
--- a/details.php	Tue Jun 23 13:41:45 2009 +0100
+++ b/details.php	Tue Jul 07 19:14:12 2009 +0100
@@ -1,47 +1,105 @@
 <?php 
-	function remove_http($url = '')
+function remove_http($url = '')
+{
+	if ($url == 'http://' OR $url == 'https://')
 	{
-		if ($url == 'http://' OR $url == 'https://')
-		{
-			return $url;
-		}
-		$matches = substr($url, 0, 7);
-		if ($matches=='http://') 
-		{
-			$url = substr($url, 7);		
-		}
-		else
-		{
-			$matches = substr($url, 0, 8);
-			if ($matches=='https://') 
-			$url = substr($url, 8);
-		}
 		return $url;
 	}
+	$matches = substr($url, 0, 7);
+	if ($matches=='http://') 
+	{
+		$url = substr($url, 7);		
+	}
+	else
+	{
+		$matches = substr($url, 0, 8);
+		if ($matches=='https://') 
+		$url = substr($url, 8);
+	}
+	return $url;
+}
 
 	// read user ID from cookie, if cookie doesn't exist, set to 1 (master)
+        $currSID1 = $_COOKIE['sid1'];
+	$sid1 = $currSID1;
+                if (!isset($_COOKIE['sid1']))
+                        {
+                        $sid1 = '06D5VlLQTbM57LL7IBMW38yHkFpb1XVa';
+                        $currSID1 = $sid1;
+                        }
+
 	$currID = $_COOKIE['uid'];
-	
-	if ($currID == "") 
+	$uid = $currID;
+                if (!isset($_COOKIE['uid']))
+                        {
+                        $uid = '1';
+			$currID = '1';
+	                $mysql = new mysqli("localhost", "www-data", "www-data", "members");
+ #              $result = $mysql->query("SELECT sid, sid_dir FROM sessions WHERE ((uid = '$currID' or uid = 1) AND (expiration_date = DATE_ADD(NOW(), INTERVAL 24 HOUR)))");
+			$result = $mysql->query("SELECT sid_dir, enum FROM sessions WHERE ((uid = '$currID' or uid = 1) AND (sid = '$sid1') AND (expiration_date = DATE_ADD(NOW(), INTERVAL 1440 MINUTE)))");
+                	$row = $result->fetch_assoc();
+                	$tsid2 = $row["sid_dir"];
+			$enum = $row["enum"];
+                	$result->close();
+
+                        }
+
+/*        if ($currID == "")
+        {
+                $currID = "1";
+echo $currID;
+	}	
+*/
+/*	if ($currID == "") 
 	{
 		$currID = 1;
+		$mysql = new mysqli("localhost", "www-data", "www-data", "members");
+ #       	$result = $mysql->query("SELECT sid, sid_dir FROM sessions WHERE ((uid = '$currID' or uid = 1) AND (expiration_date = DATE_ADD(NOW(), INTERVAL 24 HOUR)))");
+$result = $mysql->query("SELECT sid, sid_dir FROM sessions WHERE ((uid = '$currID' or uid = 1) AND (expiration_date = DATE_ADD(NOW(), INTERVAL 24 HOUR)))");
+        	$row = $result->fetch_assoc();
+        	$tsid1 = $row["sid"];
+		$tsid2 = $row["sid_dir"];
+        	$result->close();
+
+
 	}
- 	// read session IDs from cookie, if cookie doesn't exist, set to 1 (master)
+*/
+ 	// read session IDs from cookie, if cookie doesn't exist, set to 06D5VlLQTbM57LL7IBMW38yHkFpb1XVa (master)
+
+
 
 //echo $_COOKIE["sid1"];
-        $currSID1 = $_COOKIE['sid1'];
+        $currSID2 = $_COOKIE['sid2'];
+	$sid2 = $currSID2;
+                if (!isset($_COOKIE['sid2']))
+                        {
+			$sid2 = $tsid2;
+//                        $sid2 = '06D5VlLQTbM57LL7IBMW38yHkFpb1XVa';
+			$currSID2 = $sid2;
+                        }
+echo $uid;
+echo $sid1;
+echo $sid2;
+echo $enum;
+/*
 	if ($currSID1 == "")
         {
                 $currSID1 = "06D5VlLQTbM57LL7IBMW38yHkFpb1XVa";
+//		$currSID1 = $tsid1;
+
+echo $currSID1;
+
         }
 
         $currSID2 = $_COOKIE['sid2'];
 	if ($currSID2 == "")
         {
                 $currSID2 = "06D5VlLQTbM57LL7IBMW38yHkFpb1XVa";
+//		$currSID2 = $tsid2;
+echo $currSID2;
         }
-
-//print_r($_COOKIE);
+*/
+print_r($_COOKIE);
 	
 	$status = $_GET['alert'];
 	$view_mode = $_GET['view_mode'];
@@ -54,40 +112,73 @@
 	
 	// search server cache for received websites
 	// anonymous uid=1, sid1=06D5VlLQTbM57LL7IBMW38yHkFpb1XVa & sid2 =06D5VlLQTbM57LL7IBMW38yHkFpb1XVa
-	if (($currID != 1) && ($currSID1 != "06D5VlLQTbM57LL7IBMW38yHkFpb1XVa"))
+//	if (($currID != 1) && ($currSID1 != "06D5VlLQTbM57LL7IBMW38yHkFpb1XVa"))
+        if ($currID != 1) 
+
 	{
 		$query_cache = mysql_query("SELECT * FROM requests_tbl WHERE (uid = '$currID' OR uid = 1)");
 	} 
 	else 
 	{
 		$query_cache = mysql_query("SELECT * FROM requests_tbl WHERE (uid = 1)");
+                        while ($db_fieldcache = mysql_fetch_assoc($query_cache))
+                        {
+                        // send command to squid and return value
+    #                    $command2 = "squidclient -m HEAD -p 8080 -H \"Cache-Control: only-if-cached\n\" -u " . $db_fieldcache["req_ID"] . " -w " . $db_fieldcache["uid"] . " " . $db_fieldcache["req_val"] . " |grep X-Cache: |grep MISS";
+#                    $command2 = "squidclient -m HEAD -p 8080" . $db_fieldcache["req_val"] . " |grep X-Cache: |grep MISS";
+//                    $command2 = "squidclient -m HEAD -p 8080 -u {$db_fieldcache["req_ID"]} -w $currSID1 http://localhost/router_stage/{$db_fieldcache["req_ID"]}/$strip_url_val/ |grep X-Cache: |grep MISS";
+		    $curr_reqID = $db_fieldcache["req_ID"];
+#                    $http_proxy = "http://localhost:8080";
+#                    $staging = "/var/www/private/HTMLrequester/staging/";
+#                    $wget_options = " --delete-after -N -r -l 3 --no-remove-listing -p --max-redirect 10 -t 1 -d";
+#                    $strip_url_val = remove_http($db_fieldcache['req_val']);
+#                                        $command1 = "wget -P $staging $wget_options http://localhost/router_stage/{$db_fieldcache["req_ID"]}/$strip_url_val/ . '?' . 'uid=' . $uid . '&'  . 'sid1=' . $sid1 . '&' . 'sid2=' . $sid2";
+#                    exec($command1, $wget_results);
+
+$http_proxy = "http://localhost:8080";
+                    $command2 = "squidclient -m HEAD -p 8080 -u www-data -w www-data http://localhost/router_stage/{$db_fieldcache["req_ID"]}/$strip_url_val/?uid=$uid'&'sid1=$sid1'&'sid2=$sid2 |grep X-Cache: |grep MISS";
+                        exec($command2, $cache_results);
+                        // find out if site is available and update the database
+                                if (strpos($cache_results, "HIT") == true)
+                                        {
+                                        $query_update = mysql_query("UPDATE responses_tbl SET req_response = '1' WHERE req_ID = '$curr_reqID'");
+                                        }
+                                        else
+                                        {
+                			$filename = "/var/www/private/HTMLrequester/router_stage/{$db_fieldcache["req_ID"]}/";
+              				if (file_exists($filename))
+                        		{
+                                        $query_update = mysql_query("UPDATE responses_tbl SET req_response = '0' WHERE req_ID = '$curr_reqID'");
+                                       # $http_proxy = "http://localhost:8080";
+				#	$http_proxy = "http://localhost:8080";
+                                        $staging = "/var/www/private/HTMLrequester/staging/";
+                                       # $wget_options = "--dns-timeout=1 --proxy-user=www-data --proxy-password=www-data --cache=off -N -r -l 3 --no-remove-listing -p --max-redirect 10 -t 1 -d -I  http://localhost/router_stage/{$db_fieldcache["req_ID"]}/$strip_url_val/ -X   http://localhost/router_stage/{$db_fieldcache["req_ID"]}/";
+                                        #$wget_options = "--dns-timeout=1 --proxy-user=www-data --proxy-password=www-data -N -r -l 3 --no-remove-listing -p --max-redirect 10 -t 1 -d -I  http://localhost/router_stage/{$db_fieldcache["req_ID"]}/$strip_url_val/ -X   http://localhost/router_stage/{$db_fieldcache["req_ID"]}/";
+					#$wget_options = "--no-cache --dns-timeout=1 --proxy-user=www-data --proxy-password=www-data -N -r -l 3 --no-remove-listing -p --max-redirect 10 -t 1 -d -I  http://localhost/router_stage/{$db_fieldcache["req_ID"]}/$strip_url_val/ -X   http://localhost/router_stage/{$db_fieldcache["req_ID"]}/ http://localhost/router_stage/{$db_fieldcache["req_ID"]}/$strip_url_val/";
+                                        $wget_options = "--dns-timeout=1 --proxy-user=www-data --proxy-password=www-data -N -r -l 3 --no-remove-listing -p --max-redirect 10 -t 1 -d";
+
+
+
+                                        $strip_url_val = remove_http($db_fieldcache['req_val']);
+                                       # $command1 = "wget -P $staging $wget_options http://localhost/router_stage/{$db_fieldcache["req_ID"]}/$strip_url_val/?uid=$uid'&'sid1=$sid1'&'sid2=$sid2";
+                                       # exec($command1, $wget_results);
+					
+                                        $command1 = "wget -P $staging $wget_options http://localhost/router_stage/{$db_fieldcache["req_ID"]}/$strip_url_val/?uid=$uid'&'sid1=$sid1'&'sid2=$sid2";
+                                       exec($command1, $wget_results);
+					}
+					else
+					{		
+                                        $query_update = mysql_query("UPDATE responses_tbl SET req_response = '0' WHERE req_ID = '$curr_reqID'");
+					}
+                                        }
+
+			}
 	}
 	
 	while ($db_fieldcache = mysql_fetch_assoc($query_cache)) 
 	{
-		// send command to squid and return value
 		$curr_reqID = $db_fieldcache["req_ID"];
-//$commandline = "wget --delete-after -N -r -l 3 --no-remove-listing -p --max-redirect 10 -t 1 -d http://localhost/staging/" " . $db_fieldcache["req_ID"] . " " . $db_fieldcache["req_val"];
-//echo $commandline;
-
-//                exec($commandline, $wget_results);
-//$commandline = "squidclient -m HEAD -p 8080 -H \"Cache-Control: only-if-cached\n\" -u " . $db_fieldcache["req_ID"] . " -w " . $db_fieldcache["uid"] . " " . $db_fieldcache["req_val"] . " |grep X-Cache: |grep MISS";
-
 		$filename = "/var/www/private/HTMLrequester/router_stage/{$db_fieldcache["req_ID"]}/";
-
-//$commandline = "squidclient -m HEAD -p 8080 -H \"Cache-Control: only-if-cached\n\" -u " . $db_fieldcache["req_ID"] . " -w " . $db_fieldcache["uid"] . " " . $db_fieldcache["req_val"] . " |grep X-Cache: |grep MISS";
-
-//		exec($commandline, $cache_results);
-		
-		// find out if site is available and update the database
-//		if (strpos($cache_results, "HIT") == true)
-//		{
-//			$query_update = mysql_query("UPDATE responses_tbl SET req_response = '1' WHERE req_ID = '$curr_reqID'");
-//		} 
-//		else 
-//		{
-//			$query_update = mysql_query("UPDATE responses_tbl SET req_response = '0' WHERE req_ID = '$curr_reqID'");
-//		}
 		if (file_exists($filename)) 
     			{
     			$query_update = mysql_query("UPDATE requests_tbl SET req_response = '1' WHERE req_ID = '$curr_reqID'");
@@ -233,12 +324,41 @@
 				} else {
 //header ('Location: http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . dirname($db_fieldcache["req_ID"]));
 //strip_tags($text, '<p><a>')
-                                      print "<span class='result_output'><a href='". 'router_stage/' . $db_field['req_ID'] . '/' . remove_http($db_field['req_val']) ."' target='_blank'>View website</a></span>";
+if ($db_field['uid'] != 1)
+{
+                print "<span class='result_output'><a href='". 'router_stage/' . $db_field['req_ID'] . '/' . remove_http($db_field['req_val'] . '?' . 'uid=' . $uid . '&'  . 'sid1=' . $sid1 . '&' . 'sid2=' . $sid2) ."' target='_blank'>View website</a></span>";
+}
+else
+{
+
+#$data = http_get('http://...')
+#$response = http_get("'http://localhost:8080'. '/router_stage/' . $db_field['req_ID'] . '/' . remove_http($db_field['req_val'] . '?' . 'uid=' . $uid . '&'  . 'sid1=' . $sid1 . '&' . 'sid2=' . $sid2");
+print "<span class='result_output'><a href='". 'http://localhost'. '/router_stage/' . $db_field['req_ID'] . '/' . remove_http($db_field['req_val'] . '?' . 'uid=' . $uid . '&'  . 'sid1=' . $sid1 . '&' . 'sid2=' . $sid2) ."' target='_blank'>View website</a></span>";
+#print "<span class='result_output'><a href='". 'http://localhost:8080'. '/' . remove_http($db_field['req_val'] . '?' . 'uid=' . $uid . '&'  . 'sid1=' . $sid1 . '&' . 'sid2=' . $sid2) ."' target='_blank'>View website</a></span>";
+
+#print "<span class='result_output'><a href='". $response ."' target='_blank'>View website</a></span>";
+
+}
+
+                        //                print "<span class='result_output'><a href='". 'router_stage/' . $db_field['req_ID'] . '/' . remove_http($db_field['req_val'] . '?' . 'uid=' . $uid . '&'  . 'sid1=' . $sid1 . '&' . 'sid2=' . $sid2) ."' target='_blank'>View website</a></span>";
+
+/////////////////////////////////////////////////////////////
+////Uncomment this next section for Cookie in header if uid != 1  
+/*					if ($uid == 1) {
+                                      	print "<span class='result_output'><a href='". 'router_stage/' . $db_field['req_ID'] . '/' . remove_http($db_field['req_val'] . '?' . 'uid=' . $uid . '&'  . 'sid1=' . $sid1 . '&' . 'sid2=' . $sid2) ."' target='_blank'>View website</a></span>";
+					}
+					else
+					{
+					print "<span class='result_output'><a href='". 'router_stage/' . $db_field['req_ID'] . '/' . remove_http($db_field['req_val']) . "' target='_blank'>View website</a></span>";
+					}
+*/
+//////////////////////////////////////////////////////////////
 //					print "<span class='result_output'><a href='" . $db_field['req_val'] ."' target='_blank'>View website</a></span>";
-					print "<a href='delete.php?req_id=" . $db_field['req_ID'] . "'><img src='images/x.gif' width='14' height='20' /></a>";
-				}
-                print "<div class='clear'></div></div>";
-				
+#					print "<a href='delete.php?req_id=" . $db_field['req_ID'] . '/' . remove_http($db_field['req_val'] . '?' . 'uid=' . $uid . '&'  . 'sid1=' . $sid1 . '&' . 'sid2=' . $sid2 . "'><img src='images/x.gif' width='14' height='20' /></a>";
+                                       print "<a href='delete.php?req_id=" . $db_field['req_ID'] . "'><img src='images/x.gif' width='14' height='20' /></a>";
+
+					}
+                		print "<div class='clear'></div></div>";
 				$search_count++;
             }
             
@@ -249,8 +369,24 @@
             }
             
             mysql_close();
+/* To submit a form using POST method through PHP, just add the data to be posted as header. This essentially saves one extra html page sent to the browser when user has to be redirected. 
+<?php
+$host = "www.example.com";
+$path = "/path/to/script.php";
+$data = "data1=value1&data2=value2";
+$data = urlencode($data);
+
+header("POST $path HTTP/1.1\r\n" );
+header("Host: $host\r\n" );
+header("Content-type: application/x-www-form-urlencoded\r\n" );
+header("Content-length: " . strlen($data) . "\r\n" );
+header("Connection: close\r\n\r\n" );
+header($data);
+?>
+*/
         ?>
     </div>
 </div>
 </body>
 </html>
+