Changeset 69 for trunk/Packages/Common/Mail.php

Timestamp:

Feb 28, 2016, 10:54:30 AM (9 years ago)

Author:

chronos

Message:

• Modified: Use object oriented approach for page drawing using Application class.
• Added: SQL updated will be automatic using UpdateTrace.php file.
• Added: Use generic setup page at URL /setup for SQL structure update.
• Modified: Update Common package to newer version.

File:

• trunk/Packages/Common/Mail.php (modified) (14 diffs)

trunk/Packages/Common/Mail.php

@@ -13 +13 @@
   var $From;
   var $Recipients;
-  var $Bodies;  
+  var $Bodies;
   var $Attachments;
   var $AgentIdent;
@@ -19 +19 @@
   var $ReplyTo;
   var $Headers;
-  
+
   function __construct()
   {
-    $this->Priorities = array('1 (Highest)', '2 (High)', '3 (Normal)', '4 (Low)', '5 (Lowest)');           
+    $this->Priorities = array('1 (Highest)', '2 (High)', '3 (Normal)', '4 (Low)', '5 (Lowest)');
     $this->Boundary = md5(date('r', time()));
     $this->AgentIdent = 'PHP/Mail';
     $this->Clear();
   }
-  
+
   function Clear()
   {
@@ -63 +63 @@
   function AddBody($Content, $MimeType = 'text/plain', $Charset = 'utf-8')
   {
-    $this->Bodies[] = array('Content' => $Content, 'Type' => strtolower($MimeType), 
+    $this->Bodies[] = array('Content' => $Content, 'Type' => strtolower($MimeType),
       'Charset' => strtolower($Charset));
   }
@@ -75 +75 @@
   {
     if(!intval($Priority)) return(false);
-                
+
     if(!isset($this->priorities[$Priority - 1])) return(false);
 
-    $this->xheaders['X-Priority'] = $this->priorities[$Priority - 1];   
+    $this->xheaders['X-Priority'] = $this->priorities[$Priority - 1];
     return(true);
   }
 
   function AttachFile($FileName, $FileType, $Disposition = DISPOSITION_ATTACHMENT)
-  {     
-    $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType, 
+  {
+    $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType,
       'Disposition' => $Disposition, 'Type' => 'File');
   }
@@ -90 +90 @@
   function AttachData($FileName, $FileType, $Data, $Disposition = DISPOSITION_ATTACHMENT)
   {
-    $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType, 
+    $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType,
       'Disposition' => $Disposition, 'Type' => 'Data', 'Data' => $Data);
   }
@@ -96 +96 @@
   function Send()
   {
-    if(count($this->Bodies) == 0) throw new Exception('Mail: Need at least one text body');
-    
+    if(count($this->Bodies) == 0) throw new Exception(T('Mail message need at least one text body'));
+
     $Body = $this->BuildAttachment($this->BuildBody());
-    
+
     $To = '';
     $this->Headers['CC'] = '';
     $this->Headers['BCC'] = '';
-    foreach($this->Recipients as $Index => $Recipient)      
+    foreach($this->Recipients as $Index => $Recipient)
     {
       if($Recipient['Type'] == 'SendCombined')
@@ -126 +126 @@
       }
     }
-    if($To == '') throw new Exception('Mail: Need at least one recipient address');
-    
+    if($To == '') throw new Exception(T('Mail message need at least one recipient address'));
+
     $this->Headers['Mime-Version'] = '1.0';
-    
+
     if($this->AgentIdent != '') $this->Headers['X-Mailer'] = $this->AgentIdent;
     if($this->ReplyTo != '') $this->Headers['Reply-To'] = $this->ReplyTo;
@@ -135 +135 @@
 
     $Headers = '';
-    foreach($this->Headers as $Header => $Value) 
+    foreach($this->Headers as $Header => $Value)
     {
       if(($Header != 'Subject') and ($Value != '')) $Headers .= $Header.': '.$Value."\n";
-    }   
+    }
 
     $this->Subject = strtr($this->Subject, "\r\n", '  ');
 
