Changeset 396

Timestamp:

Mar 3, 2012, 9:12:26 AM (13 years ago)

Author:

chronos

Message:

• Upraveno: Přepracována třída Mail pro lepší zpracování více těl zpráv a více příloh.
• Přidáno: Částečná podpora pro zasílání faktur jako přílohy v poště při vyúčtování.

Location:

trunk

Files:

• Mail.php (modified) (3 diffs)
• config.sample.php (modified) (3 diffs)
• finance/bills.php (modified) (1 diff)
• finance/manage.php (modified) (2 diffs)
• global.php (modified) (2 diffs)
• network/administration.php (modified) (1 diff)
• sql/updates/396.sql (added)
• temp/mailtest.php (modified) (1 diff)

trunk/Mail.php

@@ -9 +9 @@
 class Mail
 {
-  var $SendTo = array();
-  var $acc = array();
-  var $abcc = array();
-  var $aattach = array();
-  var $xheaders = array();
-  var $priorities = array('1 (Highest)', '2 (High)', '3 (Normal)', '4 (Low)', '5 (Lowest)');
-  var $charset = 'us-ascii';
-  var $ctencoding = '7bit';
-  var $receipt = 0;  
-        
+  var $Priorities;
+  var $Subject;
+  var $From;
+  var $Recipients;
+  var $Bodies;  
+  var $Attachments;
+  var $AgentIdent;
+  var $Organization;
+  var $ReplyTo;
+  var $Headers;
+  
   function __construct()
   {
-    $this->autoCheck(true);
-    $this->Boundary = md5(uniqid('myboundary'));
-  }
-
-  function autoCheck($Bool)
-  {
-    if($Bool) $this->checkAddress = true;
-      else $this->checkAddress = false;
-  }
-
-  function Subject($Subject)
-  {
-    $this->xheaders['Subject'] = strtr($Subject, "\r\n" , '  ');
-  }
- 
-  function From($From)
-  {
-    if(!is_string($From)) 
-      throw new Exception('Class Mail: error, From is not a string');
-    $this->xheaders['From'] = $From;
-  }
-
-  function ReplyTo($Address)
-  {
-    if(!is_string($Address)) return(false);
-        
-    $this->xheaders['Reply-To'] = $Address;
-  }
-
-  function Receipt()
-  {
-    $this->receipt = 1;
-  }
-
-  function To($to)
-  {
-    // TODO : test validité sur to
-    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($this->checkAddress == true) $this->CheckAdresses($this->acc);   
-  }
-
-  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($this->charset != CHARSET_ASCII) $this->ctencoding = '8bit';
-    }
-  }
-
-  function AlternateBody($Body)
-  {
-    $this->AlternateBody = $Body;
+    $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()
+  {
+    $this->Bodies = array();
+    $this->Attachments = array();
+    $this->Recipients = array();
+    $this->SenderAddress = '';
+    $this->SenderName = '';
+    $this->Subject = '';
+    $this->Organization = '';
+    $this->ReplyTo = '';
+    $this->Headers = array();
+  }
+
+  function AddTo($Address, $Name)
+  {
+    $this->Recipients[] = array('Address' => $Address, 'Name' => $Name, 'Type' => 'Send');
+  }
+
+  function AddCc($Address, $Name)
+  {
+    $this->Recipients[] = array('Address' => $Address, 'Name' => $Name, 'Type' => 'Copy');
+  }
+
+  function AddBcc($bcc)
+  {
+    $this->Recipients[] = array('Address' => $Address, 'Name' => $Name, 'Type' => 'HiddenCopy');
+  }
+
+  function AddBody($Content, $MimeType = 'text/plain', $Charset = 'utf-8')
+  {
+    $this->Bodies[] = array('Content' => $Content, 'Type' => strtolower($MimeType), 
+      'Charset' => strtolower($Charset));
   }
 
@@ -111 +77 @@
   }
 
