BackupPC: lib/BackupPC/CGI/HostInfo.pm - 4.3.2 vs. 4.4.0 changes | Fossies Diffs

"Fossies" - the Fresh Open Source Software Archive

Source code changes of the file "lib/BackupPC/CGI/HostInfo.pm" between
BackupPC-4.3.2.tar.gz and BackupPC-4.4.0.tar.gz

About: BackupPC is a high-performance, enterprise-grade system for backing up Linux and WinXX PCs and laptops to a server’s disk (http/cgi user interface).

[ To the main BackupPC source changes report ]

HostInfo.pm (BackupPC-4.3.2)	:	HostInfo.pm (BackupPC-4.4.0)

skipping to change at line 30		skipping to change at line 30
# This program is distributed in the hope that it will be useful,		# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of		# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.		# GNU General Public License for more details.
#		#
# You should have received a copy of the GNU General Public License		# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.		# along with this program. If not, see <http://www.gnu.org/licenses/>.
#		#
#========================================================================		#========================================================================
#		#

# Version 4.3.2, released 17 Feb 2020.		# Version 4.4.0, released 20 Jun 2020.
#		#
# See http://backuppc.sourceforge.net.		# See http://backuppc.sourceforge.net.
#		#
#========================================================================		#========================================================================

package BackupPC::CGI::HostInfo;		package BackupPC::CGI::HostInfo;

use strict;		use strict;

		use Encode qw/decode_utf8/;
use BackupPC::CGI::Lib qw(:all);		use BackupPC::CGI::Lib qw(:all);

sub action		sub action
{		{
my $host = $1 if ( $In{host} =~ /(.*)/ );		my $host = $1 if ( $In{host} =~ /(.*)/ );
my($statusStr, $startIncrStr);		my($statusStr, $startIncrStr);

$host =~ s/^\s+//;		$host =~ s/^\s+//;
$host =~ s/\s+$//;		$host =~ s/\s+$//;
if ( $host eq "" ) {		if ( $host eq "" ) {

ErrorExit(eval("qq{$Lang->{Unknown_host_or_user}}"));		ErrorExit(eval("qq{$Lang->{Unknown_host_or_user}}"));
}		}
$host = lc($host)		$host = lc($host)

if ( !-d "$TopDir/pc/$host" && -d "$TopDir/pc/" . lc($host) );		if ( !-d "$TopDir/pc/$host" && -d "$TopDir/pc/" . lc($host) );
if ( $host =~ /\.\./ \|\| !-d "$TopDir/pc/$host" ) {		if ( $host =~ /\.\./ \|\| !-d "$TopDir/pc/$host" ) {
#		#
# try to lookup by user name		# try to lookup by user name
#		#
if ( $host eq "" \|\| !defined($Hosts->{$host}) ) {		if ( $host eq "" \|\| !defined($Hosts->{$host}) ) {
foreach my $h ( keys(%$Hosts) ) {		foreach my $h ( keys(%$Hosts) ) {

if ( $Hosts->{$h}{user} eq $host		if ( $Hosts->{$h}{user} eq $host \|\| lc($Hosts->{$h}{user}) eq lc
\|\| lc($Hosts->{$h}{user}) eq lc($host) ) {		($host) ) {
$host = $h;		$host = $h;
last;		last;
}		}
}		}
CheckPermission();		CheckPermission();
ErrorExit(eval("qq{$Lang->{Unknown_host_or_user}}"))		ErrorExit(eval("qq{$Lang->{Unknown_host_or_user}}"))

if ( !defined($Hosts->{$host}) );		if ( !defined($Hosts->{$host}) );
}		}
$In{host} = $host;		$In{host} = $host;
}		}
GetStatusInfo("host(${EscURI($host)})");		GetStatusInfo("host(${EscURI($host)})");
$bpc->ConfigRead($host);		$bpc->ConfigRead($host);
%Conf = $bpc->Conf();		%Conf = $bpc->Conf();
my $Privileged = CheckPermission($host);		my $Privileged = CheckPermission($host);
if ( !$Privileged ) {		if ( !$Privileged ) {
ErrorExit(eval("qq{$Lang->{Only_privileged_users_can_view_information_ab out}}"));		ErrorExit(eval("qq{$Lang->{Only_privileged_users_can_view_information_ab out}}"));
}		}

		if ( $In{action} eq "keepBackup" ) {
		my $num = $In{num};
		my $keep = $In{keep};
		my $i;
		if ( $num !~ /^\d+$/ ) {
		ErrorExit("Backup number ${EscHTML($In{num})} for host ${EscHTML($ho
		st)} does not exist.");
		}
		my @Backups = $bpc->BackupInfoRead($host);
		for ( $i = 0 ; $i < @Backups ; $i++ ) {
		if ( $Backups[$i]{num} == $num ) {
		if ( !$Backups[$i]{noFill} && $Backups[$i]{keep} != ($keep ? 1 :
		0) ) {
		$Backups[$i]{keep} = $keep ? 1 : 0;
		$bpc->BackupInfoWrite($host, @Backups);
		BackupPC::Storage->backupInfoWrite("$TopDir/pc/$host", $Back
		ups[$i]{num}, $Backups[$i], 1);
		}
		last;
		}
		}
		if ( $i >= @Backups ) {
		ErrorExit("Backup number ${EscHTML($In{num})} for host ${EscHTML($ho
		st)} does not exist.");
		}
		}
