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

Fix searching when user can only view extra log files https://www.virtualmin.com/node/56500

Browse Source
This commit is contained in:
Jamie Cameron
2018-03-24 17:24:51 -07:00
parent c6ad8d9530
commit 71024e59cc
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
syslog/save_log.cgi
View File

@@ -20,12 +20,19 @@ if ($in{'delete'}) {
}
elsif ($in{'view'}) {
# Viewing a log file
@extras = &extra_log_files();
if ($in{'idx'} =~ /^\//) {
# The drop-down selector on this page has chosen a file
$in{'file'} = $in{'idx'};
if (&indexof($in{'idx'}, (map { $_->{'file'} } @extras)) >= 0) {
$in{'extra'} = $in{'idx'};
delete($in{'file'});
}
else {
$in{'file'} = $in{'idx'};
delete($in{'extra'});
}
delete($in{'idx'});
delete($in{'oidx'});
delete($in{'extra'});
}
if ($in{'idx'} ne '') {
# From syslog
@@ -49,7 +56,6 @@ elsif ($in{'view'}) {
}
elsif ($in{'extra'}) {
# Extra log file
@extras = &extra_log_files();
($extra) = grep { $_->{'file'} eq $in{'extra'} } @extras;
$extra || &error($text{'save_ecannot7'});
&can_edit_log($extra) || &error($text{'save_ecannot2'});