-  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->Attachments[] = array('FileName' => $Filename, 'FileType' => $FileType, 
-      'Disposition' => $Disposition);
-  }
-
-  private function BuildMail()
-  {
-    // build the headers
-    $this->headers = '';
-    //  $this->xheaders['To'] = implode( ", ", $this->sendto );
-        
-    if(count($this->acc) > 0)
-      $this->xheaders['CC'] = implode(', ', $this->acc);
-        
-    if(count($this->abcc) > 0) 
-      $this->xheaders['BCC'] = implode(', ', $this->abcc);
-        
-    if($this->receipt) 
-    {
-      if(isset($this->xheaders['Reply-To']))
-        $this->xheaders['Disposition-Notification-To'] = $this->xheaders['Reply-To'];
-        else $this->xheaders['Disposition-Notification-To'] = $this->xheaders['From'];
-    }
-        
-    if($this->charset != '') 
-    {
-      $this->xheaders['Mime-Version'] = '1.0';
-      $this->xheaders['Content-Type'] = 'text/plain; charset='.$this->charset;
-      $this->xheaders['Content-Transfer-Encoding'] = $this->ctencoding;
-    }
-
-    $this->xheaders['X-Mailer'] = 'PHP/Mail';
-        
-    // include attached files
-    if(count($this->Attachments) > 0) $this->BuildAttachement();
-      else $this->fullBody = $this->Body;
-    
-    reset($this->xheaders);
-    foreach($this->xheaders as $Header => $Value) 
-    {
-      if($Header != 'Subject') $this->headers .= $Header.': '.$Value."\n";
-    }
+  function AttachFile($FileName, $FileType, $Disposition = DISPOSITION_ATTACHMENT)
+  {     
+    $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType, 
+      'Disposition' => $Disposition, 'Type' => 'File');
+  }
+
+  function AttachData($FileName, $FileType, $Data, $Disposition = DISPOSITION_ATTACHMENT)
+  {
+    $this->Attachments[] = array('FileName' => $FileName, 'FileType' => $FileType, 
+      'Disposition' => $Disposition, 'Type' => 'Data', 'Data' => $Data);
   }
 
   function Send()
   {
-    $this->BuildMail();
-    $this->strTo = implode(', ', $this->SendTo);
-        
-    $res = mail($this->strTo, $this->xheaders['Subject'], $this->fullBody, $this->headers);
+    if(count($this->Bodies) == 0) throw new Exception('Mail: Need at least one text body');
+    
+    $Body = $this->BuildAttachment($this->BuildBody());
+    
+    $To = '';
+    $this->Headers['CC'] = '';
+    $this->Headers['BCC'] = '';
+    foreach($this->Recipients as $Index => $Recipient)      
+    {
+      if($Recipient['Type'] == 'Send')
+      {
+        if($Index > 0) $To .= ', ';
+        $To .= $Recipient['Name'].' <'.$Recipient['Address'].'>';
+      } else
+      if($Recipient['Type'] == 'Copy')
+      {
+        if($Index > 0) $this->Headers['CC'] .= ', ';
+        $this->Headers['CC'] .= $Recipient['Name'].' <'.$To['Address'].'>';
+      } else
+      if($Recipient['Type'] == 'HiddenCopy')
+      {
+        if($Index > 0) $this->Headers['BCC'] .= ', ';
+        $this->Headers['BCC'] .= $Recipient['Name'].' <'.$To['Address'].'>';
+      }
+    }
+    if($To == '') throw new Exception('Mail: Need at least one recipient address');
+    
+    $this->Headers['Mime-Version'] = '1.0';
+    if(count($this->Attachments) == 0)
+    {
+      $this->Headers['Content-Type'] = $this->Bodies[0]['Type'].'; charset='.$this->Bodies[0]['Charset'];
+      $this->Headers['Content-Transfer-Encoding'] = $this->ContentEncoding($this->Bodies[0]['Charset']);
+    }
+    
+    if($this->AgentIdent != '') $this->Headers['X-Mailer'] = $this->AgentIdent;
+    if($this->ReplyTo != '') $this->Headers['Reply-To'] = $this->ReplyTo;
+    if($this->From != '') $this->Headers['From'] = $this->From;
+
+    $Headers = '';
+    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');
+    
+
+    $res = mail($To, $this->Subject, $Body, $Headers);
     return($res);
-  }
-
-  function Get()
-  {
-    $this->BuildMail();
-    $Mail = "To: " . $this->strTo."\n";
-    $Mail .= $this->headers."\n";
-    $Mail .= $this->fullBody;
-    return($Mail);
   }
 
@@ -190 +157 @@
     {
       if(!$this->ValidEmail($Address)) 
-        throw new Exception('Class Mail, method Mail : invalid address '.$Address);
+        throw new Exception('Mail: Invalid address '.$Address);
     }
   } 
