1 |
wellsi |
1.1 |
diff -ruN e-smith-backup-2.2.0.old/root/etc/e-smith/web/functions/backup e-smith-backup-2.2.0/root/etc/e-smith/web/functions/backup |
2 |
|
|
--- e-smith-backup-2.2.0.old/root/etc/e-smith/web/functions/backup 2013-12-11 20:44:17.000000000 -0800 |
3 |
|
|
+++ e-smith-backup-2.2.0/root/etc/e-smith/web/functions/backup 2013-12-11 21:27:35.000000000 -0800 |
4 |
|
|
@@ -2776,6 +2776,7 @@ |
5 |
|
|
my $regex = qr/\[.*\] */; |
6 |
|
|
while (<RD>) |
7 |
|
|
{ |
8 |
|
|
+ $_ =~ s/[\r\n]+//g; # remove line endings |
9 |
|
|
$_ =~ s/$regex//; |
10 |
|
|
if ($filterexp) {next unless m/$rgfilter/}; |
11 |
|
|
push @flabels, $_; |
12 |
|
|
@@ -2886,10 +2887,9 @@ |
13 |
|
|
return; |
14 |
|
|
} |
15 |
|
|
|
16 |
|
|
- my $restorefiles = $q->param ('restorefiles'); |
17 |
|
|
- $restorefiles =~ s/\r//; |
18 |
|
|
+ my @restorefiles = $q->param ('restorefiles'); |
19 |
|
|
my $f; |
20 |
|
|
- foreach $f ($restorefiles) |
21 |
|
|
+ foreach $f (@restorefiles) |
22 |
|
|
{ |
23 |
|
|
if ($f =~ /^(.*)$/) |
24 |
|
|
{ |