From: Janusz Dobrowolski Date: Mon, 12 Nov 2012 08:39:44 +0000 (+0100) Subject: Fixed small bug in mail class, added text/hmtl mime type. X-Git-Tag: 2.3-final~385 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=fe435d21cfea6abb4166ca67ae9a0e3f76807c9d;p=fa-stable.git Fixed small bug in mail class, added text/hmtl mime type. --- diff --git a/includes/ui/view_package.php b/includes/ui/view_package.php index 9e68d046..dee8a2f9 100644 --- a/includes/ui/view_package.php +++ b/includes/ui/view_package.php @@ -1,4 +1,14 @@ . +***********************************************************************/ $page_security = 'SA_OPEN'; $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); diff --git a/reporting/includes/class.mail.inc b/reporting/includes/class.mail.inc index 77881553..65066ca7 100644 --- a/reporting/includes/class.mail.inc +++ b/reporting/includes/class.mail.inc @@ -75,7 +75,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 +83,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"; } @@ -103,6 +103,8 @@ 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'; }