Changeset 396 for trunk/global.php

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í.

File:

• trunk/global.php (modified) (2 diffs)

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;