Added search box for searching admin settings

diff --git a/admin/search.php b/admin/search.php
index 26899daf853ad8274535e3abd14e4d002fa5e70c..74c6cfbe546340daeb27cc67e5b60fe67b353c84 100644 (file)
--- 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 323d0456728af88e9c4cf54c4e04e22b2c7e1512..95dd95f4dde7fb0e93c1a03c7f2f8dc9c9aa0c4d 100644 (file)
--- 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;
 
     }