-
-  private function BuildAttachement()
-  {
-    $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'];;
+  
+  private function ContentEncoding($Charset)
+  {
+    if($Charset != CHARSET_ASCII) return('8bit');
+      else return('7bit');
+  }
+
+  private function BuildAttachment($Body)
+  {
+    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";    
+      $Result .= $Body;
+    
+      foreach($this->Attachments as $Attachment) 
+      {
+        $FileName = $Attachment['FileName'];
+        $BaseName = basename($FileName);
+        $ContentType = $Attachment['FileType'];
+        $Disposition = $Attachment['Disposition'];
+        if($Attachment['Type'] == 'File')
+        {
+          if(!file_exists($FileName)) 
+            throw new Exception('Mail: Attached file '.$FileName.' can\'t be found');
+          $Data = file_get_contents($FileName);
+        } else 
+        if($Attachment['Type'] == 'Data') $Data = $Attachment['Data'];
+          else $Data = '';
                 
-      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);
-  }
+        $Result .= "\n".'--PHP-mixed-'.$this->Boundary."\n".
+          "Content-Type: ".$ContentType."; name=\"".$BaseName."\"\n".
+          "Content-Transfer-Encoding: base64\n".
+          "Content-Disposition: ".$Disposition."\n\n";
+        $Result .= chunk_split(base64_encode($Data))."\r\n";
+      }
+    } else $Result = $Body;
+    return($Result);    
+  }
+  
+  private function BuildBody()
+  {
+    $Result = '';
+    if(count($this->Bodies) > 1) 
+      $Result .= 'Content-Type: multipart/alternative; boundary="PHP-alt-'.$this->Boundary.'"'.
+        "\n\n";
+        
+    foreach($this->Bodies as $Body)
+    {
+      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";          
+    }
+    return($Result);
+  }  
 }
 
+/*
+// Example
+$Mail = new Mail();
+$Mail->AddTo('nobody@nodomain', 'Recipient');
+$Mail->From = 'No reply <noreply@nodomain>';
+$Mail->Subject = 'Test message';
+$Mail->AddBody('This is sample message sent by PHP Mail class');
+$Mail->AddBody('This is sample <strong>HTML</strong> message sent by <i>PHP Mail class</i>', 'text/html');
+$Mail->AttachFile('mailtest.php', 'text/plain');
+$Mail->AttachData('DataFile.txt', 'text/plain', 'Sample text');
+$Mail->Send();
+*/
+
 ?>

trunk/config.sample.php

@@ -10 +10 @@
     'User' => 'root',
     'Password' => '',
-    'Database' => 'is',
+    'Database' => 'centrala',
     'Prefix' => '',
     'Charset' => 'utf8',
@@ -16 +16 @@
   'Web' => array
   (
-    'Style' => 'simple',
+    'Style' => 'new',
     'FormatHTML' => false,
     'Charset' => 'utf-8',
@@ -34 +34 @@
     'UserSupport' => 1,
     'UploadFileFolder' => 'files',
+    'FileRootPath' => 'finance/doklady',
     'News' => array
     (

trunk/finance/bills.php

@@ -192 +192 @@
   function HtmlToPdf($HtmlCode)
   {
-    $Output = shell_exec('echo "'.addslashes(FromUTF8($HtmlCode)).'"|htmldoc --no-numbered --webpage --charset 8859-2 -t pdf -');
+    $Output = shell_exec('echo "'.addslashes(FromUTF8($HtmlCode)).'"|htmldoc --no-numbered --webpage --no-embedfonts --charset 8859-2 -t pdf -');
     return($Output);
   }

trunk/finance/manage.php

@@ -391 +391 @@
   }
   
-  function SendPaymentEmail($MemberId)
+  function SendPaymentEmail($MemberId, $FileId = '')
   {
     global $Config;
@@ -430 +430 @@
         
       $Content .= '<br />Tento email je generován automaticky. V případě zjištění nesrovnalostí napište zpět.';
-      $AdditionalHeaders = 'To: =?UTF-8?B?'.base64_encode($User['Name']).'?= <'.$User['Email'].">\n".'From: =?UTF-8?B?'.base64_encode($Config['Web']['Title']).'?='." <".$Config['Web']['AdminEmail'].">\n";
-      $this->System->AddEmailToQueue($User['Email'], $Title, $Content, $AdditionalHeaders);
+      $this->System->AddEmailToQueue($User['Name'].' <'.$User['Email'].'>', $Title, $Content, 
+         $Config['Web']['Admin'].' <'.$Config['Web']['AdminEmail'].'>');
       $Output = '';
     } else $Output = 'Uživatel '.$User['Name'].' nemá email.';

trunk/global.php

@@ -108 +108 @@
   }
   
