projects / fa-stable.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Dimension is missing in Supplier Invoice View, GL Rows.
[fa-stable.git] / reporting / includes / class.mail.inc
diff --git a/reporting/includes/class.mail.inc b/reporting/includes/class.mail.inc
index 778815534f01e83144c488434b8af765e21832a0..b1e29c145caacd7d1ceb03272b55ab62084f62f8 100644 (file)
--- 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 .= "<html><body>\n".$html."\n</body></html>\n";
     }
 
@@ -103,6 +107,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';
        }
 
@@ -130,9 +136,7 @@ class email
             }
             $this->header .= "\n";
         }
-               $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";
 
         // Attachment hinzufügen
         $max = count($this->attachment);
@@ -154,10 +158,10 @@ class email
                $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
+?>
FrontAccounting stable branch