my $deleteEnabled = $PrivAdmin \|\| ($Conf{CgiUserDeleteBackupEnable} > 0 && $ Privileged);		my $deleteEnabled = $PrivAdmin \|\| ($Conf{CgiUserDeleteBackupEnable} > 0 && $ Privileged);
$deleteEnabled = 0 if ( $Conf{CgiUserDeleteBackupEnable} < 0 );		$deleteEnabled = 0 if ( $Conf{CgiUserDeleteBackupEnable} < 0 );
ReadUserEmailInfo();		ReadUserEmailInfo();

if ( $Conf{XferMethod} eq "archive" ) {		if ( $Conf{XferMethod} eq "archive" ) {
my @Archives = $bpc->ArchiveInfoRead($host);		my @Archives = $bpc->ArchiveInfoRead($host);

my ($ArchiveStr,$warnStr);		my($ArchiveStr, $warnStr);

for ( my $i = 0 ; $i < @Archives ; $i++ ) {		for ( my $i = 0 ; $i < @Archives ; $i++ ) {
my $startTime = timeStamp2($Archives[$i]{startTime});		my $startTime = timeStamp2($Archives[$i]{startTime});
my $dur = $Archives[$i]{endTime} - $Archives[$i]{startTime};		my $dur = $Archives[$i]{endTime} - $Archives[$i]{startTime};

$dur = 1 if ( $dur <= 0 );		$dur = 1 if ( $dur <= 0 );
my $duration = sprintf("%.1f", $dur / 60);		my $duration = sprintf("%.1f", $dur / 60);
my $Archives_Result = $Lang->{failed};		my $Archives_Result = $Lang->{failed};

if ($Archives[$i]{result} ne "failed") { $Archives_Result = $Lang->{		if ( $Archives[$i]{result} ne "failed" ) { $Archives_Result = $Lang-
success}; }		>{success}; }
$ArchiveStr .= <<EOF;		$ArchiveStr .= <<EOF;
<tr><td align="center"><a href="$MyURL?action=archiveInfo&num=$Archives[$i]{num} &host=${EscURI($host)}">$Archives[$i]{num}</a> </td>		<tr><td align="center"><a href="$MyURL?action=archiveInfo&num=$Archives[$i]{num} &host=${EscURI($host)}">$Archives[$i]{num}</a> </td>
<td align="center"> $Archives_Result </td>		<td align="center"> $Archives_Result </td>
<td align="right" data-date_format="$Conf{CgiDateFormatMMDD}"> $startTime </ td>		<td align="right" data-date_format="$Conf{CgiDateFormatMMDD}"> $startTime </ td>
<td align="right"> $duration </td>		<td align="right"> $duration </td>
</tr>		</tr>
EOF		EOF
}		}
if ( $ArchiveStr ne "" ) {		if ( $ArchiveStr ne "" ) {
$ArchiveStr = eval("qq{$Lang->{Archive_Summary}}");		$ArchiveStr = eval("qq{$Lang->{Archive_Summary}}");
}		}

skipping to change at line 141		skipping to change at line 163
my($dur, $duration, $MB, $MBperSec, $MBExist, $MBNew);		my($dur, $duration, $MB, $MBperSec, $MBExist, $MBNew);
my $startTime = timeStamp2($Backups[$i]{startTime});		my $startTime = timeStamp2($Backups[$i]{startTime});

#		#
# if a backup is active, but there is no job, then force it to be displa yed		# if a backup is active, but there is no job, then force it to be displa yed
# as partial. this handles case of a forced exit of BackupPC without no rmal		# as partial. this handles case of a forced exit of BackupPC without no rmal
# cleanup		# cleanup
#		#
$Backups[$i]{type} = "partial" if ( $Backups[$i]{type} eq "active" && !d efined($StatusHost{Job}) );		$Backups[$i]{type} = "partial" if ( $Backups[$i]{type} eq "active" && !d efined($StatusHost{Job}) );
if ( $Backups[$i]{type} ne "active" ) {		if ( $Backups[$i]{type} ne "active" ) {

$dur = $Backups[$i]{endTime} - $Backups[$i]{startTime};		$dur = $Backups[$i]{endTime} - $Backups[$i]{startTime};
$dur = 1 if ( $dur <= 0 );		$dur = 1 if ( $dur <= 0 );
$duration = sprintf("%.1f", $dur / 60);		$duration = sprintf("%.1f", $dur / 60);
$MB = sprintf("%.1f", $Backups[$i]{size} / (1024*1024));		$MB = sprintf("%.1f", $Backups[$i]{size} / (1024 * 1024));
$MBperSec = sprintf("%.2f", $Backups[$i]{size} / (10241024$dur));		$MBperSec = sprintf("%.2f", $Backups[$i]{size} / (1024 * 1024 * $dur
$MBExist = sprintf("%.1f", $Backups[$i]{sizeExist} / (1024*1024));		));
$MBNew = sprintf("%.1f", $Backups[$i]{sizeNew} / (1024*1024));		$MBExist = sprintf("%.1f", $Backups[$i]{sizeExist} / (1024 * 1024))
		;
		$MBNew = sprintf("%.1f", $Backups[$i]{sizeNew} / (1024 * 1024));
if ( $Backups[$i]{sizeExist} && $Backups[$i]{sizeExistComp} ) {		if ( $Backups[$i]{sizeExist} && $Backups[$i]{sizeExistComp} ) {

$MBExistComp = sprintf("%.1f", $Backups[$i]{sizeExistComp}		$MBExistComp = sprintf("%.1f", $Backups[$i]{sizeExistComp} / (
/ (1024 * 1024));		1024 * 1024));
$ExistComp = sprintf("%.1f%%", 100 *		$ExistComp = sprintf("%.1f%%", 100 * (1 - $Backups[$i]{sizeExi
(1 - $Backups[$i]{sizeExistComp} / $Backups[$i]{sizeExist}		stComp} / $Backups[$i]{sizeExist}));
));
}		}
if ( $Backups[$i]{sizeNew} && $Backups[$i]{sizeNewComp} ) {		if ( $Backups[$i]{sizeNew} && $Backups[$i]{sizeNewComp} ) {

$MBNewComp = sprintf("%.1f", $Backups[$i]{sizeNewComp}		$MBNewComp = sprintf("%.1f", $Backups[$i]{sizeNewComp} / (1024
/ (1024 * 1024));		* 1024));
$NewComp = sprintf("%.1f%%", 100 *		$NewComp = sprintf("%.1f%%", 100 * (1 - $Backups[$i]{sizeNewCo
(1 - $Backups[$i]{sizeNewComp} / $Backups[$i]{sizeNew}));		mp} / $Backups[$i]{sizeNew}));
}		}
}		}

my $age = sprintf("%.1f", (time - $Backups[$i]{startTime}) / (24*3600));		my $age = sprintf("%.1f", (time - $Backups[$i]{startTime}) / (24 * 3600));
my $browseURL = "$MyURL?action=browse&host=${EscURI($host)}&num=$Backups [$i]{num}";		my $browseURL = "$MyURL?action=browse&host=${EscURI($host)}&num=$Backups [$i]{num}";

my $level = $Backups[$i]{level};		my $level = $Backups[$i]{level};
my $filled = $Backups[$i]{noFill} ? $Lang->{No} : $Lang->{Yes};		my $filled = $Backups[$i]{noFill} ? $Lang->{No} : $Lang->{Yes};
$filled .= " ($Backups[$i]{fillFromNum}) "		$filled .= " ($Backups[$i]{fillFromNum}) "

if ( $Backups[$i]{fillFromNum} ne "" );		if ( $Backups[$i]{fillFromNum} ne "" );
my $ltype = $Lang->{"backupType_$Backups[$i]{type}"};		my $ltype = $Lang->{"backupType_$Backups[$i]{type}"};
my $deleteStr;		my $keepOrDeleteStr = " <td class=\"border\">\n";
if ( $deleteEnabled ) {
$deleteStr = <<EOF;		if ( !$Backups[$i]{noFill} && ($i < @Backups - 1 \|\| $Backups[$i]{type} e
<td align="center" class="border"><form name="DeleteForm" action="$MyURL" me		q "full") ) {
thod="get" style="margin-bottom: 0px;">		my $keepChecked = $Backups[$i]{keep} ? " checked" : "";
		$keepOrDeleteStr .= <<EOF;
		<form name="KeepForm" action="$MyURL" method="get" style="margin: 0px;">
		<input type="checkbox" name="keep" $keepChecked value="1" onchange="th
		is.form.submit()">
		<input type="hidden" name="num" value="$Backups[$i]{num}">
		<input type="hidden" name="action" value="keepBackup">
		<input type="hidden" name="host" value="$host">
		</form><span style="display:none">$Backups[$i]{keep}<!- for sorting -></sp
		an></td>
		EOF
		}
		$keepOrDeleteStr .= " </td>\n <td class=\"border\">\n";
		if ( (!$Backups[$i]{keep} \|\| $Backups[$i]{noFill}) && $deleteEnabled ) {
		$keepOrDeleteStr .= <<EOF;
		<form name="DeleteForm" action="$MyURL" method="get" style="margin: 0px;">
<input type="hidden" name="action" value="deleteBackup">		<input type="hidden" name="action" value="deleteBackup">
<input type="hidden" name="host" value="$host">		<input type="hidden" name="host" value="$host">
<input type="hidden" name="num" value="$Backups[$i]{num}">		<input type="hidden" name="num" value="$Backups[$i]{num}">
<input type="hidden" name="nofill" value="$Backups[$i]{noFill}">		<input type="hidden" name="nofill" value="$Backups[$i]{noFill}">
<input type="hidden" name="type" value="$Backups[$i]{type}">		<input type="hidden" name="type" value="$Backups[$i]{type}">
<input type="submit" value="${EscHTML($Lang->{CfgEdit_Button_Delete})}">		<input type="submit" value="${EscHTML($Lang->{CfgEdit_Button_Delete})}">

</form></td>		</form>
EOF		EOF
}		}

		$keepOrDeleteStr .= " </td>\n";
		my $comment = decode_utf8($Backups[$i]{comment});
push @bkpRows, <<EOF;		push @bkpRows, <<EOF;
<tr>		<tr>
<td align="center" class="border"> <a href="$browseURL">$Backups[$i]{num}</a > </td>		<td align="center" class="border"> <a href="$browseURL">$Backups[$i]{num}</a > </td>
<td align="center" class="border"> $ltype </td>		<td align="center" class="border"> $ltype </td>
<td align="center" class="border"> $filled </td>		<td align="center" class="border"> $filled </td>
<td align="center" class="border"> $level </td>		<td align="center" class="border"> $level </td>
<td align="right" class="border" data-date_format="$Conf{CgiDateFormatMMDD}" > $startTime </td>		<td align="right" class="border" data-date_format="$Conf{CgiDateFormatMMDD}" > $startTime </td>
<td align="right" class="border"> $duration </td>		<td align="right" class="border"> $duration </td>
<td align="right" class="border"> $age </td>		<td align="right" class="border"> $age </td>

$deleteStr		$keepOrDeleteStr
<td align="left" class="border"> <tt>$TopDir/pc/$host/$Backups[$i]{num}</t		<td align="left" class="border"> $comment </td></tr>
t> </td></tr>
EOF		EOF
push @sizeRows, <<EOF;		push @sizeRows, <<EOF;
<tr><td align="center" class="border"> <a href="$browseURL">$Backups[$i]{num}</a > </td>		<tr><td align="center" class="border"> <a href="$browseURL">$Backups[$i]{num}</a > </td>
<td align="center" class="border"> $ltype </td>		<td align="center" class="border"> $ltype </td>
<td align="right" class="border"> $Backups[$i]{nFiles} </td>		<td align="right" class="border"> $Backups[$i]{nFiles} </td>
<td align="right" class="border"> $MB </td>		<td align="right" class="border"> $MB </td>
<td align="right" class="border"> $MBperSec </td>		<td align="right" class="border"> $MBperSec </td>
<td align="right" class="border"> $Backups[$i]{nFilesExist} </td>		<td align="right" class="border"> $Backups[$i]{nFilesExist} </td>
<td align="right" class="border"> $MBExist </td>		<td align="right" class="border"> $MBExist </td>
<td align="right" class="border"> $Backups[$i]{nFilesNew} </td>		<td align="right" class="border"> $Backups[$i]{nFilesNew} </td>
<td align="right" class="border"> $MBNew </td>		<td align="right" class="border"> $MBNew </td>
</tr>		</tr>
EOF		EOF
my $is_compress = $Backups[$i]{compress} \|\| $Lang->{off};		my $is_compress = $Backups[$i]{compress} \|\| $Lang->{off};

if (! $ExistComp) { $ExistComp = " "; }		if ( !$ExistComp ) { $ExistComp = " "; }
if (! $MBExistComp) { $MBExistComp = " "; }		if ( !$MBExistComp ) { $MBExistComp = " "; }
push @compRows, <<EOF;		push @compRows, <<EOF;
<tr><td align="center" class="border"> <a href="$browseURL">$Backups[$i]{num}</a > </td>		<tr><td align="center" class="border"> <a href="$browseURL">$Backups[$i]{num}</a > </td>
<td align="center" class="border"> $ltype </td>		<td align="center" class="border"> $ltype </td>
<td align="center" class="border"> $is_compress </td>		<td align="center" class="border"> $is_compress </td>
<td align="right" class="border"> $MBExist </td>		<td align="right" class="border"> $MBExist </td>
<td align="right" class="border"> $MBExistComp </td>		<td align="right" class="border"> $MBExistComp </td>
<td align="right" class="border"> $ExistComp </td>		<td align="right" class="border"> $ExistComp </td>
<td align="right" class="border"> $MBNew </td>		<td align="right" class="border"> $MBNew </td>
<td align="right" class="border"> $MBNewComp </td>		<td align="right" class="border"> $MBNewComp </td>
<td align="right" class="border"> $NewComp </td>		<td align="right" class="border"> $NewComp </td>

skipping to change at line 231		skipping to change at line 264
<tr><td align="center" class="border"> <a href="$browseURL">$Backups[$i]{num}</a > </td>		<tr><td align="center" class="border"> <a href="$browseURL">$Backups[$i]{num}</a > </td>
<td align="center" class="border"> $ltype </td>		<td align="center" class="border"> $ltype </td>
<td align="center" class="border"> <a href="$MyURL?action=view&type=XferLOG& num=$Backups[$i]{num}&host=${EscURI($host)}">$Lang->{XferLOG}</a>,		<td align="center" class="border"> <a href="$MyURL?action=view&type=XferLOG& num=$Backups[$i]{num}&host=${EscURI($host)}">$Lang->{XferLOG}</a>,
<a href="$MyURL?action=view&type=XferErr&num=$Backups[$i]{ num}&host=${EscURI($host)}">$Lang->{Errors}</a> </td>		<a href="$MyURL?action=view&type=XferErr&num=$Backups[$i]{ num}&host=${EscURI($host)}">$Lang->{Errors}</a> </td>
<td align="right" class="border"> $Backups[$i]{xferErrs} </td>		<td align="right" class="border"> $Backups[$i]{xferErrs} </td>
<td align="right" class="border"> $Backups[$i]{xferBadFile} </td>		<td align="right" class="border"> $Backups[$i]{xferBadFile} </td>
<td align="right" class="border"> $Backups[$i]{xferBadShare} </td>		<td align="right" class="border"> $Backups[$i]{xferBadShare} </td>
<td align="right" class="border"> $Backups[$i]{tarErrs} </td></tr>		<td align="right" class="border"> $Backups[$i]{tarErrs} </td></tr>
EOF		EOF
}		}

