* Various changes for 3.0.0beta1

[BackupPC.git] / lib / BackupPC / CGI / RestoreInfo.pm

diff --git a/lib/BackupPC/CGI/RestoreInfo.pm b/lib/BackupPC/CGI/RestoreInfo.pm
index 83583e8..5b222f0 100644 (file)
--- a/lib/BackupPC/CGI/RestoreInfo.pm
+++ b/lib/BackupPC/CGI/RestoreInfo.pm
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0_CVS, released 3 Jul 2003.
+# Version 3.0.0beta1, released 30 Jul 2006.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -38,6 +38,7 @@ package BackupPC::CGI::RestoreInfo;
 
 use strict;
 use BackupPC::CGI::Lib qw(:all);
+use Encode;
 
 sub action
 {
@@ -79,13 +80,17 @@ sub action
        (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
     }
-
-    Header(eval("qq{$Lang->{Restore___num_details_for__host}}"));
-    print(eval("qq{$Lang->{Restore___num_details_for__host2 }}"));
+    my $content = eval("qq{$Lang->{Restore___num_details_for__host2}}");
+    Header(eval("qq{$Lang->{Restore___num_details_for__host}}"),$content);
     Trailer();
 }