Changeset 395 for trunk/Mail.php

Timestamp:

Mar 2, 2012, 6:12:11 PM (13 years ago)

Author:

chronos

Message:

• Přidáno: Podpora pro alternativní HTML text pro odesílání emailů.

File:

• trunk/Mail.php (modified) (10 diffs)

trunk/Mail.php

@@ -1 +1 @@
 <?php
 
-define(DISPOSITION_INLINE, 'inline');
-define(DISPOSITION_ATTACHMENT, 'attachment');
-
-define(CHARSET_ASCII, 'us-ascii');
-define(CHARSET_UTF8, 'utf-8');
+define('DISPOSITION_INLINE', 'inline');
+define('DISPOSITION_ATTACHMENT', 'attachment');
+
+define('CHARSET_ASCII', 'us-ascii');
+define('CHARSET_UTF8', 'utf-8');
 
 class Mail
@@ -17 +17 @@
   var $charset = 'us-ascii';
   var $ctencoding = '7bit';
-  var $receipt = 0;
+  var $receipt = 0;  
         
   function __construct()
   {
     $this->autoCheck(true);
-    $this->boundary = '--'.md5(uniqid('myboundary'));
+    $this->Boundary = md5(uniqid('myboundary'));
   }
 
@@ -39 +39 @@
   {
     if(!is_string($From)) 
-    {
       throw new Exception('Class Mail: error, From is not a string');
-    }
     $this->xheaders['From'] = $From;
   }
