From: moodler <moodler>
Date: Mon, 2 Oct 2006 06:16:50 +0000 (+0000)
Subject: Added search box for searching admin settings
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=36e5266fc14d9292a0793acb22625f17f3a19214;p=moodle.git

Added search box for searching admin settings
---

diff --git a/admin/search.php b/admin/search.php
index 26899daf85..74c6cfbe54 100644
--- a/admin/search.php
+++ b/admin/search.php
@@ -5,10 +5,13 @@
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
+$query = required_param('query', PARAM_ALPHAEXT);
+
 $adminroot = admin_get_root();
 admin_externalpage_setup('search', $adminroot); // now hidden page
 
-$query = required_param('query', PARAM_ALPHAEXT);
+$CFG->adminsearchquery = $query;  // So we can reference it in search boxes later in this invocation
+
 
 $resultshtml = search_settings_html(admin_get_root(), $query);
 
diff --git a/blocks/admin_tree/block_admin_tree.php b/blocks/admin_tree/block_admin_tree.php
index 323d045672..95dd95f4dd 100644
--- a/blocks/admin_tree/block_admin_tree.php
+++ b/blocks/admin_tree/block_admin_tree.php
@@ -179,12 +179,18 @@ class block_admin_tree extends block_base {
             $this->content->text .= $this->expandjavascript;
 
             $this->content->text .= '</script>' . "\n";
-            $this->content->footer = '';
         } else {
             $this->content = new stdClass;
             $this->content->text = '';
-            $this->content->footer = '';
         }
+
+        $searchcontent = isset($CFG->adminsearchquery) ? $CFG->adminsearchquery : '';
+
+        $this->content->footer = '<div class="adminsearchform">'.
+                                 '<form action="'.$CFG->wwwroot.'/admin/search.php" method="get">'.
+                                 '<input type="text" name="query" size="8" value="'.$searchcontent.'" />'.
+                                 '<input type="submit" value="'.get_string('search').'" />'.
+                                 '</form></div>';
         return $this->content;
 
     }