projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Commit for 2.1.0.
[BackupPC.git]
/
bin
/
BackupPC_sendEmail
diff --git
a/bin/BackupPC_sendEmail
b/bin/BackupPC_sendEmail
index
d5d4e00
..
ff6ddc7
100755
(executable)
--- a/
bin/BackupPC_sendEmail
+++ b/
bin/BackupPC_sendEmail
@@
-1,4
+1,4
@@
-#!/bin/perl
-T
+#!/bin/perl
#============================================================= -*-perl-*-
#
# BackupPC_sendEmail: send status emails to users and admins
#============================================================= -*-perl-*-
#
# BackupPC_sendEmail: send status emails to users and admins
@@
-13,7
+13,7
@@
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2001 Craig Barratt
+# Copyright (C) 2001
-2003
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
@@
-31,13
+31,14
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version 2.
0.0_CVS, released 3 Feb 2003
.
+# Version 2.
1.0, released 20 Jun 2004
.
#
# See http://backuppc.sourceforge.net.
#
#========================================================================
use strict;
#
# See http://backuppc.sourceforge.net.
#
#========================================================================
use strict;
+no utf8;
use lib "/usr/local/BackupPC/lib";
use BackupPC::Lib;
use BackupPC::FileZIO;
use lib "/usr/local/BackupPC/lib";
use BackupPC::Lib;
use BackupPC::FileZIO;
@@
-59,8
+60,7
@@
use vars qw(%UserEmailInfo);
do "$TopDir/log/UserEmailInfo.pl";
my %opts;
do "$TopDir/log/UserEmailInfo.pl";
my %opts;
-getopts("t", \%opts);
-if ( @ARGV != 0 ) {
+if ( !getopts("t", \%opts) || @ARGV != 0 ) {
print("usage: $0 [-t]\n");
exit(1);
}
print("usage: $0 [-t]\n");
exit(1);
}
@@
-169,6
+169,7
@@
foreach my $host ( sort(keys(%Status)) ) {
my $user = $Hosts->{$host}{user};
next if ( time - $UserEmailInfo{$user}{lastTime}
< $Conf{EMailNotifyMinDays} * 24*3600 );
my $user = $Hosts->{$host}{user};
next if ( time - $UserEmailInfo{$user}{lastTime}
< $Conf{EMailNotifyMinDays} * 24*3600 );
+ next if ($Conf{XferMethod} eq "archive" );
my @Backups = $bpc->BackupInfoRead($host);
my $numBackups = @Backups;
if ( $numBackups == 0 ) {
my @Backups = $bpc->BackupInfoRead($host);
my $numBackups = @Backups;
if ( $numBackups == 0 ) {
@@
-215,8
+216,8
@@
foreach my $host ( sort(keys(%Status)) ) {
while ( 1 ) {
my $s = $fh->readLine();
last if ( $s eq "" );
while ( 1 ) {
my $s = $fh->readLine();
last if ( $s eq "" );
- if ( $s =~ /^Error reading file.*\.pst : ERRDOS - ERRlock/
- || $s =~ /^Error reading file.*\.pst\. Got 0 bytes/ ) {
+ if ( $s =~ /^
\s*
Error reading file.*\.pst : ERRDOS - ERRlock/
+ || $s =~ /^
\s*
Error reading file.*\.pst\. Got 0 bytes/ ) {
$badOutlook = 1;
last;
}
$badOutlook = 1;
last;
}
@@
-283,6
+284,7
@@
if ( !$opts{t} ) {
[\%UserEmailInfo],
[qw(*UserEmailInfo)]);
if ( open(HOST, ">", "$TopDir/log/UserEmailInfo.pl") ) {
[\%UserEmailInfo],
[qw(*UserEmailInfo)]);
if ( open(HOST, ">", "$TopDir/log/UserEmailInfo.pl") ) {
+ binmode(HOST);
print(HOST $dumpStr);
close(HOST);
}
print(HOST $dumpStr);
close(HOST);
}