X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fclass.mail.inc;h=778815534f01e83144c488434b8af765e21832a0;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=c6f717e9440b89ab979f136b1bd056bcde588325;hpb=b9947de96180bb97af210ec86fd3205b33d636a4;p=fa-stable.git diff --git a/reporting/includes/class.mail.inc b/reporting/includes/class.mail.inc index c6f717e9..77881553 100644 --- a/reporting/includes/class.mail.inc +++ b/reporting/includes/class.mail.inc @@ -24,6 +24,8 @@ erroneous file naming. I tried to emulate this mindset. Added line length and EOL char for file chunking. For some reason without it there were extra line feeds in the chunked file. + + * Lots of fixes for FA */ class email @@ -71,14 +73,16 @@ class email function text($text) { - $this->body = "Content-Type: text/plain; charset=\"{$this->charset}\"\n"; + $this->body = "--$this->boundary\n"; + $this->body .= "Content-Type: text/plain; charset=\"{$this->charset}\"\n"; $this->body .= "Content-Transfer-Encoding: 8bit\n"; $this->body .= $text."\n"; } function html($html) { - $this->body = "Content-Type: text/html; charset=\"{$this->charset}\"\n"; + $this->body = "--$this->boundary\n"; + $this->body .= "Content-Type: text/html; charset=\"{$this->charset}\"\n"; $this->body .= "Content-Transfer-Encoding: quoted-printable\n"; $this->body .= "\n".$html."\n\n"; } @@ -129,8 +133,6 @@ class email $this->header .= "MIME-Version: 1.0\n"; $this->header .= "Content-Type: multipart/mixed;\n boundary=\"$this->boundary\"\n"; $this->header .= "This is a multi-part message in MIME format.\n"; - $this->header .= "--$this->boundary\n"; - $this->header .= $this->content_type; // Attachment hinzufügen $max = count($this->attachment); @@ -149,9 +151,11 @@ class email } $this->body .= "--".$this->boundary."--\n"; + $ret = 0; foreach($this->to as $mail) { - $ret = mail($mail, $this->subject, $this->body, $this->header); + if (mail($mail, $this->subject, $this->body, $this->header)) + $ret++; } return $ret; }