Changeset 545

Timestamp:

09/13/06 15:32:21 (2 years ago)

Author:

ben

Message:

You can now filter your search to just resources or accounts (i.e., users and communities).

Files:

• devel/_templates/Default_Template/pageshell (modified) (2 diffs)
• devel/search/index.php (modified) (3 diffs)
• devel/units/files/function_search.php (modified) (1 diff)
• devel/units/profile/function_search.php (modified) (1 diff)
• devel/units/search/function_display.php (modified) (1 diff)
• devel/units/search/function_search_all_display.php (modified) (1 diff)
• devel/units/weblogs/function_search.php (modified) (1 diff)

devel/_templates/Default_Template/pageshell

@@ -42 +42 @@
-                <div id="search_widget"><!-- open div search_widget -->
-                <img src="{{url}}_templates/default_images/own_ad_top.gif" alt="" border="0" />
-all
+index
-                <script language="JavaScript" type="text/javascript">
-                        <!--
@@ -51 +51 @@
-                        -->
-                </script>
-
+
+
+
+
+
+
-             </form>
-                <img src="{{url}}_templates/default_images/own_ad_bottom.gif" alt="" border="0" />

devel/search/index.php

@@ -19 +19 @@
-        $PAGE->search_type = $db->qstr($PAGE->search_type_unformatted);
-        
+        $PAGE->returned_items = optional_param('returned_items','');
+        
-        $querystring = "";
-        if (isset($_GET) && !empty($_GET)) {
@@ -34 +36 @@
-        $querystring = $CFG->wwwroot . "search/index.php?" . $querystring;
-        
-ing
+ for results from:
-        
-        if ($PAGE->search_type  == "''") {
@@ -57 +59 @@
-        $body .= "</p>";
-        
+        
+        
+        $querystring = "";
+        if (isset($_GET) && !empty($_GET)) {
+            foreach($_GET as $key => $value) {
+                if ($key != 'returned_items') {
+                    if (!empty($querystring)) {
+                        $querystring .= "&";
+                    }
+                    $querystring .= urlencode($key);
+                    $querystring .= "=";
+                    $querystring .= urlencode(optional_param($key,''));
+                }
+            }
+        }
+        $querystring = $CFG->wwwroot . "search/index.php?" . $querystring;
+        
+        $body .= "<p>" . gettext("Filter by content type:") . " ";
+        if (empty($PAGE->returned_items)) {
+            $body .= "<b class=\"search_displaying_type\">";
+        }
+        $body .= "<a href=\"$querystring\">" . gettext("Everything") . "</a> ";
+        if (empty($PAGE->returned_items)) {
+            $body .= "</b>";
+        }
+        if ($PAGE->returned_items == 'accounts') {
+            $body .= "<b class=\"search_displaying_type\">";
+        }
+        $body .= "<a href=\"$querystring&returned_items=accounts\">" . gettext("Users and communities") . "</a> ";
+        if ($PAGE->returned_items == 'accounts') {
+            $body .= "</b>";
+        }
+        if ($PAGE->returned_items == 'resources') {
+            $body .= "<b class=\"search_displaying_type\">";
+        }
+        $body .= "<a href=\"$querystring&returned_items=resources\">" . gettext("Resources") . "</a> ";
+        if ($PAGE->returned_items == 'resources') {
+            $body .= "</b>";
+        }
+        
+        
-        $body .= run("search:display");
-        

devel/units/files/function_search.php

@@ -4 +4 @@
-global $search_exclusions;
-
-
+
+
+
+
+
+
+
+
-    
-    $dbtag = $db->qstr($parameter[1]);

devel/units/profile/function_search.php

@@ -13 +13 @@
-            }
-        }
-
+
+
+
+
+
-        if ($handle) {
-            

devel/units/search/function_display.php

@@ -16 +16 @@
-    
-            foreach($query as $field => $value) {
-
+
+
+
-                    // $searchline = "tagtype = '".addslashes($field)."' and tag = '".addslashes($value)."'";
-                    $run_result .= run("search:display_results", array($field,$value));

devel/units/search/function_search_all_display.php

@@ -14 +14 @@
-        
-    }
-
+ && $tag != "returned_items"
-        $run_result .= run("search:tags:suggest",$tag);
-        $run_result .= run("search:users:suggest",$tag);

devel/units/weblogs/function_search.php

@@ -9 +9 @@
-$otherUsers2 = gettext("Users with weblog posts in category"); // gettext variable
-
-
+
+
+
+
+
+
+
-    
-    if ($parameter[0] == "weblog") {