X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FHostInfo.pm;h=d43ccfcd6239b88850b5f9d1c0784fce9d3f4e55;hb=ec2bfb5d93994c39238ad23c4df1da82f5bef0d5;hp=01e292406f5ab30ce43a656ca80916a4d921327f;hpb=b81d2da5e16975674f011e4833337ac0fa24e0ea;p=BackupPC.git diff --git a/lib/BackupPC/CGI/HostInfo.pm b/lib/BackupPC/CGI/HostInfo.pm index 01e2924..d43ccfc 100644 --- a/lib/BackupPC/CGI/HostInfo.pm +++ b/lib/BackupPC/CGI/HostInfo.pm @@ -10,7 +10,7 @@ # Craig Barratt # # 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 3.0.0beta2, released 11 Nov 2006. +# Version 3.2.0, released 31 Jul 2010. # # See http://backuppc.sourceforge.net. # @@ -248,8 +248,15 @@ EOF if ( $user ne "" ) { $statusStr .= eval("qq{$Lang->{This_PC_is_used_by}$moreUserStr}"); } - if ( defined($UserEmailInfo{$user}) + if ( defined($UserEmailInfo{$user}) && defined($UserEmailInfo{$user}{$host}) ) { + my $mailTime = timeStamp2($UserEmailInfo{$user}{$host}{lastTime}); + my $subj = $UserEmailInfo{$user}{$host}{lastSubj}; + $statusStr .= eval("qq{$Lang->{Last_email_sent_to__was_at___subject}}"); + } elsif ( defined($UserEmailInfo{$user}) && $UserEmailInfo{$user}{lastHost} eq $host ) { + # + # Old format %UserEmailInfo - pre 3.2.0. + # my $mailTime = timeStamp2($UserEmailInfo{$user}{lastTime}); my $subj = $UserEmailInfo{$user}{lastSubj}; $statusStr .= eval("qq{$Lang->{Last_email_sent_to__was_at___subject}}");