X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=gwvpmini%2Fgwvpmini_search.php;h=6e72fe9c2d27f6a46f6af368adadef29af3d80f7;hb=39de15eac6b59d9c49634f63e6fcd3ca03082a12;hp=870dc0b3533322b714c23345f65f9758e98ef9d9;hpb=3175ff316104151c9cca5d33aa09b61f2da6253c;p=gwvp-mini.git

diff --git a/gwvpmini/gwvpmini_search.php b/gwvpmini/gwvpmini_search.php
index 870dc0b..6e72fe9 100644
--- a/gwvpmini/gwvpmini_search.php
+++ b/gwvpmini/gwvpmini_search.php
@@ -10,13 +10,16 @@ $CALL_ME_FUNCTIONS["search"] = "gwvpmini_SearchCallMe";
 function gwvpmini_SearchCallMe()
 {
 
-	error_log("in repoadmin callme - err?");
-	error_log(print_r($_REQUEST, true));
+	// error_log("in repoadmin callme - err?");
+	// error_log(print_r($_REQUEST, true));
 	if(isset($_REQUEST["q"])) {
-		error_log("in repoadmin callme, for Q");
+		// 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);
@@ -76,13 +99,12 @@ function gwvpmini_SearchMainPageBody()
 	echo "<tr valign=\"top\"><td>";
 	
 	
-	// get_gravatar( $email, $s = 80, $d = 'mm', $r = 'g', $img = false, $atts = array() ) {
+	
 	if($reps != false) {
 		echo "<table border=\"1\">";
 		foreach($reps as $rep) {
 			$ownerinfo = gwvpmini_getUser(null, null, $rep["owner"]);
-			$userdets = get_gravatar($ownerinfo["email"], 40, 'mm', 'g', true);
-			$userdets .= "<br><a href=\"$BASE_URL/user/".$ownerinfo["username"]."\">".$ownerinfo["username"]."</a>";
+			$userdets = gwvpmini_HtmlGravatar($ownerinfo["email"], 40, "<br>")."<a href=\"$BASE_URL/user/".$ownerinfo["username"]."\">".$ownerinfo["username"]."</a>";
 			
 			$repodets = "<b><a href=\"$BASE_URL/view/".$rep["name"]."\">".$rep["name"]."</a></b><br>".$rep["desc"];
 			echo "<tr><td>$userdets</td><td>$repodets</td></tr>";
@@ -97,8 +119,7 @@ function gwvpmini_SearchMainPageBody()
 		echo "<table border=\"1\">";
 		$ownedrepos = "BLAHBLAH";
 		foreach($ppls as $ppl) {
-			$userdets = get_gravatar($ppl["email"], 40, 'mm', 'g', true);
-			$userdets .= "<br><a href=\"$BASE_URL/user/".$ppl["username"]."\">".$ppl["username"]."</a>";
+			$userdets = gwvpmini_HtmlGravatar($ppl["email"], 40, "<br>")."<a href=\"$BASE_URL/user/".$ppl["username"]."\">".$ppl["username"]."</a>";
 			$repos = gwvpmini_GetOwnedRepos($ppl["username"]);
 			if($repos == false) $ownedrepos = "No Repos";
 			else {