X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fclass.mail.inc;h=16cc81c368f7a7b0a69894e10a1a14e77cc554d3;hb=0e9e4cf4f01431531dfed299bb501955bb0818ed;hp=edda2b5ad781e077ae28816802b8ef00fa8a6512;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git

diff --git a/reporting/includes/class.mail.inc b/reporting/includes/class.mail.inc
index edda2b5a..16cc81c3 100644
--- a/reporting/includes/class.mail.inc
+++ b/reporting/includes/class.mail.inc
@@ -41,7 +41,7 @@ class email
 	var $charset = 'ISO-8859-1';
 	var $add_params;
 	
-    function email($name, $mail)
+    function __construct($name, $mail)
     {
         $this->boundary = md5(uniqid(time()));
 		$this->header = "From: $name <$mail>\n";
@@ -65,9 +65,11 @@ class email
     	$this->bcc[] = $mail;
     }
 
-    function attachment($file)
+    function attachment($file, $filename=null)
     {
-		$this->attachment[] = $file;
+    	if (!isset($filename))
+    		$filename = basename($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,46 +118,30 @@ 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
-        $max = count($this->attachment);
-        if ($max > 0)
+        // Add Attachments
+        if (!empty($this->attachment))
         {
-            for ($i = 0; $i < $max; $i++)
+            foreach ($this->attachment as $filename => $file)
             {
-                $file = fread(fopen($this->attachment[$i], "r"), filesize($this->attachment[$i]));
+                $file = fread(fopen($file, "r"), filesize($file));
 				$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($file). "; name=\"".$filename."\"\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)