ISPConfig coding guidelines

Marius Burkard

2016-02-06 7b4df68ebbfa7edd70bc5c560c4d8aa0780e8a5b

 server/plugins-available/mail_plugin.inc.php

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

      //* Send the welcome email message
      $domain = explode('@', $data["new"]["email"])[1];
      $html = False;
      if (file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$domain.'.html')) {
      $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')) {
         $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')) {
         $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');
@@ -243,7 +243,7 @@
      unset($tmp);

      $mailHeaders      = "MIME-Version: 1.0" . "\n";
      if ($html){
      if($html) {
         $mailHeaders     .= "Content-Type: text/html; charset=utf-8" . "\n";
         $mailHeaders     .= "Content-Transfer-Encoding: quoted-printable" . "\n";
      } else {