-    if($this->Subject == '') throw new Exception('Mail: Missing Subject');
-    
+    if($this->Subject == '') throw new Exception(T('Mail message missing Subject'));
+
 
     $res = mail($To, $this->Subject, $Body, $Headers);
@@ -152 +152 @@
   {
     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)) 
+    if(ereg("^[^@  ]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2}|net|com|gov|mil|org|edu|int)\$", $Address))
       return(true);
       else return(false);
@@ -159 +159 @@
   function CheckAdresses($Addresses)
   {
-    foreach($Addresses as $Address) 
-    {
-      if(!$this->ValidEmail($Address)) 
-        throw new Exception('Mail: Invalid address '.$Address);
-    }
-  } 
-  
+    foreach($Addresses as $Address)
+    {
+      if(!$this->ValidEmail($Address))
+  throw new Exception(sprintf(T('Mail message invalid address %s'), $Address));
+    }
+  }
+
   private function ContentEncoding($Charset)
   {
@@ -175 +175 @@
   {
     if(count($this->Attachments) > 0)
-    {        
+    {
       $this->Headers['Content-Type'] = "multipart/mixed;\n boundary=\"PHP-mixed-".$this->Boundary."\"";
       $Result = "This is a multi-part message in MIME format.\n".
-        "--PHP-mixed-".$this->Boundary."\n";    
+        "--PHP-mixed-".$this->Boundary."\n";
       $Result .= $Body;
-    
-      foreach($this->Attachments as $Attachment) 
+
+      foreach($this->Attachments as $Attachment)
       {
         $FileName = $Attachment['FileName'];
@@ -189 +189 @@
         if($Attachment['Type'] == 'File')
         {
-          if(!file_exists($FileName)) 
-            throw new Exception('Mail: Attached file '.$FileName.' can\'t be found');
+          if(!file_exists($FileName))
+            throw new Exception(sprintf(T('Mail message attached file %s can\'t be found'), $FileName));
           $Data = file_get_contents($FileName);
-        } else 
+        } else
         if($Attachment['Type'] == 'Data') $Data = $Attachment['Data'];
           else $Data = '';
-                
+
         $Result .= "\n".'--PHP-mixed-'.$this->Boundary."\n".
           "Content-Type: ".$ContentType."; name=\"".$BaseName."\"\n".
@@ -203 +203 @@
       }
     } else $Result = $Body;
-    return($Result);    
-  }
-  
+    return($Result);
+  }
+
   private function BuildBody()
   {
     $Result = '';
-    if(count($this->Bodies) > 1) 
+    if(count($this->Bodies) > 1)
     {
       $this->Headers['Content-Type'] = 'multipart/alternative; boundary="PHP-alt-'.$this->Boundary.'"';
       $Result .= 'Content-Type: multipart/alternative; boundary="PHP-alt-'.$this->Boundary.'"'.
         "\n\n";
-    } else 
+    } else
     {
       $this->Headers['Content-Type'] = $this->Bodies[0]['Type'].'; charset='.$this->Bodies[0]['Charset'];
@@ -220 +220 @@
     }
 
-        
+
     foreach($this->Bodies as $Body)
     {
-      if(count($this->Bodies) > 1) $Result .= "\n\n".'--PHP-alt-'.$this->Boundary."\n";           
+      if(count($this->Bodies) > 1) $Result .= "\n\n".'--PHP-alt-'.$this->Boundary."\n";
       $Result .= 'Content-Type: '.$Body['Type'].'; charset='.$Body['Charset'].
-        "\nContent-Transfer-Encoding: ".$this->ContentEncoding($Body['Charset'])."\n\n".$Body['Content']."\n";          
+        "\nContent-Transfer-Encoding: ".$this->ContentEncoding($Body['Charset'])."\n\n".$Body['Content']."\n";
     }
     return($Result);
-  }  
+  }
 }