replacing the cli cmds with variables and configuration in config.php

[gwvp-mini.git] / gwvpmini / gwvpmini_search.php

diff --git a/gwvpmini/gwvpmini_search.php b/gwvpmini/gwvpmini_search.php
index 6bcf4c1..6e72fe9 100644 (file)
--- a/gwvpmini/gwvpmini_search.php
+++ b/gwvpmini/gwvpmini_search.php
@@ -10,13 +10,16 @@ $CALL_ME_FUNCTIONS["search"] = "gwvpmini_SearchCallMe";
 function gwvpmini_SearchCallMe()\r
 {\r
 \r
-       error_log("in repoadmin callme - err?");\r
-       error_log(print_r($_REQUEST, true));\r
+       // error_log("in repoadmin callme - err?");\r
+       // error_log(print_r($_REQUEST, true));\r
        if(isset($_REQUEST["q"])) {\r
-               error_log("in repoadmin callme, for Q");\r
+               // error_log("in repoadmin callme, for Q");\r
                $query = $_REQUEST["q"];\r
                $qspl = explode("/", $query);\r
-               if(isset($qspl[0])) {\r
+               if(isset($qspl[0])) {
+                       if($qspl[0] == "search_redirs") {
+                               return "gwvpmini_SearchMainPageRedir";
+                       }\r
                        if($qspl[0] == "search") {\r
                                return "gwvpmini_SearchMainPage";\r
                        } else return false;\r
@@ -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,14 +46,34 @@ 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"];\r
+               $qspl = explode("/", $query);\r
+               if(isset($qspl[1])) {
+                       $search = $qspl[1];
+               }
+       }
        
-       $reps = gwvp_findReposLike($search);
-       $ppls = gwvp_findPeopleLike($search);
+       $reps = gwvpmini_findReposLike($search);
+       $ppls = gwvpmini_findPeopleLike($search);
        
        
        
@@ -76,15 +99,14 @@ 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>".$rep["name"]."</b><br>".$rep["desc"];
+                       $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>";
                }
                echo "</table>";
@@ -97,8 +119,7 @@ function gwvpmini_SearchMainPageBody()
                echo "<table border=\"1\">";
                $ownedrepos = "BLAHBLAH";\r
                foreach($ppls as $ppl) {\r
-                       $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 {