projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* checkin with 3.2.0beta0 release header
[BackupPC.git]
/
lib
/
BackupPC
/
CGI
/
RestoreInfo.pm
diff --git
a/lib/BackupPC/CGI/RestoreInfo.pm
b/lib/BackupPC/CGI/RestoreInfo.pm
index
93dacb6
..
c37df46
100644
(file)
--- a/
lib/BackupPC/CGI/RestoreInfo.pm
+++ b/
lib/BackupPC/CGI/RestoreInfo.pm
@@
-10,7
+10,7
@@
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2003 Craig Barratt
+# Copyright (C) 2003
-2007
Craig Barratt
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-28,7
+28,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version
2.1.0_CVS, released 8 Feb 2004
.
+# Version
3.2.0beta0, released 5 April 2009
.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-38,6
+38,7
@@
package BackupPC::CGI::RestoreInfo;
use strict;
use BackupPC::CGI::Lib qw(:all);
use strict;
use BackupPC::CGI::Lib qw(:all);
+use Encode qw/decode_utf8/;
sub action
{
sub action
{
@@
-79,11
+80,18
@@
sub action
(my $strippedShareDest = $RestoreReq{shareDest}) =~ s/^\///;
substr($targetFile, 0, length($RestoreReq{pathHdrSrc}))
= $RestoreReq{pathHdrDest};
(my $strippedShareDest = $RestoreReq{shareDest}) =~ s/^\///;
substr($targetFile, 0, length($RestoreReq{pathHdrSrc}))
= $RestoreReq{pathHdrDest};
+ $targetFile =~ s{//+}{/}g;
+ $strippedShareDest = decode_utf8($strippedShareDest);
+ $targetFile = decode_utf8($targetFile);
+ $strippedShareSrc = decode_utf8($strippedShareSrc);
+ $f = decode_utf8($f);
$fileListStr .= <<EOF;
<tr><td>$RestoreReq{hostSrc}:/$strippedShareSrc$f</td><td>$RestoreReq{hostDest}:/$strippedShareDest$targetFile</td></tr>
EOF
}
$fileListStr .= <<EOF;
<tr><td>$RestoreReq{hostSrc}:/$strippedShareSrc$f</td><td>$RestoreReq{hostDest}:/$strippedShareDest$targetFile</td></tr>
EOF
}
- my $content = eval("qq{$Lang->{Restore___num_details_for__host2 }}");
+ $RestoreReq{shareSrc} = decode_utf8($RestoreReq{shareSrc});
+ $RestoreReq{shareDest} = decode_utf8($RestoreReq{shareDest});
+ my $content = eval("qq{$Lang->{Restore___num_details_for__host2}}");
Header(eval("qq{$Lang->{Restore___num_details_for__host}}"),$content);
Trailer();
}
Header(eval("qq{$Lang->{Restore___num_details_for__host}}"),$content);
Trailer();
}