Handle hostnames with upper-case letters

[webmin.git] / webmin-search-lib.pl

diff --git a/webmin-search-lib.pl b/webmin-search-lib.pl
old mode 100644 (file)
new mode 100755 (executable)
index 6d5e704..aff55e3
--- a/webmin-search-lib.pl
+++ b/webmin-search-lib.pl
@@ -1,6 +1,6 @@
 # Functions for searching the webmin docs and UI
 
-=head2 search_webmin(phrase, [callback-function])
+=head2 search_webmin(phrase, [callback-function], [&modules])
 
 Searches all Webmin help pages, UI text, module names and config.info files
 for entries matching the given phrase or word. Returns them sorted by relevance
@@ -19,7 +19,7 @@ order, each as a hash ref with the following keys :
 =cut
 sub search_webmin
 {
-my ($re, $cbfunc) = @_;
+my ($re, $cbfunc, $onlymods) = @_;
 
 # Work out this Webmin's URL base
 my $urlhost = $ENV{'HTTP_HOST'};
@@ -31,10 +31,18 @@ my $urlbase = ($ENV{'HTTPS'} eq 'ON' ? 'https://' : 'http://').$urlhost;
 # Search module names and add to results list
 my @rv = ( );
 my $pn = &get_product_name();
-my @mods = sort { $b->{'longdesc'} cmp $a->{'longdesc'} }
-            grep { !$_->{'clone'} }
-              grep { !$_->{'noui'} && !$_->{$pn.'_noui'} }
-                &get_available_module_infos();
+my @mods;
+if ($onlymods) {
+       # Modules specified by caller
+       @mods = grep { &foreign_available($_->{'dir'}) } @$onlymods;
+       }
+else {
+       # All reasonable modules
+       @mods = &get_available_module_infos();
+       }
+@mods = grep { !$_->{'clone'} }
+         grep { !$_->{'noui'} && !$_->{$pn.'_noui'} } @mods;
+@mods = sort { $b->{'longdesc'} cmp $a->{'longdesc'} } @mods;
 foreach my $m (@mods) {
        if ($m->{'desc'} =~ /\Q$re\E/i) {
                # Module description match
@@ -44,6 +52,14 @@ foreach my $m (@mods) {
                            'link' => $m->{'dir'}.'/',
                            'text' => $m->{'desc'} });
                }
+       elsif ($m->{'longdesc'} =~ /\Q$re\E/i) {
+               # Module long description match
+               push(@rv, { 'mod' => $m,
+                           'rank' => 9.5,
+                           'type' => 'mod',
+                           'link' => $m->{'dir'}.'/',
+                           'text' => $m->{'longdesc'} });
+               }
        elsif ($m->{'dir'} =~ /\Q$re\E/i) {
                # Module directory match
                push(@rv, { 'mod' => $m,