michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Handle non-numeric IDs

Browse Source
This commit is contained in:
Jamie Cameron
2009-03-01 19:21:02 +00:00
parent 906fd9ab23
commit bd727a120b
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fsdump/backup.pl
View File

@@ -127,7 +127,7 @@ if ($out && $dump->{'email'} && &foreign_check("mailboxes")) {
# Check for any dumps scheduled to run after this one
foreach $follow (&list_dumps()) {
if ($follow->{'follow'} == $dump->{'id'} && $follow->{'enabled'} == 2) {
if ($follow->{'follow'} eq $dump->{'id'} && $follow->{'enabled'} == 2) {
system("$cron_cmd $follow->{'id'}");
}
}

2
fsdump/fsdump-lib.pl
View File

@@ -4,8 +4,6 @@
BEGIN { push(@INC, ".."); };
use WebminCore;
#do '../web-lib.pl';
#do '../ui-lib.pl';
&init_config();
if ($gconfig{'os_type'} =~ /^\S+\-linux$/) {
do "linux-lib.pl";

2
fsdump/kill.cgi
View File

@@ -10,7 +10,7 @@ require './fsdump-lib.pl';
@procs = &proc::list_processes();
@running = &running_dumps(\@procs);
($job) = grep { $_->{'id'} == $in{'id'} &&
($job) = grep { $_->{'id'} eq $in{'id'} &&
$_->{'pid'} == $in{'pid'} } @running;
$job || &error($text{'kill_egone'});
&can_edit_dir($job) || &error($text{'kill_ecannot'});

2
fsdump/newtape.cgi
View File

@@ -10,7 +10,7 @@ require './fsdump-lib.pl';
@procs = &proc::list_processes();
@running = &running_dumps(\@procs);
($job) = grep { $_->{'id'} == $in{'id'} &&
($job) = grep { $_->{'id'} eq $in{'id'} &&
$_->{'pid'} == $in{'pid'} } @running;
$job || &error($text{'newtape_egone'});
&can_edit_dir($job) || &error($text{'newtape_ecannot'});

2
fsdump/newtape.pl
View File

@@ -13,7 +13,7 @@ $dump->{'id'} || die "Dump $ARGV[0] does not exist!";
# Find the status file
opendir(DIR, $module_config_directory);
foreach $f (readdir(DIR)) {
if ($f =~ /^(\d+)\.(\d+)\.status$/ && $1 == $dump->{'id'}) {
if ($f =~ /^(\d+)\.(\d+)\.status$/ && $1 eq $dump->{'id'}) {
# Got it!
$sfile = "$module_config_directory/$f";
}