X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_sendEmail;h=5a063e20ab37bf3b55ea76324d1bcd53dd6e8af0;hp=055884a447e5e1f631aadc92b04e803e4f410311;hb=f6fbcc3682d2bc9e7dfdc26e95bd5fcdb359496d;hpb=5b79f9a3c01bca16dd4d211e76fc53daa549e421

diff --git a/bin/BackupPC_sendEmail b/bin/BackupPC_sendEmail
index 055884a..5a063e2 100755
--- a/bin/BackupPC_sendEmail
+++ b/bin/BackupPC_sendEmail
@@ -1,4 +1,4 @@
-#!/bin/perl
+#!/usr/bin/perl
 #============================================================= -*-perl-*-
 #
 # BackupPC_sendEmail: send status emails to users and admins
@@ -31,7 +31,7 @@
 #
 #========================================================================
 #
-# Version 3.1.0, released 25 Nov 2007.
+# Version 3.2.0beta0, released 5 April 2009.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -373,7 +373,7 @@ sub sendUserEmail
     $vars->{domain}   = $Conf{EMailUserDestDomain};
     $vars->{CgiURL}   = $Conf{CgiURL};
     $subj =~ s/\$(\w+)/defined($vars->{$1}) ? $vars->{$1} : "\$$1"/eg;
-    $vars->{subj}     = $subj;
+    $vars->{subj}     = encode('MIME-Header', $subj);
     $mesg =~ s/\$(\w+)/defined($vars->{$1}) ? $vars->{$1} : "\$$1"/eg;
     SendMail($mesg);
     $UserEmailInfo{$user}{lastTime} = time;
@@ -403,13 +403,7 @@ sub SendMail
     	printf("Can't run sendmail ($Conf{SendmailPath}): $!\n");
 	return;
     }
-    if ( $utf8 ) {
-	binmode(MAIL, ":utf8");
-	if ($mesg =~ /^Subject: (.*)$/m) {
-		my $new_subj = encode('MIME-Header', $1);
-		$mesg =~ s/^Subject: .*$/Subject: $new_subj/m;
-	}
-    }
+    binmode(MAIL, ":utf8") if ( $utf8 );
     print MAIL $mesg;
     close(MAIL);
 }