Compatibility regression fix for previous commit.

[fa-stable.git] / reporting / includes / class.mail.inc

diff --git a/reporting/includes/class.mail.inc b/reporting/includes/class.mail.inc
index b1e29c145caacd7d1ceb03272b55ab62084f62f8..9ae05ea9acca9686041ff762edb7a1414c75a13f 100644 (file)
--- a/reporting/includes/class.mail.inc
+++ b/reporting/includes/class.mail.inc
@@ -35,16 +35,16 @@ class email
     var $bcc = array();
     var $attachment = array();
     var $boundary = "";
-    var $header = "";
+    var $headers = array();
     var $subject = "";
     var $body = "";
        var $charset = 'ISO-8859-1';
-       var $add_params;
+       var $add_params = "";
        
-    function email($name, $mail)
+    function __construct($name, $mail)
     {
         $this->boundary = md5(uniqid(time()));
-               $this->header = "From: $name <$mail>\n";
+               $this->headers['From'] = "$name <$mail>";
                $bcc = get_company_pref('bcc_email');
                if ($bcc)
                        $this->bcc[] = $bcc;
@@ -65,9 +65,11 @@ class email
        $this->bcc[] = $mail;
     }
 
-    function attachment($file)
+    function attachment($file, $filename=null)
     {
-               $this->attachment[] = $file;
+       if (!isset($filename))
+               $filename = $file;
+       $this->attachment[$filename] = $file;
     }
 
     function subject($subject)
@@ -97,6 +99,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');
@@ -114,54 +118,36 @@ class email
 
        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 .= "Content-Type: multipart/mixed;\n boundary=\"$this->boundary\"\n";
+        // Add CC Recipients 
+               if (!empty($this->cc)) 
+                       $this->headers['Cc'] = implode(", ", $this->cc); 
+
+               // Add BCC Recipients 
+               if (!empty($this->bcc)) 
+                       $this->headers['Bcc'] = implode(", ", $this->bcc); 
+               $this->headers['Content-Type'] = "multipart/mixed;\n boundary=\"$this->boundary\"";
 
-        // Attachment hinzufügen
-        $max = count($this->attachment);
-        if ($max > 0)
+        // Add Attachments
+        if (!empty($this->attachment))
         {
-            for ($i = 0; $i < $max; $i++)
+            foreach ($this->attachment as $filename => $fname)
             {
-                $file = fread(fopen($this->attachment[$i], "r"), filesize($this->attachment[$i]));
+                $file = fread(fopen($fname, "r"), filesize($fname));
                                $this->body .= "--".$this->boundary."\n";
-                               $this->body .= "Content-Type: " .$this->mime_type(basename($this->attachment[$i])). "; name=\"".basename($this->attachment[$i])."\"\n";
+                               $this->body .= "Content-Type: " .$this->mime_type(basename($filename)). "; name=\"".basename($fname)."\"\n";
                                $this->body .= "Content-Transfer-Encoding: base64\n";
-                               $this->body .= "Content-Disposition: attachment; filename=\"".basename($this->attachment[$i])."\"\n\n";
+                               $this->body .= "Content-Disposition: attachment; filename=\"".$filename."\"\n\n";
                                $this->body .= chunk_split(base64_encode($file),"72","\n");
-                $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, $this->add_params))
+                       if (mail($mail, $this->subject, $this->body, $this->headers, $this->add_params))
                                $ret++;
         }
         return $ret;
     }
 }
-?>