X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FRestoreInfo.pm;h=a48e8b6bd8f387875dda7fe7c1f219558728f1ce;hb=b4c35eed7b4c3304460c858b3fa5d41229476371;hp=83583e881948e7507beee8b7d19446106bdc0e97;hpb=329e870f56fb6572fa697998d33676588034c149;p=BackupPC.git

diff --git a/lib/BackupPC/CGI/RestoreInfo.pm b/lib/BackupPC/CGI/RestoreInfo.pm
index 83583e8..a48e8b6 100644
--- a/lib/BackupPC/CGI/RestoreInfo.pm
+++ b/lib/BackupPC/CGI/RestoreInfo.pm
@@ -10,7 +10,7 @@
 #   Craig Barratt  <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT
-#   Copyright (C) 2003  Craig Barratt
+#   Copyright (C) 2003-2009  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
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0_CVS, released 3 Jul 2003.
+# Version 3.2.0, released 31 Jul 2010.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -38,6 +38,7 @@ package BackupPC::CGI::RestoreInfo;
 
 use strict;
 use BackupPC::CGI::Lib qw(:all);
+use Encode qw/decode_utf8/;
 
 sub action
 {
@@ -79,13 +80,19 @@ 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 }}"));
+    $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();
 }