my $str = join("\n", reverse(@bkpRows));
		my $str = join("\n", reverse(@bkpRows));
my $sizeStr = join("\n", reverse(@sizeRows));		my $sizeStr = join("\n", reverse(@sizeRows));
my $compStr = join("\n", reverse(@compRows));		my $compStr = join("\n", reverse(@compRows));

my $errStr = join("\n", reverse(@errRows));		my $errStr = join("\n", reverse(@errRows));
my $warnStr = join("\n", reverse(@warnRows));		my $warnStr = join("\n", reverse(@warnRows));

my @Restores = $bpc->RestoreInfoRead($host);		my @Restores = $bpc->RestoreInfoRead($host);
my @restoreRows;		my @restoreRows;

for ( my $i = 0 ; $i < @Restores ; $i++ ) {		for ( my $i = 0 ; $i < @Restores ; $i++ ) {
my $startTime = timeStamp2($Restores[$i]{startTime});		my $startTime = timeStamp2($Restores[$i]{startTime});
my $dur = $Restores[$i]{endTime} - $Restores[$i]{startTime};		my $dur = $Restores[$i]{endTime} - $Restores[$i]{startTime};

$dur = 1 if ( $dur <= 0 );		$dur = 1 if ( $dur <= 0 );
my $duration = sprintf("%.1f", $dur / 60);		my $duration = sprintf("%.1f", $dur / 60);
my $MB = sprintf("%.1f", $Restores[$i]{size} / (1024*1024));		my $MB = sprintf("%.1f", $Restores[$i]{size} / (1024 * 1024));
my $MBperSec = sprintf("%.2f", $Restores[$i]{size} / (10241024$dur));		my $MBperSec = sprintf("%.2f", $Restores[$i]{size} / (1024 * 1024 * $dur
		));
my $Restores_Result = $Lang->{failed};		my $Restores_Result = $Lang->{failed};

if ($Restores[$i]{result} ne "failed") { $Restores_Result = $Lang->{succ ess}; }		if ( $Restores[$i]{result} ne "failed" ) { $Restores_Result = $Lang->{su ccess}; }
push @restoreRows, <<EOF;		push @restoreRows, <<EOF;
<tr><td align="center" class="border"><a href="$MyURL?action=restoreInfo&num=$Re stores[$i]{num}&host=${EscURI($host)}">$Restores[$i]{num}</a> </td>		<tr><td align="center" class="border"><a href="$MyURL?action=restoreInfo&num=$Re stores[$i]{num}&host=${EscURI($host)}">$Restores[$i]{num}</a> </td>
<td align="center" class="border"> $Restores_Result </td>		<td align="center" class="border"> $Restores_Result </td>
<td align="right" class="border" data-date_format="$Conf{CgiDateFormatMMDD}" > $startTime </td>		<td align="right" class="border" data-date_format="$Conf{CgiDateFormatMMDD}" > $startTime </td>
<td align="right" class="border"> $duration </td>		<td align="right" class="border"> $duration </td>
<td align="right" class="border"> $Restores[$i]{nFiles} </td>		<td align="right" class="border"> $Restores[$i]{nFiles} </td>
<td align="right" class="border"> $MB </td>		<td align="right" class="border"> $MB </td>
<td align="right" class="border"> $Restores[$i]{tarCreateErrs} </td>		<td align="right" class="border"> $Restores[$i]{tarCreateErrs} </td>
<td align="right" class="border"> $Restores[$i]{xferErrs} </td>		<td align="right" class="border"> $Restores[$i]{xferErrs} </td>
</tr>		</tr>
EOF		EOF
}		}
my $restoreStr = join("\n", reverse(@restoreRows));		my $restoreStr = join("\n", reverse(@restoreRows));
if ( $restoreStr ne "" ) {		if ( $restoreStr ne "" ) {
$restoreStr = eval("qq{$Lang->{Restore_Summary}}");		$restoreStr = eval("qq{$Lang->{Restore_Summary}}");
}		}
if ( @Backups == 0 ) {		if ( @Backups == 0 ) {
$warnStr = $Lang->{This_PC_has_never_been_backed_up};		$warnStr = $Lang->{This_PC_has_never_been_backed_up};
}		}
if ( defined($Hosts->{$host}) ) {		if ( defined($Hosts->{$host}) ) {

my $user = $Hosts->{$host}{user};		my $user = $Hosts->{$host}{user};
my @moreUsers = sort(keys(%{$Hosts->{$host}{moreUsers}}));		my @moreUsers = sort(keys(%{$Hosts->{$host}{moreUsers}}));
my $moreUserStr;		my $moreUserStr;
foreach my $u ( sort(keys(%{$Hosts->{$host}{moreUsers}})) ) {		foreach my $u ( sort(keys(%{$Hosts->{$host}{moreUsers}})) ) {
$moreUserStr .= ", " if ( $moreUserStr ne "" );		$moreUserStr .= ", " if ( $moreUserStr ne "" );
$moreUserStr .= "${UserLink($u)}";		$moreUserStr .= "${UserLink($u)}";
}		}
if ( $moreUserStr ne "" ) {		if ( $moreUserStr ne "" ) {
$moreUserStr = " ($Lang->{and} $moreUserStr).\n";		$moreUserStr = " ($Lang->{and} $moreUserStr).\n";
} else {		} else {
$moreUserStr = ".\n";		$moreUserStr = ".\n";
}		}
if ( $user ne "" ) {		if ( $user ne "" ) {
$statusStr .= eval("qq{$Lang->{This_PC_is_used_by}$moreUserStr}");		$statusStr .= eval("qq{$Lang->{This_PC_is_used_by}$moreUserStr}");
}		}

if ( defined($UserEmailInfo{$user})		if ( defined($UserEmailInfo{$user})
&& defined($UserEmailInfo{$user}{$host})		&& defined($UserEmailInfo{$user}{$host})
&& defined($UserEmailInfo{$user}{$host}{lastSubj}) ) {		&& defined($UserEmailInfo{$user}{$host}{lastSubj}) ) {
my $mailTime = timeStamp2($UserEmailInfo{$user}{$host}{lastTime});		my $mailTime = timeStamp2($UserEmailInfo{$user}{$host}{lastTime});
my $subj = $UserEmailInfo{$user}{$host}{lastSubj};		my $subj = $UserEmailInfo{$user}{$host}{lastSubj};

$statusStr .= eval("qq{$Lang->{Last_email_sent_to__was_at___subject }}");		$statusStr .= eval("qq{$Lang->{Last_email_sent_to__was_at___subject} }");
} elsif ( defined($UserEmailInfo{$user})		} elsif ( defined($UserEmailInfo{$user})

&& $UserEmailInfo{$user}{lastHost} eq $host		&& $UserEmailInfo{$user}{lastHost} eq $host
&& defined($UserEmailInfo{$user}{lastSubj}) ) {		&& defined($UserEmailInfo{$user}{lastSubj}) ) {
#		#
# Old format %UserEmailInfo - pre 3.2.0.		# Old format %UserEmailInfo - pre 3.2.0.
#		#
my $mailTime = timeStamp2($UserEmailInfo{$user}{lastTime});		my $mailTime = timeStamp2($UserEmailInfo{$user}{lastTime});
my $subj = $UserEmailInfo{$user}{lastSubj};		my $subj = $UserEmailInfo{$user}{lastSubj};

$statusStr .= eval("qq{$Lang->{Last_email_sent_to__was_at___subject }}");		$statusStr .= eval("qq{$Lang->{Last_email_sent_to__was_at___subject} }");
}		}
}		}
if ( defined($StatusHost{Job}) ) {		if ( defined($StatusHost{Job}) ) {
my $startTime = timeStamp2($StatusHost{Job}{startTime});		my $startTime = timeStamp2($StatusHost{Job}{startTime});
(my $cmd = $StatusHost{Job}{cmd}) =~ s/$BinDir\///g;		(my $cmd = $StatusHost{Job}{cmd}) =~ s/$BinDir\///g;
$statusStr .= eval("qq{$Lang->{The_command_cmd_is_currently_running_for_ started}}");		$statusStr .= eval("qq{$Lang->{The_command_cmd_is_currently_running_for_ started}}");
}		}
if ( $StatusHost{BgQueueOn} ) {		if ( $StatusHost{BgQueueOn} ) {
$statusStr .= eval("qq{$Lang->{Host_host_is_queued_on_the_background_que ue_will_be_backed_up_soon}}");		$statusStr .= eval("qq{$Lang->{Host_host_is_queued_on_the_background_que ue_will_be_backed_up_soon}}");
}		}
if ( $StatusHost{UserQueueOn} ) {		if ( $StatusHost{UserQueueOn} ) {
$statusStr .= eval("qq{$Lang->{Host_host_is_queued_on_the_user_queue__wi ll_be_backed_up_soon}}");		$statusStr .= eval("qq{$Lang->{Host_host_is_queued_on_the_user_queue__wi ll_be_backed_up_soon}}");
}		}
if ( $StatusHost{CmdQueueOn} ) {		if ( $StatusHost{CmdQueueOn} ) {
$statusStr .= eval("qq{$Lang->{A_command_for_host_is_on_the_command_queu e_will_run_soon}}");		$statusStr .= eval("qq{$Lang->{A_command_for_host_is_on_the_command_queu e_will_run_soon}}");
}		}

