Fixed amibiguity in few text messages to make translations easier, updated gettext...

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

diff --git a/reporting/includes/class.mail.inc b/reporting/includes/class.mail.inc
index 65066ca75fa8eb75ca4cbad1d3f6eaacc145f68e..7cce85a109e1788546d2c2d4cc265bad504162e2 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)
@@ -93,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');
@@ -110,33 +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";
-        }
-               $this->header .= "MIME-Version: 1.0\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";
-               $this->header .= "This is a multi-part message in MIME format.\n";
 
-        // Attachment hinzufügen
+        // Add Attachments
         $max = count($this->attachment);
         if ($max > 0)
         {
@@ -151,15 +140,14 @@ class email
                 $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))
+                       if (mail($mail, $this->subject, $this->body, $this->header, $this->add_params))
                                $ret++;
         }
         return $ret;
     }
 }
-?>
\ No newline at end of file