Changeset 393 for trunk/Mail.php

Timestamp:

Mar 1, 2012, 9:55:39 PM (13 years ago)

Author:

chronos

Message:

• Testování odesílání pošty s přílohou.

File:

• trunk/Mail.php (modified) (12 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');
 
 class Mail
 {
-  var $sendto = array();
+  var $SendTo = array();
   var $acc = array();
   var $abcc = array();
@@ -54 +60 @@
   {
     // TODO : test validité sur to
-    if(is_array($to)) $this->sendto= $to;
-      else $this->sendto[] = $to;
-
-    if($this->checkAddress == true) $this->CheckAdresses($this->sendto);
+    if(is_array($to)) $this->SendTo = $to;
+      else $this->SendTo[] = $to;
+
+    if($this->checkAddress == true) $this->CheckAdresses($this->SendTo);
   }
 
   function Cc($cc)
   {
-    if(is_array($cc)) $this->acc= $cc;
-      else $this->acc[]= $cc;
+    if(is_array($cc)) $this->acc = $cc;
+      else $this->acc[] = $cc;
                 
     if($this->checkAddress == true) $this->CheckAdresses($this->acc);   
@@ -82 +88 @@
   }
 
-  function Body($body, $charset='')
+  function Body($body, $charset = '')
   {
     $this->body = $body;
@@ -89 +95 @@
     {
       $this->charset = strtolower($charset);
-      if($this->charset != 'us-ascii') $this->ctencoding = '8bit';
+      if($this->charset != CHARSET_ASCII) $this->ctencoding = '8bit';
     }
   }
@@ -108 +114 @@
   }
 
-  function Attach( $filename, $filetype = '', $disposition = 'inline')
+  function Attach($filename, $filetype = '', $disposition = DISPOSITION_ATTACHMENT)
   {
     // TODO : si filetype="", alors chercher dans un tablo de MT connus / extension du fichier
@@ -118 +124 @@
   }
 
-  function BuildMail()
+  private function BuildMail()
   {
     // build the headers
@@ -149 +155 @@
     if( count( $this->aattach ) > 0 ) 
     {
-      $this->_build_attachement();
+      $this->BuildAttachement();
     } else 
     {
@@ -165 +171 @@
   {
     $this->BuildMail();
-    $this->strTo = implode(', ', $this->sendto );
+    $this->strTo = implode(', ', $this->SendTo );
         
     // envoie du mail
@@ -182 +188 @@
   function ValidEmail($address)
   {
-    if( ereg( ".*<(.+)>", $address, $regs ) ) 
+    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);
+    if(ereg( "^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$",$address)) 
+      return(true);
       else return(false);
   }
@@ -193 +199 @@
   function CheckAdresses( $aad )
   {
-    for($i=0; $i< count($aad); $i++ ) 
+    for($i=0; $i< count($aad); $i++) 
     {
       if(!$this->ValidEmail($aad[$i])) 
       {
-        throw new Exception("Class Mail, method Mail : invalid address $aad[$i]");      
+        throw new Exception('Class Mail, method Mail : invalid address '.$aad[$i]);
       }
     }
   } 
 
-  function _build_attachement()
+  private function BuildAttachement()
   {
     $this->xheaders['Content-Type'] = "multipart/mixed;\n boundary=\"$this->boundary\"";
@@ -215 +221 @@
         
     // for each attached file, do...
-    for( $i = 0; $i < count($this->aattach); $i++) 
+    for($i = 0; $i < count($this->aattach); $i++) 
     {
       $filename = $this->aattach[$i];
@@ -225 +231 @@
       {
         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.