projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* When there is an existing partial, a new partials is only saved
[BackupPC.git]
/
lib
/
BackupPC
/
CGI
/
Restore.pm
diff --git
a/lib/BackupPC/CGI/Restore.pm
b/lib/BackupPC/CGI/Restore.pm
index
9c6a66b
..
318874a
100644
(file)
--- a/
lib/BackupPC/CGI/Restore.pm
+++ b/
lib/BackupPC/CGI/Restore.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 3.
0.0alpha, released 23 Jan 2006
.
+# Version 3.
1.0beta0, released 3 Sep 2007
.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-40,7
+40,7
@@
use strict;
use BackupPC::CGI::Lib qw(:all);
use Data::Dumper;
use File::Path;
use BackupPC::CGI::Lib qw(:all);
use Data::Dumper;
use File::Path;
-use Encode;
+use Encode
qw/decode_utf8/
;
sub action
{
sub action
{
@@
-80,7
+80,7
@@
EOF
EOF
}
$hiddenStr .= "<input type=\"hidden\" name=\"fcbMax\" value=\"$In{fcbMax}\">\n";
EOF
}
$hiddenStr .= "<input type=\"hidden\" name=\"fcbMax\" value=\"$In{fcbMax}\">\n";
- $hiddenStr .= "<input type=\"hidden\" name=\"share\" value=\"${EscHTML(
$share
)}\">\n";
+ $hiddenStr .= "<input type=\"hidden\" name=\"share\" value=\"${EscHTML(
decode_utf8($share)
)}\">\n";
$badFileCnt++ if ( $In{pathHdr} =~ m{(^|/)\.\.(/|$)} );
$badFileCnt++ if ( $In{num} =~ m{(^|/)\.\.(/|$)} );
if ( @fileList == 0 ) {
$badFileCnt++ if ( $In{pathHdr} =~ m{(^|/)\.\.(/|$)} );
$badFileCnt++ if ( $In{num} =~ m{(^|/)\.\.(/|$)} );
if ( @fileList == 0 ) {
@@
-112,7
+112,9
@@
EOF
#
# Tell the user what options they have
#
#
# Tell the user what options they have
#
- $content .= eval("qq{$Lang->{Restore_Options_for__host2}}");
+ $pathHdr = decode_utf8($pathHdr);
+ $share = decode_utf8($share);
+ $content = eval("qq{$Lang->{Restore_Options_for__host2}}");
if ( @hosts == 1 ) {
#
if ( @hosts == 1 ) {
#
@@
-271,6
+273,8
@@
EOF
<tr><td>$host:/$strippedShare$f</td><td>$In{hostDest}:/$strippedShareDest$targetFile</td></tr>
EOF
}
<tr><td>$host:/$strippedShare$f</td><td>$In{hostDest}:/$strippedShareDest$targetFile</td></tr>
EOF
}
+ $In{shareDest} = decode_utf8($In{shareDest});
+ $In{pathHdr} = decode_utf8($In{pathHdr});
my $content = eval("qq{$Lang->{Are_you_sure}}");
Header(eval("qq{$Lang->{Restore_Confirm_on__host}}"), $content);
Trailer();
my $content = eval("qq{$Lang->{Are_you_sure}}");
Header(eval("qq{$Lang->{Restore_Confirm_on__host}}"), $content);
Trailer();