my $startTime = timeStamp2($StatusHost{endTime} == 0 ?		my $startTime = timeStamp2($StatusHost{endTime} == 0 ? $StatusHost{startTime
$StatusHost{startTime} : $StatusHost{endTime});		} : $StatusHost{endTime});
my $reason = "";		my $reason = "";
if ( $StatusHost{reason} ne "" ) {		if ( $StatusHost{reason} ne "" ) {
$reason = " ($Lang->{$StatusHost{reason}})";		$reason = " ($Lang->{$StatusHost{reason}})";
}		}
$statusStr .= eval("qq{$Lang->{Last_status_is_state_StatusHost_state_reason_ as_of_startTime}}");		$statusStr .= eval("qq{$Lang->{Last_status_is_state_StatusHost_state_reason_ as_of_startTime}}");


if ( $StatusHost{state} ne "Status_backup_in_progress"		if ( $StatusHost{state} ne "Status_backup_in_progress"
&& $StatusHost{state} ne "Status_restore_in_progress"		&& $StatusHost{state} ne "Status_restore_in_progress"
&& $StatusHost{error} ne "" ) {		&& $StatusHost{error} ne "" ) {
$statusStr .= eval("qq{$Lang->{Last_error_is____EscHTML_StatusHost_error }}");		$statusStr .= eval("qq{$Lang->{Last_error_is____EscHTML_StatusHost_error }}");
}		}
my $priorStr = "Pings";		my $priorStr = "Pings";
if ( $StatusHost{deadCnt} > 0 ) {		if ( $StatusHost{deadCnt} > 0 ) {
$statusStr .= eval("qq{$Lang->{Pings_to_host_have_failed_StatusHost_dead Cnt__consecutive_times}}");		$statusStr .= eval("qq{$Lang->{Pings_to_host_have_failed_StatusHost_dead Cnt__consecutive_times}}");
$priorStr = $Lang->{Prior_to_that__pings};		$priorStr = $Lang->{Prior_to_that__pings};
}		}
if ( $StatusHost{aliveCnt} > 0 ) {		if ( $StatusHost{aliveCnt} > 0 ) {
$statusStr .= eval("qq{$Lang->{priorStr_to_host_have_succeeded_StatusHos taliveCnt_consecutive_times}}");		$statusStr .= eval("qq{$Lang->{priorStr_to_host_have_succeeded_StatusHos taliveCnt_consecutive_times}}");


if ( (@{$Conf{BlackoutPeriods}} \|\| defined($Conf{BlackoutHourBegin}))		if ( (@{$Conf{BlackoutPeriods}} \|\| defined($Conf{BlackoutHourBegin}))
&& $StatusHost{aliveCnt} >= $Conf{BlackoutGoodCnt}		&& $StatusHost{aliveCnt} >= $Conf{BlackoutGoodCnt}
&& $Conf{BlackoutGoodCnt} >= 0 ) {		&& $Conf{BlackoutGoodCnt} >= 0 ) {
#		#
# Handle backward compatibility with original separate scalar		# Handle backward compatibility with original separate scalar
# blackout parameters.		# blackout parameters.
#		#
if ( defined($Conf{BlackoutHourBegin}) ) {		if ( defined($Conf{BlackoutHourBegin}) ) {

push(@{$Conf{BlackoutPeriods}},		push(
{		@{$Conf{BlackoutPeriods}},
hourBegin => $Conf{BlackoutHourBegin},		{
hourEnd => $Conf{BlackoutHourEnd},		hourBegin => $Conf{BlackoutHourBegin},
weekDays => $Conf{BlackoutWeekDays},		hourEnd => $Conf{BlackoutHourEnd},
}		weekDays => $Conf{BlackoutWeekDays},
		}
);		);
}		}

#		#
# TODO: this string needs i18n. Also, comma-separated		# TODO: this string needs i18n. Also, comma-separated
# list with "and" for the last element might not translate		# list with "and" for the last element might not translate
# correctly.		# correctly.
#		#
my(@days) = qw(Sun Mon Tue Wed Thu Fri Sat);		my(@days) = qw(Sun Mon Tue Wed Thu Fri Sat);
my $blackoutStr;		my $blackoutStr;
my $periodCnt = 0;		my $periodCnt = 0;
foreach my $p ( @{$Conf{BlackoutPeriods}} ) {		foreach my $p ( @{$Conf{BlackoutPeriods}} ) {

next if ( ref($p->{weekDays}) ne "ARRAY"		next if ( ref($p->{weekDays}) ne "ARRAY" \|\| !defined($p->{hourBe
\|\| !defined($p->{hourBegin})		gin}) \|\| !defined($p->{hourEnd}) );
\|\| !defined($p->{hourEnd})
);
my $days = join(", ", @days[@{$p->{weekDays}}]);		my $days = join(", ", @days[@{$p->{weekDays}}]);

my $t0 = sprintf("%d:%02d", $p->{hourBegin},		my $t0 = sprintf("%d:%02d", $p->{hourBegin}, 60 * ($p->{hourBe
60 * ($p->{hourBegin} - int($p->{hourBegin})));		gin} - int($p->{hourBegin})));
my $t1 = sprintf("%d:%02d", $p->{hourEnd},		my $t1 = sprintf("%d:%02d", $p->{hourEnd}, 60 * ($p->{hourEnd}
60 * ($p->{hourEnd} - int($p->{hourEnd})));		- int($p->{hourEnd})));
if ( $periodCnt ) {		if ( $periodCnt ) {
$blackoutStr .= ", ";		$blackoutStr .= ", ";
if ( $periodCnt == @{$Conf{BlackoutPeriods}} - 1 ) {		if ( $periodCnt == @{$Conf{BlackoutPeriods}} - 1 ) {
$blackoutStr .= eval("qq{$Lang->{and}}");		$blackoutStr .= eval("qq{$Lang->{and}}");
$blackoutStr .= " ";		$blackoutStr .= " ";
}		}
}		}

$blackoutStr		$blackoutStr .= eval("qq{$Lang->{__time0_to__time1_on__days}}");
.= eval("qq{$Lang->{__time0_to__time1_on__days}}");
$periodCnt++;		$periodCnt++;
}		}

$statusStr .= eval("qq{$Lang->{Because__host_has_been_on_the_network		$statusStr .= eval(
_at_least__Conf_BlackoutGoodCnt_consecutive_times___}}");		"qq{$Lang->{Because__host_has_been_on_the_network_at_least__Conf
		_BlackoutGoodCnt_consecutive_times___}}"
		);
}		}
}		}
if ( $StatusHost{backoffTime} > time ) {		if ( $StatusHost{backoffTime} > time ) {
my $hours = sprintf("%.1f", ($StatusHost{backoffTime} - time) / 3600);		my $hours = sprintf("%.1f", ($StatusHost{backoffTime} - time) / 3600);
$statusStr .= eval("qq{$Lang->{Backups_are_deferred_for_hours_hours_chan ge_this_number}}");		$statusStr .= eval("qq{$Lang->{Backups_are_deferred_for_hours_hours_chan ge_this_number}}");

}		}
if ( length($Conf{ClientComment}) ) {		if ( length($Conf{ClientComment}) ) {
$statusStr .= "<li>${EscHTML($Conf{ClientComment})}\n";		$statusStr .= "<li>${EscHTML($Conf{ClientComment})}\n";
}		}
if ( @Backups ) {		if ( @Backups ) {


# only allow incremental if there are already some backups		# only allow incremental if there are already some backups
$startIncrStr = <<EOF;		$startIncrStr = <<EOF;
<input type="button" value="$Lang->{Start_Incr_Backup}"		<input type="button" value="$Lang->{Start_Incr_Backup}"
onClick="document.StartStopForm.action.value='Start_Incr_Backup';		onClick="document.StartStopForm.action.value='Start_Incr_Backup';
document.StartStopForm.submit();">		document.StartStopForm.submit();">
EOF		EOF
}		}

$startIncrStr = eval("qq{$startIncrStr}");		$startIncrStr = eval("qq{$startIncrStr}");
my $content = eval("qq{$Lang->{Host__host_Backup_Summary2}}");		my $content = eval("qq{$Lang->{Host__host_Backup_Summary2}}");

End of changes. 38 change blocks.
86 lines changed or deleted		133 lines changed or added

Home | About | Features | All | Newest | Dox | Diffs | RSS Feeds | Screenshots | Comments | Imprint | Privacy | HTTP(S)