X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fclass.mail.inc;h=7cce85a109e1788546d2c2d4cc265bad504162e2;hb=477c1f221df891f39e9363f7b34e6ff1eb4ad4c7;hp=778815534f01e83144c488434b8af765e21832a0;hpb=25c7baa5d19f94e705ece3b8af3cb3a43b9c1830;p=fa-stable.git diff --git a/reporting/includes/class.mail.inc b/reporting/includes/class.mail.inc index 77881553..7cce85a1 100644 --- a/reporting/includes/class.mail.inc +++ b/reporting/includes/class.mail.inc @@ -39,11 +39,15 @@ class email var $subject = ""; var $body = ""; var $charset = 'ISO-8859-1'; + var $add_params; function email($name, $mail) { $this->boundary = md5(uniqid(time())); $this->header = "From: $name <$mail>\n"; + $bcc = get_company_pref('bcc_email'); + if ($bcc) + $this->bcc[] = $bcc; } function to($mail) @@ -75,7 +79,7 @@ class email { $this->body = "--$this->boundary\n"; $this->body .= "Content-Type: text/plain; charset=\"{$this->charset}\"\n"; - $this->body .= "Content-Transfer-Encoding: 8bit\n"; + $this->body .= "Content-Transfer-Encoding: 8bit\n\n"; $this->body .= $text."\n"; } @@ -83,7 +87,7 @@ class email { $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 .= "Content-Transfer-Encoding: quoted-printable\n\n"; $this->body .= "\n".$html."\n\n"; } @@ -93,6 +97,8 @@ class email if ($filename == $file . '.zip') return 'application/x-zip-compressed'; $file = basename($filename, '.pdf'); if ($filename == $file . '.pdf') return 'application/pdf'; + $file = basename($filename, '.xls'); + if ($filename == $file . '.xls') return 'application/vnd.ms-excel'; $file = basename($filename, '.csv'); if ($filename == $file . '.csv') return 'application/vnd.ms-excel'; $file = basename($filename, '.tar'); @@ -103,38 +109,23 @@ class email if ($filename == $file . '.tgz') return 'application/x-tar-gz'; $file = basename($filename, '.gz'); if ($filename == $file . '.gz') return 'application/x-gzip'; + $file = basename($filename, '.html'); + if ($filename == $file . '.html') return 'text/html'; return 'application/unknown'; } function send() { - // CC Empfänger hinzufügen - $max = count($this->cc); - if ($max > 0) - { - $this->header .= "Cc: ".$this->cc[0]; - for ($i = 1; $i < $max; $i++) - { - $this->header .= ", ".$this->cc[$i]; - } - $this->header .= "\n"; - } - // BCC Empfänger hinzufügen - $max = count($this->bcc); - if ($max > 0) - { - $this->header .= "Bcc: ".$this->bcc[0]; - for ($i = 1; $i < $max; $i++) - { - $this->header .= ", ".$this->bcc[$i]; - } - $this->header .= "\n"; - } - $this->header .= "MIME-Version: 1.0\n"; + // Add CC Recipients + if (!empty($this->cc)) + $this->header .= "Cc: " . implode(", ", $this->cc) . "\n" ; + + // Add BCC Recipients + if (!empty($this->bcc)) + $this->header .= "Bcc: " . implode(", ", $this->bcc) . "\n" ; $this->header .= "Content-Type: multipart/mixed;\n boundary=\"$this->boundary\"\n"; - $this->header .= "This is a multi-part message in MIME format.\n"; - // Attachment hinzufügen + // Add Attachments $max = count($this->attachment); if ($max > 0) { @@ -149,15 +140,14 @@ class email $file = ""; } } - $this->body .= "--".$this->boundary."--\n"; + $this->body .= "--".$this->boundary."--\n"; $ret = 0; foreach($this->to as $mail) { - if (mail($mail, $this->subject, $this->body, $this->header)) + if (mail($mail, $this->subject, $this->body, $this->header, $this->add_params)) $ret++; } return $ret; } } -?> \ No newline at end of file