From: Joe <unknown>
Date: Wed, 4 Feb 2015 07:03:03 +0000 (+0100)
Subject: Cleanup and preparing for XLS extension in class.mail.inc.
X-Git-Tag: v2.4.2~19^2~255
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=9d4f2dee640cb454f90e52e44bacbb551c81f9c1;p=fa-stable.git

Cleanup and preparing for XLS extension in class.mail.inc.
---

diff --git a/reporting/includes/class.mail.inc b/reporting/includes/class.mail.inc
index edda2b5a..7cce85a1 100644
--- a/reporting/includes/class.mail.inc
+++ b/reporting/includes/class.mail.inc
@@ -97,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');
@@ -114,31 +116,16 @@ 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";
-        }
+        // 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";
 
-        // Attachment hinzufügen
+        // Add Attachments
         $max = count($this->attachment);
         if ($max > 0)
         {
@@ -153,7 +140,7 @@ class email
                 $file = "";
             }
         }
-			$this->body .= "--".$this->boundary."--\n";
+		$this->body .= "--".$this->boundary."--\n";
 
 		$ret = 0;
         foreach($this->to as $mail)