#
#========================================================================
#
-# Version 1.6.0_CVS, released 10 Dec 2002.
+# Version 2.0.0_CVS, released 3 Feb 2003.
#
# See http://backuppc.sourceforge.net.
#
if ( $In{doit} ) {
if ( $start ) {
if ( $Hosts->{$host}{dhcp} ) {
- $reply = $bpc->ServerMesg("backup $In{hostIP} $host"
- . " $User $doFull");
+ $reply = $bpc->ServerMesg("backup $In{hostIP} ${EscURI($host)}"
+ . " $User $doFull");
$str = eval("qq{$Lang->{Backup_requested_on_DHCP__host}}");
} else {
- $reply = $bpc->ServerMesg("backup $host $host $User $doFull");
+ $reply = $bpc->ServerMesg("backup ${EscURI($host)}"
+ . " ${EscURI($host)} $User $doFull");
$str = eval("qq{$Lang->{Backup_requested_on__host_by__User}}");
}
} else {
- $reply = $bpc->ServerMesg("stop $host $User $In{backoff}");
+ $reply = $bpc->ServerMesg("stop ${EscURI($host)} $User $In{backoff}");
$str = eval("qq{$Lang->{Backup_stopped_dequeued_on__host_by__User}}");
}
print (eval("qq{$Lang->{Are_you_sure_start}}"));
} else {
my $backoff = "";
- GetStatusInfo("host($host)");
+ GetStatusInfo("host(${EscURI($host)})");
if ( $StatusHost{backoffTime} > time ) {
$backoff = sprintf("%.1f",
($StatusHost{backoffTime} - time) / 3600);
$comment = "(Extracting only Errors)";
} elsif ( $host ne "" && $type eq "config" ) {
$file = "$TopDir/pc/$host/config.pl";
+ $file = "$TopDir/conf/$host.pl"
+ if ( $host ne "config" && -f "$TopDir/conf/$host.pl"
+ && !-f $file );
} elsif ( $type eq "docs" ) {
$file = "$BinDir/../doc/BackupPC.html";
if ( open(LOG, $file) ) {
while ( 1 ) {
$_ = $fh->readLine();
if ( $_ eq "" ) {
- print(eval ("qq{$Lang->{skipped__skipped_lines}}"));
+ print(eval ("qq{$Lang->{skipped__skipped_lines}}"))
+ if ( $skipped );
last;
}
if ( /smb: \\>/
$skipped++;
next;
}
- print(eval("qq{$Lang->{skipped__skipped_lines}}")) if ( $skipped );
+ print(eval("qq{$Lang->{skipped__skipped_lines}}"))
+ if ( $skipped );
$skipped = 0;
- print ${EscapeHTML($_)};
+ print ${EscHTML($_)};
}
} elsif ( $linkHosts ) {
while ( 1 ) {
$_ = $fh->readLine();
last if ( $_ eq "" );
- my $s = ${EscapeHTML($_)};
+ my $s = ${EscHTML($_)};
$s =~ s/\b([\w-]+)\b/defined($Hosts->{$1})
? ${HostLink($1)} : $1/eg;
print $s;
s/(SmbSharePasswd.*=.*['"]).*(['"])/$1$2/ig;
s/(SmbShareUserName.*=.*['"]).*(['"])/$1$2/ig;
s/(ServerMesgSecret.*=.*['"]).*(['"])/$1$2/ig;
- print ${EscapeHTML($_)};
+ print ${EscHTML($_)};
}
} else {
while ( 1 ) {
$_ = $fh->readLine();
last if ( $_ eq "" );
- print ${EscapeHTML($_)};
+ print ${EscHTML($_)};
}
}
$fh->close();
my($url0, $hdr, $root, $str);
if ( $host ne "" ) {
$root = "$TopDir/pc/$host/LOG";
- $url0 = "&host=$host";
+ $url0 = "&host=${EscURI($host)}";
$hdr = "for host $host";
} else {
$root = "$TopDir/log/LOG";
last if ( $Backups[$i]{num} == $num );
}
if ( $i >= @Backups ) {
- ErrorExit("Backup number $num for host ${EscapeHTML($host)} does"
+ ErrorExit("Backup number $num for host ${EscHTML($host)} does"
. " not exist.");
}
my $backupTime = timeStamp2($Backups[$i]{startTime});
$share = (sort(keys(%$attr)))[0];
$dir = '/';
} else {
- ErrorExit(eval("qq{$Lang->{Directory___EscapeHTML}}"));
+ ErrorExit(eval("qq{$Lang->{Directory___EscHTML}}"));
}
}
my $relDir = $dir;
# Loop over each of the files in this directory
#
foreach my $f ( sort(keys(%$attr)) ) {
- my($dirOpen, $gotDir, $imgStr, $img);
+ my($dirOpen, $gotDir, $imgStr, $img, $path);
my $fURI = $f; # URI escaped $f
my $shareURI = $share; # URI escaped $share
- my $path = "$relDir/$f";
+ if ( $relDir eq "" ) {
+ $path = $f;
+ } else {
+ ($path = "$relDir/$f") =~ s{//+}{/}g;
+ }
if ( $shareURI eq "" ) {
$shareURI = $path;
- $path = "";
+ $path = "/";
}
$path =~ s{^/+}{/};
- $path =~ s/([^\w.\/-])/uc sprintf("%%%02x", ord($1))/eg;
- $fURI =~ s/([^\w.\/-])/uc sprintf("%%%02x", ord($1))/eg;
- $shareURI =~ s/([^\w.\/-])/uc sprintf("%%%02x", ord($1))/eg;
+ $path =~ s/([^\w.\/-])/uc sprintf("%%%02X", ord($1))/eg;
+ $fURI =~ s/([^\w.\/-])/uc sprintf("%%%02X", ord($1))/eg;
+ $shareURI =~ s/([^\w.\/-])/uc sprintf("%%%02X", ord($1))/eg;
$dirOpen = 1 if ( defined($currDir) && $f eq $currDir );
if ( $attr->{$f}{type} == BPC_FTYPE_DIR ) {
#
push(@DirStr, {needTick => 1,
tdArgs => $BGcolor,
link => <<EOF});
-<a href="$MyURL?action=browse&host=$host&num=$num&share=$shareURI&dir=$path">$imgStr</a><a href="$MyURL?action=browse&host=$host&num=$num&share=$shareURI&dir=$path" style="font-size:13px;font-family:arial;text-decoration:none;line-height:15px"> $bold$dirName$unbold</a></td></tr>
+<a href="$MyURL?action=browse&host=${EscURI($host)}&num=$num&share=$shareURI&dir=$path">$imgStr</a><a href="$MyURL?action=browse&host=${EscURI($host)}&num=$num&share=$shareURI&dir=$path" style="font-size:13px;font-family:arial;text-decoration:none;line-height:15px"> $bold$dirName$unbold</a></td></tr>
EOF
$fileCnt++;
$gotDir = 1;
} else {
$attrStr .= "<td colspan=\"5\" align=\"center\"> </td>\n";
}
+ (my $fDisp = "${EscHTML($f)}") =~ s/ / /g;
if ( $gotDir ) {
$fileStr .= <<EOF;
-<tr bgcolor="#ffffcc"><td><input type="checkbox" name="fcb$checkBoxCnt" value="$path"> <a href="$MyURL?action=browse&host=$host&num=$num&share=$shareURI&dir=$path">${EscapeHTML($f)}</a></td>
+<tr bgcolor="#ffffcc"><td><input type="checkbox" name="fcb$checkBoxCnt" value="$path"> <a href="$MyURL?action=browse&host=${EscURI($host)}&num=$num&share=$shareURI&dir=$path">$fDisp</a></td>
$attrStr
</tr>
EOF
} else {
$fileStr .= <<EOF;
-<tr bgcolor="#ffffcc"><td><input type="checkbox" name="fcb$checkBoxCnt" value="$path"> <a href="$MyURL?action=RestoreFile&host=$host&num=$num&share=$shareURI&dir=$path">${EscapeHTML($f)}</a></td>
+<tr bgcolor="#ffffcc"><td><input type="checkbox" name="fcb$checkBoxCnt" value="$path"> <a href="$MyURL?action=RestoreFile&host=${EscURI($host)}&num=$num&share=$shareURI&dir=$path">$fDisp</a></td>
$attrStr
</tr>
EOF
# Prune the last directory off $relDir, or at the very end
# do the top-level directory.
#
- if ( $relDir eq "" ) {
+ if ( $relDir eq "" || $relDir eq "/" ) {
$currDir = $share;
$share = "";
+ $relDir = "";
} else {
$relDir =~ s/(.*)\/(.*)/$1/;
$currDir = $2;
}
my @otherDirs;
foreach my $i ( $view->backupList($share, $dir) ) {
- next if ( $i == $num );
my $path = $dir;
my $shareURI = $share;
$path =~ s/([^\w.\/-])/uc sprintf("%%%02x", ord($1))/eg;
$shareURI =~ s/([^\w.\/-])/uc sprintf("%%%02x", ord($1))/eg;
- push(@otherDirs, <<EOF);
-<a href="$MyURL?action=browse&host=$host&num=$i&share=$shareURI&dir=$path">$i</a>
-EOF
+ push(@otherDirs, "<a href=\"$MyURL?action=browse&host=${EscURI($host)}&num=$i"
+ . "&share=$shareURI&dir=$path\">$i</a>");
+
}
if ( @otherDirs ) {
- my $otherDirs = join(", ", @otherDirs);
+ my $otherDirs = join(",\n", @otherDirs);
$filledBackup .= eval("qq{$Lang->{Visit_this_directory_in_backup}}");
}
-
print (eval("qq{$Lang->{Backup_browse_for__host}}"));
Trailer();
}
<input type="hidden" name="fcb$i" value="$In{'fcb' . $i}">
EOF
$fileListStr .= <<EOF;
-<li> ${EscapeHTML($name)}
+<li> ${EscHTML($name)}
EOF
}
$hiddenStr .= "<input type=\"hidden\" name=\"fcbMax\" value=\"$In{fcbMax}\">\n";
- $hiddenStr .= "<input type=\"hidden\" name=\"share\" value=\"${EscapeHTML($share)}\">\n";
+ $hiddenStr .= "<input type=\"hidden\" name=\"share\" value=\"${EscHTML($share)}\">\n";
$badFileCnt++ if ( $In{pathHdr} =~ m{(^|/)\.\.(/|$)} );
$badFileCnt++ if ( $In{num} =~ m{(^|/)\.\.(/|$)} );
if ( @fileList == 0 ) {
Trailer();
} elsif ( $In{type} == 4 ) {
if ( !defined($Hosts->{$In{hostDest}}) ) {
- ErrorExit(eval("qq{$Lang->{Host_doesn_t_exist}}"));
+ ErrorExit(eval("qq{$Lang->{Host__doesn_t_exist}}"));
}
if ( !CheckPermission($In{hostDest}) ) {
ErrorExit(eval("qq{$Lang->{You_don_t_have_permission_to_restore_onto_host}}"));
} else {
ErrorExit(eval("qq{$Lang->{Can_t_open_create}}"));
}
- $reply = $bpc->ServerMesg("restore $ipAddr"
- . " $hostDest $User $reqFileName");
+ $reply = $bpc->ServerMesg("restore ${EscURI($ipAddr)}"
+ . " ${EscURI($hostDest)} $User $reqFileName");
$str = eval("qq{$Lang->{Restore_requested_to_host__hostDest__backup___num}}");
Header(eval("qq{$Lang->{Restore_Requested_on__hostDest}}"));
print (eval("qq{$Lang->{Reply_from_server_was___reply}}"));
my $view = BackupPC::View->new($bpc, $host, \@Backups);
my $a = $view->fileAttrib($num, $share, $dir);
if ( $dir =~ m{(^|/)\.\.(/|$)} || !defined($a) ) {
- ErrorExit("Can't restore bad file ${EscapeHTML($dir)}");
+ ErrorExit("Can't restore bad file ${EscHTML($dir)}");
}
my $f = BackupPC::FileZIO->open($a->{fullPath}, 0, $a->{compress});
my $data;
}
$In{host} = $host;
}
- GetStatusInfo("host($host)");
+ GetStatusInfo("host(${EscURI($host)})");
$bpc->ConfigRead($host);
%Conf = $bpc->Conf();
my $Privileged = CheckPermission($host);
(1 - $Backups[$i]{sizeNewComp} / $Backups[$i]{sizeNew}));
}
my $age = sprintf("%.1f", (time - $Backups[$i]{startTime}) / (24*3600));
- my $browseURL = "$MyURL?action=browse&host=$host&num=$Backups[$i]{num}";
+ my $browseURL = "$MyURL?action=browse&host=${EscURI($host)}&num=$Backups[$i]{num}";
my $filled = $Backups[$i]{noFill} ? $Lang->{No} : $Lang->{Yes};
$filled .= " ($Backups[$i]{fillFromNum}) "
if ( $Backups[$i]{fillFromNum} ne "" );
<td align="right"> $MBNew </td>
</tr>
EOF
- $Backups[$i]{compress} ||= "off";
- my $is_compress = $Lang->{off};
- if ($Backups[$i]{compress} ne "off") {$is_compress = $Lang->{on}; }
+ my $is_compress = $Backups[$i]{compress} || $Lang->{off};
if (! $ExistComp) { $ExistComp = " "; }
if (! $MBExistComp) { $MBExistComp = " "; }
$compStr .= <<EOF;
$errStr .= <<EOF;
<tr><td align="center"> <a href="$browseURL">$Backups[$i]{num}</a> </td>
<td align="center"> $ltype </td>
- <td align="center"> <a href="$MyURL?action=view&type=XferLOG&num=$Backups[$i]{num}&host=$host">XferLOG</a>,
- <a href="$MyURL?action=view&type=XferErr&num=$Backups[$i]{num}&host=$host">Errors</a> </td>
+ <td align="center"> <a href="$MyURL?action=view&type=XferLOG&num=$Backups[$i]{num}&host=${EscURI($host)}">XferLOG</a>,
+ <a href="$MyURL?action=view&type=XferErr&num=$Backups[$i]{num}&host=${EscURI($host)}">Errors</a> </td>
<td align="right"> $Backups[$i]{xferErrs} </td>
<td align="right"> $Backups[$i]{xferBadFile} </td>
<td align="right"> $Backups[$i]{xferBadShare} </td>
my $Restores_Result = $Lang->{failed};
if ($Restores[$i]{result} ne "failed") { $Restores_Result = $Lang->{success}; }
$restoreStr .= <<EOF;
-<tr><td align="center"><a href="$MyURL?action=restoreInfo&num=$Restores[$i]{num}&host=$host">$Restores[$i]{num}</a> </td>
+<tr><td align="center"><a href="$MyURL?action=restoreInfo&num=$Restores[$i]{num}&host=${EscURI($host)}">$Restores[$i]{num}</a> </td>
<td align="center"> $Restores_Result </td>
<td align="right"> $startTime </td>
<td align="right"> $duration </td>
$statusStr .= eval("qq{$Lang->{Last_status_is_state_StatusHost_state_reason_as_of_startTime}}");
if ( $StatusHost{error} ne "" ) {
- $statusStr .= eval("qq{$Lang->{Last_error_is____EscapeHTML_StatusHost_error}}");
+ $statusStr .= eval("qq{$Lang->{Last_error_is____EscHTML_StatusHost_error}}");
}
my $priorStr = "Pings";
if ( $StatusHost{deadCnt} > 0 ) {
$jobStr .= "</tr>\n";
}
foreach my $host ( sort(keys(%Status)) ) {
- next if ( $Status{$host}{reason} ne "Reason_backup_failed" );
+ next if ( $Status{$host}{reason} ne "Reason_backup_failed"
+ || $Status{$host}{error} =~ /^Can't find host \Q$host/ );
my $startTime = timeStamp2($Status{$host}{startTime});
my($errorTime, $XferViewStr);
if ( $Status{$host}{errorTime} > 0 ) {
|| -f "$TopDir/pc/$host/XferLOG.bad.z"
) {
$XferViewStr = <<EOF;
-<a href="$MyURL?action=view&type=XferLOGbad&host=$host">XferLOG</a>,
-<a href="$MyURL?action=view&type=XferErrbad&host=$host">XferErr</a>
+<a href="$MyURL?action=view&type=XferLOGbad&host=${EscURI($host)}">XferLOG</a>,
+<a href="$MyURL?action=view&type=XferErrbad&host=${EscURI($host)}">XferErr</a>
EOF
} else {
$XferViewStr = "";
<td align="right"> $startTime </td>
<td> $XferViewStr </td>
<td align="right"> $errorTime </td>
- <td> ${EscapeHTML($shortErr)} </td></tr>
+ <td> ${EscHTML($shortErr)} </td></tr>
EOF
}
my $now = timeStamp2(time);
}
Header($Lang->{H_BackupPC_Server_Status});
- #Header("H_BackupPC_Server_Status");
print (eval ("qq{$Lang->{BackupPC_Server_Status}}"));
-
- #Header($Lang->{BackupPC_Server_Status});
-
- #my $trans_text = $Lang->{BackupPC_Server_Status};
- #print eval ("qq{$trans_text}");
Trailer();
}
my($host) = @_;
my($s);
if ( defined($Hosts->{$host}) || defined($Status{$host}) ) {
- $s = "<a href=\"$MyURL?host=$host\">$host</a>";
+ $s = "<a href=\"$MyURL?host=${EscURI($host)}\">$host</a>";
} else {
$s = $host;
}
return \$s;
}
-sub EscapeHTML
+sub EscHTML
{
my($s) = @_;
$s =~ s/&/&/g;
$s =~ s/\"/"/g;
$s =~ s/>/>/g;
$s =~ s/</</g;
- $s =~ s{([^[:print:]])}{sprintf("&\#x%02X", ord($1));}eg;
+ $s =~ s{([^[:print:]])}{sprintf("&\#x%02X;", ord($1));}eg;
return \$s;
}
-##sub URIEncode
-##{
-## my($s) = @_;
-## $s =~ s{(['"&%[:^print:]])}{sprintf("%%%02X", ord($1));}eg;
-## return \$s;
-##}
+sub EscURI
+{
+ my($s) = @_;
+ $s =~ s{([^\w.\/-])}{sprintf("%%%02X", ord($1));}eg;
+ return \$s;
+}
sub ErrorExit
{
if ( defined($bpc) );
if ( !defined($Lang->{Error}) ) {
Header("BackupPC: Error");
+ $mesg = <<EOF if ( !defined($mesg) );
+There is some problem with the BackupPC installation.
+Please check the permissions on BackupPC_Admin.
+EOF
print <<EOF;
-${h1("Error: Language strings not defined!!")}
+${h1("Error: Unable to read config.pl or language strings!!")}
<p>$mesg</p>
EOF
Trailer();
my($netBiosHost, $netBiosUser) = $bpc->NetBiosInfoGet($ipAddr);
if ( $netBiosHost ne $host ) {
my($tryIP);
- GetStatusInfo("host($host)");
+ GetStatusInfo("host(${EscURI($host)})");
if ( defined($StatusHost{dhcpHostIP})
&& $StatusHost{dhcpHostIP} ne $ipAddr ) {
$tryIP = eval("qq{$Lang->{tryIP}}");
my $poolTime = timeStamp2($info->{"${name}Time"});
$info->{"${name}FileCntRm"} = $info->{"${name}FileCntRm"} + 0;
return eval("qq{$Lang->{Pool_Stat}}");
-
}
###########################################################################
{ link => "?action=queue", name => $Lang->{Current_queues} },
{ link => "?action=view&type=docs", name => $Lang->{Documentation},
priv => 1},
+ { link => "http://backuppc.sourceforge.net/faq", name => "FAQ",
+ priv => 1},
{ link => "http://backuppc.sourceforge.net", name => "SourceForge",
- priv => 1},
+ priv => 1},
);
print $Cgi->header();
print <<EOF;
my $host = $In{host};
NavSectionTitle( eval("qq{$Lang->{Host_Inhost}}") );
NavSectionStart();
- NavLink("?host=$host", $Lang->{Home});
- NavLink("?action=view&type=LOG&host=$host", $Lang->{LOG_file});
- NavLink("?action=LOGlist&host=$host", $Lang->{Old_LOGs});
+ NavLink("?host=${EscURI($host)}", $Lang->{Home});
+ NavLink("?action=view&type=LOG&host=${EscURI($host)}", $Lang->{LOG_file});
+ NavLink("?action=LOGlist&host=${EscURI($host)}", $Lang->{Old_LOGs});
if ( -f "$TopDir/pc/$host/SmbLOG.bad"
|| -f "$TopDir/pc/$host/SmbLOG.bad.z"
|| -f "$TopDir/pc/$host/XferLOG.bad"
|| -f "$TopDir/pc/$host/XferLOG.bad.z" ) {
- NavLink("?action=view&type=XferLOGbad&host=$host",
+ NavLink("?action=view&type=XferLOGbad&host=${EscURI($host)}",
$Lang->{Last_bad_XferLOG});
- NavLink("?action=view&type=XferErrbad&host=$host",
+ NavLink("?action=view&type=XferErrbad&host=${EscURI($host)}",
$Lang->{Last_bad_XferLOG_errors_only});
}
if ( -f "$TopDir/pc/$host/config.pl" ) {
- NavLink("?action=view&type=config&host=$host", $Lang->{Config_file});
+ NavLink("?action=view&type=config&host=${EscURI($host)}", $Lang->{Config_file});
}
NavSectionEnd();
}
if ( defined($Hosts) && %$Hosts > 0 ) {
NavSectionStart(0);
foreach my $host ( GetUserHosts() ) {
- NavLink("?host=$host", $host);
+ NavLink("?host=${EscURI($host)}", $host);
}
NavSectionEnd();
}
projects / BackupPC.git / blobdiff