# HG changeset patch
# User Alex McMahon <alex.mcmahon@cs.tcd.ie>
# Date 1277993827 0
# Node ID 5c3c1b82fea26717174e623f0d0ce537bc1e25b3
# Parent  0cc2bfb3d6e1575ea1c5336494c2885424234ed9
sid_dir

diff -r 0cc2bfb3d6e1 -r 5c3c1b82fea2 details.php
--- a/details.php	Tue Jun 22 08:47:21 2010 +0000
+++ b/details.php	Thu Jul 01 14:17:07 2010 +0000
@@ -35,21 +35,18 @@
                         $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)))");
+			$result = $mysql->query("SELECT sid_dir, enum FROM sessions WHERE ((uid = '$currID' or uid = 1) AND (sid = '$sid1' or sid = '06D5VlLQTbM57LL7IBMW38yHkFpb1XVa')) ORDER BY enum desc LIMIT 0,1");
                 	$row = $result->fetch_assoc();
                 	$tsid2 = $row["sid_dir"];
 			$enum = $row["enum"];
                 	$result->close();
-
                         }
-
         $currSID2 = $_COOKIE['sid2'];
 	$sid2 = $currSID2;
                 if (!isset($_COOKIE['sid2']))
                         {
-			$sid2 = $tsid2;
-//                        $sid2 = '06D5VlLQTbM57LL7IBMW38yHkFpb1XVa';
+#			$sid2 = $tsid2;
+                        $sid2 = '06D5VlLQTbM57LL7IBMW38yHkFpb1XVa';
 			$currSID2 = $sid2;
                         }
 #        $view_mode = "public"
@@ -258,13 +255,13 @@
 				} else {
 //header ('Location: http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . dirname($db_fieldcache["req_ID"]));
 //strip_tags($text, '<p><a>')
-if ($db_field['uid'] != 1)
+/*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
 {
-
+*/
 print "<span class='result_output'><a href='". 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . '/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://village.n4c.eu/portal'. '/router_stage/' . $db_field['req_ID'] . '/' . remove_http($db_field['req_val'] . '?' . 'uid=' . $uid . '&'  . 'sid1=' . $sid1 . '&' . 'sid2=' . $sid2) ."' target='_blank'>View website</a></span>";
@@ -272,7 +269,7 @@
 
 #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>";
 
diff -r 0cc2bfb3d6e1 -r 5c3c1b82fea2 index.php
--- a/index.php	Tue Jun 22 08:47:21 2010 +0000
+++ b/index.php	Thu Jul 01 14:17:07 2010 +0000
@@ -71,8 +71,8 @@
                 	}
         	if (!isset($_COOKIE['sid2']))
                		{
-//			$sid2 = '06D5VlLQTbM57LL7IBMW38yHkFpb1XVa';
-                        $sid2 = $tsid2;
+			$sid2 = '06D5VlLQTbM57LL7IBMW38yHkFpb1XVa';
+       //                 $sid2 = $tsid2;
                 	}
                }
 
diff -r 0cc2bfb3d6e1 -r 5c3c1b82fea2 mod_auth_form-2.05/src/Makefile.am
--- a/mod_auth_form-2.05/src/Makefile.am	Tue Jun 22 08:47:21 2010 +0000
+++ b/mod_auth_form-2.05/src/Makefile.am	Thu Jul 01 14:17:07 2010 +0000
@@ -11,3 +11,4 @@
 AM_CPPFLAGS = -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE
 AM_CPPFLAGS = -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE
 AM_CPPFLAGS = -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE
+AM_CPPFLAGS = -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE