Changeset 532 for trunk/Common/EmailQueue.php

Timestamp:

Apr 24, 2013, 9:09:32 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Metoda ShowMain v PageNews rozdělena do jednotlivých metod dle vybrané akce.
• Opraveno: V souboru EmailQueue se vkládaly na výstup chybně dva znaky mezer.
• Opraveno: Zamezení úpravy aktualit vložených bez nastaveného uživatele (jako anonym).
• Opraveno: Odstraněny některé pevné reference na server centrala.
• Opraveno: Uložení úpravy odkazu aktualit.

File:

• trunk/Common/EmailQueue.php (modified) (1 diff)

trunk/Common/EmailQueue.php

@@ -1 @@
-  <?php
+<?php
   
-  class EmailQueue extends Module 
-  {    
-    function AddItem($To, $Subject, $Content, $From, $AttachmentFileId = '')
-    {
-      $Values = array('To' => $To, 
-        'Subject' => $Subject, 'Content' => $Content, 'Time' => 'NOW()', 
-        'From' => $From);
-      if($AttachmentFileId != '') $Values['AttachmentFile'] = $AttachmentFileId;
-      $this->Database->insert('EmailQueue', $Values);
-    }
+class EmailQueue extends Module 
+{    
+  function AddItem($To, $Subject, $Content, $From, $AttachmentFileId = '')
+  {
+    $Values = array('To' => $To, 
+      'Subject' => $Subject, 'Content' => $Content, 'Time' => 'NOW()', 
+      'From' => $From);
+    if($AttachmentFileId != '') $Values['AttachmentFile'] = $AttachmentFileId;
+    $this->Database->insert('EmailQueue', $Values);
+  }
+ 
+  function Process()
+  {
+    $Output = '';
+    $DbResult = $this->Database->select('EmailQueue', '*', 'Archive=0');
+    while($DbRow = $DbResult->fetch_assoc())
+    {      
+      $Mail = new Mail();
+      $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'] != '')
+      {
+        $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();
+      $this->Database->update('EmailQueue', 'Id='.$DbRow['Id'], array('Archive' => 1));
+      $this->ModuleManager->Modules['Log']->NewRecord('System', 'SendEmail', $DbRow['Id']);
+      $Output .= 'To: '.$DbRow['To'].'  Subject: '.$DbRow['Subject'].'<br />';
+    }    
+    return($Output);
+  }
+}
   
-    function Process()
-    {
-      $Output = '';
-      $DbResult = $this->Database->select('EmailQueue', '*', 'Archive=0');
-      while($DbRow = $DbResult->fetch_assoc())
-      {      
-        $Mail = new Mail();
-        $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'] != '')
-        {
-          $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();
-        $this->Database->update('EmailQueue', 'Id='.$DbRow['Id'], array('Archive' => 1));
-        $this->ModuleManager->Modules['Log']->NewRecord('System', 'SendEmail', $DbRow['Id']);
-        $Output .= 'To: '.$DbRow['To'].'  Subject: '.$DbRow['Subject'].'<br />';
-      }    
-      return($Output);
-    }
-  }
-  
-  ?>
+?>