Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 server/plugins-available/mail_plugin.inc.php

@@ -207,7 +207,14 @@

      //* Send the welcome email message
      $domain = explode('@', $data["new"]["email"])[1];
      if(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.txt')) {
      $html = false;
      if(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.html')) {
         $lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.html');
         $html = true;
      } elseif(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.html')) {
         $lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.html');
         $html = true;
      } elseif(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.txt')) {
         $lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.txt');
      } elseif(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.txt')) {
         $lines = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.txt');
@@ -236,8 +243,13 @@
      unset($tmp);

      $mailHeaders      = "MIME-Version: 1.0" . "\n";
      $mailHeaders     .= "Content-type: text/plain; charset=utf-8" . "\n";
      $mailHeaders     .= "Content-Transfer-Encoding: 8bit" . "\n";
      if($html) {
         $mailHeaders     .= "Content-Type: text/html; charset=utf-8" . "\n";
         $mailHeaders     .= "Content-Transfer-Encoding: quoted-printable" . "\n";
      } else {
         $mailHeaders     .= "Content-Type: text/plain; charset=utf-8" . "\n";
         $mailHeaders     .= "Content-Transfer-Encoding: 8bit" . "\n";
      }
      $mailHeaders     .= "From: $welcome_mail_from" . "\n";
      $mailHeaders     .= "Reply-To: $welcome_mail_from" . "\n";
      $mailTarget       = $data["new"]["email"];