projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates in preparation for 3.0.0beta2:
[BackupPC.git]
/
lib
/
BackupPC
/
CGI
/
RestoreInfo.pm
diff --git
a/lib/BackupPC/CGI/RestoreInfo.pm
b/lib/BackupPC/CGI/RestoreInfo.pm
index
c50565c
..
0d43f24
100644
(file)
--- a/
lib/BackupPC/CGI/RestoreInfo.pm
+++ b/
lib/BackupPC/CGI/RestoreInfo.pm
@@
-28,7
+28,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version
2.1.0beta2, released 23 May 2004
.
+# Version
3.0.0beta2, released 11 Nov 2006
.
#
# 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;
sub action
{
sub action
{
@@
-80,6
+81,10
@@
sub action
substr($targetFile, 0, length($RestoreReq{pathHdrSrc}))
= $RestoreReq{pathHdrDest};
$targetFile =~ s{//+}{/}g;
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