Changeset 526 for trunk/Common/System.php

Timestamp:

Apr 21, 2013, 10:23:56 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Tabulka HyperLink přejmenována na obecnější název Action. Odkazy na názvy ikony přepracovány na samostatnou tabulku.
• Upraveno: Funkce týkající se fronty mailů odděleny do samostatného souboru.

File:

• trunk/Common/System.php (modified) (4 diffs)

trunk/Common/System.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/EmailQueue.php');
 
 class System
@@ -13 +15 @@
   var $PathItems;
   var $RootURLFolder;
+  var $EmailQueue;
 
   function __construct()
@@ -21 +24 @@
     $this->Database = new Database();
     $this->FormManager = new FormManager($this->Database);
+    $this->EmailQueue = new EmailQueue($this);
   }  
   
@@ -79 +83 @@
   }
   
-  function AddEmailToQueue($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 ProcessEmailQueue()
-  {
-    $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 HumanDate($Time)
   {