Global ACL option to disable webmin search

diff --git a/CHANGELOG b/CHANGELOG
index 15e8bec..fd23e73 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -127,3 +127,4 @@ Beginnings of a Basque translation, thanks to Mireia Lezea.
 Czech translation updates, thanks to Karel Hudan.
 The Webmin RPM now preserves the /etc/webmin directory when un-installed and then re-installed.
 Added a robots.txt file to block indexing of Webmin by search engines.
+The Webmin search box can now be disabled in the Webmin Users module, under "Permissions for all modules".

diff --git a/acl_security.pl b/acl_security.pl
index 4bfd2a0..ee11d1e 100755 (executable)
--- a/acl_security.pl
+++ b/acl_security.pl
@@ -99,6 +99,11 @@ print &ui_table_row($text{'acl_readonly2'},
        &ui_radio("readonly", int($o->{'readonly'}),
                  [ [ 1, $text{'acl_readonlyyes'} ],
                    [ 0, $text{'no'} ] ]));
+
+# Allow use of search field
+print &ui_table_row($text{'acl_webminsearch'},
+       &ui_radio("webminsearch", int($o->{'webminsearch'}),
+                 [ [ 1, $text{'yes'} ], [ 0, $text{'no'} ] ]));
 }
 
 # acl_security_save(&options)
@@ -126,5 +131,6 @@ $_[0]->{'rpc'} = $in{'rpc'};
 $_[0]->{'negative'} = $in{'negative'};
 $_[0]->{'readonly'} = $in{'readonly'};
 $_[0]->{'fileunix'} = $in{'fileunix_def'} ? undef : $in{'fileunix'};
+$_[0]->{'webminsearch'} = $in{'webminsearch'};
 }
 

diff --git a/blue-theme/left.cgi b/blue-theme/left.cgi
index c4432bf..1d6d225 100755 (executable)
--- a/blue-theme/left.cgi
+++ b/blue-theme/left.cgi
@@ -6,6 +6,7 @@ use WebminCore;
 &init_config();
 &ReadParse();
 %text = &load_language($current_theme);
+%gaccess = &get_module_acl(undef, "");
 
 # Work out what modules and categories we have
 @cats = &get_visible_modules_categories();
@@ -89,7 +90,8 @@ else {
        }
 
 # Show module/help search form
-if (-r "$root_directory/webmin_search.cgi") {
+if (-r "$root_directory/webmin_search.cgi" &&
+    $gaccess{'webminsearch'}) {
        print "<form action=webmin_search.cgi target=right>\n";
        print $text{'left_search'},"&nbsp;";
        print &ui_textbox("search", undef, 15);

diff --git a/defaultacl b/defaultacl
index ae55fda..e424f59 100644 (file)
--- a/defaultacl
+++ b/defaultacl
@@ -6,3 +6,4 @@ feedback=2
 readonly=0
 nodot=0
 fileunix=root
+webminsearch=1

diff --git a/lang/en b/lang/en
index de72f19..0eb7881 100644 (file)
--- a/lang/en
+++ b/lang/en
@@ -173,6 +173,7 @@ acl_readonlyyes=Yes (Some modules may not be available)
 acl_negative=Grant new module permissions to user?
 acl_fileunix=Browse files as Unix user
 acl_sameunix=Same as Webmin login
+acl_webminsearch=Show Webmin search field?
 
 month_1=January
 month_2=February