Cleanup and preparing for XLS extension in class.mail.inc.
authorJoe <unknown>
Wed, 4 Feb 2015 07:03:03 +0000 (08:03 +0100)
committerJoe <unknown>
Wed, 4 Feb 2015 07:03:03 +0000 (08:03 +0100)
reporting/includes/class.mail.inc

index edda2b5ad781e077ae28816802b8ef00fa8a6512..7cce85a109e1788546d2c2d4cc265bad504162e2 100644 (file)
@@ -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)