ftimme
2011-09-19 4ffb51e51f89a45256836fb55ad1c29f5e06beb2
server/plugins-available/mail_plugin.inc.php
@@ -169,8 +169,10 @@
         $tmp = file($conf['rootpath'].'/conf/mail/welcome_email_en.txt');
      }
      
      $welcome_mail_subject  = trim(substr($tmp[0],8));
      $welcome_mail_from  = trim(substr($tmp[0],5));
      $welcome_mail_subject  = trim(substr($tmp[1],8));
      unset($tmp[0]);
      unset($tmp[1]);
      $welcome_mail_message = trim(implode($tmp));
      unset($tmp);
      
@@ -180,10 +182,11 @@
      $mailHeaders      = "MIME-Version: 1.0" . "\n";
      $mailHeaders     .= "Content-type: text/plain; charset=utf-8" . "\n";
      $mailHeaders     .= "Content-Transfer-Encoding: 8bit" . "\n";
      $mailHeaders     .= "From: $welcomeFromName <$welcomeFromEmail>" . "\n";
      $mailHeaders     .= "Reply-To: <$welcomeFromEmail>" . "\n";
      $mailHeaders     .= "From: $welcome_mail_from" . "\n";
      $mailHeaders     .= "Reply-To: $welcome_mail_from" . "\n";
      $mailTarget       = $data["new"]["email"];
      $mailSubject = "=?utf-8?Q?" . imap_8bit($welcome_mail_subject) . "?=";
      // $mailSubject = "=?utf-8?Q?" . imap_8bit($welcome_mail_subject) . "?=";
      $mailSubject      = "=?utf-8?B?".base64_encode($welcome_mail_subject)."?=";
      mail($mailTarget, $mailSubject, $welcome_mail_message, $mailHeaders);