-  function AddEmailToQueue($Address, $Subject, $Content, $Headers = '')
-  {
-    $this->Database->insert('EmailQueue', array('Address' => $Address, 'Subject' => $Subject, 'Content' => $Content, 'Time' => 'NOW()', 'Headers' => $Headers));
-  }
-  
-  function MailUTF8($To, $Subject = '(No subject)', $Message = '', $Header = '') 
-  {
-    $Header = 'MIME-Version: 1.0' . "\r\n" . 'Content-type: text/html; charset=UTF-8' . "\r\n".$Header;
-    mail($To, '=?UTF-8?B?'.base64_encode($Subject).'?=', $Message, $Header);
-    //echo('mail('.$To.', =?UTF-8?B?'.base64_encode($Subject).'?=, '.$Message.', '.$Header.')<br/>');
-  }
-
+  function AddEmailToQueue($To, $Subject, $Content, $From, $AttachmentFileId = '')
+  {
+    $Values = array('Address' => $To, 
+      'Subject' => $Subject, 'Content' => $Content, 'Time' => 'NOW()', 
+      'From' => $From);
+    if($AttachmentFileId != '') $Values['AttachmentFile'] = $AttachmentFileId;
+    $this->Database->insert('EmailQueue', $Values);
+  }
+  
   function ProcessEmailQueue()
   {
+    $Mail = new Mail();
     $Output = '';
     $DbResult = $this->Database->select('EmailQueue', '*', 'Archive=0');
     while($DbRow = $DbResult->fetch_assoc())
     {      
-      $this->MailUTF8($DbRow['Address'], $DbRow['Subject'], $DbRow['Content'], $DbRow['Headers']);
-      //echo('mail('.$DbRow['Address'].', '.$DbRow['Subject'].', '.$DbRow['Content'].', FromUTF8('.$DbRow['Headers'].', \'iso2\'));');
+      $Mail->AddTo($DbRow['To']);
+      $Mail->Subject = $DbRow['Subject'];
+      $Mail->From = $DbRow['From'];
+      $Mail->AddBody(strip_tags($DbRow['Content']), 'text/plain');
+      $Mail->AddBody($DbRow['Content'], 'text/html');
+      if($DbRow['AttachmentFile'] != 'NULL')
+      {
+        $DbResult2 = $this->Dataase->select('File', '*', 'Id='.$DbRow['AttachmentFile']);
+        $File = $DbResult2->fetch_assoc();
+        $Mail->AttachFile($this->Config['Web']['FileRootFolder'].$File['DrivePath'], $File['MimeType']);
+      }
+      $Mail->Send();
       $this->Database->update('EmailQueue', 'Id='.$DbRow['Id'], array('Archive' => 1));
       $this->Modules['Log']->NewRecord('System', 'SendEmail', $DbRow['Id']);
@@ -209 +217 @@
   $Database->ShowSQLQuery = $Config['Web']['ShowSQLQuery'];
   
-  $Mail = new Mail();
-
   $System = new System();
   $System->Config = $Config;

trunk/network/administration.php

@@ -23 +23 @@
         $Form = new Form('Email');
         $Form->LoadValuesFromForm();
-        $Result = $this->System->AddEmailToQueue($Form->Values['Address'], $Form->Values['Subject'], $Form->Values['Content']);
+        $Result = $this->System->AddEmailToQueue($Form->Values['Address'], 
+          $Form->Values['Subject'], $Form->Values['Content'], 
+          $this->System->Config['Web']['Admin'].' <'.$this->System->Config['Web']['AdminEmail'].'>');
         $Output = $this->SystemMessage('Vložení emailu', 'Nový email byl vložen do fronty');
       }

trunk/temp/mailtest.php

@@ -6 +6 @@
 
 $Mail = new Mail();
-$Mail->To('robie@centrum.cz');
-$Mail->Subject('Zkušební zpráva');
-$Mail->From('chronos@zdechov.net');
-$Mail->Body('Toto je zkušební zpráva.', 'utf-8');
-$Mail->AlternateBody('<strong>Toto</strong> je zkušební zpráva.', 'utf-8');
-$Mail->Attach('sugar.php', 'text/plain');
+$Mail->AddTo('robie@centrum.cz', 'Chronos ěščřžýáíé');
+$Mail->From = 'Sender ěščřžýáíé <noreply@nodomain>';
+$Mail->Subject = 'Test message ěščřžýáíé';
+$Mail->AddBody('This is sample message sent by PHP Mail class ěščřžýáíé');
+$Mail->AddBody('This is sample <strong>HTML</strong> message sent by <i>PHP Mail class</i> ěščřžýáíé', 'text/html');
+$Mail->AttachFile('mailtest.php', 'text/plain');
+$Mail->AttachData('DataFile.txt', 'text/plain', 'Sample text ěščřžýáíé');
 $Mail->Send();