From: Paul J R <me@pjr.cc>
Date: Tue, 2 Oct 2012 00:34:33 +0000 (+1000)
Subject: changed search funcitonality so it can be called as either
X-Git-Url: http://git.pjr.cc/?p=gwvp-mini.git;a=commitdiff_plain;h=c6ae91bb2641911a7bf9b0ee8e3b6da182de0b79

changed search funcitonality so it can be called as either
http://host/gwvp/search/<searchstring>
or via its form

Also does a 30x on the form submission so the returning search page can
be gone back to rather then ending in a form re-submission request
---

diff --git a/gwvpmini/gwvpmini_search.php b/gwvpmini/gwvpmini_search.php
index cf2681f..6e72fe9 100644
--- a/gwvpmini/gwvpmini_search.php
+++ b/gwvpmini/gwvpmini_search.php
@@ -16,7 +16,10 @@ function gwvpmini_SearchCallMe()
 		// error_log("in repoadmin callme, for Q");
 		$query = $_REQUEST["q"];
 		$qspl = explode("/", $query);
-		if(isset($qspl[0])) {
+		if(isset($qspl[0])) {
+			if($qspl[0] == "search_redirs") {
+				return "gwvpmini_SearchMainPageRedir";
+			}
 			if($qspl[0] == "search") {
 				return "gwvpmini_SearchMainPage";
 			} else return false;
@@ -32,7 +35,7 @@ function gwvpmini_SearchBuilder()
 {
 	global $BASE_URL;
 	
-	echo "<form method=\"post\" action=\"$BASE_URL/search\">";
+	echo "<form method=\"post\" action=\"$BASE_URL/search_redirs\">";
 	echo "<input type=\"text\" name=\"searchstring\"><input type=\"submit\" name=\"Search\" value=\"Seach\">";
 	echo "</form>";
 		
@@ -43,11 +46,31 @@ function gwvpmini_SearchMainPage()
 	gwvpmini_goMainPage("gwvpmini_SearchMainPageBody");
 }
 
+function gwvpmini_SearchMainPageRedir()
+{
+	global $BASE_URL;
+	
+	$_SESSION["search"] = $_REQUEST["searchstring"];
+	header("Location: $BASE_URL/search");
+	
+	return;
+}
+
 function gwvpmini_SearchMainPageBody()
 {
 	global $BASE_URL;
 	
-	$search = $_REQUEST["searchstring"];
+	$search = "";
+	if(isset($_SESSION["search"])) {
+		$search = $_SESSION["search"];
+		unset($_SESSION["search"]);
+	} else {
+		$query = $_REQUEST["q"];
+		$qspl = explode("/", $query);
+		if(isset($qspl[1])) {
+			$search = $qspl[1];
+		}
+	}
 	
 	$reps = gwvpmini_findReposLike($search);
 	$ppls = gwvpmini_findPeopleLike($search);