Fix for bug 125516: the recent fix for emails truncating when a period occurred…

Bugzilla/Token.pm

@@ -101,7 +101,7 @@ sub MailPasswordToken {
     my $emailsuffix = &::Param('emailsuffix');
     $token = &::url_quote($token);
 
-    open SENDMAIL, "|/usr/lib/sendmail -ti";
+    open SENDMAIL, "|/usr/lib/sendmail -t -i";
 
     print SENDMAIL qq|From: bugzilla-daemon
 To: $emailaddress$emailsuffix
@@ -144,7 +144,7 @@ sub Cancel {
     my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
 
     # Notify the user via email about the cancellation.
-    open SENDMAIL, "|/usr/lib/sendmail -ti";
+    open SENDMAIL, "|/usr/lib/sendmail -t -i";
     print SENDMAIL qq|From: bugzilla-daemon
 To: $username
 Subject: "$tokentype" token cancelled

CGI.pl

@@ -762,7 +762,7 @@ sub MailPassword {
                              "login" => $login,
                              "password" => $password});
 
-    open SENDMAIL, "|/usr/lib/sendmail -ti";
+    open SENDMAIL, "|/usr/lib/sendmail -t -i";
     print SENDMAIL $msg;
     close SENDMAIL;
 }

Token.pm

@@ -101,7 +101,7 @@ sub MailPasswordToken {
     my $emailsuffix = &::Param('emailsuffix');
     $token = &::url_quote($token);
 
-    open SENDMAIL, "|/usr/lib/sendmail -ti";
+    open SENDMAIL, "|/usr/lib/sendmail -t -i";
 
     print SENDMAIL qq|From: bugzilla-daemon
 To: $emailaddress$emailsuffix
@@ -144,7 +144,7 @@ sub Cancel {
     my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
 
     # Notify the user via email about the cancellation.
-    open SENDMAIL, "|/usr/lib/sendmail -ti";
+    open SENDMAIL, "|/usr/lib/sendmail -t -i";
     print SENDMAIL qq|From: bugzilla-daemon
 To: $username
 Subject: "$tokentype" token cancelled

globals.pl

@@ -1432,7 +1432,7 @@ sub RemoveVotes {
             if (Param('sendmailnow')) {
                $sendmailparm = '';
             }
-            if (open(SENDMAIL, "|/usr/lib/sendmail $sendmailparm -ti")) {
+            if (open(SENDMAIL, "|/usr/lib/sendmail $sendmailparm -t -i")) {
                 my %substs;
 
                 $substs{"to"} = $name;

importxml.pl

@@ -114,7 +114,7 @@ sub MailMessage {
   $header.= "Subject: $subject\n\n";
 
   open(SENDMAIL,
-    "|/usr/lib/sendmail -ODeliveryMode=background -ti") ||
+    "|/usr/lib/sendmail -ODeliveryMode=background -t -i") ||
       die "Can't open sendmail";
   print SENDMAIL $header . $message . "\n";
   close SENDMAIL;

move.pl

@@ -154,7 +154,7 @@ $msg .= "Subject: Moving bug(s) $buglist\n\n";
 $msg .= $xml . "\n";
 
 open(SENDMAIL,
-  "|/usr/lib/sendmail -ODeliveryMode=background -ti") ||
+  "|/usr/lib/sendmail -ODeliveryMode=background -t -i") ||
     die "Can't open sendmail";
 print SENDMAIL $msg;
 close SENDMAIL;

processmail

@@ -771,7 +771,7 @@ sub NewProcessOnePerson ($$$$$$$$$$$$) {
     }
 
     if ($enableSendMail == 1) {
-    open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -ti") ||
+    open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t -i") ||
       die "Can't open sendmail";
     
     print SENDMAIL trim($msg) . "\n";

whineatnews.pl

@@ -64,7 +64,7 @@ foreach my $email (sort (keys %bugs)) {
     }
 
     my $sendmailparam = Param('sendmailnow') ? '' : "-ODeliveryMode=deferred";
-    open SENDMAIL, "|/usr/lib/sendmail $sendmailparam -ti"
+    open SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t -i"
         or die "Can't open sendmail";
     print SENDMAIL $msg;
     close SENDMAIL;