Changeset 460

Timestamp:

Nov 5, 2012, 10:12:56 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Odesílání emailů.

Location:

trunk

Files:

• Common/Global.php (modified) (1 diff)
• Common/Mail.php (modified) (5 diffs)
• sql/updates/459.sql (modified) (1 diff)

trunk/Common/Global.php

@@ -133 +133 @@
     while($DbRow = $DbResult->fetch_assoc())
     {      
-      $Mail->AddTo($DbRow['To']);
+      $Mail->AddToCombined($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')
+      if($DbRow['AttachmentFile'] != '')
       {
-        $DbResult2 = $this->Dataase->select('File', '*', 'Id='.$DbRow['AttachmentFile']);
-        $File = $DbResult2->fetch_assoc();
-        $Mail->AttachFile($this->Config['Web']['FileRootFolder'].$File['DrivePath'], $File['MimeType']);
+        $DbResult2 = $this->Database->select('File', '*', 'Id='.$DbRow['AttachmentFile']);
+        while($File = $DbResult2->fetch_assoc())
+          $Mail->AttachFile($this->Config['Web']['FileRootFolder'].$File['DrivePath'], $File['MimeType']);
       }
       $Mail->Send();

trunk/Common/Mail.php

@@ -41 +41 @@
   }
 
+  function AddToCombined($Address)
+  {
+    $this->Recipients[] = array('Address' => $Address, 'Type' => 'SendCombined');
+  }
+
   function AddTo($Address, $Name)
   {
@@ -100 +105 @@
     foreach($this->Recipients as $Index => $Recipient)      
     {
+      if($Recipient['Type'] == 'SendCombined')
+      {
+        if($Index > 0) $To .= ', ';
+        $To .= $Recipient['Address'];
+      } else
       if($Recipient['Type'] == 'Send')
       {
@@ -119 +129 @@
     
     $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;
@@ -169 +174 @@
   private function BuildAttachment($Body)
   {
-    if(count($this->Attachments > 0))
-    {
+    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";    
@@ -206 +210 @@
     $Result = '';
     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 
+    {
+      $this->Headers['Content-Type'] = $this->Bodies[0]['Type'].'; charset='.$this->Bodies[0]['Charset'];
+      $this->Headers['Content-Transfer-Encoding'] = $this->ContentEncoding($this->Bodies[0]['Charset']);
+    }
+
         
     foreach($this->Bodies as $Body)

trunk/sql/updates/459.sql

@@ -2 +2 @@
 
 ALTER TABLE `EmailQueue` CHANGE `Address` `To` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_czech_ci NOT NULL;
+ALTER TABLE `EmailQueue` CHANGE `AttachmentFile` `AttachmentFile` INT( 11 ) NULL ;
+UPDATE `EmailQueue` SET AttachmentFile = NULL WHERE AttachmentFile=0;