michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Global ACL option to disable webmin search

Browse Source
This commit is contained in:
Jamie Cameron
2009-12-28 23:12:30 -08:00
parent eb64c8ef6c
commit d32ac11bfb
5 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -127,3 +127,4 @@ Beginnings of a Basque translation, thanks to Mireia Lezea.
Czech translation updates, thanks to Karel Hudan. Czech translation updates, thanks to Karel Hudan.
The Webmin RPM now preserves the /etc/webmin directory when un-installed and then re-installed. 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. 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".

6
acl_security.pl
View File

@@ -99,6 +99,11 @@ print &ui_table_row($text{'acl_readonly2'},
&ui_radio("readonly", int($o->{'readonly'}), &ui_radio("readonly", int($o->{'readonly'}),
[ [ 1, $text{'acl_readonlyyes'} ], [ [ 1, $text{'acl_readonlyyes'} ],
[ 0, $text{'no'} ] ])); [ 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) # acl_security_save(&options)
@@ -126,5 +131,6 @@ $_[0]->{'rpc'} = $in{'rpc'};
$_[0]->{'negative'} = $in{'negative'}; $_[0]->{'negative'} = $in{'negative'};
$_[0]->{'readonly'} = $in{'readonly'}; $_[0]->{'readonly'} = $in{'readonly'};
$_[0]->{'fileunix'} = $in{'fileunix_def'} ? undef : $in{'fileunix'}; $_[0]->{'fileunix'} = $in{'fileunix_def'} ? undef : $in{'fileunix'};
$_[0]->{'webminsearch'} = $in{'webminsearch'};
} }

4
blue-theme/left.cgi
View File

@@ -6,6 +6,7 @@ use WebminCore;
&init_config(); &init_config();
&ReadParse(); &ReadParse();
%text = &load_language($current_theme); %text = &load_language($current_theme);
%gaccess = &get_module_acl(undef, "");
# Work out what modules and categories we have # Work out what modules and categories we have
@cats = &get_visible_modules_categories(); @cats = &get_visible_modules_categories();
@@ -89,7 +90,8 @@ else {
} }
# Show module/help search form # 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 "<form action=webmin_search.cgi target=right>\n";
print $text{'left_search'},"&nbsp;"; print $text{'left_search'},"&nbsp;";
print &ui_textbox("search", undef, 15); print &ui_textbox("search", undef, 15);

1
defaultacl
View File

@@ -6,3 +6,4 @@ feedback=2
readonly=0 readonly=0
nodot=0 nodot=0
fileunix=root fileunix=root
webminsearch=1

1
lang/en
View File

@@ -173,6 +173,7 @@ acl_readonlyyes=Yes (Some modules may not be available)
acl_negative=Grant new module permissions to user? acl_negative=Grant new module permissions to user?
acl_fileunix=Browse files as Unix user acl_fileunix=Browse files as Unix user
acl_sameunix=Same as Webmin login acl_sameunix=Same as Webmin login
acl_webminsearch=Show Webmin search field?
month_1=January month_1=January
month_2=February month_2=February