@@ -76 +74 @@
   function Bcc($bcc)
   {
-    if(is_array($bcc)) 
-    {
-      $this->abcc = $bcc;
-    } else 
-    {
-      $this->abcc[]= $bcc;
-    }
-
-    if($this->checkAddress == true)
-    $this->CheckAdresses($this->abcc);
-  }
-
-  function Body($body, $charset = '')
-  {
-    $this->body = $body;
-        
-    if($charset != '') 
-    {
-      $this->charset = strtolower($charset);
+    if(is_array($bcc)) $this->abcc = $bcc;
+      else $this->abcc[]= $bcc;
+
+    if($this->checkAddress == true) $this->CheckAdresses($this->abcc);
+  }
+
+  function Body($Body, $Charset = '')
+  {
+    $this->Body = $Body;
+        
+    if($Charset != '') 
+    {
+      $this->charset = strtolower($Charset);
       if($this->charset != CHARSET_ASCII) $this->ctencoding = '8bit';
     }
   }
 
+  function AlternateBody($Body)
+  {
+    $this->AlternateBody = $Body;
+  }
+
   function Organization($org)
   {
@@ -104 +101 @@
   }
 
-  function Priority($priority)
-  {
-    if(!intval($priority)) return(false);
-                
-    if(!isset($this->priorities[$priority - 1])) return(false);
-
-    $this->xheaders['X-Priority'] = $this->priorities[$priority - 1];   
+  function Priority($Priority)
+  {
+    if(!intval($Priority)) return(false);
+                
+    if(!isset($this->priorities[$Priority - 1])) return(false);
+
+    $this->xheaders['X-Priority'] = $this->priorities[$Priority - 1];   
     return(true);
   }
 
-  function Attach($filename, $filetype = '', $disposition = DISPOSITION_ATTACHMENT)
+  function Attach($Filename, $FileType = '', $Disposition = DISPOSITION_ATTACHMENT)
   {
     // TODO : si filetype="", alors chercher dans un tablo de MT connus / extension du fichier
-    if($filetype == '') $filetype = 'application/x-unknown-content-type';
-                
-    $this->aattach[] = $filename;
-    $this->actype[] = $filetype;
-    $this->adispo[] = $disposition;
+    if($FileType == '') $FileType = 'application/x-unknown-content-type';
+                
+    $this->Attachments[] = array('FileName' => $Filename, 'FileType' => $FileType, 
+      'Disposition' => $Disposition);
   }
 
@@ -127 +123 @@
   {
     // build the headers
-    $this->headers = "";
+    $this->headers = '';
     //  $this->xheaders['To'] = implode( ", ", $this->sendto );
         
     if(count($this->acc) > 0)
-      $this->xheaders['CC'] = implode(', ', $this->acc );
+      $this->xheaders['CC'] = implode(', ', $this->acc);
         
     if(count($this->abcc) > 0) 
@@ -150 +146 @@
     }
 
-    $this->xheaders['X-Mailer'] = 'Php/libMailv1.3';
+    $this->xheaders['X-Mailer'] = 'PHP/Mail';
         
     // include attached files
-    if( count( $this->aattach ) > 0 ) 
-    {
-      $this->BuildAttachement();
-    } else 
-    {
-      $this->fullBody = $this->body;
-    }
-
+    if(count($this->Attachments) > 0) $this->BuildAttachement();
+      else $this->fullBody = $this->Body;
+    
     reset($this->xheaders);
-    while(list($hdr, $value) = each($this->xheaders)) 
-    {
-      if($hdr != 'Subject') $this->headers .= "$hdr: $value\n";
+    foreach($this->xheaders as $Header => $Value) 
+    {
+      if($Header != 'Subject') $this->headers .= $Header.': '.$Value."\n";
     }
   }
@@ -171 +162 @@
   {
     $this->BuildMail();
-    $this->strTo = implode(', ', $this->SendTo );
-        
-    // envoie du mail
-    $res = @mail($this->strTo, $this->xheaders['Subject'], $this->fullBody, $this->headers);
+    $this->strTo = implode(', ', $this->SendTo);
+        
+    $res = mail($this->strTo, $this->xheaders['Subject'], $this->fullBody, $this->headers);
+    return($res);
   }
 
@@ -180 +171 @@
   {
     $this->BuildMail();
-    $mail = "To: " . $this->strTo . "\n";
-    $mail .= $this->headers . "\n";
-    $mail .= $this->fullBody;
-    return($mail);
-  }
-
-  function ValidEmail($address)
-  {
-    if(ereg( ".*<(.+)>", $address, $regs)) 
-    {
-      $address = $regs[1];
-    }
-    if(ereg( "^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$",$address)) 
+    $Mail = "To: " . $this->strTo."\n";
+    $Mail .= $this->headers."\n";
+    $Mail .= $this->fullBody;
+    return($Mail);
+  }
+
+  function ValidEmail($Address)
+  {
+    if(ereg(".*<(.+)>", $Address, $regs)) $Address = $regs[1];
+    if(ereg("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address)) 
       return(true);
       else return(false);
   }
 
-  function CheckAdresses( $aad )
-  {
-    for($i=0; $i< count($aad); $i++) 
-    {
-      if(!$this->ValidEmail($aad[$i])) 
-      {
-        throw new Exception('Class Mail, method Mail : invalid address '.$aad[$i]);
-      }
+  function CheckAdresses($Addresses)
+  {
+    foreach($Addresses as $Address) 
+    {
+      if(!$this->ValidEmail($Address)) 
+        throw new Exception('Class Mail, method Mail : invalid address '.$Address);
     }
   } 
@@ -210 +196 @@
   private function BuildAttachement()
   {
-    $this->xheaders['Content-Type'] = "multipart/mixed;\n boundary=\"$this->boundary\"";
-
-    $this->fullBody = "This is a multi-part message in MIME format.\n--$this->boundary\n";
-    $this->fullBody .= "Content-Type: text/plain; charset=$this->charset\nContent-Transfer-Encoding: $this->ctencoding\n\n" . $this->body ."\n";
-        
-    $sep = chr(13).chr(10);
-        
-    $ata = array();
-    $k = 0;
-        
-    // for each attached file, do...
-    for($i = 0; $i < count($this->aattach); $i++) 
-    {
-      $filename = $this->aattach[$i];
-      $basename = basename($filename);
-      $ctype = $this->actype[$i];       // content-type
-      $disposition = $this->adispo[$i];
-                
-      if(!file_exists($filename)) 
-      {
-        throw new Exception('Class Mail, method attach : file '.$filename.' can\'t be found');
-      } 
-      $subhdr = '--'.$this->boundary."\nContent-type: ".$ctype.";\n name=\"".$basename.
-        "\"\nContent-Transfer-Encoding: base64\nContent-Disposition: ".$disposition.
-        ";\n  filename=\"".$basename."\"\n";
-      $ata[$k++] = $subhdr;
-      // non encoded line length
-      $linesz = filesize($filename) + 1;
-      $fp = fopen( $filename, 'r');
-      $ata[$k++] = chunk_split(base64_encode(fread($fp, $linesz)));
-      fclose($fp);
-    }
-    $this->fullBody .= implode($sep, $ata);
+    $this->xheaders['Content-Type'] = "multipart/mixed;\n boundary=\"PHP-mixed-".$this->Boundary."\"";
+
+    $this->fullBody = "This is a multi-part message in MIME format.\n--PHP-mixed-".$this->Boundary."\n";
+    if($this->AlternateBody != '') 
+    {
+      $this->fullBody .= 'Content-Type: multipart/alternative; boundary="PHP-alt-'.$this->Boundary.'"';
+      $this->fullBody .= "\n\n".'--PHP-alt-'.$this->Boundary."\n";
+      $this->fullBody .= "Content-Type: text/plain; charset=".$this->charset.
+        "\nContent-Transfer-Encoding: ".$this->ctencoding."\n\n".$this->Body."\n";
+      
+      $this->fullBody .= "\n\n".'--PHP-alt-'.$this->Boundary."\n";
+      $this->fullBody .= "Content-Type: text/html; charset=".$this->charset.
+        "\nContent-Transfer-Encoding: ".$this->ctencoding."\n\n".$this->AlternateBody."\n";
+      //$this->fullBody .= "\n\n".'--PHP-alt-'.$this->Boundary."\n\n";
+    } else
+    $this->fullBody .= "Content-Type: text/plain; charset=".$this->charset.
+      "\nContent-Transfer-Encoding: ".$this->ctencoding."\n\n".$this->Body."\n";
+        
+    $ata = array();  
+    foreach($this->Attachments as $Attachment) 
+    {
+      $FileName = $Attachment['FileName'];
+      $BaseName = basename($FileName);
+      $ctype = $Attachment['FileType'];
+      $Disposition = $Attachment['Disposition'];;
+                
+      if(!file_exists($FileName)) 
+        throw new Exception('Mail: Attached file '.$FileName.' can\'t be found');
+      $subhdr = "\n".'--PHP-mixed-'.$this->Boundary."\nContent-type: ".$ctype.";\n name=\"".$BaseName.
+        "\"\nContent-Transfer-Encoding: base64\nContent-Disposition: ".$Disposition.
+        ";\n  filename=\"".$BaseName."\"\n";
+      $ata[] = $subhdr;
+      $ata[] = chunk_split(base64_encode(file_get_contents($FileName)));      
+    }
+    $this->fullBody .= implode("\r\n", $ata);
   }
 }